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

Merge pull request #45 from badgerman/master 

Bug 2032: Rename FIGHT -> COMBAT, again
This commit is contained in:
Enno Rehling 2014-10-26 21:38:22 +01:00
parent b67d42b45e 96d5544b1f
commit 209776b751
5 changed files with 10 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">
<text locale="de">HELFEN</text>
</string>
<string name="fight">
<string name="combat">
<text locale="de">KÄMPFEN</text>
</string>
<string name="ready">

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

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

2
src/kernel/config.c
View File

@ -673,7 +673,7 @@ static void init_gms(void)
faction *f;
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)
fset(f, FFL_GM);

2
src/keyword.c
View File

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

7
src/util/attrib.test.c
View File

@ -69,6 +69,13 @@ static void test_attrib_nexttype(CuTest * tc)
CuAssertPtrEquals(tc, a, alist->nexttype);
CuAssertPtrEquals(tc, 0, a->nexttype);
a_remove(&alist, alist);
CuAssertPtrEquals(tc, a, alist->nexttype);
CuAssertPtrNotNull(tc, (a = a_add(&alist, a_new(&at_bar))));
a_remove(&alist, alist->nexttype);
CuAssertPtrEquals(tc, a, alist->nexttype);
a_removeall(&alist, &at_foo);
a_removeall(&alist, &at_bar);
}