X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=830834d85cb6884341295781b1aed872d6d64344;hb=939a6fd558cffde54d72f9f562e504bbeffc638c;hp=46324314fdaf3e008e172b220e23959c47100090;hpb=2443a8a09966a9940e1420c91d24a297325c2a00;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 46324314..830834d8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -26,15 +26,18 @@ /* screens in the setup menu */ #define SETUP_MODE_MAIN 0 -#define SETUP_MODE_INPUT 1 -#define SETUP_MODE_SHORTCUT 2 -#define SETUP_MODE_GRAPHICS 3 -#define SETUP_MODE_SOUND 4 -#define SETUP_MODE_CHOOSE_GRAPHICS 5 -#define SETUP_MODE_CHOOSE_SOUNDS 6 -#define SETUP_MODE_CHOOSE_MUSIC 7 - -#define MAX_SETUP_MODES 8 +#define SETUP_MODE_GAME 1 +#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 @@ -58,49 +61,88 @@ /* forward declarations of internal functions */ static void HandleScreenGadgets(struct GadgetInfo *); -static void execExitSetupChooseArtwork(void); static void HandleSetupScreen_Generic(int, int, int, int, int); static void HandleSetupScreen_Input(int, int, int, int, int); static void CustomizeKeyboard(int); static void CalibrateJoystick(int); +static void execSetupArtwork(void); 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 == GFX_ARROW_BLUE_LEFT ? GFX_ARROW_RED_LEFT : - graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT : - GFX_KUGEL_ROT); + graphic = (graphic == IMG_ARROW_BLUE_LEFT ? IMG_ARROW_RED_LEFT : + graphic == IMG_ARROW_BLUE_RIGHT ? IMG_ARROW_RED_RIGHT : + IMG_BALL_RED); + + 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); +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_size, int font_type) +{ + if (game_status == MAINMENU && gfx.menu_main_hide_static_text) + return; + + DrawText(x, y, text, font_size, font_type); } void DrawHeadline() { - int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 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, FS_BIG, FC_YELLOW); + DrawTextStatic(x2, SY + 46, WINDOW_SUBTITLE_STRING, FS_SMALL, FC_RED); } static void ToggleFullscreenIfNeeded() @@ -108,7 +150,7 @@ static void ToggleFullscreenIfNeeded() if (setup.fullscreen != video.fullscreen_enabled) { /* save old door content */ - BlitBitmap(backbuffer, pix[PIX_DB_DOOR], + BlitBitmap(backbuffer, bitmap_db_door, DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); /* toggle fullscreen */ @@ -116,10 +158,11 @@ static void ToggleFullscreenIfNeeded() setup.fullscreen = video.fullscreen_enabled; /* redraw background to newly created backbuffer */ - BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, + 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); /* restore old door content */ - BlitBitmap(pix[PIX_DB_DOOR], backbuffer, + BlitBitmap(bitmap_db_door, backbuffer, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); redraw_mask = REDRAW_ALL; @@ -134,9 +177,14 @@ void DrawMainMenu() UnmapAllGadgets(); FadeSounds(); + KeyboardAutoRepeatOn(); - ActivateJoystickIfAvailable(); + ActivateJoystick(); + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + + audio.sound_deactivated = FALSE; /* needed if last screen was the playing screen, invoked from level editor */ if (level_editor_test_game) @@ -152,6 +200,9 @@ void DrawMainMenu() /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); + /* needed if last screen (level choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + #ifdef TARGET_SDL SetDrawtoField(DRAW_BACKBUFFER); #endif @@ -161,7 +212,7 @@ void DrawMainMenu() /* leveldir_current may be invalid (level group, parent link) */ if (!validLevelSeries(leveldir_current)) - leveldir_current = getFirstValidLevelSeries(leveldir_last_valid); + leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid); /* store valid level series information */ leveldir_last_valid = leveldir_current; @@ -173,19 +224,22 @@ void DrawMainMenu() GetPlayerConfig(); LoadLevel(level_nr); + SetMainBackgroundImage(IMG_BACKGROUND_MAIN); ClearWindow(); + DrawHeadline(); - DrawText(SX + 32, SY + 2*32, name_text, FS_BIG, FC_GREEN); + + DrawTextStatic(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); + DrawTextStatic(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 + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN); + DrawTextStatic(SX + 32, SY + 5*32, "Level Creator", FS_BIG, FC_GREEN); + DrawTextStatic(SY + 32, SY + 6*32, "Info Screen", FS_BIG, FC_GREEN); + DrawTextStatic(SX + 32, SY + 7*32, "Start Game", FS_BIG, FC_GREEN); + DrawTextStatic(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN); + DrawTextStatic(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); @@ -200,13 +254,18 @@ void DrawMainMenu() } for(i=0; i<8; i++) - initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU)); + initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE)); - DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT); - DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT); +#if 0 + DrawGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0); + DrawGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0); +#else + drawCursorXY(10, 1, IMG_ARROW_BLUE_LEFT); + drawCursorXY(14, 1, IMG_ARROW_BLUE_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", + FS_SMALL, FC_RED); if (leveldir_current->name) { @@ -231,7 +290,6 @@ void DrawMainMenu() #if 0 ClearEventQueue(); #endif - } static void gotoTopLevelDir() @@ -312,10 +370,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), + FS_BIG, font_color); LoadLevel(level_nr); DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); @@ -429,8 +485,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, @@ -538,12 +594,225 @@ 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?)"}, {"Normal sand:", "You can dig through it"}, {"Empty field:", "You can walk through it"}, - {"Quicksand: You cannot pass it,", "but rocks can fall though it"}, + {"Quicksand: You cannot pass it,", "but rocks can fall through it"}, {"Massive Wall:", "Nothing can go through it"}, {"Normal Wall: You can't go through", "it, but you can bomb it away"}, {"Growing Wall: Grows in several di-", "rections if there is an empty field"}, @@ -602,7 +871,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] = { @@ -617,7 +886,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; @@ -669,7 +939,7 @@ void DrawHelpScreenElAction(int start) } j++; - DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame); + DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame); i++; } @@ -679,6 +949,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) { @@ -686,6 +1031,7 @@ 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(); @@ -806,15 +1152,21 @@ void DrawHelpScreen() CloseDoor(DOOR_CLOSE_2); for(i=0;i 0) { xpos--; setup.player_name[xpos] = 0; - DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); - DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM); + + DrawBackground(SX + (xpos + 6) * 32, SY + ypos * 32, 2 * TILEX, TILEY); + drawCursorXY(xpos + 6, ypos - 2, IMG_BALL_RED); } 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, GFX_LEERRAUM); + DrawText(SX + 6 * 32, SY + ypos * 32, setup.player_name, FS_BIG, FC_RED); + DrawBackground(SX + (xpos + 6) * 32, SY + ypos * 32, TILEX, TILEY); SaveSetup(); game_status = MAINMENU; @@ -930,6 +1296,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); @@ -963,7 +1330,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 = @@ -990,18 +1357,28 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color); if (node->parent_link) - initCursor(i, GFX_ARROW_BLUE_LEFT); + initCursor(i, IMG_ARROW_BLUE_LEFT); else if (node->level_group) - initCursor(i, GFX_ARROW_BLUE_RIGHT); + initCursor(i, IMG_ARROW_BLUE_RIGHT); else - initCursor(i, GFX_KUGEL_BLAU); + initCursor(i, IMG_BALL_BLUE); } if (first_entry > 0) - DrawGraphic(0, 1, GFX_ARROW_BLUE_UP); + { + int ypos = 1; + + DrawBackground(SX, SY + ypos * 32, TILEX, TILEY); + DrawGraphicThruMask(0, ypos, IMG_ARROW_BLUE_UP, 0); + } if (first_entry + num_page_entries < num_entries) - DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN); + { + int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1; + + DrawBackground(SX, SY + ypos * 32, TILEX, TILEY); + DrawGraphicThruMask(0, ypos, IMG_ARROW_BLUE_DOWN, 0); + } } static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) @@ -1015,7 +1392,7 @@ 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); @@ -1078,7 +1455,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (game_status == SETUP) { - execExitSetupChooseArtwork(); + execSetupArtwork(); } else { @@ -1215,7 +1592,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (game_status == SETUP) { - execExitSetupChooseArtwork(); + execSetupArtwork(); } else { @@ -1234,6 +1611,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, void DrawChooseLevel() { + SetMainBackgroundImage(IMG_BACKGROUND_LEVEL_SERIES); + DrawChooseTree(&leveldir_current); } @@ -1253,15 +1632,23 @@ void DrawHallOfFame(int highlight_position) FadeToFront(); InitAnimation(); + HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE); - PlaySound(SND_HALLOFFAME); + +#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_HALL_OF_FAME); ClearWindow(); + DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW); DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr); @@ -1332,7 +1719,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (button_released) { - FadeSound(SND_HALLOFFAME); + FadeSound(SND_MENU_HALL_OF_FAME); game_status = MAINMENU; DrawMainMenu(); } @@ -1340,7 +1727,12 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) BackToFront(); if (game_status == HALLOFFAME) + { DoAnimation(); +#if 1 + PlaySound_Menu_Continue(SND_MENU_HALL_OF_FAME); +#endif + } } @@ -1350,7 +1742,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) static struct TokenInfo *setup_info; static int num_setup_info; -static char *custom_graphics, *custom_sounds, *custom_music; + +static char *graphics_set_name; +static char *sounds_set_name; +static char *music_set_name; static void execSetupMain() { @@ -1358,23 +1753,48 @@ static void execSetupMain() DrawSetupScreen(); } -static void execSetupGraphics() +static void execSetupGame() { - custom_graphics = artwork.gfx_current->name; + setup_mode = SETUP_MODE_GAME; + DrawSetupScreen(); +} + +static void execSetupEditor() +{ + setup_mode = SETUP_MODE_EDITOR; + DrawSetupScreen(); +} +static void execSetupGraphics() +{ setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); } static void execSetupSound() { - custom_sounds = artwork.snd_current->name; - custom_music = artwork.mus_current->name; - setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } +static void execSetupArtwork() +{ + /* needed if last screen (setup choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + + setup.graphics_set = artwork.gfx_current->identifier; + setup.sounds_set = artwork.snd_current->identifier; + setup.music_set = artwork.mus_current->identifier; + + /* needed for displaying artwork name instead of artwork identifier */ + graphics_set_name = artwork.gfx_current->name; + sounds_set_name = artwork.snd_current->name; + music_set_name = artwork.mus_current->name; + + setup_mode = SETUP_MODE_ARTWORK; + DrawSetupScreen(); +} + static void execSetupChooseGraphics() { setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; @@ -1405,14 +1825,6 @@ static void execSetupShortcut() DrawSetupScreen(); } -static void execExitSetupChooseArtwork() -{ - if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) - execSetupGraphics(); - else - execSetupSound(); -} - static void execExitSetup() { game_status = MAINMENU; @@ -1427,38 +1839,60 @@ static void execSaveAndExitSetup() static struct TokenInfo setup_info_main[] = { - { TYPE_ENTER_MENU, execSetupGraphics, "Graphics Setup" }, - { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" }, + { TYPE_ENTER_MENU, execSetupGame, "Game Settings" }, + { TYPE_ENTER_MENU, execSetupEditor, "Editor Settings" }, + { TYPE_ENTER_MENU, execSetupGraphics, "Graphics" }, + { TYPE_ENTER_MENU, execSetupSound, "Sound & Music" }, + { TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" }, { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, { TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" }, { TYPE_EMPTY, NULL, "" }, -#if 0 - { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, - { TYPE_SWITCH, &setup.fading, "Fading:" }, -#endif - { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, - { TYPE_SWITCH, &setup.ask_on_escape, "Ask on Esc:" }, - { TYPE_SWITCH, &setup.toons, "Toons:" }, - { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, + { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, + { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and Exit" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_game[] = +{ { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" }, { TYPE_SWITCH, &setup.handicap, "Handicap:" }, { TYPE_SWITCH, &setup.time_limit, "Timelimit:" }, + { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, - { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_editor[] = +{ + { TYPE_STRING, NULL, "Offer Special Elements:"}, + { TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" }, + { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, + { TYPE_SWITCH, &setup.editor.el_more, "More:" }, + { TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" }, + { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" }, + { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamd. Caves:" }, + { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX Boulderd.:" }, + { TYPE_SWITCH, &setup.editor.el_chars, "Characters:" }, + { TYPE_SWITCH, &setup.editor.el_custom, "Custom:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } }; static struct TokenInfo setup_info_graphics[] = { - { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" }, - { TYPE_STRING, &custom_graphics, "" }, - { TYPE_EMPTY, NULL, "" }, { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" }, +#if 0 + { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, + { TYPE_SWITCH, &setup.fading, "Fading:" }, +#endif + { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, + { TYPE_SWITCH, &setup.toons, "Toons:" }, { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } }; @@ -1470,12 +1904,25 @@ static struct TokenInfo setup_info_sound[] = { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" }, { TYPE_SWITCH, &setup.sound_music, "Game Music:" }, { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_artwork[] = +{ + { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" }, + { TYPE_STRING, &graphics_set_name, "" }, { TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" }, - { TYPE_STRING, &custom_sounds, "" }, + { TYPE_STRING, &sounds_set_name, "" }, { TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" }, - { TYPE_STRING, &custom_music, "" }, + { TYPE_STRING, &music_set_name, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_STRING, NULL, "Override Level Artwork:"}, + { TYPE_YES_NO, &setup.override_level_graphics, "Graphics:" }, + { TYPE_YES_NO, &setup.override_level_sounds, "Sounds:" }, + { TYPE_YES_NO, &setup.override_level_music, "Music:" }, { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } }; @@ -1485,8 +1932,12 @@ static struct TokenInfo setup_info_shortcut[] = { TYPE_KEY, &setup.shortcut.save_game, "" }, { TYPE_KEYTEXT, NULL, "Quick Load Game:", }, { TYPE_KEY, &setup.shortcut.load_game, "" }, + { TYPE_KEYTEXT, NULL, "Toggle Pause:", }, + { TYPE_KEY, &setup.shortcut.toggle_pause, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_YES_NO, &setup.ask_on_escape, "Ask on Esc:" }, { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } }; @@ -1541,10 +1992,14 @@ static void drawSetupValue(int pos) { int xpos = MENU_SCREEN_VALUE_XPOS; int ypos = MENU_SCREEN_START_YPOS + pos; - int value_color = FC_YELLOW; + int font_size = FS_BIG; + int font_color = FC_YELLOW; char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED, setup_info[pos].value); + if (value_string == NULL) + return; + if (setup_info[pos].type & TYPE_KEY) { xpos = 3; @@ -1552,23 +2007,26 @@ static void drawSetupValue(int pos) if (setup_info[pos].type & TYPE_QUERY) { value_string = ""; - value_color = FC_RED; + font_color = FC_RED; } } else if (setup_info[pos].type & TYPE_STRING) { - xpos = 3; + int max_value_len = (SCR_FIELDX - 2) * 2; + + xpos = 1; + font_size = FS_MEDIUM; - if (strlen(value_string) > 14) - value_string[14] = '\0'; + if (strlen(value_string) > max_value_len) + value_string[max_value_len] = '\0'; } else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE && !*(boolean *)(setup_info[pos].value)) - value_color = FC_BLUE; + font_color = FC_BLUE; DrawText(SX + xpos * 32, SY + ypos * 32, (xpos == 3 ? " " : " "), FS_BIG, FC_YELLOW); - DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color); + DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color); } static void changeSetupValue(int pos) @@ -1600,6 +2058,7 @@ static void DrawSetupScreen_Generic() UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); + ClearWindow(); if (setup_mode == SETUP_MODE_MAIN) @@ -1607,6 +2066,16 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_main; title_string = "Setup"; } + else if (setup_mode == SETUP_MODE_GAME) + { + 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; @@ -1617,6 +2086,11 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_sound; title_string = "Setup Sound"; } + else if (setup_mode == SETUP_MODE_ARTWORK) + { + setup_info = setup_info_artwork; + title_string = "Custom Artwork"; + } else if (setup_mode == SETUP_MODE_SHORTCUT) { setup_info = setup_info_shortcut; @@ -1636,21 +2110,20 @@ static void DrawSetupScreen_Generic() if ((value_ptr == &setup.sound && !audio.sound_available) || (value_ptr == &setup.sound_loops && !audio.loops_available) || (value_ptr == &setup.sound_music && !audio.music_available) || - (value_ptr == &setup.sound_music && !audio.music_available) || (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; - if (setup_info[i].type & TYPE_ENTER_OR_LEAVE_MENU) - font_size = FS_BIG; + if (setup_info[i].type & TYPE_STRING) + font_size = FS_MEDIUM; DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN); if (setup_info[i].type & TYPE_ENTER_MENU) - initCursor(i, GFX_ARROW_BLUE_RIGHT); + initCursor(i, IMG_ARROW_BLUE_RIGHT); else if (setup_info[i].type & TYPE_LEAVE_MENU) - initCursor(i, GFX_ARROW_BLUE_LEFT); + initCursor(i, IMG_ARROW_BLUE_LEFT); else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) - initCursor(i, GFX_KUGEL_BLAU); + initCursor(i, IMG_BALL_BLUE); if (setup_info[i].type & TYPE_VALUE) drawSetupValue(i); @@ -1666,12 +2139,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; } @@ -1729,26 +2208,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) } else if (!(setup_info[y].type & TYPE_GHOSTED)) { -#if 0 - if (setup_info[y].type & TYPE_BOOLEAN_STYLE) - { - boolean new_value = !*(boolean *)(setup_info[y].value); - - *(boolean *)setup_info[y].value = new_value; - drawSetupValue(y); - } - else if (setup_info[y].type == TYPE_KEYTEXT && - setup_info[y + 1].type == TYPE_KEY) - { - changeSetupValue(y + 1); - } - else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) - { - void (*menu_callback_function)(void) = setup_info[choice].value; - - menu_callback_function(); - } -#else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) { void (*menu_callback_function)(void) = setup_info[choice].value; @@ -1764,7 +2223,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) if (setup_info[y].type & TYPE_VALUE) changeSetupValue(y); } -#endif } } @@ -1777,23 +2235,26 @@ 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, GFX_KUGEL_BLAU); - initCursor(1, GFX_KUGEL_BLAU); - initCursor(2, GFX_ARROW_BLUE_RIGHT); - initCursor(13, GFX_ARROW_BLUE_LEFT); + initCursor(0, IMG_BALL_BLUE); + initCursor(1, IMG_BALL_BLUE); + initCursor(2, IMG_ARROW_BLUE_RIGHT); + initCursor(13, IMG_ARROW_BLUE_LEFT); - DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT); - DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT); + drawCursorXY(10, 0, IMG_ARROW_BLUE_LEFT); + drawCursorXY(12, 0, IMG_ARROW_BLUE_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+15*32, "Back", FS_BIG, FC_GREEN); +#if 0 DeactivateJoystickForCalibration(); DrawTextFCentered(SYSIZE - 20, FC_BLUE, "Joysticks deactivated on this screen"); +#endif HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE); FadeToFront(); @@ -1849,7 +2310,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), FS_BIG, FC_RED); - DrawGraphic(8, 2, GFX_SPIELER1 + player_nr); + DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0); if (setup.input[player_nr].use_joystick) { @@ -1867,10 +2328,10 @@ static void drawPlayerSetupInputInfo(int player_nr) } DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN); - DrawGraphic(1, 6, GFX_ARROW_BLUE_LEFT); - DrawGraphic(1, 7, GFX_ARROW_BLUE_RIGHT); - DrawGraphic(1, 8, GFX_ARROW_BLUE_UP); - DrawGraphic(1, 9, GFX_ARROW_BLUE_DOWN); + drawCursorXY(1, 4, IMG_ARROW_BLUE_LEFT); + drawCursorXY(1, 5, IMG_ARROW_BLUE_RIGHT); + drawCursorXY(1, 6, IMG_ARROW_BLUE_UP); + drawCursorXY(1, 7, IMG_ARROW_BLUE_DOWN); 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); @@ -2063,7 +2524,7 @@ void CustomizeKeyboard(int player_nr) { case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, TRUE); + Key key = GetEventKey((KeyEvent *)&event, FALSE); if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { @@ -2172,7 +2633,7 @@ static boolean CalibrateJoystickMain(int player_nr) for(x=0; x<3; x++) { check[x][y] = FALSE; - DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU); + DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0); } } @@ -2195,7 +2656,7 @@ static boolean CalibrateJoystickMain(int player_nr) new_joystick_xmiddle = joy_x; new_joystick_ymiddle = joy_y; - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); + DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0); BackToFront(); while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ @@ -2265,8 +2726,8 @@ static boolean CalibrateJoystickMain(int player_nr) if (x != last_x || y != last_y) { - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB); - DrawGraphic(xpos + x, ypos + y, GFX_KUGEL_ROT); + DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0); + DrawGraphic(xpos + x, ypos + y, IMG_BALL_RED, 0); last_x = x; last_y = y; @@ -2342,6 +2803,10 @@ void CalibrateJoystick(int player_nr) void DrawSetupScreen() { + DeactivateJoystick(); + + SetMainBackgroundImage(IMG_BACKGROUND_SETUP); + if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) @@ -2387,11 +2852,6 @@ void HandleGameActions() /* ---------- new screen button stuff -------------------------------------- */ /* graphic position and size values for buttons and scrollbars */ -#define SC_SCROLLBUTTON_XPOS 64 -#define SC_SCROLLBUTTON_YPOS 0 -#define SC_SCROLLBAR_XPOS 0 -#define SC_SCROLLBAR_YPOS 64 - #define SC_SCROLLBUTTON_XSIZE 32 #define SC_SCROLLBUTTON_YSIZE 32 @@ -2408,29 +2868,33 @@ void HandleGameActions() static struct { - int xpos, ypos; + int gfx_unpressed, gfx_pressed; int x, y; int gadget_id; char *infotext; } scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] = { { - SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS, - SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS, + IMG_ARROW_BLUE_UP, IMG_ARROW_RED_UP, + SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS, SCREEN_CTRL_ID_SCROLL_UP, - "scroll level series up" + "scroll up" }, { - SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS, - SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS, + IMG_ARROW_BLUE_DOWN, IMG_ARROW_RED_DOWN, + SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS, SCREEN_CTRL_ID_SCROLL_DOWN, - "scroll level series down" + "scroll down" } }; static struct { - int xpos, ypos; +#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; @@ -2439,9 +2903,13 @@ static struct } scrollbar_info[NUM_SCREEN_SCROLLBARS] = { { - SC_SCROLLBAR_XPOS, SC_SCROLLBAR_YPOS, - SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS, - SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE, +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + &scrollbar_bitmap[0], &scrollbar_bitmap[1], +#else + IMG_SCROLLBAR_BLUE, 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, SCREEN_CTRL_ID_SCROLL_VERTICAL, "scroll level series vertically" @@ -2450,16 +2918,17 @@ static struct static void CreateScreenScrollbuttons() { - Bitmap *gd_bitmap = pix[PIX_MORE]; struct GadgetInfo *gi; unsigned long event_mask; int i; for (i=0; iclip_mask = + graphic_info[IMG_SCROLLBAR_BLUE + i].clip_mask; + scrollbar_bitmap[i]->stored_clip_gc = + graphic_info[IMG_SCROLLBAR_BLUE + i].clip_gc; + + BlitBitmap(graphic_info[IMG_SCROLLBAR_BLUE + i].bitmap, + scrollbar_bitmap[i], + graphic_info[IMG_SCROLLBAR_BLUE + i].src_x, + graphic_info[IMG_SCROLLBAR_BLUE + 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; icustom_id; - if (game_status != CHOOSELEVEL) + if (game_status != CHOOSELEVEL && game_status != SETUP) return; switch (id) { case SCREEN_CTRL_ID_SCROLL_UP: - HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK); + else if (game_status == SETUP) + HandleSetupScreen(SX,SY + 32, 0,0, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_DOWN: - HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); + else if (game_status == SETUP) + HandleSetupScreen(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: - HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); + else if (game_status == SETUP) + HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); break; default: