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

330 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Enno Rehling
2a61dc4d11 prepare for give_men refactoring by writing some basic tests. 2014-12-10 20:44:33 +01:00
Enno Rehling
1024dd5c81 Refactoring morale into a separate module. 
Not all of it yet, because it is inconveniently part of kernel/region.
 2014-12-10 19:04:02 +01:00
Enno Rehling
01877f5169 cleanup, fix a TODO, eliminate dead code. 2014-12-10 09:39:11 +01:00
Enno Rehling
0c54c7e32d always nice to eliminate a few TODO's and kill some bitrot. 2014-12-09 23:27:05 +01:00
Enno Rehling
188e003f7c retrofit tests for alliances. 2014-12-09 14:43:11 +01:00
Enno Rehling
9b56ccf53c cleaning up some alliance code, killing bitrot from WDW. 2014-12-09 14:14:35 +01:00
Enno Rehling
2c077c25e8 space savings: update data files, remove names from NPC units where their name is their race. 2014-12-09 07:44:26 +01:00
Enno Rehling
0fead39b41 added a function that sets a monster's name to NULL if it is the name of its race. 
deprecate old rc_name function (renamed to rc_name_s) because it used a static return string.
 2014-12-09 07:20:36 +01:00
Enno Rehling
bde56aa1f8 eliminate unused variables, fix CI build. 2014-12-09 06:46:45 +01:00
Enno Rehling
9394c4324e units without a name will use their race as a default name. 2014-12-09 06:45:21 +01:00
Enno Rehling
3428f40f81 load inifile in main, it is only used by the server. 
this should fix the broken CI build.
 2014-12-09 06:01:10 +01:00
Enno Rehling
b551edbdb3 refactoring: moving unitname to unit.c. 
also removing static-string some cruft from config.c.
 2014-12-09 05:55:16 +01:00
Enno Rehling
669712f04f rename race_ to _race, to follow the style guide. 2014-12-08 22:06:05 +01:00
Enno Rehling
3dd3761acd prevent an invalid assert when undead heroes are magical 2014-12-07 11:14:14 +01:00
Enno Rehling
7b2d1991d8 add missing file, fix factions that lack a locale. 2014-11-23 21:15:09 +01:00
Enno Rehling
5b9eb9080f refactoring: move all monster-related code into monster.c 
make some features depend on being NPCs, not monster faction.
 2014-11-11 16:53:56 +01:00
Enno Rehling
ebd115b04a refactor of rc_specialdamage, and move it into battle, nothing else uses it. 2014-11-09 22:31:41 +01:00
Enno Rehling
e9084d9678 when free_gamedata, also unhash all factions. speed up is_monsters(). 2014-11-07 22:58:29 +01:00
Enno Rehling
d1f7fb571c fix test for get_monsters(), nobody needs the function to ever return NULL. 2014-11-07 21:28:58 +01:00