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

330 Commits

Author SHA1 Message Date
Enno Rehling 1b038a7eaf delete wisps, or any other border that can be read but not written 2012-05-21 17:46:32 -07:00
Enno Rehling a45eb53191 findskill uses critbits now 
killing old PTRIES code
 2012-05-21 17:45:54 -07:00
Enno Rehling ad59fe96b0 buffer size was too small for some special items 2012-05-21 15:47:18 -07:00
Enno Rehling 1e9c10fbe2 finditemtype works as tested. 
starting to think about removing default_locale in lieu of a hierarchical system.
 2012-05-21 13:18:05 -07:00
Enno Rehling 5ab1b2881a This patches the failure of the test, but it is slow as heck. 2012-05-20 23:06:12 -07:00
Enno Rehling 52e323fef8 added a test that fails because of stupid static state in finditemtype 2012-05-20 23:03:16 -07:00
Enno Rehling 08adc91534 gcc 4.6 is a lot more picky about unused variables, so I shall appease it. 2012-05-20 00:16:12 -07:00
Enno Rehling 7dea6457d1 cleaning up GIVE, because there was too much parameter-searching going on here for the normal case of GIVE X N ITEM 2012-05-19 22:47:52 -07:00
Enno Rehling 8af1cad1dc Merge branch 'master' of gitorious.org:eressea/server 2012-05-19 22:13:02 -07:00
Enno Rehling 5c1f011000 Merge branch 'master' of gitorious.org:eressea/server 2012-05-20 06:55:36 +02:00
Enno Rehling c6559414c6 fewer findparam calls are better 2012-05-20 06:54:59 +02:00
Enno Rehling c9902a1d25 move error handling for use_cmd into a single location 2012-05-19 21:01:25 -07:00
Enno Rehling bcb01742ae remove yet another fintoken warning from the logs 2012-05-19 20:00:54 -07:00
Enno Rehling cc9a815eea remove another fintoken warning from the logs 2012-05-19 19:54:14 -07:00
Enno Rehling bcd6991703 testing spells is a lot easier when you can disable fumbles 
all tun_tests tests pass
 2012-05-19 18:50:28 -07:00
Enno Rehling 3fa4a31d14 trying to figure out why some run_tests tests are not working 2012-05-20 03:21:38 +02:00
Enno Rehling a342e846bc improved some tests 
fixed some resource-related things, especially registration
 2012-05-19 17:23:57 -07:00
Enno Rehling a8a8dfbbb6 registering item types is hard. 2012-05-19 16:55:03 -07:00
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 ee2709e021 fix tests 2012-05-19 22:30:57 +02:00
Enno Rehling b57db72396 fix broken tests and clear locales (badly) when clearing global stte 2012-05-19 22:21:24 +02:00
Enno Rehling c8c1d8c27d fix an odd edge-case where there is only a byte left in the destination string, but we're parsing a utf8 character. 2012-05-19 22:13:10 +02:00
Enno Rehling 71f1e35f6d fix an odd edge-case where there is only a byte left in the destination string, but we're parsing a utf8 character. 2012-05-19 13:10: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 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 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 ae31948dc5 fix a crash when wolves are cast with too little force 2012-04-16 06:56:44 +02:00
Enno Rehling 80a907d78f repair units that are toads without a time-limit. 2012-04-07 18:11:58 -07:00
Enno Rehling 63799d823d hack to ignore otherfaction attributes if faction stealth is not allowed. 2012-03-04 19:29:32 -08: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 f7afab976a Merge branch 'master' of gitorious.org:eressea/server 2011-10-28 23:57:30 -07:00
Enno Rehling e6c094922c update to sqllite 3.7.8 2011-10-28 23:53:28 -07:00
Enno Rehling d55d62278e fx an off-by-one memcpy error 2011-08-28 06:51:21 +02:00
Enno Rehling edfa266a32 Fix a crash in turn 733: alps sometimes have weird messages (also, unitmessage is dumb) 2011-08-06 13:56:46 -07: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 17d339b196 http://bugs.eressea.de/view.php?id=1851 spy messages have too many arguments 2011-04-29 21:50:12 -07:00
Enno Rehling 3abcbb4717 eliminated region_list use from wormholes 
fixed a small memory leak
 2011-04-26 21:31:41 -07:00
Enno Rehling f00f537336 eliminated region_list use from get_island_info 2011-04-26 21:25:47 -07:00
Enno Rehling 6798c497f8 eliminated region_list use from get_island 2011-04-26 21:22:30 -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 813d75f820 fixing spy messages (wrong arguments cause crash). 2011-03-19 11:06:03 -07:00
Enno Rehling 36b58cca6e test that fighters get created properly. 
better test initialization code.
 2011-03-15 21:04:38 -07:00
Enno Rehling 8d497e4b50 change the way the market tests are included. 2011-03-15 20:00:54 -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 8fca34e824 SUITE_ADD_TEST is a macro and doesn't want this syntax 2011-03-12 16:58:12 -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 f0039bc58f added spy to spy messages (see #1604) 2011-03-09 21:00:19 +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 5bf42bd8e9 make laws_tests more stand-alone 2011-03-08 21:18:35 -08: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 d65d03db9c fixed oops with __cplusplus 2011-03-09 00:28:37 +01:00
Enno Rehling 54d05f8544 MSVC warns about unreachable code. 2011-03-07 23:46:56 -08: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 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