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

Fixeing GCC 

Das es nicht gut ist wenn max als int in der Funktion definiert ist und
gleichzeitig global als Funktion existiert ist OK, aber warum Travis
chance() nicht kennt verstehe ich nicht, das ist in der rand.h als
extern definiert, sollte also kein Problem sein. Jetzt halt mit
rng_int().
This commit is contained in:
CTD 2014-10-17 11:23:49 +02:00
parent 1c7075573b
commit 3d6c499431
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/economy.c
View File

@ -3215,7 +3215,7 @@ static void expandloot(region * r, request * lootorders)
free(oa); free(oa);
/* Lowering morale by 1 depending on the looted money (+20%) */ /* Lowering morale by 1 depending on the looted money (+20%) */
if (chance(looted / startmoney + 0.2)) { if (rng_int() % 100 < ((looted / startmoney) + 0.2)) {
int m = region_get_morale(r); int m = region_get_morale(r);
if (m) { if (m) {
/*Nur Moral -1, turns is not changed, so the first time nothing happens if the morale is good*/ /*Nur Moral -1, turns is not changed, so the first time nothing happens if the morale is good*/
@ -3371,7 +3371,7 @@ void loot_cmd(unit * u, struct order *ord, request ** lootorders)
} }
else { else {
/* For player start with 20 Silver +10 every 5 level of close combat skill*/ /* For player start with 20 Silver +10 every 5 level of close combat skill*/
int skbonus = (max(eff_skill(u, SK_MELEE, r), eff_skill(u, SK_SPEAR, r)) * 2 / 10) + 2; int skbonus = (_max(eff_skill(u, SK_MELEE, r), eff_skill(u, SK_SPEAR, r)) * 2 / 10) + 2;
u->wants = _min(n * skbonus * 10, max); u->wants = _min(n * skbonus * 10, max);
} }