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

2714 Commits

Author SHA1 Message Date
Enno Rehling 7fe6fea56d Merge branch 'master' into develop 2016-12-09 06:52:23 +01:00
Enno Rehling 01233c4f82 UTF-8 statt utf-8. 
Auf besonderen Wunsch werden einheitlich Großbuchstaben verwendet.
 2016-12-05 07:54:43 +01:00
Enno Rehling 92b885ae73 Merge branch 'master' into develop 2016-12-03 23:47:12 +01:00
Enno Rehling afac66e213 fix bug 2261: bit manipulation error in STEALTH FACTION. 
https://bugs.eressea.de/view.php?id=2261
 2016-12-03 23:38:53 +01:00
Enno Rehling 2de3c3179a develop branch is now base for 3.11 2016-11-28 08:39:07 +01:00
Enno Rehling 6079293fea the _BSD_SOURCE macro was deprecated with glibc 2.12 2016-11-26 16:54:19 +01:00
Enno Rehling 43b8ff1ea8 fix strdup compilications when compiling with gcc and autoconf. 2016-11-26 16:21:41 +01:00
Enno Rehling 7870b63655 fix VS 2015 build 2016-11-26 07:04:18 +01:00
Enno Rehling 14b5c0f922 mac builds using gcc do not need autoconf. 
need to find a differnt way to test autoconf.
 2016-11-25 22:19:59 +01:00
Enno Rehling 2f81dc16b2 fix autoconf usage, force my OSX build to use it 2016-11-25 21:57:47 +01:00
Enno Rehling 31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling 0208304b07 use autoconf when not MSCVER or GLIBC 2016-11-25 21:12:14 +01:00
Enno Rehling e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling c9c4f5dd37 gcc complains about BSD_SOURCE now 2016-11-25 09:54:05 +00:00
Enno Rehling 78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling 91adf420bc strncat error V645 2016-11-23 19:18:54 +01:00
Enno Rehling 7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling ea6cd2ca32 remove unguard trigger. 
it is unused by the code
 2016-11-23 17:55:44 +01:00
Enno Rehling 13c29c136c eliminate config.h from triggers. 
was only used once, for a single fset macro
 2016-11-23 17:52:57 +01:00
Enno Rehling 88f5bfaf47 move wages and related functionality to buildin.c 2016-11-23 17:36:39 +01:00
Enno Rehling 09f22ba0bc move findrace into race.c 2016-11-22 12:32:28 +01:00
Enno Rehling 925d65c206 move entertainmoney to economy 2016-11-22 12:22:07 +01:00
Enno Rehling ec4060cb9a fix curse-vigour calculation math. 
also fix a ton of small other niggles from pvs-studio.
 2016-11-20 19:08:39 +01:00
Enno Rehling a8f3cad143 remove bad umlaut encodings, make sources US-ASCII. 2016-11-20 18:09:08 +01:00
Enno Rehling 9ac74ceecc fix constant conversion error 2016-11-20 15:14:03 +01:00
Enno Rehling ae951ee780 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-20 14:50:49 +01:00
Enno Rehling 55a0388eb2 fix truncated names that split a utf8 sequence. 2016-11-20 14:50:38 +01:00
Enno Rehling 19a0c2ddb3 quelling some static analysis complaints. 2016-11-19 20:57:10 +01:00
Enno Rehling eabaf8bebb fix last commit. 2016-11-19 16:27:37 +01:00
Enno Rehling 531da88b2a squash some static analysis warnings. 2016-11-19 15:19:23 +01:00
Enno Rehling 14b4ae5859 set volcano acitvation chance to 0 during test. 
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
 2016-11-18 22:31:06 +01:00
Enno Rehling ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling 7d874f1606 fix clang builds 2016-11-18 13:24:50 +01:00
Enno Rehling 8b46e1323a declare struct before use 2016-11-18 11:11:21 +01:00
Enno Rehling a08563e846 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-17 22:10:53 +01:00
Enno Rehling dc2452e2c1 config.h globals cleanup. 2016-11-17 22:10:41 +01:00
Enno Rehling aef475f663 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-17 22:09:51 +01:00
Enno Rehling cb6be542b9 remove unused variables. 2016-11-17 21:32:24 +01:00
Enno Rehling 27605f18ba more boring macros removed. 2016-11-17 21:31:11 +01:00
Enno Rehling 303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling 434cf8fce6 the unitid macro is boring. 2016-11-17 21:27:19 +01:00
Enno Rehling bc5e744347 i2b is a bullshit macro. 2016-11-17 21:23:49 +01:00
Enno Rehling 2f305f16d9 additional testing for renumber. 2016-11-17 21:08:35 +01:00
Enno Rehling 6c9e1fb345 more config.h removal. 
freset/fset/fval must die!
 2016-11-17 17:06:31 +01:00
Enno Rehling d1d1bee8f6 missing struct declarations in curse.h 
remove config.h from spells and curses.
 2016-11-17 11:34:35 +01:00
Enno Rehling b24f8b2839 remove config.h from items/ 2016-11-17 11:25:02 +01:00
Enno Rehling e3b7e19750 sometims we only include config.h for fval. 
I hate fval.
 2016-11-17 10:57:20 +01:00
Enno Rehling d5218b99b8 do not include config.h from util (also, wasn't needed) 
also remove it from monsters.
 2016-11-17 10:55:23 +01:00
Enno Rehling a601a675f6 reduce config.h even more. 
let's get all those global variables out of there.
 2016-11-17 10:42:20 +01:00
Enno Rehling cbb18edb8f declutter config.h, use it sparingly. 2016-11-17 10:38:09 +01:00
Enno Rehling f371a0c5f3 eliminate unused callback module. 
what was I thinking when I wrote this?
 2016-11-17 10:32:20 +01:00
Enno Rehling 42eff95ec2 remove unused empty files 2016-11-17 10:26:30 +01:00
Enno Rehling 3a64a2f404 stop spamming the log when using a listbox. 2016-11-16 23:09:07 +01:00
Enno Rehling 6a75b20315 remove wdwpyramid 2016-11-16 22:57:17 +01:00
Enno Rehling a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling 413f70d1a1 move market function out of config.c 2016-11-16 22:30:59 +01:00
Enno Rehling 4a66732637 renumber tests for building, ship 2016-11-16 20:41:48 +01:00
Enno Rehling 264fc0cb6f test renumbering units and factions. 2016-11-16 20:03:34 +01:00
Enno Rehling fbe846864d arguments for test_setup that help debugging tests. 2016-11-16 18:08:10 +01:00
Enno Rehling e50dfbf42b fix terrains.json, reduce config.h use 2016-11-15 23:56:39 +01:00
Enno Rehling 360776f8b9 eliminate data_version variables, issue #479 2016-11-15 23:45:14 +01:00
Enno Rehling 17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling 772bc427aa Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-15 20:44:02 +01:00
Enno Rehling c1f468ceb0 begin to declutter config.c 2016-11-15 20:43:36 +01:00
Enno Rehling 49e5b5b67e gcc missing include 2016-11-14 23:19:28 +01:00
Enno Rehling ce4a3c14b3 convert from atoi to atoip. 
most numbers in commands cannot be negative.
 2016-11-14 22:27:44 +01:00
Enno Rehling b48b80a1e9 verify errno in test_atoip 2016-11-14 22:21:32 +01:00
Enno Rehling c512d180f8 prevent atoip setting errno on mac. 
only call atoi when string starts with a digit
 2016-11-14 22:15:52 +01:00
Enno Rehling e293741997 wrong enum, thanks gcc 2016-11-14 20:33:26 +01:00
Enno Rehling ae0d5f53bf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-14 20:01:56 +01:00
Enno Rehling d73a629e79 add a test for regular give_cmd. 
also, speed up the function a little bit.
 2016-11-14 20:01:44 +01:00
Enno Rehling 5e48eac26a coverity warning: NEGATIVE_RETURNS 2016-11-14 02:21:49 +01:00
Enno Rehling 03a94d1264 remove unused and broken backup functionality 2016-11-14 01:35:45 +01:00
Enno Rehling 2b07ae810c kil xmlreport files. 
remove unnecessary includes.
 2016-11-14 01:27:59 +01:00
Enno Rehling 0472ac761e declutter save.h (items, spellbooks) 2016-11-14 01:22:50 +01:00
Enno Rehling d0b4f16213 reduce item.h include dependencies 2016-11-14 01:05:10 +01:00
Enno Rehling d28d3f4690 move read/write_items to item.c. 
fix bad memset in attrib.test.c.
 2016-11-14 01:00:48 +01:00
Enno Rehling 3cc719ba93 fix gcc build 2016-11-13 19:51:41 +01:00
Enno Rehling 0eaa750ef4 move read/write_attribs to attrib.h, too 2016-11-13 19:47:36 +01:00
Enno Rehling 11b122048b reduce dependency on save.h 
moving a_write* functions to attrib.h, which was most of the reason everyone and their mom include save.h
 2016-11-13 19:40:38 +01:00
Enno Rehling 37bb9c7ae9 Bug 2255: increase the max. number of teachers. 
https://bugs.eressea.de/view.php?id=2255
 2016-11-13 19:00:59 +01:00
Enno Rehling 3533291711 remove at_hurting, it was only used by the Temple of Pain, which is no longer in the game. 2016-11-13 18:33:47 +01:00
Enno Rehling 76734c7929 remove ARENA_CREATION code, it wasn't active. 2016-11-13 18:27:58 +01:00
Enno Rehling 2d2ded8f0d fix a_readint for deprecated attribs. 2016-11-13 17:57:57 +01:00
Enno Rehling 28aa2a56b8 Entferne unbenutztes "Szepter der Tränen". 
Was für eine saublöde Idee.
 2016-11-13 17:49:16 +01:00
Enno Rehling 29d072a186 remove the old ORCIFICATION code. 2016-11-13 17:13:59 +01:00
Enno Rehling 8b0ee77bda begin removing orcification 2016-11-13 17:06:28 +01:00
Enno Rehling 7557b97dee BUG 2253: Magicians cannot give men to empty units or peasants. 
https://bugs.eressea.de/view.php?id=2253
 2016-11-13 16:09:58 +01:00
Enno Rehling f63baddd51 use memmove, not memcpy. 
fix unicode_trim for windows.
remove unused unicode_mkname.
 2016-11-13 15:49:26 +01:00
Enno Rehling 663ad17b5a extract read_region and test that it fixes bad names. 2016-11-12 01:03:07 +01:00
Enno Rehling ec787743f0 extract read_faction and test that it repairs bad names 2016-11-12 00:47:25 +01:00
Enno Rehling 710811131f fix bad ship and building names and descriptions in save. 2016-11-11 22:28:22 +01:00
Enno Rehling 5032d44af4 refactor: extract read_/write_ship functions. 
add test: bad names are cleaned up (failing).
 2016-11-11 22:25:56 +01:00
Enno Rehling 110e87916d fix bad ship names in save file. 2016-11-11 21:46:56 +01:00
Enno Rehling 599c422852 refactor: extract read_/write_building. 
add a failing test for conversion of bad names.
 2016-11-11 21:41:25 +01:00
Enno Rehling a47da05f51 test unit names get fixed during read. 2016-11-11 15:41:34 +01:00
Enno Rehling 64f80274a0 test that ship and building cannot be named poorly. 2016-11-11 14:00:04 +01:00
Enno Rehling dea1020983 log a warning, not an error, when fixing bad save data. 2016-11-11 11:10:15 +01:00
Enno Rehling bc44caa17f backfill tests for renaming regions. 2016-11-11 02:07:11 +01:00
Enno Rehling ff09defa69 prevent badly naming units/factions/regions. 2016-11-11 01:59:43 +01:00
Enno Rehling e0add2275f also remove trailing spaces. 2016-11-11 01:34:59 +01:00
Enno Rehling 97e91fd8eb fix bad names. 
trim leading whitespace and non-printable characters from existing
unit, region and faction names/descriptions.
 2016-11-11 00:30:49 +01:00
Enno Rehling 7b412399b7 delete leading spaces from names. 2016-11-09 22:03:46 +01:00
Enno Rehling f03e8f3b62 return an error code if the string had any characters removed. 2016-11-09 14:58:51 +01:00
Enno Rehling 7d79822aa4 fix missing nul-terminator. 2016-11-09 11:54:34 +01:00
Enno Rehling f68fcf40a6 custom function to make "valid" names. 
remove any non-printable characters from a string.
TODO: test with utf-8 values.
TODO: remove leading/trainling whitespace.
 2016-11-08 22:54:47 +01:00
Enno Rehling fec9945458 Fixing Bugs 2246 & 2251 
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
 2016-11-05 18:20:56 +01:00
Enno Rehling bad4fb47c5 bad GUARD_NONE conversion, should have been false. 2016-11-05 16:20:00 +01:00
Enno Rehling 467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +01:00
Enno Rehling 03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling 92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling 313d988e59 fix remaining unit test after guard changes. 2016-10-31 20:10:17 +01:00
Enno Rehling 0bcb3a853f WIP: finish removing GUARD_* flags 
TODO: fix failing tests
 2016-10-31 09:40:36 +01:00
Enno Rehling 754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling 2953a5f036 fix swapped assertions. 2016-10-30 09:49:30 +01:00
Enno Rehling eb7199450d fix Linux compilation. 2016-10-30 09:47:18 +01:00
Enno Rehling f147d6a8c8 remove at_guard from guard.c, fix compilation. 2016-10-30 09:43:28 +01:00
Enno Rehling 2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling 8597e8b16a move guard test to guard.test.c 2016-10-30 05:39:25 +01:00
Enno Rehling a5e63a2472 move GUARD_* flags to guard.h 2016-10-30 05:37:12 +01:00
Enno Rehling 1116afed2b merge conflict resolve 2016-10-29 19:19:22 +02:00
Enno Rehling 1ea8c80845 test that is_guard changes when armedmen does. 2016-10-29 19:19:11 +02:00
Enno Rehling 4487f4d3e1 missing declaration 2016-10-29 19:19:02 +02:00
Enno Rehling 29c5bd6f55 test that regular guards need weapons and skills 2016-10-29 19:18:55 +02:00
Enno Rehling 7c827c0389 add test for races with "unarmed guard" flag. 2016-10-29 19:18:49 +02:00
Enno Rehling 654926fa06 add a failing test for "monsters can guard when unarmed" 2016-10-29 19:18:43 +02:00
Enno Rehling 5bb2dbfd87 move is_guarded from move.h to guard.h 
Conflicts:
	src/move.c
 2016-10-29 19:15:49 +02:00
Enno Rehling 59c8fbc5a5 fix bad Lua test for ents, so they actually guard. 2016-10-29 17:51:01 +02:00
Enno Rehling 6075396de3 WIP: make guard tests pass. 
BUG: monsters are always allowed to guard unarmed.
TODO: more code duplication, refactor it.
TODO: ents do not guard resources?
 2016-10-29 14:16:40 +02:00
Enno Rehling f1d07fb647 I no longer use CRTDBG to find bugs. Valgrind rules. 2016-10-29 10:53:18 +02:00
Enno Rehling e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling 91ae9245ca armedmen tests. 
check missing weapons, WTF_SIEGE and minskill
 2016-10-25 15:01:54 +02:00
Enno Rehling 97918799c1 additional testing for armedmen(). 2016-10-25 00:16:13 +02:00
Enno Rehling 8f802c11e1 off-by-one error for early break from loop. 2016-10-25 00:12:18 +02:00
Enno Rehling e5dc754c25 fix demand in broken regions, after load. 2016-10-24 13:54:53 +02:00
Enno Rehling cd69936922 fix demand in terraformed regions. 
https://bugs.eressea.de/view.php?id=2249
 2016-10-24 13:47:38 +02:00
Enno Rehling 2fbc7a44d5 add missing tests for recent failures. 2016-10-23 13:02:53 +02:00
Enno Rehling a921a6594a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-23 10:03:46 +02:00
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