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

1944 Commits

Author SHA1 Message Date
Steffen Mecke 1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Steffen Mecke 723c3df7b2 test for immigration 2015-12-08 17:57:23 +01:00
Steffen Mecke 703edb676c facility to inject a non-random random generator 
This should be handy for writing tests that make use of randomization.
 2015-12-08 17:57:23 +01:00
Enno Rehling 1a9e3db423 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-12-06 20:51:14 +01:00
Enno Rehling 44024878f9 Merge branch 'master' of github.com:eressea/server 2015-12-06 20:50:06 +01:00
Enno Rehling 9b7d4adda5 https://bugs.eressea.de/view.php?id=2173#c6397 
by request: magic resistance never higher than 90%, so highly skilled monsters cannot become completely invincible to magic.
 2015-12-06 20:48:22 +01:00
Enno Rehling acf3aaad5a release version 3.7.5 2015-12-06 18:44:31 +01:00
Enno Rehling 1075b7ce17 Merge branch 'master' into develop 2015-12-06 18:39:54 +01:00
Enno Rehling d04d8e782e https://bugs.eressea.de/view.php?id=2173 
rewrite the rules for magical damage reduction
 2015-12-06 18:34:31 +01:00
Enno Rehling b854213be6 Merge pull request #429 from ennorehling/develop 
break_curse spell description error message
 2015-12-06 16:53:04 +01:00
Enno Rehling 6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00
Enno Rehling 65902ca97f do not call a function test_* that is not a test (I got confused and broke it when trying to make a change) 2015-12-06 12:02:16 +01:00
Steffen Mecke 864c875316 fix typo: fiery breath was icy 2015-12-05 22:27:03 +01:00
Enno Rehling 435d801239 fix compiation problems after merge 
what is going on with this? why was critbit outdated?
 2015-12-05 18:45:03 +01:00
Enno Rehling 1d57bf527d Merge branch 'master' into develop 
Conflicts:
	src/battle.test.c
	src/buildno.h
 2015-12-05 17:27:04 +01:00
Enno Rehling bf2920d1ae fix warnings on gcc 2015-12-05 17:25:47 +01:00
Enno Rehling 62ee1468b8 https://bugs.eressea.de/view.php?id=2166 
* fix magic resistance calculation in calculate_armor.
* add related tests.
* refactor BF_CANATTACK -> BF_NO_ATTACK because it is easier.
 2015-12-05 17:17:21 +01:00
Enno Rehling 3e048e2a84 Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 
Conflicts:
	scripts/tests/e3/castles.lua
	scripts/tests/e3/rules.lua
 2015-12-03 11:06:55 +01:00
Enno Rehling b3e7fa63e0 Merge pull request #396 from stm2/spell_parameters 
fixed treatment of spell parameters (bug 1867)
 2015-12-03 11:04:57 +01:00
Enno Rehling e91310f576 Merge pull request #422 from ennorehling/feature/issue-418-seaserpent-piracy-crash 
issue #419, eliminate language_struct.h, make the struct module-private
 2015-12-02 11:52:16 +01:00
Steffen Mecke e3d7d23d00 re-enable sea serpent piracy 2015-12-01 22:30:51 +01:00
Steffen Mecke 9c076ba6b9 fix piracy_cmd for swimmers and flyers 2015-12-01 22:13:20 +01:00
Enno Rehling 9b645bf46c issue #419, eliminate language_struct.h, make the struct module-private 2015-12-01 12:24:22 +01:00
Enno Rehling 70354a355b disable piracy for sea serpents, piracy_cmd cannot handle it (issue #418) 2015-12-01 12:22:03 +01:00
Steffen Mecke eae87bc7f1 fix null pointer access, bug2169 2015-11-29 21:06:35 +01:00
Enno Rehling 4b7cb824bd Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload 
Conflicts:
	src/move.c
	src/tests.c
 2015-11-27 12:40:17 +01:00
Enno Rehling 950bf91850 fix merge conflict in PR #397 (config changes) 2015-11-26 18:48:21 +01:00
Enno Rehling 6ad5db8e22 Merge pull request #397 from stm2/taxing_message 
taxing without skill does not fail silently any more
 2015-11-26 18:43:57 +01:00
Enno Rehling 0410581907 Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests 
Conflicts:
	src/move.test.c
	src/study.c
 2015-11-26 18:42:23 +01:00
Steffen Mecke fe49f01bb6 added moa tests for buildingtype_exists 2015-11-25 23:25:59 +01:00
Enno Rehling 6c2f4be4af fix sea serpents using piracy (by re-ordering the decision making process) 2015-11-25 15:29:26 +01:00
Enno Rehling 90b0bdd44e re-enable all monster tests except piracy for seaserpents, which is red. 2015-11-25 14:53:29 +01:00
Enno Rehling 1cf805649e Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/monsters.c
	src/monsters.test.c
 2015-11-25 14:38:26 +01:00
Enno Rehling c85e489f4f Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers 
Conflicts:
	src/kernel/unit.c
	src/laws.test.c
	src/monsters.c
 2015-11-25 14:25:42 +01:00
Enno Rehling b6bb5dee85 fix last merge to work with new config code 2015-11-25 13:27:44 +01:00
Enno Rehling 677f7eac0a Merge branch 'master' into develop 
Conflicts:
	src/move.c
 2015-11-25 13:25:36 +01:00
Enno Rehling 4e4a11d40c Merge remote-tracking branch 'upstream/master' 2015-11-25 12:06:22 +01:00
Enno Rehling f301bec623 addressing comments by solthar on bug 2164, PR #408: storms should still cause damage to ships. 
cleaning up some configuration lookups in sail, moving them outside of loops.
 2015-11-25 12:04:09 +01:00
Enno Rehling f559c263e3 cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
Enno Rehling 8aa7fec54c config.c cleanup: move attribute registration to attributes.c 2015-11-24 19:32:52 +01:00
Enno Rehling 84a943b698 fix gcc build 2015-11-24 19:15:53 +01:00
Enno Rehling 64b84481b2 refactoring: move parsing and allies code out of config.c 2015-11-24 18:52:09 +01:00
Enno Rehling bdc5372537 disable test for seaserpent piracy (planned for 3.8) 2015-11-24 16:12:33 +01:00
Enno Rehling 1b3c8ea466 import monsters tests from PR #404 
Monsters (i.e. sea serpents) can attack on oceans, when not guarding
 2015-11-24 14:57:50 +01:00
Enno Rehling 817d81dbf9 remove the rules.hunger.reduces_skill variable, no game was doing anything other than the default. 2015-11-23 21:05:25 +01:00
Enno Rehling 0a47f0e398 eliminate SkillCap feature, it was stupid and not used by any game, ever 2015-11-23 20:58:51 +01:00
Enno Rehling 2a9dee4134 Merge branch 'master' into develop 
Conflicts:
	src/move.c
 2015-11-23 20:33:47 +01:00
Enno Rehling d45f16982d https://bugs.eressea.de/view.php?id=2164 
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
 2015-11-23 18:41:11 +01:00
Enno Rehling 5b9333f6d9 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
	src/monsters.c
 2015-11-23 17:12:48 +01:00
Enno Rehling 1ed0eaf473 release version 3.7.3 2015-11-23 17:10:49 +01:00
Enno Rehling 0e5fcbbc7c Merge pull request #407 from ennorehling/release-3.7 
bugfixes 2163, 2164 and 2165
 2015-11-23 17:07:11 +01:00
Enno Rehling 4b7b32cbb5 use monster_attack, not explicit create_order, because we need to check buildings, etc. 2015-11-23 17:00:07 +01:00
Enno Rehling defd870cd1 https://bugs.eressea.de/view.php?id=2163 
Fix order of Arguments when checking for defensive building.
Solthar reminds us that good variable names are good.
 2015-11-23 16:48:05 +01:00
Enno Rehling b6a947ca0c https://bugs.eressea.de/view.php?id=2165 
Monster bewachten nicht, wenn sie nicht ausreichend bewaffnet waren, weil der nötige Check nicht in can_start_guarding gemacht wurde, sondern in guard_on_cmd.
 2015-11-23 15:35:26 +01:00
Enno Rehling c7ab0e8f59 fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift). 
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
 2015-11-23 12:37:42 +01:00
Enno Rehling dcfc1d1f15 Merge pull request #406 from ennorehling/critbit-params 
config_get/config_set refactoring, kill cache logic
 2015-11-23 12:25:16 +01:00
Enno Rehling 48c75466b6 kill static caches for floating-point variables 2015-11-22 17:32:35 +01:00
Enno Rehling 2e392b4d7c eliminate even more static variable caches 2015-11-22 16:14:27 +01:00
Enno Rehling f7698d92a9 change how migrant quota is configured for a race, eliminate the related rule caching 2015-11-22 15:53:50 +01:00
Enno Rehling 5f457f77b4 refactoring: move those count_* functions out of config.c 2015-11-22 15:46:14 +01:00
Enno Rehling 3bd458b5e8 optimization: read configuration once before all battles, not before or during each individual one. 2015-11-22 15:29:43 +01:00
Enno Rehling 7bbf11c6b6 eliminate more static cached configuration values 2015-11-22 15:14:50 +01:00
Enno Rehling 17068af332 unusual potion delay attribute can use a potion in another region? unclear what this code does, but fixing my bad assumption. 2015-11-22 14:36:05 +01:00
Enno Rehling c6bac1e49e refactoring: sprout methods for all special-action potions 
remove static caches for WOL configuration
 2015-11-22 14:28:15 +01:00
Enno Rehling 35e7a0bc79 eliminate global.cookie and the cache-invalidation which it enabled 2015-11-22 12:50:10 +01:00
Enno Rehling 73fc5a51b3 remove more junk defines from config.h, move them closer to where they belong 2015-11-22 12:47:57 +01:00
Enno Rehling bf74eb1446 cleanup: remove movement constatns from config.h 2015-11-22 12:41:22 +01:00
Enno Rehling cf6084a5ca refactoring: move game configuration defines out of config.h 
temporarily pushing them into settings.h where others already are, though they should be in their own modules or in config files.
 2015-11-22 12:37:25 +01:00
Enno Rehling 74b1f9872e change visibility of configuration data structures, local to config.c only 2015-11-22 12:27:08 +01:00
Enno Rehling fe173e9551 refactor: make sure global.paramteres is used only inside config.c 2015-11-22 12:24:27 +01:00
Enno Rehling edcd79d044 add a config_token function to look for a token inside a list 2015-11-22 12:20:33 +01:00
Enno Rehling a4cb5e2906 replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
Enno Rehling b05fe9316a introducing config_set and config_get so we don't have to refer to globals.parameters everywhere 2015-11-22 10:33:31 +01:00
Enno Rehling 66dd1b8172 remove produce_exp caching in static variables (more slowdown) 2015-11-22 10:21:37 +01:00
Enno Rehling f0a47321d6 reduce log spam 2015-11-21 21:49:33 +01:00
Enno Rehling 6b83120c7a remove caching from is_guarded, which should slow it down significantly :-( 2015-11-21 21:33:17 +01:00
Enno Rehling 7dae5aa035 eliminate silly caching logic from natural armor calculation 2015-11-21 19:02:14 +01:00
Enno Rehling 990fda6234 clean up config.c, remove static configuration caching 2015-11-21 18:13:16 +01:00
Enno Rehling bc936bf019 eliminate more static variable configuration caching 2015-11-21 13:52:47 +01:00
Enno Rehling 7e27928d17 eliminate static variables and cache logic from more modules 2015-11-21 12:28:20 +01:00
Enno Rehling 86faae6eea eliminate static variables and cache logic from upkeep 2015-11-21 12:21:07 +01:00
Enno Rehling 0d91a7dfde eliminate static variables and cache logic 2015-11-21 12:18:38 +01:00
Enno Rehling 06f8ba9ee4 faster lookup for get_param with tries 
eliminate unnecessary constatn from rand.c
 2015-11-20 15:48:17 +01:00
Steffen Mecke ae870ff53e fix division by zero 2015-11-19 16:46:46 +01:00
Steffen Mecke afd44fc50a fix test interdependence; set silver weight to 1 2015-11-19 15:29:04 +01:00
Steffen Mecke a6757ecf9d Merge branch 'develop' into massive_overload 
Conflicts:
	src/move.test.c
 2015-11-19 14:54:14 +01:00
Steffen Mecke 92ee0f24a4 tweaked parameters for massive overload 
so ... many ... configuration parameters
scrubbed lua test
 2015-11-19 12:36:15 +01:00
Enno Rehling 0363938db0 Merge pull request #402 from stm2/follow_message 
error msg for movement should contain FOLLOW SHIP order
 2015-11-17 17:42:45 +01:00
Steffen Mecke acb45e079d test commit for travis 2015-11-17 17:34:03 +01:00
Steffen Mecke 8a063c3567 fix bug in dragon_affinity 2015-11-17 17:19:06 +01:00
Steffen Mecke a7a82662b7 reduce maximum overload damage to 38% 2015-11-17 15:47:43 +01:00
Steffen Mecke 742a30cc39 fix seaserpents 
seaserpents could not do piracy
seaserpents should be able to attack after move
 2015-11-17 12:17:28 +01:00
Steffen Mecke 2a569635df seaserpent test 2015-11-17 12:13:23 +01:00
Steffen Mecke a144686e66 monsters may attack on ocean 2015-11-17 12:13:23 +01:00
Steffen Mecke a366cd4b17 tests for plan_monster 2015-11-17 12:12:06 +01:00
Steffen Mecke 384a2ea7d7 remove duplicate monster_attacks code 2015-11-17 02:16:07 +01:00
Steffen Mecke 069303d0ae slightly improved monster code 
change normalvariate to more efficient dice based method
try harder to learn a useful skill
 2015-11-17 02:14:28 +01:00
Steffen Mecke 8cec4b20e0 reduce code obfuscation 2015-11-17 02:14:08 +01:00
Steffen Mecke 1789bc06e9 monster faction may learn from experience 2015-11-17 02:13:57 +01:00
Enno Rehling efc87a16e3 clarify dragon planning code (bug 2159) 2015-11-16 16:57:51 +01:00
Steffen Mecke b34fca4633 hopefully fixing travis build (thanks, valgrind) 2015-11-16 14:40:18 +01:00
Enno Rehling 8e4b9283a3 release version 3.7.2 2015-11-16 14:34:30 +01:00
Enno Rehling 6237e6dfe2 Merge branch 'release-3.7' into develop 2015-11-16 14:30:31 +01:00
Enno Rehling bf969879cd release version 3.7.1 2015-11-16 14:28:47 +01:00
Enno Rehling d07f359acb fix a minor warning, get ready for 3.7 release 2015-11-16 14:12:51 +01:00
Steffen Mecke 4fdb9e86e7 test for follow ship error msg 2015-11-16 12:51:34 +01:00
Steffen Mecke a6fe494ff4 error msg for movement should contain FOLLOW SHIP order 
http://bugs.eressea.de/view.php?id=2161
 2015-11-16 12:47:20 +01:00
Steffen Mecke 5326bbd9e4 refactored inside_building/building_is_active/active_building 2015-11-16 02:13:48 +01:00
Steffen Mecke dcca3f1424 test and fix for market operation, bug2083 
http://bugs.eressea.de/view.php?id=2083
 2015-11-16 01:13:01 +01:00
Steffen Mecke 3a18384ddb overfull ships do not drift but take damage 
http://bugs.eressea.de/view.php?id=2157
removed exploit:
ships more than 2 times over their ship type's capacity do not drift but take 30% to 100% damage
 2015-11-15 12:43:05 +01:00
Steffen Mecke 01f4ebd4ce test for fixed value instead of range 2015-11-14 17:14:38 +01:00
Steffen Mecke 493b45c832 taxing without skill does not fail silently any more 
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
 2015-11-14 15:36:14 +01:00
Steffen Mecke f9c2994de1 fixing memory bug 2015-11-13 15:52:32 +01:00
Steffen Mecke 477d69152f added tests for all kinds of syntax parameters 2015-11-13 00:57:14 +01:00
Steffen Mecke 4ab92e3caf fixed descriptions of spells with parameters (bug #2060+1867) 2015-11-13 00:57:14 +01:00
Steffen Mecke f3972a2390 prepared test for nr_spell 2015-11-13 00:57:14 +01:00
Steffen Mecke 251126054e add missing NULL check to in_safe_building 2015-11-13 00:50:54 +01:00
Enno Rehling 5ef9b624ff Merge branch 'release-3.7' into develop 2015-11-12 18:11:21 +01:00
Enno Rehling 7fb5adc7af in_safe_building needs a test and some changes to logic 
github issue #393 fixed
 2015-11-12 17:55:39 +01:00
Steffen Mecke e2b56cd04a fix morale change when region owner changes 
http://bugs.eressea.de/view.php?id=2139
 2015-11-12 16:09:26 +01:00
Enno Rehling c5965fcd59 CID 22455 Logically dead code 
github issue #359
 2015-11-11 16:00:07 +01:00
Enno Rehling 972b8cee40 CID 22436 Ignoring number of bytes read 
github issue #333
 2015-11-11 15:55:39 +01:00
Enno Rehling 1949e8710d CID 22536: Resource leak (RESOURCE_LEAK) 
github issue #388
 2015-11-11 15:51:48 +01:00
Enno Rehling fc73da4ae4 CID 22484 Explicit null dereferenced 
github issue #386
 2015-11-11 15:48:11 +01:00
Enno Rehling 3cd47bb8fa CID 22503 Negative array index write 
github issue #387
I was pretty sure I had submitted this before. What is going on?
 2015-11-11 15:48:09 +01:00
Enno Rehling f69311b141 Merge branch 'develop' of github.com:eressea/server into develop 2015-11-11 15:15:30 +01:00
Enno Rehling d11f8ead56 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
 2015-11-11 15:15:08 +01:00
Enno Rehling 4eb4ff40ac https://bugs.eressea.de/view.php?id=2155 
monsters do not attack units inside a castle or watch
dragons do not attack guards
 2015-11-11 14:36:56 +01:00
Enno Rehling 34c9958368 CID 22584 Result is not floating-point 
github issue #326
chance of morale loss is 20-100 percent depending on loss of silver
 2015-11-10 10:44:17 +01:00
Enno Rehling edb862a8fc CID 22461 Division or modulo by zero 
partial fix github issue #326
also fewer calls to rmoney
 2015-11-09 20:10:02 +01:00
Enno Rehling e14cc50252 CID 22522, 22520 Resource leak 
helping coverity scan to understand this code
 2015-11-09 20:05:55 +01:00
Enno Rehling 66e43caf9d CID 32303 Unchecked return value 
appeasing coverity
 2015-11-09 20:03:38 +01:00
Enno Rehling 32c777d428 add missing test file, try again 2015-11-09 19:46:01 +01:00
Enno Rehling ea8721367a test and fix shock trigger. 
https://bugs.eressea.de/view.php?id=2154
 2015-11-09 19:43:51 +01:00
Enno Rehling fed660987a CID 22519 et al (resource leaks) 
make the failure case for get_spellbook a little slower, but make static analysis happy.
 2015-11-09 19:16:20 +01:00
Enno Rehling 9ff6aa0d42 CID 22472 Division or modulo by zero 
CID 22471 Division or modulo by zero
github issue #350
github issue #349
 2015-11-09 18:06:11 +01:00
Enno Rehling 2e7a1a3ded CID 32208 Time of check time of use 2015-11-09 18:03:19 +01:00
Enno Rehling 4477785da0 first release candidate 2015-11-09 17:08:41 +01:00
Enno Rehling 82994e5fd1 version number increase for planned february release 2015-11-09 17:04:50 +01:00
Enno Rehling 28781dfcc8 Merge pull request #378 from ennorehling/develop 
spells are allowed to have 0 hp
 2015-11-09 16:45:08 +01:00
Enno Rehling 4790950daf spells are allowed to have 0 hp 
https://bugs.eressea.de/view.php?id=2150
 2015-11-09 16:39:30 +01:00
Enno Rehling e9ed30f9db Merge pull request #377 from ennorehling/develop 
Bug 2152: Parteitarnung
 2015-11-09 16:30:57 +01:00
Enno Rehling 6d0bcb246d fix compilation and setting parameters to null 2015-11-09 13:55:09 +01:00
Enno Rehling 2aafa2b54f missing test file 2015-11-09 13:41:53 +01:00
Enno Rehling ee02721c21 fix and tests for otherfaction attributes in E2 
https://bugs.eressea.de/view.php?id=2152
 2015-11-09 13:36:52 +01:00
Enno Rehling bf8cc4cb08 trying to trace down an intermittently failing test on windows 2015-11-08 10:34:43 +01:00
Enno Rehling 318820fb00 eliminate use of test_create_world 2015-11-07 23:49:45 +01:00
Enno Rehling 43ab9e3304 Merge pull request #372 from TurnerSE/bug/#1859 
Scheint ja zu funktionieren? Wenn etwas anderes kaputt geht, dann hat das nicht genug Tests, das ist auch eine Lehre. Und noch ist ja Zeit zum Release, um das zu merken.
 2015-11-07 19:21:16 +01:00
Enno Rehling 9f94979b0d Merge branch 'bug/#2144' of https://github.com/TurnerSE/server into TurnerSE-bug/#2144 2015-11-07 18:53:19 +01:00
Philipp Dreher 6f3ea9b85a co is now first checked for validity before it is used for var-initialisation 2015-11-07 18:52:30 +01:00
Enno Rehling e8a42b20dd don't use test_create_world 2015-11-07 18:47:55 +01:00
Enno Rehling 7ef18b1533 call cleanup 2015-11-07 18:45:41 +01:00
Enno Rehling 242efafd61 Fehlende Initializierung, github #375 2015-11-07 18:21:48 +01:00
Enno Rehling 26b6ae4e30 github issue #374 
stick some assertions in natural_armor
refactor it for readability
eliminate a static memory leak
reset num_races to zero at end of test
 2015-11-07 18:21:47 +01:00
Philipp Dreher 43b2e30c46 added initial cleanup 2015-11-07 15:18:23 +01:00
Philipp Dreher 4d622224aa added message cleanup 2015-11-07 14:47:14 +01:00
Philipp Dreher 5e85945c94 fixed the test so it finally behaves correctly 2015-11-07 14:27:48 +01:00
Enno Rehling 2f8dc29396 clean up item tests so they don't use test_create_world 
fix intermittent skillpotion test
 2015-11-07 13:52:18 +01:00
Philipp Dreher 663d947b2a New behaviour in case of low skill during building 
Insufficient skill after hitting the next improvement stage is now
handled by leaving the for-loop and skipping to after-build-processing.
 2015-11-06 21:04:35 +01:00
Philipp Dreher b0a986e155 Revert "added a lua-test" 
This reverts commit a452ad1517.
 2015-11-06 20:57:19 +01:00
Philipp Dreher a452ad1517 added a lua-test 
New lua-test for the bug concerning the minskill for castle-stages.
(#1859)
 2015-11-06 20:53:10 +01:00
Philipp Dreher be5d81acd1 Revert "new test" 
This reverts commit cb16315e7c.
 2015-11-06 20:51:38 +01:00
Philipp Dreher cb16315e7c new test 
Added test for the handling of castles' buildstages and their individual
skillcaps.
 2015-11-06 13:14:19 +01:00
Philipp Dreher 757bff87d3 slight code improvement 
(test still not working as it should though)
 2015-11-06 12:08:12 +01:00
Philipp Dreher 9e2d2b1560 corrected some mistakes in setup and cleanup of the test 2015-11-05 20:10:51 +01:00
Philipp Dreher 62805cdfa3 added new test to check the msg-behaviour 2015-11-05 15:16:52 +01:00
Enno Rehling 4ae94eaa3f fix compilation 2015-11-05 14:06:26 +01:00
Enno Rehling 40651d57cd 22583 Time of check time of use 
avoid use of access()
 2015-11-05 14:05:58 +01:00
Enno Rehling 5f99288af1 CID 22581 Time of check time of use 
CID 22582 Time of check time of use
CID 30743 Time of check time of use
 2015-11-05 13:27:38 +01:00
Enno Rehling 8a057f183f CID 22580 Time of check time of use 
no need to check this first
 2015-11-05 13:22:51 +01:00
Enno Rehling 797eee025d fix cb_insert comparison (new return value for success) 2015-11-05 13:01:48 +01:00
Enno Rehling dcc819491f make it easier for coverity to understand this code (there are no resource leaks) 2015-11-05 12:47:34 +01:00
Enno Rehling d553066590 CID 22548 Resource leak 
github issue #334
 2015-11-05 11:31:52 +01:00
Enno Rehling fce3f63cc1 CID 22529 Resource leak 
github issue #351
allocation call optimization for small units
 2015-11-05 11:22:16 +01:00
Enno Rehling 530f729621 CID 22499 Missing break in switch 
github issue #357
nice catch!
 2015-11-05 11:18:39 +01:00
Enno Rehling 4c861aa40d CID 22496 Infinite loop 
github issue #356
this is only relevant to old data files, it appears.
 2015-11-05 11:17:31 +01:00
Enno Rehling 58c1d83c9e CID 22491 FORWARD_NULL 
github issue #352
fals positive, rewriting code to appease coverity
 2015-11-05 11:14:53 +01:00
Enno Rehling 62d7e9e944 CID 22473 Evaluation order violation 
github issue #347
 2015-11-05 11:11:02 +01:00
Enno Rehling e16e669294 CID LAST_ROW 22455 Logically dead code 
github issue #359
song of confusion was not selecting from fleeing units
 2015-11-05 11:08:55 +01:00
Enno Rehling 2a7fc87656 CID 30742 Dereference before null check 
CID 30741 ditto
 2015-11-05 10:59:14 +01:00
Enno Rehling 0206ffbec6 accidentally inverted condition when fixing volcano attribute 2015-11-05 09:57:57 +01:00
Enno Rehling 91758d2e51 CID 22439 Unchecked return value from library 2015-11-05 09:00:52 +01:00
Enno Rehling 52edf15cec CID 22438 Unchecked return value from library 2015-11-05 08:57:56 +01:00
Enno Rehling 64e8d4b094 CID 22484 Explicit null dereferenced 2015-11-05 08:50:01 +01:00
Enno Rehling 744246ab34 CID 22498 Missing break in switch 2015-11-05 08:48:03 +01:00
Enno Rehling ba69f72116 CID 22502 Argument cannot be negative 
these curses macros are hard to decipher, I think this may be a kind of false positive because stdscr is always not-null?
 2015-11-05 08:40:09 +01:00
Enno Rehling f83e71e99a 22483 Dereference after null check 2015-11-05 08:36:32 +01:00
Enno Rehling c68829029b 22485 Dereference after null check 2015-11-05 08:35:03 +01:00
Enno Rehling b81e56d306 CID 22486 Dereference after null check 2015-11-05 08:32:21 +01:00
Philipp Dreher d5f8448d7d changed the handling of an item the unit has no access to 
Since the return of display_item() implies that the item, which is
definitely an item but not a potion at this point, is neither in the
inventory of the unit nor an item in the region or the faction's item
pool, the existing message 36 is now triggered in this case and the
previously conditional break is now done indepent of the outcome of
display_item, which shouldn't be critical (it's  an item so it can't be
a spell or a race).
 2015-11-04 23:48:30 +01:00
Enno Rehling b6190b5193 CID 22527 Resource leak 2015-11-04 19:20:34 +01:00
Enno Rehling 4d1f2327fe CID 22545: Leak of memory or pointers to system resources 
github issue #335
volcano destruction was not causing a resuction in wages etc., because we forgot to add the attribute to the region.
 2015-11-04 19:13:15 +01:00
Enno Rehling c9f886078b CID 22452 'Constant' variable guards dead code 
github issue #353 there is no a_fshidden attribute.
 2015-11-04 19:08:45 +01:00
Enno Rehling 075de3c919 math is hard, typing is harder. bugfix. thank you, valgrind my friend. 2015-11-04 15:00:15 +01:00
Enno Rehling 67e2eafbcf add missing include (MSVC is not picky enough) 2015-11-04 14:55:13 +01:00
Enno Rehling 10f2dd2d6e CID 22497 Missing break in switch 
make this code easier to read, favor if over switch
 2015-11-04 14:52:10 +01:00
Enno Rehling 65f1574312 CID 22490 Dereference after null check 2015-11-04 14:27:38 +01:00
Enno Rehling 0271336428 CID 22494 Identical code for different branches 2015-11-04 14:24:44 +01:00
Enno Rehling 6e31751731 CID 22542 Resource leak 
Fix broken error mesasge: "Die Einheit hat diesen Gegenstand zwar, aber sämtliche $int($reservation) $resource($resource,$reservation) sind reserviert."
 2015-11-04 14:22:45 +01:00
Enno Rehling 0a5bd9d356 22480 Dereference after null check 2015-11-04 14:19:43 +01:00
Enno Rehling eea0186601 22440 Unchecked return value from library 
rewrite log rotation, check errors
 2015-11-04 14:16:15 +01:00
Enno Rehling 30cc5405ae CID 22467: Division or modulo by zero 
github issue #348
 2015-11-04 12:59:03 +01:00
Enno Rehling 8ab4784e3f Merge branch 'coverity-scan' of https://github.com/ennorehling/eressea into ennorehling-coverity-scan 
Conflicts:
	src/kernel/jsonconf.c
	src/kernel/save.h
	src/names.c
 2015-11-04 12:44:45 +01:00
Enno Rehling 45b6de9c0d CID 22468 Division or modulo by zero 2015-11-04 12:30:46 +01:00
Enno Rehling 8bc44d82ed CID 22500 Argument cannot be negative 2015-11-04 12:29:51 +01:00
Enno Rehling 5887e8e48f CID 22434 Ignoring number of bytes read 2015-11-04 12:19:16 +01:00
Enno Rehling b7b1ae43c2 CID 22493 Dereference after null check 
CID 22458 Logically dead code
github issue #361
 2015-11-04 12:16:52 +01:00
Enno Rehling 1a715d6736 CID 22493 Dereference after null check 2015-11-04 12:14:12 +01:00
Enno Rehling 657f5044e5 CID 22495 Identical code for different branches 2015-11-04 12:11:26 +01:00
Enno Rehling 9d4489972b CID 22447 Calling risky function 
github issue #336
 2015-11-04 12:09:45 +01:00
Enno Rehling c090f8e1f4 CID 22441 Unchecked return value from library 2015-11-04 12:03:26 +01:00
Enno Rehling d6cd1feb48 CID 22456: 'Constant' variable guards dead code 
github issue #360
prayers sind ein feature, das nie fertig entwickelt wurde
 2015-11-04 11:59:17 +01:00
Enno Rehling 978dd1400f CID 22465 Division or modulo by zero 2015-11-04 11:57:13 +01:00
Enno Rehling a02b5f343e CID 22488 Dereference after null check 2015-11-04 11:55:04 +01:00
Enno Rehling 47f678d2a3 CID 22436 Ignoring number of bytes read, github issue #333 2015-11-04 11:51:19 +01:00
Enno Rehling 731dac3363 CID 22437 Unchecked return value from library 
github issue #332
 2015-11-04 11:45:13 +01:00
Enno Rehling 87a47e241c CID 22479 Dereference after null check 
CID 22478 Dereference after null check
CID 22477 Dereference after null check
CID 22476 Dereference after null check
CID 22475 Dereference after null check
 2015-11-04 11:23:57 +01:00
Enno Rehling d4ff807c20 Merge pull request #364 from ennorehling/coverity-fixes 
several smaller coverity fixes
 2015-11-04 11:04:32 +01:00
Enno Rehling 024e4c45ca fix a bug introduced by f78fe842 (CID 22443) 2015-11-04 10:40:53 +01:00
Enno Rehling c57668e6ee failing test for newly discovered storage problems 2015-11-04 09:48:51 +01:00
Enno Rehling dedbd67d07 re-apply fix for CID 22551: dereference before null check (merge conflict) 2015-11-04 09:36:09 +01:00
Enno Rehling 0be8724093 CID 22475 Dereference after null check 2015-11-04 07:56:19 +01:00
Enno Rehling 04b5bc0c60 CID 22474 Evaluation order violation 2015-11-03 23:19:35 +01:00
Enno Rehling 7efda5f967 CID 22468 Division or modulo by zero 2015-11-03 23:18:56 +01:00
Enno Rehling 1f055b3175 CID 22466 Division or modulo by zero 2015-11-03 23:17:11 +01:00
Enno Rehling 103c480c91 CID 22465 Division or modulo by zero 2015-11-03 23:15:26 +01:00
Enno Rehling 1093a23d5a CID 22464 Division or modulo by zero 2015-11-03 23:14:06 +01:00
Enno Rehling 876e4122b1 CID 22463 Division or modulo by zero 2015-11-03 23:13:04 +01:00
Enno Rehling fff40f048b CID 22462 Division or modulo by zero 2015-11-03 23:11:34 +01:00
Enno Rehling e6973ff394 CID 22445 Unchecked return value 2015-11-03 23:05:44 +01:00
Enno Rehling f78fe84216 CID 22443 Ignoring number of bytes read 2015-11-03 23:03:40 +01:00
Enno Rehling 870d42ccfe CID 22442 Unchecked return value from library 2015-11-03 23:01:09 +01:00
Enno Rehling 307c5ec85b CID 22435 Unchecked return value from library 2015-11-03 22:56:05 +01:00
Enno Rehling 0c5ef21c10 CID 22434 Ignoring number of bytes read 
also potential missing  null-termination
 2015-11-03 22:53:19 +01:00
Enno Rehling 154c2076a2 fixing bug 2149: projectile armor shall only protect against projectiles 
https://bugs.eressea.de/view.php?id=2149
 2015-11-03 19:12:40 +01:00
Enno Rehling cfc31c6598 provide a failing test for issue 2149 2015-11-03 19:11:03 +01:00
Enno Rehling f959f43f1e extensive tests for armor calculation 2015-11-03 18:59:09 +01:00
Enno Rehling cc89e9c9da fix crash when rules do not define a unicorn item 2015-11-03 17:33:44 +01:00
Enno Rehling 15ff621cbb refactor: extract damage calculation from terminate 
start writing tests (WIP)
 2015-11-03 14:22:50 +01:00
Enno Rehling 91a6324a97 cleanup: functions do not need to be dereferenced with an & in C. 2015-11-03 13:30:34 +01:00
Enno Rehling 7e81b98fa4 Merge pull request #339 from TurnerSE/improvement/CID22481 
Improvement/cid22481
 2015-11-03 13:08:03 +01:00
Enno Rehling 4052f52472 Merge pull request #345 from TurnerSE/bug/#2145 
Bug/#2145
 2015-11-03 13:04:28 +01:00
Enno Rehling ae28cbd7c3 Merge branch 'enhancement/airship_refactoring' of https://github.com/TurnerSE/server into TurnerSE-enhancement/airship_refactoring 
Conflicts:
	src/spells/shipcurse.c
 2015-11-03 13:02:42 +01:00
Philipp Dreher 5178bbd674 moved application of armor-penetration 
halfed armor now includes the effect of natural armor, but not the
effect of magic armor
 2015-11-03 00:05:55 +01:00
Philipp Dreher bf42143b11 Revert "WIP new test for armor penetration" 
This reverts commit dab8bdf7ef.
 2015-11-03 00:01:10 +01:00
Philipp Dreher 0e83cc69d3 missed a spot... 2015-11-02 18:27:07 +01:00
Philipp Dreher c2a8c32be0 forgot fwd-declaration of structs... 2015-11-02 18:08:35 +01:00
Philipp Dreher 07fd3dc970 formal correction 2015-11-02 18:06:19 +01:00
Philipp Dreher 30dce18697 small formal corrections 2015-11-02 17:58:14 +01:00
Philipp Dreher 96ccb046ab added test-suite for flyingship.c 
some general testing of the spells functionality for future maintenance
purposes
 2015-11-02 17:54:23 +01:00
Enno Rehling 63541dcc5d Merge pull request #338 from TurnerSE/improvement/test_skillpotion 
Improvement/test skillpotion
 2015-11-02 17:38:47 +01:00
Philipp Dreher 29173887b6 test_create_castorder can take spelllparameters now too 2015-11-02 17:09:16 +01:00
Enno Rehling 01078460bb Merge pull request #343 from ennorehling/feature/bug-2143-monsters-attack-buildings 
bug 2143: monsters attack buildings
 2015-11-02 16:40:32 +01:00
Philipp Dreher 0e8365c802 moved convenience function for convenience 
the formerly static function test_create_castorder is now available for
general usage via tests.h/.c
 2015-11-02 16:12:56 +01:00
Philipp Dreher f550431118 small documentation correction 2015-11-02 15:59:29 +01:00
Enno Rehling 0b00bfecdf Merge pull request #342 from TurnerSE/bug/CID22449 
Bug/cid22449
 2015-11-02 15:55:44 +01:00
Philipp Dreher 8200fdb6c2 moved files for flyingship to subdir "spells" 2015-11-02 15:40:26 +01:00
Enno Rehling f70b385bef clean up plan_monsters and make it a bit more readable 2015-11-02 15:27:01 +01:00
Enno Rehling 072bfd3912 testin building_is_active 
testing multiple units in one building
 2015-11-02 15:06:30 +01:00
Enno Rehling 4bf2509fb3 test inside_building vs. overflow 
fix default building capacity (should be 1 per size)
 2015-11-02 14:56:58 +01:00
Enno Rehling 42ae086def unit is inisde a building also when it was not paid for 2015-11-02 14:49:48 +01:00
Enno Rehling 24ff4c301d refactor: separate building_is_active from inside_building 2015-11-02 14:18:50 +01:00
Philipp Dreher 098abcc144 internal restructuring in flyingship 2015-11-02 14:01:38 +01:00
Philipp Dreher abd6be475f that just slipped in the commit by accident... 2015-11-02 13:55:28 +01:00
Philipp Dreher fe0d038bf3 moved more related functionality from shipcurse.c to flyingship.c 2015-11-02 13:39:06 +01:00
Philipp Dreher 2fe95f3d61 integration of the separate if-conditions and simplification of the loop 2015-11-02 13:12:19 +01:00
Philipp Dreher bf779fc810 removed obsolete code 2015-11-02 13:06:14 +01:00
Philipp Dreher d93305b180 moved flying ship functionality from move.c to flyingship.c 2015-11-02 00:35:32 +01:00
Philipp Dreher 6e7510b7e9 moved flying ship functionality from spells.c and shipcurse.c to flyingship.c 2015-11-02 00:32:56 +01:00
Philipp Dreher 3fa4c18e87 added files for new module "flyingship" 2015-11-02 00:26:23 +01:00
Philipp Dreher b107ddadf5 added assert to check the faction-pointer 2015-11-01 21:43:18 +01:00
Philipp Dreher 491e5faed9 Revert "general check for sf->faction's validity" 
This reverts commit f18b5ea7d2.
 2015-11-01 21:40:06 +01:00
Philipp Dreher f18b5ea7d2 general check for sf->faction's validity 
The handling of an ally without a valid faction-pointer is now skipped
in favor of a logged error.
 2015-11-01 18:54:29 +01:00
Philipp Dreher 91155f509c formatting: tabs --> spaces 2015-11-01 17:38:12 +01:00
Philipp Dreher dab8bdf7ef WIP new test for armor penetration 2015-11-01 17:15:11 +01:00
Philipp Dreher b6443e40ba reanimated dead code 2015-11-01 17:14:51 +01:00
Enno Rehling 0b098dede6 remove invalid tests. uninitialized locales do not have default words 2015-11-01 05:35:10 +01:00
Philipp Dreher bebc92f82d expansion of the skillpotion-test 
test now checks the effect of the potion on the week-counter of
sufficiently high skills
 2015-10-31 19:03:15 +01:00
Enno Rehling fbf483fb4e CID 22518: Parse warning (PW.PARAM_SET_BUT_NOT_USED) 2015-10-30 15:21:06 +01:00
Enno Rehling 21a2313e2a CID 22517: Parse warning (PW.PARAM_SET_BUT_NOT_USED) 2015-10-30 15:20:06 +01:00
Enno Rehling a91a0f6a53 CID 22514: Out-of-bounds read (OVERRUN) 2015-10-30 15:17:39 +01:00
Enno Rehling 0da10ea490 CID 22513: Out-of-bounds read (OVERRUN) 2015-10-30 14:41:52 +01:00
Enno Rehling 674bc2b4c7 nope, the ticket is actually required. 2015-10-30 12:58:27 +01:00
Enno Rehling e7ca5345d7 CID 22509: Dereference null return value (NULL_RETURNS) 
potential problems at the edge of the map.
 2015-10-30 12:57:07 +01:00
Enno Rehling 8f7f182c91 CID 22507: Dereference null return value (NULL_RETURNS) 
checking fopen results
 2015-10-30 12:55:30 +01:00
Enno Rehling d6bc1c3119 CID 22506: Dereference null return value (NULL_RETURNS) 
always check fopen success
 2015-10-30 12:54:07 +01:00
Enno Rehling 204b4d6b93 CID 22505: Dereference null return value (NULL_RETURNS) 
potential bugs at the edge of the map
 2015-10-30 12:52:18 +01:00
Enno Rehling 1df0afc58a CID 22550: Dereference before null check (REVERSE_INULL) 2015-10-30 12:50:32 +01:00
Enno Rehling 1d204b12f1 CID 22549: Dereference before null check (REVERSE_INULL) 2015-10-30 12:49:37 +01:00
Enno Rehling e1eb5098d4 CID 22554: Improper use of negative value (REVERSE_NEGATIVE) 
I believe this was a false positive, but more asserts can never hurt.
 2015-10-30 12:40:48 +01:00
Enno Rehling 93b7bacff5 CID 22552: Dereference before null check (REVERSE_INULL) 2015-10-30 12:37:27 +01:00
Enno Rehling 54304af182 allocate space for null terminator 2015-10-30 12:08:09 +01:00
Enno Rehling 7fa12ae3af CID 22556: String not null terminated (STRING_NULL) 
add missing null-termination
 2015-10-30 11:59:05 +01:00
Enno Rehling 68f8f0830e CID 22561: Copy into fixed size buffer (STRING_OVERFLOW) 2015-10-30 11:45:20 +01:00
Enno Rehling be0563c1f0 CID 22560: Copy into fixed size buffer (STRING_OVERFLOW) 2015-10-30 11:43:45 +01:00
Enno Rehling 5d273e475e CID 22558: Copy into fixed size buffer (STRING_OVERFLOW) 
bsdstring buffer size check
 2015-10-30 11:41:59 +01:00
Enno Rehling 1fb04179dc CID 22557: Copy into fixed size buffer (STRING_OVERFLOW) 
eliminate code duplication. bsdstring is better than libc strings.
 2015-10-30 11:39:47 +01:00
Enno Rehling ca7d25858e CID 22563: Copy into fixed size buffer (STRING_OVERFLOW) 
bsdstring to the rescue, once again
 2015-10-30 11:16:09 +01:00
Enno Rehling 0de6e5ecb8 CID 22564: Copy into fixed size buffer (STRING_OVERFLOW) 
buffer sizes => bsdstring.h
 2015-10-30 11:13:48 +01:00
Enno Rehling df82a9795d CID 22565: Copy into fixed size buffer (STRING_OVERFLOW) 
bsdstring to the rescue
 2015-10-30 11:11:54 +01:00