summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-05 01:53:24 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-05 01:53:24 (GMT)
commitfd2f0c905be873dc3892086850744f18c068e4be (patch)
treee29177a26251fea3de26250b4ac932b1248aee58 /src/main.c
parent5a37f32ca12a48432af5be190245d2a377005e49 (diff)
downloadpowder-fd2f0c905be873dc3892086850744f18c068e4be.zip
powder-fd2f0c905be873dc3892086850744f18c068e4be.tar.gz
better liquid movement in radial gravity, '=' resets pressure, cannot draw stickman on clone anymore, 'w' does not work when stickman2 is out, use shift-w.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index c5fc100..f89eae1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1516,8 +1516,19 @@ int main(int argc, char *argv[])
else
GRID_MODE = (GRID_MODE+1)%10;
}
+ if(sdl_key=='=')
+ {
+ int nx, ny;
+ for(nx = 0;nx<XRES/CELL;nx++)
+ for(ny = 0;ny<YRES/CELL;ny++)
+ {
+ pv[ny][nx] = 0;
+ vx[ny][nx] = 0;
+ vy[ny][nx] = 0;
+ }
+ }
- if(sdl_key=='w') //Gravity, by Moach
+ if(sdl_key=='w' && (!isplayer2 || (sdl_mod & (KMOD_SHIFT)))) //Gravity, by Moach
{
++gravityMode; // cycle gravity mode
itc = 51;
@@ -2060,6 +2071,10 @@ int main(int argc, char *argv[])
svf_tags[0] = 0;
svf_description[0] = 0;
gravityMode = 1;
+ isplayer2 = 0;
+ isplayer = 0;
+ ISSPAWN1 = 0;
+ ISSPAWN2 = 0;
memset(fire_bg, 0, XRES*YRES*PIXELSIZE);
memset(fire_r, 0, sizeof(fire_r));