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

eliminate some type conversion warnings (MSVC)

This commit is contained in:
Enno Rehling 2021-03-21 18:09:21 +01:00
parent 521ae1f769
commit f11802d817
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle.c
View File

@ -111,7 +111,7 @@ const troop no_troop = { 0, 0 };
static int max_turns; static int max_turns;
static int rule_damage; static int rule_damage;
static int rule_loot; static int rule_loot;
static float loot_divisor; static double loot_divisor;
static int flee_chance_max_percent; static int flee_chance_max_percent;
static int flee_chance_base; static int flee_chance_base;
static int flee_chance_skill_bonus; static int flee_chance_skill_bonus;
@ -3167,7 +3167,8 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
int dwp[WMAX]; int dwp[WMAX];
int wcount[WMAX]; int wcount[WMAX];
int wused[WMAX]; int wused[WMAX];
int oi = 0, di = 0, w = 0; int oi = 0, di = 0;
unsigned 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)
@ -3182,9 +3183,9 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
} }
assert(w != WMAX); assert(w != WMAX);
} }
assert(w >= 0); fig->weapons = malloc((1 + w) * sizeof(weapon));
fig->weapons = (weapon *)calloc((size_t)(w + 1), sizeof(weapon)); memcpy(fig->weapons, weapons, w * sizeof(weapon));
memcpy(fig->weapons, weapons, (size_t)w * sizeof(weapon)); fig->weapons[w].type = NULL;
for (i = 0; i != w; ++i) { for (i = 0; i != w; ++i) {
int j, o = 0, d = 0; int j, o = 0, d = 0;