rnd-20030416-1-src
[rocksndiamonds.git] / src / screens.c
index 88f6987587652a447f619a432696ae5db4ef7a3c..06260aeb6d8d6248df51d04fe56b5f53dc3e3d6f 100644 (file)
@@ -71,6 +71,16 @@ static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 static int setup_mode = SETUP_MODE_MAIN;
 
+#if 0
+static int mSX = SX;
+static int mSY = SY;
+#else
+#define mSX (SX + (game_status == MAINMENU ? global.menu_draw_xoffset_MAIN : \
+                  global.menu_draw_xoffset))
+#define mSY (SY + (game_status == MAINMENU ? global.menu_draw_yoffset_MAIN : \
+                  global.menu_draw_yoffset))
+#endif
+
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
 #define NUM_SCROLLBAR_BITMAPS          2
 static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
@@ -96,8 +106,14 @@ static void drawCursorExt(int xpos, int ypos, int color, int graphic)
 
   ypos += MENU_SCREEN_START_YPOS;
 
+#if 1
+  DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
+  DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY,
+                        graphic, 0);
+#else
   DrawBackground(SX + xpos * 32, SY + ypos * 32, TILEX, TILEY);
   DrawGraphicThruMask(xpos, ypos, graphic, 0);
+#endif
 }
 
 static void initCursor(int ypos, int graphic)
@@ -131,10 +147,10 @@ static void PlaySound_Menu_Continue(int sound)
 
 void DrawHeadline()
 {
-  int font1_xsize = getFontWidth(FONT_TITLE_1);
-  int font2_xsize = getFontWidth(FONT_TITLE_2);
-  int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING)   * font1_xsize) / 2;
-  int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_xsize) / 2;
+  int font1_width = getFontWidth(FONT_TITLE_1);
+  int font2_width = getFontWidth(FONT_TITLE_2);
+  int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING)   * font1_width) / 2;
+  int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_width) / 2;
 
   DrawText(x1, SY + 8,  PROGRAM_TITLE_STRING,   FONT_TITLE_1);
   DrawText(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2);
@@ -168,9 +184,16 @@ void DrawMainMenu()
 {
   static LevelDirTree *leveldir_last_valid = NULL;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
-  int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
+  int font_width = getFontWidth(FONT_MENU_1);
+  int name_width = font_width * strlen("Name:");
+  int level_width = font_width * strlen("Level:");
   int i;
 
+#if 0
+  mSX = SX + global.menu_draw_xoffset;
+  mSY = SY + global.menu_draw_yoffset;
+#endif
+
   UnmapAllGadgets();
   FadeSounds();
 
@@ -225,39 +248,39 @@ void DrawMainMenu()
 
   DrawHeadline();
 
-  DrawText(SX + 32,    SY + 2*32, name_text, FONT_MENU_1);
-  DrawText(SX + 32 + name_width, SY + 2*32, setup.player_name, FONT_INPUT);
-  DrawText(SX + 32,    SY + 3*32, "Level:", FONT_MENU_1);
-  DrawText(SX + 11 * 32, SY + 3*32, int2str(level_nr,3), FONT_VALUE_1);
-  DrawText(SX + 32,    SY + 4*32, "Hall Of Fame", FONT_MENU_1);
-  DrawText(SX + 32,    SY + 5*32, "Level Creator", FONT_MENU_1);
-  DrawText(SY + 32,    SY + 6*32, "Info Screen", FONT_MENU_1);
-  DrawText(SX + 32,    SY + 7*32, "Start Game", FONT_MENU_1);
-  DrawText(SX + 32,    SY + 8*32, "Setup", FONT_MENU_1);
-  DrawText(SX + 32,    SY + 9*32, "Quit", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 2*32, name_text, FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 3*32, "Level:", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 4*32, "Hall Of Fame", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 5*32, "Level Creator", FONT_MENU_1);
+  DrawText(mSY + 32, mSY + 6*32, "Info Screen", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 7*32, "Start Game", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
+
+  DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT_1);
+  DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
+          FONT_VALUE_1);
 
   DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
 
-  DrawTextF(7*32 + 6, 3*32 + 9, FONT_TEXT_3, "%d-%d",
-           leveldir_current->first_level,
-           leveldir_current->last_level);
+  DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d",
+           leveldir_current->first_level, leveldir_current->last_level);
 
+  /*
   if (leveldir_current->readonly)
+  */
   {
-    DrawTextF(15*32 + 6, 3*32 + 9 - 7, FONT_TEXT_3, "READ");
-    DrawTextF(15*32 + 6, 3*32 + 9 + 7, FONT_TEXT_3, "ONLY");
+    DrawTextF(mSX + level_width + 9*32 - 2,
+             mSY + 3*32 + 1 - 7, FONT_TEXT_3, "READ");
+    DrawTextF(mSX + level_width + 9*32 - 2,
+             mSY + 3*32 + 1 + 7, FONT_TEXT_3, "ONLY");
   }
 
   for(i=0; i<8; i++)
     initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON));
 
-#if 0
-  DrawGraphic(10, 3, IMG_MENU_BUTTON_LEFT, 0);
-  DrawGraphic(14, 3, IMG_MENU_BUTTON_RIGHT, 0);
-#else
-  drawCursorXY(10, 1, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(14, 1, IMG_MENU_BUTTON_RIGHT);
-#endif
+  drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(level_width/32 + 8, 1, IMG_MENU_BUTTON_RIGHT);
 
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2);
 
@@ -354,7 +377,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     level_nr = new_level_nr;
 
-    DrawText(SX + 11 * 32, SY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
+    DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
 
     LoadLevel(level_nr);
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
@@ -468,125 +491,15 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 static long helpscreen_state;
 static int helpscreen_step[MAX_HELPSCREEN_ELS];
 static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-#if 0
-static int OLD_helpscreen_action[] =
-{
-  GFX_SPIELER1_DOWN,4,2,
-  GFX_SPIELER1_UP,4,2,
-  GFX_SPIELER1_LEFT,4,2,
-  GFX_SPIELER1_RIGHT,4,2,
-  GFX_SPIELER1_PUSH_LEFT,4,2,
-  GFX_SPIELER1_PUSH_RIGHT,4,2,                                 HA_NEXT,
-  GFX_ERDREICH,1,100,                                          HA_NEXT,
-  GFX_LEERRAUM,1,100,                                          HA_NEXT,
-  GFX_MORAST_LEER,1,100,                                       HA_NEXT,
-  GFX_BETON,1,100,                                             HA_NEXT,
-  GFX_MAUERWERK,1,100,                                         HA_NEXT,
-  GFX_MAUER_L1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_R1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_UP,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_DOWN,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,   HA_NEXT,
-  GFX_UNSICHTBAR,1,100,                                                HA_NEXT,
-  GFX_FELSBODEN,1,100,                                         HA_NEXT,
-  GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4,                       HA_NEXT,
-  GFX_EDELSTEIN,2,5,                                           HA_NEXT,
-  GFX_DIAMANT,2,5,                                             HA_NEXT,
-  GFX_EDELSTEIN_BD,2,5,                                                HA_NEXT,
-  GFX_EDELSTEIN_GELB,2,5, GFX_EDELSTEIN_ROT,2,5,
-  GFX_EDELSTEIN_LILA,2,5,                                      HA_NEXT,
-  GFX_FELSBROCKEN,4,5,                                         HA_NEXT,
-  GFX_BOMBE,1,50, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,                HA_NEXT,
-  GFX_KOKOSNUSS,1,50, GFX_CRACKINGNUT,3,1, GFX_EDELSTEIN,1,10, HA_NEXT,
-  GFX_ERZ_EDEL,1,50, GFX_EXPLOSION,8,1, GFX_EDELSTEIN,1,10,    HA_NEXT,
-  GFX_ERZ_DIAM,1,50, GFX_EXPLOSION,8,1, GFX_DIAMANT,1,10,      HA_NEXT,
-  GFX_ERZ_EDEL_BD,1,50, GFX_EXPLOSION,8,1,GFX_EDELSTEIN_BD,1,10,HA_NEXT,
-  GFX_ERZ_EDEL_GELB,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_GELB,1,10, GFX_ERZ_EDEL_ROT,1,50,
-  GFX_EXPLOSION,8,1, GFX_EDELSTEIN_ROT,1,10,
-  GFX_ERZ_EDEL_LILA,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_LILA,1,10,                                     HA_NEXT,
-  GFX_GEBLUBBER,4,4,                                           HA_NEXT,
-  GFX_SCHLUESSEL1,4,25,                                                HA_NEXT,
-  GFX_PFORTE1,4,25,                                            HA_NEXT,
-  GFX_PFORTE1X,4,25,                                           HA_NEXT,
-  GFX_DYNAMIT_AUS,1,100,                                       HA_NEXT,
-  GFX_DYNAMIT,7,6, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,       HA_NEXT,
-  GFX_DYNABOMB+0,4,3, GFX_DYNABOMB+3,1,3, GFX_DYNABOMB+2,1,3,
-  GFX_DYNABOMB+1,1,3, GFX_DYNABOMB+0,1,3, GFX_EXPLOSION,8,1,
-  GFX_LEERRAUM,1,10,                                           HA_NEXT,
-  GFX_DYNABOMB_NR,1,100,                                       HA_NEXT,
-  GFX_DYNABOMB_SZ,1,100,                                       HA_NEXT,
-  GFX_FLIEGER+4,1,3, GFX_FLIEGER+0,1,3, GFX_FLIEGER+4,1,3,
-  GFX_FLIEGER+5,1,3, GFX_FLIEGER+1,1,3, GFX_FLIEGER+5,1,3,
-  GFX_FLIEGER+6,1,3, GFX_FLIEGER+2,1,3, GFX_FLIEGER+6,1,3,
-  GFX_FLIEGER+7,1,3, GFX_FLIEGER+3,1,3, GFX_FLIEGER+7,1,3,     HA_NEXT,
-  GFX_KAEFER+4,1,1, GFX_KAEFER+0,1,1, GFX_KAEFER+4,1,1,
-  GFX_KAEFER+5,1,1, GFX_KAEFER+1,1,1, GFX_KAEFER+5,1,1,
-  GFX_KAEFER+6,1,1, GFX_KAEFER+2,1,1, GFX_KAEFER+6,1,1,
-  GFX_KAEFER+7,1,1, GFX_KAEFER+3,1,1, GFX_KAEFER+7,1,1,                HA_NEXT,
-  GFX_BUTTERFLY,2,2,                                           HA_NEXT,
-  GFX_FIREFLY,2,2,                                             HA_NEXT,
-  GFX_PACMAN+0,1,3, GFX_PACMAN+4,1,2, GFX_PACMAN+0,1,3,
-  GFX_PACMAN+1,1,3, GFX_PACMAN+5,1,2, GFX_PACMAN+1,1,3,
-  GFX_PACMAN+2,1,3, GFX_PACMAN+6,1,2, GFX_PACMAN+2,1,3,
-  GFX_PACMAN+3,1,3, GFX_PACMAN+7,1,2, GFX_PACMAN+3,1,3,                HA_NEXT,
-  GFX_MAMPFER+0,4,1, GFX_MAMPFER+3,1,1, GFX_MAMPFER+2,1,1,
-  GFX_MAMPFER+1,1,1, GFX_MAMPFER+0,1,1,                                HA_NEXT,
-  GFX_MAMPFER2+0,4,1, GFX_MAMPFER2+3,1,1, GFX_MAMPFER2+2,1,1,
-  GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1,                      HA_NEXT,
-  GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
-  GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1,                            HA_NEXT,
-  GFX_MOLE_DOWN,4,2,
-  GFX_MOLE_UP,4,2,
-  GFX_MOLE_LEFT,4,2,
-  GFX_MOLE_RIGHT,4,2,                                          HA_NEXT,
-  GFX_PINGUIN_DOWN,4,2,
-  GFX_PINGUIN_UP,4,2,
-  GFX_PINGUIN_LEFT,4,2,
-  GFX_PINGUIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_SCHWEIN_DOWN,4,2,
-  GFX_SCHWEIN_UP,4,2,
-  GFX_SCHWEIN_LEFT,4,2,
-  GFX_SCHWEIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_DRACHE_DOWN,4,2,
-  GFX_DRACHE_UP,4,2,
-  GFX_DRACHE_LEFT,4,2,
-  GFX_DRACHE_RIGHT,4,2,                                                HA_NEXT,
-  GFX_SONDE_START,8,1,                                         HA_NEXT,
-  GFX_ABLENK,4,1,                                              HA_NEXT,
-  GFX_BIRNE_AUS,1,25, GFX_BIRNE_EIN,1,25,                      HA_NEXT,
-  GFX_ZEIT_VOLL,1,25, GFX_ZEIT_LEER,1,25,                      HA_NEXT,
-  GFX_TROPFEN,1,25, GFX_AMOEBING,4,1, GFX_AMOEBE_LEBT,1,10,    HA_NEXT,
-  GFX_AMOEBE_TOT+2,2,50, GFX_AMOEBE_TOT,2,50,                  HA_NEXT,
-  GFX_AMOEBE_LEBT,4,40,                                                HA_NEXT,
-  GFX_AMOEBE_LEBT,1,10,        GFX_AMOEBING,4,2,                       HA_NEXT,
-  GFX_AMOEBE_LEBT,1,25, GFX_AMOEBE_TOT,1,25, GFX_EXPLOSION,8,1,
-  GFX_DIAMANT,1,10,                                            HA_NEXT,
-  GFX_LIFE,1,100,                                              HA_NEXT,
-  GFX_LIFE_ASYNC,1,100,                                                HA_NEXT,
-  GFX_MAGIC_WALL_OFF,4,2,                                      HA_NEXT,
-  GFX_MAGIC_WALL_BD_OFF,4,2,                                   HA_NEXT,
-  GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_SOKOBAN_OBJEKT,1,100,                                    HA_NEXT,
-  GFX_SOKOBAN_FELD_LEER,1,100,                                 HA_NEXT,
-  GFX_SOKOBAN_FELD_VOLL,1,100,                                 HA_NEXT,
-  GFX_SPEED_PILL,1,100,                                                HA_NEXT,
-  HA_END
-};
-#endif
 
 static int helpscreen_action[] =
 {
-  IMG_PLAYER1_MOVING_DOWN,             16,
-  IMG_PLAYER1_MOVING_UP,               16,
-  IMG_PLAYER1_MOVING_LEFT,             16,
-  IMG_PLAYER1_MOVING_RIGHT,            16,
-  IMG_PLAYER1_PUSHING_LEFT,            16,
-  IMG_PLAYER1_PUSHING_RIGHT,           16,                     HA_NEXT,
+  IMG_PLAYER_1_MOVING_DOWN,            16,
+  IMG_PLAYER_1_MOVING_UP,              16,
+  IMG_PLAYER_1_MOVING_LEFT,            16,
+  IMG_PLAYER_1_MOVING_RIGHT,           16,
+  IMG_PLAYER_1_PUSHING_LEFT,           16,
+  IMG_PLAYER_1_PUSHING_RIGHT,          16,                     HA_NEXT,
 
   IMG_SAND,                            -1,                     HA_NEXT,
 
@@ -598,16 +511,16 @@ static int helpscreen_action[] =
 
   IMG_WALL,                            -1,                     HA_NEXT,
 
-  IMG_WALL_GROWING_ACTIVE_LEFT,                20,
+  IMG_EXPANDABLE_WALL_GROWING_LEFT,    20,
   IMG_WALL,                            50,
   IMG_EMPTY_SPACE,                     20,
-  IMG_WALL_GROWING_ACTIVE_RIGHT,       20,
+  IMG_EXPANDABLE_WALL_GROWING_RIGHT,   20,
   IMG_WALL,                            50,
   IMG_EMPTY_SPACE,                     20,
-  IMG_WALL_GROWING_ACTIVE_UP,          20,
+  IMG_EXPANDABLE_WALL_GROWING_UP,      20,
   IMG_WALL,                            50,
   IMG_EMPTY_SPACE,                     20,
-  IMG_WALL_GROWING_ACTIVE_DOWN,                20,
+  IMG_EXPANDABLE_WALL_GROWING_DOWN,    20,
   IMG_WALL,                            50,
   IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
 
@@ -615,11 +528,7 @@ static int helpscreen_action[] =
 
   IMG_WALL_CRUMBLED,                   -1,                     HA_NEXT,
 
-  IMG_INFO_FONT_EM_1,                  160,
-  IMG_INFO_FONT_EM_2,                  160,
-  IMG_INFO_FONT_EM_3,                  160,
-  IMG_INFO_FONT_EM_4,                  160,
-  IMG_INFO_FONT_EM_5,                  40,                     HA_NEXT,
+  IMG_FONT_GAME_INFO,                  -1,                     HA_NEXT,
 
   IMG_EMERALD,                         -1,                     HA_NEXT,
 
@@ -638,7 +547,7 @@ static int helpscreen_action[] =
   IMG_EMPTY_SPACE,                     10,                     HA_NEXT,
 
   IMG_NUT,                             100,
-  IMG_NUT_CRACKING,                    6,
+  IMG_NUT_BREAKING,                    6,
   IMG_EMERALD,                         20,                     HA_NEXT,
 
   IMG_WALL_EMERALD,                    100,
@@ -665,20 +574,20 @@ static int helpscreen_action[] =
 
   IMG_ACID,                            -1,                     HA_NEXT,
 
-  IMG_KEY1,                            50,
-  IMG_KEY2,                            50,
-  IMG_KEY3,                            50,
-  IMG_KEY4,                            50,                     HA_NEXT,
+  IMG_KEY_1,                           50,
+  IMG_KEY_2,                           50,
+  IMG_KEY_3,                           50,
+  IMG_KEY_4,                           50,                     HA_NEXT,
 
-  IMG_GATE1,                           50,
-  IMG_GATE2,                           50,
-  IMG_GATE3,                           50,
-  IMG_GATE4,                           50,                     HA_NEXT,
+  IMG_GATE_1,                          50,
+  IMG_GATE_2,                          50,
+  IMG_GATE_3,                          50,
+  IMG_GATE_4,                          50,                     HA_NEXT,
 
-  IMG_GATE1_GRAY,                      50,
-  IMG_GATE2_GRAY,                      50,
-  IMG_GATE3_GRAY,                      50,
-  IMG_GATE4_GRAY,                      50,                     HA_NEXT,
+  IMG_GATE_1_GRAY,                     50,
+  IMG_GATE_2_GRAY,                     50,
+  IMG_GATE_3_GRAY,                     50,
+  IMG_GATE_4_GRAY,                     50,                     HA_NEXT,
 
   IMG_DYNAMITE,                                -1,                     HA_NEXT,
 
@@ -690,9 +599,11 @@ static int helpscreen_action[] =
   IMG_EXPLOSION,                       16,
   IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
 
-  IMG_DYNABOMB_NR,                     -1,                     HA_NEXT,
+  IMG_DYNABOMB_INCREASE_NUMBER,                -1,                     HA_NEXT,
+
+  IMG_DYNABOMB_INCREASE_SIZE,          -1,                     HA_NEXT,
 
-  IMG_DYNABOMB_SZ,                     -1,                     HA_NEXT,
+  IMG_DYNABOMB_INCREASE_POWER,         -1,                     HA_NEXT,
 
   IMG_SPACESHIP_RIGHT,                 16,
   IMG_SPACESHIP_UP,                    16,
@@ -751,7 +662,7 @@ static int helpscreen_action[] =
   IMG_TIME_ORB_EMPTY,                  50,                     HA_NEXT,
 
   IMG_AMOEBA_DROP,                     50,
-  IMG_AMOEBA_CREATING,                 6,
+  IMG_AMOEBA_GROWING,                  6,
   IMG_AMOEBA_WET,                      20,                     HA_NEXT,
 
   IMG_AMOEBA_DEAD,                     -1,                     HA_NEXT,
@@ -759,14 +670,14 @@ static int helpscreen_action[] =
   IMG_AMOEBA_WET,                      -1,                     HA_NEXT,
 
   IMG_AMOEBA_WET,                      100,
-  IMG_AMOEBA_CREATING,                 6,                      HA_NEXT,
+  IMG_AMOEBA_GROWING,                  6,                      HA_NEXT,
 
   IMG_AMOEBA_FULL,                     50,
   IMG_AMOEBA_DEAD,                     50,
   IMG_EXPLOSION,                       16,
   IMG_DIAMOND,                         20,                     HA_NEXT,
 
-  IMG_GAMEOFLIFE,                      -1,                     HA_NEXT,
+  IMG_GAME_OF_LIFE,                    -1,                     HA_NEXT,
 
   IMG_BIOMAZE,                         -1,                     HA_NEXT,
 
@@ -822,6 +733,7 @@ static char *helpscreen_eltext[][2] =
  {"Dyna Bomb: Explodes in 4 directions","with variable explosion size"},
  {"Dyna Bomb: Increases the number of",        "dyna bombs available at a time"},
  {"Dyna Bomb: Increases the size of",  "explosion of dyna bombs"},
+ {"Dyna Bomb: Increases the power of", "explosion of dyna bombs"},
  {"Spaceship: Moves at the left side", "of walls; don't touch it!"},
  {"Bug: Moves at the right side",      "of walls; don't touch it!"},
  {"Butterfly: Moves at the right side",        "of walls; don't touch it!"},
@@ -937,8 +849,8 @@ void OLD_DrawHelpScreenElAction(int start)
 void DrawHelpScreenElAction(int start)
 {
   int i = 0, j = 0;
-  int xstart = SX + 16;
-  int ystart = SY + 64 + 2 * 32;
+  int xstart = mSX + 16;
+  int ystart = mSY + 64 + 2 * 32;
   int ystep = TILEY + 4;
   int graphic;
   int frame_count;
@@ -1011,7 +923,7 @@ void DrawHelpScreenElAction(int start)
 void DrawHelpScreenElText(int start)
 {
   int i;
-  int xstart = SX + 56, ystart = SY + 65 + 2 * 32, ystep = TILEY + 4;
+  int xstart = mSX + 56, ystart = mSY + 65 + 2 * 32, ystep = TILEY + 4;
   int ybottom = SYSIZE - 20;
 
   SetMainBackgroundImage(IMG_BACKGROUND_INFO);
@@ -1141,9 +1053,9 @@ void DrawHelpScreen()
   InitAnimation();
 
 #if 0
-  PlaySoundLoop(SND_MENU_INFO_SCREEN);
+  PlaySoundLoop(SND_BACKGROUND_INFO);
 #else
-  PlaySound_Menu_Start(SND_MENU_INFO_SCREEN);
+  PlaySound_Menu_Start(SND_BACKGROUND_INFO);
 #endif
 }
 
@@ -1205,9 +1117,9 @@ void HandleHelpScreen(int button)
        must therefore periodically be reactivated with the current sound
        engine !!! */
 #if 0
-    PlaySoundLoop(SND_MENU_INFO_SCREEN);
+    PlaySoundLoop(SND_BACKGROUND_INFO);
 #else
-    PlaySound_Menu_Continue(SND_MENU_INFO_SCREEN);
+    PlaySound_Menu_Continue(SND_BACKGROUND_INFO);
 #endif
 
     DoAnimation();
@@ -1219,17 +1131,17 @@ void HandleHelpScreen(int button)
 void HandleTypeName(int newxpos, Key key)
 {
   static int xpos = 0, ypos = 2;
-  int font_width = getFontWidth(FONT_INPUT_ACTIVE);
+  int font_width = getFontWidth(FONT_INPUT_1_ACTIVE);
   int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
-  int startx = SX + 32 + name_width;
-  int starty = SY + ypos * 32;
+  int startx = mSX + 32 + name_width;
+  int starty = mSY + ypos * 32;
 
   if (newxpos)
   {
     xpos = newxpos;
 
-    DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
-    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
 
     return;
   }
@@ -1249,20 +1161,20 @@ void HandleTypeName(int newxpos, Key key)
     setup.player_name[xpos + 1] = 0;
     xpos++;
 
-    DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
-    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
   }
   else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
 
-    DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_1_ACTIVE);
   }
   else if (key == KSYM_Return && xpos > 0)
   {
-    DrawText(startx, starty, setup.player_name, FONT_INPUT);
-    DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1);
+    DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_1_ACTIVE);
 
     SaveSetup();
     game_status = MAINMENU;
@@ -1337,7 +1249,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     strncpy(buffer, node->name , max_buffer_len);
     buffer[max_buffer_len] = '\0';
 
-    DrawText(SX + 32, SY + ypos * 32, buffer, FONT_TEXT_1 + node->color);
+    DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color);
 
     if (node->parent_link)
       initCursor(i, IMG_MENU_BUTTON_LEFT);
@@ -1623,9 +1535,9 @@ void DrawHallOfFame(int highlight_position)
   HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
 
 #if 0
-  PlaySound(SND_MENU_HALL_OF_FAME);
+  PlaySound(SND_BACKGROUND_SCORES);
 #else
-  PlaySound_Menu_Start(SND_MENU_HALL_OF_FAME);
+  PlaySound_Menu_Start(SND_BACKGROUND_SCORES);
 #endif
 }
 
@@ -1636,20 +1548,20 @@ static void drawHallOfFameList(int first_entry, int highlight_position)
   SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
   ClearWindow();
 
-  DrawText(SX + 80, SY + 8, "Hall Of Fame", FONT_TITLE_1);
+  DrawText(mSX + 80, mSY + 8, "Hall Of Fame", FONT_TITLE_1);
   DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr);
 
   for(i=0; i<MAX_MENU_ENTRIES_ON_SCREEN; i++)
   {
     int entry = first_entry + i;
 
-    DrawText(SX, SY + 64 + i * 32, "..................................",
+    DrawText(mSX, mSY + 64 + i * 32, "..................................",
             (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
-    DrawText(SX, SY + 64 + i * 32, int2str(entry + 1, 3),
+    DrawText(mSX, mSY + 64 + i * 32, int2str(entry + 1, 3),
             (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
-    DrawText(SX + 64, SY + 64 + i * 32, highscore[entry].Name,
+    DrawText(mSX + 64, mSY + 64 + i * 32, highscore[entry].Name,
             (entry == highlight_position ? FONT_TEXT_3 : FONT_TEXT_1));
-    DrawText(SX + 14 * 32 + 16, SY + 64 + i * 32,
+    DrawText(mSX + 14 * 32 + 16, mSY + 64 + i * 32,
             int2str(highscore[entry].Score, 5),
             (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
   }
@@ -1700,7 +1612,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
   if (button_released)
   {
-    FadeSound(SND_MENU_HALL_OF_FAME);
+    FadeSound(SND_BACKGROUND_SCORES);
     game_status = MAINMENU;
     DrawMainMenu();
   }
@@ -1711,7 +1623,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   {
     DoAnimation();
 #if 1
-    PlaySound_Menu_Continue(SND_MENU_HALL_OF_FAME);
+    PlaySound_Menu_Continue(SND_BACKGROUND_SCORES);
 #endif
   }
 }
@@ -1987,7 +1899,7 @@ static void drawSetupValue(int pos)
     if (setup_info[pos].type & TYPE_QUERY)
     {
       value_string = "<press key>";
-      font_nr = FONT_INPUT_ACTIVE;
+      font_nr = FONT_INPUT_1_ACTIVE;
     }
   }
   else if (setup_info[pos].type & TYPE_STRING)
@@ -2004,9 +1916,9 @@ static void drawSetupValue(int pos)
           !*(boolean *)(setup_info[pos].value))
     font_nr = FONT_OPTION_OFF;
 
-  DrawText(SX + xpos * 32, SY + ypos * 32,
+  DrawText(mSX + xpos * 32, mSY + ypos * 32,
           (xpos == 3 ? "              " : "   "), font_nr);
-  DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_nr);
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
 }
 
 static void changeSetupValue(int pos)
@@ -2077,7 +1989,7 @@ static void DrawSetupScreen_Generic()
     title_string = "Setup Shortcuts";
   }
 
-  DrawText(SX + 16, SY + 16, title_string, FONT_TITLE_1);
+  DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1);
 
   num_setup_info = 0;
   for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
@@ -2096,7 +2008,7 @@ static void DrawSetupScreen_Generic()
     if (setup_info[i].type & TYPE_STRING)
       font_nr = FONT_MENU_2;
 
-    DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_nr);
+    DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr);
 
     if (setup_info[i].type & TYPE_ENTER_MENU)
       initCursor(i, IMG_MENU_BUTTON_RIGHT);
@@ -2216,7 +2128,7 @@ void DrawSetupScreen_Input()
 {
   ClearWindow();
 
-  DrawText(SX+16, SY+16, "Setup Input", FONT_TITLE_1);
+  DrawText(mSX+16, mSY+16, "Setup Input", FONT_TITLE_1);
 
   initCursor(0, IMG_MENU_BUTTON);
   initCursor(1, IMG_MENU_BUTTON);
@@ -2226,9 +2138,9 @@ void DrawSetupScreen_Input()
   drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT);
 
-  DrawText(SX+32, SY+2*32, "Player:", FONT_MENU_1);
-  DrawText(SX+32, SY+3*32, "Device:", FONT_MENU_1);
-  DrawText(SX+32, SY+15*32, "Back",   FONT_MENU_1);
+  DrawText(mSX+32, mSY+2*32, "Player:", FONT_MENU_1);
+  DrawText(mSX+32, mSY+3*32, "Device:", FONT_MENU_1);
+  DrawText(mSX+32, mSY+15*32, "Back",   FONT_MENU_1);
 
 #if 0
   DeactivateJoystickForCalibration();
@@ -2289,43 +2201,48 @@ static void drawPlayerSetupInputInfo(int player_nr)
 
   custom_key = setup.input[player_nr].key;
 
-  DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FONT_INPUT_ACTIVE);
-  DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0);
+  DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
+#if 1
+  DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+                        PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#else
+  DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#endif
 
   if (setup.input[player_nr].use_joystick)
   {
     char *device_name = setup.input[player_nr].joy.device_name;
 
-    DrawText(SX+8*32, SY+3*32,
+    DrawText(mSX+8*32, mSY+3*32,
             joystick_name[getJoystickNrFromDeviceName(device_name)],
             FONT_VALUE_1);
-    DrawText(SX+32, SY+4*32, "Calibrate", FONT_MENU_1);
+    DrawText(mSX+32, mSY+4*32, "Calibrate", FONT_MENU_1);
   }
   else
   {
-    DrawText(SX+8*32, SY+3*32, "Keyboard ", FONT_VALUE_1);
-    DrawText(SX+32,   SY+4*32, "Customize", FONT_MENU_1);
+    DrawText(mSX+8*32, mSY+3*32, "Keyboard ", FONT_VALUE_1);
+    DrawText(mSX+32,   mSY+4*32, "Customize", FONT_MENU_1);
   }
 
-  DrawText(SX+32, SY+5*32, "Actual Settings:", FONT_MENU_1);
+  DrawText(mSX+32, mSY+5*32, "Actual Settings:", FONT_MENU_1);
   drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
   drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
   drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
-  DrawText(SX+2*32, SY+6*32, ":", FONT_VALUE_OLD);
-  DrawText(SX+2*32, SY+7*32, ":", FONT_VALUE_OLD);
-  DrawText(SX+2*32, SY+8*32, ":", FONT_VALUE_OLD);
-  DrawText(SX+2*32, SY+9*32, ":", FONT_VALUE_OLD);
-  DrawText(SX+32, SY+10*32, "Snap Field:", FONT_VALUE_OLD);
-  DrawText(SX+32, SY+12*32, "Place Bomb:", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+6*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+7*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+8*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+9*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD);
+  DrawText(mSX+32, mSY+12*32, "Place Bomb:", FONT_VALUE_OLD);
 
   for (i=0; i<6; i++)
   {
     int ypos = 6 + i + (i > 3 ? i-3 : 0);
 
-    DrawText(SX + 3*32, SY + ypos*32,
+    DrawText(mSX + 3*32, mSY + ypos*32,
             "              ", FONT_VALUE_1);
-    DrawText(SX + 3*32, SY + ypos*32,
+    DrawText(mSX + 3*32, mSY + ypos*32,
             (setup.input[player_nr].use_joystick ?
              custom[i].text :
              getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
@@ -2477,17 +2394,17 @@ void CustomizeKeyboard(int player_nr)
   custom_key = setup.input[player_nr].key;
 
   ClearWindow();
-  DrawText(SX + 16, SY + 16, "Keyboard Input", FONT_TITLE_1);
+  DrawText(mSX + 16, mSY + 16, "Keyboard Input", FONT_TITLE_1);
 
   BackToFront();
   InitAnimation();
 
   step_nr = 0;
-  DrawText(SX, SY + (2+2*step_nr)*32,
-          customize_step[step_nr].text, FONT_INPUT_ACTIVE);
-  DrawText(SX, SY + (2+2*step_nr+1)*32,
-          "Key:", FONT_INPUT_ACTIVE);
-  DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
+  DrawText(mSX, mSY + (2+2*step_nr)*32,
+          customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
+  DrawText(mSX, mSY + (2+2*step_nr+1)*32,
+          "Key:", FONT_INPUT_1_ACTIVE);
+  DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
           getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
   while(!finished)
@@ -2527,32 +2444,32 @@ void CustomizeKeyboard(int player_nr)
 
            /* got new key binding */
            *customize_step[step_nr].key = key;
-           DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
+           DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
                     "             ", FONT_VALUE_1);
-           DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
+           DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
                     getKeyNameFromKey(key), FONT_VALUE_1);
            step_nr++;
 
            /* un-highlight last query */
-           DrawText(SX, SY+(2+2*(step_nr-1))*32,
+           DrawText(mSX, mSY+(2+2*(step_nr-1))*32,
                     customize_step[step_nr-1].text, FONT_MENU_1);
-           DrawText(SX, SY+(2+2*(step_nr-1)+1)*32,
+           DrawText(mSX, mSY+(2+2*(step_nr-1)+1)*32,
                     "Key:", FONT_MENU_1);
 
            /* press 'Enter' to leave */
            if (step_nr == 6)
            {
-             DrawText(SX + 16, SY + 15*32+16,
+             DrawText(mSX + 16, mSY + 15*32+16,
                       "Press Enter", FONT_TITLE_1);
              break;
            }
 
            /* query next key binding */
-           DrawText(SX, SY+(2+2*step_nr)*32,
-                    customize_step[step_nr].text, FONT_INPUT_ACTIVE);
-           DrawText(SX, SY+(2+2*step_nr+1)*32,
-                    "Key:", FONT_INPUT_ACTIVE);
-           DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32,
+           DrawText(mSX, mSY+(2+2*step_nr)*32,
+                    customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
+           DrawText(mSX, mSY+(2+2*step_nr+1)*32,
+                    "Key:", FONT_INPUT_1_ACTIVE);
+           DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
                     getKeyNameFromKey(*customize_step[step_nr].key),
                     FONT_VALUE_OLD);
          }
@@ -2615,13 +2532,13 @@ static boolean CalibrateJoystickMain(int player_nr)
     }
   }
 
-  DrawText(SX,      SY +  6 * 32, " ROTATE JOYSTICK ", FONT_TITLE_1);
-  DrawText(SX,      SY +  7 * 32, "IN ALL DIRECTIONS", FONT_TITLE_1);
-  DrawText(SX + 16, SY +  9 * 32, "  IF ALL BALLS  ",  FONT_TITLE_1);
-  DrawText(SX,      SY + 10 * 32, "   ARE YELLOW,   ", FONT_TITLE_1);
-  DrawText(SX,      SY + 11 * 32, " CENTER JOYSTICK ", FONT_TITLE_1);
-  DrawText(SX,      SY + 12 * 32, "       AND       ", FONT_TITLE_1);
-  DrawText(SX,      SY + 13 * 32, "PRESS ANY BUTTON!", FONT_TITLE_1);
+  DrawText(mSX,      mSY +  6 * 32, " ROTATE JOYSTICK ", FONT_TITLE_1);
+  DrawText(mSX,      mSY +  7 * 32, "IN ALL DIRECTIONS", FONT_TITLE_1);
+  DrawText(mSX + 16, mSY +  9 * 32, "  IF ALL BALLS  ",  FONT_TITLE_1);
+  DrawText(mSX,      mSY + 10 * 32, "   ARE YELLOW,   ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 11 * 32, " CENTER JOYSTICK ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 12 * 32, "       AND       ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 13 * 32, "PRESS ANY BUTTON!", FONT_TITLE_1);
 
   joy_value = Joystick(player_nr);
   last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
@@ -2772,8 +2689,8 @@ void CalibrateJoystick(int player_nr)
   {
     ClearWindow();
 
-    DrawText(SX + 16, SY + 6*32, "  JOYSTICK NOT  ",  FONT_TITLE_1);
-    DrawText(SX,      SY + 7*32, "    AVAILABLE    ", FONT_TITLE_1);
+    DrawText(mSX + 16, mSY + 6*32, "  JOYSTICK NOT  ",  FONT_TITLE_1);
+    DrawText(mSX,      mSY + 7*32, "    AVAILABLE    ", FONT_TITLE_1);
     BackToFront();
     Delay(2000);       /* show error message for two seconds */
   }