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

1683 commits

Author SHA1 Message Date
Enno Rehling
599efb2e76 remove lomem code, it was a bad idea 2017-11-25 20:24:57 +01:00
Enno Rehling
85306165d6 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:31:24 +01:00
Enno Rehling
38922d9205 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:29:52 +01:00
Enno Rehling
d13a0de0f9 Merge branch 'develop' into order_id 2017-11-25 11:24:03 +01:00
Enno Rehling
f8f8f8f43f Merge branch 'master' into develop 2017-11-21 08:47:49 +01:00
Enno Rehling
67318950d5 Merge branch 'develop' into order_id 2017-11-20 18:23:33 +01:00
Enno Rehling
36809d1f9a fix coverity resource leaks 2017-11-20 16:49:35 +01:00
Enno Rehling
7c69bfa410 snprintf usage 2017-11-20 14:50:19 +01:00
Enno Rehling
e0bd5c2c7b abort on OOM 2017-11-20 14:44:02 +01:00
Enno Rehling
8a638859fd fix memory access in rc_setoption 2017-11-20 08:24:56 +01:00
Enno Rehling
fdd28835b5 Shifting signed 32-bit value by 31 bits is undefined behaviour 2017-11-20 07:51:31 +01:00
Enno Rehling
793de9f82a no special apple ifdef required 2017-11-19 16:32:20 +01:00
Enno Rehling
41f20c02b2 fix bdb load/save, use recno db 2017-11-19 16:30:20 +01:00
Enno Rehling
2ff820d1b4 implement get/put for db 2017-11-19 12:50:24 +01:00
Enno Rehling
2f5f685e55 add berkeley db, rename some files 2017-11-19 12:31:50 +01:00
Enno Rehling
9c44c1ce63 Merge branch 'develop' into order_id 2017-11-19 03:21:02 +01:00
Enno Rehling
c39708f40c BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:20:00 +01:00
Enno Rehling
b0ce88631e fix bug 2386, int overflow 2017-11-19 03:19:59 +01:00
Enno Rehling
97b4806deb Merge branch 'release-13.3' 
Conflicts:
	src/kernel/unit.c
	src/kernel/unit.test.c
 2017-11-19 03:13:16 +01:00
Enno Rehling
1c24628d62 BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:00:18 +01:00
Enno Rehling
7e1f3dbdc5 fix bug 2386, int overflow 2017-11-19 02:56:13 +01:00
Steffen Mecke
2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling
73c1478b87 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-18 18:26:37 +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
50e242b810 fix include of renamed header 2017-11-18 13:02:12 +01:00
Enno Rehling
2224b59ff9 organize database drivers in their own directory 2017-11-18 12:55:07 +01:00
Enno Rehling
290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Enno Rehling
54b016a735 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-15 20:37:46 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
d2356d9e4f fix name of config variables. 2017-11-12 14:32:08 +01:00
Enno Rehling
48a58fc907 sqlite optimizations: transactions, journal_mode, synchronous. 2017-11-11 21:46:16 +01:00
Enno Rehling
79b397e07f fix config_get, has no default. 2017-11-10 16:32:20 +01:00
Enno Rehling
6923fe5c53 fix lua dbupdate 
write sqlite data to a temporary db by default (configurable).
 2017-11-10 16:29:48 +01:00
Enno Rehling
f8e552ab6e gcc and clang want function pointers to be cast. 2017-11-10 08:02:52 +01:00
Enno Rehling
05b7837070 fix parser to keep a reference to the order it is parsing. 
make push/popstate not crash. pass unit tests.
 2017-11-10 07:56:56 +01:00
Enno Rehling
df4cc70abf add nul terminator to loaded string. 2017-11-10 07:45:41 +01:00
Enno Rehling
89bf17cdca almost have sqlite storage working (in memory, not file). 
but test_teach_magic crashes.
 2017-11-09 21:33:42 +01:00
Enno Rehling
0cd9651690 fix sqlite linking for tests. 
implement save_order for sqlite.
 2017-11-09 21:12:25 +01:00
Enno Rehling
9f778c0ae9 fix symetric db_open and db_close calls. 2017-11-09 20:17:06 +01:00
Enno Rehling
fee9b6d0a8 separate database logic from order_data. 
laying groundwork for different database backends.
 2017-11-09 19:55:28 +01:00
Enno Rehling
34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling
eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling
31d15550ed Add test coverage for NAME ALLIANCE. 2017-11-06 20:38:28 +01:00
Enno Rehling
7196f799e6 add a terrain_changed function for use with static terrain variables. 2017-11-06 20:29:26 +01:00
Enno Rehling
373d738084 add a modules.icebergs configuration variable. 2017-11-05 19:35:06 +01:00
Enno Rehling
440679da87 code that uses newterrain needs to set up terrains in tests. 2017-11-05 17:00:40 +01:00
Enno Rehling
2b81334ba2 use the correct swamp terrain, still failing. newterrain is a plague. 2017-11-05 16:43:01 +01:00
Enno Rehling
a17c8ada71 Add a test for the happy case of the BUY command. 2017-11-04 20:10:05 +01:00
Enno Rehling
5af5daa355 BUG 2378: Fix magic armor resistance calculation. 
Use frac_one constant where applicable.
 2017-10-29 18:55:43 +01:00
Enno Rehling
551f349309 begin work on 3.15 release 2017-10-28 19:46:17 +02:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
4257a9891c another test. moving some deckchairs around. 2017-10-14 09:01:14 +02:00
Enno Rehling
5a40ff9e62 merge conflict fix 2017-10-13 19:35:12 +02:00
Enno Rehling
78360b1466 refactoring: move order_data to orderdb module. 2017-10-13 19:34:39 +02:00
Enno Rehling
8a5164806b try fixing coverity complaints 2017-10-13 19:33:29 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
394839f7a4 WIP: optimized study orders, failing 15 study tests 2017-10-13 19:33:28 +02:00
Enno Rehling
1033143411 fix gcc build 2017-10-13 19:33:28 +02:00
Enno Rehling
42f7be4bb9 do not use a list to store several million entries. 2017-10-13 19:33:28 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
2b54605080 remove order de-duplication for short and study orders. 2017-10-13 19:33:27 +02:00
Enno Rehling
db0bd8d4db refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-13 19:33:27 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +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
2ce94f2d47 BUG 2367: refactor create_newfamiliar. 
add first failing test for bug report.
 2017-10-06 21:23:58 +02:00
Enno Rehling
4452f93009 BUG 2367: add a test for set_familiar. 2017-10-05 22:13:39 +02:00
Enno Rehling
02cfde0a49 fix create_unit default order memory leak 2017-10-01 17:08:05 +02:00
Enno Rehling
03f46e35c4 one short order to rule them all. 2017-09-30 20:09:30 +02:00
Enno Rehling
e50c421b3f can remove the keyword from order_data now 2017-09-30 20:08:22 +02:00
Enno Rehling
a067838fa0 test all the edge cases. 2017-09-30 19:44:39 +02:00
Enno Rehling
5c63d20ff7 fix remaining bugs 2017-09-30 19:35:40 +02:00
Enno Rehling
54fdda85cd smallify order 2017-09-30 19:22:24 +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
e0514eddb5 let callers pass memory into create_order_i 2017-09-25 22:15:13 +02:00
Enno Rehling
9a1295b4a5 push whitespace eating down the stack a bit. 2017-09-25 22:12:49 +02:00
Enno Rehling
778f487afa remove whitespace eating from parse_order. 2017-09-25 22:08:23 +02:00
Enno Rehling
6bf2ac34e3 test that whitespace is ignored when parsing orders 2017-09-25 22:04:16 +02:00
Enno Rehling
1203b6e23a fix clang build warning 2017-09-22 19:13:42 +02:00
Enno Rehling
f350b81d51 gcc warning 2017-09-22 17:59:23 +02:00
Enno Rehling
8ebd4c2066 some more bugs reading objects that are conditional on save-data 2017-09-22 17:58:10 +02:00
Enno Rehling
0a9705809b fix some bugs created during conversions (thanks, tests!) 2017-09-22 17:19:55 +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
afe4532966 remove code for unsupported old region references 2017-09-21 17:29:01 +02:00
Enno Rehling
902e2126c9 WIP: change the resolve.h API 2017-09-21 17:29:01 +02:00
Enno Rehling
cda17d5379 The minimum data version has actually been 332 for a long time. 2017-09-21 16:30:29 +02:00
Enno Rehling
89e162c12a change resolve.h api to use int, not variant. 2017-09-19 11:42:02 +02:00
Enno Rehling
30777e5948 CID 173898 'Constant' variable guards dead code 2017-09-18 20:27:34 +02:00
Enno Rehling
4bccc87f2b fix Invalid read (valgrind) in remove_skill 2017-09-18 20:20:13 +02:00
Enno Rehling
832ba5f948 relax the limit on shortness of names a bit. 2017-09-18 20:14:46 +02:00
Enno Rehling
f43ec9ee0f remove equipment.name, save an allocation. 2017-09-18 20:03:23 +02:00
Enno Rehling
b4fc7a1ab4 fix coverity nag about spellbooks. 2017-09-18 19:51:47 +02:00
Enno Rehling
2451a8f637 resource names are max 23 bytes long. 
fix rt_find nul-termination bug
 2017-09-18 17:57:59 +02:00
Enno Rehling
c45c211dcf merge equipment fixes from develop 2017-09-18 17:47:24 +02:00
Enno Rehling
e2f6ada862 limit equipment names to 15 byte plus nul. 2017-09-18 17:46:26 +02:00
Enno Rehling
4cab65d233 fail get_equipment test when name is exactly 16 bytes long. 2017-09-18 17:32:39 +02:00
Enno Rehling
5605510351 Merge branch 'develop' 2017-09-18 17:27:09 +02:00
Enno Rehling
6ab35d80d0 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-09-18 17:26:50 +02:00
Enno Rehling
7fdbb1b939 add a test for rt_find to flush out substring matches. 2017-09-18 17:26:34 +02:00
Enno Rehling
69079ce319 remove it_register, because it does nothing. 2017-09-18 17:20:58 +02:00
Enno Rehling
1f65932794 add a test for get_equipment with substrings. 2017-09-18 17:20:09 +02:00
Enno Rehling
c9445ab517 change resource_type trie storage 2017-09-18 11:48:42 +02:00
Enno Rehling
97dc98862b do not use strncpy, then 2017-09-18 08:39:06 +02:00
Enno Rehling
455e03fa05 try and make coverity understand the equipment trie. 
shorten names.
 2017-09-17 20:42:43 +02:00
Enno Rehling
8e0bdbe428 coverity scan does not understand get_or_create_equipment? 2017-09-17 09:31:43 +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
a569ef67e8 sortiere unit.skills nach id. 
TODO: binary search statt linear, read_unit optimization

https://trello.com/c/ydUTDGgl/616-sort-unitskills-binary-search
 2017-09-15 21:52:20 +02:00
Enno Rehling
c5181195d7 new feature: sea serpents will not go after small targets. 2017-09-09 12:58:10 +02:00
Enno Rehling
b9b3f0322e slightly faster lookup for equipment, probably. 2017-09-08 22:24:17 +02:00
Enno Rehling
30b0b2ad81 fix a lot of memory leaks that were exposed by unit tests. 2017-09-02 17:36:09 +02:00
Enno Rehling
eabf72e60e BUG 2362: clone_men hitpoint calculation was wrong. 2017-09-01 22:04:36 +02:00
Enno Rehling
a8bfa5e095 try fixing familars without a mage. 2017-08-31 21:19:25 +02:00
Enno Rehling
1ac64650b0 BUG 2360: upper limits for trees. 
https://bugs.eressea.de/view.php?id=2360
 2017-08-27 20:10:27 +02:00
Enno Rehling
f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +02:00
Enno Rehling
4bb6d503ea upgrade version number, ready for 3.14 development 2017-08-24 17:00:36 +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
7985ebe511 replace ct_find calls with constants. 
reorder a lot of includes.
 2017-08-21 20:18:19 +02:00
Enno Rehling
c99e92db20 kill curse cache logic, it was a bad idea. 
ct_find is almost never what we want to do.
 2017-08-21 19:43:35 +02:00
Enno Rehling
134ff982ba BUG 2358: Schiffbeschleunigung dauert laenger als eine Woche. 2017-08-20 19:07:52 +02:00
Enno Rehling
219a3159e8 sort the at_keys array, binary search. 2017-08-20 12:58:05 +02:00
Enno Rehling
aac2b0a60f Merge branch 'master' 2017-08-18 21:11:18 +02:00
Enno Rehling
89d50e9b72 fix compile, wrong data version. 2017-08-18 21:05:26 +02:00
Enno Rehling
e2578966e5 fix bad data caused by bug 2356 2017-08-18 21:02:23 +02:00
Enno Rehling
54b5b09e15 Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
	src/modules/autoseed.c
 2017-08-18 20:31:14 +02:00
Enno Rehling
d13cd0d0df Merge pull request #721 from ennorehling/master 
BUG 2357: new players must be able to recruit
 2017-08-18 20:26:23 +02:00
Enno Rehling
aa61860996 BUG 2357: make sure starting regions have enough recruits 2017-08-18 20:20:12 +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
293cb78de8 BUG 2356: add a failing test. 2017-08-18 19:36:17 +02:00
Enno Rehling
40581e9a04 Merge remote-tracking branch 'upstream/develop' into develop 2017-08-06 21:05:54 +02:00
Enno Rehling
faf0f48a70 BUG 2354: fix email validation. 
https://bugs.eressea.de/view.php?id=2354
 2017-08-06 21:03:51 +02:00
Enno Rehling
78f8ec0173 Added a test for the set_email function. 
I'm hoping to trigger bug 2354 in a unit test.
 2017-08-06 19:02:57 +02:00
Enno Rehling
4291c4de3d BUG 2353: Segen der Erde produziert zu viel Silber 
https://bugs.eressea.de/view.php?id=2353
In E3 gibt es legazy-attribute mit falschem Effekt, ignorieren.
 2017-08-06 18:52:59 +02:00
Steffen Mecke
160ef71d40 refactor for STUDYDAYS 2017-08-01 22:09:57 +02:00
Steffen Mecke
1edfb7ae8e use STUDYDAYS consequently 2017-08-01 22:09:57 +02:00
Steffen Mecke
4fe72b5d28 BUG 2350: read studyspeed correctly and fix orcs 2017-08-01 22:09:57 +02:00
Enno Rehling
4675cf1d05 allow config to override first unit equipment 2017-07-30 14:05:33 +02:00
Enno Rehling
3c2754071d this test fails when btype->maxsize isn't used as a limit for building. 2017-07-17 14:01:08 +02:00
Enno Rehling
0bf003cdc4 add a test for btype.maxsize 2017-07-17 13:37:40 +02:00
Enno Rehling
b79db40f41 retrofit a test for buildingcapacity. 2017-07-17 12:39:41 +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
6d1f4f06de BUG 2256: kill the FFL_NEWID flag 2017-07-09 15:37:42 +02:00
Enno Rehling
beecc0e323 BUG 2343: fix clone_men (hitpoints), add test. 2017-06-25 14:07:50 +02:00
Enno Rehling
2dab88b118 cmistake no return value, no mistakes 2017-06-25 08:21:14 +02:00
Enno Rehling
1273abb967 Getrennte Befehle fuer PFLANZE und ZUECHTE 2017-06-24 13:36:18 +02:00
Enno Rehling
3ceeb54006 Merge branch 'master' into develop 2017-06-18 22:05:20 +02:00
Enno Rehling
75ae22e5b6 BUG 2340: endloser Sturmelementar 
CURSE_NOAGE is a weird thing.
 2017-06-18 21:48:47 +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
3ec1476da2 improve the mailcmd test 2017-06-11 17:13:31 +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
3e0bc4f26d cannot assert that free_unit has no faction (complicated reasons) 2017-06-04 14:35:15 +02:00
Enno Rehling
728f7ed389 Revert "fix some failing tests." 
This reverts commit 8c11cb676f.
 2017-06-04 14:33:13 +02:00
Enno Rehling
8c11cb676f fix some failing tests. 2017-06-04 14:18:28 +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
1687e31d5f starting a new release 2017-05-28 12:51:41 +02:00
Enno Rehling
3306488641 Merge pull request #695 from ennorehling/feature/refactor-rcspell 
refactor observers, lighthouses
 2017-05-28 12:50:05 +02:00
Enno Rehling
383866c44b Merge pull request #694 from ennorehling/feature/2326-undeadhero 
BUG 2326: counting undead heroes in battle summary
 2017-05-28 12:49:46 +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
94a4e52ac8 Merge branch 'develop' into feature/refactor-rcspell 2017-05-22 21:36:02 +02:00
Enno Rehling
a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling
abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling
58d9aa58a0 BUG 2326: Untote Helden fehlen in der Kampfübersicht 
https://bugs.eressea.de/view.php?id=2326
 2017-05-21 11:14:16 +02:00
Enno Rehling
1bc23beccc remove btypr->name funcptr and btype->attribs. 
why weren't these already gone?
 2017-05-12 22:12:22 +02:00
Enno Rehling
11d9afc62e BUG 2322: Test and bugfix for castle names. 2017-05-12 22:05:14 +02:00
Enno Rehling
c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00
Enno Rehling
6b7dcadf84 refactor resource callbacks into callbacks module 2017-05-09 08:18:20 +02:00
Enno Rehling
d9fca4dcb3 refactor stray fptr variable into callbacks module. 2017-05-08 22:44:18 +02:00
Enno Rehling
18defdd5a2 remove last pieces of calendar.xml 2017-05-08 06:57:03 +02:00
Enno Rehling
8765204e00 add unit tests for calendar parsing. 2017-05-07 18:10:18 +02:00
Enno Rehling
7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling
bf935f5bb7 gamedate: no negative turns allowed. 
feed the beast assert.
 2017-05-07 16:12:10 +02:00
Enno Rehling
2e3f68ed87 add a config_set_int convenience function. 2017-05-07 13:26:54 +02:00
Enno Rehling
898c12e99a XML construction elements never have a building. 
required buildings are encoded by RMT_PROD_REQUIRE.
improved error messaging.
 2017-05-06 15:53:21 +02:00
Enno Rehling
b74d18b8c9 bt_register is non-standard API, hide it. 
factor out st_register for readability.
 2017-05-06 15:39:09 +02:00
Enno Rehling
3eb89e93ae use a cbtrie for shiptype-lookups instead of the selist. 2017-05-06 15:33:35 +02:00
Enno Rehling
6778cbe483 assert that we do not add new ship types after the per-language lookup is initialized. 2017-05-06 15:26:45 +02:00
Enno Rehling
dd4bdca72b do not use the shiptypes list for searches, use a cbtrie. 2017-05-06 15:05:36 +02:00
Enno Rehling
cb0cd87f23 fix callbacks linkage for clang/mac 2017-05-02 15:10:43 +02:00
Enno Rehling
5d710fa79f merge spell callback changes. 2017-05-01 19:13:40 +02:00
Enno Rehling
fa7a3e246b eliminate spell->id. 
clean up some spell functions used by more than one spell.
 2017-05-01 17:04:28 +02:00
Enno Rehling
22c05963fd fix illusioncastle reporting. 2017-05-01 14:49:06 +02:00
Enno Rehling
80d696d02a remove the funcpointer from struct spell. 2017-04-30 22:15:18 +02:00
Enno Rehling
724a41ac85 refactor: pass function name to callback, calculate it in call_spell instead. 2017-04-30 21:38:44 +02:00
Enno Rehling
edd3b36a9f add a callbacks module. 
make last-chance spell function in lua for spells with none.
 2017-04-30 21:38:44 +02:00
Enno Rehling
74673f172f test for raindance/harvest spells, both games 2017-04-30 21:38:30 +02:00
Enno Rehling
11bcfc2867 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 17:26:02 +02:00
Enno Rehling
294b7bf01e route all casting through a single cast_spell function. 2017-04-30 10:00:29 +02:00
Enno Rehling
3052628251 broaden the fumbe-lookup tests a bit, make sure prefixes don't match. 2017-04-30 04:28:07 +02:00
Enno Rehling
e5f898ce87 bugfix: portals crash buildingtype(). 
only type that has no construction.
 2017-04-30 03:42:39 +02:00
Enno Rehling
e6f8c943fa refactor the special fumble functions for spells. 
removed from struct spell.
funpointers in structs are bad, mkay.
 2017-04-30 03:27:28 +02:00
Enno Rehling
7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling
3b9a6e45a1 turns out: btype->age is never used. 2017-04-29 13:53:28 +02:00
Enno Rehling
8928c9d3cf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-29 13:37:45 +02:00
Enno Rehling
3f8de76b9d fix largestbuilding, broken in prev commit. 2017-04-29 13:37:34 +02:00
Enno Rehling
dee10e8d0d remove suspicious disabled code 2017-04-28 21:58:27 +02:00
Enno Rehling
bdc7457a08 additional testing for largestbuilding and comparisons. 2017-04-28 21:30:05 +02:00
Enno Rehling
1112890293 use building_taxes everywhere. 
make it return an integer, not double.
 2017-04-28 20:10:20 +02:00
Enno Rehling
16267c447e extract taxes into separate function (WIP) 2017-04-27 19:08:10 +02:00
Enno Rehling
a313e78de5 move building names from function to construction data. 2017-04-26 21:44:24 +02:00
Enno Rehling
055fdceff9 fix gcc build 2017-04-17 20:45:01 +02:00
Enno Rehling
635ec6d6c6 Fix a crash in TARNE <race> 
this was complicated to test, and I had to rewrite how races and their names are registered by test_create_locale.
 2017-04-17 20:11:44 +02:00
Enno Rehling
51c2df62ca fixing new coverity scan defects 
167039 Dereference after null check
167038 Unchecked return value
 2017-04-16 15:52:34 +02:00
Enno Rehling
aeeb13bb53 BUG 2318: Go, Ponnuki, Go! 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:35:55 +02:00
Enno Rehling
c6a8a76e31 strip skillmod down to the essentials. 2017-04-02 20:17:39 +02:00
Enno Rehling
d7f69dfa27 enum type clarification 2017-04-02 19:21:37 +02:00
Enno Rehling
e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling
4aa26343f6 the LOMEM define has never been used, kill it. 2017-04-01 20:08:04 +02:00
Enno Rehling
0ff9f1601c de-clutter header file. 2017-04-01 11:39:50 +02:00
Enno Rehling
967e70a4e1 SMF_RIDING is unused. 2017-04-01 11:39:41 +02:00
Enno Rehling
ed99f60186 decluttering settings.h 2017-03-31 21:37:30 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
868f4e6cef also apply noerror rules to msg_feedback. 2017-03-25 11:36:29 +01:00
Enno Rehling
b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling
485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling
ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01: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
4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?) 
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
 2017-03-17 22:46:10 +01:00
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling
8d8173def3 remove the functions struct from settings (next: remove wage, too) 2017-03-13 09:30:20 +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
ba3f3a17d3 require that main.c declare any ini variables that we might expect. 2017-03-12 21:03:38 +01:00
Enno Rehling
4b88a5abc7 BUG 2301: validate [game] section in eressea.ini 
load_inifile is old stuff, should use config_get instead.
 2017-03-12 19:48:44 +01:00
Enno Rehling
7b4550b9d6 kill faction.nregions, it is calculated but never read. 2017-03-12 14:20:34 +01:00
Enno Rehling
a93dc5459b BUG 2313: spells must not be counted. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:39:25 +01:00
Enno Rehling
d8e5feac61 additional test for bug 2313. 
do not count spells toward num_unit or num_people.
 2017-03-12 13:24:32 +01:00
Enno Rehling
decc38a056 BUG 2313: proper accounting in remove_unit. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:02:55 +01:00
Enno Rehling
4c21ff5d63 BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +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
0f2744fcf3 BUG 2285: remove factions' wealthfrom statistics. 2017-03-11 18:10:23 +01:00
Enno Rehling
0bfd1feee6 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/kernel/item.c
 2017-03-11 14:49:31 +01:00
Enno Rehling
51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01:00
Enno Rehling
cdf13c9fec stop using test_create_world, use test_setup. 2017-03-11 14:22:21 +01:00
Enno Rehling
be0b54494e clean up some tests. 
the test locale gets some extra strings.
test_create_world is bad, stop using it. unfinished.
 2017-03-10 21:29:37 +01:00