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

3319 commits

Author SHA1 Message Date
Enno Rehling
9f97ee2dd7 Merge branch 'resolve-hashing' 2017-09-23 21:14:57 +02:00
Enno Rehling
95695c1b54 remove log_orders because I'm never using it and it costs time. 
reduce memory reserved for balloc.
 2017-09-23 21:12:50 +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
59169f3eb1 simplicate 2017-09-21 17:26:37 +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
5e204083b8 remove noreply email, monster report. 2017-09-18 21:43:52 +02:00
Enno Rehling
d8c063ae50 CID 172474 + 173899 Copy into fixed size buffer 2017-09-18 20:33:36 +02:00
Enno Rehling
30777e5948 CID 173898 'Constant' variable guards dead code 2017-09-18 20:27:34 +02:00
Enno Rehling
fd27534132 coverity CID 173897 Pointer to local outside scope 2017-09-18 20:23:31 +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
02ed1dfe0c fix get_spellbook with cb_find_str. 2017-09-18 19:35:37 +02:00
Enno Rehling
6d79f5fad1 Merge branch 'coverity-equipment' 2017-09-18 19:13:39 +02:00
Enno Rehling
6083ff7616 get_spellbook has a bug. new clibs version 2017-09-18 19:13:26 +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
eca1e5f973 make keys_size not return 4096 all the time. 2017-09-17 21:09:23 +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
1319f546b8 fix seaserpent tests, simplify monster tests. 2017-09-09 15:24:50 +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
e7fe3f8292 push stream compatibility calls back to cr_output_region. 2017-09-05 19:52:48 +02:00
Enno Rehling
873b1a81af testing that words do not get split, lines get split at spaces. 2017-09-04 20:08:34 +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
71ced993e2 Merge remote-tracking branch 'upstream/develop' into develop 2017-09-02 17:10:55 +02:00
Steffen Mecke
080d5e3f65 rename teaching_info.value to days 2017-09-02 15:50:03 +02:00
Steffen Mecke
b98c01a7b8 simplify academy teaching code, addressing bug 2335 2017-09-02 03:24:04 +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
8517857d55 BUG 2361: familiars cannot forget magic. 
https://bugs.eressea.de/view.php?id=2361
 2017-08-27 19:55:04 +02:00
Enno Rehling
f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +02:00
Enno Rehling
612cd1158a move chaosgate to borders.c 2017-08-25 21:07:23 +02:00
Enno Rehling
faefaf2523 deprecate unused at_cursewall. 2017-08-25 21:03:04 +02:00
Enno Rehling
6d1fe2842a leak: free special directions. 2017-08-25 08:52:15 +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
ef68b8123d smart(er) dynamic allocation of key memory. 2017-08-20 17:45:03 +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
21a43b8be9 Merge remote-tracking branch 'upstream/develop' into develop 2017-08-18 20:31:56 +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
b8e755c023 Merge pull request #720 from ennorehling/hotfix/bug-2356-curse-flags 
BUG 2356: Mauern der Ewigkeit
 2017-08-18 19:54:05 +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
293cb78de8 BUG 2356: add a failing test. 2017-08-18 19:36:17 +02:00
Enno Rehling
3ea06b23e8 Merge branch 'master' into develop 2017-08-16 21:50:40 +02:00
Enno Rehling
a8e9da1c19 do not upgrade keys for later data versions 2017-08-16 21:48:04 +02:00
Enno Rehling
6d050bb6c2 fix a_key attribute still being written. 
simplify (and slow down) key upgrades.
 2017-08-16 21:33:02 +02:00
Enno Rehling
9d8e9cc00b at_keys is overflowing, add an assert to detect it 2017-08-16 20:48:03 +02:00
Enno Rehling
62d8024c49 fix dupe detection 2017-08-09 19:42:55 +02:00
Enno Rehling
c984e876af Merge branch 'master' into develop 
Conflicts:
	src/modules/autoseed.c
 2017-08-09 19:42:24 +02:00
Enno Rehling
c4f7e36903 fix valgrind report in a test (bad rtype construction) 2017-08-09 19:39:29 +02:00
Enno Rehling
bbeac66250 fix dupe detection 2017-08-09 19:18:45 +02:00
Enno Rehling
1aa142d821 log warnings for duplicate new emails. 2017-08-09 19:04:49 +02:00
Enno Rehling
0cb085378d Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
 2017-08-07 19:01:07 +02:00
Enno Rehling
2aab736b59 try giving new factions a name 2017-08-07 18:58:39 +02:00
Enno Rehling
aae1095c00 Merge remote-tracking branch 'upstream/master' 2017-08-07 18:47:05 +02:00
Enno Rehling
c387e985b8 gmtool can clear regions 2017-08-07 18:38:10 +02:00
Enno Rehling
e59ae05729 Merge branch 'master' of github.com:eressea/server 2017-08-07 18:37:33 +02:00
Enno Rehling
59cee972e3 BUG 2355: (temporarily) disable assert 
https://bugs.eressea.de/view.php?id=2355
 2017-08-06 21:27:20 +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
9110d01229 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-08-06 18:55:19 +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
f0c17b01af fixed demon_skillchange and produceexp 
learn_skill's argument is the number of person days, not the number of unit days as assumed!
 2017-08-04 15:23:05 +02:00
Steffen Mecke
80bfb5dbc6 rename teacher variable 2017-08-01 22:09:57 +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
847e6f3e43 limit island size from configuration, deal with existing units. 2017-07-27 16:36:45 +02:00
Enno Rehling
822292c99a do not seed factions when creating islands with 'B'. 2017-07-27 16:16:54 +02:00
Enno Rehling
475c9f8cd8 seed a single faction from newplayers file. 2017-07-23 15:18:16 +02:00
Enno Rehling
3151fe9f9b ignore comments in newfactions 2017-07-23 09:27:28 +02:00
Enno Rehling
a5d350fe3a seed a single faction from newplayers file. 2017-07-23 09:15:23 +02:00
Enno Rehling
aa2c13cffa gcc ist pingelig 2017-07-17 17:22:01 +02:00
Enno Rehling
233ea9dce4 BUG 2337: lighthouse capacity is # of units, not people. 2017-07-17 17:08:27 +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
de1e0ae916 fix indentation 2017-07-09 10:43:53 +02:00
Enno Rehling
6fa471bb97 merge conflicts from the 13.2.3 release 2017-07-09 10:42:10 +02:00
Enno Rehling
7790ebd671 Valenar crash: bad report interval when a faction has no units. 2017-06-26 20:39:05 +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
0593378df0 Merge branch 'master' into develop 2017-06-24 22:10:05 +02:00
Enno Rehling
1e78414562 BUG 2344: GIB KOMMANDO und ! Präfix 2017-06-24 22:02:07 +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
2c9c4c23f0 convert warning to debug output 2017-06-11 14:47:33 +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
9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
Enno Rehling
153039fdef fix gcc compilation, unused variable 2017-05-24 08:58: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
86974df332 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 22:08:22 +02:00
Enno Rehling
611d69908f remove unnecessary code. 2017-05-22 22:08:18 +02:00
Enno Rehling
95a9bb4ab9 register missing attribute. 2017-05-22 21:53:10 +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
1bb022ef58 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 21:16:34 +02:00
Enno Rehling
51f8f87072 eliminate the O(n) lighthouse/inside complexity from prepare_report 2017-05-22 21:15:42 +02:00
Enno Rehling
17ed46e6a8 fix test 2017-05-22 19:50:18 +02:00
Enno Rehling
0755830754 fix compilation, test still fails 2017-05-21 23:47:54 +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
37aded9b1d remove unused function 2017-05-21 16:12:13 +02:00
Enno Rehling
bc0726da18 remove duplicate test 2017-05-21 14:52:46 +02:00
Enno Rehling
c8e777c6d4 Merge branch 'bug2211_addendum' of https://github.com/stm2/server into stm2-bug2211_addendum 2017-05-21 14:51:13 +02:00
Enno Rehling
efb0501b20 additional testing 2017-05-21 13:10:53 +02:00
Enno Rehling
7b0ec466fa only enable certain pragmas for MSVC 2015 and later 2017-05-21 13:09:54 +02:00
Enno Rehling
88626fb163 optimization: select_fighters. 
use select_fighters with callback to reduce the number of selected units for (most) combat spells.
 2017-05-21 12:26:04 +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
53dc475d9d remove unused callback functions. 2017-05-08 22:41:00 +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
ad465f1028 Ponnuki should not be aggressive. 2017-05-07 17:29:55 +02:00
Enno Rehling
bf935f5bb7 gamedate: no negative turns allowed. 
feed the beast assert.
 2017-05-07 16:12:10 +02:00
Enno Rehling
29061fa4ba fleshing out the calendar tests 2017-05-07 15:50:19 +02:00
Enno Rehling
fa7e21b783 very simple calendar test. 2017-05-07 13:40:43 +02:00
Enno Rehling
3e1462a192 add empty calendar unit test. 2017-05-07 13:35:59 +02:00
Enno Rehling
2e3f68ed87 add a config_set_int convenience function. 2017-05-07 13:26:54 +02:00
Enno Rehling
9d5369ff1e coverity: unintended integer division 2017-05-06 16:48:32 +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
db07cbed6b use correct type for PI (double). 
promote defines to platform-header.
 2017-05-06 09:44:06 +02:00
Enno Rehling
7ad5c4b3f2 define PI, because M_PI is not to be depended on 2017-05-04 08:22:20 +02:00
Enno Rehling
692c9a1dac M_PI is not defined in standard C, needs __USE_BSD 2017-05-04 08:14:19 +02:00
Enno Rehling
138035dfda Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-04 06:51:28 +02:00
Enno Rehling
ccf90413e6 start cleaning up random bindings 2017-05-04 06:44:33 +02:00
Enno Rehling
26795ae717 guassian distribution has no endless loops. 2017-05-03 21:02:30 +02:00
Enno Rehling
cb0cd87f23 fix callbacks linkage for clang/mac 2017-05-02 15:10:43 +02:00
Enno Rehling
5778bc2c93 no more than 4 critical hits 2017-05-02 09:59:04 +02:00
Enno Rehling
83d40962d2 disable randomness that causes some tests to become intermittent. 
fix normalvariante and chance so they work better with constant
rng always returning zero
 2017-05-02 08:45:18 +02:00
Enno Rehling
5d710fa79f merge spell callback changes. 2017-05-01 19:13:40 +02:00
Enno Rehling
8e9866f0ce additional tests for spells. 
also some support functionality for lua tests.
 2017-05-01 19:09:00 +02:00
Enno Rehling
03cd63a05a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-05-01 17:04:37 +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
7b9305f005 missing include 2017-05-01 15:25:46 +02:00
Enno Rehling
3b11067825 add a test for illusion buildings. 2017-05-01 15:07:54 +02:00
Enno Rehling
22c05963fd fix illusioncastle reporting. 2017-05-01 14:49:06 +02:00
Enno Rehling
79de2ba2ed compatibility code for old data that contains a caldera. 2017-05-01 14:24:05 +02:00
Enno Rehling
c281a1e5c9 compatibility code for old data that contains a caldera. 2017-05-01 13:26:17 +02:00
Enno Rehling
773e8c79d0 some code normalization. 2017-04-30 22:49:26 +02:00
Enno Rehling
51a991413f use at_deprecate, as is intended. 2017-04-30 22:46:35 +02:00
Enno Rehling
80d696d02a remove the funcpointer from struct spell. 2017-04-30 22:15:18 +02:00
Enno Rehling
976b23be72 refactor E3 to use the same raindance/harvest spells as E2. 
only indirect effects are different.
 2017-04-30 21:39:08 +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
bd9968c266 set the callback, remove lua_callspell from XML. 
WIP: some spells cannot find their lua callback.
 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
1885831204 remove handle_events for unused events. 2017-04-30 03:48:50 +02:00
Enno Rehling
80e6ed0863 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 03:42:50 +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
6f4a8b5df1 header cleanup 2017-04-29 21:50:17 +02:00
Enno Rehling
931e705b05 delete unused functions 2017-04-29 20:37:02 +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
091a8de6b6 Merge branch 'master' into develop 
Conflicts:
	src/kernel/race.c
	src/spy.c
 2017-04-22 18:38:34 +02:00
Enno Rehling
e530543022 demon stealth: cloak as other race. 
added a Lua test.
get_race oob fix (potential crash).
 2017-04-22 18:33:47 +02:00
Enno Rehling
055fdceff9 fix gcc build 2017-04-17 20:45:01 +02:00
Enno Rehling
9fcab4ccb8 do not hard-code list of allowed races for demons. 2017-04-17 20:18:37 +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
b06e93db7a BUG 2317: wyrms in E2 didn't move 2017-04-17 16:50:15 +02:00
Enno Rehling
153ef2056e Merge remote-tracking branch 'upstream/develop' into develop 2017-04-16 16:04:01 +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
742fa423b3 do not log an ERROR when a familiar as no equipment 2017-04-16 12:36:59 +02:00
Enno Rehling
0b226ba75e fix farsi names containing nzwj symbol. 2017-04-10 17:32:32 +02:00
Enno Rehling
aebc7d4cac BUG 2138: Ponnuki is dead, long live Ponnuki 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:40:42 +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
7dd79a1e79 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-02 19:21:44 +02:00
Enno Rehling
d7f69dfa27 enum type clarification 2017-04-02 19:21:37 +02:00
Enno Rehling
50eb35edf6 unused variable 2017-04-02 15:50:29 +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