Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- FFL_RESTART zurückgesetzt 

- Fix Neustart
This commit is contained in:
Christian Schlittchen 2002-05-05 08:06:19 +00:00
parent fdf2b84212
commit a5ccf84555
6 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/laws.c
View File

@ -1163,7 +1163,7 @@ quit(void)
continue;
}
if (u->faction->age > 3 || fval(u->faction, FFL_RESTART)) {
cmistake(u, S->s, 305, MSG_EVENT);
cmistake(u, S->s, 314, MSG_EVENT);
continue;
}

2
src/common/kernel/battle.c
View File

@ -1051,7 +1051,7 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile)
}
#if CHANGED_CROSSBOWS == 1
if(fval(awtype,WTF_ARMORPIERCING)) {
if(awtype && fval(awtype,WTF_ARMORPIERCING)) {
/* crossbows */
ar /= 2;
an /= 2;

10
src/common/settings-eressea.h
View File

@ -30,10 +30,10 @@
#define SKILLPOINTS 0
#define NEW_MIGRATION 1
#define PEASANTS_DO_NOT_STARVE 0
#define GUARD_DISABLES_RECRUIT 0
#define GUARD_DISABLES_PRODUCTION 0
#define RESOURCE_QUANTITY 1.0
#define RECRUITFRACTION 20 /* 100/RECRUITFRACTION% */
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CATAPULT_AMMUNITION 0 /* Gebaut werden kann sie auch mit 0! */
#define CHANGED_CROSSBOWS 0
#define CHANGED_CROSSBOWS 1

2
src/corwin.mk
View File

@ -4,7 +4,7 @@ ifndef ERESSEA
endif
# Hier definieren, damit nicht '@gcc'
CC = gcc-3.0 -D_GNU_SOURCE -ansi -pedantic
CC = gcc-3.0 -D_GNU_SOURCE -ansi -pedantic -W
DEPEND = @gcc-3.0 -MM -MG -r
# CC = gcc -D_GNU_SOURCE
AR = ar

13
src/eressea/korrektur.c
View File

@ -2801,6 +2801,18 @@ xe_init(void)
return 0;
}
static int
fix_restart_flag(void)
{
faction *f;
for(f=factions; f; f=f->next) {
freset(f, FFL_RESTART);
}
return 0;
}
extern border *borders[];
static void
@ -2894,6 +2906,7 @@ korrektur(void)
do_once("guac", guard_conversion());
do_once("qpoi", questportal_init());
do_once("xini", xe_init());
do_once("rest", fix_restart_flag());
warn_password();
fix_road_borders();

11
src/res/de/messages.xml
View File

@ -4430,6 +4430,17 @@
</nr>
</locale>
</message>
<message name="error314">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Eine Partei kann nur einmal neu starten."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - Restart can only be used once."</text>
</message>
<message name="drown_on_ship">
<type>