summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLieuwe <lieuwemo@gmail.com>2011-03-16 15:53:20 (GMT)
committer Lieuwe <lieuwemo@gmail.com>2011-03-16 15:53:20 (GMT)
commitb4a3b12d3d5b4d4c3493ad5d40b44034d4839c59 (patch)
treeef0691b5c49d9a34af4589ce060dae1db7c62bb1 /src
parenta7408b93c031a28856707d915d7860be2d289062 (diff)
downloadpowder-b4a3b12d3d5b4d4c3493ad5d40b44034d4839c59.zip
powder-b4a3b12d3d5b4d4c3493ad5d40b44034d4839c59.tar.gz
broke stuff
Diffstat (limited to 'src')
-rw-r--r--src/elements/watr.c9
-rw-r--r--src/graphics.c6
2 files changed, 13 insertions, 2 deletions
diff --git a/src/elements/watr.c b/src/elements/watr.c
index 7c7ef64..38ff7a0 100644
--- a/src/elements/watr.c
+++ b/src/elements/watr.c
@@ -9,11 +9,16 @@ int update_WATR(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
- if ((r&0xFF)==PT_SALT && 1>(rand()%250))
+ /*if ((r&0xFF)==PT_SALT && 1>(rand()%250))
{
part_change_type(i,x,y,PT_SLTW);
part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
- }
+ }*/
+ if ((r&0xFF)==PT_SALT)
+ {
+ parts[i].life = 100;
+ kill_part(r>>8);
+ }
if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (legacy_enable||parts[i].temp>(273.15f+12.0f)) && 1>(rand()%500))
{
part_change_type(i,x,y,PT_FIRE);
diff --git a/src/graphics.c b/src/graphics.c
index cea2ba7..e11eece 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -2913,6 +2913,12 @@ void draw_parts(pixel *vid)
}
}
#endif
+ if (parts[i].type==PT_WATR){
+ if(parts[i].life==0)
+ blendpixel(vid,x+nx,y+ny,0,255,0,255);
+ else
+ blendpixel(vid,x+nx,y+ny,255,0,0,255);
+ }
}
#ifdef OpenGL
glFlush ();