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

1449 commits

Author SHA1 Message Date
Enno Rehling
dd9420fc38 move at_guard into guard module as well 2015-09-12 23:38:31 +02:00
Enno Rehling
3055f517dc move guard implementation into a module (WIP) 2015-09-12 22:53:54 +02:00
Enno Rehling
5f7b9129bc Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 22:47:33 +02:00
Enno Rehling
a027139057 remove global variable verbosity in favor of static in main.c (use log_* functions everywhere) 2015-09-12 20:58:09 +02:00
Enno Rehling
06a04d0e20 fix logging for sp_igjarjuk, temporarily set log-levels for the game to error|warn|info 
remove some code that accesses `verbosity` variable (todo: hide it more, fix logging)
 2015-09-12 19:48:03 +02:00
Enno Rehling
63c983e197 Merge branch 'develop' of github.com:eressea/server into develop 2015-09-12 19:28:49 +02:00
Enno Rehling
c7a0fb5f28 development build is 3.7 2015-09-12 19:28:28 +02:00
Enno Rehling
44dd66f2fb Merge branch 'master' into develop 2015-09-12 19:27:56 +02:00
Enno Rehling
28f17b6a08 release version 3.6.3 2015-09-12 19:27:11 +02:00
Enno Rehling
7259a4b45e remove parse_main from xmlreader, everything superseeded by jsonconf 2015-09-12 18:16:23 +02:00
Enno Rehling
1e75255d51 allow disabling skills through json 2015-09-12 17:43:31 +02:00
Enno Rehling
a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling
c76b118fb8 eliminate game/order from XML data 2015-09-12 17:12:02 +02:00
Enno Rehling
44eb3a4f58 disable keywords through JSON configuration 2015-09-12 17:06:55 +02:00
Enno Rehling
32ff7c89bc Merge pull request #296 from ennorehling/feature/config-producexpchance 
Bug 2137: calculating produceexp correctly
 2015-09-12 16:52:55 +02:00
Enno Rehling
7906cdbcb6 do not read gamename from XML, read it from JSON only (two mechanisms for the same feature are too many) 2015-09-12 16:49:18 +02:00
Enno Rehling
d65e9aaf94 eliminate xml reading of produceexp chance 2015-09-12 16:42:02 +02:00
Enno Rehling
8a95ea0c00 speeding up produceexp_chance 2015-09-12 16:41:22 +02:00
Enno Rehling
9bdc811582 produceexp uses a json-configurable constant 
make get_param_flt return a double, floats are for wimps.
 2015-09-12 16:38:51 +02:00
Enno Rehling
68c448b3fb fix signature of callback 2015-09-12 16:29:57 +02:00
Enno Rehling
d1686849e0 refactoring: move produceexp into unit module, for want of a better one. add a bit of test coverage. 
https://bugs.eressea.de/view.php?id=2137 - fix learning-by-doing with less than u->number people.
 2015-09-12 16:25:47 +02:00
Enno Rehling
c704cd5784 release version 3.6.2 2015-09-12 15:41:25 +02:00
Enno Rehling
9563aa712f eliminate junk function 2015-09-12 14:16:18 +02:00
Enno Rehling
42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling
aa32cf190e remove xmlreader code for prefixes 2015-09-12 13:40:10 +02:00
Enno Rehling
09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +02:00
Enno Rehling
13e1573611 moving the calendar module out of the kernel directory, it does not belong with the major game objects 2015-09-12 12:54:09 +02:00
Enno Rehling
47c95aee35 implement JSON prefixes. fix free_prefixes not resetting size (TODO: quicklist). 2015-09-12 12:49:12 +02:00
Enno Rehling
f0e255924f add a unit test for add/free prefixes. fix bad free_prefixes call site. 2015-09-12 12:41:04 +02:00
Enno Rehling
9f6b374056 add a (red) test for JSON prefixes. 2015-09-12 12:33:25 +02:00
Enno Rehling
44d982d210 free race prefixes when the game is done (small memory leak). 2015-09-12 12:29:42 +02:00
Enno Rehling
f1476c2167 refactoring: split out a module for race prefixes 2015-09-12 12:24:10 +02:00
Enno Rehling
bd51ac7dd7 eliminate terrain parsing from xmlreader.c, it's all in JSON now! 2015-09-11 22:46:47 +02:00
Enno Rehling
c57918ede0 replace XML terrains for E3 and E4 with JSON configuration 2015-09-11 22:43:08 +02:00
Enno Rehling
b4971dd651 replace all of the E2 terrains with JSON data (no more XML!) 2015-09-11 22:11:59 +02:00
Enno Rehling
7c4d18ec2d avoid an annoying division by zero when terrains are not fully initialized (size=0) 2015-09-11 21:31:59 +02:00
Enno Rehling
db4cb2618b transfer most core and all game-specific terrains for E2 from XML to JSON. 2015-09-11 21:14:10 +02:00
Enno Rehling
9df5799efd define core plain and ocean in JSON for E2. 2015-09-11 12:52:18 +02:00
Enno Rehling
a582c69523 finished and tested: terrains can be completely defined in JSON. 2015-09-11 12:27:45 +02:00
Enno Rehling
43bac506a4 fix bad size for calloc. 2015-09-11 12:25:28 +02:00
Enno Rehling
c707ff39b6 memory leak: properly free terrain_production objects 2015-09-11 12:17:35 +02:00
Enno Rehling
59e2c12605 completing the implementation of JSON terrains (WIP). 
seeing a crash when trying to allocate a resource for stone in test_json_terrains.
 2015-09-11 12:12:53 +02:00
Enno Rehling
8860244f1c Merge branch 'link-seen-duplicate' into feature/feature-json-terrains 2015-09-11 11:12:30 +02:00
Enno Rehling
d15d0cc0f4 remove unused xml_i function 2015-09-11 11:08:10 +02:00
Enno Rehling
cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete) 
rename some rules to make it more obvious that they are flags or other integer values.
 2015-09-11 10:04:08 +02:00
Enno Rehling
c5e14c85a6 read boolean json values 
be smarter about reading number values that are integers
 2015-09-11 09:17:07 +02:00
Enno Rehling
9bb2a625f9 fix xmlreader bug introduced by last commit (xpath->node not initialized) 2015-09-11 09:10:00 +02:00
Enno Rehling
1a7d6dd91d xmlreader no longer needs to parse settings, that's all in json now. 2015-09-10 23:29:18 +02:00
Enno Rehling
1969c165d3 allow settings in json configuration file 
move E2 settings from XML to JSON
 2015-09-10 23:16:17 +02:00
Enno Rehling
2b46c4c4a9 kill stray semicolon 2015-09-10 21:22:55 +02:00
Enno Rehling
f2b2dc2063 fix linux build, missing include 2015-09-09 16:48:24 +02:00
Enno Rehling
337aca9b3c remove region.donations, replace with a global list. 2015-09-09 16:47:09 +02:00
Enno Rehling
d29d38f710 refactor donations into a seaprate code module, add a basic test 2015-09-09 15:45:20 +02:00
Enno Rehling
60111282b3 make findunitr be O(1) instead of O(#r->units) 2015-09-09 13:29:58 +02:00
Enno Rehling
5faf642b9c use the same DISABLE_TEST macro everywhere. 2015-09-09 13:23:20 +02:00
Enno Rehling
6f212686f3 Merge pull request #287 from ennorehling/feature/issue-282-link-seen 
eliminate duplicate call to link_seen
 2015-09-09 12:41:14 +02:00
Enno Rehling
bf6f05f39d fix unused variable warning 2015-09-09 11:24:11 +02:00
Enno Rehling
cac22bcb02 Merge branch 'feature/issue-282-link-seen' of github.com:ennorehling/eressea into feature/issue-282-link-seen 2015-09-09 11:23:15 +02:00
Enno Rehling
f7c1efc287 memory error seems to be in test_write_flag (curse-hashing?), not in the new ones. 2015-09-09 11:22:35 +02:00
Enno Rehling
e5a92d6313 building on linux 2015-09-09 11:09:57 +02:00
Enno Rehling
65c39866e1 refactor: add a faction_add_seen function that also updates [first, last) interval. 
add tests for add_seen.
disable test_faction_add_seen, looks like it needs a valgrind check?
 2015-09-09 11:08:33 +02:00
Enno Rehling
7f9e84d68b fix neighbor seen_region collection. 2015-09-09 10:22:04 +02:00
Enno Rehling
42e51a0ec4 refactor looping through the hashtable of seen_regions into a map function. 2015-09-09 09:38:57 +02:00
Enno Rehling
3eabf082ac refactor prepare_report to extract prepare_seen, because we assume the bug is in there. 
add a failing test for it to prove that bug is in here.
 2015-09-09 09:04:59 +02:00
Enno Rehling
b551261b66 fix the bug that the unit test exposed. it was so simple! 
still not fixing the integration test, though :-(
 2015-09-08 16:35:18 +02:00
Enno Rehling
1fbbba564b add a unit test for the problem that fails (test_seen_interval_forward) 2015-09-08 16:28:47 +02:00
Enno Rehling
2e0482973e testing test_seen_interval 2015-09-08 10:17:01 +02:00
Enno Rehling
8562a6d072 add test suite for seen_region logic (empty) 2015-09-08 10:07:29 +02:00
Enno Rehling
9312b44f8e move seen_region logic to a separate seen.[hc] module for testing. 
currently failing test:

  1) Failure (tests.report.test_lighthouse):
  ./scripts/tests/common.lua:1051: true expected but was false
 2015-09-08 09:56:56 +02:00
Enno Rehling
d64948f0fc eliminate duplicate call to link_seen (and report_context.seen) 2015-09-07 19:48:53 +02:00
Enno Rehling
77912166bf Backfill missing tests for Bug 1818. Actual bug appears to have been fixed some time ago. 2015-09-07 14:49:57 +02:00
Enno Rehling
34580ab9fa fix test requiring a data directory (sigsegv) 2015-09-06 20:07:15 +02:00
Enno Rehling
f84133eb53 fix linux builds 2015-09-06 19:08:57 +02:00
Enno Rehling
b8df3f3a5f increase the datatype for scores from int to long long 
this fixes https://bugs.eressea.de/view.php?id=2136
 2015-09-06 19:04:04 +02:00
Enno Rehling
19e27930ab Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	.travis.yml
	scripts/eressea/cursed.lua
 2015-09-06 13:28:08 +02:00
Enno Rehling
79663d5933 relatively simple fix to bug 1685: unit ids must start with alphanumerical characters. 
https://bugs.eressea.de/view.php?id=1685
 2015-09-05 19:48:25 +02:00
Enno Rehling
a2c269e805 add another failing unit test for bug 1685, closer to the core of the problem 2015-09-05 19:45:34 +02:00
Enno Rehling
3dc173b6ec add unit tests for read_unitid 2015-09-05 19:44:30 +02:00
Enno Rehling
400b8f1ffa add another failing test for bug 1685 
add test for forbiddenid (cannot have a unit with id TEMP)
 2015-09-05 19:25:55 +02:00
Enno Rehling
74d7caf526 remove dead code for base10->base36 conversion 2015-09-05 19:24:59 +02:00
Enno Rehling
b631f539ce simplify atoi36, it does not need to eat whitespace 2015-09-05 18:18:22 +02:00
Enno Rehling
2e3c0db02a add a failing test for bug 1685 2015-09-05 18:14:28 +02:00
Enno Rehling
552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling
6d592a4460 drifting ships do not take damage (forum debate), version update 2015-08-31 12:53:24 +02:00
Enno Rehling
a00fdf9316 fix hitpoints for summoned wolves 2015-08-31 12:50:47 +02:00
Enno Rehling
94850e86cb fix hitpoints for summoned wolves 2015-08-31 11:12:45 +02:00
Enno Rehling
70aff6f567 Merge pull request #283 from ennorehling/cursed-faction 
The revenge of Igjarjuk
 2015-08-31 07:58:16 +02:00
Enno Rehling
8c860811e2 Summon Igjarjuk only at the start of a battle, not after. 2015-08-30 23:15:04 +02:00
Enno Rehling
d08959f9a8 fix German spelling in a message, 
add a test for is_guarded.
 2015-08-30 14:52:42 +02:00
Enno Rehling
acb2aed30f add message for igjarjuk effect 2015-08-30 11:01:53 +02:00
Enno Rehling
7bb882b15b add a spell for igjarjuk (WIP) 2015-08-30 10:57:08 +02:00
Enno Rehling
efca4d1979 fix last merge, signature of effskill changed 2015-08-29 15:00:59 +02:00
Enno Rehling
78cf76464a Merge pull request #281 from ennorehling/todo-cleanup 
code cleanup
 2015-08-29 14:09:36 +02:00
Enno Rehling
e4026e0f6b eliminate more non-critical arguments. 2015-08-27 16:59:39 +02:00
Enno Rehling
20ab40dc2b Merge branch 'todo-cleanup' of github.com:ennorehling/eressea into todo-cleanup 
Conflicts:
	src/attributes/stealth.c
 2015-08-27 16:54:42 +02:00
Enno Rehling
564a041b0d eliminate invalid assertions, remove unnecessary arguments (plant/breed/trees) 2015-08-27 16:53:36 +02:00
Enno Rehling
66d8e3c7ba fix linux build, kill invalid assert 2015-08-27 16:23:30 +02:00
Enno Rehling
de808bf146 change effskill signature to take a region, change eff_skill to work on a skill * to avoid multiple lookups. 2015-08-27 16:16:55 +02:00
Enno Rehling
6889cb0c80 remove superfluous argument from herbsearch 
use effskill, not eff_skill
 2015-08-27 14:46:08 +02:00
Enno Rehling
71dea1eca7 backfill missing tests for herbsearch (alchemy). 2015-08-27 13:19:58 +02:00
Enno Rehling
eb26cc971f Testing bufunit with skills and different viewers. 2015-08-26 21:19:14 +02:00
Enno Rehling
bc1c3dd712 move NEWATSROI out of item_modification 2015-08-26 19:59:11 +02:00
Enno Rehling
c5f4d213ce test familiar/mage connection and ageing of same. 2015-08-26 08:42:45 +02:00
Enno Rehling
b27f0787a8 test familiar skill bonus 2015-08-26 08:36:25 +02:00
Enno Rehling
4dee1744a2 write some tests around effskill and skillmod. 2015-08-26 08:22:51 +02:00
Enno Rehling
5fc1587879 age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age) 2015-08-25 22:50:58 +02:00
Enno Rehling
9586d970e8 fix bad castorder creation for combat spell (some unions are the WORST) 2015-08-22 18:51:10 +02:00
Enno Rehling
dd667aa752 cursed factions get to fight a wolfhowl if they attack (WIP) 2015-08-22 17:56:36 +02:00
Enno Rehling
4c32fe19ee eliminate some dead code that was still marked with TODO. 2015-08-21 10:54:09 +02:00
Enno Rehling
89bc83c4ab Merge branch 'master' into develop 
Conflicts:
	src/bind_region.c
	src/buildno.h
	src/kernel/item.c
 2015-08-20 16:58:07 +02:00
Enno Rehling
d69bf18e23 suspect some submodule shenanigans 2015-08-20 16:26:32 +02:00
Enno Rehling
853290413f fix segfault, disable intermittent test 2015-08-20 16:18:15 +02:00
Enno Rehling
f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling
dfb0bcaccf Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
	src/laws.c
 2015-08-20 15:49:36 +02:00
Enno Rehling
1641e6ef89 remove spellbook repair code, we are done 2015-08-20 15:09:38 +02:00
Enno Rehling
469701a6ff fix linux build 2015-08-20 12:56:33 +02:00
Enno Rehling
8716e5fdc5 repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code). 2015-08-20 12:13:09 +02:00
Enno Rehling
ff38d8bf4c I don't think it's good to call update_spells before the turn. 
one should only have the spells that are in the previous week's report.
a few comments wouldn't hurt.
 2015-08-20 12:12:17 +02:00
Enno Rehling
e6eb53c864 save the faction.max_spelllevel in the data file, do not recalculate it each time. 
when recalculating it, include spellbook to determine max-level (dead mages may have pushed the level up).
 2015-08-19 19:43:47 +02:00
Enno Rehling
fc308940b5 fix linux build 2015-08-19 14:50:24 +02:00
Enno Rehling
a9ecd1f55e replace all at_travelunit code with travelthru_map calls. 
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
 2015-08-19 14:37:51 +02:00
Enno Rehling
ebe365fd6e move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
Enno Rehling
1f4c8d5858 fix linux build, missing include 2015-08-18 17:28:07 +02:00
Enno Rehling
5bc4f7f144 add some simple tests for writing travelthru information to the report, fix test that sets errno as a side effect (thanks, Microsoft!) 2015-08-18 17:08:02 +02:00
Enno Rehling
c8cbeea660 STRLCPY macro redefinition and fixes for gcc. work for monkeys. 2015-08-17 22:48:21 +02:00
Enno Rehling
681697fd47 gcc still more picky than clang. 2015-08-17 20:32:02 +02:00
Enno Rehling
e621b97465 Easy pratfall: Visual Studio includes limits.h through stdlib.h, but gcc/clang do not. 2015-08-17 20:22:02 +02:00
Enno Rehling
1042c94fd9 quickly fix gcc conversion warnings. lots of DRY. 2015-08-17 20:17:02 +02:00
Enno Rehling
b999e3c963 replace strlcpy/wrptr pairs with new STRLCPY macro. 2015-08-17 19:37:02 +02:00
Enno Rehling
7e64f3177d refactoring: rewrite tests to use test_find_messagetype instead of assert_messages. 
tests: add cleanup of message_types to reduce global state.
 2015-08-17 19:36:28 +02:00
Enno Rehling
1806030baa new all-in-one strlcpy and wrptr function 2015-08-17 19:28:05 +02:00
Enno Rehling
dcececf4fa Debug: move errno testing closer to the report-writing, so we know which report caused the error. 
Fix: wrptr gets the result from _snprintf, which is int, not size_t.
 2015-08-17 16:17:08 +02:00
Enno Rehling
df5eaa6ef2 eliminate warning (unused variable) 2015-08-16 19:55:11 +02:00
Enno Rehling
b50c1720cf several monster_attack fixes. 
1. do not try to attack other monsters.
2. monsters outside of a building can attack units outside of buildings.
3. dragons can guard without weapons.
 2015-08-16 16:18:59 +02:00
Enno Rehling
3fe0e62105 do not remove battles from dead faction before writing the report. 2015-08-16 12:06:05 +02:00
Enno Rehling
27b5588e8f Merge region messages and individual messages before writing them into the report. 
This fixes https://bugs.eressea.de/view.php?id=2073
 2015-08-16 11:30:44 +02:00
Enno Rehling
47dccc667b Add a message that contains the password in the first report, so Magellan can pick it up. 
Fix a bad type conversion when setting skills.
 2015-08-15 20:25:36 +02:00
Enno Rehling
0af5df470b managed to commit some broken tests, and travis let them pass. something is wrong with the CI tests. 2015-08-07 18:30:02 +02:00
Enno Rehling
398579c293 remove duplication, fix a stray blank space in the NR. 2015-08-07 16:17:11 +02:00
Enno Rehling
816243d2d7 magicians can always identify their own curse-effects. 
magic-resistance on a building is always visible to anybody, just like it is on units.
 2015-08-07 15:52:10 +02:00
Enno Rehling
00423a746b clarify the good/bad dreams tests 2015-08-07 13:26:41 +02:00
Enno Rehling
12a2a1f412 get_captain is wrong, the rules say the captain is the FIRST unit in the ship, which I believe means ship_owner, not best skill. 
clean up shipspeed tests a little (WIP, missing edge cases).
ignore some temporary files.
 2015-08-07 13:07:45 +02:00
Enno Rehling
3bfc05c3b0 test bonus for new ship-speed rules (WIP). 2015-08-07 13:03:19 +02:00
Enno Rehling
b72f48c044 enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
Enno Rehling
c322fbffd5 rename ship_sailors to crew_skill, it's more descriptive 2015-08-07 12:46:32 +02:00
Enno Rehling
afbc4c816b refactoring ship speed, extract total skills of sailors into a function. 2015-08-07 12:43:18 +02:00
Enno Rehling
bfdef37808 fix the test and the formula for damaged ships' speeds. 2015-08-07 12:03:33 +02:00
Enno Rehling
8636aabe8a tests for existing shipspeed features, failing ship for ship-damage. 2015-08-07 11:50:49 +02:00
Enno Rehling
b3a8a95a24 cherry-picking ship tests from range_max code 2015-08-07 11:48:46 +02:00
Enno Rehling
04db291c8b disable random study in test to make it not intermittent 2015-08-06 20:48:14 +02:00
Enno Rehling
c0a760a645 Merge branch 'develop' of github.com:eressea/server into develop 2015-08-06 19:54:51 +02:00
Enno Rehling
6c8300a47e Merge branch 'feature/bug-1588-magicpower-limit' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-1588-magicpower-limit 
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/bind_unit.c
	src/kernel/spellid.h
	src/magic.c
	src/magic.h
 2015-08-06 19:53:24 +02:00
Enno Rehling
4c877288d3 remove spellid.h, it represents an outdated way of doing things. 
merge the enum into combatspells, and reduce it to the spells actually used here.
 2015-08-06 17:57:51 +02:00
Enno Rehling
01649ce682 Merge pull request #266 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:12:41 +02:00
Enno Rehling
1e6a83f357 resize buffer in eval_command, it was too small for many commands. 
increase MAXTEACHERS.
eliminate oldterrain warning in json_report.
 2015-08-06 16:52:24 +02:00
Enno Rehling
0f5567b7f8 fix missing include (gcc) 2015-08-05 16:02:15 +02:00
Enno Rehling
e9b1d6a0ae fix gcc warning 2015-08-05 15:42:22 +02:00
Enno Rehling
8dc4e93e90 fix missing units from CR, add a test, partially convert from FILE* to stream 2015-08-05 14:45:46 +02:00
Enno Rehling
8efc874952 backfill missing tests for ally_cmd 2015-08-05 12:19:17 +02:00
Enno Rehling
420574c7e4 add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again 2015-08-05 10:25:25 +02:00
Enno Rehling
c22636ca13 unit tests for update_long_order. e3 tests are still broken. 2015-08-05 00:03:30 +02:00
Enno Rehling
928b9966d0 fix broken test (select DESTROY over MOVE), start writing unit tests for update_long_order 2015-08-04 23:04:00 +02:00
Enno Rehling
4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling
2288b8fb27 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	src/buildno.h
	src/kernel/config.c
	src/kernel/save.c
	src/kernel/unit.c
	src/laws.c
	src/move.c
 2015-08-03 19:43:26 +02:00
Enno Rehling
c19bed02fe Merge remote-tracking branch 'upstream/develop' into develop 2015-08-03 19:17:25 +02:00
Enno Rehling
9938b3fb66 eliminate update_gbdream completely, make code smaller and simpler. 
simplify tests (no need to use create_spell if we don't use it)
increase build no for hotfix.
 2015-08-02 23:16:41 +02:00
Enno Rehling
d99ffaf1ed filter by curse-type before trying to call update_gbdreams. 2015-08-02 22:45:59 +02:00
Enno Rehling
b5ed7c562d wait until curse->magician has been resolve()'s before calling effskill() to find f->max_spelllevel. 2015-08-02 22:08:35 +02:00
Enno Rehling
17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling
a119f7617f add some assertions to make sure update_gbdream is not called without a magician 2015-08-02 21:17:21 +02:00
Enno Rehling
009993f2f4 address some PVS comments 2015-07-21 09:01:11 +02:00
Enno Rehling
602f254e22 Merge branch 'develop' of github.com:eressea/server into develop 
Conflicts:
	s/build
 2015-07-12 14:43:48 +02:00
Enno Rehling
21a81bd307 cleanup: struct declaration, more static. 2015-07-12 14:24:46 +02:00
Enno Rehling
f1b0488a78 missing include 2015-07-12 14:17:35 +02:00
Enno Rehling
0a57933e30 minor optimizations, error checking (static analysis) 2015-07-12 14:17:27 +02:00
Enno Rehling
3fc3660152 ignore PVS=-Studio files 2015-07-12 14:17:18 +02:00
Enno Rehling
c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling
7087c0e0ab Update to latest submodules, fix iniparser and critbit. 
I did this before, must have lost it in the merge. Crazy.
 2015-07-12 10:38:01 +02:00
Enno Rehling
083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling
11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling
cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling
a3a2e3074d uninitialized variable 2015-07-12 01:38:22 +02:00
Enno Rehling
c6da0c2189 fix tolua, I guess 2015-07-11 23:45:59 +02:00
Enno Rehling
bf4bad92db disable broken test, try new travis infrastructure 2015-07-11 16:02:51 +02:00
Enno Rehling
27835dc4e1 unit tests for STUDY and TEACH commands. 2015-07-09 13:24:21 +02:00
Enno Rehling
034d1d5433 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 19:03:45 +02:00
Enno Rehling
434923ec67 Merge pull request #257 from badgerman/feature/rename-cerddor 
Bug 2115: fix the name of Cerddor everywhere.
 2015-07-08 18:57:08 +02:00
Enno Rehling
b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling
05f444bab1 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 17:53:09 +02:00
Enno Rehling
efe2185b13 fix build, eliminate unused variables/functions. 2015-07-08 05:17:10 +02:00
Enno Rehling
6abf8f7adb bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell). 2015-07-08 05:12:26 +02:00
Enno Rehling
d7f4fbe05d remove enum constants for curses that are no longer referred to by them (deprecated style). 2015-07-07 21:10:18 +02:00
Enno Rehling
c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling
cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling
76a9dd6741 Merge remote-tracking branch 'upstream/develop' into develop 2015-07-07 15:34:42 +02:00
Enno Rehling
391a123a3e test that correct messages are sent to correct factions. 2015-07-07 14:42:07 +02:00
Enno Rehling
f9130fcb38 some more easy tests for sabotage. 2015-07-07 13:38:14 +02:00
Enno Rehling
d7e5876c62 fix build, missing limits.h include 2015-07-07 09:44:24 +02:00
Enno Rehling
1e669472a6 add a test and fix potential crashes in SABOTAGE command. 
sometimes even a simple test will uncover a ton of small errors.
 2015-07-07 09:29:43 +02:00
Enno Rehling
e25d3c8ed1 Fix a bug reporting DETROY messages to the correct unit. 
Add missing not-null assertions before accessing function parameters.
Eliminate all of the PVS-Studio warnings.
 2015-07-07 00:49:12 +02:00
Enno Rehling
05ec74f9ec annotate with finds from PVS Studio trial static analysis 2015-07-06 21:31:27 +02:00
Enno Rehling
09db2fe278 jsreport: return error if file not open. add scan-build to travis 2015-07-06 20:49:13 +02:00
Enno Rehling
ef4052b0f6 the outcome of a casual static analysis session. 2015-07-06 19:53:09 +02:00
Enno Rehling
17fb05b167 Merge pull request #253 from badgerman/feature/bug-1692-magicresistance-visibility 
bug 1692: magicresistance visibility
 2015-07-06 17:59:16 +02:00
Enno Rehling
960e0f8024 do not show magic resistance effects to other than the unit's own faction. 
https://bugs.eressea.de/view.php?id=1692
 2015-07-06 16:13:22 +02:00
Enno Rehling
7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling
4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +02:00
Enno Rehling
6df1e3eeb0 Merge pull request #250 from badgerman/feature/newplayer-fixes 
some fixes for new players
 2015-07-05 15:21:54 +02:00
Enno Rehling
a28ca695fd start new hotfix branch 2015-07-05 15:19:38 +02:00
Enno Rehling
ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling
fab3f0a8c0 Merge pull request #249 from badgerman/feature/bug-1596-flee-tactics-round 
Bug 1596: Schwer verwundete fliehen auch nach der Taktik-Runde.
 2015-07-04 18:12:59 +02:00
Enno Rehling
1e9e3a3b6a Bug 1596: Schwer verwundete fliehen auch nach der Taktik-Runde. 
https://bugs.eressea.de/view.php?id=1596
remove an unnecessary (and wrong) check.
 2015-07-04 17:54:00 +02:00
Enno Rehling
40cd6b3bc4 Merge pull request #248 from badgerman/feature/bug-1838-deathcloud-duration 
Bug 1838: deathcloud duration and messages
 2015-07-03 18:32:25 +02:00
Enno Rehling
af004bb27b individual poison damage messages 2015-07-03 18:27:10 +02:00
Enno Rehling
c42227c9e4 Bug 1838: Giftwolken dauern nur eine Woche, erscheinen nicht im Report. 
https://bugs.eressea.de/view.php?id=1838
- fix dc_age return value
- speed up curse reporting a little
 2015-07-03 17:36:37 +02:00
Enno Rehling
59745c7ed0 parentheses to fix operator precedence. 2015-07-03 16:13:24 +02:00
Enno Rehling
979f3460d6 Bug 1805: re-enable NMR warnings 
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
 2015-07-03 15:31:57 +02:00
Enno Rehling
b2d981e577 improved tests for DESTROY, fix destroy-after-attack 2015-07-03 13:08:06 +02:00
Enno Rehling
13ed70f2fd Merge pull request #245 from badgerman/feature/bug-1950-flee-and-guard 
Bug 1950: fleeing units can guard the same turn.
 2015-07-02 18:12:03 +02:00
Enno Rehling
a2376290d8 Bug 1950: fleeing units can guard the same turn. 
checking for UFL_FLEEING in can_start_guarding should make that impossible now.
https://bugs.eressea.de/view.php?id=1950
 2015-07-02 17:52:22 +02:00
Enno Rehling
98c161869f Merge pull request #244 from badgerman/develop 
Bug 1861 (MAXTEACHERS) and misc fixes
 2015-07-02 16:32:25 +02:00
Enno Rehling
f054ea114b Bug 1861: increase MAXTEACHERS, warn if it is still too small. 2015-07-02 16:23:38 +02:00
Enno Rehling
bfd93c68b2 remove bogus assert 2015-07-02 15:44:21 +02:00
Enno Rehling
a975073c0d fix an issue when reading pre-spellbook datafiles for E3. 2015-07-02 14:39:13 +02:00
Enno Rehling
31ca0ce052 fix a parser crash in the USE command. 2015-07-02 13:42:15 +02:00
Enno Rehling
37eb189cd0 Merge pull request #242 from badgerman/feature/bug-2080-move-after-destroy 
bug 2080: long actions after DESTROY
 2015-07-02 11:58:12 +02:00
Enno Rehling
fc2b8f3471 bug 2080: long actions after DESTROY 
https://bugs.eressea.de/view.php?id=2080
we forgot to set the flags. also added a test for the future.
 2015-07-02 11:42:18 +02:00
Enno Rehling
78857d8aa3 Merge pull request #240 from badgerman/feature/bug-2069-familiar-races 
bug 2069: familiar races
 2015-07-02 11:23:25 +02:00
Enno Rehling
b53d01eb18 Bug 1890: monsters do not respect the rules when giving excess weight to peasants. 
https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
 2015-07-02 11:08:38 +02:00
Enno Rehling
414f6d3210 bug 2069: not all E3 magic schools have a familiar. 
https://bugs.eressea.de/view.php?id=2069
quick fix: defaulting all additional schools to the illaun familiar.
 2015-07-02 09:49:51 +02:00
Enno Rehling
15e9c5962c merge feature/test-cleanup 
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
 2015-07-01 21:24:44 +02:00
Enno Rehling
0ee76ea8dd Bug 2113: player-owned dragons did not get movement bonuses. 
https://bugs.eressea.de/view.php?id=2113
 2015-06-26 20:12:01 +02:00
Enno Rehling
94ec39d7bb Bug 2114: broken army listing during combat. 
https://bugs.eressea.de/view.php?id=2114
 2015-06-26 14:44:28 +02:00
Enno Rehling
3ba2b3d4d7 indentation fixes (tab->spaces) 2015-06-26 14:31:21 +02:00
Enno Rehling
9b42824a5e Bug 2112: volcano stops smoking after it has erupted. 
https://bugs.eressea.de/view.php?id=2112
 2015-06-26 14:26:42 +02:00
Enno Rehling
6a42b6231e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-06-21 18:32:10 +02:00
Enno Rehling
a085442b8f eliminate unused variable. 2015-06-21 17:54:39 +02:00
Enno Rehling
04bf7153f0 remove a faction from its alliance when it is dead. 2015-06-21 17:49:22 +02:00
Enno Rehling
659aa6c973 after combat, eject enemies only 2015-06-20 14:28:16 +02:00
Enno Rehling
9b7a4e813b functional test for forced leave configuration. 
functional test for forced leave after combat.
functional test for MAKE TEMP.
error handling for Lua function building.create().
reduce some errors to warnings.
initialize race.battle_flags correctly (when not created through XML).
re-initialize processor in case config has changed.
handle missing translation of combat status, with error message.
 2015-06-19 13:17:01 +02:00
Enno Rehling
e7bffb7533 implement post-combat forced leave from ship/building 2015-06-19 07:53:11 +02:00
Enno Rehling
e6b3a6da65 suppress valgrind warning form issue #227 2015-06-17 07:54:56 +02:00
Enno Rehling
272653f8ba fixing sea serpents with empty names, again. https://bugs.eressea.de/view.php?id=2057 2015-06-12 18:05:56 +02:00
Enno Rehling
4e33e59d64 more lua_pushinteger conversion for lua 5.3 2015-06-08 21:19:17 +02:00
Enno Rehling
84f8a9f746 calculate simple default scores for items that do not have one defined in XML. 2015-06-08 21:15:07 +02:00
Enno Rehling
2967cd59cf replace pushnumber with pushinteger where applicable (prep for Lua 5.3). 
also kill an unreferenced string.
 2015-06-08 20:53:40 +02:00
Enno Rehling
872721dc0f Merge branch 'master' of github.com:eressea/server 2015-06-08 09:46:55 +02:00
Enno Rehling
4a31bea3b9 increase build number, new version installed 2015-06-08 09:46:07 +02:00
Enno Rehling
563a08de97 Merge branch 'develop' of github.com:eressea/server into develop 2015-06-08 09:44:04 +02:00
Enno Rehling
266b019928 Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit 
Conflicts:
	scripts/eressea/xmlconf.lua
 2015-06-08 09:43:36 +02:00