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

Enforcing maximum size of units in recruiting (compile-fix).

Browse source
This commit is contained in:
Enno Rehling 2006-10-29 13:11:41 +00:00
parent b1f1f07231
commit 4f182eb06b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/gamecode/economy.c
View file

@ -75,7 +75,8 @@
typedef struct request { typedef struct request {
struct request * next; struct request * next;
struct unit *unit; struct unit * unit;
struct order * ord;
int qty; int qty;
int no; int no;
union { union {
@ -163,6 +164,7 @@ expandorders(region * r, request * requests)
} }
while (requests) { while (requests) {
request * o = requests->next; request * o = requests->next;
free_order(requests->ord);
free(requests); free(requests);
requests = o; requests = o;
} }
@ -354,7 +356,7 @@ do_recruiting(recruitment * recruits, int available)
use_pooled(u, oldresourcetype[R_SILVER], GET_DEFAULT, rc->recruitcost*number); use_pooled(u, oldresourcetype[R_SILVER], GET_DEFAULT, rc->recruitcost*number);
} }
if (u->number+number>UNIT_MAXSIZE) { if (u->number+number>UNIT_MAXSIZE) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "error_unit_size", "maxsize", UNIT_MAXSIZE)); ADDMSG(&u->faction->msgs, msg_feedback(u, req->ord, "error_unit_size", "maxsize", UNIT_MAXSIZE));
number = UNIT_MAXSIZE-u->number; number = UNIT_MAXSIZE-u->number;
assert(number>=0); assert(number>=0);
} }
@ -555,6 +557,7 @@ recruit(unit * u, struct order * ord, request ** recruitorders)
o = (request *) calloc(1, sizeof(request)); o = (request *) calloc(1, sizeof(request));
o->qty = n; o->qty = n;
o->unit = u; o->unit = u;
o->ord = copy_order(ord);
addlist(recruitorders, o); addlist(recruitorders, o);
} }
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -1629,7 +1632,7 @@ make_cmd(unit * u, struct order * ord)
const char *s; const char *s;
const struct locale * lang = u->faction->locale; const struct locale * lang = u->faction->locale;
if (u->number==NULL) return; if (u->number==0) return;
init_tokens(ord); init_tokens(ord);
skip_token(); skip_token();