Commit graph

57 commits

Author SHA1 Message Date
Enno Rehling
35c6f30511 umlaut substitutions 2019-02-08 11:37:32 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection.
effskill: use NULL, not 0 for pointer arguments.
2019-02-02 20:38:02 +01:00
Enno Rehling
7ea64be314 code analysis scan.
add checks for malloc results.
reduce stack size.
2018-12-15 19:38:40 +01:00
Enno Rehling
bc5f2ea6d1 move keyword.[hc] to util 2018-09-29 18:13:32 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +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
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +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
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
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
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
1eaa1e6d84 BUG 2405: use mistletoe to create effect, use effect to flee from battle. 2018-01-21 18:07:49 +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
7b8951b6e8 kill the fleechance attribute 2018-01-11 16:47:22 +01:00
Enno Rehling
e4859e68c9 do not use MIN and MAX. 2018-01-01 08:23:52 +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
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Steffen Mecke
080d5e3f65 rename teaching_info.value to days 2017-09-02 15:50:03 +02:00
Enno Rehling
f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +02:00
Enno Rehling
7985ebe511 replace ct_find calls with constants.
reorder a lot of includes.
2017-08-21 20:18:19 +02:00
Enno Rehling
7a4a49160c unused variable 2017-08-18 19:48:34 +02:00
Enno Rehling
c8b2ce7900 BUG 2356: fix curse read/write
rename curse::flags to curse::mask, use c_flags.
fix some curse_type having CURSE_ISNEW fixed.
2017-08-18 19:39:33 +02:00
Enno Rehling
f4eda9f59e prefer dice to dice_rand 2017-03-06 06:28:12 +01:00
Enno Rehling
69e28034b4 Kill unused "magicboost" function.
I have no idea why this exists.
2017-02-27 21:00:15 +01:00
Enno Rehling
9e239c88f4 testing insect warmth potion 2017-02-27 20:26:48 +01:00
Enno Rehling
462d0118e3 better testing for some items. 2017-02-27 20:16:50 +01:00
Enno Rehling
9d09574d5e enable process_orders to be done in steps.
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806 Test E2 items in E2 only.
Remove eye of demon (broken item).
2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b remove remainders of the arena.
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398 tests for more items 2017-02-27 15:14:52 +01:00
Enno Rehling
3d4860c033 remove more of the artrewards 2017-02-27 14:19:25 +01:00
Enno Rehling
db0cbf34c7 test for aurapotion 2017-02-27 14:17:38 +01:00
Enno Rehling
5ffe60193b move items with tests to items.c 2017-02-27 14:10:12 +01:00
Enno Rehling
2be1868ff0 Antiemagiekristall Meldung geht an die Region.
Nicht nur an die Partei, die es zaubert.
http://bugs.eressea.de/view.php?id=1987
2017-02-03 21:48:03 +01:00
Enno Rehling
8b7dae6977 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-10 16:31:05 +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
dd8449783a converting float->double in a lot of the code to prevent -Wconversion messages 2015-05-15 19:08:44 +02:00
Enno Rehling
abca25d1d5 fix indentation in every file
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
2015-01-30 20:37:14 +01:00
Enno Rehling
c8b9044f78 rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
Enno Rehling
1af315ebf2 move magic out of kernel, into src.
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
2014-11-01 12:57:01 +01:00
Enno Rehling
74582aeb2f fix remaining getstrtoken uses without null-check. 2014-09-21 16:43:17 +02:00