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

315 Commits

Author SHA1 Message Date
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 e501ed5bbd test that we are the owner of the building first. 2012-05-18 21:46:41 -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 ff5dc2534e rename _log_debug to log_debug and get rid of the cumbersome #define 2012-05-16 16:56:07 -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 21a49b1660 log_rotate function to fight the increasingly huge logfiles 2012-05-16 09:11:49 +02:00
Enno Rehling b0959398d8 log library refactoring, first steps 2012-05-16 07:21:59 +02:00
Enno Rehling 64f1ceecf5 logging has a debug/info option now 
fixed a bug in the umluaut_test, was not initializing the tnode.
 2012-05-16 01:56:25 +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 77110158f9 find_function is one of our more frequently called functions, and it can probably do with a little more performance. Let's see if this helps. 2012-05-15 00:19:25 -07:00
Enno Rehling 2d2f566634 A function to transliterate German special characters, for future use. 2012-05-15 00:06:27 -07:00
Enno Rehling f8cadfebee test suite for the crazy stuff that umlaut.c does. 2012-05-14 20:08:11 -07:00
Enno Rehling 2638f42eca putting the crit-bit tree to use. findingfunctions is faster this way than that hand-rolled list 2012-05-14 17:02:15 -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 3a8f682bea remove now-obsolete function 2012-05-14 14:16:56 -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 e272a00994 add test for that weird function-lookup module before I refactor it. 2012-05-14 13:09:57 -07:00
Enno Rehling 8636762e73 Add the missing ring of regeneration, even if it doesn't do anything (yet) 2012-05-12 15:55:48 -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