X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=68132cf55e22692577af7ad39af0bee4669f377e;hb=82b1f76754f039e4ee151c7da7c49819c7310546;hp=ec2e0e6db510f38d5a56be64b594216b850e95c2;hpb=a4d4e8e444b21b58dcc88b52ff22726c545142a4;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index ec2e0e6d..68132cf5 100644 --- a/src/screens.c +++ b/src/screens.c @@ -36,8 +36,8 @@ void DrawHeadline() int x2 = SX+(SXSIZE - strlen(COPYRIGHT_STRING) * FONT2_XSIZE) / 2; int y2 = SY+46; - DrawText(x1,y1, GAMETITLE_STRING, FS_BIG,FC_YELLOW); - DrawText(x2,y2, COPYRIGHT_STRING, FS_SMALL,FC_RED); + DrawText(x1,y1, GAMETITLE_STRING, FS_BIG, FC_YELLOW); + DrawText(x2,y2, COPYRIGHT_STRING, FS_SMALL, FC_RED); } void DrawMainMenu() @@ -50,17 +50,17 @@ void DrawMainMenu() ClearWindow(); DrawHeadline(); - DrawText(SX+32, SY+64, "Name:",FS_BIG,FC_GREEN); - DrawText(SX+192,SY+64, local_player->alias_name,FS_BIG,FC_RED); - DrawText(SX+32, SY+96, "Level:",FS_BIG,FC_GREEN); - DrawText(SX+352,SY+96, int2str(level_nr,3),FS_BIG, + DrawText(SX + 32, SY + 2*32, "Name:", FS_BIG, FC_GREEN); + DrawText(SX + 6*32, SY + 2*32, local_player->alias_name, FS_BIG, FC_RED); + DrawText(SX + 32, SY + 3*32, "Level:", FS_BIG, FC_GREEN); + DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG, (level_nr0) || - (x==15 && level_nr local_player->handicap) - level_nr = local_player->handicap; - - DrawTextExt(drawto,gc,SX+352,SY+96, int2str(level_nr,3), FS_BIG,FC_RED); - DrawTextExt(window,gc,SX+352,SY+96, int2str(level_nr,3), FS_BIG,FC_RED); + DrawTextExt(drawto,gc,SX+11*32,SY+3*32, + int2str(level_nr,3), FS_BIG,FC_RED); + DrawTextExt(window,gc,SX+11*32,SY+3*32, + int2str(level_nr,3), FS_BIG,FC_RED); LoadLevel(level_nr); DrawMicroLevel(MICROLEV_XPOS,MICROLEV_YPOS); @@ -192,7 +203,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (num_leveldirs) { game_status = CHOOSELEVEL; - SavePlayerInfo(PLAYER_LEVEL); + SaveLevelSetup(); DrawChooseLevel(); } } @@ -233,7 +244,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==10) { - SavePlayerInfo(PLAYER_LEVEL); + SaveLevelSetup(); if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -681,22 +692,6 @@ void HandleHelpScreen(int button) BackToFront(); } -void CheckCheat() -{ - int old_handicap = local_player->handicap; - -#if 0 - if (!strcmp(local_player->alias_name,"Artsoft")) -#endif - local_player->handicap = leveldir[leveldir_nr].levels-1; - - if (local_player->handicap != old_handicap) - { - SavePlayerInfo(PLAYER_LEVEL); - level_nr = local_player->handicap; - } -} - void HandleTypeName(int newxpos, KeySym key) { static int xpos = 0, ypos = 2; @@ -742,15 +737,11 @@ void HandleTypeName(int newxpos, KeySym key) { DrawText(SX+6*32,SY+ypos*32,local_player->alias_name,FS_BIG,FC_RED); DrawGraphic(xpos+6,ypos,GFX_LEERRAUM); - SavePlayerInfo(PLAYER_SETUP); - CheckCheat(); + SaveSetup(); game_status = MAINMENU; -/* - DrawMainMenu(); -*/ - } + BackToFront(); } @@ -829,10 +820,8 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) } else { - local_player->leveldir_nr = leveldir_nr = y-3; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); - CheckCheat(); + leveldir_nr = y-3; + SaveLevelSetup(); TapeErase(); LoadLevelTape(level_nr); @@ -842,6 +831,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) redraw = TRUE; } } + BackToFront(); if (game_status==CHOOSELEVEL) @@ -897,26 +887,25 @@ void DrawSetupScreen() int i; static struct setup { - unsigned int bit; + boolean *value; char *text, *mode[2]; - int color[2]; - } setup[] = + } setup_info[] = { - {SETUP_SOUND, "Sound:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_LOOPS, " Sound Loops:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_MUSIC, " Game Music:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_TOONS, "Toons:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_DIRECT_DRAW, "Buffered gfx:",{"off","on" }, {FC_BLUE,FC_YELLOW}}, - {SETUP_SCROLL_DELAY,"Scroll Delay:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOFT_SCROLL, "Soft Scroll.:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_FADING, "Fading:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_QUICK_DOORS, "Quick Doors:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_AUTO_RECORD, "Auto-Record:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {0, "Input Setup", {"", ""}, {0,0}}, - {0, "", {"", ""}, {0,0}}, - {0, "", {"", ""}, {0,0}}, - {0, "Exit", {"", ""}, {0,0}}, - {0, "Save and exit",{"", ""}, {0,0}} + { &setup.sound_on, "Sound:", { "on", "off" } }, + { &setup.sound_loops_on, " Sound Loops:",{ "on", "off" } }, + { &setup.sound_music_on, " Game Music:", { "on", "off" } }, + { &setup.toons_on, "Toons:", { "on", "off" } }, + { &setup.direct_draw_on, "Buffered gfx:",{ "off","on" } }, + { &setup.scroll_delay_on, "Scroll Delay:",{ "on", "off" } }, + { &setup.soft_scrolling_on, "Soft Scroll.:",{ "on", "off" } }, + { &setup.fading_on, "Fading:", { "on", "off" } }, + { &setup.quick_doors, "Quick Doors:", { "on", "off" } }, + { &setup.autorecord_on, "Auto-Record:", { "on", "off" } }, + { NULL, "Input Devices",{ "", "" } }, + { NULL, "", { "", "" } }, + { NULL, "", { "", "" } }, + { NULL, "Exit", { "", "" } }, + { NULL, "Save and exit",{ "", "" } } }; CloseDoor(DOOR_CLOSE_2); @@ -930,15 +919,17 @@ void DrawSetupScreen() if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2)) { DrawGraphic(0,i,GFX_KUGEL_BLAU); - DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN); + DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN); } - if (i < SETUP_SCREEN_POS_EMPTY1) + if (setup_info[base].value) { - int setting_bit = setup[base].bit; - int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); - DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos], - FS_BIG,setup[base].color[setting_pos]); + int setting_value = *setup_info[base].value; + int setting_pos = (setting_value != 0 ? 0 : 1); + int fc_on = (strcmp(setup_info[base].mode[setting_pos], "on") == 0); + + DrawText(SX+14*32, SY+i*32, setup_info[base].mode[setting_pos], + FS_BIG, (fc_on ? FC_YELLOW : FC_BLUE)); } } @@ -1012,97 +1003,97 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) if (y==3 && sound_status==SOUND_AVAILABLE) { - if (SETUP_SOUND_ON(local_player->setup)) + if (setup.sound_on) { 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); - local_player->setup &= ~SETUP_SOUND_LOOPS; - local_player->setup &= ~SETUP_SOUND_MUSIC; + setup.sound_loops_on = FALSE; + setup.sound_music_on = FALSE; } else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - local_player->setup ^= SETUP_SOUND; + setup.sound_on = !setup.sound_on; } else if (y==4 && sound_loops_allowed) { - if (SETUP_SOUND_LOOPS_ON(local_player->setup)) + if (setup.sound_loops_on) 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); - local_player->setup |= SETUP_SOUND; + setup.sound_on = TRUE; } - local_player->setup ^= SETUP_SOUND_LOOPS; + setup.sound_loops_on = !setup.sound_loops_on; } else if (y==5 && sound_loops_allowed) { - if (SETUP_SOUND_MUSIC_ON(local_player->setup)) + if (setup.sound_music_on) 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); - local_player->setup |= SETUP_SOUND; + setup.sound_on = TRUE; } - local_player->setup ^= SETUP_SOUND_MUSIC; + setup.sound_music_on = !setup.sound_music_on; } else if (y==6) { - if (SETUP_TOONS_ON(local_player->setup)) + if (setup.toons_on) 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); - local_player->setup ^= SETUP_TOONS; + setup.toons_on = !setup.toons_on; } else if (y==7) { - if (!SETUP_DIRECT_DRAW_ON(local_player->setup)) + if (!setup.direct_draw_on) 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); - local_player->setup ^= SETUP_DIRECT_DRAW; + setup.direct_draw_on = !setup.direct_draw_on; } else if (y==8) { - if (SETUP_SCROLL_DELAY_ON(local_player->setup)) + if (setup.scroll_delay_on) 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); - local_player->setup ^= SETUP_SCROLL_DELAY; + setup.scroll_delay_on = !setup.scroll_delay_on; } else if (y==9) { - if (SETUP_SOFT_SCROLL_ON(local_player->setup)) + if (setup.soft_scrolling_on) 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); - local_player->setup ^= SETUP_SOFT_SCROLL; + setup.soft_scrolling_on = !setup.soft_scrolling_on; } else if (y==10) { - if (SETUP_FADING_ON(local_player->setup)) + if (setup.fading_on) 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); - local_player->setup ^= SETUP_FADING; + setup.fading_on = !setup.fading_on; } else if (y==11) { - if (SETUP_QUICK_DOORS_ON(local_player->setup)) + 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); - local_player->setup ^= SETUP_QUICK_DOORS; + setup.quick_doors = !setup.quick_doors; } else if (y==12) { - if (SETUP_AUTO_RECORD_ON(local_player->setup)) + if (setup.autorecord_on) 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); - local_player->setup ^= SETUP_AUTO_RECORD; + setup.autorecord_on = !setup.autorecord_on; } else if (y==13) { @@ -1110,33 +1101,11 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawSetupInputScreen(); redraw = TRUE; } - -#if 0 - else if (y==13) - { - if (SETUP_2ND_JOYSTICK_ON(local_player->setup)) - DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW); - else - DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW); - local_player->setup ^= SETUP_2ND_JOYSTICK; - } - else if (y==14) - { - /* - CalibrateJoystick(); - */ - - CustomizeKeyboard(); - - redraw = TRUE; - } -#endif - else if (y==pos_end-1 || y==pos_end) { if (y==pos_end) { - SavePlayerInfo(PLAYER_SETUP); + SaveSetup(); SaveJoystickData(); } @@ -1154,90 +1123,92 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) void DrawSetupInputScreen() { -#if 0 - static struct setup - { - unsigned int bit; - char *text, *mode[2]; - int color[2]; - } setup[] = - { - {SETUP_SOUND, "Sound:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_LOOPS, " Sound Loops:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_MUSIC, " Game Music:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_TOONS, "Toons:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_DIRECT_DRAW, "Buffered gfx:",{"off","on" }, {FC_BLUE,FC_YELLOW}}, - {SETUP_SCROLL_DELAY,"Scroll Delay:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOFT_SCROLL, "Soft Scroll.:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_FADING, "Fading:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_QUICK_DOORS, "Quick Doors:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_AUTO_RECORD, "Auto-Record:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_2ND_JOYSTICK,"Joystick:", {"2nd","1st"}, {FC_YELLOW,FC_YELLOW}}, - {0, "Cal. Joystick",{"", ""}, {0,0}}, - {0, "", {"", ""}, {0,0}}, - {0, "Exit", {"", ""}, {0,0}}, - {0, "Save and exit",{"", ""}, {0,0}} - }; -#endif - ClearWindow(); DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW); DrawGraphic(0, 2, GFX_KUGEL_BLAU); DrawGraphic(0, 3, GFX_KUGEL_BLAU); DrawGraphic(0, 4, GFX_KUGEL_BLAU); + DrawGraphic(0, 15, GFX_KUGEL_BLAU); + DrawGraphic(10, 2, GFX_PFEIL_L); + DrawGraphic(12, 2, GFX_PFEIL_R); DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN); - DrawText(SX+12*32, SY+2*32, "1", FS_BIG, FC_RED); - DrawGraphic(9,2,GFX_PFEIL_L); - DrawGraphic(11,2,GFX_PFEIL_R); + DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); + DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); + + FadeToFront(); + InitAnimation(); + HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE); +} - DrawText(SX+32, SY+3*32, "Inputdevice:", FS_BIG, FC_GREEN); - if (setup.joy_input[0].use_joystick) +static void drawPlayerSetupInputInfo(int player_nr) +{ + int i; + static struct SetupKeyboardInfo custom_key; + static struct + { + KeySym *keysym; + char *text; + } custom[] = { - DrawText(SX+13*32, SY+3*32, - (setup.joy_input[0].joystick_nr == 0 ? "JOY1" : "JOY2"), + { &custom_key.left, "Joystick Left" }, + { &custom_key.right, "Joystick Right" }, + { &custom_key.up, "Joystick Up" }, + { &custom_key.down, "Joystick Down" }, + { &custom_key.snap, "Button 1" }, + { &custom_key.bomb, "Button 2" } + }; + + custom_key = setup.input[player_nr].key; + + DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED); + DrawGraphic(8, 2, GFX_SPIELER1 + player_nr); + + if (setup.input[player_nr].use_joystick) + { + DrawText(SX+8*32, SY+3*32, + (setup.input[player_nr].joystick_nr == 0 ? + "Joystick1" : "Joystick2"), FS_BIG, FC_YELLOW); DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN); } else { - DrawText(SX+13*32, SY+3*32, "KEYS", FS_BIG, FC_YELLOW); + DrawText(SX+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW); DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN); } - DrawGraphic(0, 15, GFX_KUGEL_BLAU); - DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); - -#if 0 - for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) + DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN); + DrawGraphic(1, 6, GFX_PFEIL_L); + DrawGraphic(1, 7, GFX_PFEIL_R); + DrawGraphic(1, 8, GFX_PFEIL_O); + DrawGraphic(1, 9, GFX_PFEIL_U); + DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE); + DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE); + DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE); + DrawText(SX+2*32, SY+9*32, ":", FS_BIG, FC_BLUE); + DrawText(SX+32, SY+10*32, "Snap Field:", FS_BIG, FC_BLUE); + DrawText(SX+32, SY+12*32, "Place Bomb:", FS_BIG, FC_BLUE); + + for (i=0; i<6; i++) { - int base = i - SETUP_SCREEN_POS_START; - - if (i != SETUP_SCREEN_POS_EMPTY) - { - DrawGraphic(0,i,GFX_KUGEL_BLAU); - DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN); - } - - if (i < SETUP_SCREEN_POS_EMPTY) - { - int setting_bit = setup[base].bit; - int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); - DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos], - FS_BIG,setup[base].color[setting_pos]); - } + int ypos = 6 + i + (i > 3 ? i-3 : 0); + + DrawText(SX + 3*32, SY + ypos*32, + " ", FS_BIG, FC_YELLOW); + DrawText(SX + 3*32, SY + ypos*32, + (setup.input[player_nr].use_joystick ? + custom[i].text : + getKeyNameFromKeySym(*custom[i].keysym)), + FS_BIG, FC_YELLOW); } -#endif - - FadeToFront(); - InitAnimation(); - HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE); } void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) { static int choice = 3; + 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; @@ -1246,7 +1217,10 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) int pos_end = SETUPINPUT_SCREEN_POS_END + 1; if (button == MB_MENU_INITIALIZE) + { + drawPlayerSetupInputInfo(player_nr); redraw = TRUE; + } if (redraw) { @@ -1259,10 +1233,21 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (dx || dy) { - if (dy) + if (dx && choice == 3) { + x = (dx < 0 ? 11 : 13); + y = 3; + } + else if (dx && choice == 4) + { + button = MB_MENU_CHOICE; x = 1; - y = choice+dy; + y = 4; + } + else if (dy) + { + x = 1; + y = choice + dy; } else x = y = 0; @@ -1282,170 +1267,78 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) y = choice; } - if (x==1 && y >= pos_start && y <= pos_end && - !(y >= pos_empty1 && y <= pos_empty2)) + if (y == 3 && ((x == 1 && !button) || ((x == 11 || x == 13) && button))) + { + static long delay = 0; + + if (!DelayReached(&delay,150)) + goto out; + + player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS; + + drawPlayerSetupInputInfo(player_nr); + } + else if (x==1 && y >= pos_start && y <= pos_end && + !(y >= pos_empty1 && y <= pos_empty2)) { if (button) { - if (y!=choice) + if (y != choice) { - DrawGraphic(0,y-1,GFX_KUGEL_ROT); - DrawGraphic(0,choice-1,GFX_KUGEL_BLAU); + DrawGraphic(0, y-1, GFX_KUGEL_ROT); + DrawGraphic(0, choice-1, GFX_KUGEL_BLAU); } choice = y; } else { -#if 0 - int yy = y-1; - - if (y==3 && sound_status==SOUND_AVAILABLE) + if (y == 4) { - if (SETUP_SOUND_ON(local_player->setup)) - { - 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); - local_player->setup &= ~SETUP_SOUND_LOOPS; - local_player->setup &= ~SETUP_SOUND_MUSIC; - } - else - DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - local_player->setup ^= SETUP_SOUND; - } - else if (y==4 && sound_loops_allowed) - { - if (SETUP_SOUND_LOOPS_ON(local_player->setup)) - DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); - else + int one_joystick_nr = (dx >= 0 ? 0 : 1); + int the_other_joystick_nr = (dx >= 0 ? 1 : 0); + + if (setup.input[player_nr].use_joystick) { - 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); - local_player->setup |= SETUP_SOUND; + 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; } - local_player->setup ^= SETUP_SOUND_LOOPS; - } - else if (y==5 && sound_loops_allowed) - { - if (SETUP_SOUND_MUSIC_ON(local_player->setup)) - 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); - local_player->setup |= SETUP_SOUND; + setup.input[player_nr].use_joystick = TRUE; + setup.input[player_nr].joystick_nr = one_joystick_nr; } - local_player->setup ^= SETUP_SOUND_MUSIC; - } - else if (y==6) - { - if (SETUP_TOONS_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_TOONS; - } - else if (y==7) - { - if (!SETUP_DIRECT_DRAW_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_DIRECT_DRAW; - } - else if (y==8) - { - if (SETUP_SCROLL_DELAY_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_SCROLL_DELAY; - } - else if (y==9) - { - if (SETUP_SOFT_SCROLL_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_SOFT_SCROLL; - } - else if (y==10) - { - if (SETUP_FADING_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_FADING; - } - else if (y==11) - { - if (SETUP_QUICK_DOORS_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_QUICK_DOORS; - } - else if (y==12) - { - if (SETUP_AUTO_RECORD_ON(local_player->setup)) - 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); - local_player->setup ^= SETUP_AUTO_RECORD; - } - else if (y==13) - { - if (SETUP_2ND_JOYSTICK_ON(local_player->setup)) - DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW); - else - DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW); - local_player->setup ^= SETUP_2ND_JOYSTICK; - } - else if (y==14) - { - /* - CalibrateJoystick(); - */ - - CustomizeKeyboard(); - redraw = TRUE; + drawPlayerSetupInputInfo(player_nr); } - else if (y==pos_end-1 || y==pos_end) + else if (y == 5) { - if (y==pos_end) - { - SavePlayerInfo(PLAYER_SETUP); - SaveJoystickData(); - } + if (setup.input[player_nr].use_joystick) + CalibrateJoystick(setup.input[player_nr].joystick_nr); + else + CustomizeKeyboard(player_nr); - game_status = MAINMENU; - DrawMainMenu(); redraw = TRUE; } -#endif - - - if (y==pos_end) + else if (y == pos_end) { game_status = SETUP; DrawSetupScreen(); redraw = TRUE; } - - } } BackToFront(); - if (game_status==SETUP) + out: + + if (game_status == SETUPINPUT) DoAnimation(); } -void CustomizeKeyboard( /* int player_nr */ ) +void CustomizeKeyboard(int player_nr) { - int player_nr = 0; - int i; int step_nr; boolean finished = FALSE; @@ -1464,7 +1357,8 @@ void CustomizeKeyboard( /* int player_nr */ ) { &custom_key.bomb, "Place Bomb" } }; - custom_key = setup.key_input[player_nr]; + /* read existing key bindings from player setup */ + custom_key = setup.input[player_nr].key; ClearWindow(); DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW); @@ -1478,7 +1372,8 @@ 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, - getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE); + getKeyNameFromKeySym(*customize_step[step_nr].keysym), + FS_BIG, FC_BLUE); while(!finished) { @@ -1501,8 +1396,9 @@ void CustomizeKeyboard( /* int player_nr */ ) break; } + /* press 'Enter' to keep the existing key binding */ if (key == XK_Return || step_nr == 6) - break; + key = *customize_step[step_nr].keysym; /* check if key already used */ for (i=0; isetup &= ~SETUP_SOUND_MUSIC; FadeSound(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF); } else if (sound_loops_allowed) { setup.sound_on = setup.sound_music_on = TRUE; - local_player->setup |= (SETUP_SOUND | SETUP_SOUND_MUSIC); PlaySoundLoop(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON); } @@ -2068,13 +1964,11 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_loops_on) { setup.sound_loops_on = FALSE; - local_player->setup &= ~SETUP_SOUND_LOOPS; DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); } else if (sound_loops_allowed) { setup.sound_on = setup.sound_loops_on = TRUE; - local_player->setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS); DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON); } else @@ -2085,13 +1979,11 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_simple_on) { setup.sound_simple_on = FALSE; - local_player->setup &= ~SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); } else if (sound_status==SOUND_AVAILABLE) { setup.sound_on = setup.sound_simple_on = TRUE; - local_player->setup |= SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON); } else @@ -2146,30 +2038,6 @@ void HandleGameButtons(int mx, int my, int button) } else TapeTogglePause(); - - /* - if (tape.pausing) - { - if (options.network) - SendToServer_ContinuePlaying(); - else - { - tape.pausing = FALSE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); - } - } - else - { - if (options.network) - SendToServer_PausePlaying(); - else - { - tape.pausing = TRUE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); - } - } - */ - break; case BUTTON_GAME_PLAY: