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

Merge branch 'develop' of github.com:eressea/server into develop

Browse source
This commit is contained in:
Enno Rehling 2016-01-30 23:09:38 +01:00
commit 9376aa5c46
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/magic.c
View file

@ -1869,7 +1869,7 @@ static int addparam_building(const char *const param[], spllprm ** spobjp)
static int static int
addparam_region(const char *const param[], spllprm ** spobjp, const unit * u, addparam_region(const char *const param[], spllprm ** spobjp, const unit * u,
order * ord, plane * pl) order * ord)
{ {
assert(param[0]); assert(param[0]);
if (param[1] == 0) { if (param[1] == 0) {
@ -1878,6 +1878,7 @@ order * ord, plane * pl)
return -1; return -1;
} }
else { else {
plane *pl = getplanebyid(0);
int tx = atoi((const char *)param[0]), ty = atoi((const char *)param[1]); int tx = atoi((const char *)param[0]), ty = atoi((const char *)param[1]);
int x = rel_to_abs(pl, u->faction, tx, 0); int x = rel_to_abs(pl, u->faction, tx, 0);
int y = rel_to_abs(pl, u->faction, ty, 1); int y = rel_to_abs(pl, u->faction, ty, 1);
@ -1991,9 +1992,8 @@ static spellparameter *add_spellparameter(region * target_r, unit * u,
++c; ++c;
break; break;
case 'r': case 'r':
/* Parameter sind zwei Regionskoordinaten */ /* Parameter sind zwei Regionskoordinaten innerhalb der "normalen" Plane */
/* this silly thing only works in the normal plane! */ j = addparam_region(param + i, &spobj, u, ord);
j = addparam_region(param + i, &spobj, u, ord, NULL);
++c; ++c;
break; break;
case 'b': case 'b':