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

3697 commits

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