Commit graph

304 commits

Author SHA1 Message Date
Enno Rehling
622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling
28e9ddbdb4 Merge branch 'master' 2018-02-25 20:27:16 +01:00
Enno Rehling
b67db4faf9 remove unused ct_fleechance (misteltoe relic) 2018-02-25 13:22:41 +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
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
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
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
a6c2a878e0 remov bsdstring tests and include 2017-12-30 20:11:02 +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
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
ed75f4d21a fix bug 2389 (sailing into glaciers).
reduce verbosity.
2017-12-17 14:28:15 +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
77921a94ba BUG 1986: Jedes Magiegebiet kann Vertraute rufen. 2017-12-11 19:47:57 +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
9163d166ec cppcheck style fixes.
delete dead functions.
reactivate patzer_deathcloud.
2017-12-08 19:59:49 +01:00
Enno Rehling
c124702ffe merge order_id branch 2017-11-26 15:20:38 +01:00
Enno Rehling
599efb2e76 remove lomem code, it was a bad idea 2017-11-25 20:24:57 +01:00
Enno Rehling
9c44c1ce63 Merge branch 'develop' into order_id 2017-11-19 03:21:02 +01:00
Steffen Mecke
2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +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
290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
c2634bd095 move readorders to orderfile module. 2017-10-07 19:44:23 +02:00
Enno Rehling
ecce8e5d91 Revert "refactor: extract a read_order function."
This reverts commit 8b39133dbf.
2017-10-07 18:06:54 +02:00
Enno Rehling
0537d39b17 add a fix for 2367 to fix_familiars 2017-10-07 03:22:35 +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
86e99a560c read_order must use parse_order (not create) to properly handle make temp. 2017-09-26 18:52:26 +02:00
Enno Rehling
8b39133dbf refactor: extract a read_order function. 2017-09-26 17:07:49 +02:00
Enno Rehling
3aed0b1ee5 fix gcc compilation 2017-09-22 16:39:46 +02:00
Enno Rehling
0c16727d41 hashing implemented with linear probing and tombstones.
WIP: this crashes 572 in faction_getmages?
2017-09-22 09:15:37 +02:00
Enno Rehling
902e2126c9 WIP: change the resolve.h API 2017-09-21 17:29:01 +02:00
Enno Rehling
89e162c12a change resolve.h api to use int, not variant. 2017-09-19 11:42:02 +02:00
Enno Rehling
0d0fb49381 attempt to fix valgrind bug 2017-09-16 09:34:47 +02:00
Enno Rehling
0a3eb9ac7b fix read/write of regioninfo. 2017-09-16 09:03:42 +02:00
Enno Rehling
1b19e8d19c BUG 2365: Ozeane sollen keine Beschreibung haben können.
https://trello.com/c/GSeHT8t6/618-why-r-display-not-r-land-display
2017-09-16 08:42:49 +02:00
Enno Rehling
423fe65377 move region display to land_region struct, oceans do not have descriptions. 2017-09-16 07:58:57 +02:00
Enno Rehling
8c6362002e fix some niggles, delete invalid test. 2017-09-16 07:37:33 +02:00
Enno Rehling
860afe855f improve the skill read/write code. 2017-09-15 22:03:54 +02:00
Enno Rehling
8b4e3b7738 extract write_skills and read_skills functions. 2017-09-15 21:55:57 +02:00
Enno Rehling
a8bfa5e095 try fixing familars without a mage. 2017-08-31 21:19:25 +02:00
Enno Rehling
3ceeb54006 Merge branch 'master' into develop 2017-06-18 22:05:20 +02:00
Enno Rehling
8178f3f1e6 BUG 2334: Nochmal Ponnuki
Monsters cannot attack or guard when they are fleeing
2017-06-18 14:20:01 +02:00
Enno Rehling
69ef2c7ce7 Merge branch 'master' into develop
Conflicts:
	src/magic.c
2017-06-18 01:11:40 +02:00
Enno Rehling
f6ba5b6a53 BUG 2333 NMR-Anzahl im WB falsch
https://bugs.eressea.de/view.php?id=2333
2017-06-11 17:06:13 +02:00
Enno Rehling
5b807e2057 crash casued by spell conversion.
remove unit from faction, not only region!
also remove spammy warning that has no value.
2017-06-04 14:13:05 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
30cfe2c0c0 convert RC_SPELL to at_observer during readgame. 2017-05-24 08:18:55 +02:00
Enno Rehling
c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
0c8a9354db rmt_find no longer used.
handle old data files with rm_iron, etc.
2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10 make region:set_resource do the right thing
also for adamantium
2017-03-22 20:37:09 +01:00
Enno Rehling
8cfcffc4aa remove data_turn and gamename from global settings.
make run-turn.sh work without valgrind
2017-03-13 09:19:37 +01:00
Enno Rehling
d633c2a9fb BUG 2310: counting units and people.
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
2017-03-11 19:36:26 +01:00
Enno Rehling
acfb666539 remove rtype->uget funpointer, and lua callbacks.
fix a missing lua_pop that trashed the heap.
2017-03-04 20:59:43 +01:00
Enno Rehling
794dae11cf remove artsculpture and genericbuilding.
deal with buildings having an unknown type.
2017-02-24 14:29:14 +01:00
Enno Rehling
f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling
ba1fdcce59 remove race.describe funpointer 2017-02-20 07:47:36 +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
f6fcd39293 add a failing test for familiars (disabled).
remove superfluous init_locales calls.
2017-02-11 22:28:57 +01:00
Enno Rehling
ae83448e4a Deveron is now just E3 with a different name.
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
2017-02-02 10:10:21 +01:00
Enno Rehling
af1ce9b84e issue #633: parse FACTION/PARTEI in any language.
added a test since the first fix did not work.
2017-01-26 18:06:48 +01:00
Enno Rehling
1bd6ab11ea FACTION and PARTEI should both start orders. 2017-01-26 18:06:48 +01:00
Enno Rehling
6e51570229 remove ERESSEA keyword from "bad password" message. 2017-01-26 18:06:16 +01:00
Enno Rehling
d1b5daf833 compiles with gcc on rpi 2017-01-26 18:05:26 +01:00
Enno Rehling
d94cde67a4 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
Enno Rehling
a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling
78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling
303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling
03a94d1264 remove unused and broken backup functionality 2016-11-14 01:35:45 +01:00
Enno Rehling
0472ac761e declutter save.h (items, spellbooks) 2016-11-14 01:22:50 +01:00
Enno Rehling
d28d3f4690 move read/write_items to item.c.
fix bad memset in attrib.test.c.
2016-11-14 01:00:48 +01:00
Enno Rehling
0eaa750ef4 move read/write_attribs to attrib.h, too 2016-11-13 19:47:36 +01:00
Enno Rehling
11b122048b reduce dependency on save.h
moving a_write* functions to attrib.h, which was most of the reason everyone and their mom include save.h
2016-11-13 19:40:38 +01:00
Enno Rehling
2d2ded8f0d fix a_readint for deprecated attribs. 2016-11-13 17:57:57 +01:00
Enno Rehling
663ad17b5a extract read_region and test that it fixes bad names. 2016-11-12 01:03:07 +01:00
Enno Rehling
ec787743f0 extract read_faction and test that it repairs bad names 2016-11-12 00:47:25 +01:00
Enno Rehling
710811131f fix bad ship and building names and descriptions in save. 2016-11-11 22:28:22 +01:00
Enno Rehling
5032d44af4 refactor: extract read_/write_ship functions.
add test: bad names are cleaned up (failing).
2016-11-11 22:25:56 +01:00
Enno Rehling
110e87916d fix bad ship names in save file. 2016-11-11 21:46:56 +01:00
Enno Rehling
599c422852 refactor: extract read_/write_building.
add a failing test for conversion of bad names.
2016-11-11 21:41:25 +01:00
Enno Rehling
dea1020983 log a warning, not an error, when fixing bad save data. 2016-11-11 11:10:15 +01:00
Enno Rehling
97e91fd8eb fix bad names.
trim leading whitespace and non-printable characters from existing
unit, region and faction names/descriptions.
2016-11-11 00:30:49 +01:00
Enno Rehling
fec9945458 Fixing Bugs 2246 & 2251
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
2016-11-05 18:20:56 +01:00
Enno Rehling
e5dc754c25 fix demand in broken regions, after load. 2016-10-24 13:54:53 +02:00
Enno Rehling
5fe0503cd8 remove the unicode.h include from files that don't use it. 2016-10-05 16:43:14 +02:00
Enno Rehling
e97ebb0469 RF_SAVEMASK needs to include RF_LIGHTHOUSE or the new report prep doesn't work. 2016-09-17 19:52:13 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
318cf68e1b move version string into a single object file 2016-09-16 16:30:17 +02:00
Enno Rehling
95481211e5 expect remove and unlink to set errno when file doesn't exist, reduce misleading spam. 2016-09-11 17:19:27 +02:00
Enno Rehling
7807f83830 fix compilation (buildno.h is gone) 2016-09-10 17:43:06 +02:00
Enno Rehling
e200952e87 new version numbering in version.h
eliminate buildno.h
TODO: update build scripts
2016-09-10 17:41:44 +02:00