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

http://eressea.upb.de/mantis/view.php?id=987 

Nummer Schiff ist fuer neue Schiffe wieder erlaubt.
This commit is contained in:
Enno Rehling 2006-10-07 21:29:29 +00:00
parent d02be7811a
commit 7e4db04e1b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/gamecode/laws.c
View File

@ -2931,14 +2931,18 @@ renumber_cmd(unit * u, order * ord)
u->no = i; u->no = i;
uhash(u); uhash(u);
break; break;
#ifdef ALLOW_SHIP_RENUM
case P_SHIP: case P_SHIP:
if (!u->ship) { if (!u->ship) {
cmistake(u,ord,144,MSG_EVENT); cmistake(u, ord, 144, MSG_EVENT);
break;
}
if (u->ship->coast != NODIRECTION) {
cmistake(u, ord, 116, MSG_EVENT);
break; break;
} }
if (!fval(u, UFL_OWNER)) { if (!fval(u, UFL_OWNER)) {
cmistake(u,ord,146,MSG_EVENT); cmistake(u, ord, 146, MSG_EVENT);
break; break;
} }
s = getstrtoken(); s = getstrtoken();
@ -2951,7 +2955,7 @@ renumber_cmd(unit * u, order * ord)
break; break;
} }
if (findship(i) || findbuilding(i)) { if (findship(i) || findbuilding(i)) {
cmistake(u,ord,115,MSG_EVENT); cmistake(u, ord, 115, MSG_EVENT);
break; break;
} }
} }
@ -2959,7 +2963,6 @@ renumber_cmd(unit * u, order * ord)
u->ship->no = i; u->ship->no = i;
shash(u->ship); shash(u->ship);
break; break;
#endif
case P_BUILDING: case P_BUILDING:
case P_GEBAEUDE: case P_GEBAEUDE:
if (!u->building) { if (!u->building) {