X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ac3eaef20929d8f7147cab5b174c6e7ed3c05fce;hb=0a05f4c2fbfe8ef1c372694a10d94818bff18d09;hp=57bfb001979859d1dea0748f2796ec82ad9e1340;hpb=d5b2ac0f473b0868014826e2c6488c72c79008f1;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 57bfb001..ac3eaef2 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,45 +1,45 @@ /*********************************************************** -* 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_START 0 +#define SETUP_SCREEN_POS_END (SCR_FIELDY - 3) #define SETUP_SCREEN_POS_EMPTY1 (SETUP_SCREEN_POS_END - 2) #define SETUP_SCREEN_POS_EMPTY2 (SETUP_SCREEN_POS_END - 2) /* 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 @@ -63,6 +63,29 @@ void DrawHeadline() 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() { static struct LevelDirInfo *leveldir_last_valid = NULL; @@ -72,6 +95,7 @@ void DrawMainMenu() UnmapAllGadgets(); FadeSounds(); KeyboardAutoRepeatOn(); + ActivateJoystickIfAvailable(); /* needed if last screen was the playing screen, invoked from level editor */ if (level_editor_test_game) @@ -85,7 +109,11 @@ void DrawMainMenu() UndrawSpecialEditorDoor(); /* needed if last screen was the setup screen and fullscreen state changed */ - ChangeVideoModeIfNeeded(); + ToggleFullscreenIfNeeded(); + +#ifdef TARGET_SDL + SetDrawtoField(DRAW_BACKBUFFER); +#endif /* map gadgets for main menu screen */ MapTapeButtons(); @@ -177,13 +205,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 + 1; leveldir_current->node_parent->node_group->cl_first = cl_first; leveldir_current->node_parent->node_group->cl_cursor = cl_cursor; @@ -259,9 +287,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); @@ -330,7 +358,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (setup.autorecord) TapeStartRecording(); -#if !defined(MSDOS) && !defined(WIN32) +#if defined(PLATFORM_UNIX) if (options.network) SendToServer_StartPlaying(); else @@ -560,6 +588,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) @@ -614,7 +643,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++; } @@ -674,7 +703,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() @@ -778,17 +809,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(); @@ -825,33 +859,34 @@ void HandleTypeName(int newxpos, Key key) return; } - if (((key >= KEY_A && key <= KEY_Z) || (key >= KEY_a && key <= KEY_z)) && + if (((key >= KSYM_A && key <= KSYM_Z) || + (key >= KSYM_a && key <= KSYM_z)) && xpos < MAX_PLAYER_NAME_LEN) { char ascii; - if (key >= KEY_A && key <= KEY_Z) - ascii = 'A' + (char)(key - KEY_A); + if (key >= KSYM_A && key <= KSYM_Z) + ascii = 'A' + (char)(key - KSYM_A); else - ascii = 'a' + (char)(key - KEY_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 == KEY_Delete || key == KEY_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 == KEY_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); @@ -863,31 +898,31 @@ void HandleTypeName(int newxpos, Key key) BackToFront(); } -static void drawCursorExt(int ypos, int color, int graphic) +static void drawCursorExt(int pos, int color, int graphic) { static int cursor_array[SCR_FIELDY]; if (graphic) - cursor_array[ypos] = graphic; + cursor_array[pos] = graphic; - graphic = cursor_array[ypos]; + 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, ypos, graphic); + DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic); } -static void initCursor(int ypos, int graphic) +static void initCursor(int pos, int graphic) { - drawCursorExt(ypos, FC_BLUE, graphic); + drawCursorExt(pos, FC_BLUE, graphic); } -static void drawCursor(int ypos, int color) +static void drawCursor(int pos, int color) { - drawCursorExt(ypos, color, 0); + drawCursorExt(pos, color, 0); } void DrawChooseLevel() @@ -909,7 +944,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) @@ -935,7 +970,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); @@ -946,18 +981,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) @@ -988,15 +1023,16 @@ 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 = (mx + 32 - SX) / 32; + int y = (my + 32 - SY) / 32 - MENU_SCREEN_START_YPOS; 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) { @@ -1006,7 +1042,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 + 1; } if (dx == 999) /* first entry is set by scrollbar position */ @@ -1016,7 +1052,8 @@ 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); + drawChooseLevelInfo(leveldir_current->cl_first + + leveldir_current->cl_cursor - 1); redraw = TRUE; } @@ -1039,16 +1076,16 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) else x = y = 0; /* no action */ - if (ABS(dy) == SCR_FIELDY) /* handle KEY_Page_Up, KEY_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 ? 0 : num_page_entries + 1); } } - if (x == 1 && y == 2) + if (x == 1 && y == 0) { if (leveldir_current->cl_first > 0 && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) @@ -1059,14 +1096,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); + leveldir_current->cl_cursor - 1); drawCursor(leveldir_current->cl_cursor - 1, 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 == 1 && y > num_page_entries) { if (leveldir_current->cl_first + num_page_entries < num_leveldirs && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) @@ -1077,7 +1114,7 @@ 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); + leveldir_current->cl_cursor - 1); drawCursor(leveldir_current->cl_cursor - 1, FC_RED); AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, leveldir_current->cl_first); @@ -1095,7 +1132,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { struct LevelDirInfo *node_first, *node_cursor; int leveldir_pos = - leveldir_current->cl_first + leveldir_current->cl_cursor - 3; + leveldir_current->cl_first + leveldir_current->cl_cursor - 1; node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos); @@ -1114,7 +1151,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) DrawChooseLevel(); } - if (x == 1 && y >= 3 && y <= num_page_entries + 2) + if (x == 1 && y > 0 && y <= num_page_entries) { if (button) { @@ -1122,14 +1159,14 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { drawCursor(y - 1, FC_RED); drawCursor(leveldir_current->cl_cursor - 1, FC_BLUE); - drawChooseLevelInfo(leveldir_current->cl_first + y - 3); + drawChooseLevelInfo(leveldir_current->cl_first + y - 1); 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 - 1; node_first = getLevelDirInfoFirstGroupEntry(leveldir_current); node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos); @@ -1139,15 +1176,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(); @@ -1171,6 +1212,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) @@ -1190,7 +1232,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; @@ -1268,38 +1310,79 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) DoAnimation(); } -void DrawSetupScreen() +static void execSetupInput() { - int i; - static struct setup - { - boolean *value; - char *text; - } setup_info[] = - { - { &setup.sound, "Sound:", }, - { &setup.sound_loops, " Sound Loops:" }, - { &setup.sound_music, " Game Music:" }, + game_status = SETUPINPUT; + DrawSetupInputScreen(); +} + +static void execExitSetup() +{ + game_status = MAINMENU; + DrawMainMenu(); +} + +static void execSaveAndExitSetup() +{ + SaveSetup(); + execExitSetup(); +} + +static struct TokenInfo setup_info[] = +{ + { TYPE_SWITCH, &setup.sound, "Sound:", }, + { TYPE_SWITCH, &setup.sound_loops, " Sound Loops:" }, + { TYPE_SWITCH, &setup.sound_music, " Game Music:" }, #if 0 - { &setup.toons, "Toons:" }, - { &setup.double_buffering, "Buffered gfx:" }, + { TYPE_SWITCH, &setup.toons, "Toons:" }, + { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, #endif - { &setup.scroll_delay, "Scroll Delay:" }, - { &setup.soft_scrolling, "Soft Scroll.:" }, + { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, + { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" }, #if 0 - { &setup.fading, "Fading:" }, + { TYPE_SWITCH, &setup.fading, "Fading:" }, #endif - { &setup.fullscreen, "Fullscreen:" }, - { &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.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_ENTER_MENU, execSetupInput, "Input Devices" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, + { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" }, + { 0, NULL, NULL } +}; +static int num_setup_info = 0; + +static void drawSetupValue(struct TokenInfo *si, int pos) +{ + int xpos = MENU_SCREEN_VALUE_XPOS; + int ypos = MENU_SCREEN_START_YPOS + pos; + int value_color = FC_YELLOW; + char *value_string = getSetupValue(si[pos].type & ~TYPE_GHOSTED, + si[pos].value); + + if (si[pos].type & TYPE_SWITCH || + si[pos].type & TYPE_YES_NO) + { + boolean value = *(boolean *)(si[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); +} + +void DrawSetupScreen() +{ + int i; UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); @@ -1307,27 +1390,32 @@ void DrawSetupScreen() DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW); - for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) + 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; + + DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN); - if (strcmp(setup_info[base].text, "Input Devices") == 0) + if (setup_info[i].type & TYPE_ENTER_MENU) initCursor(i, GFX_ARROW_BLUE_RIGHT); - else - initCursor(i, GFX_KUGEL_BLAU); - } + 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); - if (setup_info[base].value) - { - int setting_value = *setup_info[base].value; + if (setup_info[i].type & TYPE_BOOLEAN_STYLE) + drawSetupValue(setup_info, i); - DrawText(SX+14*32, SY+i*32, (setting_value ? "on" : "off"), - FS_BIG, (setting_value ? FC_YELLOW : FC_BLUE)); - } + num_setup_info++; } FadeToFront(); @@ -1335,22 +1423,305 @@ void DrawSetupScreen() HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); } + +#if 1 + void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { - static int choice = 3; + static int choice = 0; 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; + int x = (mx - SX) / 32; + int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; + int pos_start = SETUP_SCREEN_POS_START; + int pos_empty1 = SETUP_SCREEN_POS_EMPTY1; + int pos_empty2 = SETUP_SCREEN_POS_EMPTY2; + int pos_end = SETUP_SCREEN_POS_END; if (button == MB_MENU_INITIALIZE) redraw = TRUE; if (redraw) { - drawCursor(choice - 1, FC_RED); + drawCursor(choice, FC_RED); + redraw = FALSE; + } + + if (button == MB_MENU_INITIALIZE) + return; + + if (dx || dy) + { + x = 0; + y = choice; + + 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; + + /* stay in valid range */ + if (y < 0) + y = 0; + else if (y > num_setup_info - 1) + y = num_setup_info - 1; + + /* jump to next non-empty menu entry (up or down) */ + if (setup_info[y].type == TYPE_EMPTY) + while (y > 0 && y < num_setup_info - 1 && + setup_info[y].type == TYPE_EMPTY) + y += dy; + } + + if (!mx && !my && !dx && !dy) + { + x = 0; + y = choice; + } + + if (x == 0 && y >= 0 && y < num_setup_info && + setup_info[y].type != TYPE_EMPTY) + { + if (button) + { + if (y != choice) + { + drawCursor(y, FC_RED); + drawCursor(choice, FC_BLUE); + choice = y; + } + } + else if (!(setup_info[y].type & TYPE_GHOSTED)) + { + if (setup_info[y].type & TYPE_BOOLEAN_STYLE) + { + boolean new_value = !*(boolean *)(setup_info[y].value); + + *(boolean *)setup_info[y].value = new_value; + + drawSetupValue(setup_info, y); + } + else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) + { + void (*menu_callback_function)(void) = setup_info[choice].value; + + menu_callback_function(); + redraw = TRUE; + } + } + } + + BackToFront(); + + if (game_status == SETUP) + DoAnimation(); + + return; + + + + if (x == 0 && y >= pos_start && y <= pos_end && + !(y >= pos_empty1 && y <= pos_empty2)) + { + if (button) + { + if (y != choice) + { + drawCursor(y, FC_RED); + drawCursor(choice, FC_BLUE); + } + choice = y; + } + else + { + int yy = MENU_SCREEN_START_YPOS + y; + + if (y == 0 && audio.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 == 1 && audio.loops_available) + { + 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 == 2 && audio.loops_available) + { + 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; + } + +#if 0 + else if (y == 3) + { + 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; + } + else if (y == 4) + { +#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 + + else if (y == 3) + { + 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 == 4) + { + 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; + } +#if 0 + else if (y == 5) + { + 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; + } +#endif + else if (y == 5 && video.fullscreen_available) + { + if (setup.fullscreen) + 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.fullscreen = !setup.fullscreen; + } + else if (y == 6) + { + 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 == 7) + { + 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 == 8) + { + 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 == 9) + { + 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 == 10) + { + 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 == 11) + { + game_status = SETUPINPUT; + DrawSetupInputScreen(); + redraw = TRUE; + } + else if (y == pos_end - 1 || y == pos_end) + { + if (y == pos_end) + SaveSetup(); + + game_status = MAINMENU; + DrawMainMenu(); + redraw = TRUE; + } + } + } + BackToFront(); + + if (game_status==SETUP) + DoAnimation(); +} + +#else + +void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +{ + static int choice = 0; + static int redraw = TRUE; + int x = (mx - SX) / 32; + int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; + int pos_start = SETUP_SCREEN_POS_START; + int pos_empty1 = SETUP_SCREEN_POS_EMPTY1; + int pos_empty2 = SETUP_SCREEN_POS_EMPTY2; + int pos_end = SETUP_SCREEN_POS_END; + + if (button == MB_MENU_INITIALIZE) + redraw = TRUE; + + if (redraw) + { + drawCursor(choice, FC_RED); redraw = FALSE; } @@ -1361,11 +1732,11 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (dy) { - x = 1; - y = choice+dy; + x = 0; + y = choice + dy; } else - x = y = 0; + x = y = -1; if (y >= pos_empty1 && y <= pos_empty2) y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); @@ -1378,34 +1749,34 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) if (!mx && !my && !dx && !dy) { - x = 1; + x = 0; y = choice; } - if (dx == 1 && choice == 14) + if (dx == 1 && choice == 11) { game_status = SETUPINPUT; DrawSetupInputScreen(); redraw = TRUE; } - if (x==1 && y >= pos_start && y <= pos_end && + if (x == 0 && y >= pos_start && y <= pos_end && !(y >= pos_empty1 && y <= pos_empty2)) { 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 = y; } else { - int yy = y-1; + int yy = MENU_SCREEN_START_YPOS + y; - if (y==3 && sound_status==SOUND_AVAILABLE) + if (y == 0 && audio.sound_available) { if (setup.sound) { @@ -1419,7 +1790,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.sound = !setup.sound; } - else if (y==4 && sound_loops_allowed) + else if (y == 1 && audio.loops_available) { if (setup.sound_loops) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1431,7 +1802,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } setup.sound_loops = !setup.sound_loops; } - else if (y==5 && sound_loops_allowed) + else if (y == 2 && audio.loops_available) { if (setup.sound_music) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1445,7 +1816,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } #if 0 - else if (y==6) + else if (y == 3) { if (setup.toons) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1453,7 +1824,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.toons = !setup.toons; } - else if (y==7) + else if (y == 4) { #if 0 if (setup.double_buffering) @@ -1470,7 +1841,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } #endif - else if (y==6) + else if (y == 3) { if (setup.scroll_delay) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1478,7 +1849,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.scroll_delay = !setup.scroll_delay; } - else if (y==7) + else if (y == 4) { if (setup.soft_scrolling) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1487,7 +1858,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) setup.soft_scrolling = !setup.soft_scrolling; } #if 0 - else if (y==8) + else if (y == 5) { if (setup.fading) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1496,7 +1867,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) setup.fading = !setup.fading; } #endif - else if (y==8 && fullscreen_available) + else if (y == 5 && video.fullscreen_available) { if (setup.fullscreen) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1504,7 +1875,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.fullscreen = !setup.fullscreen; } - else if (y==9) + else if (y == 6) { if (setup.quick_doors) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1512,7 +1883,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.quick_doors = !setup.quick_doors; } - else if (y==10) + else if (y == 7) { if (setup.autorecord) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1520,7 +1891,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.autorecord = !setup.autorecord; } - else if (y==11) + else if (y == 8) { if (setup.team_mode) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1528,7 +1899,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.team_mode = !setup.team_mode; } - else if (y==12) + else if (y == 9) { if (setup.handicap) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1536,7 +1907,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.handicap = !setup.handicap; } - else if (y==13) + else if (y == 10) { if (setup.time_limit) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1544,29 +1915,17 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.time_limit = !setup.time_limit; } - else if (y==14) + else if (y == 11) { game_status = SETUPINPUT; DrawSetupInputScreen(); redraw = TRUE; } - else if (y==pos_end-1 || y==pos_end) + else if (y == pos_end - 1 || y == pos_end) { - if (y==pos_end) - { + if (y == pos_end) SaveSetup(); - /* - SaveJoystickData(); - */ - -#ifdef MSDOS - save_joystick_data(JOYSTICK_FILENAME); -#endif - - - } - game_status = MAINMENU; DrawMainMenu(); redraw = TRUE; @@ -1579,23 +1938,27 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DoAnimation(); } +#endif + + 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_KUGEL_BLAU); - 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"); @@ -1621,7 +1984,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) @@ -1697,14 +2061,15 @@ static void drawPlayerSetupInputInfo(int player_nr) 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 = (mx - SX) / 32; + int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; + 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) { @@ -1714,7 +2079,7 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (redraw) { - drawCursor(choice - 1, FC_RED); + drawCursor(choice, FC_RED); redraw = FALSE; } @@ -1723,24 +2088,24 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (dx || dy) { - if (dx && choice == 3) + if (dx && choice == 0) { - x = (dx < 0 ? 11 : 13); - y = 3; + x = (dx < 0 ? 10 : 12); + y = 0; } - else if (dx && choice == 4) + else if (dx && choice == 1) { button = MB_MENU_CHOICE; - x = 1; - y = 4; + x = 0; + y = 1; } else if (dy) { - x = 1; + x = 0; y = choice + dy; } else - x = y = 0; + x = y = -1; if (y >= pos_empty1 && y <= pos_empty2) y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); @@ -1753,36 +2118,36 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (!mx && !my && !dx && !dy) { - x = 1; + x = 0; 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; } else { - if (y == 4) + if (y == 1) { char *device_name = setup.input[player_nr].joy.device_name; @@ -1804,33 +2169,9 @@ 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) { @@ -1914,7 +2255,7 @@ void CustomizeKeyboard(int player_nr) { Key key = GetEventKey((KeyEvent *)&event, TRUE); - if (key == KEY_Escape || (key == KEY_Return && step_nr == 6)) + if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { finished = TRUE; break; @@ -1925,7 +2266,7 @@ void CustomizeKeyboard(int player_nr) break; /* press 'Enter' to keep the existing key binding */ - if (key == KEY_Return) + if (key == KSYM_Return) key = *customize_step[step_nr].key; /* check if key already used */ @@ -1992,56 +2333,29 @@ void CustomizeKeyboard(int player_nr) DrawSetupInputScreen(); } -void CalibrateJoystick(int player_nr) +static boolean CalibrateJoystickMain(int player_nr) { -#ifdef __FreeBSD__ - struct joystick joy_ctrl; -#else - struct joystick_control - { - int buttons; - int x; - int y; - } joy_ctrl; -#endif - -#ifndef MSDOS - int new_joystick_xleft = 128, new_joystick_xright = 128; - int new_joystick_yupper = 128, new_joystick_ylower = 128; + int new_joystick_xleft = JOYSTICK_XMIDDLE; + int new_joystick_xright = JOYSTICK_XMIDDLE; + int new_joystick_yupper = JOYSTICK_YMIDDLE; + int new_joystick_ylower = JOYSTICK_YMIDDLE; int new_joystick_xmiddle, new_joystick_ymiddle; -#else - int calibration_step = 1; -#endif - int joystick_fd = stored_player[player_nr].joystick_fd; + int joystick_fd = joystick.fd[player_nr]; int x, y, last_x, last_y, xpos = 8, ypos = 3; boolean check[3][3]; - int check_remaining; + int check_remaining = 3 * 3; + int joy_x, joy_y; int joy_value; int result = -1; - if (joystick_status == JOYSTICK_OFF || - joystick_fd < 0 || - !setup.input[player_nr].use_joystick) - goto error_out; + if (joystick.status == JOYSTICK_NOT_AVAILABLE) + return FALSE; - ClearWindow(); + if (joystick_fd < 0 || !setup.input[player_nr].use_joystick) + return FALSE; -#ifndef MSDOS - 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, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW); - check_remaining = 3 * 3; -#else - DrawText(SX, SY + 7*32, " MOVE JOYSTICK ", FS_BIG, FC_YELLOW); - DrawText(SX + 16, SY + 8*32, " TO ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 9*32, " CENTER POSITION ", 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); - check_remaining = 0; -#endif + ClearWindow(); for(y=0; y<3; y++) { @@ -2052,21 +2366,29 @@ void CalibrateJoystick(int player_nr) } } + 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); + joy_value = Joystick(player_nr); last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); last_y = (joy_value & JOY_UP ? -1 : joy_value & JOY_DOWN ? +1 : 0); - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); - BackToFront(); + /* eventually uncalibrated center position (joystick could be uncentered) */ + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; -#ifdef __FreeBSD__ - joy_ctrl.b1 = joy_ctrl.b2 = 0; -#else - joy_ctrl.buttons = 0; -#endif + new_joystick_xmiddle = joy_x; + new_joystick_ymiddle = joy_y; - while(Joystick(player_nr) & JOY_BUTTON); + DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); + BackToFront(); + while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ InitAnimation(); while(result < 0) @@ -2082,12 +2404,12 @@ void CalibrateJoystick(int player_nr) case EVENT_KEYPRESS: switch(GetEventKey((KeyEvent *)&event, TRUE)) { - case KEY_Return: + case KSYM_Return: if (check_remaining == 0) result = 1; break; - case KEY_Escape: + case KSYM_Escape: result = 0; break; @@ -2106,28 +2428,13 @@ void CalibrateJoystick(int player_nr) } } -#ifndef MSDOS - -#ifdef USE_SDL_JOYSTICK - joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0); - joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1); -#else - if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) - { - joystick_status = JOYSTICK_OFF; - goto error_out; - } -#endif + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; - 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); - - 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; @@ -2137,60 +2444,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; @@ -2203,6 +2468,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, @@ -2211,6 +2477,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 } @@ -2222,12 +2489,19 @@ 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(); /* wait until the last pressed button was released */ - while(Joystick(player_nr) & JOY_BUTTON) + while (Joystick(player_nr) & JOY_BUTTON) { if (PendingEvent()) /* got event */ { @@ -2239,16 +2513,21 @@ void CalibrateJoystick(int player_nr) Delay(10); } } - return; - error_out: + return TRUE; +} - 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(); +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() @@ -2333,7 +2612,7 @@ static struct static void CreateScreenScrollbuttons() { - Bitmap gd_bitmap = pix[PIX_MORE]; + Bitmap *gd_bitmap = pix[PIX_MORE]; struct GadgetInfo *gi; unsigned long event_mask; int i; @@ -2387,18 +2666,18 @@ static void CreateScreenScrollbars() for (i=0; i