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

4102 commits

Author SHA1 Message Date
Enno Rehling
60a86e7b2f escaping a string for use in CR needs to only replace quotes and backslashes. 2018-05-21 13:27:02 +02:00
Enno Rehling
226fa2ba08 fix crash in region messages. 2018-05-20 17:11:29 +02:00
Enno Rehling
b3b19e7c83 suppress those null-reference bugs in another way, maybe? 2018-05-19 21:01:10 +02:00
Enno Rehling
dfa0ff09d1 Suppress some false positive coverity results. 
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
 2018-05-19 20:53:51 +02:00
Enno Rehling
4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling
6699e8940e some cleanup is good. 2018-05-18 21:44:03 +02:00
Enno Rehling
33a6d7fa0e free sections memory. 2018-05-18 21:43:02 +02:00
Enno Rehling
22f6d4feed fix sections handling, remove it from nrmessage. 2018-05-18 21:36:10 +02:00
Enno Rehling
c11a020846 remove the text from messages.xml 2018-05-18 21:24:08 +02:00
Enno Rehling
bbae56633b rules was part of convert, and we do never finished that branch. 2018-05-18 21:19:01 +02:00
Enno Rehling
ce37fd1bb7 remove libxml2 from dependencies 
remove the converter, that isn't a way we're going.
 2018-05-18 21:14:22 +02:00
Enno Rehling
6b0f75339f message parsing from exparse is working, but allocates too much. 2018-05-18 20:42:22 +02:00
Enno Rehling
19b3b5b35a change how message types are created (more prep work for expat) 2018-05-18 19:58:49 +02:00
Enno Rehling
f8b8a5284c begin expat message parsing 2018-05-18 18:50:13 +02:00
Enno Rehling
6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling
3cd51fe384 cppcheck niggles. 2018-05-18 15:34:21 +02:00
Enno Rehling
26dc593ddb shrink nrmessage 2018-05-18 08:34:00 +02:00
Enno Rehling
810bf3b40a fix some cppcheck warnings 2018-05-18 02:55:33 +02:00
Enno Rehling
9e64f66409 gates are never created, probably dead code 2018-05-18 02:55:03 +02:00
Enno Rehling
ef74b8e759 reduce the footprint of nrmessage 2018-05-18 02:46:34 +02:00
Enno Rehling
3867388834 iwyu 2018-05-18 02:35:11 +02:00
Enno Rehling
42f59fbd9e I think pofile.c belongs in the util directory. 2018-05-18 00:08:30 +02:00
Enno Rehling
7fa568da09 eliminate dead code, fix compile 2018-05-17 23:53:44 +02:00
Enno Rehling
409f5df9a9 po export code removed. 2018-05-17 23:29:12 +02:00
Enno Rehling
87914a7b5b delete XML Strings. 2018-05-17 23:27:29 +02:00
Enno Rehling
4d09f00f03 remove string parsing from XML. E3 tests failing! 2018-05-17 22:58:01 +02:00
Enno Rehling
0d6abd3811 Merge branch 'develop' 2018-05-17 22:49:03 +02:00
Enno Rehling
615dfe7ec5 Get the NR message text from locale. 2018-05-17 22:47:16 +02:00
Enno Rehling
c0ed53b679 last of the duplicate names. battles have lost their separators, though. 2018-05-17 22:15:24 +02:00
Enno Rehling
7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling
c596402e4a load strings from po file, not xml. 2018-05-17 16:54:59 +02:00
Enno Rehling
9ca945cb2c add a string escaping function. 
start some work on nrmessage.c.
 2018-05-17 16:53:56 +02:00
Enno Rehling
35c3d4cda0 export messages and strings into separate .po files 
commit the exported files.
 2018-05-17 10:43:23 +02:00
Enno Rehling
0f3e3c9e38 po file exporter, also for messages. 2018-05-16 21:58:02 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling
40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling
c223542ced kill an unused macro. 2018-05-13 16:17:03 +02:00
Enno Rehling
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling
79bc22b617 fatal error my a$$ . the gamedat check is killing tests for no discernible reason. 2018-05-12 22:12:14 +02:00
Enno Rehling
40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling
271352d0ba create a lua module that can handle simple euipments. 
lua test for equip_unit, with callbacks.
 2018-05-12 19:10:40 +02:00
Enno Rehling
b12050ac2a lua callback for equip_unit 2018-05-12 18:25:44 +02:00
Enno Rehling
7e6688552b create a callback mechanism for equipment. 2018-05-11 21:30:26 +02:00
Enno Rehling
5c26155f2f Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-11 20:55:38 +02:00
Enno Rehling
7b1038b0b1 this equipment callback is never used in our lua scripts, and we want to use equipment less. 2018-05-11 06:06:31 +02:00
Enno Rehling
ac73052dc1 autoseed code is never used in lua scripts (they have their own autoseed implementation). 2018-05-11 06:05:28 +02:00
Enno Rehling
84bc08a381 all races can be on a boat by default. 
but now MAKETEMP is broken.
prefer assert_(not_)nil over assert_(not_)equal
 2018-05-10 22:10:26 +02:00
Enno Rehling
9e16ebc01a all kinds of race flag breakage repaired. 
but now, humans suddenly can't build a ship in E2?
 2018-05-10 22:00:23 +02:00
Enno Rehling
5de2a9e2ae fix ec_flags parsing (irongolem, etc) 2018-05-10 21:05:51 +02:00
Enno Rehling
85cf8da383 rename canteach/canlearn to teach/learn 
race/function is never used (and there is no namedragon function).
 2018-05-10 20:37:37 +02:00
Enno Rehling
94769a66f8 teach vs canteach mixup 2018-05-10 20:18:56 +02:00
Enno Rehling
ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling
b0012eeae0 familiars do not need the default value in XML (bad XML). 2018-05-10 20:02:53 +02:00
Enno Rehling
48a4de0768 parse race/attack data 2018-05-10 07:01:46 +02:00
Enno Rehling
fc052034ac Merge branch 'exparse' of https://github.com/ennorehling/eressea.git 2018-05-09 22:23:40 +02:00
Enno Rehling
907348adfc merge race xml changes (teach, migrants, floating point) 2018-05-09 22:21:50 +02:00
Enno Rehling
c05a65b881 expat parses (most of) races. 
fix canteach flag in XML.
 2018-05-09 22:16:30 +02:00
Enno Rehling
8c7b890f3e set the default unarmed modifiers for races. 2018-05-09 20:56:38 +02:00
Enno Rehling
9e6ae0edc1 make str_strdup more forgiving 2018-05-09 07:14:56 +02:00
Enno Rehling
c9b9bac2ac Merge branch 'develop' 2018-05-08 23:11:14 +02:00
Enno Rehling
ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling
b197bb395d parse spell components. 2018-05-08 23:06:33 +02:00
Enno Rehling
371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling
ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
6746401330 BUG 2437: fetch_astral should have no aura cost when given bad units. 2018-05-07 20:22:02 +02:00
Enno Rehling
68de367a98 print an error instead of asserting. 2018-05-06 19:27:22 +02:00
Enno Rehling
cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling
d0d366485e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-06 19:02:55 +02:00
Enno Rehling
14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +02:00
Enno Rehling
4d3718bab9 find out why t<=0 assert happens sometimes 2018-05-06 18:05:35 +02:00
Enno Rehling
5af775ba87 prevent out-of-bounds read. 2018-05-06 16:35:23 +02:00
Enno Rehling
088747ea81 code style 2018-05-06 15:50:44 +02:00
Enno Rehling
cd2624de8a stop reallocation spell parameters. 
fix involuntary tree growth in test, message check.
 2018-05-06 15:49:34 +02:00
Enno Rehling
adbf1098b9 we fail tests when not reading spell components. 2018-05-06 14:02:44 +02:00
Enno Rehling
a44085de7a spell flags, rearranged 2018-05-06 13:59:00 +02:00
Enno Rehling
17ea7a224a spell ranks cannot be negative 2018-05-06 09:02:27 +02:00
Enno Rehling
cd2435dbb0 spell xml does not define an index attribute 2018-05-06 09:00:11 +02:00
Enno Rehling
dc3918f4a6 read spellbook (expat) 2018-05-05 07:48:38 +02:00
Enno Rehling
0e3170a0cb merge 2018-05-05 07:39:25 +02:00
Enno Rehling
d568e79490 spellbooks contain spellref, not spell *. 
for order-independent load from XML.
 2018-05-05 07:38:11 +02:00
Enno Rehling
3e2aa5b1a8 start ingesting spellbooks. 2018-05-05 06:05:50 +02:00
Enno Rehling
dca99ec79d negative, sir! 2018-05-04 18:53:35 +02:00
Enno Rehling
53f8b39e6e gcc and clang complain about unused function. 2018-05-04 18:50:44 +02:00
Enno Rehling
ad0f83dcca some xmlreader code still required that resources get loaded first. 2018-05-04 18:48:14 +02:00
Enno Rehling
85509cdf65 fix some bugs in reading weapons. 2018-05-04 18:41:59 +02:00
Enno Rehling
4e2171ace9 fix finding resources if xml is not processed in predetermined order. 2018-05-04 17:58:26 +02:00
Enno Rehling
82ba0e62d4 fix reading weapon damage. 2018-05-04 17:57:10 +02:00
Enno Rehling
704148e4bd more object types I haven't handled yet. 2018-05-03 23:04:32 +02:00
Enno Rehling
75aff73e9a Merge branch 'develop' 2018-05-03 23:01:42 +02:00
Enno Rehling
b31a1f798c BUG 2346: extract a test for ship tactics bonus. 2018-05-03 23:00:28 +02:00
Enno Rehling
34c6222b8f BUG 2436: Fix the E3 tactics bonus for ships. 2018-05-03 22:44:01 +02:00
Enno Rehling
5bcd8369af ignore sqlite setting errno 2018-05-03 22:40:54 +02:00
Enno Rehling
069047d0ac uninitialized variable crash, seenspells. 2018-05-03 22:32:11 +02:00
Enno Rehling
cb27895b81 parsing ships, done! 2018-05-03 22:27:28 +02:00
Enno Rehling
6d9ecd1879 finish loading buildings with expat. 2018-05-02 21:37:57 +02:00
Enno Rehling
50839068e5 Merge branch 'exparse' of https://github.com/ennorehling/eressea.git 2018-05-01 20:58:34 +02:00
Enno Rehling
59f74d0a98 parse building stages, too. 2018-05-01 20:58:30 +02:00
Enno Rehling
7128e1fb5c extract modifier parsing so it can be used for buildings. 2018-05-01 20:05:46 +02:00
Enno Rehling
d2eccd56b9 defaults 2018-05-01 19:39:41 +02:00
Enno Rehling
e5d3d77c06 begin parsing buildings. 2018-05-01 18:52:48 +02:00
Enno Rehling
3db9d5d878 merge from develop. luxuty price conflict resolved. 2018-05-01 17:23:46 +02:00
Enno Rehling
b5b9611a16 eliminate construction.improvement, 
create building_type.stages instead.
 2018-05-01 15:40:11 +02:00
Enno Rehling
8a21b42b65 start extracting building-only construction stuff. 2018-05-01 11:22:47 +02:00
Enno Rehling
0b097371a1 items: less xpath, more child iteration. 2018-05-01 11:20:13 +02:00
Enno Rehling
dddbf5287a refactor construction list. 2018-05-01 10:53:12 +02:00
Enno Rehling
bddf4bff39 unnecessary xpath wrangling 2018-05-01 10:47:17 +02:00
Enno Rehling
c7ae070fa7 nobody needs the construct_t enum. 2018-05-01 07:02:55 +02:00
Enno Rehling
969c28692f Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-04-30 23:24:02 +02:00
Enno Rehling
b44e4e747d ships and items never have multi-stage builds. 
we are going to make sure of this soon.
 2018-04-30 23:23:48 +02:00
Enno Rehling
e0cae602dd add a test for building items. 2018-04-30 23:18:39 +02:00
Enno Rehling
e0e873044d fix stone golems (assert). 
remove improvement logic from build().
 2018-04-30 23:11:13 +02:00
Enno Rehling
22734a4ae4 refactor building stages into build_stages(). 
TODO: remove them from build().
 2018-04-30 22:52:38 +02:00
Enno Rehling
6b38fdf4e6 fix build 2018-04-30 20:25:58 +02:00
Enno Rehling
a8f6f1a40c there is no require element for weapons. oops. 2018-04-29 20:23:41 +02:00
Enno Rehling
2579bf71b5 fix test_troll_quarrying_bonus 2018-04-29 19:33:39 +02:00
Enno Rehling
12416e8b0d fix reading skill modifiers. 2018-04-29 18:44:17 +02:00
Enno Rehling
177e0159c4 init construction defaults. 2018-04-29 18:23:23 +02:00
Enno Rehling
ec9038a5ea fix copy/paste errors, remove armor element handlers. 2018-04-29 17:27:12 +02:00
Enno Rehling
10884c825e fix compile, invalid use of rc_mask. 2018-04-29 16:11:35 +02:00
Enno Rehling
f6735049d8 add a few tests for fighters equipping the right weapons and armor. 2018-04-29 15:25:46 +02:00
Enno Rehling
c01e9b24ad unit tests for racial weapon permissions. 2018-04-29 15:09:07 +02:00
Enno Rehling
1ef57ef4f0 merge conflicts, race masking. 2018-04-29 13:50:56 +02:00
Enno Rehling
837ab325f9 XML simplificatio: unified system for masking races on modifiers. 2018-04-29 13:46:17 +02:00
Enno Rehling
ac786e034c extract rc_mask, add it to exparse code. 2018-04-29 13:16:07 +02:00
Enno Rehling
3cb1d1a071 simplify race masking for weapon modifiers. 2018-04-29 13:13:10 +02:00
Enno Rehling
dc891a94b4 armor and weapon are harder to read than other items. 
modifier handling for weapons seems ok, except races.
 2018-04-29 10:32:10 +02:00
Enno Rehling
e86f3e7589 read callback fucntions for resources and weapons. 2018-04-28 21:46:01 +02:00
Enno Rehling
46f5fa0211 item does not have funtions. 
resourcelimit is gone.
 2018-04-28 21:27:34 +02:00
Enno Rehling
4812fa1c41 unnecessary xpath searches. 
1. item does not have functions.
2. resourcelimit is gone.
 2018-04-28 21:25:26 +02:00
Enno Rehling
9dbfaea708 parse construction requirements for items. 2018-04-28 21:12:28 +02:00
Enno Rehling
9d3385de97 still cannot read potions, requirements, functions. 2018-04-28 18:49:13 +02:00
Enno Rehling
e4a2b6cb35 loading armor with expat. 2018-04-28 18:47:17 +02:00
Enno Rehling
16cebed013 implement weapons loading with expat. 2018-04-28 18:40:14 +02:00
Enno Rehling
ce50b888c9 finish loading luxury items. 2018-04-28 18:10:04 +02:00
Enno Rehling
ff4bae4da1 delete unused static functions. 2018-04-28 17:52:48 +02:00
Enno Rehling
03cff6d595 extract rc_mask, add it to exparse code. 2018-04-28 16:14:32 +02:00
Enno Rehling
edadf2cbab exparse: parse (most of) the resource data. 2018-04-28 15:58:14 +02:00
Enno Rehling
08663b6eb5 fix last commit. refactoring with the MSVC IDE is prone to errors. 2018-04-28 15:57:51 +02:00
Enno Rehling
c3b25328d3 don't exist with a leak, fix MSVC compilation. 2018-04-24 21:16:56 +01:00
Enno Rehling
b28cbd606d minimal expat parsing code 2018-04-24 22:04:23 +02:00
Enno Rehling
6207211ba9 add skeleton for expat suport 2018-04-24 21:50:49 +02:00
Enno Rehling
b868a54f0b use sbstring for make_movement_order. 2018-04-22 18:12:55 +01:00
Enno Rehling
2f7637f953 add a unit test for make_movement_order, too. 2018-04-22 18:08:56 +01:00
Enno Rehling
0171c74e19 refactor monster movement planning, test at_hate. 2018-04-22 18:04:09 +01:00
Enno Rehling
fc4b7ba73d refactor: extract cycle_route and test it (with PAUSE). 2018-04-22 11:02:05 +01:00
Enno Rehling
915706d6f8 BUG: at_hate stores a unit, never an int. 
https://bugs.eressea.de/view.php?id=2432
 2018-04-21 23:18:35 +01:00
Enno Rehling
ef96ec9de0 additional testing 2018-03-17 12:55:26 +01:00
Enno Rehling
3bca8d969a Merge branch 'master' into develop 2018-03-16 21:58:52 +01:00
Enno Rehling
121bf343ea fix get_command for K_STUDY (still bug 2427). 2018-03-16 21:49:24 +01:00
Enno Rehling
db5d9e069e failing test for bug 2427: create_order(K_STUDY, ...) 2018-03-16 19:52:54 +01:00
Enno Rehling
fa1056a696 fix sigaction code for macos 2018-03-16 16:21:33 +01:00
Enno Rehling
ac8ae18588 allow a per-game seed in eressea.ini 2018-03-11 19:10:08 +01:00
Enno Rehling
9ba255e269 allow a maxnmr setting in eressea.ini to override the nmr.timeout rule. 2018-03-11 19:07:05 +01:00
Enno Rehling
ed46a24f58 re-enable backtraces on linux. 2018-03-11 16:52:07 +01:00
Enno Rehling
da984b5880 BUG 2425: lighthouses can see units. 2018-03-11 14:40:38 +01:00
Enno Rehling
6d98a5dc4f BUG 2424 remove invlaid assertion 2018-03-11 11:39:57 +01:00
Enno Rehling
346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling
bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling
54ee7c04dc seenspell conversion bugfix 2018-03-10 17:46:48 +01:00
Enno Rehling
ef3b72ceb7 BUG 2423: only apply other skill modifiers if race-modifier doesn't drop skill below 1. 2018-03-04 20:30:34 +01:00
Enno Rehling
7e33b2a94d BUG 2379: Test war kaputt (newterrain), getesteter Code auch. 2018-03-04 20:15:42 +01:00
Enno Rehling
db253ea6a1 newterrain was unfit for unit testing. 
bad test: insects cannot trade in deserts without castle.
 2018-03-04 20:03:13 +01:00
Enno Rehling
f997ff7e59 build problems. this looks like a merge conflict. 2018-03-04 18:21:00 +01:00
Enno Rehling
6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling
622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling
5518e43591 the "moved" attribute is unused 
so was a lot of other stuff.
 2018-02-26 19:47:03 +01:00
Enno Rehling
db83140753 merge conflict nightmare fix. 2018-02-25 20:49:33 +01:00
Enno Rehling
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling
28e9ddbdb4 Merge branch 'master' 2018-02-25 20:27:16 +01:00
Enno Rehling
aae7e9b954 immer noch FAST_CONNECT Reste 2018-02-25 20:06:55 +01:00
Enno Rehling
5d9d299e68 refactor repotring items 2018-02-25 20:06:55 +01:00
Enno Rehling
72daecd27e cppcheck false positives 2018-02-25 20:06:55 +01:00
Enno Rehling
079a55fe41 cppcheck warnings 2018-02-25 20:06:47 +01:00
Enno Rehling
b7dcee7e08 fix goto-select-faction (itoa bug). 2018-02-25 19:36:28 +01:00
Enno Rehling
aacd0885df fix termination bug in itoa functions. 2018-02-25 19:17:20 +01:00
Enno Rehling
8c554edfee findunitg was deprecated. 2018-02-25 18:35:40 +01:00
Enno Rehling
4181e23d15 FAST_CONNECT is always on. 
fix more cppcheck messages.
 2018-02-25 18:30:20 +01:00
Enno Rehling
120b03d2f5 Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. 2018-02-25 18:14:48 +01:00
Enno Rehling
13cc8841d3 msg_setting is a dead feature, remove leftovers. 2018-02-25 18:10:09 +01:00
Enno Rehling
fc2506ee83 cppcheck: DMAXHASH was unused. 
cppcheck: remove warnings, reduce variable scopes.
 2018-02-25 17:58:45 +01:00
Enno Rehling
d802f6ea67 cppcheck: reduce variable scope. 2018-02-25 17:28:42 +01:00
Enno Rehling
6dd3783ecb unused #define 2018-02-25 17:19:54 +01:00
Enno Rehling
05242aaf2d Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. 2018-02-25 17:18:30 +01:00
Enno Rehling
4ce7932d14 add some checks (cppcheck is weird). 2018-02-25 17:01:16 +01:00
Enno Rehling
51fb719bb6 add a Readline module, fix detection, keep disabled for now 2018-02-25 16:36:45 +01:00
Enno Rehling
a286cb45f1 compilation fix, disable catapult damage code. 2018-02-25 14:54:45 +01:00
Enno Rehling
7b01581302 CATAPULT_STRUCTURAL_DAMAGE was broken. 
check for PDCURSES, not WIN32
 2018-02-25 14:29:25 +01:00
Enno Rehling
e4aa8f505e cppcheck warnings for battle 2018-02-25 14:18:36 +01:00
Enno Rehling
b67db4faf9 remove unused ct_fleechance (misteltoe relic) 2018-02-25 13:22:41 +01:00
Enno Rehling
cf46acdc6a bufunit does not write an indent, doe not need the parameter. 2018-02-24 19:46:34 +01:00
Enno Rehling
42c86d122e stop using MINMAX macros. 2018-02-24 19:41:36 +01:00
Enno Rehling
fa1e81f6ac write a log of dead factions. 2018-02-23 21:24:15 +01:00
Enno Rehling
de52d8d669 BUG 2419: add a spell alias. 2018-02-18 11:46:05 +01:00
Enno Rehling
f9fcc01829 print more debug information when a name is missing. 2018-02-17 21:18:00 +01:00
Enno Rehling
cb537b1a93 missing translations are the worst. 2018-02-17 21:08:58 +01:00
Enno Rehling
6c572c6287 rename potion: p14 to healing 
fix use_item message crash
 2018-02-17 20:35:00 +01:00
Enno Rehling
b602ac5f1a remove P_POWER from use_potion 2018-02-17 19:02:02 +01:00
Enno Rehling
ef7d0c40ed remove the two helaing special cases from use_potion 2018-02-17 18:51:11 +01:00
Enno Rehling
d065cbfca7 use_item message with amount instead of usepotion without. 2018-02-17 15:30:38 +01:00
Enno Rehling
4a3ad7ac84 fix potion tests, re-enable foolpotion test 2018-02-17 15:22:44 +01:00
Enno Rehling
438ae6f905 Eliminate rules.magic.multipotion, it's too much code. 2018-02-17 15:17:05 +01:00
Enno Rehling
96062f6f85 rename p2->lifepotion (WdL) 2018-02-17 10:45:56 +01:00
Enno Rehling
8a8bf489ae clarify use_potion responsibilities. 
move USE potion of life to items.c.
fix some use_ function return values.
 2018-02-17 10:39:23 +01:00
Enno Rehling
e697a23f9d BUG 2419: fix and speed up volcano-survival through potions. 2018-02-16 20:06:36 +01:00
Enno Rehling
ad86e69e6b refactor the resurrection code. There is more work to be done here, too much duplicaton between battle and volcano. 2018-02-15 21:05:11 +01:00
Enno Rehling
a9375200e4 use_potion has a lot of scaffolding that use_healingpotion was duplicating. 2018-02-15 20:41:40 +01:00
Enno Rehling
bf591ecec5 BUG 2415: eliminate at_potiondelay and WdL delay. 
BUG 2419: refactor ointment and healing, add tests for USE
 2018-02-15 20:25:58 +01:00
Enno Rehling
7d789d9896 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-14 20:03:11 +01:00
Enno Rehling
4abc603d9d triggered a missing forward declaration. 2018-02-14 20:02:50 +01:00
Enno Rehling
d15684a546 fix test_process_turn failure. 
move turn global to calendar.
promote calendar module to kernel.
 2018-02-14 20:01:36 +01:00
Enno Rehling
f4be3a1374 remove duplication setstatus -> unit_setstatus 2018-02-14 11:24:38 +01:00
Enno Rehling
b5ea102372 cppcheck: scope reductions and a false positive. 2018-02-11 16:14:00 +01:00
Enno Rehling
398a258658 cppcheck: variable scopes, etc. 2018-02-11 15:57:31 +01:00
Enno Rehling
f67a4943e4 fix some cppcheck warnings 2018-02-11 15:43:24 +01:00
Enno Rehling
ff33073bd9 unused function 2018-02-11 15:00:19 +01:00
Enno Rehling
e06248cf1e remove residual data for an unfinished "city" feature. 2018-02-10 21:25:13 +01:00
Enno Rehling
eb6271bbb8 CID 182781 I broke the wage logic. 2018-02-10 17:53:59 +01:00
Enno Rehling
e300605e87 fix gcc build 2018-02-10 17:31:48 +01:00
Enno Rehling
fe29f2433a convert multiple seenspell attributes to single seenspells list. faster? maybe. 2018-02-10 16:50:05 +01:00
Enno Rehling
c3fce574fb fix reading old data files. 2018-02-10 11:26:39 +01:00
Enno Rehling
1035a98fd3 make attrib use a variant, not a custom union. 
change attrib_type methods to take a variant, not the entire attrib.
 2018-02-09 21:20:43 +01:00
Enno Rehling
cfc3171021 constrict the seenspell module a bit more, move functionality inside. 2018-02-08 19:37:47 +01:00
Enno Rehling
ec48017520 move spell reporting attributes to a separate module. 2018-02-08 18:33:58 +01:00
Enno Rehling
87081a37bc CID 182717 call fclose, always 2018-02-08 08:33:27 +01:00
Enno Rehling
9ee84445eb stop using MIN and MAX macros 2018-02-07 18:39:20 +01:00
Enno Rehling
0884fb1f1b CID 182685 check for utf8 encoding errors. 2018-02-07 18:05:14 +01:00
Enno Rehling
f08514eaf2
Merge pull request #767 from ennorehling/noxinclude 
remove the XInclude mess
 2018-02-07 17:58:24 +01:00
Enno Rehling
d1a393610c begin work on 3.16 release 2018-02-07 17:57:24 +01:00
Enno Rehling
907c5fc601 unused variable. 2018-02-06 21:39:52 +01:00
Enno Rehling
df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling
434b7ae29e convert all of E2 to new config loading. 2018-02-05 19:35:15 +01:00
Enno Rehling
da02c1b92e Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 17:46:11 +01:00
Enno Rehling
92f82c3608 plan to eliminate xinclude use, move to single config file with includes. 2018-02-05 17:46:11 +01:00
Enno Rehling
2d7d46d3ac Merge small braineater units to reduce memory pressure. 2018-02-04 19:13:04 +01:00
Enno Rehling
a8c9576937 fix mac build 2018-02-04 14:59:01 +01:00
Enno Rehling
5b61f895a2 further reduce teh amount of temporary storage required by the economy module. 2018-02-03 20:52:24 +01:00
Enno Rehling
6f7c8743b3 remove a lot of struct copying in the stupid expand function. 2018-02-03 20:45:19 +01:00
Enno Rehling
e1d33e55a4 refactor econ_request union for readability. 2018-02-03 20:24:16 +01:00
Enno Rehling
613c0edf2f add most basic test coverage for cmd_loot 2018-02-03 15:25:03 +01:00
Enno Rehling
ba14fab3a3 macros should have uppercase names. 2018-02-03 14:49:35 +01:00
Enno Rehling
f1be8caa46 more skill size savings. 2018-02-03 14:16:01 +01:00
Enno Rehling
5cdd79804a optimize sizeof(skill) 2018-02-03 12:57:43 +01:00
Enno Rehling
5b42de3283 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-28 19:12:48 +01:00
Enno Rehling
6f1f5409ae Solve unicode indentation problems in summary. 2018-01-28 19:12:31 +01:00
Enno Rehling
1181cae463 Merge remote-tracking branch 'upstream/develop' into develop 2018-01-28 18:42:22 +01:00
Enno Rehling
6fca773426 BUG 2416: prefer sqlite over db 2018-01-28 18:26:54 +01:00
Enno Rehling
70cc56b223 make summary a little prettier. 2018-01-28 11:37:42 +01:00
Enno Rehling
b6e8822044 BUG 2398: remove deltas from summary. 2018-01-27 21:48:05 +01:00
Enno Rehling
241cb4d6eb Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-26 18:18:18 +01:00
Enno Rehling
ed623732d3 fix reduce_skill max_week calculation. 2018-01-26 18:18:12 +01:00
Enno Rehling
b0ef468617 select berkeley over sqlite, compile only one 2018-01-26 18:02:10 +01:00
Enno Rehling
ff85cda724 stop using sqlite for a player database 2018-01-26 17:56:30 +01:00
Enno Rehling
e233d08e8f move more reporting code to reports.c 2018-01-26 17:39:15 +01:00
Enno Rehling
0170a6fc09 move bsdstring use to reports.c 2018-01-25 21:31:09 +01:00
Enno Rehling
6a9320a0d0 these casts not required. 2018-01-25 18:49:12 +01:00
Enno Rehling
495c45391d CID 182344: Integer handling issues 2018-01-25 15:38:55 +01:00
Enno Rehling
cc278896f9 DRY: change mistletoe code 
add some debug logic to intermittent test
 2018-01-22 19:22:56 +01:00
Enno Rehling
0b036557c0 test that mistletoe users survive attacks. 2018-01-21 18:13:42 +01:00
Enno Rehling
1eaa1e6d84 BUG 2405: use mistletoe to create effect, use effect to flee from battle. 2018-01-21 18:07:49 +01:00
Enno Rehling
4247ef96b1 why are we using the short type? 2018-01-21 11:14:55 +01:00
Enno Rehling
7db82ba21e refactoring for readability 2018-01-21 11:03:51 +01:00
Enno Rehling
2493b01883 make some changes to support non-random skill progress. 
disable test_drain_exp, since it can't deal with that.
 2018-01-21 11:03:50 +01:00
Enno Rehling
88a96d5723 begin adding tests for skills. 2018-01-21 11:03:49 +01:00
Enno Rehling
0b20c379b6 enhance foolpotion test. 2018-01-21 11:03:49 +01:00
Enno Rehling
6481acac76 move xmlreader.c up a directory. 2018-01-21 11:03:49 +01:00
Enno Rehling
d38582360a mistletoe as curse (bad idea) 2018-01-21 11:03:48 +01:00
Enno Rehling
0bf5e3bd57 fix test_cleanup -> test_teardown name change 2018-01-21 11:02:20 +01:00
Enno Rehling
c1bacdb5fd Merge branch 'master' into develop 2018-01-21 11:01:05 +01:00
Enno Rehling
d78b21c1c3 BUG 2413: renumber parsing caused f->no == 0 2018-01-21 10:38:30 +01:00
Enno Rehling
0291d85529 make sure that jewels are what is sold in tests. 2018-01-19 16:59:52 +01:00
Enno Rehling
5b099e27f6 fix broken includes 2018-01-14 18:03:33 +01:00
Enno Rehling
0435c9ee8b jsonconf reads game rules outside of kernel, so move it out. 2018-01-14 17:50:54 +01:00
Enno Rehling
010ff35c4a test_setup_world is deprecated. 2018-01-14 17:43:10 +01:00
Enno Rehling
71c9b5adef Fix broken SHOW logic for potions. 2018-01-14 17:40:49 +01:00
Enno Rehling
7a64053dc9 better testing for is_potion (should be a function) 2018-01-14 17:40:49 +01:00
Enno Rehling
2b2a79620c compiles, test fails, xmlreader includes need fixing 2018-01-14 17:40:48 +01:00
Enno Rehling
3d69f4e372 start removing dependencies on potion_type. 
use item_type where we can. does not compile, is WIP.
 2018-01-14 17:40:48 +01:00
Enno Rehling
42e7e98ccf Default to reporting missing message types during tests as an error, grandfather in some tests with test_inject_messagetypes(); 2018-01-14 17:08:46 +01:00
Enno Rehling
787abc90cf provide more missing messages in test setups. 2018-01-14 11:58:22 +01:00
Enno Rehling
b432fbe9d8 Make the behavior for missing messages configurable. 
message_handle_missing function to set it (test_eressea should enetually use MESSAGE_MISSING_ERROR).
 2018-01-14 11:25:44 +01:00
Enno Rehling
f776450f9b Replace 0 with NULL (consistency is good). 2018-01-14 09:58:45 +01:00
Enno Rehling
75f41a7169 fix crashes on 64-bit systems (not all 0s are created equal). 2018-01-14 09:38:26 +01:00
Enno Rehling
84309caad7 Temporarily re-enable the missing_message code. 
I think we'll want to make this injectable.
Fix the give tests.
 2018-01-13 22:46:02 +01:00
Enno Rehling
b83a1ee136 fix more missing_message errors. 2018-01-13 08:51:40 +01:00
Enno Rehling
98678d9fb2 disable the missing_message replacement used in so many tests. fix some tests so they don't need it. 2018-01-12 21:15:21 +01:00
Enno Rehling
7b8951b6e8 kill the fleechance attribute 2018-01-11 16:47:22 +01:00
Enno Rehling
f1b70aca6f BUG 2405: fix mistletoe, use a curse. 2018-01-10 19:19:29 +01:00
Enno Rehling
d2cbed3042 BUG 2408: acceptance test for TARNE PARTEI 2018-01-10 18:38:38 +01:00
Enno Rehling
5587e209a2 BUG 2409: avoid using integer values >= 2^31 in the CR. 2018-01-08 19:45:49 +01:00
Enno Rehling
a48d177472 BUG 2401: fix combat display, again. 2018-01-07 17:22:15 +01:00
Enno Rehling
2cf20dd6e2 Bug 2407: do not cache study_cost(SK_MAGIC). 2018-01-07 15:26:17 +01:00
Enno Rehling
bd98cf1fbc on the Rapsberry Pi, long is only 32 bit 2018-01-07 13:56:05 +01:00
Enno Rehling
4eb4c61d37 BUG 2387 some tweaks to the first draft. 2018-01-02 20:34:42 +01:00
Enno Rehling
c7a65116be add a test for racename. 2018-01-01 18:50:39 +01:00
Enno Rehling
e4859e68c9 do not use MIN and MAX. 2018-01-01 08:23:52 +01:00
Enno Rehling
0022f48c39 do not use MIN/MAX 2018-01-01 06:56:57 +01:00
Enno Rehling
396e0f6bd7 remove bsdstring from battle. 2018-01-01 01:17:16 +01:00
Enno Rehling
9d8cfc422c fix cmake detection of libbsd 2017-12-31 21:33:31 +01:00
Enno Rehling
62130ca44b add a strncat function to sbstring, use it for create_order. 
eliminate bsdstring.h use.
 2017-12-31 20:07:40 +01:00
Enno Rehling
cc8d34a1e7 fix sbs_strcat, use it for orders. 2017-12-31 18:51:56 +01:00
Enno Rehling
ddd30e6210 sbstring implmentation and first use. 2017-12-31 18:07:29 +01:00
Enno Rehling
01dd489b7a BUG 2403: endless loop (variable rename gone wrong). 2017-12-31 16:36:59 +01:00
Enno Rehling
643c989cf9 BUG 2401: fix attacker list, move code to reports.c 2017-12-31 15:05:49 +01:00
Enno Rehling
0440fcc11c bug 2400: magicbag preservation 2017-12-31 13:14:44 +01:00
Enno Rehling
a6c2a878e0 remov bsdstring tests and include 2017-12-30 20:11:02 +01:00
Enno Rehling
83149de26a remove bsdstring.h where possible. 2017-12-30 20:09:48 +01:00
Enno Rehling
54572fe40e add missing include 2017-12-30 19:50:37 +01:00
Enno Rehling
a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +01:00
Enno Rehling
23ff404d2e move strlcat and strlcpy to strings.h 2017-12-30 13:04:00 +01:00
Enno Rehling
57b161132d fix conversion warnings (MSVC) 2017-12-30 11:51:57 +01:00
Enno Rehling
07b25fbed1 missing include, thanks mac 2017-12-30 11:09:09 +01:00
Enno Rehling
c8ee0db02d stop using MIN and MAX 2017-12-30 08:58:50 +01:00
Enno Rehling
ea0acc49d9 iwyu 2017-12-30 07:22:09 +01:00
Enno Rehling
a6ae5a9e93 no more MINMAX 2017-12-30 00:06:07 +01:00
Enno Rehling
f1a6203f3e Not yet ready to give up on the MIN/MAX macros 2017-12-29 19:26:20 +01:00
Enno Rehling
095148ab50 move va_copy macro closer to where it is used. 2017-12-29 17:00:16 +01:00
Enno Rehling
c3a812123f fix use of static configuration in study_cost. 2017-12-29 16:07:48 +01:00
Enno Rehling
c23e7bf9b9 add a unit test for academy_can_teach. 2017-12-29 13:37:17 +01:00
Enno Rehling
79b5464aab posix systems have PATH_MAX in limits.h 2017-12-29 11:58:39 +01:00
Enno Rehling
50173d5be3 PATH_MAX and MAX_PATH are crazy. 2017-12-29 11:44:14 +01:00
Enno Rehling
f98eab56c4 platform.h is only for WIN32 now. 
replace MIN and MAX macros, they are BAD.
 2017-12-29 06:13:28 +01:00
Enno Rehling
f82fe6e963 more frequent use util/macros.h instead of platform.h 2017-12-28 18:55:45 +01:00
Enno Rehling
5d45b0f99b move some platform defines to a macros header 2017-12-28 18:41:33 +01:00
Enno Rehling
5b1d27542a reduce dependence on platform.h. 
gradually stop using MAX and MIN (mistakes were made).
 2017-12-28 18:29:40 +01:00
Enno Rehling
3c16267246 prevent this mallorn problem for all future tests, too. 2017-12-28 00:10:05 +01:00
Enno Rehling
48b33d31dd prevent intermittent crash when region has mallorn: 2017-12-28 00:05:13 +01:00
Enno Rehling
4018850499 wtf is up with the travis build now? 2017-12-27 23:47:59 +01:00
Enno Rehling
5c790e024c The "Neue Spieler" statistics were never correct. 2017-12-27 22:59:50 +01:00
Enno Rehling
3c1addf2ba avoid using test_create_world. 2017-12-27 22:38:14 +01:00
Enno Rehling
f6753261cd do not use test_create_world, please. 2017-12-27 22:30:07 +01:00
Enno Rehling
bf86c4e043 backfill missing manacrystal test. 2017-12-27 22:26:50 +01:00
Enno Rehling
198f084f5d implement speedy ships, with unit tests and edge testing. 2017-12-27 21:54:09 +01:00
Enno Rehling
cff4e12fbd celan up tests, rename test_cleanup -> test_teardown. 2017-12-27 19:58:39 +01:00
Enno Rehling
c78fe1ac0a move "do not accidentally terrafomr" logic to gmtool. 2017-12-26 13:29:19 +01:00
Enno Rehling
f4388f4429 free equipments, fewer leaks. 2017-12-26 13:26:40 +01:00
Enno Rehling
3911217fb5 eliminate some TODO comments. 2017-12-26 07:25:42 +01:00
Enno Rehling
a7b7162c56 add a safety check against accidentally drowning units in terraforming. 2017-12-26 07:04:12 +01:00
Enno Rehling
f4e56d1512 bug 2238: respect the dragon speed multiplier. 2017-12-26 06:26:56 +01:00
Enno Rehling
a7c45d31ad bug 2214: drifting ships in E3 should take no damage. 2017-12-25 23:22:58 +01:00
Enno Rehling
54ae00bb7d bug 2156: fix volcano reporting, maybe. 2017-12-25 21:55:50 +01:00
Enno Rehling
6927eed52e bug 2387: create a ghost to hold on to magical notlost items. 2017-12-25 19:11:12 +01:00
Enno Rehling
01c808da66 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-23 18:33:38 +01:00
Enno Rehling
4752984e33 sqlite may set errno, reset it 2017-12-23 18:28:51 +01:00
Enno Rehling
5dabd19504 add tests for visible_unit, remove unused cansee_ex 2017-12-23 17:49:30 +01:00
Enno Rehling
6bd4e543ba BUG 2395: lighthouses were seeing units they should not. 
DRY!
 2017-12-23 17:37:24 +01:00
Enno Rehling
73f49ec90a fix demon hunger in E3 and one intermittent test. 
tests involving demons can disable skill changes.
 2017-12-22 19:14:01 +01:00
Enno Rehling
cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +01:00
Enno Rehling
683e3c566d addendum bug 2389: insects mail not sail a ship into a glacier, but can be passengers. 2017-12-17 14:50:11 +01:00
Enno Rehling
404691c5db delete unused define and code for insects. 2017-12-17 14:33:18 +01:00
Enno Rehling
ed75f4d21a fix bug 2389 (sailing into glaciers). 
reduce verbosity.
 2017-12-17 14:28:15 +01:00
Enno Rehling
3685bcabfb BUG 2389: insects starve in glaciers. 
add feature tests for hunger.
 2017-12-17 14:06:40 +01:00
Enno Rehling
e2f954b7f6 BUG 2392: anyone can use weapons, as long as they have _some_ skill. 2017-12-17 10:16:56 +01:00
Enno Rehling
63c066dfe3 BUG 2387: Zauberbeutel braucht kein notlost Attribut. 2017-12-16 20:29:07 +01:00
Enno Rehling
5977ca51b5 tests for insects, prepare for bug 1841 
another test for appeasement, fix guard bug 2389
 2017-12-15 17:16:00 +01:00
Enno Rehling
2257ba3f56 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-13 19:46:13 +01:00
Enno Rehling
2d3451d7b8 another HAVE_X define that was never defined, and pointless 2017-12-12 21:37:44 +01:00
Enno Rehling
761f40f782 FFL_CURSED is forever 2017-12-12 21:34:34 +01:00
Enno Rehling
02248e0c54 fix coverity scan errors 2017-12-12 09:19:47 +01:00
Enno Rehling
77921a94ba BUG 1986: Jedes Magiegebiet kann Vertraute rufen. 2017-12-11 19:47:57 +01:00
Enno Rehling
a74daa2474 fix mac build 2017-12-11 19:31:42 +01:00
Enno Rehling
93613b99af slprintf is not in BSD (it's theft from samba). 2017-12-11 19:23:56 +01:00
Enno Rehling
af7cc02388 try to fix the build 2017-12-11 18:42:35 +01:00
Enno Rehling
d48b9611e1 have cmake determine bsdstring requirement 2017-12-11 18:36:57 +01:00
Enno Rehling
b297b4d43c eliminate some more strlcat calls. 2017-12-11 18:35:30 +01:00
Enno Rehling
9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling
691dde5960 unit test ROUTE. 2017-12-11 16:24:06 +01:00
Enno Rehling
2ca236e68c Add lua tests for ROUTE. 2017-12-10 20:54:02 +01:00
Enno Rehling
686bbdbf69 solve helpers.c without bsdstring 2017-12-10 12:23:28 +01:00
Enno Rehling
ffc39a303f
Merge pull request #745 from ennorehling/develop 
Orders in temporary database, bugfixes, tests. For future 3.15 release.
 2017-12-09 21:30:31 +01:00
Enno Rehling
5576ef37b6 remove building_action feature, it seems that it isn't in use. 2017-12-09 21:20:20 +01:00
Enno Rehling
4e12ff536a The MUSEUM_MODULE define is unnecessary. 2017-12-09 21:06:44 +01:00
Enno Rehling
ffbc9596d7 we do not need a USE_LIBXML define, xml is a hard requirement. 2017-12-09 21:04:27 +01:00
Enno Rehling
866abcc92c remove obsolete defines. 2017-12-09 16:53:36 +01:00
Enno Rehling
643883d539 remove some more unused defines. 2017-12-09 11:17:39 +01:00
Enno Rehling
abd9b94d37 remove some ifdef options to maybe accelerate cppcheck. 2017-12-09 11:00:37 +01:00
Enno Rehling
8efc7f1829 BUG 2391: Friedenslied erlaubt Flucht aus der Region. 2017-12-09 10:44:02 +01:00
Enno Rehling
6c18604bce Failing acceptance test for bug 2391. 2017-12-09 10:24:31 +01:00
Enno Rehling
d740380152 unused variable, merge bug 2017-12-09 09:40:17 +01:00
Enno Rehling
5ad66d6b7a cppcheck style fixes 2017-12-08 21:08:45 +01:00
Enno Rehling
17ee0e50b6 cppcheck warnings and scope reductions. 2017-12-08 21:08:11 +01:00
Enno Rehling
26c31708dc delete dead code. 2017-12-08 20:46:24 +01:00
Enno Rehling
5192ffdb60 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-08 20:18:29 +01:00
Enno Rehling
1b9a686101 fix berkeley size/ulen error 
remove weather module (unused)
 2017-12-08 20:18:01 +01:00
Enno Rehling
9163d166ec cppcheck style fixes. 
delete dead functions.
reactivate patzer_deathcloud.
 2017-12-08 19:59:49 +01:00
Enno Rehling
5e435a7c0b pass cppcheck v 1.54 default checks 2017-12-08 19:26:26 +01:00
Enno Rehling
a51a145ba8 make this loop a little more readable. warning: the break has no tests. 2017-12-06 20:06:46 +01:00
Enno Rehling
7b2531a8ae writing orders to the CR no longer copies them into a buffer when it can be avoided. 2017-12-06 20:00:32 +01:00
Enno Rehling
3864a00482 remove stealing from economy.c (that file is too big). 2017-12-04 20:01:08 +01:00
Enno Rehling
05425b5101 pull economy requests into header, rename the struct. 2017-12-04 19:20:48 +01:00
Enno Rehling
b078015e85 prefer sqlite over berkeley 2017-11-26 18:16:34 +01:00
Enno Rehling
c124702ffe merge order_id branch 2017-11-26 15:20:38 +01:00
Enno Rehling
537166eadf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-11-26 15:17:59 +01:00
Enno Rehling
40bbb48e94 umlaute sind doof. 2017-11-26 15:17:46 +01:00
Enno Rehling
a67b2fa68d stop using random numbers to scale units. 2017-11-26 15:15:25 +01:00
Enno Rehling
9188f6fbb6 scale_number test revised 2017-11-26 15:13:40 +01:00
Enno Rehling
599efb2e76 remove lomem code, it was a bad idea 2017-11-25 20:24:57 +01:00
Enno Rehling
85306165d6 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:31:24 +01:00
Enno Rehling
38922d9205 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:29:52 +01:00
Enno Rehling
d13a0de0f9 Merge branch 'develop' into order_id 2017-11-25 11:24:03 +01:00
Enno Rehling
f8f8f8f43f Merge branch 'master' into develop 2017-11-21 08:47:49 +01:00
Enno Rehling
29a6c0ae86 gmtool, highlight and clear chaos 2017-11-21 08:47:35 +01:00
Enno Rehling
67318950d5 Merge branch 'develop' into order_id 2017-11-20 18:23:33 +01:00
Enno Rehling
ff2f83c371 order leak in recruit_dracoids, do not build a study order 2017-11-20 17:03:12 +01:00
Enno Rehling
36809d1f9a fix coverity resource leaks 2017-11-20 16:49:35 +01:00
Enno Rehling
4fa9e041bf fix cppcheck report (missing curly race) 2017-11-20 14:57:04 +01:00
Enno Rehling
7c69bfa410 snprintf usage 2017-11-20 14:50:19 +01:00
Enno Rehling
e0bd5c2c7b abort on OOM 2017-11-20 14:44:02 +01:00
Enno Rehling
e6c11e2223 workaround for cppcheck false-positive 2017-11-20 08:51:06 +01:00
Enno Rehling
8a638859fd fix memory access in rc_setoption 2017-11-20 08:24:56 +01:00
Enno Rehling
923f01190c sscanf format was too big 2017-11-20 07:52:56 +01:00
Enno Rehling
fdd28835b5 Shifting signed 32-bit value by 31 bits is undefined behaviour 2017-11-20 07:51:31 +01:00
Enno Rehling
793de9f82a no special apple ifdef required 2017-11-19 16:32:20 +01:00
Enno Rehling
41f20c02b2 fix bdb load/save, use recno db 2017-11-19 16:30:20 +01:00
Enno Rehling
2ff820d1b4 implement get/put for db 2017-11-19 12:50:24 +01:00
Enno Rehling
2f5f685e55 add berkeley db, rename some files 2017-11-19 12:31:50 +01:00
Enno Rehling
9c44c1ce63 Merge branch 'develop' into order_id 2017-11-19 03:21:02 +01:00
Enno Rehling
c39708f40c BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:20:00 +01:00
Enno Rehling
b0ce88631e fix bug 2386, int overflow 2017-11-19 03:19:59 +01:00
Enno Rehling
97b4806deb Merge branch 'release-13.3' 
Conflicts:
	src/kernel/unit.c
	src/kernel/unit.test.c
 2017-11-19 03:13:16 +01:00
Enno Rehling
1c24628d62 BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:00:18 +01:00
Enno Rehling
7e1f3dbdc5 fix bug 2386, int overflow 2017-11-19 02:56:13 +01:00
Steffen Mecke
2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling
3f3cdad390 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:30:19 +01:00
Enno Rehling
73c1478b87 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-18 18:26:37 +01:00
Enno Rehling
2014a23212
Merge pull request #740 from stm2/add_2383 
remove irace assumptions
 2017-11-18 18:25:50 +01:00
Steffen Mecke
6e53f15a1c addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:10:49 +01:00
Enno Rehling
396705f492 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:10:45 +01:00
Enno Rehling
50e242b810 fix include of renamed header 2017-11-18 13:02:12 +01:00
Enno Rehling
2224b59ff9 organize database drivers in their own directory 2017-11-18 12:55:07 +01:00
Enno Rehling
9d328a07f2 Merge branch 'order_id' of https://github.com/ennorehling/eressea.git 2017-11-16 18:41:18 +01:00
Enno Rehling
dbe835e485 add cmake directives to build with Berkeley DB 2017-11-16 18:30:18 +01:00
Enno Rehling
290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Enno Rehling
54b016a735 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-15 20:37:46 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Steffen Mecke
2f35feee3e minor, obvious fixes 2017-11-14 12:51:04 +01:00
Enno Rehling
3b6d7a4055 Merge branch 'develop' 2017-11-12 22:15:47 +01:00
Enno Rehling
dae2ca2b5b buildings should have all the same name-tests as ships. 2017-11-12 15:12:45 +01:00
Enno Rehling
ac8ca5f728 Also test that I can rename a ship that I myself own, of course. 2017-11-12 15:09:57 +01:00
Enno Rehling
db3feeedcc combine ship naming tests. 2017-11-12 15:05:17 +01:00
Enno Rehling
2703b01ade units can rename the ship they are on if their faction owns it. 
this fixes bug 2384.
 2017-11-12 15:01:58 +01:00
Enno Rehling
4a73db1f67 add a test that proves bug 2384 exists. 2017-11-12 14:59:44 +01:00
Enno Rehling
d2356d9e4f fix name of config variables. 2017-11-12 14:32:08 +01:00
Enno Rehling
48a58fc907 sqlite optimizations: transactions, journal_mode, synchronous. 2017-11-11 21:46:16 +01:00
Enno Rehling
79b397e07f fix config_get, has no default. 2017-11-10 16:32:20 +01:00
Enno Rehling
6923fe5c53 fix lua dbupdate 
write sqlite data to a temporary db by default (configurable).
 2017-11-10 16:29:48 +01:00
Enno Rehling
f8e552ab6e gcc and clang want function pointers to be cast. 2017-11-10 08:02:52 +01:00
Enno Rehling
05b7837070 fix parser to keep a reference to the order it is parsing. 
make push/popstate not crash. pass unit tests.
 2017-11-10 07:56:56 +01:00
Enno Rehling
df4cc70abf add nul terminator to loaded string. 2017-11-10 07:45:41 +01:00
Enno Rehling
add9d24f52 convert needs sqlite3 now (because libgame does). 2017-11-10 07:45:15 +01:00
Enno Rehling
89bf17cdca almost have sqlite storage working (in memory, not file). 
but test_teach_magic crashes.
 2017-11-09 21:33:42 +01:00
Enno Rehling
0cd9651690 fix sqlite linking for tests. 
implement save_order for sqlite.
 2017-11-09 21:12:25 +01:00
Enno Rehling
9f778c0ae9 fix symetric db_open and db_close calls. 2017-11-09 20:17:06 +01:00
Enno Rehling
fee9b6d0a8 separate database logic from order_data. 
laying groundwork for different database backends.
 2017-11-09 19:55:28 +01:00
Enno Rehling
34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling
5a0a1f495b BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-07 19:42:00 +01:00
Enno Rehling
98be298d72 reduce monster spawning with configuration settings. 2017-11-07 19:35:21 +01:00
Enno Rehling
fa42423f3c oops. 2017-11-06 21:10:37 +01:00
Enno Rehling
eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling
31d15550ed Add test coverage for NAME ALLIANCE. 2017-11-06 20:38:28 +01:00
Enno Rehling
7196f799e6 add a terrain_changed function for use with static terrain variables. 2017-11-06 20:29:26 +01:00
Enno Rehling
c597bebb8b fix drowning (it's not dependeing on icebergs). 2017-11-05 20:52:04 +01:00
Enno Rehling
5b70d605ce gcc is annoying about switch statements 2017-11-05 19:38:42 +01:00
Enno Rehling
373d738084 add a modules.icebergs configuration variable. 2017-11-05 19:35:06 +01:00
Enno Rehling
4b1b98f5ec Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-11-05 19:16:35 +01:00
Enno Rehling
96ff0815c4 newterrain sucks. 2017-11-05 19:15:43 +01:00
Enno Rehling
440679da87 code that uses newterrain needs to set up terrains in tests. 2017-11-05 17:00:40 +01:00
Enno Rehling
2b81334ba2 use the correct swamp terrain, still failing. newterrain is a plague. 2017-11-05 16:43:01 +01:00
Enno Rehling
3fdde8a4aa refactor original trade test to use shared setup function. 2017-11-05 15:14:54 +01:00
Enno Rehling
12646f726a Add a failing test for bug 2379. 2017-11-05 15:11:02 +01:00
Enno Rehling
a17c8ada71 Add a test for the happy case of the BUY command. 2017-11-04 20:10:05 +01:00
Enno Rehling
9c24fe4b07 fix gcc build 2017-10-30 18:12:24 +01:00
Enno Rehling
35742e8870 BUG 2376: Abtreiben zeigt immer Nordwesten an. 2017-10-30 18:01:33 +01:00
Enno Rehling
0277e10c8d BUG 2381: parse_token overrun. 2017-10-29 19:00:18 +01:00
Enno Rehling
5af5daa355 BUG 2378: Fix magic armor resistance calculation. 
Use frac_one constant where applicable.
 2017-10-29 18:55:43 +01:00
Enno Rehling
1866b95e14 BUG 2381: parse_token overrun. 2017-10-29 18:03:44 +01:00
Enno Rehling
551f349309 begin work on 3.15 release 2017-10-28 19:46:17 +02:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
a0a39124f0 additional tests for cansee, to support fixing bug 2374 2017-10-15 20:20:43 +02:00
Enno Rehling
4257a9891c another test. moving some deckchairs around. 2017-10-14 09:01:14 +02:00
Enno Rehling
6d79f85628 orderdb backend choices and first tests. 2017-10-14 08:43:01 +02:00
Enno Rehling
5a40ff9e62 merge conflict fix 2017-10-13 19:35:12 +02:00
Enno Rehling
78360b1466 refactoring: move order_data to orderdb module. 2017-10-13 19:34:39 +02:00
Enno Rehling
8a5164806b try fixing coverity complaints 2017-10-13 19:33:29 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
394839f7a4 WIP: optimized study orders, failing 15 study tests 2017-10-13 19:33:28 +02:00
Enno Rehling
1033143411 fix gcc build 2017-10-13 19:33:28 +02:00
Enno Rehling
42f7be4bb9 do not use a list to store several million entries. 2017-10-13 19:33:28 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
2b54605080 remove order de-duplication for short and study orders. 2017-10-13 19:33:27 +02:00
Enno Rehling
db0bd8d4db refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-13 19:33:27 +02:00
Enno Rehling
9ff98b5b23 more fine-grained testing for cansee 2017-10-13 19:32:31 +02:00
Enno Rehling
ca6cbe5906 fixing commit 1b53128e1a and adding a test for cansee. 2017-10-13 19:07:57 +02:00
Enno Rehling
8246639e57 test cansee for perception & stealth 2017-10-13 18:41:29 +02:00
Enno Rehling
a82034b8a7 BUG 2372 canride breakage 2017-10-13 18:30:22 +02:00
Enno Rehling
9527460ca4 github issue 734: clear equipments after test. 2017-10-10 20:59:51 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00