diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-07 20:29:11 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-07 20:29:11 (GMT) |
| commit | b85c29dee4ae613a42b146d8967d11fb810f0313 (patch) | |
| tree | 7321a4478d0d1151c859522b29ff16c36198c983 | |
| parent | cb74b0bacfd4d726d2713f5e3e26f4f8548cb90f (diff) | |
| download | powder-b85c29dee4ae613a42b146d8967d11fb810f0313.zip powder-b85c29dee4ae613a42b146d8967d11fb810f0313.tar.gz | |
Prevent crashes in the event of ridiculous temperatures
| -rw-r--r-- | includes/powder.h | 9 | ||||
| -rw-r--r-- | src/elements/prti.c | 2 | ||||
| -rw-r--r-- | src/elements/prto.c | 2 | ||||
| -rw-r--r-- | src/elements/wifi.c | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/includes/powder.h b/includes/powder.h index 77e7ca1..6eb2a74 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -767,10 +767,11 @@ static int lolzrule[9][9] = {0,1,0,0,0,0,0,1,0}, {0,1,0,0,0,0,0,1,0}, }; -int portal[(int)(MAX_TEMP-73.15f)/100+2][8][80]; -float portaltemp[(int)(MAX_TEMP-73.15f)/100+2][8][80]; -int portalctype[(int)(MAX_TEMP-73.15f)/100+2][8][80]; -int wireless[(int)(MAX_TEMP-73.15f)/100+2][2]; +#define CHANNELS ((int)(MAX_TEMP-73.15f)/100+2) +int portal[CHANNELS][8][80]; +float portaltemp[CHANNELS][8][80]; +int portalctype[CHANNELS][8][80]; +int wireless[CHANNELS][2]; extern int isplayer; extern float player[27]; diff --git a/src/elements/prti.c b/src/elements/prti.c index b25f7a3..560ba8c 100644 --- a/src/elements/prti.c +++ b/src/elements/prti.c @@ -4,6 +4,8 @@ int update_PRTI(UPDATE_FUNC_ARGS) { int r, nnx, rx, ry; int count =0; parts[i].tmp = (int)((parts[i].temp-73.15f)/100+1); + if (parts[i].tmp>=CHANNELS) parts[i].tmp = CHANNELS-1; + else if (parts[i].tmp<0) parts[i].tmp = 0; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) diff --git a/src/elements/prto.c b/src/elements/prto.c index 2da6e00..8f743e7 100644 --- a/src/elements/prto.c +++ b/src/elements/prto.c @@ -4,6 +4,8 @@ int update_PRTO(UPDATE_FUNC_ARGS) { int r, nnx, rx, ry, np; int count = 0; parts[i].tmp = (int)((parts[i].temp-73.15f)/100+1); + if (parts[i].tmp>=CHANNELS) parts[i].tmp = CHANNELS-1; + else if (parts[i].tmp<0) parts[i].tmp = 0; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) diff --git a/src/elements/wifi.c b/src/elements/wifi.c index fc5ee7f..a511e4b 100644 --- a/src/elements/wifi.c +++ b/src/elements/wifi.c @@ -3,6 +3,8 @@ int update_WIFI(UPDATE_FUNC_ARGS) { int r, rx, ry; parts[i].tmp = (int)((parts[i].temp-73.15f)/100+1); + if (parts[i].tmp>=CHANNELS) parts[i].tmp = CHANNELS-1; + else if (parts[i].tmp<0) parts[i].tmp = 0; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) |