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

Add missing keywords, fix disappearing units. 

https://bugs.eressea.de/view.php?id=2051
. The orders PASSWORT, FAHRE, KÄMPFE were not recognized (new imperative syntax).
. Added backwards compatibility for FIGHT (now COMBAT).

https://bugs.eressea.de/view.php?id=2050
. units were always giving away ALL persons, not the number in their GIVE command.
This commit is contained in:
Enno Rehling 2014-12-12 13:32:21 +01:00
parent 78f4dfac1d
commit 440d78596c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf/keywords.json
View File

@ -1,5 +1,8 @@
{ {
"keywords": { "keywords": {
"en" : {
"combat": [ "COMBAT", "FIGHT" ]
},
"de": { "de": {
"//" : "//", "//" : "//",
"banner": "BANNER", "banner": "BANNER",
@ -14,7 +17,7 @@
"guard": ["BEWACHE", "BEWACHEN"], "guard": ["BEWACHE", "BEWACHEN"],
"message": "BOTSCHAFT", "message": "BOTSCHAFT",
"end": "ENDE", "end": "ENDE",
"ride": ["REITE", "REITEN"], "ride": ["FAHRE", "FAHREN"],
"number": "NUMMER", "number": "NUMMER",
"follow": ["FOLGE","FOLGEN"], "follow": ["FOLGE","FOLGEN"],
"research": ["FORSCHE", "FORSCHEN"], "research": ["FORSCHE", "FORSCHEN"],
@ -29,7 +32,7 @@
"make": ["MACHE", "MACHEN"], "make": ["MACHE", "MACHEN"],
"maketemp": ["MACHE TEMP", "MACHETEMP"], "maketemp": ["MACHE TEMP", "MACHETEMP"],
"move" : "NACH", "move" : "NACH",
"password" : "PASSWORD", "password" : "PASSWORT",
"loot" : ["PLÜNDERE", "PLÜNDERN"], "loot" : ["PLÜNDERE", "PLÜNDERN"],
"recruit": ["REKRUTIERE", "REKRUTIEREN"], "recruit": ["REKRUTIERE", "REKRUTIEREN"],
"reserve": ["RESERVIERE", "RESERVIEREN"], "reserve": ["RESERVIERE", "RESERVIEREN"],

3
src/give.c
View File

@ -426,7 +426,6 @@ void give_unit(unit * u, unit * u2, order * ord)
if (u2 == NULL) { if (u2 == NULL) {
message *msg; message *msg;
if (fval(r->terrain, SEA_REGION)) { if (fval(r->terrain, SEA_REGION)) {
/* TODO: why is this here, but the unit does not actually seem to lose any men? */
msg = disband_men(u->number, u, ord); msg = disband_men(u->number, u, ord);
if (msg) { if (msg) {
ADDMSG(&u->faction->msgs, msg); ADDMSG(&u->faction->msgs, msg);
@ -755,7 +754,7 @@ void give_cmd(unit * u, order * ord)
msg_feedback(u, ord, "race_noregroup", "race", u_race(u))); msg_feedback(u, ord, "race_noregroup", "race", u_race(u)));
return; return;
} }
msg = u2 ? give_men(u->number, u, u2, ord) : disband_men(u->number, u, ord); msg = u2 ? give_men(n, u, u2, ord) : disband_men(n, u, ord);
if (msg) { if (msg) {
ADDMSG(&u->faction->msgs, msg); ADDMSG(&u->faction->msgs, msg);
} }