Commit graph

75 commits

Author SHA1 Message Date
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling
f594a908df deprecate old get_mage implementation.
fix test_familiar_equip with new get_mage.
2017-10-06 21:53:07 +02:00
Enno Rehling
8c6362002e fix some niggles, delete invalid test. 2017-09-16 07:37:33 +02:00
Enno Rehling
2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling
fc4bde47f6 kill the old curses enum and oldcursename. 2017-08-21 20:48:00 +02:00
Enno Rehling
eb1dc731cb consistently rename ec_flags constants (ECF_*) 2017-07-17 12:33:55 +02:00
Enno Rehling
f934e4d5e3 remove unused ECF_KEEP_ITEM flag. 2017-07-17 12:31:47 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
1885831204 remove handle_events for unused events. 2017-04-30 03:48:50 +02:00
Enno Rehling
21e260907c BUG 2311: unit limits were not enforced by GIVE. 2017-03-11 20:03:49 +01:00
Enno Rehling
b3e929891d Merge branch 'master' into develop 2017-03-11 07:22:49 +01:00
Enno Rehling
ce9e2ce314 fix invalid arguments for give/receive messages. 2017-03-06 22:24:15 +01:00
Enno Rehling
7022ae05bd Merge branch 'master' into develop
Conflicts:
	src/kernel/item.c
	src/modules/arena.c
2017-03-06 22:20:22 +01:00
Enno Rehling
aa662e65d2 eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
Enno Rehling
d9d542cfee we only call these when target is 0, anyway. 2017-03-03 19:19:33 +01:00
Enno Rehling
d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling
4e5f1d05ce Be very strict about C standards.
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
2017-02-18 21:15:14 +01:00
Enno Rehling
4828045fd7 there is no NEWATSROI, remove dead code 2017-02-12 18:52:41 +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
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
e293741997 wrong enum, thanks gcc 2016-11-14 20:33:26 +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
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
03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling
a5c7d9b615 fix giving items to dead units, https://bugs.eressea.de/view.php?id=2230 2016-08-21 11:58:53 +02:00
Enno Rehling
f559c263e3 cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
Enno Rehling
64b84481b2 refactoring: move parsing and allies code out of config.c 2015-11-24 18:52:09 +01:00
Enno Rehling
a4cb5e2906 replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
Enno Rehling
990fda6234 clean up config.c, remove static configuration caching 2015-11-21 18:13:16 +01:00
Enno Rehling
65f1574312 CID 22490 Dereference after null check 2015-11-04 14:27:38 +01:00
Enno Rehling
0271336428 CID 22494 Identical code for different branches 2015-11-04 14:24:44 +01:00
Enno Rehling
6e31751731 CID 22542 Resource leak
Fix broken error mesasge: "Die Einheit hat diesen Gegenstand zwar, aber sämtliche $int($reservation) $resource($resource,$reservation) sind reserviert."
2015-11-04 14:22:45 +01:00
Enno Rehling
1df0afc58a CID 22550: Dereference before null check (REVERSE_INULL) 2015-10-30 12:50:32 +01:00
Enno Rehling
e25d3c8ed1 Fix a bug reporting DETROY messages to the correct unit.
Add missing not-null assertions before accessing function parameters.
Eliminate all of the PVS-Studio warnings.
2015-07-07 00:49:12 +02:00
Enno Rehling
05ec74f9ec annotate with finds from PVS Studio trial static analysis 2015-07-06 21:31:27 +02:00
Enno Rehling
ef4052b0f6 the outcome of a casual static analysis session. 2015-07-06 19:53:09 +02:00
Enno Rehling
266b019928 Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit
Conflicts:
	scripts/eressea/xmlconf.lua
2015-06-08 09:43:36 +02:00
Enno Rehling
12946615e5 Bugfix 2109: Einheiten lassen sich nicht mehr zwischen Parteien übergeben
https://bugs.eressea.de/view.php?id=2109
Wenn max_transfers < 0 war, wurde das nur in give_men richtig interpretiert, aber nicht in give_unit.
2015-06-08 09:06:20 +02:00
Enno Rehling
34b1ead0ac Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-24 07:44:02 +02:00
Enno Rehling
73fa9a276d Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-22 16:23:18 +02: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
ce94c9805d rules.give.max_men == -1 für unlimitierte Übergaben in E2 2015-04-28 17:40:41 +02:00
Enno Rehling
f06e3371a0 Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff. 2015-04-19 12:49:39 +02:00
Enno Rehling
4d18fe68f8 gcc language purity complaint. 2015-03-13 21:56:18 +01:00
Enno Rehling
293190703f make maximum number of people transferred to a faction configurable
make E2 transfers basically unlimited.
2015-03-13 21:10:39 +01: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