Enno Rehling
462d0118e3
better testing for some items.
2017-02-27 20:16:50 +01:00
Enno Rehling
9d09574d5e
enable process_orders to be done in steps.
...
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806
Test E2 items in E2 only.
...
Remove eye of demon (broken item).
2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b
remove remainders of the arena.
...
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398
tests for more items
2017-02-27 15:14:52 +01:00
Enno Rehling
3d4860c033
remove more of the artrewards
2017-02-27 14:19:25 +01:00
Enno Rehling
db0cbf34c7
test for aurapotion
2017-02-27 14:17:38 +01:00
Enno Rehling
5ffe60193b
move items with tests to items.c
2017-02-27 14:10:12 +01:00
Enno Rehling
60c2f1e807
test the birthday amulet
2017-02-27 14:01:41 +01:00
Enno Rehling
604b574d0f
fix potion-use? need more testing
2017-02-27 11:39:55 +01:00
Enno Rehling
715c8569ba
hacked the item-use function,
...
XML needs cleaning up, funpointer needs to die
2017-02-27 09:48:28 +01:00
Enno Rehling
44c3838d79
WIP: itype->use elimination.
2017-02-27 04:22:28 +01:00
Enno Rehling
132ac0a38a
Merge remote-tracking branch 'upstream/develop' into develop
2017-02-26 20:23:25 +01:00
Enno Rehling
b8d9fae4e4
begin version 3.12
2017-02-26 20:16:22 +01:00
Enno Rehling
b8ffc20d87
remove item_useonother callbacks (use is fine).
...
add a test for foolpotion.
2017-02-26 19:54:58 +01:00
Enno Rehling
3c60f863a5
remove the special_resources trie.
...
memory leak, bad performance.
2017-02-26 18:17:58 +01:00
Enno Rehling
56eb1b753c
fix header missing a struct
2017-02-26 15:52:58 +01:00
Enno Rehling
71e5d101a8
converter compiles fine, does nothing
2017-02-26 15:33:32 +01:00
Enno Rehling
f406c47657
use converter frm noxml branch
2017-02-26 15:30:58 +01:00
Enno Rehling
67252e2924
add conversion program
2017-02-26 15:03:47 +01:00
Enno Rehling
6e27adb892
remove pointless <resourcelimit/> wrapper from XML.
2017-02-26 14:00:20 +01:00
Enno Rehling
d4b973fea4
remove resource_limit struct indirection.
2017-02-26 13:55:19 +01:00
Enno Rehling
c3b0b9e8b3
fix missing limit-flags.
2017-02-26 13:47:22 +01:00
Enno Rehling
0738090f28
no more funpointers in resource_limit.
...
change how resource limits in lua are called.
2017-02-26 13:19:47 +01:00
Enno Rehling
84c6a4b7b5
remove last vestiges of the rm_* material names
2017-02-25 21:25:55 +01:00
Enno Rehling
6031dff685
resource_limit.value is always zero, never initialized. kill it.
2017-02-25 19:50:32 +01:00
Enno Rehling
3a985108a6
change all magic resistance to use fractions.
2017-02-24 20:47:47 +01:00
Enno Rehling
e557140ad1
more fractions functionality.
2017-02-24 20:47:31 +01:00
Enno Rehling
e0229be500
also implement subtraction.
2017-02-24 17:56:39 +01:00
Enno Rehling
234eb62226
short and sweet math with fractions.
...
goinf to use this for magres.
2017-02-24 17:51:35 +01:00
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