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

1003 Commits

Author SHA1 Message Date
Enno Rehling 30f5fbd4ca work around gcc being nervous when static functions are unused. 2015-02-08 13:42:04 +01:00
Enno Rehling 39806eaef5 disable broken test_luck_message for now. 2015-02-08 13:37:44 +01:00
Enno Rehling a2e071d35b Fix broken syntax in message about effects on units. 
Add some missing descriptions.
Bump version number.
 2015-02-08 13:09:04 +01:00
Enno Rehling d7804b3556 Merge branch 'hotfix-3.4.1' of https://github.com/badgerman/eressea into badgerman-hotfix-3.4.1 
Conflicts:
	src/buildno.h
	src/tests.c
 2015-02-08 10:50:31 +01:00
Enno Rehling 954a649d3f version number bump 2015-02-08 10:41:05 +01:00
Enno Rehling f9bced467d fix a crash in rename_cmd 2015-02-08 10:33:45 +01:00
Enno Rehling 84da00f62d increase version number for develop branch 2015-02-06 01:42:12 +01:00
Enno Rehling 6953ad4403 Merge branch 'develop' of github.com:eressea/server 2015-02-06 01:40:51 +01:00
Enno Rehling fecbac86bc update version number, make preview script use the correct branch 2015-02-06 01:40:03 +01:00
Enno Rehling e0cb2c9332 add a test for json configuration leaving the ship alone if it has no data. 2015-02-03 17:13:30 +01:00
Enno Rehling 605711c13a constructor st_get_or_create sets ship_type to default values 
xmlreader does not mess with values already set.
 2015-02-03 17:10:29 +01:00
Steffen Mecke d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling faf61ae4d2 Merge branch 'stork_fix' of https://github.com/stm2/server into stm2-stork_fix 2015-02-02 20:20:44 +01:00
Enno Rehling a4e6f4874c building type construction is in bt_get_or_create, and only there. 
+ not in jsonconf
+ not in xmlreader (no test for this)
 2015-02-02 19:52:24 +01:00
Enno Rehling 0955dd7f05 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2015-02-02 18:49:00 +01:00
Steffen Mecke 5ff0596517 fix stork message (mantis 2027), add tests 2015-02-01 19:14:06 +01:00
Enno Rehling 136230f51b Merge pull request #124 from badgerman/master 
add a configuration switch to disable force_leave (bug 2059) for now.
 2015-02-01 13:01:04 +01:00
Enno Rehling 01b46b143b add a configuration switch to disable force_leave (bug 2059) for now. 2015-02-01 12:57:54 +01:00
Enno Rehling 89598dd987 Merge pull request #110 from stm2/bug1973 
cr_report should also check if region messages can be heard (bug #1973)
 2015-02-01 12:28:17 +01:00
Enno Rehling 9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling 03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling 3fc434e1b9 bug 2072: make peasant growth not spam messages. 2015-02-01 10:27:00 +01:00
Enno Rehling da9c33268c fix preview crash in embassies.lua. 
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
 2015-02-01 10:03:30 +01:00
Enno Rehling 5e0c934c6f indentation fixes for this new file 2015-01-30 22:30:11 +01:00
Enno Rehling 02f92f7932 Merge branch 'stm2-peasantgrowth_acceleration' 2015-01-30 22:25:21 +01:00
Enno Rehling df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Enno Rehling c54cbfd472 fix copyright notice 2015-01-30 22:10:29 +01:00
Enno Rehling a97a7bbf1d Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/kernel/item.test.c
 2015-01-30 20:44:42 +01:00
Steffen Mecke 5e4ea5a145 fixed formatting errors 2015-01-30 20:43:40 +01:00
Enno Rehling abca25d1d5 fix indentation in every file 
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
 2015-01-30 20:37:14 +01:00
Steffen Mecke a97b211e70 bit of testing, code improvements, formatting 2015-01-30 18:25:56 +01:00
Steffen Mecke 4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Enno Rehling 633a356928 Merge pull request #117 from stm2/mallorncursemessage 
mallorn spell used wrong error message
 2015-01-29 21:58:43 +01:00
Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling c7b28e7b39 disable ORIGIN at the source, prevent gcc warnings. 2015-01-29 16:46:03 +01:00
Enno Rehling 2260a19d50 disable ORIGIN command because of E4 crash 2015-01-26 07:24:18 +01:00
Enno Rehling 7bfb14b4e6 Resolve naming confusion, rename object and bind_hashtable. 
They implement a dict-style thing, so let's call it that.
 2015-01-17 13:34:48 +01:00
Enno Rehling dadf7734a5 set defaults in the race constructor, add test. 2015-01-15 17:17:58 +01:00
Enno Rehling 9f542e081b fix last commit, broke the gcc travis build. 2015-01-15 17:17:32 +01:00
Enno Rehling 490782e750 add some simple tests for messages, prior to any refactorings. 2015-01-15 16:40:19 +01:00
Steffen Mecke 531ab0e7a2 add configuration parameters for peasant growth and peasant luck effect 2015-01-15 13:34:50 +01:00
Steffen Mecke ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Steffen Mecke 863901d482 putting faster version into effect and removing pseudo-test 2015-01-15 02:53:15 +01:00
Steffen Mecke 51d52aaf7f implementing a much faster version of peasant growth calculation 2015-01-15 02:53:15 +01:00
Enno Rehling 6fb23af66a test that ships are encumbered by money. define money in XML, not just in code. 2015-01-14 17:56:12 +01:00
Steffen Mecke 3433ffd1bc cr_report should also check if region messages can be heard (bug #1973) 2015-01-14 16:24:22 +01:00
Steffen Mecke 039ee159cb a bunch of messages in the NR where not localized 2015-01-14 16:17:21 +01:00
Enno Rehling 468882f974 test that money has weight, add weight in init_resources (TODO: use the config files). 2015-01-14 07:46:42 +01:00
Steffen Mecke dff34f8e92 increase speed of peasant growth calculation 2015-01-14 01:55:04 +01:00
Steffen Mecke e6538439fb mallorn spell used wrong error message 2015-01-14 01:54:55 +01:00
Enno Rehling 73e1632dee Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 
Conflicts:
	src/laws.c
	src/laws.test.c
 2015-01-13 07:48:46 +01:00
Enno Rehling 4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
Enno Rehling f52e00d574 do not eject units from a ship when on the ocean. 2015-01-13 07:32:24 +01:00
Enno Rehling 698aa5e99a Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-13 07:32:23 +01:00
Enno Rehling 838cf3d938 try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
Enno Rehling 2ddd5d242a Merge branch 'master' of github.com:badgerman/eressea 2015-01-12 20:25:09 +01:00
Enno Rehling 2aac2daf56 fix the castle bonus PR so it can pass gcc. 2015-01-12 20:23:25 +01:00
Enno Rehling e897b667f6 Merge branch 'Burgen_Bonus_configurierbar' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-Burgen_Bonus_configurierbar 2015-01-12 20:10:34 +01:00
Enno Rehling 34e7373be4 fix the CI build (struct declared inside parameter list). 2015-01-12 18:31:04 +01:00
Enno Rehling e8650b5b4a test good and bad dreams, fix magicstreet test. 2015-01-12 18:22:59 +01:00
Steffen Mecke 27da082cc6 corrected good dreams message 2015-01-12 18:22:00 +01:00
Steffen Mecke fdac137c0c magic path warning was wrong way round 2015-01-12 18:21:41 +01:00
Enno Rehling 6159311e70 Merge pull request #104 from badgerman/tests-magicpath 
Tests for magicpath (currently failing)
 2015-01-12 18:02:51 +01:00
Enno Rehling 0bd1a8d6f4 add a utility function to test for message types. 2015-01-12 17:50:10 +01:00
CTD d403afc7fc Einfacher Test 
Plus Bugfix für Gebäude ohne Improvement, damit diese auch die gleiche
Funktionalität aus der XML nutzen können.
 2015-01-12 16:57:05 +01:00
CTD 34fc1b3d34 Variablen leserlicher gemacht 2015-01-12 10:55:07 +01:00
Enno Rehling 798b3d6ad6 Implement tests for magicpath. They are failing (Bug 2066). 
Also move spell and race initialization code from being server-only into game_init, where tests can use it.
 2015-01-12 08:18:41 +01:00
Enno Rehling e937749475 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
	src/kernel/faction.c
 2015-01-11 01:25:10 +01:00
Enno Rehling 95d0b2a413 add current version of processing scripts 
fix a crash in checkpasswd
 2015-01-11 01:23:47 +01:00
Enno Rehling 4b6d65fb16 separate the game into a static library shared by server and tests. 2015-01-10 17:27:18 +01:00
Enno Rehling 3d4fefcf7c Some additional TODO comments for things I want to tackle eventually. #comment-only 2015-01-10 17:05:10 +01:00
Enno Rehling 60e2e23414 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/cron/previews.sh
 2015-01-09 20:50:43 +01:00
Enno Rehling ba71728a64 preview build script checks for a branch to build from (in build/.preview) 
fix int to bool conversions
 2015-01-09 20:42:17 +01:00
Enno Rehling 29fc0fe6c3 preview build script checks for a branch to build from (in build/.preview) 
fix int to bool conversions
 2015-01-09 20:41:48 +01:00
CTD 5b82e7709d Beim Aufräumen was vergessen. 2015-01-09 16:00:11 +01:00
CTD ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling 23b8f2bc8a call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 
also, these int to bool conversion warnings made a good point, even if I could not reproduce them.
 2015-01-08 20:55:29 +01:00
Enno Rehling d968aa2ed5 do not eject units from a ship when on the ocean. 2015-01-05 22:09:08 +01:00
Enno Rehling 73da256461 Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-05 18:14:55 +01:00
Enno Rehling 04bbec2b89 turns out that set_param with null should remove the setting. 2015-01-04 16:41:59 +01:00
Enno Rehling 3db403d7fd functional test for GROW/BREED horses (Bug 1886) 2015-01-04 15:42:36 +01:00
Enno Rehling 90dd700487 BREED/PLANT/GROW are technically the same command, merge them. 
The new parser makes this easy.
 2015-01-04 15:11:49 +01:00
Enno Rehling 4ed469c126 do not try setting luxury demand on oceans. 
add some old E3 tests, disable those that have rotted.
 2015-01-01 10:12:03 +01:00
Enno Rehling b713f650e6 Merge branch 'master' of github.com:badgerman/eressea 2014-12-31 21:14:43 +01:00
Enno Rehling b29a99f9ce memory leak in special_directions. 2014-12-31 21:14:21 +01:00
Enno Rehling f1c6d35fdf unused variable, gcc complains 2014-12-31 21:08:59 +01:00
Enno Rehling 9453aff7f5 fix running game-specific tests for E3, add them to the test suite. 2014-12-31 21:07:42 +01:00
Enno Rehling db083389c7 avoid fix_demand hitting an endless loop, kill bad use of static variables. 2014-12-31 20:01:01 +01:00
Enno Rehling 5e10bc4093 wait, no. tests did not pass when that change was made (for good reason, I assume). 2014-12-31 13:19:44 +01:00
Enno Rehling f524f23cd4 superfluous semicolons and other small stuff. 
missing strings are an error, not a warning.
 2014-12-31 13:17:54 +01:00
Enno Rehling e8ad542430 more thorough cleanup of tokens. 2014-12-31 01:50:54 +01:00
Enno Rehling 3b5653b353 all good tests cleanup after themselves. 2014-12-31 01:40:46 +01:00
Enno Rehling 6abe180f68 free spellbooks correctly. 2014-12-31 01:38:49 +01:00
Enno Rehling e9c3a00f7d it sucks that get_translations sometimes returns tokens, and sometimes critbit_trees. How is anyone supposed to free that correctly? 2014-12-31 01:29:10 +01:00
Enno Rehling 2fbb04140c at_deprecated was causing a small memory leak. 2014-12-31 01:17:49 +01:00
Enno Rehling c39be8d599 more casual leak removal. 2014-12-31 01:00:10 +01:00
Enno Rehling 80be0a8e89 I broke the Lua tests, must initialize resources in eressea.free_game binding 2014-12-31 00:20:19 +01:00
Enno Rehling e04a541167 do not initialize resources in test_cleanup, that makes no sense. 2014-12-31 00:16:24 +01:00
Enno Rehling 0566dca971 Merge branch 'master' of github.com:badgerman/eressea 2014-12-30 23:50:01 +01:00
Enno Rehling 228983202d properly free items at cleanup. 2014-12-30 23:49:50 +01:00
Enno Rehling 9f09b9b915 fixed memory leaks in tests, thanks to valgrind 2014-12-30 23:34:24 +01:00
Enno Rehling a55cb13924 make valgrind happy when running tests (cleanup) 2014-12-30 02:02:10 +01:00
Enno Rehling 49a77cdcde plug some more memory leaks. 2014-12-30 01:44:28 +01:00
Enno Rehling 89ce04a6c3 this obviously cannot be const, then. fix the build. 2014-12-30 00:02:27 +01:00
Enno Rehling 077a0aeeef plug some new memory leaks 2014-12-30 00:00:57 +01:00
Enno Rehling 95ab2826ec avoid running over the array of locales in order.c when re-creating locales for tests. 2014-12-29 23:53:00 +01:00
Enno Rehling 43351e03cd parsing needs to return a static buffer if it has no argument 2014-12-29 07:44:00 +01:00
Enno Rehling 335f37a9ec clarify some parsing code that valgrind complains about. 2014-12-28 22:07:53 +01:00
Enno Rehling 975b930f44 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-12-27 23:57:16 +01:00
Enno Rehling df3ce116a7 limit eternath gates to 1-person units, avoid crash 2014-12-27 23:51:48 +01:00
Enno Rehling f1008fa231 fix floating point exception. 2014-12-26 01:41:19 +01:00
Enno Rehling 108a909131 kill gc_add and gc_done, they were terrible ideas. 2014-12-25 22:38:01 +01:00
Enno Rehling 4e94a95835 remove dead code, move weight(unit) to unit.c 2014-12-25 19:40:40 +01:00
Enno Rehling 901c70efd9 config cleanup contd. 
createunit => create_unit, everywhere.
make_undead_unit in zombies.c
 2014-12-25 18:40:46 +01:00
Enno Rehling 4bb65873da shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
Enno Rehling 4f962ae999 remove dead code 2014-12-25 00:45:52 +01:00
Enno Rehling 000bdebc82 Merge remote-tracking branch 'eressea/master' 2014-12-24 23:50:55 +01:00
Enno Rehling 3e4973db25 kill the unused EnhancedQuit feature, reducing the potential use of at_object by one more situation. 2014-12-24 16:33:21 +01:00
Enno Rehling ea035ac154 convert float values in at_object to integer where it makes sense. 
this feature is only used for the embassy_muschel turn, and I am tempted to kill it entirely.
 2014-12-24 16:21:01 +01:00
Enno Rehling 67881dfff4 parsing tokens when buffer is too small - skip the entire token. now with tests. 2014-12-24 15:55:55 +01:00
CTD 78c03f831b Zerstöre als langer Befehl 
Zerstöre ist damit ein ganz normaler langer Befehl wie Mache oder Lerne.
 2014-12-23 15:53:28 +01:00
Enno Rehling b27491eccd move atoip out of config (small helper) and test it. 
remove some unnecessary variables from laws.c
 2014-12-23 09:23:37 +01:00
Enno Rehling 5ebf05f625 additional tests for the parser. 
move more parsing code out of config.c
 2014-12-22 16:45:56 +01:00
Enno Rehling c8b9044f78 rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
Enno Rehling 870d8001ef more getstrtoken() removal. 
remove obsolete argument to checkpasswd().
 2014-12-22 14:34:14 +01:00
Enno Rehling 5cdc85f6bf start to get rid of getstrtoken(), which uses an internal static buffer and causes horrible bugs when called multiple times. 2014-12-22 14:21:24 +01:00
Enno Rehling 4097e43ce6 DESCRIBE would crash if not given a description. 
Added a test for DESCRIBE UNIT.
 2014-12-20 22:18:38 +01:00
Enno Rehling 4018aa2dfe Merge remote-tracking branch 'eressea/master' 2014-12-20 21:37:14 +01:00
Enno Rehling f6f193ab76 Monsters should LOOT if the rules don't allow TAX. 2014-12-20 21:37:06 +01:00
Enno Rehling d67ecdb8cf Merge pull request #64 from CTD1/Bauern 
Bauern in leeren Regionen
 2014-12-19 20:08:42 +01:00
Enno Rehling b3bec13051 report the unit limit in NR and CR. 
this implements https://bugs.eressea.de/view.php?id=2055
 2014-12-19 19:57:24 +01:00
Enno Rehling 2966e1ea3d remove igetstrtoken, a confusing helper function that was hardly used at all. 2014-12-18 17:47:49 +01:00
Enno Rehling da1d3c49c3 ongoing config.c cleanup: getid() 2014-12-18 07:09:22 +01:00
Enno Rehling 484e52d491 added a test: region owners can set PAY NOT <id> for empty buildings if they are in region_owner_pay_building. 2014-12-17 21:31:02 +01:00
Enno Rehling d7899a392a Merge pull request #81 from CTD1/BEZAHLE_NICHT_ID 
BEZAHLE NICHT ID
 2014-12-17 20:18:08 +01:00
Enno Rehling 83f014047b Merge pull request #83 from badgerman/master 
cleaning up in config.c and adding tests for pay_cmd
 2014-12-17 20:17:20 +01:00
Enno Rehling bd6b9761b0 add simple tests for pay_cmd. 2014-12-17 20:00:55 +01:00
Enno Rehling 916271ef3a gcc/clang want structs to be defined before used in an argument list 2014-12-17 18:47:01 +01:00
Enno Rehling bc8f8c74f9 gcc/clang want structs to be defined before used in an argument list 2014-12-17 17:46:21 +01:00
Enno Rehling 1050daac19 remove strlist from config.c, move it to reports.c (where it is used primarily). 
this is not the best data structure there is, should replace it some day.
 2014-12-17 17:40:36 +01:00
Enno Rehling 2759114414 remove unused header for an attribute that I do not even remember. 2014-12-17 17:35:10 +01:00
Enno Rehling 2a3fdab394 remove the obsolete at_gm attribute. 
The code did almost nothing, and player-operated quests are no longer something I want to do.
 2014-12-17 17:32:32 +01:00
CTD aa536a943d BEZAHLE NICHT ID 
Man kann jetzt eine Gebäudenummer hinter Bezahle nicht angeben.
Wenn man keine angibt bleibt alles wie es war, sonst wird überprüft ob
man der Besitzer dieses Gebäudes ist, und wenn ja wird für diese Gebäude
der Unterhalt abgeschaltet. Wenn für ein Gebäude die Option das der
Regionsbesitzer  es Bezahlen kann an ist (und es leer ist) ist der
Regionsbesitzer auch automatisch Gebäudebesitzer.
Wenn man ein BEZAHLE NICHT für die Burg des Regionsbesitzers (E2 die
größte Burg) absetzt (implizit oder explizit) werden alle Gebäude in der
Region abgeschaltet, die vom Regionsbesitzer verwaltet werden.
 2014-12-17 17:22:26 +01:00
Enno Rehling 8971f59ecc move more things out of config.c. 
- lighthouses into their own module.
- lastregion/firstregion into reports.c.
 2014-12-17 17:22:26 +01:00
Enno Rehling fb0eb4dce6 refactoring: moving plagues out of config.c 
cleaning up the code, moving chance into the random event code, it is not used by the plague spell (reduce signature by one argument)
 2014-12-16 14:18:29 +01:00
CTD cc09e95887 Bauerngrenze angepasst 
Maximum Bauerngrenze bei der noch zusätzlich Bauern hinzukommen können
auf 90 erhöht und auch gleich Konfigurierbar gemacht.
Das sollte immer noch zu wenig sein um ernsthaft missbrauch damit zu
betreiben.
 2014-12-15 13:07:39 +01:00
CTD 7f39763ee1 Konfigurierbar 
Ich habe zumindest mal fix eine eigene Funktion draus gemacht und es mit
einer XML Option versehen. Es ist Default an, da auch in E3 die Bauern
rückläufig sind, und da E4 auf den selben Regeln aufbaut es auch da
sinnvoll wäre "tote" Regionen wiederzubeleben.
 2014-12-15 09:48:43 +01:00
Enno Rehling d6ce30a9a9 Merge pull request #78 from badgerman/bug-2052 
bugfix: could not GIVE to TEMP units.
 2014-12-14 16:31:48 +01:00
Enno Rehling 2a113bcd04 Merge pull request #79 from badgerman/bug-2054 
Bug 2054: monsters trying to STUDY when they cannot.
 2014-12-14 16:29:56 +01:00
Enno Rehling c5774e652a also prevent monsters from studying unarmed combat if they cannot learn things. 
refactor the unit_can_study functionality into a separate function, we are now using it in multiple places.
 2014-12-14 16:17:01 +01:00
Enno Rehling 595dc35fb0 bugfix: monster races that cannot learn skills, will not try to study. 
This fixes https://bugs.eressea.de/view.php?id=2054
 2014-12-14 15:59:20 +01:00
Enno Rehling 684f779501 Merge pull request #77 from badgerman/bug-1660 
Bug 1660
 2014-12-14 15:43:15 +01:00
Enno Rehling 0645578305 bugfix: could not GIVE to TEMP units. 
https://bugs.eressea.de/view.php?id=2052
 2014-12-14 15:23:28 +01:00
Enno Rehling 42d75c334d WIP: Familiars check for combat spells in the magician's list of spells, too. 
https://bugs.eressea.de/view.php?id=1660
This does not work, because set_combatspell later uses knowsspell to make sure the spell is one the familiar has.
 2014-12-14 12:57:09 +01:00
Enno Rehling b506bed4d9 fix a crash in the parser for USE orders when no item name was given. 2014-12-14 12:56:36 +01:00
Enno Rehling 27b1d55350 enhancement: buildings without an owner report their lack of upkeep to the entire region. 
https://bugs.eressea.de/view.php?id=1713
 2014-12-14 11:48:15 +01:00
Enno Rehling dca9d7e9cb bugfixe give_cmd (cannot give more persons than the unit has). 2014-12-14 06:02:08 +01:00
Enno Rehling 4ac7258f96 Merge remote-tracking branch 'eressea/master' 2014-12-13 23:40:37 +01:00
Enno Rehling 455b3dc90e ignore obsolete "lua" attributes in ancient data files. 
fix a small bug in the mechanism for reading deprecated attrib_types.
 2014-12-13 22:08:57 +01:00
Enno Rehling 968304db96 Merge pull request #72 from badgerman/master 
fix two crashes, and undead heroes
 2014-12-13 20:42:16 +01:00
Enno Rehling 1ae44db7ca Bugfix: Untote Helden bekamen keine Beute. 
https://bugs.eressea.de/view.php?id=1962
 2014-12-13 20:16:25 +01:00
Enno Rehling a3099ed507 Merge pull request #71 from badgerman/module-rename 
Update wormholes to the module naming convention.
 2014-12-13 18:56:02 +01:00
Enno Rehling 3a1e4ab7f5 fix crash when a GIVE order has no arguments. 2014-12-13 18:40:15 +01:00
Enno Rehling f8136530ef fix the loading of chaoscount attributes that I broke in the refactoring. 2014-12-13 17:31:55 +01:00
Enno Rehling 522633a2de Update wormholes to the module naming convention. 
- register = called before game is loaded
- init = called after game is loaded
- update = called after the turn, before reports are written
 2014-12-13 16:43:35 +01:00
Enno Rehling a2c98778fd Merge pull request #69 from badgerman/chaos-module 
Moving the E2 chaos-region code into a separate module
 2014-12-13 15:54:13 +01:00
Enno Rehling 5751a9b3a9 Merge pull request #66 from badgerman/getunit-refactor 
refactoring getunit
 2014-12-13 13:26:32 +01:00
Enno Rehling fcffb3d8e1 Merge pull request #67 from badgerman/version-cleanup 
eliminating support for old datafile versions, prior to binary formats
 2014-12-13 13:26:23 +01:00
Enno Rehling c4b898e968 remove some inactive #define macros and the code that goes with them. 
mostly rules that were experimental, but have made it into common use (not worth the effort of making them configurable).
 2014-12-13 11:53:16 +01:00
Enno Rehling 2da1d11277 move chaos to a separate module (it is an old E2 feature) 2014-12-13 11:44:14 +01:00
Enno Rehling 1c96c626b6 merge failure, try again. 2014-12-13 00:13:08 +01:00
Enno Rehling a8849f2b91 remove the obsolete dungeons module. 
I don't think this has ever been used, and it has fallen victim to entropy since it was first written. good riddance!
 2014-12-13 00:03:24 +01:00
Enno Rehling 0967ccaac6 remove even more obsolete datafile version support. 2014-12-12 23:00:30 +01:00
Enno Rehling d492487a5b remove support for versions prior to turn 572 (INTPAK_VERSION). 
reading anything prior stopped working some time ago, let's not kid ourselves.
nobody needs to read those datafiles, they are more than 7 years old.
less code is better.
if access to these files is needed, check out an old version from source control.
 2014-12-12 22:52:23 +01:00
Enno Rehling 63f69ec1cf add the test coverage for getunit. 
fix a bug where NULL was not returned when unit is in the wrong region.
 2014-12-12 21:55:44 +01:00
Enno Rehling 98994f233d remove the deprecated getunit function. 
fix the build, missing return value from give_control_cmd.
 2014-12-12 21:06:47 +01:00
Enno Rehling 481275aef1 refactor: eliminate the getunitpeasants global variable. 
bugfix: it was possible to uncover stealth units with GIVE CONTROL.
 2014-12-12 20:53:39 +01:00
Enno Rehling 3d0f8d0101 Merge remote-tracking branch 'eressea/master' 
Conflicts:
	.travis.yml
	critbit
	src/buildno.h
	src/test_eressea.c
 2014-12-12 17:28:20 +01:00
Enno Rehling ab71860224 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
	src/vortex.test.c
 2014-12-12 17:24:00 +01:00
Enno Rehling b4e13b7cbd segmentation fault caused by free'ing battles twice 2014-12-12 17:21:04 +01:00
CTD 1cce4927a0 Bauern in leeren Regionen 
Eine recht einfache Funktion die ein paar zusätzliche Bauern in leeren
Regionen erschafft.
 2014-12-12 15:50:02 +01:00
Enno Rehling 440d78596c Add missing keywords, fix disappearing units. 
https://bugs.eressea.de/view.php?id=2051
. The orders PASSWORT, FAHRE, KÄMPFE were not recognized (new imperative syntax).
. Added backwards compatibility for FIGHT (now COMBAT).

https://bugs.eressea.de/view.php?id=2050
. units were always giving away ALL persons, not the number in their GIVE command.
 2014-12-12 13:32:21 +01:00
Enno Rehling 78f4dfac1d Rewrite the test framwework to report individual suites. 
Stop leaking CuTestSuite objects.
 2014-12-12 12:19:21 +01:00
Enno Rehling 9334677d81 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:32:12 +01:00
Enno Rehling cd70b8684d fix escape_string mmeory corruption error. 
fix a number of small stuff that happens when loading very old data files (like 572).
 2014-12-12 11:28:37 +01:00
Enno Rehling e1d5033b76 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:13:25 +01:00
Enno Rehling d7c2fc2b04 remove the R_UNIT resource. 
https://bugs.eressea.de/view.php?id=1945
assert that only items can be reserved.
 2014-12-11 23:24:00 +01:00
Enno Rehling 20c0dfbb47 fix null-pointer crash (EMAIL order without arguments) 2014-12-11 23:23:11 +01:00
Enno Rehling aa01d9f21a fix clone effect message. 2014-12-11 23:22:35 +01:00
Enno Rehling 2a8a233c8b remove accidental build.h file 2014-12-11 13:04:09 +01:00
Enno Rehling cfc0972912 Merge branch 'version-3-3' 
Conflicts:
	.travis.yml
	src/build.h
 2014-12-11 13:03:31 +01:00
Enno Rehling 1a1ffd06b0 build number update 2014-12-11 11:14:54 +01:00
Enno Rehling f7e9a2df09 build number update, because version 3.3 had a new release. 
really though, build numbers need a different system.
 2014-12-11 11:11:19 +01:00
Enno Rehling 3324ced2b1 Print the full version number in the CR. 2014-12-11 10:06:28 +01:00
Enno Rehling 237f055237 Print the full version number in the CR. 2014-12-11 10:05:50 +01:00
Enno Rehling a16f63fc06 PROMOTE earlier in the turn, after GIVE and before PAY. 
https://bugs.eressea.de/view.php?id=1659
 2014-12-11 09:58:23 +01:00
Enno Rehling ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling 215136465b refactoring: getunitpeasants is an awful global hack, and I am pushing it out of give_men so I can eliminate it more easily. 2014-12-10 23:05:29 +01:00
Enno Rehling f1662077c3 test giving too many and too few units. 
start moving give-to-peasants logic into its own function.
 2014-12-10 22:35:35 +01:00
Enno Rehling 33a5e0aa9d test giving men to other faction. 
refactor give_men to return a message.
major milestone reached: 200 unit tests.
 2014-12-10 21:17:00 +01:00