X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=cc5ecf0b1fd562d68b292d6d4b086887e2e3691a;hb=5a5342a6ab48037839b783adc4f3304331834a8c;hp=6e2948aae75a0fb85ca75e62a408d2c7acee2494;hpb=a04bb286a6863151907673d6ba7ebe58a0a69b4f;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 6e2948aa..cc5ecf0b 100644 --- a/src/screens.c +++ b/src/screens.c @@ -27,16 +27,17 @@ /* screens in the setup menu */ #define SETUP_MODE_MAIN 0 #define SETUP_MODE_GAME 1 -#define SETUP_MODE_INPUT 2 -#define SETUP_MODE_SHORTCUT 3 -#define SETUP_MODE_GRAPHICS 4 -#define SETUP_MODE_SOUND 5 -#define SETUP_MODE_ARTWORK 6 -#define SETUP_MODE_CHOOSE_GRAPHICS 7 -#define SETUP_MODE_CHOOSE_SOUNDS 8 -#define SETUP_MODE_CHOOSE_MUSIC 9 - -#define MAX_SETUP_MODES 10 +#define SETUP_MODE_EDITOR 2 +#define SETUP_MODE_INPUT 3 +#define SETUP_MODE_SHORTCUT 4 +#define SETUP_MODE_GRAPHICS 5 +#define SETUP_MODE_SOUND 6 +#define SETUP_MODE_ARTWORK 7 +#define SETUP_MODE_CHOOSE_GRAPHICS 8 +#define SETUP_MODE_CHOOSE_SOUNDS 9 +#define SETUP_MODE_CHOOSE_MUSIC 10 + +#define MAX_SETUP_MODES 11 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -70,39 +71,81 @@ static void HandleChooseTree(int, int, int, int, int, TreeInfo **); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; static int setup_mode = SETUP_MODE_MAIN; -static void drawCursorExt(int pos, int color, int graphic) +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) +#define NUM_SCROLLBAR_BITMAPS 2 +static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS]; +#endif + + +static void drawCursorExt(int xpos, int ypos, int color, int graphic) { static int cursor_array[SCR_FIELDY]; - if (graphic) - cursor_array[pos] = graphic; - - graphic = cursor_array[pos]; + if (xpos == 0) + { + if (graphic != 0) + cursor_array[ypos] = graphic; + else + graphic = cursor_array[ypos]; + } if (color == FC_RED) - graphic = (graphic == IMG_ARROW_BLUE_LEFT ? IMG_ARROW_RED_LEFT : - graphic == IMG_ARROW_BLUE_RIGHT ? IMG_ARROW_RED_RIGHT : - IMG_BALL_RED); + graphic = (graphic == IMG_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE : + graphic == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE: + IMG_MENU_BUTTON_ACTIVE); + + ypos += MENU_SCREEN_START_YPOS; + + DrawBackground(SX + xpos * 32, SY + ypos * 32, TILEX, TILEY); + DrawGraphicThruMask(xpos, ypos, graphic, 0); +} + +static void initCursor(int ypos, int graphic) +{ + drawCursorExt(0, ypos, FC_BLUE, graphic); +} + +static void drawCursor(int ypos, int color) +{ + drawCursorExt(0, ypos, color, 0); +} - DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic, 0); +static void drawCursorXY(int xpos, int ypos, int graphic) +{ + drawCursorExt(xpos, ypos, -1, graphic); } -static void initCursor(int pos, int graphic) +static void PlaySound_Menu_Start(int sound) { - drawCursorExt(pos, FC_BLUE, graphic); + if (sound_info[sound].loop) + PlaySoundLoop(sound); + else + PlaySound(sound); } -static void drawCursor(int pos, int color) +static void PlaySound_Menu_Continue(int sound) { - drawCursorExt(pos, color, 0); + if (sound_info[sound].loop) + 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 x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2; + 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; - DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW); - DrawTextFCentered(46, FC_RED, WINDOW_SUBTITLE_STRING); + DrawTextStatic(x1, SY + 8, PROGRAM_TITLE_STRING, FONT_TITLE_1); + DrawTextStatic(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2); } static void ToggleFullscreenIfNeeded() @@ -118,7 +161,7 @@ static void ToggleFullscreenIfNeeded() setup.fullscreen = video.fullscreen_enabled; /* redraw background to newly created backbuffer */ - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); /* restore old door content */ @@ -132,14 +175,19 @@ static void ToggleFullscreenIfNeeded() void DrawMainMenu() { static LevelDirTree *leveldir_last_valid = NULL; - int i; char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); + int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:"); + int i; UnmapAllGadgets(); FadeSounds(); + KeyboardAutoRepeatOn(); ActivateJoystick(); + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + audio.sound_deactivated = FALSE; /* needed if last screen was the playing screen, invoked from level editor */ @@ -180,49 +228,47 @@ void DrawMainMenu() GetPlayerConfig(); LoadLevel(level_nr); + SetMainBackgroundImage(IMG_BACKGROUND_MAIN); ClearWindow(); + DrawHeadline(); - DrawText(SX + 32, SY + 2*32, name_text, FS_BIG, FC_GREEN); - DrawText(SX + 6*32, SY + 2*32, setup.player_name, FS_BIG, FC_RED); - DrawText(SX + 32, SY + 3*32, "Level:", FS_BIG, FC_GREEN); - DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG, - (leveldir_current->readonly ? FC_RED : FC_YELLOW)); - DrawText(SX + 32, SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN); - DrawText(SX + 32, SY + 5*32, "Level Creator", FS_BIG, FC_GREEN); - DrawText(SY + 32, SY + 6*32, "Info Screen", FS_BIG, FC_GREEN); - DrawText(SX + 32, SY + 7*32, "Start Game", FS_BIG, FC_GREEN); - DrawText(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN); - DrawText(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN); + + DrawTextStatic(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 + 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); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); - DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d", + DrawTextF(7*32 + 6, 3*32 + 9, 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, FC_RED, "READ"); - DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY"); + DrawTextF(15*32 + 6, 3*32 + 9 - 7, FONT_TEXT_3, "READ"); + DrawTextF(15*32 + 6, 3*32 + 9 + 7, FONT_TEXT_3, "ONLY"); } for(i=0; i<8; i++) - initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE)); - - DrawGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0); - DrawGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0); + initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON)); - DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", - FS_SMALL, FC_RED); - - if (leveldir_current->name) - { - int len = strlen(leveldir_current->name); - int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2; - int lypos = SY + 352; +#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 - DrawText(lxpos, lypos, leveldir_current->name, FS_SMALL, FC_SPECIAL2); - } + DrawTextStatic(SX + 56, SY + 326, "A Game by Artsoft Entertainment", + FONT_TEXT_3); FadeToFront(); InitAnimation(); @@ -301,7 +347,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) static unsigned long level_delay = 0; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int new_level_nr, old_level_nr = level_nr; - int font_color = (leveldir_current->readonly ? FC_RED : FC_YELLOW); new_level_nr = level_nr + (x == 10 ? -step : +step); if (new_level_nr < leveldir_current->first_level) @@ -318,10 +363,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) level_nr = new_level_nr; - DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32, - int2str(level_nr, 3), FS_BIG, font_color); - DrawTextExt(window, SX + 11 * 32, SY + 3 * 32, - int2str(level_nr, 3), FS_BIG, font_color); + DrawText(SX + 11 * 32, SY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); LoadLevel(level_nr); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); @@ -435,8 +477,8 @@ 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]; -static int helpscreen_delay[MAX_HELPSCREEN_ELS]; -static int helpscreen_action[] = +#if 0 +static int OLD_helpscreen_action[] = { GFX_SPIELER1_DOWN,4,2, GFX_SPIELER1_UP,4,2, @@ -544,6 +586,219 @@ static int helpscreen_action[] = 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_SAND, -1, HA_NEXT, + + IMG_EMPTY_SPACE, -1, HA_NEXT, + + IMG_QUICKSAND_EMPTY, -1, HA_NEXT, + + IMG_STEELWALL, -1, HA_NEXT, + + IMG_WALL, -1, HA_NEXT, + + IMG_WALL_GROWING_ACTIVE_LEFT, 20, + IMG_WALL, 50, + IMG_EMPTY_SPACE, 20, + IMG_WALL_GROWING_ACTIVE_RIGHT, 20, + IMG_WALL, 50, + IMG_EMPTY_SPACE, 20, + IMG_WALL_GROWING_ACTIVE_UP, 20, + IMG_WALL, 50, + IMG_EMPTY_SPACE, 20, + IMG_WALL_GROWING_ACTIVE_DOWN, 20, + IMG_WALL, 50, + IMG_EMPTY_SPACE, 20, HA_NEXT, + + IMG_INVISIBLE_WALL, -1, HA_NEXT, + + 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_EMERALD, -1, HA_NEXT, + + IMG_DIAMOND, -1, HA_NEXT, + + IMG_BD_DIAMOND, -1, HA_NEXT, + + IMG_EMERALD_YELLOW, 50, + IMG_EMERALD_RED, 50, + IMG_EMERALD_PURPLE, 50, HA_NEXT, + + IMG_BD_ROCK, -1, HA_NEXT, + + IMG_BOMB, 100, + IMG_EXPLOSION, 16, + IMG_EMPTY_SPACE, 10, HA_NEXT, + + IMG_NUT, 100, + IMG_NUT_CRACKING, 6, + IMG_EMERALD, 20, HA_NEXT, + + IMG_WALL_EMERALD, 100, + IMG_EXPLOSION, 16, + IMG_EMERALD, 20, HA_NEXT, + + IMG_WALL_DIAMOND, 100, + IMG_EXPLOSION, 16, + IMG_DIAMOND, 20, HA_NEXT, + + IMG_WALL_BD_DIAMOND, 100, + IMG_EXPLOSION, 16, + IMG_BD_DIAMOND, 20, HA_NEXT, + + IMG_WALL_EMERALD_YELLOW, 100, + IMG_EXPLOSION, 16, + IMG_EMERALD_YELLOW, 20, + IMG_WALL_EMERALD_RED, 100, + IMG_EXPLOSION, 16, + IMG_EMERALD_RED, 20, + IMG_WALL_EMERALD_PURPLE, 100, + IMG_EXPLOSION, 16, + IMG_EMERALD_PURPLE, 20, HA_NEXT, + + IMG_ACID, -1, HA_NEXT, + + IMG_KEY1, 50, + IMG_KEY2, 50, + IMG_KEY3, 50, + IMG_KEY4, 50, HA_NEXT, + + IMG_GATE1, 50, + IMG_GATE2, 50, + IMG_GATE3, 50, + IMG_GATE4, 50, HA_NEXT, + + IMG_GATE1_GRAY, 50, + IMG_GATE2_GRAY, 50, + IMG_GATE3_GRAY, 50, + IMG_GATE4_GRAY, 50, HA_NEXT, + + IMG_DYNAMITE, -1, HA_NEXT, + + IMG_DYNAMITE_ACTIVE, 96, + IMG_EXPLOSION, 16, + IMG_EMPTY_SPACE, 20, HA_NEXT, + + IMG_DYNABOMB_ACTIVE, 100, + IMG_EXPLOSION, 16, + IMG_EMPTY_SPACE, 20, HA_NEXT, + + IMG_DYNABOMB_NR, -1, HA_NEXT, + + IMG_DYNABOMB_SZ, -1, HA_NEXT, + + IMG_SPACESHIP_RIGHT, 16, + IMG_SPACESHIP_UP, 16, + IMG_SPACESHIP_LEFT, 16, + IMG_SPACESHIP_DOWN, 16, HA_NEXT, + + IMG_BUG_RIGHT, 16, + IMG_BUG_UP, 16, + IMG_BUG_LEFT, 16, + IMG_BUG_DOWN, 16, HA_NEXT, + + IMG_BD_BUTTERFLY, -1, HA_NEXT, + + IMG_BD_FIREFLY, -1, HA_NEXT, + + IMG_PACMAN_RIGHT, 16, + IMG_PACMAN_UP, 16, + IMG_PACMAN_LEFT, 16, + IMG_PACMAN_DOWN, 16, HA_NEXT, + + IMG_YAMYAM, -1, HA_NEXT, + + IMG_DARK_YAMYAM, -1, HA_NEXT, + + IMG_ROBOT, -1, HA_NEXT, + + IMG_MOLE_MOVING_RIGHT, 16, + IMG_MOLE_MOVING_UP, 16, + IMG_MOLE_MOVING_LEFT, 16, + IMG_MOLE_MOVING_DOWN, 16, HA_NEXT, + + IMG_PENGUIN_MOVING_RIGHT, 16, + IMG_PENGUIN_MOVING_UP, 16, + IMG_PENGUIN_MOVING_LEFT, 16, + IMG_PENGUIN_MOVING_DOWN, 16, HA_NEXT, + + IMG_PIG_MOVING_RIGHT, 16, + IMG_PIG_MOVING_UP, 16, + IMG_PIG_MOVING_LEFT, 16, + IMG_PIG_MOVING_DOWN, 16, HA_NEXT, + + IMG_DRAGON_MOVING_RIGHT, 16, + IMG_DRAGON_MOVING_UP, 16, + IMG_DRAGON_MOVING_LEFT, 16, + IMG_DRAGON_MOVING_DOWN, 16, HA_NEXT, + + IMG_SATELLITE, -1, HA_NEXT, + + IMG_ROBOT_WHEEL, 50, + IMG_ROBOT_WHEEL_ACTIVE, 100, HA_NEXT, + + IMG_LAMP, 50, + IMG_LAMP_ACTIVE, 50, HA_NEXT, + + IMG_TIME_ORB_FULL, 50, + IMG_TIME_ORB_EMPTY, 50, HA_NEXT, + + IMG_AMOEBA_DROP, 50, + IMG_AMOEBA_CREATING, 6, + IMG_AMOEBA_WET, 20, HA_NEXT, + + IMG_AMOEBA_DEAD, -1, HA_NEXT, + + IMG_AMOEBA_WET, -1, HA_NEXT, + + IMG_AMOEBA_WET, 100, + IMG_AMOEBA_CREATING, 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_BIOMAZE, -1, HA_NEXT, + + IMG_MAGIC_WALL_ACTIVE, -1, HA_NEXT, + + IMG_BD_MAGIC_WALL_ACTIVE, -1, HA_NEXT, + + IMG_EXIT_CLOSED, 200, + IMG_EXIT_OPENING, 16, + IMG_EXIT_OPEN, 100, HA_NEXT, + + IMG_EXIT_OPEN, -1, HA_NEXT, + + IMG_SOKOBAN_OBJECT, -1, HA_NEXT, + + IMG_SOKOBAN_FIELD_EMPTY, -1, HA_NEXT, + + IMG_SOKOBAN_FIELD_FULL, -1, HA_NEXT, + + IMG_SPEED_PILL, -1, HA_NEXT, + + HA_END +}; static char *helpscreen_eltext[][2] = { {"THE HERO:", "(Is _this_ guy good old Rockford?)"}, @@ -608,7 +863,7 @@ static char *helpscreen_eltext[][2] = {"Sokoban element: Field with object", "which can be pushed away"}, {"Speed pill: Lets the player run", "twice as fast as normally"}, }; -static int num_helpscreen_els = sizeof(helpscreen_eltext)/(2*sizeof(char *)); +static int num_helpscreen_els = sizeof(helpscreen_eltext) / (2*sizeof(char *)); static char *helpscreen_music[][3] = { @@ -623,7 +878,8 @@ static char *helpscreen_music[][3] = static int num_helpscreen_music = 7; static int helpscreen_musicpos; -void DrawHelpScreenElAction(int start) +#if 0 +void OLD_DrawHelpScreenElAction(int start) { int i = 0, j = 0; int frame, graphic; @@ -685,6 +941,81 @@ void DrawHelpScreenElAction(int start) MarkTileDirty(1,i); } } +#endif + +void DrawHelpScreenElAction(int start) +{ + int i = 0, j = 0; + int xstart = SX + 16; + int ystart = SY + 64 + 2 * 32; + int ystep = TILEY + 4; + int graphic; + int frame_count; + int sync_frame; + int frame; + + while (helpscreen_action[j] != HA_END) + { + if (i >= start + MAX_HELPSCREEN_ELS || i >= num_helpscreen_els) + break; + else if (i < start) + { + while (helpscreen_action[j] != HA_NEXT) + j++; + + j++; + i++; + + continue; + } + + j += 2 * helpscreen_step[i-start]; + graphic = helpscreen_action[j++]; + frame_count = helpscreen_action[j++]; + if (frame_count == -1) + frame_count = 1000000; + + if (helpscreen_frame[i-start] == 0) + { + sync_frame = 0; + helpscreen_frame[i-start] = frame_count - 1; + } + else + { + sync_frame = frame_count - helpscreen_frame[i-start]; + helpscreen_frame[i-start]--; + } + + if (helpscreen_action[j] == HA_NEXT) + { + if (!helpscreen_frame[i-start]) + helpscreen_step[i-start] = 0; + } + else + { + if (!helpscreen_frame[i-start]) + helpscreen_step[i-start]++; + while(helpscreen_action[j] != HA_NEXT) + j++; + } + j++; + + frame = getGraphicAnimationFrame(graphic, sync_frame); + + DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep, + graphic, frame); + + i++; + } + + for(i=2; i<16; i++) + { + MarkTileDirty(0, i); + MarkTileDirty(1, i); + } + + FrameCounter++; +} void DrawHelpScreenElText(int start) { @@ -692,21 +1023,23 @@ void DrawHelpScreenElText(int start) int xstart = SX + 56, ystart = SY + 65 + 2 * 32, ystep = TILEY + 4; int ybottom = SYSIZE - 20; + SetMainBackgroundImage(IMG_BACKGROUND_INFO); ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, "The game elements:"); + DrawTextFCentered(100, FONT_TEXT_1, "The game elements:"); for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++) { DrawText(xstart, ystart + (i - start) * ystep + (*helpscreen_eltext[i][1] ? 0 : 8), - helpscreen_eltext[i][0], FS_SMALL, FC_YELLOW); + helpscreen_eltext[i][0], FONT_TEXT_2); DrawText(xstart, ystart + (i - start) * ystep + 16, - helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW); + helpscreen_eltext[i][1], FONT_TEXT_2); } - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT_TEXT_4, + "Press any key or button for next page"); } void DrawHelpScreenMusicText(int num) @@ -718,22 +1051,20 @@ void DrawHelpScreenMusicText(int num) ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, "The game background music loops:"); + DrawTextFCentered(100, FONT_TEXT_1, "The game background music loops:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, - "Excerpt from"); - DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][0]); - DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, - "by"); - DrawTextFCentered(ystart + 3 * ystep, FC_RED, + DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "Excerpt from"); + DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, + "\"%s\"", helpscreen_music[num][0]); + DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "by"); + DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "%s", helpscreen_music[num][1]); - DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW, - "from the album"); - DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][2]); + DrawTextFCentered(ystart + 4 * ystep, FONT_TEXT_2, "from the album"); + DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_3, + "\"%s\"", helpscreen_music[num][2]); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT_TEXT_4, + "Press any key or button for next page"); #if 0 PlaySoundLoop(background_loop[num]); @@ -749,22 +1080,17 @@ void DrawHelpScreenCreditsText() ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, - "Credits:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, - "DOS port of the game:"); - DrawTextFCentered(ystart + 1 * ystep, FC_RED, - "Guido Schulz"); - DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, - "Additional toons:"); - DrawTextFCentered(ystart + 3 * ystep, FC_RED, - "Karl Hörnell"); - DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW, + DrawTextFCentered(100, FONT_TEXT_1, "Credits:"); + DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "DOS port of the game:"); + DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, "Guido Schulz"); + DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "Additional toons:"); + DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "Karl Hörnell"); + DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_2, "...and many thanks to all contributors"); - DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW, - "of new levels!"); + DrawTextFCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!"); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT_TEXT_4, + "Press any key or button for next page"); } void DrawHelpScreenContactText() @@ -775,33 +1101,34 @@ void DrawHelpScreenContactText() ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, "Program information:"); + DrawTextFCentered(100, FONT_TEXT_1, "Program information:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "This game is Freeware!"); - DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_2, "If you like it, send e-mail to:"); - DrawTextFCentered(ystart + 2 * ystep, FC_RED, + DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_3, "info@artsoft.org"); - DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_2, "or SnailMail to:"); - DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 0, FONT_TEXT_3, "Holger Schemel"); - DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 20, FONT_TEXT_3, "Detmolder Strasse 189"); - DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 40, FONT_TEXT_3, "33604 Bielefeld"); - DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 60, FONT_TEXT_3, "Germany"); - DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 7 * ystep, FONT_TEXT_2, "If you have created new levels,"); - DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 8 * ystep, FONT_TEXT_2, "send them to me to include them!"); - DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 9 * ystep, FONT_TEXT_2, ":-)"); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu"); + DrawTextFCentered(ybottom, FONT_TEXT_4, + "Press any key or button for main menu"); } void DrawHelpScreen() @@ -812,15 +1139,21 @@ void DrawHelpScreen() CloseDoor(DOOR_CLOSE_2); for(i=0;i 0) { xpos--; setup.player_name[xpos] = 0; - DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0); - DrawGraphic(xpos + 7, ypos, IMG_EMPTY, 0); + + DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_ACTIVE); } else if (key == KSYM_Return && xpos > 0) { - DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED); - DrawGraphic(xpos + 6, ypos, IMG_EMPTY, 0); + DrawText(startx, starty, setup.player_name, FONT_INPUT); + DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_ACTIVE); SaveSetup(); game_status = MAINMENU; @@ -942,6 +1285,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); ClearWindow(); + HandleChooseTree(0,0, 0,0, MB_MENU_INITIALIZE, ti_ptr); MapChooseTreeGadgets(*ti_ptr); @@ -974,8 +1318,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, int num_entries = numTreeInfoInGroup(ti); char *title_string = NULL; int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16); + int last_game_status = game_status; /* save current game status */ - ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE); + DrawBackground(SX, SY, SXSIZE - 32, SYSIZE); redraw_mask |= REDRAW_FIELD; title_string = @@ -984,8 +1329,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" : ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : ""); - DrawText(SX + offset, SY + offset, title_string, FS_BIG, - (ti->type == TREE_TYPE_LEVEL_DIR ? FC_GREEN : FC_YELLOW)); + DrawText(SX + offset, SY + offset, title_string, FONT_TITLE_1); + + game_status = CHOOSELEVEL; /* force LEVELS font on artwork setup screen */ for(i=0; iname , max_buffer_len); buffer[max_buffer_len] = '\0'; - DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color); + DrawText(SX + 32, SY + ypos * 32, buffer, FONT_TEXT_1 + node->color); if (node->parent_link) - initCursor(i, IMG_ARROW_BLUE_LEFT); + initCursor(i, IMG_MENU_BUTTON_LEFT); else if (node->level_group) - initCursor(i, IMG_ARROW_BLUE_RIGHT); + initCursor(i, IMG_MENU_BUTTON_RIGHT); else - initCursor(i, IMG_BALL_BLUE); + initCursor(i, IMG_MENU_BUTTON); } if (first_entry > 0) - DrawGraphic(0, 1, IMG_ARROW_BLUE_UP, 0); + { + int ypos = 1; + + DrawBackground(SX, SY + ypos * 32, TILEX, TILEY); + DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_UP, 0); + } if (first_entry + num_page_entries < num_entries) - DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, IMG_ARROW_BLUE_DOWN, 0); + { + int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1; + + DrawBackground(SX, SY + ypos * 32, TILEX, TILEY); + DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_DOWN, 0); + } + + game_status = last_game_status; /* restore current game status */ } static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) @@ -1027,14 +1385,16 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); - ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32); + DrawBackground(SX + 32, SY + 32, SXSIZE - 64, 32); if (node->parent_link) - DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc); + DrawTextFCentered(40, FONT_TITLE_2, "leave group \"%s\"", + node->class_desc); else if (node->level_group) - DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc); + DrawTextFCentered(40, FONT_TITLE_2, "enter group \"%s\"", + node->class_desc); else if (ti->type == TREE_TYPE_LEVEL_DIR) - DrawTextFCentered(40, FC_RED, "%3d levels (%s)", + DrawTextFCentered(40, FONT_TITLE_2, "%3d levels (%s)", node->levels, node->class_desc); /* let BackToFront() redraw only what is needed */ @@ -1246,6 +1606,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, void DrawChooseLevel() { + SetMainBackgroundImage(IMG_BACKGROUND_LEVELS); + DrawChooseTree(&leveldir_current); } @@ -1265,37 +1627,39 @@ void DrawHallOfFame(int highlight_position) FadeToFront(); InitAnimation(); + HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE); + +#if 0 PlaySound(SND_MENU_HALL_OF_FAME); +#else + PlaySound_Menu_Start(SND_MENU_HALL_OF_FAME); +#endif } static void drawHallOfFameList(int first_entry, int highlight_position) { int i; + SetMainBackgroundImage(IMG_BACKGROUND_SCORES); ClearWindow(); - DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW); - DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr); + + DrawText(SX + 80, SY + 8, "Hall Of Fame", FONT_TITLE_1); + DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr); for(i=0; i max_value_len) value_string[max_value_len] = '\0'; } else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE && !*(boolean *)(setup_info[pos].value)) - font_color = FC_BLUE; + font_nr = FONT_OPTION_OFF; DrawText(SX + xpos * 32, SY + ypos * 32, - (xpos == 3 ? " " : " "), FS_BIG, FC_YELLOW); - DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color); + (xpos == 3 ? " " : " "), font_nr); + DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_nr); } static void changeSetupValue(int pos) @@ -1654,6 +2046,7 @@ static void DrawSetupScreen_Generic() UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); + ClearWindow(); if (setup_mode == SETUP_MODE_MAIN) @@ -1666,6 +2059,11 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_game; title_string = "Setup Game"; } + else if (setup_mode == SETUP_MODE_EDITOR) + { + setup_info = setup_info_editor; + title_string = "Setup Editor"; + } else if (setup_mode == SETUP_MODE_GRAPHICS) { setup_info = setup_info_graphics; @@ -1687,14 +2085,14 @@ static void DrawSetupScreen_Generic() title_string = "Setup Shortcuts"; } - DrawText(SX + 16, SY + 16, title_string, FS_BIG, FC_YELLOW); + DrawText(SX + 16, SY + 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++) { void *value_ptr = setup_info[i].value; int ypos = MENU_SCREEN_START_YPOS + i; - int font_size = FS_BIG; + int font_nr = FONT_MENU_1; /* set some entries to "unchangeable" according to other variables */ if ((value_ptr == &setup.sound && !audio.sound_available) || @@ -1704,16 +2102,16 @@ static void DrawSetupScreen_Generic() setup_info[i].type |= TYPE_GHOSTED; if (setup_info[i].type & TYPE_STRING) - font_size = FS_MEDIUM; + font_nr = FONT_MENU_2; - DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN); + DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_nr); if (setup_info[i].type & TYPE_ENTER_MENU) - initCursor(i, IMG_ARROW_BLUE_RIGHT); + initCursor(i, IMG_MENU_BUTTON_RIGHT); else if (setup_info[i].type & TYPE_LEAVE_MENU) - initCursor(i, IMG_ARROW_BLUE_LEFT); + initCursor(i, IMG_MENU_BUTTON_LEFT); else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) - initCursor(i, IMG_BALL_BLUE); + initCursor(i, IMG_MENU_BUTTON); if (setup_info[i].type & TYPE_VALUE) drawSetupValue(i); @@ -1729,12 +2127,18 @@ static void DrawSetupScreen_Generic() void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { static int choice_store[MAX_SETUP_MODES]; - int choice = choice_store[setup_mode]; + int choice = choice_store[setup_mode]; /* always starts with 0 */ int x = 0; int y = choice; if (button == MB_MENU_INITIALIZE) { + /* advance to first valid menu entry */ + while (choice < num_setup_info && + (setup_info[choice].type & TYPE_SKIP_ENTRY)) + choice++; + choice_store[setup_mode] = choice; + drawCursor(choice, FC_RED); return; } @@ -1819,23 +2223,24 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) void DrawSetupScreen_Input() { ClearWindow(); - DrawText(SX+16, SY+16, "Setup Input", FS_BIG, FC_YELLOW); - initCursor(0, IMG_BALL_BLUE); - initCursor(1, IMG_BALL_BLUE); - initCursor(2, IMG_ARROW_BLUE_RIGHT); - initCursor(13, IMG_ARROW_BLUE_LEFT); + DrawText(SX+16, SY+16, "Setup Input", FONT_TITLE_1); + + initCursor(0, IMG_MENU_BUTTON); + initCursor(1, IMG_MENU_BUTTON); + initCursor(2, IMG_MENU_BUTTON_RIGHT); + initCursor(13, IMG_MENU_BUTTON_LEFT); - DrawGraphic(10, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_LEFT, 0); - DrawGraphic(12, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_RIGHT, 0); + drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT); + drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT); - DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN); - DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); - DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); + 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); #if 0 DeactivateJoystickForCalibration(); - DrawTextFCentered(SYSIZE - 20, FC_BLUE, + DrawTextFCentered(SYSIZE - 20, FONT_TEXT_4, "Joysticks deactivated on this screen"); #endif @@ -1892,8 +2297,8 @@ 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), FS_BIG, FC_RED); - DrawGraphic(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0); + 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); if (setup.input[player_nr].use_joystick) { @@ -1901,38 +2306,37 @@ static void drawPlayerSetupInputInfo(int player_nr) DrawText(SX+8*32, SY+3*32, joystick_name[getJoystickNrFromDeviceName(device_name)], - FS_BIG, FC_YELLOW); - DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN); + FONT_VALUE_1); + DrawText(SX+32, SY+4*32, "Calibrate", FONT_MENU_1); } else { - DrawText(SX+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW); - DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN); + DrawText(SX+8*32, SY+3*32, "Keyboard ", FONT_VALUE_1); + DrawText(SX+32, SY+4*32, "Customize", FONT_MENU_1); } - DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN); - DrawGraphic(1, 6, IMG_ARROW_BLUE_LEFT, 0); - DrawGraphic(1, 7, IMG_ARROW_BLUE_RIGHT, 0); - DrawGraphic(1, 8, IMG_ARROW_BLUE_UP, 0); - DrawGraphic(1, 9, IMG_ARROW_BLUE_DOWN, 0); - DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE); - DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE); - DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE); - DrawText(SX+2*32, SY+9*32, ":", FS_BIG, FC_BLUE); - DrawText(SX+32, SY+10*32, "Snap Field:", FS_BIG, FC_BLUE); - DrawText(SX+32, SY+12*32, "Place Bomb:", FS_BIG, FC_BLUE); + DrawText(SX+32, SY+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); for (i=0; i<6; i++) { int ypos = 6 + i + (i > 3 ? i-3 : 0); DrawText(SX + 3*32, SY + ypos*32, - " ", FS_BIG, FC_YELLOW); + " ", FONT_VALUE_1); DrawText(SX + 3*32, SY + ypos*32, (setup.input[player_nr].use_joystick ? custom[i].text : - getKeyNameFromKey(*custom[i].key)), - FS_BIG, FC_YELLOW); + getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1); } } @@ -2081,19 +2485,18 @@ void CustomizeKeyboard(int player_nr) custom_key = setup.input[player_nr].key; ClearWindow(); - DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW); + DrawText(SX + 16, SY + 16, "Keyboard Input", FONT_TITLE_1); BackToFront(); InitAnimation(); step_nr = 0; DrawText(SX, SY + (2+2*step_nr)*32, - customize_step[step_nr].text, FS_BIG, FC_RED); + customize_step[step_nr].text, FONT_INPUT_ACTIVE); DrawText(SX, SY + (2+2*step_nr+1)*32, - "Key:", FS_BIG, FC_RED); + "Key:", FONT_INPUT_ACTIVE); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeyNameFromKey(*customize_step[step_nr].key), - FS_BIG, FC_BLUE); + getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD); while(!finished) { @@ -2133,33 +2536,33 @@ 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, - " ", FS_BIG, FC_YELLOW); + " ", FONT_VALUE_1); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeyNameFromKey(key), FS_BIG, FC_YELLOW); + getKeyNameFromKey(key), FONT_VALUE_1); step_nr++; /* un-highlight last query */ DrawText(SX, SY+(2+2*(step_nr-1))*32, - customize_step[step_nr-1].text, FS_BIG, FC_GREEN); + customize_step[step_nr-1].text, FONT_MENU_1); DrawText(SX, SY+(2+2*(step_nr-1)+1)*32, - "Key:", FS_BIG, FC_GREEN); + "Key:", FONT_MENU_1); /* press 'Enter' to leave */ if (step_nr == 6) { DrawText(SX + 16, SY + 15*32+16, - "Press Enter", FS_BIG, FC_YELLOW); + "Press Enter", FONT_TITLE_1); break; } /* query next key binding */ DrawText(SX, SY+(2+2*step_nr)*32, - customize_step[step_nr].text, FS_BIG, FC_RED); + customize_step[step_nr].text, FONT_INPUT_ACTIVE); DrawText(SX, SY+(2+2*step_nr+1)*32, - "Key:", FS_BIG, FC_RED); + "Key:", FONT_INPUT_ACTIVE); DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32, getKeyNameFromKey(*customize_step[step_nr].key), - FS_BIG, FC_BLUE); + FONT_VALUE_OLD); } break; @@ -2211,22 +2614,22 @@ static boolean CalibrateJoystickMain(int player_nr) ClearWindow(); - for(y=0; y<3; y++) + for(y=0; y < 3; y++) { - for(x=0; x<3; x++) + for(x=0; x < 3; x++) { + DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0); check[x][y] = FALSE; - DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0); } } - DrawText(SX, SY + 6 * 32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 7 * 32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW); - DrawText(SX + 16, SY + 9 * 32, " IF ALL BALLS ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 10 * 32, " ARE YELLOW, ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 11 * 32, " CENTER JOYSTICK ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 12 * 32, " AND ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 13 * 32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW); + 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); joy_value = Joystick(player_nr); last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); @@ -2239,7 +2642,7 @@ static boolean CalibrateJoystickMain(int player_nr) new_joystick_xmiddle = joy_x; new_joystick_ymiddle = joy_y; - DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0); + DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0); BackToFront(); while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ @@ -2309,8 +2712,8 @@ static boolean CalibrateJoystickMain(int player_nr) if (x != last_x || y != last_y) { - DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0); - DrawGraphic(xpos + x, ypos + y, IMG_BALL_RED, 0); + DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_YELLOW, 0); + DrawGraphic(xpos + x, ypos + y, IMG_MENU_CALIBRATE_RED, 0); last_x = x; last_y = y; @@ -2377,8 +2780,8 @@ void CalibrateJoystick(int player_nr) { ClearWindow(); - DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW); + DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FONT_TITLE_1); + DrawText(SX, SY + 7*32, " AVAILABLE ", FONT_TITLE_1); BackToFront(); Delay(2000); /* show error message for two seconds */ } @@ -2388,6 +2791,8 @@ void DrawSetupScreen() { DeactivateJoystick(); + SetMainBackgroundImage(IMG_BACKGROUND_SETUP); + if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) @@ -2456,13 +2861,13 @@ static struct } scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] = { { - IMG_ARROW_BLUE_UP, IMG_ARROW_RED_UP, + IMG_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE, SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS, SCREEN_CTRL_ID_SCROLL_UP, "scroll up" }, { - IMG_ARROW_BLUE_DOWN, IMG_ARROW_RED_DOWN, + IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE, SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS, SCREEN_CTRL_ID_SCROLL_DOWN, "scroll down" @@ -2471,7 +2876,11 @@ static struct static struct { +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + Bitmap **gfx_unpressed, **gfx_pressed; +#else int gfx_unpressed, gfx_pressed; +#endif int x, y; int width, height; int type; @@ -2480,7 +2889,11 @@ static struct } scrollbar_info[NUM_SCREEN_SCROLLBARS] = { { - IMG_SCROLLBAR_BLUE, IMG_SCROLLBAR_RED, +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + &scrollbar_bitmap[0], &scrollbar_bitmap[1], +#else + IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE, +#endif SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS, SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE, GD_TYPE_SCROLLBAR_VERTICAL, @@ -2515,12 +2928,12 @@ static void CreateScreenScrollbuttons() gfx_unpressed = scrollbutton_info[i].gfx_unpressed; gfx_pressed = scrollbutton_info[i].gfx_pressed; - gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap; - gd_bitmap_pressed = new_graphic_info[gfx_pressed].bitmap; - gd_x1 = new_graphic_info[gfx_unpressed].src_x; - gd_y1 = new_graphic_info[gfx_unpressed].src_y; - gd_x2 = new_graphic_info[gfx_pressed].src_x; - gd_y2 = new_graphic_info[gfx_pressed].src_y; + gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap; + gd_bitmap_pressed = graphic_info[gfx_pressed].bitmap; + gd_x1 = graphic_info[gfx_unpressed].src_x; + gd_y1 = graphic_info[gfx_unpressed].src_y; + gd_x2 = graphic_info[gfx_pressed].src_x; + gd_y2 = graphic_info[gfx_pressed].src_y; gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, @@ -2551,7 +2964,9 @@ static void CreateScreenScrollbars() for (i=0; iclip_mask = + graphic_info[IMG_MENU_SCROLLBAR + i].clip_mask; + scrollbar_bitmap[i]->stored_clip_gc = + graphic_info[IMG_MENU_SCROLLBAR + i].clip_gc; + + BlitBitmap(graphic_info[IMG_MENU_SCROLLBAR + i].bitmap, + scrollbar_bitmap[i], + graphic_info[IMG_MENU_SCROLLBAR + i].src_x, + graphic_info[IMG_MENU_SCROLLBAR + i].src_y, + TILEX, TILEY, 0, 0); + } +#endif + CreateScreenScrollbuttons(); CreateScreenScrollbars(); } +void FreeScreenGadgets() +{ + int i; + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++) + { + /* prevent freeing clip mask and GC twice */ + scrollbar_bitmap[i]->clip_mask = None; + scrollbar_bitmap[i]->stored_clip_gc = None; + + FreeBitmap(scrollbar_bitmap[i]); + } +#endif + + for (i=0; i