diff --git a/getsvnrev.sh b/getsvnrev.sh index cddd558..f28148b 100755 --- a/getsvnrev.sh +++ b/getsvnrev.sh @@ -1,3 +1,3 @@ #!/bin/sh #svn info | grep Revision | cut -d " " -f 2 -svnversion . | cut -d: -f2 +svnversion . | cut -d: -f2 | sed -e 's/M//g' diff --git a/rc.c b/rc.c index 6e16c4d..1387b28 100644 --- a/rc.c +++ b/rc.c @@ -906,6 +906,16 @@ int main (int argc, char **argv) { } } + // screenshot + if (keydown(0, SDLK_F12) || keydown(0, SDLK_w)) { + if (toggletimer == 0) { + /// + savebmp(screen); + toggletimer = 80; + } + } + + fpscount++; tick(); } // end main loop @@ -1206,8 +1216,10 @@ void nextlevel(void) { // now the player gets invincibility if (!inintro()) { - makeinvuln(player); - makeinvuln(player2); + if (!cheat) { + makeinvuln(player); + makeinvuln(player2); + } } // phone is cancelled on boss levels @@ -9930,28 +9942,23 @@ if (cheat) { if (toggletimer == 0) { // nextlevel(); sprite_t *s2, *nexts; - - // make the screen shake - player->powerup = PW_BOMB; - player->timer1 = BOMBSHAKETIME; - - // kill all monsters - playfx(FX_BOOM); - sprintf(tempm, "KABOOM!!"); - addoutlinetext(player->x,player->y - player->img->h/2, TEXTSIZE_BOMB, tempm,&red,&yellow,POINTSDELAY,TT_NORM); + // kill all enemies and fruits for (s2 = sprite; s2 ; s2 = nexts) { nexts = s2->next; - if (isbullet(s2->id)) { + if (isbullet(s2->id) || ismonster(s2->id) || isfruit(s2->id)) { s2->dead = D_FINAL; - } else if (ismonster(s2->id)) { - s2->willbecome = P_DIAMOND; - - if (s2->caughtby) { - uncatch(s2); + if (ismonster(s2->id)) { + if (s2->caughtby) { + uncatch(s2); + } } - die(s2); } } + // call in cloud immediately + levelcomplete = LV_FINAL; + + + toggletimer = 50; } } @@ -12364,3 +12371,11 @@ int isice(int id) { } return B_FALSE; } + +int savebmp(SDL_Surface *which) { + int rv; + char filename[BUFLEN]; + sprintf(filename, "/tmp/level_%d_%d.bmp",getcurworld(), getcurlevel()); + rv = SDL_SaveBMP(which, filename); + return rv; +} diff --git a/rc.h b/rc.h index f27b096..b3ae380 100644 --- a/rc.h +++ b/rc.h @@ -127,3 +127,4 @@ int getpnum(sprite_t *s); int isonplatform(double x, double y); int countbabies(sprite_t *s, int babytype); int isice(int id); +int savebmp(SDL_Surface *which); diff --git a/website/levels/level_1_1.png b/website/levels/level_1_1.png new file mode 100644 index 0000000..c2c6a68 Binary files /dev/null and b/website/levels/level_1_1.png differ diff --git a/website/levels/level_1_10.png b/website/levels/level_1_10.png new file mode 100644 index 0000000..19d9b0e Binary files /dev/null and b/website/levels/level_1_10.png differ diff --git a/website/levels/level_1_11.png b/website/levels/level_1_11.png new file mode 100644 index 0000000..dc4f5cb Binary files /dev/null and b/website/levels/level_1_11.png differ diff --git a/website/levels/level_1_12.png b/website/levels/level_1_12.png new file mode 100644 index 0000000..9c3372b Binary files /dev/null and b/website/levels/level_1_12.png differ diff --git a/website/levels/level_1_13.png b/website/levels/level_1_13.png new file mode 100644 index 0000000..ebc9200 Binary files /dev/null and b/website/levels/level_1_13.png differ diff --git a/website/levels/level_1_14.png b/website/levels/level_1_14.png new file mode 100644 index 0000000..462d5b4 Binary files /dev/null and b/website/levels/level_1_14.png differ diff --git a/website/levels/level_1_15.png b/website/levels/level_1_15.png new file mode 100644 index 0000000..b8c3627 Binary files /dev/null and b/website/levels/level_1_15.png differ diff --git a/website/levels/level_1_16.png b/website/levels/level_1_16.png new file mode 100644 index 0000000..9a4e4e2 Binary files /dev/null and b/website/levels/level_1_16.png differ diff --git a/website/levels/level_1_17.png b/website/levels/level_1_17.png new file mode 100644 index 0000000..dcb1c34 Binary files /dev/null and b/website/levels/level_1_17.png differ diff --git a/website/levels/level_1_18.png b/website/levels/level_1_18.png new file mode 100644 index 0000000..75f9cf7 Binary files /dev/null and b/website/levels/level_1_18.png differ diff --git a/website/levels/level_1_19.png b/website/levels/level_1_19.png new file mode 100644 index 0000000..e9a94f2 Binary files /dev/null and b/website/levels/level_1_19.png differ diff --git a/website/levels/level_1_2.png b/website/levels/level_1_2.png new file mode 100644 index 0000000..70d7821 Binary files /dev/null and b/website/levels/level_1_2.png differ diff --git a/website/levels/level_1_20.png b/website/levels/level_1_20.png new file mode 100644 index 0000000..cbef6d1 Binary files /dev/null and b/website/levels/level_1_20.png differ diff --git a/website/levels/level_1_3.png b/website/levels/level_1_3.png new file mode 100644 index 0000000..a317926 Binary files /dev/null and b/website/levels/level_1_3.png differ diff --git a/website/levels/level_1_4.png b/website/levels/level_1_4.png new file mode 100644 index 0000000..35f9448 Binary files /dev/null and b/website/levels/level_1_4.png differ diff --git a/website/levels/level_1_5.png b/website/levels/level_1_5.png new file mode 100644 index 0000000..b8808c9 Binary files /dev/null and b/website/levels/level_1_5.png differ diff --git a/website/levels/level_1_6.png b/website/levels/level_1_6.png new file mode 100644 index 0000000..3fb9056 Binary files /dev/null and b/website/levels/level_1_6.png differ diff --git a/website/levels/level_1_7.png b/website/levels/level_1_7.png new file mode 100644 index 0000000..2cbadad Binary files /dev/null and b/website/levels/level_1_7.png differ diff --git a/website/levels/level_1_8.png b/website/levels/level_1_8.png new file mode 100644 index 0000000..2b3e959 Binary files /dev/null and b/website/levels/level_1_8.png differ diff --git a/website/levels/level_1_9.png b/website/levels/level_1_9.png new file mode 100644 index 0000000..4e1a790 Binary files /dev/null and b/website/levels/level_1_9.png differ diff --git a/website/levels/level_2_1.png b/website/levels/level_2_1.png new file mode 100644 index 0000000..418b6f9 Binary files /dev/null and b/website/levels/level_2_1.png differ