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

sinnvollere Fehlermeldung bei nicht-existierendem farcasting-ziel

This commit is contained in:
Enno Rehling 2005-10-09 10:04:31 +00:00
parent a461d06aa6
commit 73ed11b893
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/kernel/magic.c
View File

@ -1626,9 +1626,8 @@ verify_targets(castorder *co)
{ /* Fehlermeldung */ { /* Fehlermeldung */
spobj->flag = TARGET_RESISTS; spobj->flag = TARGET_RESISTS;
resists++; resists++;
add_message(&mage->faction->msgs, new_message(mage->faction, ADD_MSG(&mage->faction->msgs, msg_message("spellregionresists",
"spellregionresists%u:unit%r:region%s:command", "unit region command", mage, mage->region, co->order));
mage, mage->region, co->order));
break; break;
} }
success++; success++;
@ -2447,12 +2446,12 @@ magic(void)
if (findparam(s, u->faction->locale) == P_LEVEL) { if (findparam(s, u->faction->locale) == P_LEVEL) {
s = getstrtoken(); s = getstrtoken();
level = min(atoip(s), level); level = min(atoip(s), level);
s = getstrtoken();
if (level < 1) { if (level < 1) {
/* Fehler "Das macht wenig Sinn" */ /* Fehler "Das macht wenig Sinn" */
cmistake(u, ord, 10, MSG_MAGIC); cmistake(u, ord, 10, MSG_MAGIC);
continue; continue;
} }
s = getstrtoken();
} }
if (findparam(s, u->faction->locale) == P_REGION) { if (findparam(s, u->faction->locale) == P_REGION) {
t_x = (short)atoi(getstrtoken()); t_x = (short)atoi(getstrtoken());
@ -2460,12 +2459,13 @@ magic(void)
t_y = (short)atoi(getstrtoken()); t_y = (short)atoi(getstrtoken());
t_y = rel_to_abs(getplane(u->region),u->faction,t_y,1); t_y = rel_to_abs(getplane(u->region),u->faction,t_y,1);
target_r = findregion(t_x, t_y); target_r = findregion(t_x, t_y);
s = getstrtoken();
if (!target_r) { if (!target_r) {
/* Fehler "Es wurde kein Zauber angegeben" */ /* Fehler "Die Region konnte nicht verzaubert werden" */
cmistake(u, ord, 172, MSG_MAGIC); ADD_MSG(&mage->faction->msgs, msg_message("spellregionresists",
"unit region command", mage, mage->region, co->order));
continue; continue;
} }
s = getstrtoken();
} }
/* für Syntax ' REGION x y STUFE z ' /* für Syntax ' REGION x y STUFE z '
* hier nach REGION nochmal auf STUFE prüfen */ * hier nach REGION nochmal auf STUFE prüfen */