X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=097eb44eb20429ede54279bd86ad47bd0fe9fc46;hb=078d932701464a5152c3889007e5818f87f609c7;hp=0532cdd19e2f054e9d42df7059653fe2c0f40faf;hpb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 0532cdd1..097eb44e 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,80 @@ 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) +static Bitmap *scrollbar_bitmap[4]; +#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); +} - DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic, 0); +static void drawCursor(int ypos, int color) +{ + drawCursorExt(0, ypos, color, 0); } -static void initCursor(int pos, int graphic) +static void drawCursorXY(int xpos, int ypos, int graphic) { - drawCursorExt(pos, FC_BLUE, graphic); + drawCursorExt(xpos, ypos, -1, graphic); } -static void drawCursor(int pos, int color) +static void PlaySound_Menu_Start(int sound) { - drawCursorExt(pos, color, 0); + if (sound_info[sound].loop) + PlaySoundLoop(sound); + else + PlaySound(sound); +} + +static void PlaySound_Menu_Continue(int sound) +{ + 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(FS_BIG, FC_YELLOW)); + int font2_xsize = getFontWidth(FONT(FS_SMALL, FC_RED)); + 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(FS_BIG, FC_YELLOW)); + DrawTextStatic(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT(FS_SMALL, FC_RED)); } static void ToggleFullscreenIfNeeded() @@ -118,7 +160,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 +174,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(FS_BIG, FC_GREEN)) * 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,48 +227,57 @@ 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(FS_BIG, FC_GREEN)); + DrawText(SX + 32 + name_width, SY + 2*32, setup.player_name, + FONT(FS_BIG, FC_RED)); + DrawTextStatic(SX + 32, SY + 3*32, "Level:", FONT(FS_BIG, FC_GREEN)); + DrawText(SX + 11 * 32, SY + 3*32, int2str(level_nr,3), FONT(FS_BIG, + (leveldir_current->readonly ? FC_RED : FC_YELLOW))); + DrawTextStatic(SX + 32, SY + 4*32, "Hall Of Fame", FONT(FS_BIG,FC_GREEN)); + DrawTextStatic(SX + 32, SY + 5*32, "Level Creator",FONT(FS_BIG,FC_GREEN)); + DrawTextStatic(SY + 32, SY + 6*32, "Info Screen", FONT(FS_BIG, FC_GREEN)); + DrawTextStatic(SX + 32, SY + 7*32, "Start Game", FONT(FS_BIG, FC_GREEN)); + DrawTextStatic(SX + 32, SY + 8*32, "Setup", FONT(FS_BIG, FC_GREEN)); + DrawTextStatic(SX + 32, SY + 9*32, "Quit", FONT(FS_BIG, FC_GREEN)); 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(FS_SMALL, FC_RED), "%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(FS_SMALL, FC_RED), "READ"); + DrawTextF(15*32 + 6, 3*32 + 9 + 7, FONT(FS_SMALL, FC_RED), "ONLY"); } for(i=0; i<8; i++) - initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE)); + initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON)); - DrawGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0); - DrawGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0); +#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(SX + 56, SY + 326, "A Game by Artsoft Entertainment", - FS_SMALL, FC_RED); + DrawTextStatic(SX + 56, SY + 326, "A Game by Artsoft Entertainment", + FONT(FS_SMALL, FC_RED)); if (leveldir_current->name) { int len = strlen(leveldir_current->name); - int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2; + int lxpos = SX + (SXSIZE - len * getFontWidth(FONT_SPECIAL_GAME)) / 2; int lypos = SY + 352; - DrawText(lxpos, lypos, leveldir_current->name, FS_SMALL, FC_SPECIAL2); + DrawText(lxpos, lypos, leveldir_current->name, FONT_SPECIAL_GAME); } FadeToFront(); @@ -318,10 +374,8 @@ 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(FS_BIG, font_color)); LoadLevel(level_nr); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); @@ -548,12 +602,12 @@ static int OLD_helpscreen_action[] = static int helpscreen_action[] = { - IMG_PLAYER1_DOWN_MOVING, 16, - IMG_PLAYER1_UP_MOVING, 16, - IMG_PLAYER1_LEFT_MOVING, 16, - IMG_PLAYER1_RIGHT_MOVING, 16, - IMG_PLAYER1_LEFT_PUSHING, 16, - IMG_PLAYER1_RIGHT_PUSHING, 16, HA_NEXT, + 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, @@ -686,25 +740,25 @@ static int helpscreen_action[] = IMG_ROBOT, -1, HA_NEXT, - IMG_MOLE_RIGHT_MOVING, 16, - IMG_MOLE_UP_MOVING, 16, - IMG_MOLE_LEFT_MOVING, 16, - IMG_MOLE_DOWN_MOVING, 16, 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_RIGHT_MOVING, 16, - IMG_PENGUIN_UP_MOVING, 16, - IMG_PENGUIN_LEFT_MOVING, 16, - IMG_PENGUIN_DOWN_MOVING, 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_RIGHT_MOVING, 16, - IMG_PIG_UP_MOVING, 16, - IMG_PIG_LEFT_MOVING, 16, - IMG_PIG_DOWN_MOVING, 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_RIGHT_MOVING, 16, - IMG_DRAGON_UP_MOVING, 16, - IMG_DRAGON_LEFT_MOVING, 16, - IMG_DRAGON_DOWN_MOVING, 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, @@ -981,21 +1035,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(FS_SMALL, FC_GREEN), "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_DEFAULT_SMALL); DrawText(xstart, ystart + (i - start) * ystep + 16, - helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW); + helpscreen_eltext[i][1], FONT_DEFAULT_SMALL); } - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT(FS_SMALL, FC_BLUE), + "Press any key or button for next page"); } void DrawHelpScreenMusicText(int num) @@ -1007,22 +1063,24 @@ void DrawHelpScreenMusicText(int num) ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, "The game background music loops:"); + DrawTextFCentered(100, FONT(FS_SMALL, FC_GREEN), + "The game background music loops:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 0 * ystep, FONT(FS_SMALL, FC_YELLOW), "Excerpt from"); - DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][0]); - DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 1 * ystep, FONT(FS_SMALL, FC_RED), + "\"%s\"", helpscreen_music[num][0]); + DrawTextFCentered(ystart + 2 * ystep, FONT(FS_SMALL, FC_YELLOW), "by"); - DrawTextFCentered(ystart + 3 * ystep, FC_RED, + DrawTextFCentered(ystart + 3 * ystep, FONT(FS_SMALL, FC_RED), "%s", helpscreen_music[num][1]); - DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 4 * ystep, FONT(FS_SMALL, FC_YELLOW), "from the album"); - DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][2]); + DrawTextFCentered(ystart + 5 * ystep, FONT(FS_SMALL, FC_RED), + "\"%s\"", helpscreen_music[num][2]); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT(FS_SMALL, FC_BLUE), + "Press any key or button for next page"); #if 0 PlaySoundLoop(background_loop[num]); @@ -1038,22 +1096,23 @@ void DrawHelpScreenCreditsText() ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, + DrawTextFCentered(100, FONT(FS_SMALL, FC_GREEN), "Credits:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 0 * ystep, FONT(FS_SMALL, FC_YELLOW), "DOS port of the game:"); - DrawTextFCentered(ystart + 1 * ystep, FC_RED, + DrawTextFCentered(ystart + 1 * ystep, FONT(FS_SMALL, FC_RED), "Guido Schulz"); - DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 2 * ystep, FONT(FS_SMALL, FC_YELLOW), "Additional toons:"); - DrawTextFCentered(ystart + 3 * ystep, FC_RED, + DrawTextFCentered(ystart + 3 * ystep, FONT(FS_SMALL, FC_RED), "Karl Hörnell"); - DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 5 * ystep, FONT(FS_SMALL, FC_YELLOW), "...and many thanks to all contributors"); - DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 6 * ystep, FONT(FS_SMALL, FC_YELLOW), "of new levels!"); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FONT(FS_SMALL, FC_BLUE), + "Press any key or button for next page"); } void DrawHelpScreenContactText() @@ -1064,33 +1123,34 @@ void DrawHelpScreenContactText() ClearWindow(); DrawHeadline(); - DrawTextFCentered(100, FC_GREEN, "Program information:"); + DrawTextFCentered(100, FONT(FS_SMALL, FC_GREEN), "Program information:"); - DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 0 * ystep, FONT(FS_SMALL, FC_YELLOW), "This game is Freeware!"); - DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 1 * ystep, FONT(FS_SMALL, FC_YELLOW), "If you like it, send e-mail to:"); - DrawTextFCentered(ystart + 2 * ystep, FC_RED, + DrawTextFCentered(ystart + 2 * ystep, FONT(FS_SMALL, FC_RED), "info@artsoft.org"); - DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 3 * ystep, FONT(FS_SMALL, FC_YELLOW), "or SnailMail to:"); - DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 0, FONT(FS_SMALL, FC_RED), "Holger Schemel"); - DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 20, FONT(FS_SMALL, FC_RED), "Detmolder Strasse 189"); - DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 40, FONT(FS_SMALL, FC_RED), "33604 Bielefeld"); - DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED, + DrawTextFCentered(ystart + 4 * ystep + 60, FONT(FS_SMALL, FC_RED), "Germany"); - DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 7 * ystep, FONT(FS_SMALL, FC_YELLOW), "If you have created new levels,"); - DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 8 * ystep, FONT(FS_SMALL, FC_YELLOW), "send them to me to include them!"); - DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW, + DrawTextFCentered(ystart + 9 * ystep, FONT(FS_SMALL, FC_YELLOW), ":-)"); - DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu"); + DrawTextFCentered(ybottom, FONT(FS_SMALL, FC_BLUE), + "Press any key or button for main menu"); } void DrawHelpScreen() @@ -1104,12 +1164,18 @@ void DrawHelpScreen() helpscreen_step[i] = helpscreen_frame[i] = 0; helpscreen_musicpos = 0; helpscreen_state = 0; + DrawHelpScreenElText(0); DrawHelpScreenElAction(0); FadeToFront(); InitAnimation(); + +#if 0 PlaySoundLoop(SND_MENU_INFO_SCREEN); +#else + PlaySound_Menu_Start(SND_MENU_INFO_SCREEN); +#endif } void HandleHelpScreen(int button) @@ -1168,7 +1234,11 @@ void HandleHelpScreen(int button) /* !!! workaround for playing "music" that is really a sound loop (and must therefore periodically be reactivated with the current sound engine !!! */ +#if 0 PlaySoundLoop(SND_MENU_INFO_SCREEN); +#else + PlaySound_Menu_Continue(SND_MENU_INFO_SCREEN); +#endif DoAnimation(); } @@ -1179,12 +1249,18 @@ void HandleHelpScreen(int button) void HandleTypeName(int newxpos, Key key) { static int xpos = 0, ypos = 2; + int font_width = getFontWidth(FONT_DEFAULT_BIG); + int name_width = getFontWidth(FONT(FS_BIG, FC_GREEN)) * strlen("Name:"); + int startx = SX + 32 + name_width; + int starty = SY + ypos * 32; if (newxpos) { xpos = newxpos; - DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW); - DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0); + + DrawText(startx, starty, setup.player_name, FONT_DEFAULT_BIG); + DrawText(startx + xpos * font_width, starty, "_", FONT_DEFAULT_BIG); + return; } @@ -1202,23 +1278,21 @@ void HandleTypeName(int newxpos, Key key) setup.player_name[xpos] = ascii; setup.player_name[xpos + 1] = 0; xpos++; - DrawTextExt(drawto, SX + 6*32, SY + ypos*32, - setup.player_name, FS_BIG, FC_YELLOW); - DrawTextExt(window, SX + 6*32, SY + ypos*32, - setup.player_name, FS_BIG, FC_YELLOW); - DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0); + + DrawText(startx, starty, setup.player_name, FONT_DEFAULT_BIG); + DrawText(startx + xpos * font_width, starty, "_", FONT_DEFAULT_BIG); } else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 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_DEFAULT_BIG); } 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(FS_BIG, FC_RED)); + DrawText(startx + xpos * font_width, starty, " ", FONT_DEFAULT_BIG); SaveSetup(); game_status = MAINMENU; @@ -1233,6 +1307,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); @@ -1266,7 +1341,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, char *title_string = NULL; int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16); - ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE); + DrawBackground(SX, SY, SXSIZE - 32, SYSIZE); redraw_mask |= REDRAW_FIELD; title_string = @@ -1275,8 +1350,8 @@ 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(FS_BIG, + (ti->type == TREE_TYPE_LEVEL_DIR ? FC_GREEN : FC_YELLOW))); 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(FS_MEDIUM, 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); + } } static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) @@ -1318,14 +1403,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(FS_SMALL, FC_RED), "leave group \"%s\"", + node->class_desc); else if (node->level_group) - DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc); + DrawTextFCentered(40, FONT(FS_SMALL, FC_RED), "enter group \"%s\"", + node->class_desc); else if (ti->type == TREE_TYPE_LEVEL_DIR) - DrawTextFCentered(40, FC_RED, "%3d levels (%s)", + DrawTextFCentered(40, FONT(FS_SMALL, FC_RED), "%3d levels (%s)", node->levels, node->class_desc); /* let BackToFront() redraw only what is needed */ @@ -1537,6 +1624,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, void DrawChooseLevel() { + SetMainBackgroundImage(IMG_BACKGROUND_LEVELS); + DrawChooseTree(&leveldir_current); } @@ -1556,17 +1645,26 @@ 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_DEFAULT_BIG); + DrawTextFCentered(46, FONT(FS_SMALL, FC_RED), "HighScores of Level %d", + level_nr); for(i=0; i 3 ? i-3 : 0); DrawText(SX + 3*32, SY + ypos*32, - " ", FS_BIG, FC_YELLOW); + " ", FONT_DEFAULT_BIG); 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_DEFAULT_BIG); } } @@ -2372,19 +2515,20 @@ 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_DEFAULT_BIG); 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(FS_BIG, FC_RED)); DrawText(SX, SY + (2+2*step_nr+1)*32, - "Key:", FS_BIG, FC_RED); + "Key:", FONT(FS_BIG, FC_RED)); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, getKeyNameFromKey(*customize_step[step_nr].key), - FS_BIG, FC_BLUE); + FONT(FS_BIG, FC_BLUE)); while(!finished) { @@ -2424,33 +2568,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_DEFAULT_BIG); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeyNameFromKey(key), FS_BIG, FC_YELLOW); + getKeyNameFromKey(key), FONT_DEFAULT_BIG); 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(FS_BIG, FC_GREEN)); DrawText(SX, SY+(2+2*(step_nr-1)+1)*32, - "Key:", FS_BIG, FC_GREEN); + "Key:", FONT(FS_BIG, FC_GREEN)); /* press 'Enter' to leave */ if (step_nr == 6) { DrawText(SX + 16, SY + 15*32+16, - "Press Enter", FS_BIG, FC_YELLOW); + "Press Enter", FONT_DEFAULT_BIG); 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(FS_BIG, FC_RED)); DrawText(SX, SY+(2+2*step_nr+1)*32, - "Key:", FS_BIG, FC_RED); + "Key:", FONT(FS_BIG, FC_RED)); DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32, getKeyNameFromKey(*customize_step[step_nr].key), - FS_BIG, FC_BLUE); + FONT(FS_BIG, FC_BLUE)); } break; @@ -2502,22 +2646,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(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 7 * 32, "IN ALL DIRECTIONS", FONT(FS_BIG,FC_YELLOW)); + DrawText(SX + 16, SY + 9 * 32, " IF ALL BALLS ", FONT(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 10 * 32, " ARE YELLOW, ", FONT(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 11 * 32, " CENTER JOYSTICK ", FONT(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 12 * 32, " AND ", FONT(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 13 * 32, "PRESS ANY BUTTON!", FONT(FS_BIG,FC_YELLOW)); joy_value = Joystick(player_nr); last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); @@ -2530,7 +2674,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 */ @@ -2600,8 +2744,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; @@ -2668,8 +2812,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(FS_BIG,FC_YELLOW)); + DrawText(SX, SY + 7*32, " AVAILABLE ", FONT(FS_BIG,FC_YELLOW)); BackToFront(); Delay(2000); /* show error message for two seconds */ } @@ -2679,6 +2823,8 @@ void DrawSetupScreen() { DeactivateJoystick(); + SetMainBackgroundImage(IMG_BACKGROUND_SETUP); + if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) @@ -2747,13 +2893,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" @@ -2762,7 +2908,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; @@ -2771,7 +2921,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_SCROLLBAR_RED, +#endif SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS, SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE, GD_TYPE_SCROLLBAR_VERTICAL, @@ -2806,12 +2960,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, @@ -2842,7 +2996,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<4; 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