forked from github/server
bugfix in yet another message (will it ever stop)
more error messages for the parser to make them easier to find.
This commit is contained in:
parent
b1703d27d4
commit
d78123a924
|
@ -2668,7 +2668,7 @@ magic(void)
|
||||||
* gezaubert, co->level ist aber defaultmäßig Stufe des Magiers */
|
* gezaubert, co->level ist aber defaultmäßig Stufe des Magiers */
|
||||||
if (spl_costtyp(sp) != SPC_FIX) {
|
if (spl_costtyp(sp) != SPC_FIX) {
|
||||||
ADDMSG(&u->faction->msgs, msg_message("missing_components",
|
ADDMSG(&u->faction->msgs, msg_message("missing_components",
|
||||||
"unit spell level", u, sp, level));
|
"unit spell level", u, sp, co->level));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,10 @@ parse_symbol(opstack ** stack, const char* in, const void * userdata)
|
||||||
}
|
}
|
||||||
++in;
|
++in;
|
||||||
foo = find_function(symbol);
|
foo = find_function(symbol);
|
||||||
if (foo==NULL) return NULL;
|
if (foo==NULL) {
|
||||||
|
log_error(("parser does not know about \"%s\" function.\n", symbol));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
foo->parse(stack, userdata); /* will pop parameters from stack (reverse order!) and push the result */
|
foo->parse(stack, userdata); /* will pop parameters from stack (reverse order!) and push the result */
|
||||||
} else {
|
} else {
|
||||||
variable * var = find_variable(symbol);
|
variable * var = find_variable(symbol);
|
||||||
|
@ -232,7 +235,10 @@ parse_symbol(opstack ** stack, const char* in, const void * userdata)
|
||||||
++in;
|
++in;
|
||||||
}
|
}
|
||||||
/* it's a constant (variable is a misnomer, but heck, const was taken;)) */
|
/* it's a constant (variable is a misnomer, but heck, const was taken;)) */
|
||||||
if (var==NULL) return NULL;
|
if (var==NULL) {
|
||||||
|
log_error(("parser does not know about \"%s\" variable.\n", symbol));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
opush(stack, var->value);
|
opush(stack, var->value);
|
||||||
}
|
}
|
||||||
return in;
|
return in;
|
||||||
|
|
|
@ -1402,7 +1402,7 @@
|
||||||
<arg name="spell" type="spell"/>
|
<arg name="spell" type="spell"/>
|
||||||
</type>
|
</type>
|
||||||
<text locale="de">"$unit($unit) hat nur genügend Komponenten um $spell($spell) auf Stufe $int($level) zu zaubern."</text>
|
<text locale="de">"$unit($unit) hat nur genügend Komponenten um $spell($spell) auf Stufe $int($level) zu zaubern."</text>
|
||||||
<text locale="en">"$unit($unit) has insufficient components to cast $spell($spell) on level $level($level)."</text>
|
<text locale="en">"$unit($unit) has insufficient components to cast $spell($spell) on level $int($level)."</text>
|
||||||
</message>
|
</message>
|
||||||
<message name="patzer" section="magic">
|
<message name="patzer" section="magic">
|
||||||
<type>
|
<type>
|
||||||
|
|
Loading…
Reference in New Issue