X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b16ca49c1140568a351dcaa880ddecdc5d984f42;hb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;hp=cc5ecf0b1fd562d68b292d6d4b086887e2e3691a;hpb=5a5342a6ab48037839b783adc4f3304331834a8c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index cc5ecf0b..b16ca49c 100644 --- a/src/screens.c +++ b/src/screens.c @@ -129,14 +129,6 @@ static void PlaySound_Menu_Continue(int sound) PlaySoundLoop(sound); } -void DrawTextStatic(int x, int y, char *text, int font_nr) -{ - if (game_status == MAINMENU && gfx.menu_main_hide_static_text) - return; - - DrawText(x, y, text, font_nr); -} - void DrawHeadline() { int font1_xsize = getFontWidth(FONT_TITLE_1); @@ -144,8 +136,8 @@ void DrawHeadline() int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * font1_xsize) / 2; int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_xsize) / 2; - DrawTextStatic(x1, SY + 8, PROGRAM_TITLE_STRING, FONT_TITLE_1); - DrawTextStatic(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2); + DrawText(x1, SY + 8, PROGRAM_TITLE_STRING, FONT_TITLE_1); + DrawText(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2); } static void ToggleFullscreenIfNeeded() @@ -233,16 +225,16 @@ void DrawMainMenu() DrawHeadline(); - DrawTextStatic(SX + 32, SY + 2*32, name_text, FONT_MENU_1); + DrawText(SX + 32, SY + 2*32, name_text, FONT_MENU_1); DrawText(SX + 32 + name_width, SY + 2*32, setup.player_name, FONT_INPUT); - DrawTextStatic(SX + 32, SY + 3*32, "Level:", FONT_MENU_1); + DrawText(SX + 32, SY + 3*32, "Level:", FONT_MENU_1); DrawText(SX + 11 * 32, SY + 3*32, int2str(level_nr,3), FONT_VALUE_1); - DrawTextStatic(SX + 32, SY + 4*32, "Hall Of Fame", FONT_MENU_1); - DrawTextStatic(SX + 32, SY + 5*32, "Level Creator", FONT_MENU_1); - DrawTextStatic(SY + 32, SY + 6*32, "Info Screen", FONT_MENU_1); - DrawTextStatic(SX + 32, SY + 7*32, "Start Game", FONT_MENU_1); - DrawTextStatic(SX + 32, SY + 8*32, "Setup", FONT_MENU_1); - DrawTextStatic(SX + 32, SY + 9*32, "Quit", FONT_MENU_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); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); @@ -267,8 +259,7 @@ void DrawMainMenu() drawCursorXY(14, 1, IMG_MENU_BUTTON_RIGHT); #endif - DrawTextStatic(SX + 56, SY + 326, "A Game by Artsoft Entertainment", - FONT_TEXT_3); + DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2); FadeToFront(); InitAnimation(); @@ -590,12 +581,12 @@ static int OLD_helpscreen_action[] = 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, @@ -607,16 +598,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, @@ -647,7 +638,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, @@ -674,20 +665,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, @@ -699,9 +690,9 @@ static int helpscreen_action[] = IMG_EXPLOSION, 16, IMG_EMPTY_SPACE, 20, HA_NEXT, - IMG_DYNABOMB_NR, -1, HA_NEXT, + EL_DYNABOMB_INCREASE_NUMBER, -1, HA_NEXT, - IMG_DYNABOMB_SZ, -1, HA_NEXT, + EL_DYNABOMB_INCREASE_SIZE, -1, HA_NEXT, IMG_SPACESHIP_RIGHT, 16, IMG_SPACESHIP_UP, 16, @@ -760,7 +751,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, @@ -768,14 +759,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, @@ -1197,8 +1188,9 @@ void HandleHelpScreen(int button) else { FadeSounds(); - DrawMainMenu(); + game_status = MAINMENU; + DrawMainMenu(); } } else @@ -2298,7 +2290,7 @@ 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); + DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); if (setup.input[player_nr].use_joystick) {