fix game_name, remove it from rules

This commit is contained in:
Enno Rehling 2017-01-22 20:32:54 +01:00
parent 9ccaab6516
commit 30665f874a
5 changed files with 1 additions and 9 deletions

View File

@ -8,8 +8,6 @@
"jsreport" "jsreport"
], ],
"settings": { "settings": {
"game.id": 2,
"game.name": "Eressea",
"orders.default": "work", "orders.default": "work",
"NewbieImmunity": 8, "NewbieImmunity": 8,
"modules.wormholes": true, "modules.wormholes": true,

View File

@ -25,8 +25,6 @@
"jsreport" "jsreport"
], ],
"settings": { "settings": {
"game.id": 3,
"game.name": "E3",
"orders.default": "work", "orders.default": "work",
"database.gameid": 7, "database.gameid": 7,
"NewbieImmunity": 4, "NewbieImmunity": 4,

View File

@ -25,8 +25,6 @@
"jsreport" "jsreport"
], ],
"settings": { "settings": {
"game.id": 4,
"game.name": "Deveron",
"orders.default": "work", "orders.default": "work",
"database.gameid": 7, "database.gameid": 7,
"NewbieImmunity": 4, "NewbieImmunity": 4,

View File

@ -6,12 +6,10 @@
_x: preposition (15 /Schlumpf/schwerter) _x: preposition (15 /Schlumpf/schwerter)
_a: including article (ein Schlumpf, a smurf) _a: including article (ein Schlumpf, a smurf)
--> -->
<strings>
<string name="mailcmd"> <string name="mailcmd">
<text locale="de">BEFEHLE</text> <text locale="de">BEFEHLE</text>
<text locale="en">ORDERS</text> <text locale="en">ORDERS</text>
</string> </string>
</strings>
<string name="vortex"> <string name="vortex">
<text locale="de">Wirbel</text> <text locale="de">Wirbel</text>
<text locale="en">vortex</text> <text locale="en">vortex</text>

View File

@ -815,7 +815,7 @@ const char * game_name_upper(void)
char *r = result; char *r = result;
const char *param = game_name(); const char *param = game_name();
const char *c = param; const char *c = param;
while (*c && (r-result)<sizeof(result)) { while (*c && (result+sizeof(result))>r) {
*r++ = (char)toupper(*c++); *r++ = (char)toupper(*c++);
} }
*r = '\0'; *r = '\0';