Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
270 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

254 Commits

Author SHA1 Message Date
Enno Rehling 496aa22e65 fixes for -ansi -pedantic 2011-03-07 17:29:19 +01:00
Enno Rehling 78b7dcd727 more indentation cleanup 2011-03-06 23:40:55 -08:00
Enno Rehling 791e4cd673 fix CRLF massacre 2011-03-07 08:35:23 +01:00
Enno Rehling 610c6799ea fix CRLF massacre 2011-03-07 08:31:59 +01:00
Enno Rehling 9c8779b303 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno Rehling 9f539b8c12 CRLF confusion? 2011-03-06 23:07:04 -08:00
Enno Rehling fb7a642d47 indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling 7a983c80cf * there are no boats 
* skill should only use 4 bytes
 2011-03-06 22:06:30 -08:00
Enno Rehling 1be42e9d50 Make all tests for Eressea pass again, using the config module. 2011-03-06 21:49:01 -08:00
Enno Rehling fb94908014 export resources and shiptypes as part of configuration. 2011-03-06 21:12:55 -08:00
Enno Rehling 36e53069e0 use quicklist to store ship types. 2011-03-06 21:11:17 -08:00
Enno Rehling 3677e899af Do not assert on unknown skills, but log them as an error. 2011-03-06 19:56:20 -08:00
Enno Rehling d75ee1a057 Make the code compile on Visual Studio again, fixing type conversion warnings and C99-isms. 
Signed-off-by: Enno Rehling <enno@eressea.de>
 2011-03-06 19:29:20 -08:00
Enno Rehling d672510f06 two little remarks 2011-03-06 12:43:39 +01:00
Enno Rehling 623c0dce84 empty ships sink 2011-03-06 12:43:18 +01:00
Enno Rehling cb4f7a03c6 configurable ship damage 2011-03-06 12:43:18 +01:00
Enno Rehling 8c129f1576 skill.id had wrong type 2011-03-05 19:39:02 +01:00
Enno Rehling 53aec0d438 do not silently fail on unknown skill 2011-03-05 19:39:02 +01:00
Enno Rehling b0f1445d68 removed all unused items 2011-03-04 20:44:30 +01:00
Enno Rehling a11d49b406 added a parenthesis to remove a warning 2011-03-04 20:44:30 +01:00
Enno Rehling 258b33e639 updates windows after search 2011-03-03 15:10:20 +01:00
Enno Rehling 7fd2852f3b fixed error with option window dimensions in gmtool 2011-03-03 15:10:20 +01:00
Enno Rehling 168e1d08d4 stop warning about duplicate spells. 2011-02-28 21:28:26 -08:00
Enno Rehling 2af300431d fix a crash in battles caused by quicklist changes 2011-03-01 04:55:58 +01:00
Enno Rehling 42eb0ef0ed remove cvector.[hc] completely 2011-02-27 20:49:38 -08:00
Enno Rehling de13d0d412 remove more cvector usage 2011-02-27 12:22:34 -08:00
Enno Rehling 342e7ee249 remove TROLLSAVE code 
remove more cvector usage
 2011-02-27 12:14:33 -08:00
Enno Rehling 1fbe46ddfe test for emptiness of a list (it's super-simple) 2011-02-27 12:14:16 -08:00
Enno Rehling b40f3d19b0 Store fighters in a quicklist, not a cvector. 2011-02-27 12:04:49 -08:00
Enno Rehling e6f6061819 quicklist.replace makes changes to the content 2011-02-27 11:49:01 -08:00
Enno Rehling 09f2286b82 use malloc. change indentation. 2011-02-27 11:24:51 -08:00
Enno Rehling 37326e4f34 move file 2011-02-27 03:18:02 -08:00
Enno Rehling 10e64c59e1 Some old files that weren't in use. Goodbye. 2011-02-27 02:57:28 -08:00
Enno Rehling 2e547d6ae8 put spoils code into the open source parts of the code. 
reduce number of races in Meropis
 2011-02-27 00:36:38 -08:00
Enno Rehling 12c3324850 When running --tests, messages cannot be created (externally defined), so that isn't an error we are interested in. 2011-02-27 00:11:34 -08:00
Enno Rehling ca2556c618 fix a segmentation fault when file cannot be opened 2011-02-26 23:52:28 -08:00
Enno Rehling cc9e95a2ab spells.lua is a bad file for example and meropis, it tests things that not every game has. 
lua_pushinteger() must be new, I've never used it before.
all tests in meropis and example pass.
 2011-02-26 23:21:12 -08:00
Enno Rehling 916e5389c7 include the correct header on linux 2011-02-27 08:01:23 +01:00
Enno Rehling 611fe8e2a1 adding a os module for os-specific functions (mkdir in this case). 2011-02-26 22:56:14 -08:00
Enno Rehling 665d4aec4d Test framework broken, we were adding the wrong spell with the right name. 2011-02-26 10:07:49 -08:00
Enno Rehling 4fa45d6449 tcc support added 2011-02-26 10:21:10 +01:00
Enno Rehling 2e67e9c290 gcc wants us to define this struct, and that's correct 2011-02-26 09:33:20 +01:00
Enno Rehling b2d6203cec 1. spell_list was pretty much used everywhere in the code, and is now also a quicklist. 
2. Cleaned up the bindings for quicklist to Lua.
 2011-02-26 00:26:14 -08:00
Enno Rehling b28fa19d01 Even if equipment is not very frequently used, there's no need for it to use spell_list structs. 2011-02-25 18:16:14 -08:00
Enno Rehling fd2b30a0ff messagetype_list, another special-cased list type, bites the dust and is replaced by the quicklist. 2011-02-25 08:04:25 -08:00
Enno Rehling c278a3b71f cursetype_list, another special-cased list type, bites the dust and is replaced by the quicklist. 2011-02-25 07:56:00 -08:00
Enno Rehling 5e21579036 another special-cased list type bites the dust and is replaced by the quicklist. 2011-02-25 07:47:35 -08:00
Enno Rehling 5497875c93 Funny. It turns out that building_list is totally not a thing and never was. 2011-02-25 07:41:51 -08:00
Enno Rehling 14dff6cdfa seen_factions is a quicklist, and the faction_list struct is a thing of the past. 2011-02-25 07:27:44 -08:00
Enno Rehling efca8cee43 The list of alliance members is now also a quicklist, and the lua binding for faction_list iteration can disappear. 2011-02-25 07:23:02 -08:00
Enno Rehling d2994d816a the oceannames has never been used. git history does not forget, so deleting is fine. 2011-02-24 23:25:54 -08:00
Enno Rehling 831de3dd55 the report's address list is now a quicklist. A bit faster perhaps, and less memory? One less reason to have the faction_list struct, at least. 2011-02-24 22:29:21 -08:00
Enno Rehling a538c52bc4 quicklists can be used as a set of pointers (this will be useful). 2011-02-24 22:27:04 -08:00
Enno Rehling 372908a9af gcc complains about typedefs for the same struct twice 2011-02-24 08:29:48 +01:00
Enno Rehling 0c2ccf2d20 We do not require unit_list, quicklists are the future. 2011-02-23 23:26:15 -08:00
Enno Rehling d479075c53 Testing util is no longer such an include-weirdness. 2011-02-23 23:23:32 -08:00
Enno Rehling 16d86413d5 add tests for quicklist. Fix the inevitable bug. 2011-02-23 23:22:31 -08:00
Enno Rehling 1cae5e2283 Added quicklist, a linked list with better cache characteristics. 2011-02-23 22:18:58 -08:00
Enno Rehling 0adf7899dd cleaning up the lists functionality a bit. I have plans. 2011-02-21 22:00:03 -08:00
Enno Rehling d033e7156c Simple tests for persistent attributes and a fix. 2011-02-19 06:13:24 -08:00
Enno Rehling 204924c35a http://bugs.eressea.de/view.php?id=1810 
Only rich peasants were dying during the plague (and paying for it)
 2011-02-15 23:34:00 -08:00
Enno Rehling 8f327f7165 array-indexing error in error message discovered by stm. 2011-02-15 23:31:22 -08:00
Enno Rehling 42c5331f1b http://bugs.eressea.de/view.php?id=1833 
There's a pretty bad problem with watchers in older datafiles.
 2011-02-15 23:28:09 -08:00
Enno Rehling f5b4b1ff99 Merged a bugfix for omniscient factions from stm. 2011-02-15 23:06:26 -08:00
Enno Rehling ad4f4f59f0 bson attributes can be on anything now 2011-02-06 08:11:40 +01:00
Enno Rehling dec5bb8834 code cleanup 2011-02-05 23:01:51 -08:00
Enno Rehling e0d70b096a http://bugs.eressea.de/view.php?id=1825 
giving command to empty units is a mistake.
 2010-12-04 17:35:49 -08:00
Enno Rehling d3a7d22253 http://bugs.eressea.de/view.php?id=1679 
Applying a patch provided by Solthar: Server will give error when unit is given more than one long order.
I just added a test to this.
 2010-11-11 20:11:19 -08:00
Enno Rehling e7ce28a258 http://bugs.eressea.de/view.php?id=1814 
fix a quoting bug in the order parser,
add a very basic test to make sure order parsing works.
 2010-11-05 22:54:29 -07:00
Enno Rehling 12828f0edd for planes that have no name, do not print a comma after the coordinates (this has irritated me in E3). 
also: add tests for this, and add a way to assert on content in reports.
 2010-11-05 21:21:49 -07:00
Enno Rehling 33100abebb http://bugs.eressea.de/view.php?id=1585 
prevent prospecting-exploit
 2010-11-02 22:23:04 -07:00
Enno Rehling c5418fc28b E3 does not have a boat, so tests needs to create a canoe sometimes 2010-10-31 19:46:08 -07:00
Enno Rehling 321c0816f6 harmless code beautification 2010-10-31 19:33:18 -07:00
Enno Rehling 279fa623d9 Make sure static data expires. 2010-10-31 19:32:24 -07:00
Enno Rehling 03fd39ac63 Idiotic Visual Studio has no separate C and C++ modes, and puts curly lines under the word "friend". So they can't be called that. 2010-10-31 19:31:45 -07:00
Enno Rehling fa6ea0a626 http://bugs.eressea.de/view.php?id=1811 
BTF_INDESTRUCTIBLE buildings were not indestructible
 2010-10-17 17:24:10 -07:00
Enno Rehling b25d96a015 Merge branch 'master' of gitorious.org:eressea/server 2010-10-16 21:12:11 -07:00
Enno Rehling 49a9992896 bindings for ship.coast 2010-10-16 21:10:46 -07:00
Enno Rehling 357de0f249 fix a crash where flying ships try to anchor 2010-10-16 22:18:30 +02:00
Enno Rehling ed77af5261 http://bugs.eressea.de/view.php?id=1784 
espionage should show the faction of the spied unit in the report.
 2010-10-12 23:17:35 -07:00
Enno Rehling f1f46782f7 * fix some rules to not use static variables across multiple runs 
* add tests for upkeep
* add a config setting to disable upkeep in tests
* add a config setting to disable random factor in studying
 2010-10-08 23:39:16 -07:00
Enno Rehling 6ce601828b this is probably correct with respect to http://bugs.eressea.de/view.php?id=1808 2010-10-05 22:10:44 -07:00
Enno Rehling bfbe9b373b increase skill-limitations by config 2010-10-02 15:37:48 -07:00
Enno Rehling 0d653ec2bf sometimes monsters have heroes, too 2010-09-26 01:06:46 +02:00
Enno Rehling fbb3234bee stealth for totally anonymous armies should work in E3 2010-09-23 23:32:15 -07:00
Enno Rehling fd05fe95e7 woops. wrong character 2010-09-12 05:20:32 +02:00
Enno Rehling 163f6f13cf add support for a new terrain type 2010-09-11 20:11:15 -07:00
Enno Rehling 45f451f17d there are regions with no name, maybe? 2010-09-11 19:37:11 -07:00
Enno Rehling 482a39db6d prevent buildings in regions that should not have any (simple hack) 2010-09-11 19:30:00 -07:00
Enno Rehling f934772a66 cleaning up a little, no change to logic 2010-09-02 23:29:33 -07:00
Enno Rehling db8f2f7d0c do not damage ships with no owner while still in production 2010-09-02 23:25:25 -07:00
Enno Rehling bf5bccc133 add an option to disable anonymous armies in combat 2010-08-28 23:05:45 -07:00
Enno Rehling e53c1dc07b bind settings and unit-reporting 2010-08-28 17:52:33 -07:00
Enno Rehling e3c2ac1ec6 http://bugs.eressea.de/view.php?id=1796 
great bows should be allowed for all, not just elves
 2010-08-17 23:24:51 -07:00
Enno Rehling 366035510c fixing building renaming 
http://bugs.eressea.de/view.php?id=1798
foreign/owned was swapped
 2010-08-17 22:32:36 -07:00
Enno Rehling 6a5a731262 log an error instead of asserting on spell components 2010-08-16 23:08:42 -07:00
Enno Rehling 68f04e66d1 VS 2008 fixes fixed to build Release 2010-08-14 19:41:18 -07:00
Enno Rehling 8554cbf48b VC 2008 project files for building on my netbook 2010-08-14 16:49:13 -07:00
Enno Rehling 3d5f7a92b8 http://bugs.eressea.de/view.php?id=1788 
renaming buildings should finally work again.
 2010-08-10 23:33:38 -07:00
Enno Rehling beec74e0c6 Clearing every mage's spell-list before each turn is counter-productive. It destroys tests, and it doesn't let us have special spells added per-unit. 2010-08-08 23:39:21 -07:00
Enno Rehling 240aae8c58 bugfix, test crash 2010-08-08 12:04:08 +02:00
Enno Rehling a5e712580f undo more CRLF screwups. 2010-08-08 01:14:01 -07:00
Enno Rehling 14b3ed309f use external folder for all libraries (VS2010) 
new repository structure
 2010-08-07 23:05:54 -07:00
Enno Rehling 72505ab8f3 moving to a new repository layout. 
step 1: shared folder.
 2010-08-07 22:07:17 -07:00