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

Update for include/prototypes.h:1.90 src/lib/subs/attsub.c:1.28 src/lib/subs/shpsub.c:1.22 src/lib/update/human.c:1.16

Browse source
This commit is contained in:
Marc Olzheim 2005-10-04 15:02:16 +00:00
parent 1fa602b279
commit 51fed96269
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/scripts/nightly/patches/All/prng.patch
View file

@ -17,9 +17,9 @@ Index: empserver/include/damage.h
#endif /* _DAMAGE_H_ */ #endif /* _DAMAGE_H_ */
Index: empserver/include/prototypes.h Index: empserver/include/prototypes.h
--- empserver/include/prototypes.h 26 May 2005 01:58:48 -0000 1.84 --- empserver/include/prototypes.h 2 Oct 2005 16:30:43 -0000 1.90
+++ empserver/include/prototypes.h 28 May 2005 08:32:39 -0000 +++ empserver/include/prototypes.h 4 Oct 2005 14:57:35 -0000
@@ -392,6 +392,9 @@ @@ -390,6 +390,9 @@
#ifdef NOSTRDUP #ifdef NOSTRDUP
extern char *strdup(char *x); extern char *strdup(char *x);
#endif #endif
@ -180,9 +180,9 @@ Index: empserver/src/lib/gen/chance.c
/* /*
Index: empserver/src/lib/subs/attsub.c Index: empserver/src/lib/subs/attsub.c
--- empserver/src/lib/subs/attsub.c 31 Jul 2005 16:54:59 -0000 1.28 --- empserver/src/lib/subs/attsub.c 2 Oct 2005 14:35:18 -0000 1.30
+++ empserver/src/lib/subs/attsub.c 11 Aug 2005 09:14:25 -0000 +++ empserver/src/lib/subs/attsub.c 4 Oct 2005 14:57:37 -0000
@@ -1917,12 +1917,12 @@ @@ -1863,12 +1863,12 @@
* recalculate the odds every 8-50 casualties, not every cacsualty, * recalculate the odds every 8-50 casualties, not every cacsualty,
* since a single dead guy normally wouldn't cause a commander to * since a single dead guy normally wouldn't cause a commander to
* rethink his strategies, but 50 dead guys might. */ * rethink his strategies, but 50 dead guys might. */
@ -197,7 +197,7 @@ Index: empserver/src/lib/subs/attsub.c
while (!success && ototal) { while (!success && ototal) {
if (chance(odds)) { if (chance(odds)) {
pr("!"); pr("!");
@@ -1938,9 +1938,9 @@ @@ -1884,9 +1884,9 @@
if (((a_cas + d_cas) % 70) == 69) if (((a_cas + d_cas) % 70) == 69)
pr("\n"); pr("\n");
if (recalctime-- <= 0) { if (recalctime-- <= 0) {
@ -240,9 +240,9 @@ Index: empserver/src/lib/subs/landgun.c
if (shells < ammo && ammo != 0) if (shells < ammo && ammo != 0)
d *= (double)((double)shells / (double)ammo); d *= (double)((double)shells / (double)ammo);
Index: empserver/src/lib/subs/shpsub.c Index: empserver/src/lib/subs/shpsub.c
--- empserver/src/lib/subs/shpsub.c 21 Mar 2005 21:04:59 -0000 1.19 --- empserver/src/lib/subs/shpsub.c 3 Oct 2005 14:47:59 -0000 1.22
+++ empserver/src/lib/subs/shpsub.c 28 May 2005 08:32:40 -0000 +++ empserver/src/lib/subs/shpsub.c 4 Oct 2005 14:57:37 -0000
@@ -765,7 +765,7 @@ @@ -759,7 +759,7 @@
nreport(sp->shp_own, N_HIT_MINE, 0, 1); nreport(sp->shp_own, N_HIT_MINE, 0, 1);
@ -282,9 +282,16 @@ Index: empserver/src/lib/subs/takeover.c
n = 0; n = 0;
pp->pln_effic = n; pp->pln_effic = n;
Index: empserver/src/lib/update/human.c Index: empserver/src/lib/update/human.c
--- empserver/src/lib/update/human.c 16 Mar 2005 21:57:56 -0000 1.16 diff -u -r1.18 human.c
+++ empserver/src/lib/update/human.c 17 Mar 2005 10:01:15 -0000 --- empserver/src/lib/update/human.c 2 Oct 2005 19:10:16 -0000 1.18
@@ -119,7 +119,7 @@ +++ empserver/src/lib/update/human.c 4 Oct 2005 14:57:37 -0000
@@ -116,12 +116,12 @@
nreport(sp->sct_own, N_DIE_FAMINE, 0, 1);
}
sp->sct_work = 0;
- sp->sct_loyal += (random() % 8) + 2;
+ sp->sct_loyal += (emp_random() % 8) + 2;
}
sctwork = 0; sctwork = 0;
} else { } else {
if (sp->sct_work < 100) if (sp->sct_work < 100)
@ -293,13 +300,6 @@ Index: empserver/src/lib/update/human.c
if (sctwork > 100) if (sctwork > 100)
sctwork = 100; sctwork = 100;
if (!player->simulation) if (!player->simulation)
@@ -316,5 +316,5 @@
starvation(struct sctstr *sp)
{
sp->sct_work = 0;
- sp->sct_loyal += (random() % 8) + 2;
+ sp->sct_loyal += (emp_random() % 8) + 2;
}
Index: empserver/src/lib/update/plague.c Index: empserver/src/lib/update/plague.c
--- empserver/src/lib/update/plague.c 16 Mar 2005 21:57:57 -0000 1.15 --- empserver/src/lib/update/plague.c 16 Mar 2005 21:57:57 -0000 1.15
+++ empserver/src/lib/update/plague.c 17 Mar 2005 10:01:15 -0000 +++ empserver/src/lib/update/plague.c 17 Mar 2005 10:01:15 -0000