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

3168 commits

Author SHA1 Message Date
Enno Rehling
158e0646e1 implement fractions 2017-02-24 15:48:49 +01:00
Enno Rehling
25d3aacffa remove artrewards, they predate my backups 2017-02-24 14:38:08 +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
f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling
9cbd5b88e6 rm_tree is not actually a thing 2017-02-23 08:07:47 +01:00
Enno Rehling
be42137833 fix rmt_find for trees 2017-02-23 08:02:24 +01:00
Enno Rehling
f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling
1498f2e1d7 refactor rawmaterial_type. 
still have to decide if we need it at all.
 2017-02-22 21:10:22 +01:00
Enno Rehling
ce2ea95880 begin refactoring limited resources. 2017-02-22 20:28:34 +01:00
Enno Rehling
67831ad708 we like test_setup. 2017-02-22 20:16:51 +01:00
Enno Rehling
82e4d75429 unused function 2017-02-22 19:43:17 +01:00
Enno Rehling
807fe607e7 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-22 19:38:56 +01:00
Enno Rehling
3274065004 reduce complexity of building_protection. 2017-02-22 19:38:46 +01:00
Enno Rehling
deb39f6b8f test building_effsize does what it does 2017-02-22 14:27:13 +01:00
Enno Rehling
bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling
a1dc3dc8e4 remove race.age from XML data (set in rc_create) 2017-02-20 21:19:58 +01:00
Enno Rehling
44f6336e1f do not register unused functions. 2017-02-20 21:04:50 +01:00
Enno Rehling
4bd295e3b2 remove the nearly unused illusion race 2017-02-20 20:42:31 +01:00
Enno Rehling
5ba3d76efb remove race.init_familiar funpointer 2017-02-20 09:32:03 +01:00
Enno Rehling
04154628e6 remove funpointer for spoils 2017-02-20 09:18:04 +01:00
Enno Rehling
59f87edbb1 remove unused race.move_allowed method 2017-02-20 09:00:48 +01:00
Enno Rehling
ba1fdcce59 remove race.describe funpointer 2017-02-20 07:47:36 +01:00
Enno Rehling
27f9490ec1 Merge pull request #661 from ennorehling/develop 
pedantic gcc compilation
 2017-02-18 22:07:12 +01:00
Enno Rehling
b8302b1f15 Merge branch 'develop' of github.com:eressea/server into develop 2017-02-18 22:03:34 +01:00
Enno Rehling
b744b6d601 Merge branch 'master' into develop 2017-02-18 22:02:58 +01:00
Enno Rehling
5796f60f16 spells will always resist magic 2017-02-18 22:00:48 +01:00
Enno Rehling
9e14bf5cf9 clang complains about -ansi? 2017-02-18 21:26:38 +01:00
Enno Rehling
12b1dcaa38 remove platform-cruft 2017-02-18 21:23:24 +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
5b52451d9d remove unused ai.aggression atribute 2017-02-18 19:21:54 +01:00
Enno Rehling
a553b2258a remove code for shadowcall, too 2017-02-18 18:25:58 +01:00
Enno Rehling
daa7554361 remove race.precombatspell 2017-02-18 18:14:18 +01:00
Enno Rehling
a754975ef9 fix loading data where embassy uses floats. 2017-02-18 17:52:25 +01:00
Enno Rehling
9682d6b48c implement quick-and-dirty gcd 2017-02-18 15:45:57 +01:00
Enno Rehling
aee68fbd0f github issue #658 
MACHE 1 EISEN use 1 iron even with savings.
 2017-02-18 11:19:42 +01:00
Enno Rehling
0a3e3de5a3 refactor fractions a little bit. 2017-02-17 22:01:51 +01:00
Enno Rehling
2328975dc2 do not use floats for material-save. 
abusing variants for storing short fractions.
remove unused RMF_SAVERESOURCE.
 2017-02-17 21:45:10 +01:00
Enno Rehling
a624915a06 error message if building is required. 
was broken in recent commit.
also fix reference counts.
 2017-02-16 20:26:34 +01:00
Enno Rehling
a5dfe12d48 initialize variable 2017-02-16 19:38:09 +01:00
Enno Rehling
20ff8981df trying to extract allocation modifiers into a separate function 2017-02-16 10:19:59 +01:00
Enno Rehling
50083fc668 BUG 2279: too many resources used. 
diddling the resource-save formula until test passes.
 2017-02-15 21:16:54 +01:00
Enno Rehling
5902a6922f BUG 2279: add a failing unit test. 2017-02-15 20:50:45 +01:00
Enno Rehling
5680057e7f adding simple test for MAKE <ITEM> 2017-02-15 17:09:23 +01:00
Enno Rehling
7947101899 factor out some function to make future debugging easier. 2017-02-14 21:01:22 +01:00
Enno Rehling
4ce415be50 BUG 2281: fix maxsize of guard towers. 2017-02-14 20:51:03 +01:00
Enno Rehling
08e14f3095 coverity warnings 2017-02-14 16:23:40 +01:00
Enno Rehling
aa230cc191 fix coverity warnings 2017-02-14 12:15:36 +01:00
Enno Rehling
3ea12be564 BENUTZE Muschel repariert. 
at_keys hat jetzt auch zu jedem key ein value, und Funktionen zum Update altee Daten.
 2017-02-13 18:48:38 +01:00
Enno Rehling
e9ca536e8e Merge branch 'master' into develop 2017-02-12 20:08:29 +01:00
Enno Rehling
f132dfe4d4 bug 2282: Datenfile 2012 kaputt. 
make the reader for at_keys accept that sometimes, there are 0 keys.
 2017-02-12 19:57:02 +01:00
Enno Rehling
182fc3fa3c remove test for bug 2253 2017-02-12 19:32:27 +01:00
Enno Rehling
4828045fd7 there is no NEWATSROI, remove dead code 2017-02-12 18:52:41 +01:00
Enno Rehling
b05c2564e5 make att_modification not crash when a good/bad dream curse has no magician. 2017-02-12 13:22:44 +01:00
Enno Rehling
75514014bc no need to create locale here 2017-02-12 06:20:37 +01:00
Enno Rehling
ac8250ecd8 remove global read_orders binding 2017-02-12 06:14:29 +01:00
Enno Rehling
6893248473 jsonconf should not need to create locales 2017-02-12 06:06:33 +01:00
Enno Rehling
17ff2ead41 make_locales from config_get 2017-02-12 05:52:46 +01:00
Enno Rehling
e5c95f1501 avoid division by zero when no calendar is configured 2017-02-12 05:09:23 +01:00
Enno Rehling
422af9dd4d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-11 22:29:02 +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
40de740a0a remove dict from ships and buildings, too 2017-02-11 22:24:36 +01:00
Enno Rehling
10e78b1455 remove code for dict and lua .objects properties. 
rewrite muschelplateau code to use keys.
 2017-02-11 22:15:21 +01:00
Enno Rehling
853f63b501 delete unitmessage trigger, it is unused 2017-02-11 20:27:13 +01:00
Enno Rehling
2ee0e599b1 initialize game after loading config 2017-02-11 17:38:39 +01:00
Enno Rehling
b504899b07 fix locale initialization 2017-02-09 23:28:50 +01:00
Enno Rehling
f48dd41538 fix a segfault in free_Races 2017-02-07 21:37:38 +01:00
Enno Rehling
60497da87b print error message when missing parameter translation. 2017-02-07 20:52:31 +01:00
Enno Rehling
9c6a72f55e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-07 18:23:12 +01:00
Enno Rehling
8ffa091936 do not abort xml parsing when there is no calendar 2017-02-06 20:34:11 +01:00
Enno Rehling
d851554ebe MSVC doesn't like to do integer->char conversions. 2017-02-06 18:16:34 +01:00
Enno Rehling
baf3275eba valgrind: always terminate options 2017-02-06 11:52:07 +01:00
Enno Rehling
2267373b2e gcc warning 2017-02-06 10:44:11 +01:00
Enno Rehling
28c951bdfd eliminate race.parameters. 
move all special properties to race.options
 2017-02-06 09:46:36 +01:00
Enno Rehling
998dcffab2 introduce an rcoption struct. 
used for pretty rare options that have no property in the race struct.
 2017-02-06 09:03:08 +01:00
Enno Rehling
492aba543b delete at_scare 
delete dead code (race.attribs has no at_skillmod)
delete race.attribs
 2017-02-05 19:30:09 +01:00
Enno Rehling
67414f29eb wrap ai.scare and at_scare in rc_set_param 2017-02-05 19:26:07 +01:00
Enno Rehling
f2ed2c892a bugfix: Drachen "scare" attribut 
muss mit MOD, nicht AND angewendet werden. rng_int() & 400 ist eine bekloppte Rechnung.
 2017-02-05 18:42:06 +01:00
Enno Rehling
bd836b76e1 channel XML race.parameters through a single, tested, function 2017-02-05 16:55:51 +01:00
Enno Rehling
0b3d15f4b3 eliminate unused other_cost parameter. 
cost of other races is defined by their recruitcost.
 2017-02-04 23:46:26 +01:00
Enno Rehling
bdb50eab75 make migrants.formula a flag. 
lookup in race.parameters was slow.
there is only one formula, anyhow.
 2017-02-04 23:44:25 +01:00
Enno Rehling
3b3e39a319 optimization: elf-special "regen.forest" is now a config. 
this is an E3 feature
eliminates rc.parameters for elves
allows use of a local cached static
 2017-02-04 23:21:36 +01:00
Enno Rehling
2ecbf89f1a clean up and test various race.parameters 2017-02-04 23:16:16 +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
644a6019a6 do not call isdigit with a negative value. 
http://bugs.eressea.de/view.php?id=1987#c6941
 2017-02-03 21:19:39 +01:00
Enno Rehling
bb37e423e1 use UFL_FOLLOWED for optimization. 2017-02-03 20:35:15 +01:00
Enno Rehling
70b12ae6ca refactor handling of race.param in XML 2017-02-03 20:16:44 +01:00
Enno Rehling
250227cad2 store maxaura as an integer, not a float. 2017-02-03 20:06:01 +01:00
Enno Rehling
e51742da90 use rc_maxaura wrapper everywhere. 2017-02-03 19:50:48 +01:00
Enno Rehling
f22cc3b419 add a test for max_spellpoints 2017-02-03 19:47:30 +01:00
Enno Rehling
1c347ca5ba race.healing is now an int percentage, not a float multiplier 2017-02-03 18:18:55 +01:00
Enno Rehling
fd9583df3d fix healing for elves in a forest. 
rename _magres back to magres.
rc->parameters is not linked to config_changed invalidation.
add tests.
 2017-02-03 17:43:40 +01:00
Enno Rehling
7750297dc2 express race.magres as percentage, not probability (double->int) 2017-02-03 10:57:32 +01:00
Enno Rehling
7009f26ee5 code duplication, lazy_spell was almost the same as spellref. 2017-02-02 20:18:20 +01:00
Enno Rehling
456d1bd196 spellbooks should not use spellref, it's unnecessary. 2017-02-02 20:08:04 +01:00
Enno Rehling
7e69149c40 WIP: spellref everywhere 2017-02-02 16:52:32 +01:00
Enno Rehling
abed38db0c uninitialized variable. 2017-02-02 10:19:39 +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
534e5874e9 Merge branch 'gmtool' into develop 
Conflicts:
	src/util/unicode.test.c
 2017-01-31 22:19:00 +01:00
Enno Rehling
2b3617a998 build versioning for pre-release builds 2017-01-30 10:35:59 +01:00
Enno Rehling
3d8d091207 new build scripts, new versioning system 2017-01-30 10:26:08 +01:00
Enno Rehling
7cf07e359b Merge remote-tracking branch 'eressea/develop' into develop 2017-01-29 14:20:10 +01:00
Enno Rehling
93be6eb642 Merge branch 'master' into develop 2017-01-29 13:33:30 +01:00
Enno Rehling
6eded43ce9 Merge branch 'master' into hotfix/3_10_5 2017-01-29 13:03:27 +01:00
Enno Rehling
bf22cbc2ef increase MAXTEACHERS again (permament fix in 3.11) 2017-01-29 11:30:22 +01:00
Enno Rehling
36d884143e Bug 2278: Neue Magier können nicht gelehrt werden. 
http://bugs.eressea.de/view.php?id=2278
 2017-01-29 11:06:08 +01:00
Enno Rehling
2016a9ef20 unused function 2017-01-28 20:07:31 +01:00
Enno Rehling
11c0330de1 make race::attack use spellref, too. 2017-01-28 19:52:28 +01:00
Enno Rehling
6d15767a18 create a spellref structure. 
use this when referring to spells that may not (yet) exist.
use it for race::precombatspell (rare use case).
 2017-01-28 19:42:20 +01:00
Enno Rehling
146cb9b00d fix merge conflict 2017-01-26 19:19:40 +01:00
Enno Rehling
e47957ae8e Merge branch 'develop' into clibs 2017-01-26 19:06:14 +01:00
Enno Rehling
23b211d9e4 fix study.c teacher messaging 2017-01-26 18:58:29 +01:00
Enno Rehling
57f6c56e89 remove quicklist shim, use selist everywhere 2017-01-26 18:07:34 +01:00
Enno Rehling
21514f3bfe BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
2a1ead6506 BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
044953e4ab add a function to compare size of occupied castles 2017-01-26 18:06:49 +01:00
Enno Rehling
c0692986b2 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-26 18:06:48 +01:00
Enno Rehling
d8770932f0 fix issue #477 (intermittent volcano) 2017-01-26 18:06:48 +01:00
Enno Rehling
a79e5ef2a5 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-26 18:06:48 +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
21b617c973 fix game_name, remove it from rules 2017-01-26 18:06:48 +01:00
Enno Rehling
ee88c13732 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-26 18:06:48 +01:00
Enno Rehling
98be6bb8ae eliminate duplicate password message 2017-01-26 18:06:48 +01:00
Enno Rehling
76af048fed clean the quipment interface for lua a little bit. 2017-01-26 18:06:48 +01:00
Enno Rehling
64e45248dc rename create_equipment function 2017-01-26 18:06:48 +01:00
Enno Rehling
e7a41a2017 missing includE 2017-01-26 18:06:48 +01:00
Enno Rehling
f4e25fe20e try loading config.lua and custom.lua files, if they exist. 2017-01-26 18:06:48 +01:00
Enno Rehling
f86d86d4c6 Revert "remove sqlite3 code and dependency" 
This reverts commit 7b55a57610.
 2017-01-26 18:06:48 +01:00
Enno Rehling
59916d1d5c remove sqlite3 code and dependency 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
48ae12b629 emit a password message for newbie factions 2017-01-26 18:06:16 +01:00
Enno Rehling
d3d72d17e8 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-26 18:06:15 +01:00
Enno Rehling
847cfb5425 game.start in eressea.ini overrides calendar 2017-01-26 18:06:15 +01:00
Enno Rehling
0496c66028 use FACTION in text template, not ERESSEA 2017-01-26 18:06:15 +01:00
Enno Rehling
39375e8d4a use the email address from eressea.ini in CR mailto 2017-01-26 18:06:15 +01:00
Enno Rehling
4836e9530c config.json settings shall not override eressea.ini 2017-01-26 18:06:15 +01:00
Enno Rehling
82193864c5 fix valgrind error. 
I did not understand what keys look like, then effed up when fixing that.
 2017-01-26 18:06:15 +01:00
Enno Rehling
dbc6a17e66 fix gcc build, introduce a hard limit on ini section size 2017-01-26 18:06:15 +01:00
Enno Rehling
c6584d83d2 issue #629: fix eressea.ini config 
fixed reading of ini data into config (keys have a . here, not a :).
added a test.
removed obsolete global.inifile variable.
 2017-01-26 18:06:15 +01:00
Enno Rehling
e511bf76b5 read game configuration data from .ini file 2017-01-26 18:05:26 +01:00
Enno Rehling
b51349df6b change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-26 18:05:26 +01:00
Enno Rehling
6d5749308d rename [eressea] section to [game] 2017-01-26 18:05:26 +01:00
Enno Rehling
437d959d97 do not set -Werror twice 2017-01-26 18:05:26 +01:00
Enno Rehling
1921fa4ec1 issue #478: re-enable -Werror 2017-01-26 18:05:26 +01:00
Enno Rehling
94737375f5 issue #621: delete battledebug code 2017-01-26 18:05:26 +01:00
Enno Rehling
d1b5daf833 compiles with gcc on rpi 2017-01-26 18:05:26 +01:00
Enno Rehling
7b25ed282d more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
Enno Rehling
774fa12a5a continued work for MSVC compilation 2017-01-26 18:05:25 +01:00
Enno Rehling
5ddd511aa8 continue fixing compilation (gcc/clang) 2017-01-26 18:03:48 +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
ae3bfc952b create_order takes variable arguments! 
more snprintf removal.
 2017-01-26 17:57:22 +01:00
Enno Rehling
03def6ae5e replace snprintf and the like. 
you cannot trust _snprintf in MSVC (no zero-termination).
 2017-01-26 17:57:21 +01:00
Enno Rehling
fd759e7ff6 remove old & unused fix_famililar repair code. 2017-01-26 17:57:21 +01:00
Enno Rehling
9351a1960e gcc warning eliminated 2017-01-26 17:57:21 +01:00
Enno Rehling
2422e63af2 never use strncpy, anywhere. 2017-01-26 17:57:21 +01:00
Enno Rehling
d71d5e413a eliminate unnecessary strncpy use. 2017-01-26 17:57:21 +01:00
Enno Rehling
47c8b20f68 add a happy test for mt_new. 
refactor to not use strncpy.
 2017-01-26 17:57:21 +01:00
Enno Rehling
b8bccd7238 monster name pluralization changes with u->number. 2017-01-26 17:57:21 +01:00
Enno Rehling
e49d350348 test that monsters with "namegeneric" hook get a NULL name (WIP) 2017-01-26 17:57:21 +01:00
Enno Rehling
51bebfdb6b fix undead name generation. 2017-01-26 17:57:21 +01:00
Enno Rehling
0c865dca57 failing test for name_unit. 2017-01-26 17:57:21 +01:00
Enno Rehling
8c045d7a78 fix flt/int compilation bug. 2017-01-26 17:57:21 +01:00
Enno Rehling
f297d89958 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2017-01-26 17:57:21 +01:00
Enno Rehling
129f6fb68a fix bug 2266 2017-01-26 17:57:21 +01:00
Enno Rehling
13128be0aa add a failing test for bug 2266 2017-01-26 17:57:21 +01:00
Enno Rehling
5cb67e1da0 start writing a test (WIP). 2017-01-26 17:57:21 +01:00
Enno Rehling
70dfe20e62 small edit (int->bool) 2017-01-26 17:57:21 +01:00
Enno Rehling
61f3585ad7 unlimited teachers. 
quicklist replaces fixed array.
 2017-01-26 17:57:21 +01:00
Enno Rehling
d42f1767ff add a test for teach-messages. 
vheck that they are generated for students and teachers.
 2017-01-26 17:57:21 +01:00
Enno Rehling
a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling
2ace44d385 fix duplicate cutest library conflict and crash 2017-01-26 16:05:44 +01:00
Enno Rehling
c72b050a42 WIP: quicklist->selist shim can compile and link, but tests crash 2017-01-26 10:53:52 +01:00
Enno Rehling
1382583109 fix compilation (but not linking). 2017-01-26 10:15:26 +01:00
Enno Rehling
d9213c8f25 WIP: still converting to clibs/selist 2017-01-26 10:12:12 +01:00
Enno Rehling
955997d58c WIP: use latest clibs with selist. 
adding a transitional quicklist.c module to reduce work.
 2017-01-26 06:00:08 +01:00
Enno Rehling
30fc6f3e91 BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 21:03:08 +01:00
Enno Rehling
77cbd04cfa BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 20:57:54 +01:00
Enno Rehling
b170a30faa add a function to compare size of occupied castles 2017-01-25 18:17:19 +01:00
Enno Rehling
99274e3ab1 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-23 21:35:01 +01:00
Enno Rehling
6d9d920f81 fix issue #477 (intermittent volcano) 2017-01-23 11:45:05 +01:00
Enno Rehling
646e6f7197 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-23 11:21:48 +01:00
Enno Rehling
e19f0ad381 issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-23 10:47:49 +01:00
Enno Rehling
23d1355fa1 FACTION and PARTEI should both start orders. 2017-01-23 09:22:29 +01:00
Enno Rehling
30665f874a fix game_name, remove it from rules 2017-01-22 20:32:54 +01:00
Enno Rehling
9ccaab6516 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-22 20:19:32 +01:00
Enno Rehling
f09259f2b3 eliminate duplicate password message 2017-01-22 18:51:20 +01:00
Enno Rehling
4cbeb03590 clean the quipment interface for lua a little bit. 2017-01-22 18:35:54 +01:00
Enno Rehling
0270b3fb8a rename create_equipment function 2017-01-22 18:28:04 +01:00
Enno Rehling
09d4316568 missing includE 2017-01-22 18:03:46 +01:00
Enno Rehling
9e9cd6ae79 try loading config.lua and custom.lua files, if they exist. 2017-01-22 18:01:09 +01:00
Enno Rehling
baa210d1a9 Revert "remove sqlite3 code and dependency" 
This reverts commit 7b55a57610.
 2017-01-22 12:57:25 +01:00
Enno Rehling
7b55a57610 remove sqlite3 code and dependency 2017-01-22 12:51:32 +01:00
Enno Rehling
2c6ae9baef remove ERESSEA keyword from "bad password" message. 2017-01-22 12:43:48 +01:00
Enno Rehling
1c7f3fab44 emit a password message for newbie factions 2017-01-22 12:38:41 +01:00
Enno Rehling
d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling
cacb450567 game.start in eressea.ini overrides calendar 2017-01-22 05:18:32 +01:00
Enno Rehling
1a20d6e5c6 use FACTION in text template, not ERESSEA 2017-01-22 04:55:19 +01:00
Enno Rehling
446e58c383 use the email address from eressea.ini in CR mailto 2017-01-22 04:46:36 +01:00
Enno Rehling
f18f083922 config.json settings shall not override eressea.ini 2017-01-21 20:59:16 +01:00
Enno Rehling
8c4cccbc65 fix valgrind error. 
I did not understand what keys look like, then effed up when fixing that.
 2017-01-21 20:51:08 +01:00
Enno Rehling
75a97c2977 fix gcc build, introduce a hard limit on ini section size 2017-01-21 20:39:46 +01:00
Enno Rehling
ebbe4fa4ac issue #629: fix eressea.ini config 
fixed reading of ini data into config (keys have a . here, not a :).
added a test.
removed obsolete global.inifile variable.
 2017-01-21 19:53:47 +01:00
Enno Rehling
23e0943baa read game configuration data from .ini file 2017-01-21 18:54:08 +01:00
Enno Rehling
9c69963477 change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-20 22:39:38 +01:00
Enno Rehling
1b2bfc7995 rename [eressea] section to [game] 2017-01-20 19:43:53 +01:00
Enno Rehling
d73c760949 do not set -Werror twice 2017-01-11 15:09:02 +01:00
Enno Rehling
d8e6e80b03 issue #478: re-enable -Werror 2017-01-11 14:55:03 +01:00
Enno Rehling
a4d8d36aec issue #621: delete battledebug code 2017-01-11 14:53:35 +01:00
Enno Rehling
05b6c1c418 Merge branch 'develop' into c99 2017-01-11 09:30:50 +01:00
Enno Rehling
f8ff9ffda5 compiles with gcc on rpi 2017-01-10 18:40:01 +01:00
Enno Rehling
ba2f35e44f more stbool.h includes, MSVC has no unlink 2017-01-10 18:20:47 +01:00
Enno Rehling
881dd9886f Merge branch 'c99' of https://github.com/ennorehling/eressea.git 
Conflicts:
	src/platform.h
 2017-01-10 18:10:06 +01:00
Enno Rehling
b27e1a01aa continued work for MSVC compilation 2017-01-10 18:07:36 +01:00
Enno Rehling
ddd074f393 continue fixing compilation (gcc/clang) 2017-01-10 18:06:44 +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
4d2d5ccac9 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-01-07 21:20:11 +01:00
Enno Rehling
6d60b48b3f create_order takes variable arguments! 
more snprintf removal.
 2017-01-07 21:19:58 +01:00
Enno Rehling
3fb12d8f1e replace snprintf and the like. 
you cannot trust _snprintf in MSVC (no zero-termination).
 2017-01-07 21:09:39 +01:00
Enno Rehling
494643d65f remove old & unused fix_famililar repair code. 2017-01-07 20:20:13 +01:00
Enno Rehling
f5419a7f45 remove superfluous quicklist includes. 2017-01-06 22:47:50 +01:00
Enno Rehling
262580f1d5 gcc warning eliminated 2017-01-06 21:37:52 +01:00
Enno Rehling
8d02d5a5aa never use strncpy, anywhere. 2017-01-06 21:24:31 +01:00
Enno Rehling
9463642687 eliminate unnecessary strncpy use. 2017-01-06 21:21:20 +01:00
Enno Rehling
f9fbe60766 add a happy test for mt_new. 
refactor to not use strncpy.
 2017-01-06 20:54:57 +01:00
Enno Rehling
6c5213292c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-12-31 20:26:06 +01:00
Enno Rehling
6c4e458379 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-31 20:25:31 +01:00
Enno Rehling
65d10a76f0 Merge branch 'master' into develop 2016-12-31 20:22:18 +01:00
Enno Rehling
fa52e92f3e Merge pull request #618 from ennorehling/2268-name_unit 
BUG 2268: monster names
 2016-12-31 20:21:03 +01:00
Enno Rehling
5b7cdc4d48 monster name pluralization changes with u->number. 2016-12-31 20:17:02 +01:00
Enno Rehling
065439e967 test that monsters with "namegeneric" hook get a NULL name (WIP) 2016-12-31 20:12:13 +01:00
Enno Rehling
4a802be67c fix undead name generation. 2016-12-31 20:03:50 +01:00
Enno Rehling
a7f8ad052d failing test for name_unit. 2016-12-31 20:00:04 +01:00
Enno Rehling
44652bae80 fix flt/int compilation bug. 2016-12-23 23:58:24 +01:00
Enno Rehling
aa08a20724 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-12-23 18:05:55 +01:00
Enno Rehling
cc227fb707 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2016-12-23 18:05:38 +01:00
Enno Rehling
20fe039b16 use joint clibs directory instead of quicklist/critbit. 2016-12-19 21:35:02 +01:00
Enno Rehling
ceacec8115 Merge branch 'master' into develop 2016-12-16 17:31:59 +01:00
Enno Rehling
b0a56c0567 Merge pull request #616 from ennorehling/maxteachers 
BUG 2265: Eliminate MAXTEACHERS warning
 2016-12-16 17:30:14 +01:00
Enno Rehling
72ac801734 fix bug 2266 2016-12-16 17:17:04 +01:00
Enno Rehling
ddc7707cde add a failing test for bug 2266 2016-12-16 17:16:10 +01:00
Enno Rehling
95954fb386 start writing a test (WIP). 2016-12-16 07:29:43 +01:00
Enno Rehling
a72b29610c small edit (int->bool) 2016-12-11 22:40:06 +01:00
Enno Rehling
ccb1799726 unlimited teachers. 
quicklist replaces fixed array.
 2016-12-11 21:29:07 +01:00
Enno Rehling
0197fce9a1 add a test for teach-messages. 
vheck that they are generated for students and teachers.
 2016-12-11 21:21:50 +01:00
Enno Rehling
7fe6fea56d Merge branch 'master' into develop 2016-12-09 06:52:23 +01:00
Enno Rehling
01233c4f82 UTF-8 statt utf-8. 
Auf besonderen Wunsch werden einheitlich Großbuchstaben verwendet.
 2016-12-05 07:54:43 +01:00
Enno Rehling
92b885ae73 Merge branch 'master' into develop 2016-12-03 23:47:12 +01:00
Enno Rehling
afac66e213 fix bug 2261: bit manipulation error in STEALTH FACTION. 
https://bugs.eressea.de/view.php?id=2261
 2016-12-03 23:38:53 +01:00
Enno Rehling
2de3c3179a develop branch is now base for 3.11 2016-11-28 08:39:07 +01:00
Enno Rehling
6079293fea the _BSD_SOURCE macro was deprecated with glibc 2.12 2016-11-26 16:54:19 +01:00
Enno Rehling
43b8ff1ea8 fix strdup compilications when compiling with gcc and autoconf. 2016-11-26 16:21:41 +01:00
Enno Rehling
7870b63655 fix VS 2015 build 2016-11-26 07:04:18 +01:00
Enno Rehling
14b5c0f922 mac builds using gcc do not need autoconf. 
need to find a differnt way to test autoconf.
 2016-11-25 22:19:59 +01:00
Enno Rehling
2f81dc16b2 fix autoconf usage, force my OSX build to use it 2016-11-25 21:57:47 +01:00
Enno Rehling
31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling
0208304b07 use autoconf when not MSCVER or GLIBC 2016-11-25 21:12:14 +01:00
Enno Rehling
e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling
c9c4f5dd37 gcc complains about BSD_SOURCE now 2016-11-25 09:54:05 +00:00
Enno Rehling
78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling
ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling
91adf420bc strncat error V645 2016-11-23 19:18:54 +01:00
Enno Rehling
7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling
ea6cd2ca32 remove unguard trigger. 
it is unused by the code
 2016-11-23 17:55:44 +01:00
Enno Rehling
13c29c136c eliminate config.h from triggers. 
was only used once, for a single fset macro
 2016-11-23 17:52:57 +01:00
Enno Rehling
88f5bfaf47 move wages and related functionality to buildin.c 2016-11-23 17:36:39 +01:00
Enno Rehling
09f22ba0bc move findrace into race.c 2016-11-22 12:32:28 +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
a8f3cad143 remove bad umlaut encodings, make sources US-ASCII. 2016-11-20 18:09:08 +01:00
Enno Rehling
9ac74ceecc fix constant conversion error 2016-11-20 15:14:03 +01:00
Enno Rehling
ae951ee780 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-20 14:50:49 +01:00
Enno Rehling
55a0388eb2 fix truncated names that split a utf8 sequence. 2016-11-20 14:50:38 +01:00
Enno Rehling
19a0c2ddb3 quelling some static analysis complaints. 2016-11-19 20:57:10 +01:00
Enno Rehling
eabaf8bebb fix last commit. 2016-11-19 16:27:37 +01:00
Enno Rehling
531da88b2a squash some static analysis warnings. 2016-11-19 15:19:23 +01:00
Enno Rehling
14b4ae5859 set volcano acitvation chance to 0 during test. 
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
 2016-11-18 22:31:06 +01:00
Enno Rehling
ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling
7d874f1606 fix clang builds 2016-11-18 13:24:50 +01:00
Enno Rehling
8b46e1323a declare struct before use 2016-11-18 11:11:21 +01:00
Enno Rehling
a08563e846 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-17 22:10:53 +01:00
Enno Rehling
dc2452e2c1 config.h globals cleanup. 2016-11-17 22:10:41 +01:00
Enno Rehling
aef475f663 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-17 22:09:51 +01:00
Enno Rehling
cb6be542b9 remove unused variables. 2016-11-17 21:32:24 +01:00
Enno Rehling
27605f18ba more boring macros removed. 2016-11-17 21:31:11 +01:00
Enno Rehling
303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling
434cf8fce6 the unitid macro is boring. 2016-11-17 21:27:19 +01:00
Enno Rehling
bc5e744347 i2b is a bullshit macro. 2016-11-17 21:23:49 +01:00
Enno Rehling
2f305f16d9 additional testing for renumber. 2016-11-17 21:08:35 +01:00
Enno Rehling
6c9e1fb345 more config.h removal. 
freset/fset/fval must die!
 2016-11-17 17:06:31 +01:00
Enno Rehling
d1d1bee8f6 missing struct declarations in curse.h 
remove config.h from spells and curses.
 2016-11-17 11:34:35 +01:00
Enno Rehling
b24f8b2839 remove config.h from items/ 2016-11-17 11:25:02 +01:00
Enno Rehling
e3b7e19750 sometims we only include config.h for fval. 
I hate fval.
 2016-11-17 10:57:20 +01:00
Enno Rehling
d5218b99b8 do not include config.h from util (also, wasn't needed) 
also remove it from monsters.
 2016-11-17 10:55:23 +01:00
Enno Rehling
a601a675f6 reduce config.h even more. 
let's get all those global variables out of there.
 2016-11-17 10:42:20 +01:00
Enno Rehling
cbb18edb8f declutter config.h, use it sparingly. 2016-11-17 10:38:09 +01:00
Enno Rehling
f371a0c5f3 eliminate unused callback module. 
what was I thinking when I wrote this?
 2016-11-17 10:32:20 +01:00
Enno Rehling
42eff95ec2 remove unused empty files 2016-11-17 10:26:30 +01:00
Enno Rehling
3a64a2f404 stop spamming the log when using a listbox. 2016-11-16 23:09:07 +01:00
Enno Rehling
6a75b20315 remove wdwpyramid 2016-11-16 22:57:17 +01:00
Enno Rehling
a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling
413f70d1a1 move market function out of config.c 2016-11-16 22:30:59 +01:00
Enno Rehling
4a66732637 renumber tests for building, ship 2016-11-16 20:41:48 +01:00
Enno Rehling
264fc0cb6f test renumbering units and factions. 2016-11-16 20:03:34 +01:00
Enno Rehling
fbe846864d arguments for test_setup that help debugging tests. 2016-11-16 18:08:10 +01:00
Enno Rehling
e50dfbf42b fix terrains.json, reduce config.h use 2016-11-15 23:56:39 +01:00
Enno Rehling
360776f8b9 eliminate data_version variables, issue #479 2016-11-15 23:45:14 +01:00
Enno Rehling
17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling
772bc427aa Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-15 20:44:02 +01:00
Enno Rehling
c1f468ceb0 begin to declutter config.c 2016-11-15 20:43:36 +01:00
Enno Rehling
49e5b5b67e gcc missing include 2016-11-14 23:19:28 +01:00
Enno Rehling
ce4a3c14b3 convert from atoi to atoip. 
most numbers in commands cannot be negative.
 2016-11-14 22:27:44 +01:00
Enno Rehling
b48b80a1e9 verify errno in test_atoip 2016-11-14 22:21:32 +01:00
Enno Rehling
c512d180f8 prevent atoip setting errno on mac. 
only call atoi when string starts with a digit
 2016-11-14 22:15:52 +01:00
Enno Rehling
e293741997 wrong enum, thanks gcc 2016-11-14 20:33:26 +01:00
Enno Rehling
ae0d5f53bf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-14 20:01:56 +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
5e48eac26a coverity warning: NEGATIVE_RETURNS 2016-11-14 02:21:49 +01:00
Enno Rehling
03a94d1264 remove unused and broken backup functionality 2016-11-14 01:35:45 +01:00
Enno Rehling
2b07ae810c kil xmlreport files. 
remove unnecessary includes.
 2016-11-14 01:27:59 +01:00
Enno Rehling
0472ac761e declutter save.h (items, spellbooks) 2016-11-14 01:22:50 +01:00
Enno Rehling
d0b4f16213 reduce item.h include dependencies 2016-11-14 01:05:10 +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
3cc719ba93 fix gcc build 2016-11-13 19:51:41 +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
37bb9c7ae9 Bug 2255: increase the max. number of teachers. 
https://bugs.eressea.de/view.php?id=2255
 2016-11-13 19:00:59 +01:00
Enno Rehling
3533291711 remove at_hurting, it was only used by the Temple of Pain, which is no longer in the game. 2016-11-13 18:33:47 +01:00
Enno Rehling
76734c7929 remove ARENA_CREATION code, it wasn't active. 2016-11-13 18:27:58 +01:00
Enno Rehling
2d2ded8f0d fix a_readint for deprecated attribs. 2016-11-13 17:57:57 +01:00
Enno Rehling
28aa2a56b8 Entferne unbenutztes "Szepter der Tränen". 
Was für eine saublöde Idee.
 2016-11-13 17:49:16 +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
f63baddd51 use memmove, not memcpy. 
fix unicode_trim for windows.
remove unused unicode_mkname.
 2016-11-13 15:49:26 +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
a47da05f51 test unit names get fixed during read. 2016-11-11 15:41:34 +01:00
Enno Rehling
64f80274a0 test that ship and building cannot be named poorly. 2016-11-11 14:00:04 +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
bc44caa17f backfill tests for renaming regions. 2016-11-11 02:07:11 +01:00
Enno Rehling
ff09defa69 prevent badly naming units/factions/regions. 2016-11-11 01:59:43 +01:00
Enno Rehling
e0add2275f also remove trailing spaces. 2016-11-11 01:34:59 +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
7b412399b7 delete leading spaces from names. 2016-11-09 22:03:46 +01:00
Enno Rehling
f03e8f3b62 return an error code if the string had any characters removed. 2016-11-09 14:58:51 +01:00
Enno Rehling
7d79822aa4 fix missing nul-terminator. 2016-11-09 11:54:34 +01:00
Enno Rehling
f68fcf40a6 custom function to make "valid" names. 
remove any non-printable characters from a string.
TODO: test with utf-8 values.
TODO: remove leading/trainling whitespace.
 2016-11-08 22:54:47 +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
bad4fb47c5 bad GUARD_NONE conversion, should have been false. 2016-11-05 16:20:00 +01:00
Enno Rehling
467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +01:00
Enno Rehling
03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling
92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling
313d988e59 fix remaining unit test after guard changes. 2016-10-31 20:10:17 +01:00
Enno Rehling
0bcb3a853f WIP: finish removing GUARD_* flags 
TODO: fix failing tests
 2016-10-31 09:40:36 +01:00
Enno Rehling
754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling
2953a5f036 fix swapped assertions. 2016-10-30 09:49:30 +01:00
Enno Rehling
eb7199450d fix Linux compilation. 2016-10-30 09:47:18 +01:00
Enno Rehling
f147d6a8c8 remove at_guard from guard.c, fix compilation. 2016-10-30 09:43:28 +01:00
Enno Rehling
2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling
8597e8b16a move guard test to guard.test.c 2016-10-30 05:39:25 +01:00
Enno Rehling
a5e63a2472 move GUARD_* flags to guard.h 2016-10-30 05:37:12 +01:00
Enno Rehling
1116afed2b merge conflict resolve 2016-10-29 19:19:22 +02:00
Enno Rehling
1ea8c80845 test that is_guard changes when armedmen does. 2016-10-29 19:19:11 +02:00
Enno Rehling
4487f4d3e1 missing declaration 2016-10-29 19:19:02 +02:00
Enno Rehling
29c5bd6f55 test that regular guards need weapons and skills 2016-10-29 19:18:55 +02:00
Enno Rehling
7c827c0389 add test for races with "unarmed guard" flag. 2016-10-29 19:18:49 +02:00
Enno Rehling
654926fa06 add a failing test for "monsters can guard when unarmed" 2016-10-29 19:18:43 +02:00
Enno Rehling
5bb2dbfd87 move is_guarded from move.h to guard.h 
Conflicts:
	src/move.c
 2016-10-29 19:15:49 +02:00
Enno Rehling
59c8fbc5a5 fix bad Lua test for ents, so they actually guard. 2016-10-29 17:51:01 +02:00
Enno Rehling
6075396de3 WIP: make guard tests pass. 
BUG: monsters are always allowed to guard unarmed.
TODO: more code duplication, refactor it.
TODO: ents do not guard resources?
 2016-10-29 14:16:40 +02:00
Enno Rehling
f1d07fb647 I no longer use CRTDBG to find bugs. Valgrind rules. 2016-10-29 10:53:18 +02:00
Enno Rehling
e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling
91ae9245ca armedmen tests. 
check missing weapons, WTF_SIEGE and minskill
 2016-10-25 15:01:54 +02:00
Enno Rehling
97918799c1 additional testing for armedmen(). 2016-10-25 00:16:13 +02:00
Enno Rehling
8f802c11e1 off-by-one error for early break from loop. 2016-10-25 00:12:18 +02:00
Enno Rehling
e5dc754c25 fix demand in broken regions, after load. 2016-10-24 13:54:53 +02:00
Enno Rehling
cd69936922 fix demand in terraformed regions. 
https://bugs.eressea.de/view.php?id=2249
 2016-10-24 13:47:38 +02:00
Enno Rehling
2fbc7a44d5 add missing tests for recent failures. 2016-10-23 13:02:53 +02:00
Enno Rehling
a921a6594a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-23 10:03:46 +02:00
Enno Rehling
f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling
ac4e32a8f5 Merge branch 'master' into develop 2016-10-23 09:59:42 +02:00
Enno Rehling
34a6dd8d54 fix crash in 997: re-introduce cfindhash. 
this prevents duplicate curse.no values.
 2016-10-22 22:35:10 +02:00
Enno Rehling
06bfd2df5f Merge remote-tracking branch 'eressea/develop' into develop 2016-10-16 16:48:53 +02:00
Enno Rehling
75422e1ba6 fix gcc conversion warnings 2016-10-09 10:07:05 +02:00
Enno Rehling
bf8d3b57b3 Merge branch 'develop' of github.com:eressea/server into develop 2016-10-09 10:01:36 +02:00
Enno Rehling
3d191b6573 not likely to get fixed 2016-10-09 10:01:31 +02:00
Enno Rehling
9287d0c1b4 unused function 2016-10-07 22:06:47 +02:00
Enno Rehling
38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling
fb470b7af1 re-organize lighthouse reporting. 2016-10-05 20:36:01 +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
e79b36bc36 introduced a memory leak i last commit 2016-10-04 10:51:37 +02:00
Enno Rehling
61f76e6722 make old_race a little bit less awful. 2016-10-04 10:34:18 +02:00
Enno Rehling
3338f00fcb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-04 09:15:11 +02:00
Enno Rehling
d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling
63f60a2465 cache some more get_race calls, especially for RC_SPELL. 2016-10-03 20:36:46 +02:00
Enno Rehling
8f1a1fc8c3 tighten up some lookups. 2016-10-03 20:27:36 +02:00
Enno Rehling
fbdf845cb9 fix overpopulation-checks and movement based on splitsize. 2016-10-03 20:15:38 +02:00
Enno Rehling
26a416c5ba do not call can_survive all this much. 2016-10-03 16:38:17 +02:00
Enno Rehling
ef43aaa830 eliminate some duplicate calculations. 2016-10-03 16:28:18 +02:00
Enno Rehling
42e75007c3 little bit of refactoring and better variable names. 2016-10-03 16:26:40 +02:00
Enno Rehling
fadf591a32 gcc appeasement (overflow in constant conversion). 2016-10-02 13:19:39 +02:00
Enno Rehling
693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00
Enno Rehling
8728fccaec fix an endless loop in unicode_utf8_to_cp437 for characters not in the table. 2016-10-02 12:46:07 +02:00
Enno Rehling
c53ac9d8aa remove RS_FARVISION, it is the only spell that uses units. 2016-10-01 21:03:16 +02:00
Enno Rehling
a8a7f68112 Merge pull request #586 from ennorehling/bug-2234-maintenance-msg 
Bug 2234: building maintenance messages
 2016-10-01 18:43:16 +02:00
Enno Rehling
c640fb4be8 compile in the absence of libxml2-dev 2016-10-01 16:39:35 +00:00
Enno Rehling
cbd1e8c457 Fixing https://bugs.eressea.de/view.php?id=2234 
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
 2016-10-01 18:34:38 +02:00
Enno Rehling
41db460278 Merge pull request #585 from ennorehling/tolua-build 
allow building with lua 5.1 and matching tolua version
 2016-10-01 06:40:38 +02:00
Enno Rehling
04333e71d6 working on a new tolua build step that supports 5.1 2016-09-30 19:47:40 +00:00
Enno Rehling
fc6ab724a5 fix the economy test. no idea why it passes now? 
this doesn't represent the bug 2234 that I am trying to repro, yet.
 2016-09-27 15:40:03 +02:00
Enno Rehling
f2d0d74e70 fix the test, except it doesn't fail anymore? 2016-09-27 15:02:22 +02:00
Enno Rehling
10806a1d95 add a failing test for bug 2234 2016-09-27 08:25:58 +02:00
Enno Rehling
15702daf99 Add a new attribute and RF_OBSERVER flag. 2016-09-25 13:01:51 +02:00
Enno Rehling
3bbd2bcce8 Merge pull request #581 from ennorehling/follow-nodrift 
FEATURE: ships that FOLLOW or use PIRACY are not affected by storms.
 2016-09-25 08:37:18 +02:00
Enno Rehling
4353773c3b far_vision test uses watch_region, checkes faction.interval 2016-09-24 21:09:15 +02:00
Enno Rehling
de58fa6aa0 harmless refactoring: create RC_SPELL units from a common function. 2016-09-24 20:51:25 +02:00
Enno Rehling
87873702ca eliminate RS_FARVISION enum, there is no other kind of RC_SPELL. 2016-09-24 20:31:31 +02:00
Enno Rehling
42c44724f8 testing lazy find_spell calls for equipment configuration 2016-09-24 17:29:55 +02:00
Enno Rehling
d758f065d5 only use lists for lighthouses with range > 3. 2016-09-24 11:33:00 +02:00
Enno Rehling
9eb376e0e5 clumsy repair of duplicate regions for range >= 2 (RF_MARK) 2016-09-24 11:20:33 +02:00
Enno Rehling
423e293745 some more config lookup caching 2016-09-23 20:39:08 +02:00
Enno Rehling
c755c1d69e for short lighthouse ranges, don't use lists. 2016-09-23 19:51:33 +02:00
Enno Rehling
b0905f8e6e incomplete new get_regions_distance implementation 2016-09-23 17:03:18 +02:00
Enno Rehling
c606a9ac4d extract RC_SPELL handling into a small function, minimize get_race calls. 2016-09-22 20:22:23 +02:00
Enno Rehling
37a5954c20 NPC races cannot be recruited (and provide no score). 2016-09-22 20:11:14 +02:00
Enno Rehling
5ccb2c3dc8 remove recruitcost from non-player races. 
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
 2016-09-22 18:28:37 +02:00
Enno Rehling
2c0f0bfc1e reduce get_race calls by a few more 2016-09-22 15:51:11 +02:00
Enno Rehling
dfab45dc0c actually don't call old_race anymore 2016-09-22 09:41:30 +02:00
Enno Rehling
e45dc3d68a initizlize rc_elf 2016-09-22 09:37:54 +02:00
Enno Rehling
ac4f8d6e7b make monsters scaring peasants a per-race configuration. 
reduce the number of old_race calls that monster.c makes.
 2016-09-22 09:34:23 +02:00
Enno Rehling
ff83d5108a remove old_race call form heal_factor 2016-09-22 09:08:02 +02:00
Enno Rehling
a3ad9a0222 I am now calling get_race far too often. Fix this a bit. 2016-09-20 20:27:41 +02:00
Enno Rehling
69b420ae2f separate interval generation from seen-markup a bit more. 2016-09-20 15:53:55 +02:00
Enno Rehling
f8ac5c390d SAMRT_INTERVALS is no longer an option, but regular 2016-09-20 09:39:21 +02:00
Enno Rehling
73f33a7d0f Merge branch 'develop' 
Conflicts:
	src/kernel/config.c
 2016-09-19 20:22:53 +02:00
Enno Rehling
7d88dddcc3 Merge pull request #578 from ennorehling/cache-buiding-type 
add an API for caching the results of bt_find
 2016-09-19 20:14:27 +02:00
Enno Rehling
98d810dded Merge pull request #579 from ennorehling/cache-curse-type 
add an API for caching the results of ct_find
 2016-09-19 20:14:16 +02:00
Enno Rehling
12239178c6 rc_find optimizations in monster AI. 
remove dead alp code.
 2016-09-19 20:10:01 +02:00
Enno Rehling
aceb880826 add some TODO and reduce old_race usage. 2016-09-19 18:45:16 +02:00
Enno Rehling
a7fbe4901b eliminate old_race. make the catdragon act like a dragon. 2016-09-19 18:42:14 +02:00
Enno Rehling
043ff40d02 eliminate another call to old_race. 2016-09-19 18:28:44 +02:00
Enno Rehling
1f100a1b6c replace old_race calls with get_race. 2016-09-19 16:10:10 +02:00
Enno Rehling
e6677806b6 refactor unholy power, extract function 2016-09-19 16:03:02 +02:00
Enno Rehling
6ec99af4d6 mark all three major dragon types as RCF_DRAGON. 
use RCF_DRGON flag to detemine BP_DRAGON speed.
 2016-09-19 15:53:31 +02:00
Enno Rehling
b958fa1c2e get_race is better than old_race 2016-09-19 08:56:33 +02:00
Enno Rehling
115e13d513 initialize variable 2016-09-19 08:42:07 +02:00
Enno Rehling
6964267c37 static variables, duh 2016-09-19 08:35:54 +02:00
Enno Rehling
be5f15e18a fix const-conversion warning 2016-09-19 08:32:09 +02:00
Enno Rehling
ee77075cb6 cache get_race calls 2016-09-19 08:25:39 +02:00
Enno Rehling
025c0b91d9 cache the toad race 2016-09-19 07:02:45 +02:00
Enno Rehling
fe383af5f2 sample usage of race caching 2016-09-19 06:58:24 +02:00
Enno Rehling
96d6abdc5a add caching API for rc_find 2016-09-19 06:55:32 +02:00
Enno Rehling
f8167ed62c test get_race and others 2016-09-19 06:47:46 +02:00
Enno Rehling
fbd596fbfa remove bad caching in get_race 2016-09-19 06:43:56 +02:00
Enno Rehling
9af5fb0326 cache some of the highest-ranking ct_find callers 2016-09-19 04:23:49 +02:00
Enno Rehling
d139ee08d1 caching building_type in economy code 2016-09-19 04:15:26 +02:00
Enno Rehling
640ba05876 allow local caching of bt_find results 2016-09-19 04:04:02 +02:00
Enno Rehling
e7739867df use curse_type caching in att_modification 2016-09-19 03:55:12 +02:00
Enno Rehling
eb8376ef70 allow caching of ct_find results 2016-09-19 03:52:10 +02:00
Enno Rehling
dc5fe4a0eb recruiting fewer units than expected creates a message. 2016-09-18 13:49:34 +02:00
Enno Rehling
7ef316f773 Merge branch 'develop' into kill-seen-region 2016-09-18 13:42:32 +02:00
Enno Rehling
ec9d8eab1c fix marking seen_neighbour regions. 
fix reports-tests that didn't think about them.
 2016-09-18 13:27:25 +02:00
Enno Rehling
63a97d6bc0 check that regions are flagged with seen_neighbour where needed. 2016-09-18 13:13:07 +02:00
Enno Rehling
651ce11741 do not report seen_none in CR 2016-09-18 12:44:03 +02:00
Enno Rehling
6c9c460815 fix failing unit tests, remove deleted unit from f->units list. 2016-09-18 11:46:54 +02:00
Enno Rehling
bb689aa7b6 assert that f->units list is correct after remove_unit (fails) 2016-09-18 11:46:19 +02:00
Enno Rehling
b3c31856aa add (failing) test for recruiting into existing units. 2016-09-18 11:34:54 +02:00
Enno Rehling
ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling
a5d44f9638 re-enable creport 2016-09-17 22:57:22 +02:00
Enno Rehling
196c3b7ac8 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-17 20:05:31 +02:00
Enno Rehling
a425a78f7c add a lighthouse to the sample data. 2016-09-17 20:01:49 +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
b41f041d52 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
	src/reports.test.c
 2016-09-17 15:56:32 +02:00
Enno Rehling
4c7d51990e prepare_report should stay static, remove that change. 2016-09-17 15:37:11 +02:00
Enno Rehling
eb7dd051f8 fix bug 2237, respect lighthouse capacity. 2016-09-17 15:31:04 +02:00
Enno Rehling
c4dbb69681 previous test was bad and did not actually exercise prepare_lighthouse. 
made a slighlty better test, which is failing for the right reasons.
 2016-09-17 15:29:28 +02:00
Enno Rehling
1ca67a57d2 add a new test for lighthouse capacity. 
https://bugs.eressea.de/view.php?id=2237
 2016-09-17 14:54:39 +02:00
Enno Rehling
2a0bd3e7ca unused variable warning 2016-09-17 13:29:14 +02:00
Enno Rehling
7349ec0aa9 improve lighthouse tests. 
you must be inside lighthouse to get a report from it.
 2016-09-17 13:20:02 +02:00
Enno Rehling
951bf5718e Merge branch 'develop' into kill-seen-region 2016-09-17 12:41:06 +02:00
Enno Rehling
adfafd51a6 test lighthouses 2016-09-17 12:34:02 +02:00
Enno Rehling
0753ea0174 fix travelthru reporting (passes unit test) 2016-09-17 08:28:33 +02:00
Enno Rehling
a2125fbb9a managed to reproduce the travelthru bug in a unit test. 
travel from other factions inside the [first, last) interval will poison the report.
 2016-09-16 21:26:17 +02:00
Enno Rehling
a86e30d014 re-enable report testing, find out that it fails. 2016-09-16 21:17:54 +02:00
Enno Rehling
74ff763b22 speeding up default_wage a little bit. 2016-09-16 21:12:03 +02:00
Enno Rehling
567083c9e8 fix bad translation key 2016-09-16 20:18:53 +02:00
Enno Rehling
9d60a0f967 missing forward struct declaration 2016-09-16 19:28:07 +02:00
Enno Rehling
783c042d50 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
 2016-09-16 19:11:05 +02:00
Enno Rehling
acfa2cfbe5 remove view functions for special planes (Regatta). 2016-09-16 18:59:24 +02:00
Enno Rehling
d449ce4a8c re-enable report writing, fix report.c to work without seen_region 2016-09-16 18:03:28 +02:00
Enno Rehling
007f4d8b0d test that travelthru notifications will make it into the report. 2016-09-16 17:25:40 +02:00
Enno Rehling
6fed596c36 Merge branch 'develop' into kill-seen-region 2016-09-16 17:12:40 +02:00
Enno Rehling
1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +02:00
Enno Rehling
ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
b0799bd152 fix travis build by not depending on CMake 2.8.8 2016-09-16 16:30:56 +02:00