summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-21 17:39:53 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-21 17:39:53 (GMT)
commita716c59610f4ffe7263715f3aae8e20f44755c9b (patch)
tree9351b6d94f3cc554f162c041d950b94e7a595535 /src/elements
parentfcac7dbe09a2a55d268fa615888a1883d8468c99 (diff)
downloadpowder-a716c59610f4ffe7263715f3aae8e20f44755c9b.zip
powder-a716c59610f4ffe7263715f3aae8e20f44755c9b.tar.gz
Added some heat to TNT and IGNC
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/bang.c21
-rw-r--r--src/elements/ignt.c1
2 files changed, 11 insertions, 11 deletions
diff --git a/src/elements/bang.c b/src/elements/bang.c
index 54fea4f..a35e0fd 100644
--- a/src/elements/bang.c
+++ b/src/elements/bang.c
@@ -1,7 +1,7 @@
#include <element.h>
int update_BANG(UPDATE_FUNC_ARGS) {
- int r, rx, ry;
+ int r, rx, ry, nb;
if(parts[i].tmp==0)
{
for (rx=-1; rx<2; rx++)
@@ -33,33 +33,32 @@ int update_BANG(UPDATE_FUNC_ARGS) {
}
else if(parts[i].tmp>=3)
{
+ float otemp = parts[i].temp-275.13f;
//Explode!!
pv[y/CELL][x/CELL] += 0.5f;
if(!(rand()%3))
{
if(!(rand()%2))
{
- parts[i].tmp = 0;
create_part(i, x, y, PT_FIRE);
+ parts[i].temp = (MAX_TEMP/4)+otemp;
}
else
{
- parts[i].tmp = 0;
create_part(i, x, y, PT_SMKE);
+ parts[i].temp = (MAX_TEMP/4)+otemp;
}
}
else
{
if(!(rand()%15))
{
- int nb = create_part(i, x, y, PT_BOMB);
- if (nb!=-1) {
- parts[nb].tmp = 1;
- parts[nb].life = 50;
- //parts[nb].temp = MAX_TEMP;
- parts[nb].vx = rand()%20-10;
- parts[nb].vy = rand()%20-10;
- }
+ create_part(i, x, y, PT_BOMB);
+ parts[i].tmp = 1;
+ parts[i].life = 50;
+ parts[i].temp = (MAX_TEMP/3)+otemp;
+ parts[i].vx = rand()%20-10;
+ parts[i].vy = rand()%20-10;
}
else
{
diff --git a/src/elements/ignt.c b/src/elements/ignt.c
index 817e5f9..c11fccf 100644
--- a/src/elements/ignt.c
+++ b/src/elements/ignt.c
@@ -31,6 +31,7 @@ int update_IGNT(UPDATE_FUNC_ARGS) {
parts[nb].life = 30;
parts[nb].vx = rand()%20-10;
parts[nb].vy = rand()%20-10;
+ parts[nb].temp = 400.0f+parts[i].temp-273.15;
}
}
else