empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Encapsulate direct use of random(), srandom() in chance.c

Browse source 
Wrap roll0() around random(), and seed_prng() around srandom().  In
preparation of replacing the PRNG.
This commit is contained in:
Markus Armbruster 2012-08-14 19:23:12 +02:00
parent 8eb78a5a80
commit 866859e912
17 changed files with 87 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/subs/landgun.c
View file

@ -27,7 +27,7 @@
* landgun.c: Fire weapons
*
* Known contributors to this file:
* Markus Armbruster, 2006-2009
* Markus Armbruster, 2006-2012
*/
#include <config.h>
@ -48,7 +48,7 @@ fortgun(int effic, int guns)
double d;
double g = MIN(guns, 7);
d = (random() % 30 + 20.0) * (g / 7.0);
d = (roll0(30) + 20.0) * (g / 7.0);
d *= effic / 100.0;
return d;
}
@ -60,7 +60,7 @@ seagun(int effic, int guns)
d = 0.0;
while (guns--)
d += 10.0 + random() % 6;
d += 10.0 + roll0(6);
d *= effic * 0.01;
return d;
}
@ -72,7 +72,7 @@ landunitgun(int effic, int guns)
d = 0.0;
while (guns--)
d += 5.0 + random() % 6;
d += 5.0 + roll0(6);
d *= effic * 0.01;
return d;
}
@ -221,9 +221,9 @@ lnd_sabo(struct lndstr *lp, short item[])
lp->lnd_item[I_SHELL]--;
dam = fortgun(3 * lp->lnd_effic, 7);
if (item[I_SHELL] > 20)
dam += seagun(lp->lnd_effic, random() % (item[I_SHELL] / 10));
dam += seagun(lp->lnd_effic, roll0(item[I_SHELL] / 10));
if (item[I_PETROL] > 100)
dam += seagun(lp->lnd_effic, random() % (item[I_PETROL] / 50));
dam += seagun(lp->lnd_effic, roll0(item[I_PETROL] / 50));
return dam;
}