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

Bug 2032: rename FIGHT back to COMBAT

Browse source
This commit is contained in:
Enno Rehling 2014-10-20 17:13:32 +02:00
parent 356697e44e
commit 96d5544b1f
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/core/de/strings.xml
View file

@ -2173,7 +2173,7 @@
<string name="help"> <string name="help">
<text locale="de">HELFEN</text> <text locale="de">HELFEN</text>
</string> </string>
<string name="fight"> <string name="combat">
<text locale="de">KÄMPFEN</text> <text locale="de">KÄMPFEN</text>
</string> </string>
<string name="ready"> <string name="ready">

3
res/core/en/strings.xml
View file

@ -1451,9 +1451,6 @@
<string name="help"> <string name="help">
<text locale="en">HELP</text> <text locale="en">HELP</text>
</string> </string>
<string name="fight">
<text locale="en">FIGHT</text>
</string>
<string name="ready"> <string name="ready">
<text locale="en">COMBATSPELL</text> <text locale="en">COMBATSPELL</text>
</string> </string>

2
src/kernel/config.c
View file

@ -673,7 +673,7 @@ static void init_gms(void)
faction *f; faction *f;
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
const attrib *a = a_findc(f->attribs, &at_gm); attrib *a = a_find(f->attribs, &at_gm);
if (a != NULL) if (a != NULL)
fset(f, FFL_GM); fset(f, FFL_GM);

2
src/keyword.c
View file

@ -103,7 +103,7 @@ const char *keywords[MAXKEYWORDS] = {
"research", "research",
"give", "give",
"help", "help",
"fight", "combat",
"ready", "ready",
"buy", "buy",
"contact", "contact",