summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-01-05 19:42:31 (GMT)
committer Simon <simon@hardwired.org.uk>2011-01-05 19:42:31 (GMT)
commit71c5d53f7f65941834d15e91e7871bff32f3c821 (patch)
tree2c281ecd53414e148c8bfa9cfa47fcaba1bacf42 /src/main.c
parent5d7c0194f18d0fce25b0703b80829b0d0a719a96 (diff)
parentcf2489916c6055327f9def21ee70088f4023a384 (diff)
downloadpowder-71c5d53f7f65941834d15e91e7871bff32f3c821.zip
powder-71c5d53f7f65941834d15e91e7871bff32f3c821.tar.gz
Changes by cracker
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 1da7796..1343b96 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;
@@ -1621,7 +1632,7 @@ int main(int argc, char *argv[])
if(vs>=1)
vs = 0;
else
- vs = 2;
+ vs = 3;//every other frame
}
else
{
@@ -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));