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

CLAIM command did not like that tokens could be NULL.

This commit is contained in:
Enno Rehling 2015-04-09 12:33:23 +02:00
parent 224a9af33c
commit ad0a753c52
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/laws.c
View File

@ -3911,24 +3911,27 @@ int claim_cmd(unit * u, struct order *ord)
{ {
char token[128]; char token[128];
const char *t; const char *t;
int n; int n = 1;
const item_type *itype; const item_type *itype = 0;
init_order(ord); init_order(ord);
t = gettoken(token, sizeof(token)); t = gettoken(token, sizeof(token));
n = atoi((const char *)t); if (t) {
if (n == 0) { n = atoi((const char *)t);
n = 1; if (n == 0) {
n = 1;
}
else {
t = gettoken(token, sizeof(token));
}
if (t) {
itype = finditemtype(t, u->faction->locale);
}
} }
else { if (itype) {
t = gettoken(token, sizeof(token));
}
itype = finditemtype(t, u->faction->locale);
if (itype != NULL) {
item **iclaim = i_find(&u->faction->items, itype); item **iclaim = i_find(&u->faction->items, itype);
if (iclaim != NULL && *iclaim != NULL) { if (iclaim && *iclaim) {
n = _min(n, (*iclaim)->number); n = _min(n, (*iclaim)->number);
i_change(iclaim, itype, -n); i_change(iclaim, itype, -n);
i_change(&u->items, itype, n); i_change(&u->items, itype, n);