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

fix unsigned mismatch

This commit is contained in:
Enno Rehling 2021-03-21 18:55:31 +01:00
parent 4b0c6dc90f
commit 6a07688ff3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle.c
View File

@ -3177,7 +3177,7 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
int wcount[WMAX]; int wcount[WMAX];
int wused[WMAX]; int wused[WMAX];
int oi = 0, di = 0; int oi = 0, di = 0;
unsigned int w = 0; int w = 0;
for (itm = u->items; itm && w != WMAX; itm = itm->next) { for (itm = u->items; itm && w != WMAX; itm = itm->next) {
const weapon_type *wtype = resource2weapon(itm->type->rtype); const weapon_type *wtype = resource2weapon(itm->type->rtype);
if (wtype == NULL || itm->number == 0) if (wtype == NULL || itm->number == 0)
@ -3192,7 +3192,7 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
} }
assert(w != WMAX); assert(w != WMAX);
} }
fig->weapons = malloc((1 + w) * sizeof(weapon)); fig->weapons = malloc((1 + (size_t)w) * sizeof(weapon));
memcpy(fig->weapons, weapons, w * sizeof(weapon)); memcpy(fig->weapons, weapons, w * sizeof(weapon));
fig->weapons[w].type = NULL; fig->weapons[w].type = NULL;