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

welcome text wird spielabhängig gelesen

This commit is contained in:
Enno Rehling 2001-12-15 14:44:18 +00:00
parent 98334d883a
commit 788826049b
10 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/report.c
View File

@ -2786,7 +2786,7 @@ reports(void)
if(f->age == 1) { if(f->age == 1) {
fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n", fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n",
factionid(f), factionid(f), factionid(f)); factionid(f), factionid(f), factionid(f));
fprintf(BAT, "zip -j -9 %s.zip ../readme.txt\n", factionid(f)); fprintf(BAT, "zip -j -9 %s.zip res/%s/%s/welcome.txt\n", factionid(f), global.welcomepath, locale_name(f->locale));
} else { } else {
fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n", fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n",
factionid(f), factionid(f), factionid(f)); factionid(f), factionid(f), factionid(f));
@ -2799,7 +2799,7 @@ reports(void)
if (f->age == 1) { if (f->age == 1) {
fprintf(shfp, fprintf(shfp,
" \\\n\t\"text/plain\" \"Willkommen\" ../readme.txt"); " \\\n\t\"text/plain\" \"Willkommen\" res/%s/%s/welcome.txt\n", global.welcomepath, locale_name(f->locale));
} }
fprintf(BAT, "bzip2 -9v `ls %s.nr %s.cr`\n", fprintf(BAT, "bzip2 -9v `ls %s.nr %s.cr`\n",
@ -2828,7 +2828,7 @@ reports(void)
if (f->age == 1) { if (f->age == 1) {
fprintf(shfp, fprintf(shfp,
" \\\n\t\"text/plain\" \"Willkommen\" ../readme.txt"); " \\\n\t\"text/plain\" \"Willkommen\" res/%s/%s/welcome.txt\n", global.welcomepath, locale_name(f->locale));
} }
if (!nonr && f->options & wants_report) if (!nonr && f->options & wants_report)

2
src/common/items/seed.c
View File

@ -136,4 +136,6 @@ init_mallornseed(void)
} }
} }
#else
int __xx_nonempty=0; /* to prevent this from being an empty translation unit */
#endif #endif

4
src/common/kernel/eressea.c
View File

@ -2097,8 +2097,12 @@ parse_tagbegin(struct xml_stack *stack, void *data)
return XML_USERERROR; return XML_USERERROR;
} }
} else if (strcmp(tag->name, "game")==0) { } else if (strcmp(tag->name, "game")==0) {
const char * welcome = xml_value(tag, "welcome");
const char * name = xml_value(tag, "name"); const char * name = xml_value(tag, "name");
int maxunits = xml_ivalue(tag, "units"); int maxunits = xml_ivalue(tag, "units");
if (welcome!=NULL) {
global.welcomepath = strdup(welcome);
}
if (name!=NULL) { if (name!=NULL) {
global.gamename = strdup(name); global.gamename = strdup(name);
} }

1
src/common/kernel/eressea.h
View File

@ -1168,6 +1168,7 @@ extern const struct race * new_race[];
/* globale settings des Spieles */ /* globale settings des Spieles */
typedef struct settings { typedef struct settings {
const char *gamename; const char *gamename;
const char *welcomepath;
unsigned int maxunits; unsigned int maxunits;
struct attrib *attribs; struct attrib *attribs;
unsigned int data_version; unsigned int data_version;

1
src/eressea/main.c
View File

@ -120,6 +120,7 @@ static boolean g_killeiswald = false;
struct settings global = { struct settings global = {
"Eressea", /* gamename */ "Eressea", /* gamename */
"eressea", /* resourcepath */
1000, /* maxunits */ 1000, /* maxunits */
}; };

2
src/res/eressea.xml
View File

@ -10,7 +10,7 @@
<include file="races.xml"></include> <include file="races.xml"></include>
<include file="items.xml"></include> <include file="items.xml"></include>
<game name="Eressea"> <game name="Eressea" welcome="eressea">
<comment>Game specific</comment> <comment>Game specific</comment>
<order name="MEINUNG" disable></order> <order name="MEINUNG" disable></order>
<order name="MAGIEGEBIET" disable></order> <order name="MAGIEGEBIET" disable></order>

2
src/res/readme.txt
View File

@ -7,7 +7,7 @@ Probleme haben, weil dir vielleicht die Regeln noch unklar sind, so gibt es
mehrere Informationsquellen, die dir hoffentlich helfen können. mehrere Informationsquellen, die dir hoffentlich helfen können.
Die wichtigste Hilfe für das Spiel ist nach wie vor die Anleitung, im Netz zu Die wichtigste Hilfe für das Spiel ist nach wie vor die Anleitung, im Netz zu
finden unter http://eressea.faroul.de/. finden unter http://eressea.upb.de/rules/.
Eine Gruppe engagierter Mitspieler hat sich zum Ziel gesetzt, Neulingen zu Eine Gruppe engagierter Mitspieler hat sich zum Ziel gesetzt, Neulingen zu
helfen. Diese Spieler können per EMail unter eressea-help@eressea.kn-bremen.de helfen. Diese Spieler können per EMail unter eressea-help@eressea.kn-bremen.de

2
src/res/vinyambar-classic.xml
View File

@ -10,7 +10,7 @@
<include file="races.xml"></include> <include file="races.xml"></include>
<include file="items.xml"></include> <include file="items.xml"></include>
<game name="Vinyambar I" units="250"> <game name="Vinyambar I" units="250" welcome="vinyambar">
<comment>Game specific</comment> <comment>Game specific</comment>
<order name="MEINUNG" disable></order> <order name="MEINUNG" disable></order>
<order name="MAGIEGEBIET" disable></order> <order name="MAGIEGEBIET" disable></order>

2
src/res/vinyambar.xml
View File

@ -10,7 +10,7 @@
<include file="races.xml"></include> <include file="races.xml"></include>
<include file="items.xml"></include> <include file="items.xml"></include>
<game name="Vinyambar II" units="250"> <game name="Vinyambar II" units="250" welcome="vinyambar">
<comment>Game specific</comment> <comment>Game specific</comment>
<order name="ARBEITEN" disable></order> <order name="ARBEITEN" disable></order>
<order name="MEINUNG" disable></order> <order name="MEINUNG" disable></order>

2
src/tools/fixes.c
View File

@ -73,6 +73,7 @@ static struct attrib_type at_age = {
} \ } \
} }
#if NEW_RESOURCEGROWTH
static void static void
convert_resources(void) convert_resources(void)
{ {
@ -210,6 +211,7 @@ convert_resources(void)
log_close(); log_close();
fclose(fixes); fclose(fixes);
} }
#endif
static void static void
fix_age(void) fix_age(void)