diff --git a/makelevels.sh b/makelevels.sh index 1a6ee78..bc01697 100755 --- a/makelevels.sh +++ b/makelevels.sh @@ -1,5 +1,5 @@ # convert temporary bmp screenshots into png for f in /tmp/level*.bmp ; do - convert $f -geometry 320x240 website/levels/`basename $f .bmp`.png + convert $f -geometry 160x120 website/levels/`basename $f .bmp`.png echo done $f done diff --git a/rc.c b/rc.c index d40c736..0f91b1c 100644 --- a/rc.c +++ b/rc.c @@ -988,7 +988,24 @@ int main (int argc, char **argv) { // screenshot if (autoshot && (levelcomplete == LV_INPROGRESS)) { - if (!shottaken) { + if (shottaken) { + sprite_t *s2, *nexts; + // go to next level + // kill all enemies and fruits + for (s2 = sprite; s2 ; s2 = nexts) { + nexts = s2->next; + if (isbullet(s2->id) || ismonster(s2->id) || isfruit(s2->id)) { + s2->dead = D_FINAL; + if (ismonster(s2->id)) { + if (s2->caughtby) { + uncatch(s2); + } + } + } + } + // call in cloud immediately + levelcomplete = LV_FINAL; + } else { savebmp(screen); shottaken = B_TRUE; } @@ -8790,6 +8807,7 @@ void usage(void) { printf(" -hs xx Set hiscore_server to http://xx.\n"); printf(" -hp xx Connect to hiscore_server on port xx.\n"); printf(" -js Joystick test mode.\n"); + printf(" -as Auto screenshot mode (dumps to /tmp/levelxx.bmp).\n"); printf("\n"); } @@ -10642,8 +10660,6 @@ if (cheat) { // call in cloud immediately levelcomplete = LV_FINAL; - - toggletimer = 50; } } diff --git a/website/levels/level_1_1.png b/website/levels/level_1_1.png index 2e2d2f9..4eb2c97 100644 Binary files a/website/levels/level_1_1.png 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 index 4003950..b3cb008 100644 Binary files a/website/levels/level_1_10.png 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 index 58e0020..6c9e672 100644 Binary files a/website/levels/level_1_11.png 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 index e2eb70a..cf655a9 100644 Binary files a/website/levels/level_1_12.png 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 index 96d0b2d..4cfc271 100644 Binary files a/website/levels/level_1_13.png 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 index 61ae3b9..ab4ecc0 100644 Binary files a/website/levels/level_1_14.png 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 index dc643cb..62f896a 100644 Binary files a/website/levels/level_1_15.png 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 index 360bb81..ccb17a5 100644 Binary files a/website/levels/level_1_16.png 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 index ca0279b..81ae5f1 100644 Binary files a/website/levels/level_1_17.png 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 index 703f89d..2c1d74c 100644 Binary files a/website/levels/level_1_18.png 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 index 6d58a88..b964532 100644 Binary files a/website/levels/level_1_19.png 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 index 889dc25..d90b42c 100644 Binary files a/website/levels/level_1_2.png 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 index 8797655..6a51476 100644 Binary files a/website/levels/level_1_20.png 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 index 41798f6..fd80f3c 100644 Binary files a/website/levels/level_1_3.png 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 index 567b360..ccd7def 100644 Binary files a/website/levels/level_1_4.png 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 index e8bb1fc..7292965 100644 Binary files a/website/levels/level_1_5.png 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 index 22bd39e..61043bc 100644 Binary files a/website/levels/level_1_6.png 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 index 540f9ca..7b6087d 100644 Binary files a/website/levels/level_1_7.png 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 index de37834..788ccd5 100644 Binary files a/website/levels/level_1_8.png 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 index 0171235..2c9245a 100644 Binary files a/website/levels/level_1_9.png 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 index a3f659c..24f83ba 100644 Binary files a/website/levels/level_2_1.png and b/website/levels/level_2_1.png differ diff --git a/website/levels/level_2_10.png b/website/levels/level_2_10.png index eee8a9f..2d5b804 100644 Binary files a/website/levels/level_2_10.png and b/website/levels/level_2_10.png differ diff --git a/website/levels/level_2_11.png b/website/levels/level_2_11.png index 9c9d310..1929f2e 100644 Binary files a/website/levels/level_2_11.png and b/website/levels/level_2_11.png differ diff --git a/website/levels/level_2_12.png b/website/levels/level_2_12.png index cc2bc9a..b06a51d 100644 Binary files a/website/levels/level_2_12.png and b/website/levels/level_2_12.png differ diff --git a/website/levels/level_2_13.png b/website/levels/level_2_13.png index 4996673..d4faf9a 100644 Binary files a/website/levels/level_2_13.png and b/website/levels/level_2_13.png differ diff --git a/website/levels/level_2_14.png b/website/levels/level_2_14.png index 800c7ba..aa54c14 100644 Binary files a/website/levels/level_2_14.png and b/website/levels/level_2_14.png differ diff --git a/website/levels/level_2_15.png b/website/levels/level_2_15.png index f53e072..bcce9cf 100644 Binary files a/website/levels/level_2_15.png and b/website/levels/level_2_15.png differ diff --git a/website/levels/level_2_16.png b/website/levels/level_2_16.png index 421bee7..80c6eef 100644 Binary files a/website/levels/level_2_16.png and b/website/levels/level_2_16.png differ diff --git a/website/levels/level_2_17.png b/website/levels/level_2_17.png index 62592dc..051b520 100644 Binary files a/website/levels/level_2_17.png and b/website/levels/level_2_17.png differ diff --git a/website/levels/level_2_18.png b/website/levels/level_2_18.png index 578e46c..0af35e0 100644 Binary files a/website/levels/level_2_18.png and b/website/levels/level_2_18.png differ diff --git a/website/levels/level_2_19.png b/website/levels/level_2_19.png index 16b9f5c..7a7f7dd 100644 Binary files a/website/levels/level_2_19.png and b/website/levels/level_2_19.png differ diff --git a/website/levels/level_2_2.png b/website/levels/level_2_2.png index 479c582..4ac05c2 100644 Binary files a/website/levels/level_2_2.png and b/website/levels/level_2_2.png differ diff --git a/website/levels/level_2_20.png b/website/levels/level_2_20.png index ca784b3..986c392 100644 Binary files a/website/levels/level_2_20.png and b/website/levels/level_2_20.png differ diff --git a/website/levels/level_2_3.png b/website/levels/level_2_3.png index a13f2cb..6060c02 100644 Binary files a/website/levels/level_2_3.png and b/website/levels/level_2_3.png differ diff --git a/website/levels/level_2_4.png b/website/levels/level_2_4.png index d955079..48984a6 100644 Binary files a/website/levels/level_2_4.png and b/website/levels/level_2_4.png differ diff --git a/website/levels/level_2_5.png b/website/levels/level_2_5.png index 1a3adf9..0ebac5a 100644 Binary files a/website/levels/level_2_5.png and b/website/levels/level_2_5.png differ diff --git a/website/levels/level_2_6.png b/website/levels/level_2_6.png index 261012f..b60ea30 100644 Binary files a/website/levels/level_2_6.png and b/website/levels/level_2_6.png differ diff --git a/website/levels/level_2_7.png b/website/levels/level_2_7.png index 405306e..5eda9c5 100644 Binary files a/website/levels/level_2_7.png and b/website/levels/level_2_7.png differ diff --git a/website/levels/level_2_8.png b/website/levels/level_2_8.png index f023fdb..704aa73 100644 Binary files a/website/levels/level_2_8.png and b/website/levels/level_2_8.png differ diff --git a/website/levels/level_2_9.png b/website/levels/level_2_9.png index 3f12ca1..e163a81 100644 Binary files a/website/levels/level_2_9.png and b/website/levels/level_2_9.png differ diff --git a/website/levels/level_3_1.png b/website/levels/level_3_1.png index f8d6506..4b044a7 100644 Binary files a/website/levels/level_3_1.png and b/website/levels/level_3_1.png differ diff --git a/website/levels/level_3_10.png b/website/levels/level_3_10.png index 0202905..9d90c99 100644 Binary files a/website/levels/level_3_10.png and b/website/levels/level_3_10.png differ diff --git a/website/levels/level_3_11.png b/website/levels/level_3_11.png index 3990dfa..f572d9b 100644 Binary files a/website/levels/level_3_11.png and b/website/levels/level_3_11.png differ diff --git a/website/levels/level_3_12.png b/website/levels/level_3_12.png index 9e0a78b..07e1a38 100644 Binary files a/website/levels/level_3_12.png and b/website/levels/level_3_12.png differ diff --git a/website/levels/level_3_13.png b/website/levels/level_3_13.png index 5678371..2254901 100644 Binary files a/website/levels/level_3_13.png and b/website/levels/level_3_13.png differ diff --git a/website/levels/level_3_14.png b/website/levels/level_3_14.png index 369fa60..00c9865 100644 Binary files a/website/levels/level_3_14.png and b/website/levels/level_3_14.png differ diff --git a/website/levels/level_3_15.png b/website/levels/level_3_15.png index 8bed9cd..3f28954 100644 Binary files a/website/levels/level_3_15.png and b/website/levels/level_3_15.png differ diff --git a/website/levels/level_3_16.png b/website/levels/level_3_16.png index 10f7837..703fb73 100644 Binary files a/website/levels/level_3_16.png and b/website/levels/level_3_16.png differ diff --git a/website/levels/level_3_17.png b/website/levels/level_3_17.png index 32f2692..a97391e 100644 Binary files a/website/levels/level_3_17.png and b/website/levels/level_3_17.png differ diff --git a/website/levels/level_3_18.png b/website/levels/level_3_18.png index 0b06e8d..455ce34 100644 Binary files a/website/levels/level_3_18.png and b/website/levels/level_3_18.png differ diff --git a/website/levels/level_3_19.png b/website/levels/level_3_19.png index 2cf8df9..a8d3e40 100644 Binary files a/website/levels/level_3_19.png and b/website/levels/level_3_19.png differ diff --git a/website/levels/level_3_2.png b/website/levels/level_3_2.png index e0df90d..ab35202 100644 Binary files a/website/levels/level_3_2.png and b/website/levels/level_3_2.png differ diff --git a/website/levels/level_3_20.png b/website/levels/level_3_20.png index cde3999..44e6c06 100644 Binary files a/website/levels/level_3_20.png and b/website/levels/level_3_20.png differ diff --git a/website/levels/level_3_3.png b/website/levels/level_3_3.png index 35a354e..904cb53 100644 Binary files a/website/levels/level_3_3.png and b/website/levels/level_3_3.png differ diff --git a/website/levels/level_3_4.png b/website/levels/level_3_4.png index 65d86c3..6518ea6 100644 Binary files a/website/levels/level_3_4.png and b/website/levels/level_3_4.png differ diff --git a/website/levels/level_3_5.png b/website/levels/level_3_5.png index ba49972..fd56813 100644 Binary files a/website/levels/level_3_5.png and b/website/levels/level_3_5.png differ diff --git a/website/levels/level_3_6.png b/website/levels/level_3_6.png index 064e5b5..48ce167 100644 Binary files a/website/levels/level_3_6.png and b/website/levels/level_3_6.png differ diff --git a/website/levels/level_3_7.png b/website/levels/level_3_7.png index 1d16e1d..56d026a 100644 Binary files a/website/levels/level_3_7.png and b/website/levels/level_3_7.png differ diff --git a/website/levels/level_3_8.png b/website/levels/level_3_8.png index d35c6ed..8f4ce5a 100644 Binary files a/website/levels/level_3_8.png and b/website/levels/level_3_8.png differ diff --git a/website/levels/level_3_9.png b/website/levels/level_3_9.png index 6111b44..b95a375 100644 Binary files a/website/levels/level_3_9.png and b/website/levels/level_3_9.png differ diff --git a/website/levels/level_4_1.png b/website/levels/level_4_1.png index 30d9baf..f2891c8 100644 Binary files a/website/levels/level_4_1.png and b/website/levels/level_4_1.png differ diff --git a/website/levels/level_4_2.png b/website/levels/level_4_2.png index af6f014..2979391 100644 Binary files a/website/levels/level_4_2.png and b/website/levels/level_4_2.png differ diff --git a/website/levels/level_4_3.png b/website/levels/level_4_3.png index b24e41b..5974f21 100644 Binary files a/website/levels/level_4_3.png and b/website/levels/level_4_3.png differ diff --git a/website/levels/level_4_4.png b/website/levels/level_4_4.png index 9142e63..f3e812d 100644 Binary files a/website/levels/level_4_4.png and b/website/levels/level_4_4.png differ diff --git a/website/levels/level_4_5.png b/website/levels/level_4_5.png index 1441d0b..ec52032 100644 Binary files a/website/levels/level_4_5.png and b/website/levels/level_4_5.png differ diff --git a/website/levels/level_4_6.png b/website/levels/level_4_6.png index 90baf9b..d31c072 100644 Binary files a/website/levels/level_4_6.png and b/website/levels/level_4_6.png differ diff --git a/website/levels/level_4_7.png b/website/levels/level_4_7.png index 6daddc3..094a885 100644 Binary files a/website/levels/level_4_7.png and b/website/levels/level_4_7.png differ