Commit Graph

4407 Commits

Author SHA1 Message Date
Enno Rehling 27e435850e indentation rules, strictly applied 2011-03-07 08:02:35 +01: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 763d134b9f Make all tests for Eressea pass again, using the config module. 2011-03-06 21:49:01 -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 e8910e5a72 Merge commit 'refs/merge-requests/2' of git://gitorious.org/eressea/server into merge-requests/2 2011-03-06 19:14:45 -08:00
Enno 6286c3212d more copyable Makefile 2011-03-06 21:01:30 +01:00
Enno Rehling 75998e0949 Makefile so it's easier to one-step build this 2011-03-06 17:41:14 +01:00
Enno Rehling d672510f06 two little remarks 2011-03-06 12:43:39 +01:00
Enno Rehling a1af328950 added Atlantis ship types 2011-03-06 12:43:18 +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 8c42643528 added Atlantis ship types 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 b7c323f0c9 whitepsace change to test buildbot 2011-03-05 04:56:59 +01:00
Enno 8e650ce4e9 an equals operator on these would be neat 2011-03-05 04:49:08 +01:00
Enno d58d90b853 sometimes we need a Makefile to be happy 2011-03-05 04:17:02 +01:00
Enno Rehling 02921d0148 removed all unused items 2011-03-04 20:44:30 +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 71988d9912 remove cvector.[hc] completely 2011-02-27 20:53:19 -08: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 7d4205a3d1 Fix carts in E3.
Store fighters in a quicklist, not a cvector.
2011-02-27 12:04:29 -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 1898dbe13a We have put the spoils code into the open source parts of the code. 2011-02-27 00:37:08 -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 59f3ebef68 fix some tests 2011-02-27 08:51:17 +01:00
Enno Rehling cf9bf54a95 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 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 c810b72845 Some test requires that a cart exists.
Meropis gets its own list of items.
2011-02-26 22:57:42 -08:00
Enno Rehling 611fe8e2a1 adding a os module for os-specific functions (mkdir in this case). 2011-02-26 22:56:14 -08:00