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

2675 commits

Author SHA1 Message Date
Enno Rehling
f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling
ac4e32a8f5 Merge branch 'master' into develop 2016-10-23 09:59:42 +02:00
Enno Rehling
34a6dd8d54 fix crash in 997: re-introduce cfindhash. 
this prevents duplicate curse.no values.
 2016-10-22 22:35:10 +02:00
Enno Rehling
06bfd2df5f Merge remote-tracking branch 'eressea/develop' into develop 2016-10-16 16:48:53 +02:00
Enno Rehling
75422e1ba6 fix gcc conversion warnings 2016-10-09 10:07:05 +02:00
Enno Rehling
bf8d3b57b3 Merge branch 'develop' of github.com:eressea/server into develop 2016-10-09 10:01:36 +02:00
Enno Rehling
3d191b6573 not likely to get fixed 2016-10-09 10:01:31 +02:00
Enno Rehling
9287d0c1b4 unused function 2016-10-07 22:06:47 +02:00
Enno Rehling
38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling
fb470b7af1 re-organize lighthouse reporting. 2016-10-05 20:36:01 +02:00
Enno Rehling
5fe0503cd8 remove the unicode.h include from files that don't use it. 2016-10-05 16:43:14 +02:00
Enno Rehling
e79b36bc36 introduced a memory leak i last commit 2016-10-04 10:51:37 +02:00
Enno Rehling
61f76e6722 make old_race a little bit less awful. 2016-10-04 10:34:18 +02:00
Enno Rehling
3338f00fcb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-04 09:15:11 +02:00
Enno Rehling
d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling
63f60a2465 cache some more get_race calls, especially for RC_SPELL. 2016-10-03 20:36:46 +02:00
Enno Rehling
8f1a1fc8c3 tighten up some lookups. 2016-10-03 20:27:36 +02:00
Enno Rehling
fbdf845cb9 fix overpopulation-checks and movement based on splitsize. 2016-10-03 20:15:38 +02:00
Enno Rehling
26a416c5ba do not call can_survive all this much. 2016-10-03 16:38:17 +02:00
Enno Rehling
ef43aaa830 eliminate some duplicate calculations. 2016-10-03 16:28:18 +02:00
Enno Rehling
42e75007c3 little bit of refactoring and better variable names. 2016-10-03 16:26:40 +02:00
Enno Rehling
fadf591a32 gcc appeasement (overflow in constant conversion). 2016-10-02 13:19:39 +02:00
Enno Rehling
693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00
Enno Rehling
8728fccaec fix an endless loop in unicode_utf8_to_cp437 for characters not in the table. 2016-10-02 12:46:07 +02:00
Enno Rehling
c53ac9d8aa remove RS_FARVISION, it is the only spell that uses units. 2016-10-01 21:03:16 +02:00
Enno Rehling
a8a7f68112 Merge pull request #586 from ennorehling/bug-2234-maintenance-msg 
Bug 2234: building maintenance messages
 2016-10-01 18:43:16 +02:00
Enno Rehling
c640fb4be8 compile in the absence of libxml2-dev 2016-10-01 16:39:35 +00:00
Enno Rehling
cbd1e8c457 Fixing https://bugs.eressea.de/view.php?id=2234 
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
 2016-10-01 18:34:38 +02:00
Enno Rehling
41db460278 Merge pull request #585 from ennorehling/tolua-build 
allow building with lua 5.1 and matching tolua version
 2016-10-01 06:40:38 +02:00
Enno Rehling
04333e71d6 working on a new tolua build step that supports 5.1 2016-09-30 19:47:40 +00:00
Enno Rehling
fc6ab724a5 fix the economy test. no idea why it passes now? 
this doesn't represent the bug 2234 that I am trying to repro, yet.
 2016-09-27 15:40:03 +02:00
Enno Rehling
f2d0d74e70 fix the test, except it doesn't fail anymore? 2016-09-27 15:02:22 +02:00
Enno Rehling
10806a1d95 add a failing test for bug 2234 2016-09-27 08:25:58 +02:00
Enno Rehling
3bbd2bcce8 Merge pull request #581 from ennorehling/follow-nodrift 
FEATURE: ships that FOLLOW or use PIRACY are not affected by storms.
 2016-09-25 08:37:18 +02:00
Enno Rehling
42c44724f8 testing lazy find_spell calls for equipment configuration 2016-09-24 17:29:55 +02:00
Enno Rehling
423e293745 some more config lookup caching 2016-09-23 20:39:08 +02:00
Enno Rehling
c606a9ac4d extract RC_SPELL handling into a small function, minimize get_race calls. 2016-09-22 20:22:23 +02:00
Enno Rehling
37a5954c20 NPC races cannot be recruited (and provide no score). 2016-09-22 20:11:14 +02:00
Enno Rehling
5ccb2c3dc8 remove recruitcost from non-player races. 
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
 2016-09-22 18:28:37 +02:00
Enno Rehling
2c0f0bfc1e reduce get_race calls by a few more 2016-09-22 15:51:11 +02:00
Enno Rehling
dfab45dc0c actually don't call old_race anymore 2016-09-22 09:41:30 +02:00
Enno Rehling
e45dc3d68a initizlize rc_elf 2016-09-22 09:37:54 +02:00
Enno Rehling
ac4f8d6e7b make monsters scaring peasants a per-race configuration. 
reduce the number of old_race calls that monster.c makes.
 2016-09-22 09:34:23 +02:00
Enno Rehling
ff83d5108a remove old_race call form heal_factor 2016-09-22 09:08:02 +02:00
Enno Rehling
a3ad9a0222 I am now calling get_race far too often. Fix this a bit. 2016-09-20 20:27:41 +02:00
Enno Rehling
69b420ae2f separate interval generation from seen-markup a bit more. 2016-09-20 15:53:55 +02:00
Enno Rehling
f8ac5c390d SAMRT_INTERVALS is no longer an option, but regular 2016-09-20 09:39:21 +02:00
Enno Rehling
73f33a7d0f Merge branch 'develop' 
Conflicts:
	src/kernel/config.c
 2016-09-19 20:22:53 +02:00
Enno Rehling
7d88dddcc3 Merge pull request #578 from ennorehling/cache-buiding-type 
add an API for caching the results of bt_find
 2016-09-19 20:14:27 +02:00
Enno Rehling
98d810dded Merge pull request #579 from ennorehling/cache-curse-type 
add an API for caching the results of ct_find
 2016-09-19 20:14:16 +02:00
Enno Rehling
12239178c6 rc_find optimizations in monster AI. 
remove dead alp code.
 2016-09-19 20:10:01 +02:00
Enno Rehling
aceb880826 add some TODO and reduce old_race usage. 2016-09-19 18:45:16 +02:00
Enno Rehling
a7fbe4901b eliminate old_race. make the catdragon act like a dragon. 2016-09-19 18:42:14 +02:00
Enno Rehling
043ff40d02 eliminate another call to old_race. 2016-09-19 18:28:44 +02:00
Enno Rehling
1f100a1b6c replace old_race calls with get_race. 2016-09-19 16:10:10 +02:00
Enno Rehling
e6677806b6 refactor unholy power, extract function 2016-09-19 16:03:02 +02:00
Enno Rehling
6ec99af4d6 mark all three major dragon types as RCF_DRAGON. 
use RCF_DRGON flag to detemine BP_DRAGON speed.
 2016-09-19 15:53:31 +02:00
Enno Rehling
b958fa1c2e get_race is better than old_race 2016-09-19 08:56:33 +02:00
Enno Rehling
115e13d513 initialize variable 2016-09-19 08:42:07 +02:00
Enno Rehling
6964267c37 static variables, duh 2016-09-19 08:35:54 +02:00
Enno Rehling
be5f15e18a fix const-conversion warning 2016-09-19 08:32:09 +02:00
Enno Rehling
ee77075cb6 cache get_race calls 2016-09-19 08:25:39 +02:00
Enno Rehling
025c0b91d9 cache the toad race 2016-09-19 07:02:45 +02:00
Enno Rehling
fe383af5f2 sample usage of race caching 2016-09-19 06:58:24 +02:00
Enno Rehling
96d6abdc5a add caching API for rc_find 2016-09-19 06:55:32 +02:00
Enno Rehling
f8167ed62c test get_race and others 2016-09-19 06:47:46 +02:00
Enno Rehling
fbd596fbfa remove bad caching in get_race 2016-09-19 06:43:56 +02:00
Enno Rehling
9af5fb0326 cache some of the highest-ranking ct_find callers 2016-09-19 04:23:49 +02:00
Enno Rehling
d139ee08d1 caching building_type in economy code 2016-09-19 04:15:26 +02:00
Enno Rehling
640ba05876 allow local caching of bt_find results 2016-09-19 04:04:02 +02:00
Enno Rehling
e7739867df use curse_type caching in att_modification 2016-09-19 03:55:12 +02:00
Enno Rehling
eb8376ef70 allow caching of ct_find results 2016-09-19 03:52:10 +02:00
Enno Rehling
dc5fe4a0eb recruiting fewer units than expected creates a message. 2016-09-18 13:49:34 +02:00
Enno Rehling
7ef316f773 Merge branch 'develop' into kill-seen-region 2016-09-18 13:42:32 +02:00
Enno Rehling
ec9d8eab1c fix marking seen_neighbour regions. 
fix reports-tests that didn't think about them.
 2016-09-18 13:27:25 +02:00
Enno Rehling
63a97d6bc0 check that regions are flagged with seen_neighbour where needed. 2016-09-18 13:13:07 +02:00
Enno Rehling
651ce11741 do not report seen_none in CR 2016-09-18 12:44:03 +02:00
Enno Rehling
6c9c460815 fix failing unit tests, remove deleted unit from f->units list. 2016-09-18 11:46:54 +02:00
Enno Rehling
bb689aa7b6 assert that f->units list is correct after remove_unit (fails) 2016-09-18 11:46:19 +02:00
Enno Rehling
b3c31856aa add (failing) test for recruiting into existing units. 2016-09-18 11:34:54 +02:00
Enno Rehling
ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling
a5d44f9638 re-enable creport 2016-09-17 22:57:22 +02:00
Enno Rehling
196c3b7ac8 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-17 20:05:31 +02:00
Enno Rehling
a425a78f7c add a lighthouse to the sample data. 2016-09-17 20:01:49 +02:00
Enno Rehling
e97ebb0469 RF_SAVEMASK needs to include RF_LIGHTHOUSE or the new report prep doesn't work. 2016-09-17 19:52:13 +02:00
Enno Rehling
b41f041d52 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
	src/reports.test.c
 2016-09-17 15:56:32 +02:00
Enno Rehling
4c7d51990e prepare_report should stay static, remove that change. 2016-09-17 15:37:11 +02:00
Enno Rehling
eb7dd051f8 fix bug 2237, respect lighthouse capacity. 2016-09-17 15:31:04 +02:00
Enno Rehling
c4dbb69681 previous test was bad and did not actually exercise prepare_lighthouse. 
made a slighlty better test, which is failing for the right reasons.
 2016-09-17 15:29:28 +02:00
Enno Rehling
1ca67a57d2 add a new test for lighthouse capacity. 
https://bugs.eressea.de/view.php?id=2237
 2016-09-17 14:54:39 +02:00
Enno Rehling
2a0bd3e7ca unused variable warning 2016-09-17 13:29:14 +02:00
Enno Rehling
7349ec0aa9 improve lighthouse tests. 
you must be inside lighthouse to get a report from it.
 2016-09-17 13:20:02 +02:00
Enno Rehling
951bf5718e Merge branch 'develop' into kill-seen-region 2016-09-17 12:41:06 +02:00
Enno Rehling
adfafd51a6 test lighthouses 2016-09-17 12:34:02 +02:00
Enno Rehling
0753ea0174 fix travelthru reporting (passes unit test) 2016-09-17 08:28:33 +02:00
Enno Rehling
a2125fbb9a managed to reproduce the travelthru bug in a unit test. 
travel from other factions inside the [first, last) interval will poison the report.
 2016-09-16 21:26:17 +02:00
Enno Rehling
a86e30d014 re-enable report testing, find out that it fails. 2016-09-16 21:17:54 +02:00
Enno Rehling
74ff763b22 speeding up default_wage a little bit. 2016-09-16 21:12:03 +02:00
Enno Rehling
567083c9e8 fix bad translation key 2016-09-16 20:18:53 +02:00
Enno Rehling
9d60a0f967 missing forward struct declaration 2016-09-16 19:28:07 +02:00
Enno Rehling
783c042d50 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
 2016-09-16 19:11:05 +02:00
Enno Rehling
acfa2cfbe5 remove view functions for special planes (Regatta). 2016-09-16 18:59:24 +02:00
Enno Rehling
d449ce4a8c re-enable report writing, fix report.c to work without seen_region 2016-09-16 18:03:28 +02:00
Enno Rehling
007f4d8b0d test that travelthru notifications will make it into the report. 2016-09-16 17:25:40 +02:00
Enno Rehling
6fed596c36 Merge branch 'develop' into kill-seen-region 2016-09-16 17:12:40 +02:00
Enno Rehling
1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +02:00
Enno Rehling
ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
b0799bd152 fix travis build by not depending on CMake 2.8.8 2016-09-16 16:30:56 +02:00
Enno Rehling
dc004b2d71 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 16:30:49 +02:00
Enno Rehling
47526dd36b smarter version.c build that avoids full rebuilds. 2016-09-16 16:30:43 +02:00
Enno Rehling
10916bb0a1 use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c 2016-09-16 16:30:30 +02:00
Enno Rehling
318cf68e1b move version string into a single object file 2016-09-16 16:30:17 +02:00
Enno Rehling
bf59b1adf9 fix travis build by not depending on CMake 2.8.8 2016-09-16 10:55:38 +02:00
Enno Rehling
00a3a934f5 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 09:49:53 +02:00
Enno Rehling
dbde14fdff smarter version.c build that avoids full rebuilds. 2016-09-16 09:39:59 +02:00
Enno Rehling
3f86014e9d delete files created by report_summary 2016-09-15 21:16:45 +02:00
Enno Rehling
77e39fc64b use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c 2016-09-15 20:14:17 +02:00
Enno Rehling
d8d3cd4cc4 move version string into a single object file 2016-09-15 20:11:38 +02:00
Enno Rehling
42bfc43e4f test lighthouse preparation 2016-09-15 13:01:08 +02:00
Enno Rehling
2b9e5ffff9 check seen_neighbour 2016-09-15 10:02:49 +02:00
Enno Rehling
dfbc520203 add a simple test for prepare_report. 
TODO: it is _too_ simple.
 2016-09-14 21:46:57 +02:00
Enno Rehling
929db73102 disable integration tests 
combine prepare_ functions
 2016-09-14 17:14:04 +02:00
Enno Rehling
8ec37783e2 fix nul-pointer access 2016-09-13 21:13:26 +02:00
Enno Rehling
cd71a21bf5 really disable reports 2016-09-13 21:09:05 +02:00
Enno Rehling
482e619969 disable reports entirely. 2016-09-13 20:17:59 +02:00
Enno Rehling
4e4b4e482e split off report.test from reports.test 
move some tests around
 2016-09-13 20:13:26 +02:00
Enno Rehling
428f640ba6 disable reports tests. have to sort them by report.test and reports.test first 2016-09-13 19:09:53 +02:00
Enno Rehling
648857f52c disable report.c temporarily 2016-09-13 18:52:35 +02:00
Enno Rehling
acfb06392a Everything except report.c compiles. 
Not that I'm not claiming that it works.
 2016-09-13 17:02:51 +02:00
Enno Rehling
20578da0e9 delete the old seen.* files 
remove includes for seen.h
remove unused functions
 2016-09-13 16:58:48 +02:00
Enno Rehling
f520d8396d make creport not use seen_region. 
remove jsreport from build
 2016-09-13 15:30:09 +02:00
Enno Rehling
71fa3600f7 recalculate [first,last) after lighthouses aand trvelthru 2016-09-13 09:09:35 +02:00
Enno Rehling
652ead4f60 prepare_seen has to check for ctx->f. we are no longer preparing everyone at once 2016-09-13 07:46:08 +02:00
Enno Rehling
a67950433d WIP: prepare_seen vs lastregion/firstregion. 
lighthouses and travelthru are handled by both, should only be in prepare_seen?
 2016-09-12 22:03:16 +02:00
Enno Rehling
84bc6c58a8 prepare_reports gone 
prepare_seen is something else now
unit tests are crashing
 2016-09-12 15:59:22 +02:00
Enno Rehling
f946d50001 alternative implementation for dfindhash that doesn't use as much memory. 
do not set u->faction = NULL for deleted units.
 2016-09-11 20:09:48 +02:00
Enno Rehling
3e2c630c3f testing that remove_unit takes unit out of the world properly. 
there is more to it than this, but I'd be happy with the dfindhash check for now.
 2016-09-11 19:39:35 +02:00
Enno Rehling
f07c79e5cf CID 146892: null-pointer check should be an assert. 2016-09-11 19:09:23 +02:00
Enno Rehling
95481211e5 expect remove and unlink to set errno when file doesn't exist, reduce misleading spam. 2016-09-11 17:19:27 +02:00
Enno Rehling
0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling
402c19d8fc dn't warn new player about NMR. 
newbie info text was no longer valid.
 2016-09-11 16:35:55 +02:00
Enno Rehling
49ccb3825f test and cache all the rules! 2016-09-11 15:54:03 +02:00
Enno Rehling
86ef225ccb add some more local caching. 2016-09-11 12:48:00 +02:00
Enno Rehling
f75be76ee1 created a new configuration caching API (config_changed). 
applied this to some rules.
 2016-09-11 12:15:53 +02:00
Enno Rehling
d45798b798 fix leaking errno from save.test call to remove 2016-09-11 11:06:58 +02:00
Enno Rehling
5dc9ccb03e do not call log10(0) for new lighthouses. 
some tests for LEARN MAGIC.
 2016-09-11 11:02:04 +02:00
Enno Rehling
3a438ffd4f I have questions about this 2016-09-10 21:12:19 +02:00
Enno Rehling
a41f3dbe27 fix memory leak, not cleaning up deadhash 2016-09-10 21:01:22 +02:00
Enno Rehling
5f915948f5 add a test for the deadhash feature (mathes units to dead factions) 2016-09-10 20:56:13 +02:00
Enno Rehling
497f53102c set version based on most recent tag 2016-09-10 18:44:19 +02:00
Enno Rehling
7807f83830 fix compilation (buildno.h is gone) 2016-09-10 17:43:06 +02:00
Enno Rehling
e200952e87 new version numbering in version.h 
eliminate buildno.h
TODO: update build scripts
 2016-09-10 17:41:44 +02:00
Enno Rehling
c352ab9f8e move game-version information fom version.h to gamedata.h 2016-09-10 17:21:17 +02:00
Enno Rehling
cb381123ff fix some calendar-related leaks and issues 2016-09-09 18:39:38 +02:00
Enno Rehling
781ae306b4 introduced a bug when refactoring 2016-09-09 17:42:00 +02:00
Enno Rehling
b56d1220b7 make the summary test pass without a leak 2016-09-09 17:40:36 +02:00
Enno Rehling
a62a14956f quickly fix summary test when there is no calendar defined 2016-09-09 17:29:17 +02:00
Enno Rehling
5864651b28 WIP: add a simple test for summary, add a simple dtor for them (it is still leaking stuff). 2016-09-09 17:20:09 +02:00
Enno Rehling
053f8a6e09 clean up the dead faction hashtable between tests. 2016-09-08 21:15:29 +02:00
Enno Rehling
87328a0e92 eliminate memory leak in a test. 2016-09-08 21:01:58 +02:00
Enno Rehling
51c1ddc98b save.test is still lekaing units. 
calling test_setup and test_cleanup, doesn't fix everything.
 2016-09-08 20:44:03 +02:00
Enno Rehling
e3f774b4b0 release version 3.9.2 2016-09-08 20:35:07 +02:00
Enno Rehling
93a1fe5059 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-08 20:10:58 +02:00
Enno Rehling
ab876431de reset turn to 0 before and after each test. 
save tests that depend on the global turn variable would fail when being run out of order.
this cause issue #560
 2016-09-08 19:48:36 +02:00
Enno Rehling
d5261ab1da fix group.test leaks 2016-09-08 17:40:17 +02:00
Enno Rehling
a281ace21b always create test units inside a region (so they can get destroyed in free_gamedata) 2016-09-08 09:11:17 +02:00
Enno Rehling
22586aa45f fix seen.test creating a unit without a region 2016-09-08 09:06:02 +02:00
Enno Rehling
8cefc17e3e Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-08 08:55:18 +02:00
Enno Rehling
25e5d1d285 use test_setup to start tests 2016-09-08 08:12:26 +02:00
Enno Rehling
993af3a7f9 memory leak in equipment.skills 2016-09-08 06:56:16 +02:00
Enno Rehling
cb706c2cf2 equipment.test is down to two leaks and one TODO 2016-09-07 21:29:54 +02:00
Enno Rehling
d84ed1f89d move static variable cleanup to kernel_done. 
clean up some more.
 2016-09-07 21:22:05 +02:00
Enno Rehling
ef5ce04335 remove unused code 2016-09-07 20:50:52 +02:00
Enno Rehling
144fcbef58 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-07 20:48:16 +02:00
Enno Rehling
dda845e2f4 free configuration data (valgrind calls it still-reachable leaks). 2016-09-07 20:46:41 +02:00
Enno Rehling
c8283060f9 test_setup/cleanup for equipment.test 2016-09-07 19:04:42 +02:00
Enno Rehling
282cc129d7 spellbook_clear crash fix 2016-09-07 19:02:03 +02:00
Enno Rehling
dd2f146e27 fix equipment static memory leak 2016-09-07 17:09:37 +01:00
Enno Rehling
af310d48d6 remove unused function after refactoring 2016-09-07 17:52:12 +02:00
Enno Rehling
4115bff79b eliminate leak from alliance.test 2016-09-07 17:50:51 +02:00
Enno Rehling
9499919387 fix uninitialized member 2016-09-07 17:48:27 +02:00
Enno Rehling
632f25d429 try to eliminate memory leak in command.test 2016-09-07 16:39:54 +01:00
Enno Rehling
1ad2775f51 simplify add_command 2016-09-07 15:43:04 +02:00
Enno Rehling
eed6e1d88d add_command has an unused argument 2016-09-07 15:36:48 +02:00
Enno Rehling
d962dd110a correct type. 2016-09-07 15:29:40 +02:00
Enno Rehling
133bef1041 fix compilation. 
eliminate the last order-related memory leak.
 2016-09-06 22:21:06 +02:00
Enno Rehling
270c12b6d8 these config tests were leaking orders. 
convert them to test_setup use, too.
 2016-09-06 21:04:25 +01:00
Enno Rehling
00804344fd fix order-related memory leaks 2016-09-06 21:07:23 +02:00
Enno Rehling
a5ce809f41 fix memory leak in umlaut.c with reference counting (sad). 2016-09-06 19:57:07 +01:00
Enno Rehling
b62fa64d8c closer leak debugging 2016-09-05 20:05:36 +02:00
Enno Rehling
c525553c49 unused variable 2016-09-05 17:48:54 +01:00
Enno Rehling
fa6a3e377d relocate the addtoken leak "test" to umlaut.test.c 2016-09-05 18:46:02 +02:00
Enno Rehling
7b5383dfff disable all direction tests instead of the minimal leak proof 2016-09-05 17:57:59 +02:00
Enno Rehling
98d1fb935c Feature: ships that FOLLOW or use PIRACY are not affected by storms. 2016-09-04 22:00:37 +01:00
Enno Rehling
530a6d067f Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-04 22:52:13 +02:00
Enno Rehling
b2b9b9eae4 test having more than one name per direction. 
use test_setup.
 2016-09-04 21:52:09 +01:00
Enno Rehling
19d490ce71 test_create_locale leaks memory. 
adding a simple test that shows this (under valgrind).
 2016-09-04 22:07:52 +02:00
Enno Rehling
a5b3fad67a skeleton of a language test, try to find init_direction memory leak. 2016-09-04 20:27:36 +01:00
Enno Rehling
a56f51099c use test_setup in seen.test 2016-09-04 21:15:22 +02:00
Enno Rehling
e7b93adb75 rearranging deckchairs on the HMS Random Numbers. 2016-09-04 17:04:41 +01:00
Enno Rehling
388ea174ef disable conversion warning (for mtrand code). 
do not know how to do it selectively, so disabling all of it.
 2016-09-04 13:09:10 +02:00
Enno Rehling
2ccd2c0c16 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-04 10:47:40 +02:00
Enno Rehling
00c4c337ff remove crypto submodule, stea mtrand from it 2016-09-04 10:47:21 +02:00
Enno Rehling
b5298f60bf Merge pull request #552 from ennorehling/issue-551-description 
issue #551 and some other tests
 2016-09-02 15:43:08 +01:00
Enno Rehling
4e323f8120 bugfix #551: do not return a stack buffer that isn't static 2016-09-02 16:18:45 +02:00
Enno Rehling
b725e9676a simple test for basic unit descriptions 2016-09-02 09:29:52 +02:00
Enno Rehling
ed2c4ec56a missing null-check before isparam 2016-09-01 21:57:50 +02:00
Enno Rehling
3a719226a2 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-01 21:55:52 +02:00
Enno Rehling
9f7e4effc2 Merge branch 'master' of github.com:eressea/server 2016-09-01 21:51:45 +02:00
Enno Rehling
fed399042d fix piracy order aliasing issue #549 
https://bugs.eressea.de/view.php?id=2233
piracy_cmd always works on u->thisorder, does not need an argument.
 2016-09-01 20:40:07 +01:00
Enno Rehling
b321918cd1 check and fix destroy_cmd syntax error handling 2016-08-31 20:38:20 +02:00
Enno Rehling
3c1704e691 Merge remote-tracking branch 'upstream/develop' into develop 2016-08-31 18:51:29 +01:00
Enno Rehling
87fed5b7d2 Merge pull request #548 from ennorehling/refactor-volcano 
new tests, TODOs removed, remove code duplication
 2016-08-31 17:19:29 +01:00
Enno Rehling
298b3893f2 update development version 2016-08-31 18:18:51 +02:00
Enno Rehling
6204bdc000 Merge branch 'develop' 2016-08-31 18:17:50 +02:00
Enno Rehling
a858ceda76 release version 3.9.1 2016-08-31 18:15:54 +02:00
Enno Rehling
a08ad52809 Merge branch 'develop' 
Conflicts:
	src/util/log.c
 2016-08-31 18:15:07 +02:00
Enno Rehling
f722364090 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-08-31 17:40:50 +02:00
Enno Rehling
24c877d974 reduce failing test to less code 2016-08-31 17:38:33 +02:00
Enno Rehling
8aec1c3e7f narrowing down the memory leak in jsonconf.test.c, by adding a similar 
test to umlaut.test.c that exhibits the same behavior in a simpler
setting.
 2016-08-31 17:37:07 +02:00
Enno Rehling
1eb0fd758a fix broken seaserpent test 2016-08-31 16:47:36 +02:00
Enno Rehling
8a157de36c only name monsters that have a naming function. test is bad, failing. 2016-08-31 16:43:02 +02:00
Enno Rehling
9a72157cf3 split out seaserpent creation for testing 2016-08-31 11:35:07 +02:00
Enno Rehling
cd46bac132 fix mac build with clang 7.3 2016-08-31 09:42:36 +02:00
Enno Rehling
fa729ba972 fix mac build with clang 7.3 2016-08-31 09:26:48 +02:00
Enno Rehling
afeea58999 fix include order 2016-08-30 21:22:32 +02:00
Enno Rehling
a1d56acfe6 missing include, I believe 2016-08-30 20:15:28 +01:00
Enno Rehling
d9e541843b further reduce number of bt_find calls. 2016-08-30 09:36:09 +01:00
Enno Rehling
5bb9a10a46 is_building_type should be a quicker way to test for a building type than bt_find. 2016-08-30 09:13:59 +01:00
Enno Rehling
fdc91c01a0 remove some FIXME comments 2016-08-30 07:56:40 +01:00
Enno Rehling
2d1a13a811 death to static caches! 2016-08-30 07:51:05 +01:00
Enno Rehling
257d5c18bb remove unused FASTER_SKILLMOD optimization 2016-08-30 07:39:57 +01:00
Enno Rehling
ce7eb9663a remove dead phoenix feature. 2016-08-29 20:56:00 +01:00
Enno Rehling
eee4fa9e91 I am pretty sure the phoenix doesn't work. 2016-08-29 20:53:53 +01:00
Enno Rehling
d0c1b2daa4 that's all folks. no more static curse_type caches. 2016-08-29 20:36:26 +01:00
Enno Rehling
873e6f8086 remove more static curse_type variables 2016-08-29 20:34:30 +01:00
Enno Rehling
f47113e9bd eliminate static curse variables (gbdream & more) 2016-08-29 20:31:18 +01:00
Enno Rehling
1a1ec3f363 cleanup: remove static curse_type variables. 2016-08-29 20:12:31 +01:00
Enno Rehling
b43ac6ab27 remove static initialization code 2016-08-29 19:52:43 +01:00
Enno Rehling
aa998166e4 optimization: the orcish curse is pretty rare, and we are spending a lot of time on processing it. 
remove static variables.
 2016-08-29 19:44:43 +01:00
Enno Rehling
8ff26eb0e4 optimization: no need to look for a curse if unit has no attribs. 2016-08-29 19:41:21 +01:00
Enno Rehling
40d9ebfa94 reduce code duplication: itemcloak code was copied between NR and CR. 2016-08-29 19:37:47 +01:00
Enno Rehling
5a73fc80d8 telepath_see is a planned, but never realized, feature. delete it. 2016-08-29 18:20:36 +01:00
Enno Rehling
4bc8817056 remove a TODO that was ill-advised. The reason that "resources" is a list is that it's built incrementally. 2016-08-29 18:15:20 +01:00
Enno Rehling
ef44a4534e add a test for copying resources message arguments. 
my plan is to add a new argument type for arrays of resources with fewer allocations.
 2016-08-29 17:31:09 +01:00
Enno Rehling
fb2b6495e5 promote spell.test error logging to a tests.c API, use it for item.test 2016-08-29 15:19:17 +01:00
Enno Rehling
2c5063095d fixed: tests that try to create duplicate spells do not spam stderr. 2016-08-29 14:49:31 +01:00
Enno Rehling
c032091b39 new rule: call test_setup to begin test, test_cleanup at end. 2016-08-29 14:21:28 +01:00
Enno Rehling
1c5fcded9f allow control over stderr logging from tests. 
separate test_cleanup from test_setup.
 2016-08-29 14:09:47 +01:00
Enno Rehling
2eb9b5c5ea delete dead code (dbrace) 2016-08-29 13:49:39 +01:00
Enno Rehling
fd273848ae add an assert_alloc macro for allocations that cannot fail. 2016-08-29 09:26:49 +01:00
Enno Rehling
1f3413a9b4 annotations 2016-08-29 08:55:59 +01:00
Enno Rehling
0d609f2115 test magicwalls and strongwalls effects on buildings. 2016-08-29 08:53:09 +01:00
Enno Rehling
23a91be9c1 basic test for skilldiff. 2016-08-29 08:06:33 +01:00
Enno Rehling
194f96c50f eliminate some possible null-pointer exceptions 2016-08-28 21:03:23 +01:00
Enno Rehling
5bc5dbdca1 check for out-of-memory situations. 2016-08-28 20:54:02 +01:00
Enno Rehling
33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01:00
Enno Rehling
c18d75207e remove a TODO: static return variable from make_names. 2016-08-28 20:31:25 +01:00
Enno Rehling
e3b0dfedc9 race naming functions do more work than before. 2016-08-28 20:27:40 +01:00
Enno Rehling
514565d66b move race_name_func registrations into race.c 2016-08-28 20:02:45 +01:00
Enno Rehling
0f3de70ced refactor to push back the const-ness of generated names. 2016-08-28 19:06:14 +01:00
Enno Rehling
d1b6629281 extract counting name particles. 2016-08-28 19:00:04 +01:00
Enno Rehling
0ac30c65a1 refactoring prior to removing static variable 2016-08-28 18:15:00 +01:00
Enno Rehling
eb8db3bfb9 test undead name generation. 2016-08-28 18:08:52 +01:00
Enno Rehling
020ab942ec add tests for monster naming functions (existence only). 2016-08-28 17:37:08 +01:00
Enno Rehling
534708d83e add a test for DESTROY <limit> ROAD 2016-08-28 16:51:16 +01:00
Enno Rehling
a451d61f23 simplify destroy_cmd parsing. 2016-08-28 16:48:06 +01:00
Enno Rehling
808d51429e test destroy_road message arguments. 2016-08-28 16:44:14 +01:00
Enno Rehling
b0400a797d when not skilled enough to destroy a road, don't get a destroy_road message. 
test destroy_road message.
 2016-08-28 16:31:29 +01:00
Enno Rehling
1cdeab5e06 test destroy_road skill scaling and person scaling. 2016-08-28 16:13:26 +01:00
Enno Rehling
1e04e20671 testing destroy_road by way of destroy_cmd. 
two simple cases only.
 2016-08-28 14:31:25 +01:00
Enno Rehling
cf96013e0b better volcano message testing. 2016-08-28 14:06:57 +01:00
Enno Rehling
3bc2221bfe finish testing the (current) volcano_dead message. 2016-08-28 10:08:41 +01:00
Enno Rehling
9400a05a87 test that two different volcano_dead messages are sent for units in different regions. 
new test_find_messagetype_ex helper.
 2016-08-28 10:05:34 +01:00
Enno Rehling
b56c48d95c verify arguments for volcanooutbreak message. 2016-08-27 08:29:01 +01:00
Enno Rehling
6d5e295678 activate, fix and improve volcano test. 
reduce number of terrain lookups.
 2016-08-26 17:26:26 +01:00
Enno Rehling
c3119e4c4a oh, I get it. reduceproduction signals that this volcano recently exploded. 
added a test for outbreak and message
 2016-08-23 07:53:29 +02:00
Enno Rehling
68f619cb90 test that message is sent when volcano stops smoking 2016-08-23 07:46:55 +02:00
Enno Rehling
bdc9af9b69 fix intermittent test for dead code path, all new volcanos have reduceproduction attributes 2016-08-23 07:44:17 +02:00
Enno Rehling
61929ab2d2 test that smoking volcanoes stop smoking 2016-08-23 07:38:44 +02:00
Enno Rehling
4bdc9a5153 extract main volcano loop to volcano module, start adding tests 2016-08-22 21:27:24 +02:00
Enno Rehling
5e5882d674 extracting volcano code into a separate module (step one) 2016-08-21 21:21:56 +02:00
Enno Rehling
a42bd9c3bf remove the BLD_WORKING flag. 
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
 2016-08-21 20:12:28 +02:00
Enno Rehling
d3e05c7ddf merge in and fix the economy tests 2016-08-21 20:04:51 +02:00
Enno Rehling
43090e1492 remove any reference to old two-stage maintenance. 
getting rid of a lot of dead code.
 2016-08-21 20:02:20 +02:00
Enno Rehling
901cf97cb2 refactoring the "nocostbuilding" curse. 
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
 2016-08-21 20:02:19 +02:00
Enno Rehling
b2e79dc5e9 building maintenance unit tests. 
backfilling some very basic test coverage.
 2016-08-21 20:01:30 +02:00
Enno Rehling
2df881c6ed check the results of MAKE TEMP 
new units have the UFL_ISNEW flag
 2016-08-21 12:38:25 +02:00
Enno Rehling
a5c7d9b615 fix giving items to dead units, https://bugs.eressea.de/view.php?id=2230 2016-08-21 11:58:53 +02:00
Enno Rehling
6cfdc50fdf add unit tests for giving stuff to empty units. 
should only be allowed to give things to a new unit, not a recently
deceased.
https://bugs.eressea.de/view.php?id=2230
 2016-08-21 11:46:54 +02:00
Enno Rehling
b5ed9e96dd re-enable disabled test (it passes, so what gives?) 2016-08-21 06:59:43 +02:00
Enno Rehling
6ca3f04b89 issue #538: default terrain 
I think it's unnecessary, so delete it
 2016-08-20 23:42:15 +02:00
Enno Rehling
9a6d4a174a remove move_on_land argument from move_cmd 2016-08-20 19:25:44 +02:00
Enno Rehling
6c17cf9d17 remove move_on_land from sail() 2016-08-20 19:24:18 +02:00
Enno Rehling
860078cfc9 fix piracy_cmd_land_to_land 2016-08-20 19:10:53 +02:00
Enno Rehling
c755de1cd5 fix the bug (move_on_land must die). 
disable broken test (setup_pirate is incomprehensible gibberish).
 2016-08-20 17:25:04 +02:00
Enno Rehling
1c4c0602f9 reactivate disabled piracy test, watch it fail 2016-08-20 11:06:46 +02:00
Enno Rehling
9e901b47b6 I'm getting reports of leaks for umlaut.c based structures and configuration? 
This is not actually solving those, though.
clean up report directory, fix .bat file.
 2016-08-18 20:07:16 +02:00
Enno Rehling
3be627d6ef fix compilation 2016-08-18 19:13:31 +02:00
Enno Rehling
ecffed0577 verify data after deleting planes, do not delete plane 50 (yet) 2016-08-18 19:11:26 +02:00
Enno Rehling
e5f5dc6aa4 fail when there are borders that can't be read because their endpoints are missing 2016-08-18 19:11:10 +02:00
Enno Rehling
abd6600cfe when reading alliances, duplicate ids are impossible. 
makealliance does too much work, new_alliance is simpler.
 2016-08-18 19:09:43 +02:00
Enno Rehling
a3ff8781c4 setting herbs will warn if they are the wrong herbs. 
planes can be erased.
add a script that erases unused planes from E2.
 2016-08-18 19:04:48 +02:00
Enno Rehling
0c6defad91 extract read_planes into a separate function. 2016-08-18 18:59:30 +02:00
Enno Rehling
3e47f02fc2 coverity CID 141509 Unchecked return value from library 
Conflicts:
	src/util/log.c
 2016-08-13 10:18:42 +02:00
Enno Rehling
1735ec9eee coverity CID 141509 Unchecked return value from library 2016-08-09 18:28:15 +02:00
Enno Rehling
238a0e22f2 Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance 
Conflicts:
	src/util/CMakeLists.txt
 2016-08-08 08:46:09 +02:00
Enno Rehling
b4135e49fb unused variable 2016-08-07 19:20:41 +02:00
Enno Rehling
731238dfb1 support different editor codepages 2016-08-07 19:19:35 +02:00
Enno Rehling
400051332a Trying out some different codepages for pdcurses/WIN32 and ncurses/Linux. 2016-08-07 18:55:03 +02:00
Enno Rehling
69c0194628 curses output doesn't deal well with non-ascii characters. "Fix" UTF8 characters by replacing them with ? 2016-08-07 18:25:28 +02:00
Enno Rehling
5dcbb8a3f4 add a very simple tst for unicode comparisons 2016-08-07 10:28:09 +02:00
Enno Rehling
4f5bd43dcf Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-08-07 00:47:50 +02:00
Enno Rehling
44b6a87649 death by NMR was broken, because I can't write loops good. 2016-08-07 00:40:10 +02:00
Enno Rehling
575f5fa355 Merge branch 'develop' of github.com:eressea/server into develop 2016-08-06 23:31:33 +02:00
Enno Rehling
b1f729a379 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-08-06 23:30:59 +02:00
Enno Rehling
ae3e5b8088 release version 3.8.15 2016-08-06 23:27:23 +02:00
Enno Rehling
7cbd23c26b fix error detection during report writing 2016-08-06 20:50:27 +02:00
Enno Rehling
3ea33c6895 repair magic item: stardust 
https://bugs.eressea.de/view.php?id=2226
 2016-08-06 18:16:50 +02:00
Enno Rehling
257ae38749 fix spellbook leak 2016-08-06 15:15:11 +02:00
Enno Rehling
fef2852c5e Reparatur Irrlichter 
https://bugs.eressea.de/view.php?id=2227
 2016-08-06 14:36:54 +02:00
Enno Rehling
e2808eeea9 reqsize defaults to 1. 
remove default values from xml to make it smaller and simpler.
 2016-08-06 13:53:07 +02:00
Enno Rehling
db5b90e80b clarify building_type.maxsize and add error logging for bug 2221. 
https://bugs.eressea.de/view.php?id=2221
 2016-08-06 13:52:29 +02:00
Enno Rehling
3dab1876ae Merge remote-tracking branch 'upstream/develop' into develop 2016-08-05 22:19:16 +02:00
Enno Rehling
c5d266ff72 better defaults for logging to file and stderr. 
https://bugs.eressea.de/view.php?id=2224
 2016-08-05 22:15:41 +02:00
Enno Rehling
30135fc1b9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-08-05 21:59:49 +02:00
Enno Rehling
50860ea0ef fix reading data from very old files 2016-08-05 21:58:06 +02:00
Enno Rehling
03a8b7383c fix log_rotate warnings (#529) 
* ignore file-not-found errors when trying to rotate logs.
I suspect this is faster and safer than testing existence.

* block rename warnings, part deux
 2016-08-05 20:15:05 +02:00
Enno Rehling
170ca3e396 block rename warnings, part deux 2016-08-05 20:09:07 +02:00
Enno Rehling
32384f9fd7 ignore file-not-found errors when trying to rotate logs. 
I suspect this is faster and safer than testing existence.
 2016-08-05 17:21:29 +02:00
Enno Rehling
36e1060fc7 turn maxsize assert into an error 
fix log rotation on windows
 2016-07-31 18:48:27 +02:00
Enno Rehling
51ffce6b24 fix merge conflicts 2016-07-30 23:19:27 +02:00
Enno Rehling
0a9cbc308b Merge pull request #523 from ennorehling/feature/bug-2207 
fix seeding new players (bug 2207)
 2016-07-30 22:54:51 +02:00
Enno Rehling
eebdcf5d93 control log level from command line (with -l, like -v) 
make newplayer.lua use the autoseed module, eliminate duplication
seeding new players is broken

Conflicts:
	src/gmtool.c
	src/main.c
	src/util/log.c
	src/util/log.h
 2016-07-30 22:46:57 +02:00
Enno Rehling
f2c02232cd http://bugs.eressea.de/view.php?id=2207 
check that there are any regions that we can seed new factions into
don't run into endless loop
 2016-07-30 22:01:10 +02:00
Enno Rehling
c31f543718 Merge pull request #522 from ennorehling/feature/bug-2221 
logging and fixing of live data for bug 2221
 2016-07-30 21:24:44 +02:00
Enno Rehling
31feeecbd8 logging and fixing of live data for bug 2221 
additional lua test that failed to find the issue
https://bugs.eressea.de/view.php?id=2221
 2016-07-30 21:13:42 +02:00
Enno Rehling
9f836e2f4b Merge pull request #519 from CTD1/master 
Fix VS Warning about bool - int convertion
 2016-07-15 11:10:12 +02:00
CTD
f324408b6f Fix bool - int conversion the other way 2016-07-15 10:48:37 +02:00
Enno Rehling
87eafaeb99 remove all password hashing code 2016-07-13 19:10:22 +02:00
CTD
65eab060a0 fix vs bool - int conversion warning 2016-07-12 13:24:17 +02:00
Enno Rehling
8d4a2ed688 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-07-03 11:10:04 +02:00
Enno Rehling
ca7b250c46 otherfaction can be null if not f->alive 2016-07-03 11:02:21 +02:00
Enno Rehling
dbaad4c403 release version 3.8.14 2016-07-03 10:59:50 +02:00
Enno Rehling
40dbe2b0cb delete old healing effects on read 
remove obsolete effect-handling from battle.c
 2016-06-17 21:49:31 +02:00
Steffen Mecke
e6907f570e use up old potion effects 2016-06-13 09:25:08 +02:00
Steffen Mecke
afdd20c4dd healing potion works once per battle with 100% 2016-06-12 23:23:22 +02:00
Steffen Mecke
61d93b7931 fix two bugs concerning horse bonus 
switched E3 horse damage and attack bonuses
horses help fleeing if when riding is 0
 2016-06-12 23:16:06 +02:00
Enno Rehling
61acd40424 Merge pull request #512 from stm2/dragon_growl 
Dragon growl
 2016-06-11 23:16:23 +02:00
Enno Rehling
9b284b424f Merge pull request #513 from ennorehling/feature/bug-2211-reshow-race 
Bug 2211: ZEIGE Elf
 2016-06-11 23:14:41 +02:00
Enno Rehling
3a61326e1a Merge pull request #514 from ennorehling/feature/bug-2206-parse_token 
parse_token buffer overrun
 2016-06-11 23:14:29 +02:00
Steffen Mecke
c5014fd766 integrated Ennos suggestions for dragon growls 
Dragons now growl 20% more elegantly!
 2016-06-11 13:47:38 +02:00
Enno Rehling
78fa6d3a47 remove the SAIL_INTO flag 2016-06-10 20:55:27 +02:00
Enno Rehling
2b17656efe custom message for insects that cannot enter a region. 2016-06-10 20:45:23 +02:00
Enno Rehling
f08957b513 test target selection rules for drifting ships. 2016-06-10 18:24:18 +02:00
Enno Rehling
546ffe87b8 change ship_allowed constants just a little bit 2016-06-10 18:00:22 +02:00
Enno Rehling
394621956d missing include, gcc fix 2016-06-07 21:51:56 +02:00
Enno Rehling
4414d7ef57 fix parse_token buffer overrun. 
missing tests for parse_token.
this fixes http://bugs.eressea.de/view.php?id=2206
 2016-06-07 21:47:09 +02:00
Enno Rehling
1443c24b36 fix gcc build 2016-06-06 23:45:11 +02:00
Enno Rehling
44d8f49bc3 test SHOW <race> only works for your own race. 
testing message contents is hard!
 2016-06-06 23:39:40 +02:00
Enno Rehling
c79ecc1a78 fix bug 2211, ignore a match for items we don't have. 2016-06-06 23:24:33 +02:00
Enno Rehling
eac94bdf4a add a test that demonstrates bug 2211 2016-06-06 22:14:28 +02:00
Steffen Mecke
cafa29426f simplified message_test 2016-05-31 10:37:01 +02:00
Steffen Mecke
ce312afc95 fix dragon growl for regions with an apostrophe 2016-05-31 01:54:06 +02:00
Steffen Mecke
96b7c92d81 fail fast for wrong message parameters 
simplifies debugging
 2016-05-31 01:54:06 +02:00
Enno Rehling
5535beed61 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
 2016-05-29 11:13:19 +02:00
Enno Rehling
72d9f8adf0 For NMR purposes, count cursed factions like NPCs (i.e. not). 
fix warnings in log tests
log whitespace cleanup
 2016-05-29 10:58:49 +02:00
Enno Rehling
6148273d97 http://bugs.eressea.de/view.php?id=2210 
fix deprecated attributes (at_key) yet again.
 2016-05-28 20:26:59 +02:00
Enno Rehling
2282bdf3d1 release version 3.8.12 2016-05-20 23:08:23 +02:00
Enno Rehling
c1b0395a6c Merge branch 'master' into develop 
Conflicts:
	src/kernel/save.test.c
	src/kernel/version.h
 2016-05-20 23:07:18 +02:00
Enno Rehling
cdd7606f02 fixing the password saving test. 2016-05-20 22:38:18 +02:00
Enno Rehling
01035a7325 password reading from external file is active, but broken. yikes 2016-05-20 20:49:47 +02:00
Enno Rehling
b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling
21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling
65432748fb eliminate false positive CID 26252 (itoa36 is always 4 chars or less) 2016-05-04 16:35:07 +02:00
Enno Rehling
80716d0787 fix key-upgrade function (coverity CID 102076) 
fix MSVC warning (strncpy)
 2016-05-02 19:22:57 +02:00
Enno Rehling
c4d31d368e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/util/log.c
	src/util/log.h
 2016-05-01 13:47:30 +02:00
Enno Rehling
0557aa84ac release version 3.8.9 2016-05-01 13:40:10 +02:00
Enno Rehling
f24b1c1cdc fix multi-logging 2016-05-01 13:40:01 +02:00
Enno Rehling
41277ed5ee prove that logging is broken (new test segfaults) 2016-05-01 13:39:25 +02:00
Enno Rehling
1fa1693119 test multiple loggers 2016-05-01 13:36:00 +02:00
Enno Rehling
354e609929 catalog missing test files in CMakeLists.txt 2016-04-10 13:22:51 +02:00
Enno Rehling
8d6fba258f kill some obsolete FIXME comments. 2016-04-09 19:10:51 +02:00
Enno Rehling
a834c486d9 fix a FIXME: setting default order through config, making test better. 
this feature is not in use, so all this work is really pointless.
 2016-04-09 19:05:28 +02:00
Enno Rehling
11ae7dd55e add a test for default_order, so I can change it. 2016-04-09 18:49:25 +02:00
Enno Rehling
01ecc72f2d fix a FIXME: include gamedata.h directly, not through save.h 2016-04-09 18:22:20 +02:00
Enno Rehling
4dc9b737de mark missing test files in CMakeLists.txt 
kill some dead code prototypes
 2016-04-09 18:19:30 +02:00
Enno Rehling
c0acfddb71 test some simple facts about planes 2016-04-09 14:26:10 +02:00
Enno Rehling
45d16ef18f test: ALLIANCE transfer leadership 2016-04-09 11:52:26 +02:00
Enno Rehling
8971ba99fe additional tests: ALLIANCE kick/leave commands 2016-04-09 11:49:41 +02:00
Enno Rehling
4b6445dbf3 test: cannot join an alliance if not invited 2016-04-09 11:43:47 +02:00
Enno Rehling
8801d88554 only create the syntax tree if there actually was an ALLIANCE command 2016-04-09 11:41:32 +02:00
Enno Rehling
8965edfacb add some flavor, make sure the correct command is executed when there's more than one. 2016-04-08 21:46:08 +02:00
Enno Rehling
3937cbc7b5 add missing file, test that command.c does what it's meant to do. 2016-04-08 21:44:06 +02:00
Enno Rehling
3368ad51bd test for alliance join/invite happy case 2016-04-08 21:33:18 +02:00
Enno Rehling
80b14048be remove some unused code from alliances 
start writing test coverage
 2016-04-08 19:45:27 +02:00
Enno Rehling
b2e8c75c02 add a test that should have crashed before my fix. 2016-04-03 12:37:26 +02:00
Enno Rehling
30b3cff657 fix a crash in write_game caused by remove_empty_factions 
https://bugs.eressea.de/view.php?id=2201
 2016-04-03 12:23:51 +02:00
Enno Rehling
be89aaeb83 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-03-26 22:28:14 +01:00