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

fix -Wconversion in spells.c

This commit is contained in:
Enno Rehling 2015-05-15 07:07:21 +02:00
parent fe29e29c31
commit d2af6a2f88
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/spells.c
View File

@ -490,7 +490,7 @@ static const race *select_familiar(const race * magerace, magic_t magiegebiet)
unsigned int maxlen = listlen(familiarraces); unsigned int maxlen = listlen(familiarraces);
if (maxlen > 0) { if (maxlen > 0) {
race_list *rclist = familiarraces; race_list *rclist = familiarraces;
int index = rng_int() % maxlen; unsigned int index = rng_uint() % maxlen;
while (index-- > 0) { while (index-- > 0) {
rclist = rclist->next; rclist = rclist->next;
} }
@ -536,7 +536,8 @@ static int sp_summon_familiar(castorder * co)
int cast_level = co->level; int cast_level = co->level;
const race *rc; const race *rc;
int sk; int sk;
int dh, dh1, bytes; int dh, dh1;
size_t bytes;
message *msg; message *msg;
char zText[2048], *bufp = zText; char zText[2048], *bufp = zText;
size_t size = sizeof(zText) - 1; size_t size = sizeof(zText) - 1;
@ -597,17 +598,17 @@ static int sp_summon_familiar(castorder * co)
else { else {
if (dh == 0) { if (dh == 0) {
bytes = bytes =
(int)strlcpy(bufp, (const char *)LOC(mage->faction->locale, strlcpy(bufp, (const char *)LOC(mage->faction->locale,
"list_and"), size); "list_and"), size);
} }
else { else {
bytes = (int)strlcpy(bufp, (const char *)", ", size); bytes = strlcpy(bufp, (const char *)", ", size);
} }
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
} }
bytes = bytes =
(int)strlcpy(bufp, (const char *)skillname((skill_t)sk, mage->faction->locale), strlcpy(bufp, (const char *)skillname((skill_t)sk, mage->faction->locale),
size); size);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
@ -1299,16 +1300,17 @@ static int sp_rosthauch(castorder * co)
for (; iweapon != NULL; iweapon = iweapon->next) { for (; iweapon != NULL; iweapon = iweapon->next) {
item **ip = i_find(&u->items, iweapon->type); item **ip = i_find(&u->items, iweapon->type);
if (*ip) { if (*ip) {
int i = _min((*ip)->number, force); float chance = (float)_min((*ip)->number, force);
if (iweapon->chance < 1.0) { if (iweapon->chance < 1.0) {
i = (int)(i * iweapon->chance); chance *= iweapon->chance;
} }
if (i > 0) { if (chance > 0) {
force -= i; int ichange = (int)chance;
ironweapon += i; force -= ichange;
i_change(ip, iweapon->type, -i); ironweapon += ichange;
i_change(ip, iweapon->type, -ichange);
if (iweapon->rusty) { if (iweapon->rusty) {
i_change(&u->items, iweapon->rusty, i); i_change(&u->items, iweapon->rusty, ichange);
} }
} }
} }
@ -4004,7 +4006,7 @@ static int sp_recruit(castorder * co)
* Bauer, nur die Kosten steigen. */ * Bauer, nur die Kosten steigen. */
n = (pow(force, 1.6) * 100) / f->race->recruitcost; n = (pow(force, 1.6) * 100) / f->race->recruitcost;
if (rc->recruit_multi != 0) { if (rc->recruit_multi != 0) {
double multp = maxp / rc->recruit_multi; double multp = (double)maxp / rc->recruit_multi;
n = _min(multp, n); n = _min(multp, n);
n = _max(n, 1); n = _max(n, 1);
rsetpeasants(r, maxp - (int)(n * rc->recruit_multi)); rsetpeasants(r, maxp - (int)(n * rc->recruit_multi));
@ -4054,7 +4056,7 @@ static int sp_bigrecruit(castorder * co)
/* Fuer vergleichbare Erfolge bei unterschiedlichen Rassen die /* Fuer vergleichbare Erfolge bei unterschiedlichen Rassen die
* Rekrutierungskosten mit einfliessen lassen. */ * Rekrutierungskosten mit einfliessen lassen. */
n = (int)force + lovar((force * force * 1000) / f->race->recruitcost); n = (int)force + lovar((force * force * 1000) / (float)f->race->recruitcost);
if (f->race == get_race(RC_ORC)) { if (f->race == get_race(RC_ORC)) {
n = _min(2 * maxp, n); n = _min(2 * maxp, n);
n = _max(n, 1); n = _max(n, 1);
@ -4197,7 +4199,7 @@ static int sp_seduce(castorder * co)
loot += rng_int() % 2; loot += rng_int() % 2;
} }
if (loot > 0) { if (loot > 0) {
loot = (int)_min(loot, force * 5); loot = _min(loot, (int)(force * 5));
} }
} }
if (loot > 0) { if (loot > 0) {
@ -4314,7 +4316,7 @@ static int sp_headache(castorder * co)
} }
if (smax != NULL) { if (smax != NULL) {
/* wirkt auf maximal 10 Personen */ /* wirkt auf maximal 10 Personen */
int change = _min(10, target->number) * (rng_int() % 2 + 1) / target->number; unsigned int change = _min(10, target->number) * (rng_uint() % 2 + 1) / target->number;
reduce_skill(target, smax, change); reduce_skill(target, smax, change);
} }
set_order(&target->thisorder, NULL); set_order(&target->thisorder, NULL);
@ -4358,7 +4360,7 @@ static int sp_raisepeasants(castorder * co)
"error_nopeasants", "")); "error_nopeasants", ""));
return 0; return 0;
} }
bauern = (int)_min(rpeasants(r), power * 250); bauern = _min(rpeasants(r), (int)(power * 250));
rsetpeasants(r, rpeasants(r) - bauern); rsetpeasants(r, rpeasants(r) - bauern);
u2 = u2 =

3
src/util/rng.h
View File

@ -29,7 +29,8 @@ extern "C" {
long genrand_int31(void); long genrand_int31(void);
# define rng_init(seed) init_genrand(seed) # define rng_init(seed) init_genrand(seed)
# define rng_int genrand_int31 # define rng_int (int)genrand_int31
# define rng_uint (unsigned int)genrand_int32
# define rng_double genrand_real2 # define rng_double genrand_real2
# define RNG_RAND_MAX 0x7fffffff # define RNG_RAND_MAX 0x7fffffff
#else #else