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
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
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
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