diff options
| author | Simon <simon@hardwired.org.uk> | 2011-02-09 15:56:30 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-02-09 15:56:30 (GMT) |
| commit | 3de4d163a577def9f0c75e37bd80716e66a9ef0b (patch) | |
| tree | 6f7d27f79676406f085bb5d663a8aee5040e2c10 /src/elements | |
| parent | d5fe05d76079fda752fa3f6be26abdcd828d1f26 (diff) | |
| parent | 7c100f29c0f62733156238d391ec1cec6fc508ee (diff) | |
| download | powder-3de4d163a577def9f0c75e37bd80716e66a9ef0b.zip powder-3de4d163a577def9f0c75e37bd80716e66a9ef0b.tar.gz | |
Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/prti.c | 2 | ||||
| -rw-r--r-- | src/elements/prto.c | 2 | ||||
| -rw-r--r-- | src/elements/wifi.c | 2 |
3 files changed, 6 insertions, 0 deletions
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)) |