X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b9b7c5dde86630c7858ad9338821c368b830fa09;hb=a1bc27d0855dc6fa72c4c361fc1671b2dcc6547b;hp=f2335cac639ab23a52c3e2e5e3854f5f2aba8649;hpb=f8f7840ddc57a2c31a3d6ab664b0e4e7e7ad69ce;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index f2335cac..b9b7c5dd 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,45 +1,47 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2001 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* screens.c * +* screens.c * ***********************************************************/ +#include "libgame/libgame.h" + #include "screens.h" #include "events.h" -#include "sound.h" #include "game.h" #include "tools.h" #include "editor.h" -#include "misc.h" #include "files.h" -#include "buttons.h" #include "tape.h" -#include "joystick.h" #include "cartoons.h" #include "network.h" #include "init.h" -/* for DrawSetupScreen(), HandleSetupScreen() */ -#define SETUP_SCREEN_POS_START 2 -#define SETUP_SCREEN_POS_END (SCR_FIELDY - 1) -#define SETUP_SCREEN_POS_EMPTY1 (SETUP_SCREEN_POS_END - 2) -#define SETUP_SCREEN_POS_EMPTY2 (SETUP_SCREEN_POS_END - 2) +/* screens in the setup menu */ +#define SETUP_MODE_MAIN 0 +#define SETUP_MODE_INPUT 1 +#define SETUP_MODE_GRAPHICS 2 +#define SETUP_MODE_SOUND 3 + +#define MAX_SETUP_MODES 4 /* for HandleSetupInputScreen() */ -#define SETUPINPUT_SCREEN_POS_START 2 -#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 2) +#define SETUPINPUT_SCREEN_POS_START 0 +#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 4) #define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3) #define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1) /* for HandleChooseLevel() */ -#define MAX_LEVEL_SERIES_ON_SCREEN (SCR_FIELDY - 2) +#define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - 2) +#define MENU_SCREEN_START_YPOS 2 +#define MENU_SCREEN_VALUE_XPOS 14 /* buttons and scrollbars identifiers */ #define SCREEN_CTRL_ID_SCROLL_UP 0 @@ -55,16 +57,62 @@ static void HandleScreenGadgets(struct GadgetInfo *); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; -#ifdef MSDOS -extern unsigned char get_ascii(KeySym); -#endif +static void drawCursorExt(int pos, int color, int graphic) +{ + static int cursor_array[SCR_FIELDY]; + + if (graphic) + cursor_array[pos] = graphic; + + graphic = cursor_array[pos]; + + 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); + + DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic); +} + +static void initCursor(int pos, int graphic) +{ + drawCursorExt(pos, FC_BLUE, graphic); +} + +static void drawCursor(int pos, int color) +{ + drawCursorExt(pos, color, 0); +} void DrawHeadline() { int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2; DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW); - DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING); + DrawTextFCentered(46, FC_RED, WINDOW_SUBTITLE_STRING); +} + +static void ToggleFullscreenIfNeeded() +{ + if (setup.fullscreen != video.fullscreen_enabled) + { + /* save old door content */ + BlitBitmap(backbuffer, pix[PIX_DB_DOOR], + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + + /* toggle fullscreen */ + ChangeVideoModeIfNeeded(setup.fullscreen); + setup.fullscreen = video.fullscreen_enabled; + + /* redraw background to newly created backbuffer */ + BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); + + /* restore old door content */ + BlitBitmap(pix[PIX_DB_DOOR], backbuffer, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); + + redraw_mask = REDRAW_ALL; + } } void DrawMainMenu() @@ -75,7 +123,9 @@ void DrawMainMenu() UnmapAllGadgets(); FadeSounds(); - XAutoRepeatOn(display); + KeyboardAutoRepeatOn(); + ActivateJoystickIfAvailable(); + SetDrawDeactivationMask(REDRAW_NONE); /* needed if last screen was the playing screen, invoked from level editor */ if (level_editor_test_game) @@ -88,6 +138,13 @@ void DrawMainMenu() /* needed if last screen was the editor screen */ UndrawSpecialEditorDoor(); + /* needed if last screen was the setup screen and fullscreen state changed */ + ToggleFullscreenIfNeeded(); + +#ifdef TARGET_SDL + SetDrawtoField(DRAW_BACKBUFFER); +#endif + /* map gadgets for main menu screen */ MapTapeButtons(); @@ -131,8 +188,9 @@ void DrawMainMenu() DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY"); } - for(i=2; i<10; i++) - DrawGraphic(0, i, GFX_KUGEL_BLAU); + for(i=0; i<8; i++) + initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU)); + DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT); DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT); @@ -178,13 +236,13 @@ static void gotoTopLevelDir() int num_page_entries; int cl_first, cl_cursor; - if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN) + if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN) num_page_entries = num_leveldirs; else - num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1; + num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1; cl_first = MAX(0, leveldir_pos - num_page_entries + 1); - cl_cursor = leveldir_pos - cl_first + 3; + cl_cursor = leveldir_pos - cl_first; leveldir_current->node_parent->node_group->cl_first = cl_first; leveldir_current->node_parent->node_group->cl_cursor = cl_cursor; @@ -196,48 +254,31 @@ static void gotoTopLevelDir() void HandleMainMenu(int mx, int my, int dx, int dy, int button) { - static int choice = 3; - static int redraw = TRUE; - int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32; - - if (redraw || button == MB_MENU_INITIALIZE) - { - DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); - redraw = FALSE; - } + static int choice = 0; + int x = 0; + int y = choice; if (button == MB_MENU_INITIALIZE) + { + drawCursor(choice, FC_RED); return; + } - if (dx || dy) + if (mx || my) /* mouse input */ { - if (dx && choice == 4) - { - x = (dx < 0 ? 11 : 15); - y = 4; - } - else if (dy) - { - x = 1; - y = choice + dy; - } - else - x = y = 0; - - if (y < 3) - y = 3; - else if (y > 10) - y = 10; + x = (mx - SX) / 32; + y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; } - - if (!mx && !my && !dx && !dy) + else if (dx || dy) /* keyboard input */ { - x = 1; - y = choice; + if (dx && choice == 1) + x = (dx < 0 ? 10 : 14); + else if (dy) + y = choice + dy; } - if (y == 4 && ((x == 11 && level_nr > leveldir_current->first_level) || - (x == 15 && level_nr < leveldir_current->last_level)) && + if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) || + (x == 14 && level_nr < leveldir_current->last_level)) && button) { static unsigned long level_delay = 0; @@ -245,7 +286,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) 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 == 11 ? -step : +step); + new_level_nr = level_nr + (x == 10 ? -step : +step); if (new_level_nr < leveldir_current->first_level) new_level_nr = leveldir_current->first_level; if (new_level_nr > leveldir_current->last_level) @@ -260,9 +301,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) level_nr = new_level_nr; - DrawTextExt(drawto, gc, SX + 11 * 32, SY + 3 * 32, + DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32, int2str(level_nr, 3), FS_BIG, font_color); - DrawTextExt(window, gc, SX + 11 * 32, SY + 3 * 32, + DrawTextExt(window, SX + 11 * 32, SY + 3 * 32, int2str(level_nr, 3), FS_BIG, font_color); LoadLevel(level_nr); @@ -274,28 +315,28 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) /* needed because DrawMicroLevel() takes some time */ BackToFront(); - XSync(display, FALSE); + SyncDisplay(); DelayReached(&level_delay, 0); /* reset delay counter */ } - else if (x == 1 && y >= 3 && y <= 10) + else if (x == 0 && y >= 0 && y <= 7) { if (button) { if (y != choice) { - DrawGraphic(0, y - 1, GFX_KUGEL_ROT); - DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU); + drawCursor(y, FC_RED); + drawCursor(choice, FC_BLUE); choice = y; } } else { - if (y == 3) + if (y == 0) { game_status = TYPENAME; HandleTypeName(strlen(setup.player_name), 0); } - else if (y == 4) + else if (y == 1) { if (leveldir_first) { @@ -308,12 +349,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) DrawChooseLevel(); } } - else if (y == 5) + else if (y == 2) { game_status = HALLOFFAME; DrawHallOfFame(-1); } - else if (y == 6) + else if (y == 3) { if (leveldir_current->readonly && strcmp(setup.player_name, "Artsoft") != 0) @@ -321,17 +362,17 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = LEVELED; DrawLevelEd(); } - else if (y == 7) + else if (y == 4) { game_status = HELPSCREEN; DrawHelpScreen(); } - else if (y == 8) + else if (y == 5) { if (setup.autorecord) TapeStartRecording(); -#ifndef MSDOS +#if defined(PLATFORM_UNIX) if (options.network) SendToServer_StartPlaying(); else @@ -342,22 +383,21 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) InitGame(); } } - else if (y == 9) + else if (y == 6) { game_status = SETUP; DrawSetupScreen(); } - else if (y == 10) + else if (y == 7) { SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } - - redraw = TRUE; } } + BackToFront(); out: @@ -369,6 +409,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } } + #define MAX_HELPSCREEN_ELS 10 #define HA_NEXT -999 #define HA_END -1000 @@ -561,6 +602,7 @@ static char *helpscreen_music[][3] = { "Voyager", "The Alan Parsons Project","Pyramid" }, { "Twilight Painter", "Tangerine Dream", "Heartbreakers" } }; +static int num_helpscreen_music = 7; static int helpscreen_musicpos; void DrawHelpScreenElAction(int start) @@ -615,7 +657,7 @@ void DrawHelpScreenElAction(int start) } j++; - DrawGraphicExt(drawto, gc, xstart, ystart+(i-start)*ystep, graphic+frame); + DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame); i++; } @@ -675,7 +717,9 @@ void DrawHelpScreenMusicText(int num) DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); +#if 0 PlaySoundLoop(background_loop[num]); +#endif } void DrawHelpScreenCreditsText() @@ -690,7 +734,7 @@ void DrawHelpScreenCreditsText() DrawTextFCentered(100, FC_GREEN, "Credits:"); DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, - "DOS/Windows port of the game:"); + "DOS port of the game:"); DrawTextFCentered(ystart + 1 * ystep, FC_RED, "Guido Schulz"); DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, @@ -720,13 +764,13 @@ void DrawHelpScreenContactText() DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW, "If you like it, send e-mail to:"); DrawTextFCentered(ystart + 2 * ystep, FC_RED, - "aeglos@valinor.owl.de"); + "info@artsoft.org"); DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW, "or SnailMail to:"); DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED, "Holger Schemel"); DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED, - "Oststrasse 11a"); + "Detmolder Strasse 189"); DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED, "33604 Bielefeld"); DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED, @@ -779,17 +823,20 @@ void HandleHelpScreen(int button) DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS); DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS); } - else if (helpscreen_state < num_helpscreen_els_pages + num_bg_loops - 1) + else if (helpscreen_state < + num_helpscreen_els_pages + num_helpscreen_music - 1) { helpscreen_state++; DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages); } - else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops - 1) + else if (helpscreen_state == + num_helpscreen_els_pages + num_helpscreen_music - 1) { helpscreen_state++; DrawHelpScreenCreditsText(); } - else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops) + else if (helpscreen_state == + num_helpscreen_els_pages + num_helpscreen_music) { helpscreen_state++; DrawHelpScreenContactText(); @@ -814,7 +861,7 @@ void HandleHelpScreen(int button) BackToFront(); } -void HandleTypeName(int newxpos, KeySym key) +void HandleTypeName(int newxpos, Key key) { static int xpos = 0, ypos = 2; @@ -826,33 +873,34 @@ void HandleTypeName(int newxpos, KeySym key) return; } - if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && + if (((key >= KSYM_A && key <= KSYM_Z) || + (key >= KSYM_a && key <= KSYM_z)) && xpos < MAX_PLAYER_NAME_LEN) { char ascii; - if (key >= XK_A && key <= XK_Z) - ascii = 'A' + (char)(key - XK_A); + if (key >= KSYM_A && key <= KSYM_Z) + ascii = 'A' + (char)(key - KSYM_A); else - ascii = 'a' + (char)(key - XK_a); + ascii = 'a' + (char)(key - KSYM_a); setup.player_name[xpos] = ascii; setup.player_name[xpos + 1] = 0; xpos++; - DrawTextExt(drawto, gc, SX + 6*32, SY + ypos*32, + DrawTextExt(drawto, SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW); - DrawTextExt(window, gc, SX + 6*32, SY + ypos*32, + DrawTextExt(window, SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW); DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); } - else if ((key == XK_Delete || key == XK_BackSpace) && xpos > 0) + else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) { xpos--; setup.player_name[xpos] = 0; DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM); } - else if (key == XK_Return && xpos > 0) + 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); @@ -864,33 +912,6 @@ void HandleTypeName(int newxpos, KeySym key) BackToFront(); } -static void drawCursorExt(int ypos, int color, int graphic) -{ - static int cursor_array[SCR_FIELDY]; - - if (graphic) - cursor_array[ypos] = graphic; - - 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); - - DrawGraphic(0, ypos, graphic); -} - -static void initCursor(int ypos, int graphic) -{ - drawCursorExt(ypos, FC_BLUE, graphic); -} - -static void drawCursor(int ypos, int color) -{ - drawCursorExt(ypos, color, 0); -} - void DrawChooseLevel() { UnmapAllGadgets(); @@ -910,7 +931,7 @@ static void AdjustChooseLevelScrollbar(int id, int first_entry) int items_max, items_visible, item_position; items_max = numLevelDirInfoInGroup(leveldir_current); - items_visible = MAX_LEVEL_SERIES_ON_SCREEN - 1; + items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1; item_position = first_entry; if (item_position > items_max - items_visible) @@ -927,7 +948,7 @@ static void drawChooseLevelList(int first_entry, int num_page_entries) int max_buffer_len = (SCR_FIELDX - 2) * 2; int num_leveldirs = numLevelDirInfoInGroup(leveldir_current); - XFillRectangle(display, backbuffer, gc, SX, SY, SXSIZE - 32, SYSIZE); + ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE); redraw_mask |= REDRAW_FIELD; DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN); @@ -936,7 +957,7 @@ static void drawChooseLevelList(int first_entry, int num_page_entries) { struct LevelDirInfo *node, *node_first; int leveldir_pos = first_entry + i; - int ypos = i + 2; + int ypos = MENU_SCREEN_START_YPOS + i; node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node = getLevelDirInfoFromPos(node_first, leveldir_pos); @@ -947,18 +968,18 @@ static void drawChooseLevelList(int first_entry, int num_page_entries) DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color); if (node->parent_link) - initCursor(ypos, GFX_ARROW_BLUE_LEFT); + initCursor(i, GFX_ARROW_BLUE_LEFT); else if (node->level_group) - initCursor(ypos, GFX_ARROW_BLUE_RIGHT); + initCursor(i, GFX_ARROW_BLUE_RIGHT); else - initCursor(ypos, GFX_KUGEL_BLAU); + initCursor(i, GFX_KUGEL_BLAU); } if (first_entry > 0) DrawGraphic(0, 1, GFX_ARROW_BLUE_UP); if (first_entry + num_page_entries < num_leveldirs) - DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN); + DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN); } static void drawChooseLevelInfo(int leveldir_pos) @@ -969,7 +990,7 @@ static void drawChooseLevelInfo(int leveldir_pos) node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node = getLevelDirInfoFromPos(node_first, leveldir_pos); - XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 64, 32); + ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32); if (node->parent_link) DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc); @@ -988,16 +1009,16 @@ static void drawChooseLevelInfo(int leveldir_pos) void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { static unsigned long choose_delay = 0; - static int redraw = TRUE; - int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32; + int x = 0; + int y = leveldir_current->cl_cursor; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int num_leveldirs = numLevelDirInfoInGroup(leveldir_current); int num_page_entries; - if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN) + if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN) num_page_entries = num_leveldirs; else - num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1; + num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1; if (button == MB_MENU_INITIALIZE) { @@ -1007,7 +1028,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { leveldir_current->cl_first = MAX(0, leveldir_pos - num_page_entries + 1); leveldir_current->cl_cursor = - leveldir_pos - leveldir_current->cl_first + 3; + leveldir_pos - leveldir_current->cl_first; } if (dx == 999) /* first entry is set by scrollbar position */ @@ -1017,39 +1038,45 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) leveldir_current->cl_first); drawChooseLevelList(leveldir_current->cl_first, num_page_entries); - drawChooseLevelInfo(leveldir_pos); - redraw = TRUE; + drawChooseLevelInfo(leveldir_current->cl_first + + leveldir_current->cl_cursor); + drawCursor(leveldir_current->cl_cursor, FC_RED); + return; } - - if (redraw) + else if (button == MB_MENU_LEAVE) { - drawCursor(leveldir_current->cl_cursor - 1, FC_RED); - redraw = FALSE; - } - - if (button == MB_MENU_INITIALIZE) + if (leveldir_current->node_parent) + { + leveldir_current = leveldir_current->node_parent; + DrawChooseLevel(); + } + else + { + game_status = MAINMENU; + DrawMainMenu(); + } return; + } - if (dx || dy) + if (mx || my) /* mouse input */ + { + x = (mx - SX) / 32; + y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; + } + else if (dx || dy) /* keyboard input */ { if (dy) - { - x = 1; y = leveldir_current->cl_cursor + dy; - } - else - x = y = 0; /* no action */ - if (ABS(dy) == SCR_FIELDY) /* handle XK_Page_Up, XK_Page_Down */ + if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */ { dy = SIGN(dy); step = num_page_entries - 1; - x = 1; - y = (dy < 0 ? 2 : num_page_entries + 3); + y = (dy < 0 ? -1 : num_page_entries); } } - if (x == 1 && y == 2) + if (x == 0 && y == -1) { if (leveldir_current->cl_first > 0 && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) @@ -1060,14 +1087,14 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) drawChooseLevelList(leveldir_current->cl_first, num_page_entries); drawChooseLevelInfo(leveldir_current->cl_first + - leveldir_current->cl_cursor - 3); - drawCursor(leveldir_current->cl_cursor - 1, FC_RED); + leveldir_current->cl_cursor); + drawCursor(leveldir_current->cl_cursor, FC_RED); AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, leveldir_current->cl_first); return; } } - else if (x == 1 && y > num_page_entries + 2) + else if (x == 0 && y > num_page_entries - 1) { if (leveldir_current->cl_first + num_page_entries < num_leveldirs && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) @@ -1078,25 +1105,18 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) drawChooseLevelList(leveldir_current->cl_first, num_page_entries); drawChooseLevelInfo(leveldir_current->cl_first + - leveldir_current->cl_cursor - 3); - drawCursor(leveldir_current->cl_cursor - 1, FC_RED); + leveldir_current->cl_cursor); + drawCursor(leveldir_current->cl_cursor, FC_RED); AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, leveldir_current->cl_first); return; } } - if (!mx && !my && !dx && !dy) - { - x = 1; - y = leveldir_current->cl_cursor; - } - if (dx == 1) { struct LevelDirInfo *node_first, *node_cursor; - int leveldir_pos = - leveldir_current->cl_first + leveldir_current->cl_cursor - 3; + int leveldir_pos = leveldir_current->cl_first + y; node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos); @@ -1107,30 +1127,32 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) node_cursor->cl_cursor = leveldir_current->cl_cursor; leveldir_current = node_cursor->node_group; DrawChooseLevel(); + return; } } else if (dx == -1 && leveldir_current->node_parent) { leveldir_current = leveldir_current->node_parent; DrawChooseLevel(); + return; } - if (x == 1 && y >= 3 && y <= num_page_entries + 2) + if (x == 0 && y >= 0 && y < num_page_entries) { if (button) { if (y != leveldir_current->cl_cursor) { - drawCursor(y - 1, FC_RED); - drawCursor(leveldir_current->cl_cursor - 1, FC_BLUE); - drawChooseLevelInfo(leveldir_current->cl_first + y - 3); + drawCursor(y, FC_RED); + drawCursor(leveldir_current->cl_cursor, FC_BLUE); + drawChooseLevelInfo(leveldir_current->cl_first + y); leveldir_current->cl_cursor = y; } } else { struct LevelDirInfo *node_first, *node_cursor; - int leveldir_pos = leveldir_current->cl_first + y - 3; + int leveldir_pos = leveldir_current->cl_first + y; node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos); @@ -1140,15 +1162,19 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) node_cursor->cl_first = leveldir_current->cl_first; node_cursor->cl_cursor = leveldir_current->cl_cursor; leveldir_current = node_cursor->node_group; + DrawChooseLevel(); } else if (node_cursor->parent_link) { leveldir_current = node_cursor->node_parent; + DrawChooseLevel(); } else { + node_cursor->cl_first = leveldir_current->cl_first; + node_cursor->cl_cursor = leveldir_current->cl_cursor; leveldir_current = node_cursor; LoadLevelSetup_SeriesInfo(); @@ -1172,6 +1198,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) void DrawHallOfFame(int highlight_position) { UnmapAllGadgets(); + FadeSounds(); CloseDoor(DOOR_CLOSE_2); if (highlight_position < 0) @@ -1191,7 +1218,7 @@ static void drawHallOfFameList(int first_entry, int highlight_position) DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW); DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr); - for(i=0; i 0) { - if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN < MAX_SCORE_ENTRIES) + if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES) { first_entry += step; - if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN > MAX_SCORE_ENTRIES) - first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_LEVEL_SERIES_ON_SCREEN); + if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES) + first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_MENU_ENTRIES_ON_SCREEN); drawHallOfFameList(first_entry, highlight_position); return; @@ -1269,63 +1296,161 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) DoAnimation(); } -void DrawSetupScreen() + +/* ========================================================================= */ +/* setup screen functions */ +/* ========================================================================= */ + +static struct TokenInfo *setup_info; +static int num_setup_info; +static int setup_mode = SETUP_MODE_MAIN; + +static void execSetupMain() { - int i; - static struct setup - { - boolean *value; - char *text; - } setup_info[] = - { - { &setup.sound, "Sound:", }, - { &setup.sound_loops, " Sound Loops:" }, - { &setup.sound_music, " Game Music:" }, + setup_mode = SETUP_MODE_MAIN; + DrawSetupScreen(); +} + +static void execSetupSound() +{ + setup_mode = SETUP_MODE_SOUND; + DrawSetupScreen(); +} + +static void execSetupInput() +{ + setup_mode = SETUP_MODE_INPUT; + DrawSetupScreen(); +} + +static void execExitSetup() +{ + game_status = MAINMENU; + DrawMainMenu(); +} + +static void execSaveAndExitSetup() +{ + SaveSetup(); + execExitSetup(); +} + +static struct TokenInfo setup_info_main[] = +{ + { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" }, + { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, + { TYPE_EMPTY, NULL, "" }, #if 0 - { &setup.toons, "Toons:" }, - { &setup.double_buffering, "Buffered gfx:" }, + { TYPE_SWITCH, &setup.sound, "Sound:", }, + { TYPE_SWITCH, &setup.sound_loops, " Sound Loops:" }, + { TYPE_SWITCH, &setup.sound_music, " Game Music:" }, #endif - { &setup.scroll_delay, "Scroll Delay:" }, - { &setup.soft_scrolling, "Soft Scroll.:" }, - { &setup.fading, "Fading:" }, - { &setup.quick_doors, "Quick Doors:" }, - { &setup.autorecord, "Auto-Record:" }, - { &setup.team_mode, "Team-Mode:" }, - { &setup.handicap, "Handicap:" }, - { &setup.time_limit, "Timelimit:" }, - { NULL, "Input Devices" }, - { NULL, "" }, - { NULL, "Exit" }, - { NULL, "Save and exit" } - }; + { TYPE_SWITCH, &setup.toons, "Toons:" }, +#if 0 + { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, +#endif + { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, + { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" }, +#if 0 + { TYPE_SWITCH, &setup.fading, "Fading:" }, +#endif + { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, + { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, + { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, + { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" }, + { TYPE_SWITCH, &setup.handicap, "Handicap:" }, + { TYPE_SWITCH, &setup.time_limit, "Timelimit:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, + { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_sound[] = +{ + { TYPE_SWITCH, &setup.sound, "Sound:", }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" }, + { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" }, + { TYPE_SWITCH, &setup.sound_music, "Game Music:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { 0, NULL, NULL } +}; + +static void drawSetupValue(int pos) +{ + int xpos = MENU_SCREEN_VALUE_XPOS; + int ypos = MENU_SCREEN_START_YPOS + pos; + int value_color = FC_YELLOW; + char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED, + setup_info[pos].value); + + if (setup_info[pos].type & TYPE_SWITCH || + setup_info[pos].type & TYPE_YES_NO) + { + boolean value = *(boolean *)(setup_info[pos].value); + int value_length = 3; + + if (!value) + value_color = FC_BLUE; + + if (strlen(value_string) < value_length) + strcat(value_string, " "); + } + + DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color); +} + +static void DrawGenericSetupScreen() +{ + char *title_string = NULL; + int i; UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); ClearWindow(); - DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW); + if (setup_mode == SETUP_MODE_MAIN) + { + setup_info = setup_info_main; + title_string = "Setup"; + } + else if (setup_mode == SETUP_MODE_SOUND) + { + setup_info = setup_info_sound; + title_string = "Sound Setup"; + } + + DrawText(SX + 16, SY + 16, title_string, FS_BIG, FC_YELLOW); - for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) + num_setup_info = 0; + for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) { - int base = i - SETUP_SCREEN_POS_START; + void *value_ptr = setup_info[i].value; + int ypos = MENU_SCREEN_START_YPOS + i; - if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2)) - { - DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN); + /* set some entries to "unchangeable" according to other variables */ + 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 (strcmp(setup_info[base].text, "Input Devices") == 0) - initCursor(i, GFX_ARROW_BLUE_RIGHT); - else - initCursor(i, GFX_KUGEL_BLAU); - } + DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN); - if (setup_info[base].value) - { - int setting_value = *setup_info[base].value; + if (setup_info[i].type & TYPE_ENTER_MENU) + initCursor(i, GFX_ARROW_BLUE_RIGHT); + else if (setup_info[i].type & TYPE_LEAVE_MENU) + initCursor(i, GFX_ARROW_BLUE_LEFT); + else if (setup_info[i].type != TYPE_EMPTY) + initCursor(i, GFX_KUGEL_BLAU); - DrawText(SX+14*32, SY+i*32, (setting_value ? "on" : "off"), - FS_BIG, (setting_value ? FC_YELLOW : FC_BLUE)); - } + if (setup_info[i].type & TYPE_BOOLEAN_STYLE) + drawSetupValue(i); + + num_setup_info++; } FadeToFront(); @@ -1333,237 +1458,91 @@ void DrawSetupScreen() HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); } -void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button) { - static int choice = 3; - static int redraw = TRUE; - int x = (mx+32-SX)/32, y = (my+32-SY)/32; - int pos_start = SETUP_SCREEN_POS_START + 1; - int pos_empty1 = SETUP_SCREEN_POS_EMPTY1 + 1; - int pos_empty2 = SETUP_SCREEN_POS_EMPTY2 + 1; - int pos_end = SETUP_SCREEN_POS_END + 1; + static int choice_store[MAX_SETUP_MODES]; + int choice = choice_store[setup_mode]; + int x = 0; + int y = choice; if (button == MB_MENU_INITIALIZE) - redraw = TRUE; - - if (redraw) { - drawCursor(choice - 1, FC_RED); - redraw = FALSE; - } - - if (button == MB_MENU_INITIALIZE) + drawCursor(choice, FC_RED); return; - - if (dx || dy) + } + else if (button == MB_MENU_LEAVE) { - if (dy) + for (y=0; y= pos_empty1 && y <= pos_empty2) - y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); + menu_callback_function(); + break; /* absolutely needed because 'setup_info' has changed! */ + } + } - if (y < pos_start) - y = pos_start; - else if (y > pos_end) - y = pos_end; + return; } - if (!mx && !my && !dx && !dy) + if (mx || my) /* mouse input */ { - x = 1; - y = choice; + x = (mx - SX) / 32; + y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; } - - if (dx == 1 && choice == 14) + else if (dx || dy) /* keyboard input */ { - game_status = SETUPINPUT; - DrawSetupInputScreen(); - redraw = TRUE; + if (dx) + { + int type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU); + + if (!(setup_info[choice].type & TYPE_ENTER_OR_LEAVE_MENU) || + setup_info[choice].type == type) + button = MB_MENU_CHOICE; + } + else if (dy) + y = choice + dy; + + /* jump to next non-empty menu entry (up or down) */ + while (y > 0 && y < num_setup_info - 1 && + setup_info[y].type == TYPE_EMPTY) + y += dy; } - if (x==1 && y >= pos_start && y <= pos_end && - !(y >= pos_empty1 && y <= pos_empty2)) + if (x == 0 && y >= 0 && y < num_setup_info && + setup_info[y].type != TYPE_EMPTY) { if (button) { - if (y!=choice) + if (y != choice) { - drawCursor(y - 1, FC_RED); - drawCursor(choice - 1, FC_BLUE); + drawCursor(y, FC_RED); + drawCursor(choice, FC_BLUE); + choice = choice_store[setup_mode] = y; } - choice = y; } - else + else if (!(setup_info[y].type & TYPE_GHOSTED)) { - int yy = y-1; - - if (y==3 && sound_status==SOUND_AVAILABLE) - { - if (setup.sound) - { - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE); - DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE); - setup.sound_loops = FALSE; - setup.sound_music = FALSE; - } - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.sound = !setup.sound; - } - else if (y==4 && sound_loops_allowed) + if (setup_info[y].type & TYPE_BOOLEAN_STYLE) { - if (setup.sound_loops) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - { - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW); - setup.sound = TRUE; - } - setup.sound_loops = !setup.sound_loops; - } - else if (y==5 && sound_loops_allowed) - { - if (setup.sound_music) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - { - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW); - setup.sound = TRUE; - } - setup.sound_music = !setup.sound_music; - } + boolean new_value = !*(boolean *)(setup_info[y].value); -#if 0 - else if (y==6) - { - if (setup.toons) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.toons = !setup.toons; + *(boolean *)setup_info[y].value = new_value; + drawSetupValue(y); } - else if (y==7) + else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) { -#if 0 - if (setup.double_buffering) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.double_buffering = !setup.double_buffering; - setup.direct_draw = !setup.double_buffering; -#else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.double_buffering = TRUE; - setup.direct_draw = !setup.double_buffering; -#endif - } -#endif + void (*menu_callback_function)(void) = setup_info[choice].value; - else if (y==6) - { - if (setup.scroll_delay) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.scroll_delay = !setup.scroll_delay; - } - else if (y==7) - { - if (setup.soft_scrolling) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.soft_scrolling = !setup.soft_scrolling; - } - else if (y==8) - { - if (setup.fading) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.fading = !setup.fading; - } - else if (y==9) - { - if (setup.quick_doors) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.quick_doors = !setup.quick_doors; - } - else if (y==10) - { - if (setup.autorecord) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.autorecord = !setup.autorecord; - } - else if (y==11) - { - if (setup.team_mode) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.team_mode = !setup.team_mode; - } - else if (y==12) - { - if (setup.handicap) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.handicap = !setup.handicap; - } - else if (y==13) - { - if (setup.time_limit) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.time_limit = !setup.time_limit; - } - else if (y==14) - { - game_status = SETUPINPUT; - DrawSetupInputScreen(); - redraw = TRUE; - } - else if (y==pos_end-1 || y==pos_end) - { - if (y==pos_end) - { - SaveSetup(); - - /* - SaveJoystickData(); - */ - -#ifdef MSDOS - save_joystick_data(JOYSTICK_FILENAME); -#endif - - - } - - game_status = MAINMENU; - DrawMainMenu(); - redraw = TRUE; + menu_callback_function(); } } } + BackToFront(); - if (game_status==SETUP) + if (game_status == SETUP) DoAnimation(); } @@ -1572,18 +1551,19 @@ void DrawSetupInputScreen() ClearWindow(); DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW); - initCursor(2, GFX_KUGEL_BLAU); - initCursor(3, GFX_KUGEL_BLAU); - initCursor(4, GFX_ARROW_BLUE_RIGHT); - initCursor(15, GFX_KUGEL_BLAU); + initCursor(0, GFX_KUGEL_BLAU); + initCursor(1, GFX_KUGEL_BLAU); + initCursor(2, GFX_ARROW_BLUE_RIGHT); + initCursor(13, GFX_ARROW_BLUE_LEFT); - DrawGraphic(10, 2, GFX_ARROW_BLUE_LEFT); - DrawGraphic(12, 2, GFX_ARROW_BLUE_RIGHT); + DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT); + DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_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); + DeactivateJoystickForCalibration(); DrawTextFCentered(SYSIZE - 20, FC_BLUE, "Joysticks deactivated on this screen"); @@ -1609,7 +1589,8 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr) device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10); } else - strncpy(device_name, joystick_device_name[device_nr], strlen(device_name)); + strncpy(device_name, getDeviceNameFromJoystickNr(device_nr), + strlen(device_name)); } static void drawPlayerSetupInputInfo(int player_nr) @@ -1618,7 +1599,7 @@ static void drawPlayerSetupInputInfo(int player_nr) static struct SetupKeyboardInfo custom_key; static struct { - KeySym *keysym; + Key *key; char *text; } custom[] = { @@ -1678,99 +1659,81 @@ static void drawPlayerSetupInputInfo(int player_nr) DrawText(SX + 3*32, SY + ypos*32, (setup.input[player_nr].use_joystick ? custom[i].text : - getKeyNameFromKeySym(*custom[i].keysym)), + getKeyNameFromKey(*custom[i].key)), FS_BIG, FC_YELLOW); } } void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) { - static int choice = 3; + static int choice = 0; static int player_nr = 0; - static int redraw = TRUE; - int x = (mx+32-SX)/32, y = (my+32-SY)/32; - int pos_start = SETUPINPUT_SCREEN_POS_START + 1; - int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1 + 1; - int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2 + 1; - int pos_end = SETUPINPUT_SCREEN_POS_END + 1; + int x = 0; + int y = choice; + int pos_start = SETUPINPUT_SCREEN_POS_START; + int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1; + int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2; + int pos_end = SETUPINPUT_SCREEN_POS_END; if (button == MB_MENU_INITIALIZE) { drawPlayerSetupInputInfo(player_nr); - redraw = TRUE; + drawCursor(choice, FC_RED); + return; } - - if (redraw) + else if (button == MB_MENU_LEAVE) { - drawCursor(choice - 1, FC_RED); - redraw = FALSE; + setup_mode = SETUP_MODE_MAIN; + DrawSetupScreen(); + InitJoysticks(); } - if (button == MB_MENU_INITIALIZE) - return; - - if (dx || dy) + if (mx || my) /* mouse input */ { - if (dx && choice == 3) - { - x = (dx < 0 ? 11 : 13); - y = 3; - } - else if (dx && choice == 4) - { + x = (mx - SX) / 32; + y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; + } + else if (dx || dy) /* keyboard input */ + { + if (dx && choice == 0) + x = (dx < 0 ? 10 : 12); + else if ((dx && choice == 1) || + (dx == +1 && choice == 2) || + (dx == -1 && choice == pos_end)) button = MB_MENU_CHOICE; - x = 1; - y = 4; - } else if (dy) - { - x = 1; y = choice + dy; - } - else - x = y = 0; if (y >= pos_empty1 && y <= pos_empty2) y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); - - if (y < pos_start) - y = pos_start; - else if (y > pos_end) - y = pos_end; - } - - if (!mx && !my && !dx && !dy) - { - x = 1; - y = choice; } - if (y == 3 && ((x == 1 && !button) || ((x == 11 || x == 13) && button))) + if (y == 0 && ((x == 0 && !button) || ((x == 10 || x == 12) && button))) { static unsigned long delay = 0; if (!DelayReached(&delay, GADGET_FRAME_DELAY)) goto out; - player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS; + player_nr = (player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS; drawPlayerSetupInputInfo(player_nr); } - else if (x==1 && y >= pos_start && y <= pos_end && + else if (x == 0 && y >= pos_start && y <= pos_end && !(y >= pos_empty1 && y <= pos_empty2)) { if (button) { if (y != choice) { - drawCursor(y - 1, FC_RED); - drawCursor(choice - 1, FC_BLUE); + drawCursor(y, FC_RED); + drawCursor(choice, FC_BLUE); + choice = y; } - choice = y; } else { - if (y == 4) + if (y == 1) { char *device_name = setup.input[player_nr].joy.device_name; @@ -1792,64 +1755,52 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) setJoystickDeviceToNr(device_name, new_device_nr); } - - /* - InitJoysticks(); - */ - - -#if 0 - int one_joystick_nr = (dx >= 0 ? 0 : 1); - int the_other_joystick_nr = (dx >= 0 ? 1 : 0); - - if (setup.input[player_nr].use_joystick) - { - if (setup.input[player_nr].joystick_nr == one_joystick_nr) - setup.input[player_nr].joystick_nr = the_other_joystick_nr; - else - setup.input[player_nr].use_joystick = FALSE; - } - else - { - setup.input[player_nr].use_joystick = TRUE; - setup.input[player_nr].joystick_nr = one_joystick_nr; - } -#endif - drawPlayerSetupInputInfo(player_nr); } - else if (y == 5) + else if (y == 2) { if (setup.input[player_nr].use_joystick) { InitJoysticks(); - game_status = CALIBRATION; CalibrateJoystick(player_nr); - game_status = SETUPINPUT; } else CustomizeKeyboard(player_nr); - - redraw = TRUE; } else if (y == pos_end) { InitJoysticks(); - game_status = SETUP; + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); - redraw = TRUE; } } } + BackToFront(); out: - if (game_status == SETUPINPUT) + if (game_status == SETUP) DoAnimation(); } +void DrawSetupScreen() +{ + if (setup_mode == SETUP_MODE_INPUT) + DrawSetupInputScreen(); + else + DrawGenericSetupScreen(); +} + +void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +{ + if (setup_mode == SETUP_MODE_INPUT) + HandleSetupInputScreen(mx, my, dx, dy, button); + else + HandleGenericSetupScreen(mx, my, dx, dy, button); +} + void CustomizeKeyboard(int player_nr) { int i; @@ -1858,7 +1809,7 @@ void CustomizeKeyboard(int player_nr) static struct SetupKeyboardInfo custom_key; static struct { - KeySym *keysym; + Key *key; char *text; } customize_step[] = { @@ -1885,47 +1836,50 @@ void CustomizeKeyboard(int player_nr) DrawText(SX, SY + (2+2*step_nr+1)*32, "Key:", FS_BIG, FC_RED); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeyNameFromKeySym(*customize_step[step_nr].keysym), + getKeyNameFromKey(*customize_step[step_nr].key), FS_BIG, FC_BLUE); while(!finished) { - if (XPending(display)) /* got event from X server */ + if (PendingEvent()) /* got event */ { - XEvent event; + Event event; - XNextEvent(display, &event); + NextEvent(&event); switch(event.type) { - case KeyPress: + case EVENT_KEYPRESS: { - KeySym key = XLookupKeysym((XKeyEvent *)&event, - ((XKeyEvent *)&event)->state); + Key key = GetEventKey((KeyEvent *)&event, TRUE); - if (key == XK_Escape || (key == XK_Return && step_nr == 6)) + if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { finished = TRUE; break; } + /* all keys configured -- wait for "Escape" or "Return" key */ + if (step_nr == 6) + break; + /* press 'Enter' to keep the existing key binding */ - if (key == XK_Return || step_nr == 6) - key = *customize_step[step_nr].keysym; + if (key == KSYM_Return) + key = *customize_step[step_nr].key; /* check if key already used */ for (i=0; istate)) + case EVENT_KEYPRESS: + switch(GetEventKey((KeyEvent *)&event, TRUE)) { - case XK_Return: + case KSYM_Return: if (check_remaining == 0) result = 1; break; - case XK_Escape: + case KSYM_Escape: result = 0; break; @@ -2082,7 +2016,7 @@ void CalibrateJoystick(int player_nr) } break; - case KeyRelease: + case EVENT_KEYRELEASE: key_joystick_mapping = 0; break; @@ -2092,22 +2026,13 @@ void CalibrateJoystick(int player_nr) } } -#ifndef MSDOS - if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) - { - joystick_status = JOYSTICK_OFF; - goto error_out; - } - - new_joystick_xleft = MIN(new_joystick_xleft, joy_ctrl.x); - new_joystick_xright = MAX(new_joystick_xright, joy_ctrl.x); - new_joystick_yupper = MIN(new_joystick_yupper, joy_ctrl.y); - new_joystick_ylower = MAX(new_joystick_ylower, joy_ctrl.y); + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; - new_joystick_xmiddle = - new_joystick_xleft + (new_joystick_xright - new_joystick_xleft) / 2; - new_joystick_ymiddle = - new_joystick_yupper + (new_joystick_ylower - new_joystick_yupper) / 2; + new_joystick_xleft = MIN(new_joystick_xleft, joy_x); + new_joystick_xright = MAX(new_joystick_xright, joy_x); + new_joystick_yupper = MIN(new_joystick_yupper, joy_y); + new_joystick_ylower = MAX(new_joystick_ylower, joy_y); setup.input[player_nr].joy.xleft = new_joystick_xleft; setup.input[player_nr].joy.yupper = new_joystick_yupper; @@ -2117,60 +2042,18 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; CheckJoystickData(); -#endif joy_value = Joystick(player_nr); if (joy_value & JOY_BUTTON && check_remaining == 0) - { result = 1; -#ifdef MSDOS - if (calibration_step == 1) - { - remove_joystick(); - InitJoysticks(); - } - else if (calibrate_joystick(joystick_fd) != 0) - { - joystick_status = JOYSTICK_OFF; - goto error_out; - } - - if (joy[joystick_fd].flags & JOYFLAG_CALIBRATE) - { - calibration_step++; - result = -1; - - DrawText(SX, SY + 7*32, " MOVE JOYSTICK ", FS_BIG, FC_YELLOW); - DrawText(SX + 16, SY + 8*32, " TO ", FS_BIG, FC_YELLOW); - - if (calibration_step == 2) - DrawText(SX + 16, SY + 9*32," THE UPPER LEFT ", FS_BIG, FC_YELLOW); - else - DrawText(SX, SY + 9*32," THE LOWER RIGHT ", FS_BIG, FC_YELLOW); - - DrawText(SX, SY + 10*32, " AND ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW); - - BackToFront(); - - while(Joystick(player_nr) & JOY_BUTTON) - DoAnimation(); - } -#endif - } - x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); y = (joy_value & JOY_UP ? -1 : joy_value & JOY_DOWN ? +1 : 0); if (x != last_x || y != last_y) { -#ifndef MSDOS DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB); -#else - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_BLAU); -#endif DrawGraphic(xpos + x, ypos + y, GFX_KUGEL_ROT); last_x = x; @@ -2183,6 +2066,7 @@ void CalibrateJoystick(int player_nr) } #if 0 +#ifdef DEBUG printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n", setup.input[player_nr].joy.xleft, setup.input[player_nr].joy.xmiddle, @@ -2191,6 +2075,7 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.yupper, setup.input[player_nr].joy.ymiddle, setup.input[player_nr].joy.ylower); +#endif #endif } @@ -2202,20 +2087,45 @@ void CalibrateJoystick(int player_nr) Delay(10); } + /* calibrated center position (joystick should now be centered) */ + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; + + new_joystick_xmiddle = joy_x; + new_joystick_ymiddle = joy_y; + StopAnimation(); DrawSetupInputScreen(); - while(Joystick(player_nr) & JOY_BUTTON); - return; - error_out: + /* wait until the last pressed button was released */ + while (Joystick(player_nr) & JOY_BUTTON) + { + if (PendingEvent()) /* got event */ + { + Event event; - ClearWindow(); - DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW); - BackToFront(); - Delay(2000); - DrawSetupInputScreen(); + NextEvent(&event); + HandleOtherEvents(&event); + + Delay(10); + } + } + + return TRUE; +} + +void CalibrateJoystick(int player_nr) +{ + if (!CalibrateJoystickMain(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); + BackToFront(); + Delay(2000); /* show error message for two seconds */ + } } void HandleGameActions() @@ -2300,7 +2210,7 @@ static struct static void CreateScreenScrollbuttons() { - Pixmap gd_pixmap = pix[PIX_MORE]; + Bitmap *gd_bitmap = pix[PIX_MORE]; struct GadgetInfo *gi; unsigned long event_mask; int i; @@ -2334,8 +2244,8 @@ static void CreateScreenScrollbuttons() GDI_HEIGHT, height, GDI_TYPE, GD_TYPE_NORMAL_BUTTON, GDI_STATE, GD_BUTTON_UNPRESSED, - GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1, - GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2, + GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1, + GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_ACTION, HandleScreenGadgets, GDI_END); @@ -2354,18 +2264,18 @@ static void CreateScreenScrollbars() for (i=0; i