Commit graph

3550 commits

Author SHA1 Message Date
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