Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
286 commits 10 branches 0 tags 41 MiB
Commit graph

186 commits

Author SHA1 Message Date
Enno Rehling
671e976ad6 Nobody needs to see empty messages in the CR 2012-05-19 16:54:41 -07:00
Enno Rehling
0fc37c9c59 complain properly when the orders are not readable! 2012-05-19 16:54:19 -07:00
Enno Rehling
b44737387a fix broken tests and clear locales (badly) when clearing global stte 2012-05-19 20:49:47 +02:00
Enno Rehling
7f7c883583 rt_find and it_find use new improved critbit-tree 
critbit update
testing the test suite
 2012-05-19 11:26:46 -07:00
Enno Rehling
f47f83ceca a little bit of test coverage for rt_find 2012-05-19 00:18:23 -07:00
Enno Rehling
504a70a9c6 fix a serious issue where repeated orders were getting lost 2012-05-18 23:57:20 -07:00
Enno Rehling
b95f7ec139 more strictly define what it means to be the owner of the show, and when it is transferred. 
mostly copied from building_owner.
test coverage is a wonderful thing.
 2012-05-18 23:20:38 -07:00
Enno Rehling
0c2531f259 remove UFL_OWNER anywhere but in save.c 2012-05-18 22:34:04 -07:00
Enno Rehling
57fbc7809c more strictly define what it means to be the owner of the building, and when it is transferred. 
test coverage is a winderful thing.
UFL_OWNER is probably entirely useless now, must fix
 2012-05-18 21:26:41 -07:00
Enno Rehling
0616549ea5 new gcc spouts more warnings, fix them. 2012-05-18 19:29:35 -07:00
Enno Rehling
8cd99bf88c fallback for generating building/ship names in tests, when no translations are available 2012-05-18 09:19:46 -07:00
Enno Rehling
ad05ec8c53 fix an assert that was too picky 2012-05-18 02:08:29 +02:00
Enno Rehling
775e8edae1 as much as possible, replace the UFL_OWNER flag with checking the owner the canonical way. 2012-05-17 16:40:50 -07:00
Enno Rehling
95d1203594 repair feedback for not woning anything when trying to destroy. 2012-05-17 15:33:42 -07:00
Enno Rehling
ff33af3c65 ship and building owners encapsulated in accessors 
tests added
 2012-05-17 15:23:15 -07:00
Enno Rehling
7789e0534e implement ship-ownership transfer as a function 
test the reorder_units function
 2012-05-17 12:23:25 -07:00
Enno Rehling
43f5770694 Fix ship-owners when control is given 2012-05-17 10:31:58 -07:00
Enno Rehling
9cbdaea27f More tests for ships. 
ship->owner is now in use, but there's an assert failing in shipspeed() during report writing.
 2012-05-17 01:14:43 -07:00
Enno Rehling
94ca9a1f98 ship->owner not yet ready for primetime 
better tests written
 2012-05-17 00:25:47 -07:00
Enno Rehling
d12fe2dbed begin making shipowner use ship->owner. 
fix a broken test caused by locale_string returning null.
 2012-05-17 00:13:30 -07:00
Enno Rehling
ecbe770fce rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:01 -07:00
Enno Rehling
14d62afb0d rename _log_warn to log_warning and get rid of the cumbersome #define 2012-05-16 15:52:37 -07:00
Enno Rehling
9065334677 eressea-pbem.de no longer exists 
improve default_order generation, save memory.
 2012-05-16 13:07:28 -07:00
Enno Rehling
7b6a719a62 findparam improvements! 
removed findbuildingtype from findparam
separate isparam() function that I can optimize later
 2012-05-16 12:06:44 -07:00
Enno Rehling
02ab10d723 fix const correctness 2012-05-16 18:21:07 +02:00
Enno Rehling
0a6e18f34d Spiking on findparam to use critbit as a findtoken replacement 2012-05-16 09:18:25 -07:00
Enno Rehling
53d35213b6 Merge branch 'master' of gitorious.org:eressea/server 
Clean up all warnings that Visual C++ didn't find

Conflicts:
	shared/src/util/umlaut.c
	shared/src/util/umlaut_test.c
 2012-05-16 09:48:01 +02:00
Enno Rehling
bfad64695c optimize the number of failed findparam calls a little bit 2012-05-16 09:24:12 +02:00
Enno Rehling
b0959398d8 log library refactoring, first steps 2012-05-16 07:21:59 +02:00
Enno Rehling
116a1ee8ba remove tnode from anywhere, and use a void* instead, in preparation for a new findtoken implementation. this needs to have a good testing. 
lots of warning fixes for high warning levels in visual studio also
 2012-05-15 15:04:23 -07:00
Enno Rehling
53b9de957c putting the crit-bit tree to use. finding special region resources is faster this way than doing individual strcmp calls. 2012-05-14 16:36:17 -07:00
Enno Rehling
53bc4eee11 remove viewrange, because it's not used very much (was used for one quest only) 
add my crit-bit implementation. to be used soon.
 2012-05-14 14:16:02 -07:00
Enno Rehling
cf6a52bde7 log an error for missing resources 2012-05-12 15:51:28 -07:00
Enno Rehling
08fc39cca7 deal with invalid border types (wisps are getting deleted from Eressea) and disabled spells (again, wisps). 2012-05-12 13:16:07 -07:00
Enno Rehling
88acf39638 spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:22:54 -07:00
Enno Rehling
12c03644c4 u_hasspell only needs a mage, not a unit 2012-05-09 20:30:26 -07:00
Enno Rehling
882ac9e8e9 pick the correct target region for spells cast by familiars. 2012-05-09 20:23:00 -07:00
Enno Rehling
ee7a35f293 new_castorder is history 2012-05-09 18:42:20 -07:00
Enno Rehling
67ef4c52a3 combat spell functions have the same interface as spells now. 2012-05-09 18:28:33 -07:00
Enno Rehling
06e0d2b3b6 cleaning up castorder, unifying access to target region and caster. 2012-05-09 14:16:41 -07:00
Enno Rehling
02559f6869 refactoring castorder, because it's a bit of a mess of units, fighters, familliars and casters. 2012-05-09 13:46:10 -07:00
Enno Rehling
6dcf6669c3 get_spellfromtoken takes a mage 
clarify this code with regards to mages casting through a familiar
 2012-05-09 13:18:02 -07:00
Enno Rehling
c10e2552ad get_spellfromtoken needs a mage, not any unit. 2012-05-09 13:06:16 -07:00
Enno Rehling
c41d185cd6 some cleanup 2012-05-09 13:02:08 -07:00
Enno Rehling
c22f49ec36 replace spellid_t with unsigned int 
fix finding spells by token
make magic_t an enum
 2012-05-09 03:14:54 -07:00
Enno Rehling
80a907d78f repair units that are toads without a time-limit. 2012-04-07 18:11:58 -07:00
Enno Rehling
52013f0e7c faction stealth is only selectively enabled in E3 2012-03-04 19:21:00 -08:00
Enno Rehling
9640ac19b3 dragon names always contained 2 spaces after the article 
http://bugs.eressea.de/view.php?id=1884
 2012-03-04 16:42:19 -08:00
Enno Rehling
d55d62278e fx an off-by-one memcpy error 2011-08-28 06:51:21 +02:00
Enno Rehling
21b8ab2d31 be nice to your friends, but not your enemies 2011-06-05 12:21:49 -07:00
Enno Rehling
cc870c076c http://bugs.eressea.de/view.php?id=1855 
fixing delayed-action potions.
 2011-06-04 11:19:44 -07:00
Enno Rehling
bc48f3c29e Merge branch 'master' of gitorious.org:eressea/server 2011-06-04 18:37:27 +02:00
Enno Rehling
2aa3acf56a do not crash when terraforming land regions with road in them (oceans cannot have roads) 2011-06-04 18:37:02 +02:00
Enno Rehling
d4310b1b51 bad magic resistance zone implemented. 
this fixes http://bugs.eressea.de/view.php?id=1854
 2011-05-15 15:01:09 -07:00
Enno Rehling
58208e0db5 Improve sailing messages to include the region. 
http://bugs.eressea.de/view.php?id=1729
 2011-05-02 23:34:35 -07:00
Enno Rehling
a2816f1528 fix_familiars had a bug caused by quicklist 2011-05-02 23:27:39 -07:00
Enno Rehling
817f396467 http://bugs.eressea.de/view.php?id=1844 
Only use potions that we have the resources for.
 2011-04-29 22:49:29 -07:00
Enno Rehling
c4cc06a80f get_regions_distance converted to quicklist 2011-04-25 22:30:54 -07:00
Enno Rehling
dbd338c284 eliminate region_list usage from the monster pathfinder 2011-04-25 22:20:01 -07:00
Enno Rehling
9802eecd79 code prettyfication 2011-04-24 16:18:01 -07:00
Enno Rehling
ec9e7bf833 new lighthouse behavior as described in http://bugs.eressea.de/view.php?id=1847 2011-04-24 12:19:34 -07:00
Enno Rehling
28a1e8d3cc E3 rule for dwarf castles should not be default. 2011-04-24 11:42:19 -07:00
Enno Rehling
e7ab2b46ad do not assert on rich units, warn instead 2011-03-27 21:05:22 +02:00
Enno Rehling
36b58cca6e test that fighters get created properly. 
better test initialization code.
 2011-03-15 21:04:38 -07:00
Enno Rehling
3493c651f7 test that attackers do not get a building bonus 2011-03-12 17:54:57 -08:00
Enno Rehling
89b3b3161f Add a test for the effect of buildings in battles, and a file to test pieces of the combat code from C in the future. 
Add some testing support for terrains and buildings.
 2011-03-12 17:01:20 -08:00
Enno Rehling
31edf06d05 just a bit of typecasting 2011-03-12 17:00:16 -08:00
Enno Rehling
5afb83c193 Let tests clean up after/before themselves, so terrains can be created by each. 2011-03-12 16:59:32 -08:00
Enno Rehling
315066309a create races with a minimum of hitpoints so tests don't break. 2011-03-12 16:58:45 -08:00
Enno Rehling
3d98275d58 we never checked if building maintenance was paid (see also #1740) 2011-03-09 21:00:29 +01:00
Enno Rehling
2c02c38803 insects trying to land in glaciers should not damage ships (cf. #1729) 2011-03-09 21:00:26 +01:00
Enno Rehling
cf4e081179 nobody ever profited from castle bonuses 2011-03-09 14:49:50 +01:00
Enno Rehling
ff51fe6493 added meropis buildings 
also fixed a bug that prevented tests with ATTACKs to be executed properly (NewbieImmunity)
 2011-03-09 14:49:43 +01:00
Enno Rehling
fa69da6de2 added missing move_test.c 2011-03-09 11:01:40 +01:00
Enno Rehling
e01c6bb8b1 make merge request sing with Eressea 
added a missing file (move_test.c)
changing the way tests are included
making some lua code prettier (too many parens)
 2011-03-08 21:06:38 -08:00
Enno Rehling
8714957a61 fixed two bugs: harbours were not unique and multiple instances of unique buildings could still be built 2011-03-09 00:28:37 +01:00
Enno Rehling
b4c5607747 compiling with -pedantic on linux 2011-03-08 08:44:20 +01:00
Enno Rehling
04b3d7ff45 use enums, fix typecasts 2011-03-07 22:31:06 -08:00
Enno Rehling
496aa22e65 fixes for -ansi -pedantic 2011-03-07 17:29:19 +01:00
Enno Rehling
9c8779b303 indentation rules, slightly updated 2011-03-07 08:24:52 +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
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
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
b40f3d19b0 Store fighters in a quicklist, not a cvector. 2011-02-27 12:04:49 -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