X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=acc371dcfa8945ba3b994250f478bb0b0b5c5ae9;hb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;hp=ad05d1a610becd58fa93050d1098ff7034dea37e;hpb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index ad05d1a6..acc371dc 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 +198,15 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (num_leveldirs) { game_status = CHOOSELEVEL; + + + SaveLevelSetup(); + +#if 0 SavePlayerInfo(PLAYER_LEVEL); +#endif + + DrawChooseLevel(); } } @@ -233,7 +247,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==10) { + + SaveLevelSetup(); + +#if 0 SavePlayerInfo(PLAYER_LEVEL); +#endif + if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -681,13 +701,13 @@ void HandleHelpScreen(int button) BackToFront(); } + +#if 0 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) @@ -696,6 +716,8 @@ void CheckCheat() level_nr = local_player->handicap; } } +#endif + void HandleTypeName(int newxpos, KeySym key) { @@ -742,8 +764,21 @@ 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); + + + SaveSetup(); + + +#if 0 SavePlayerInfo(PLAYER_SETUP); +#endif + + + +#if 0 CheckCheat(); +#endif + game_status = MAINMENU; /* @@ -830,9 +865,19 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) else { local_player->leveldir_nr = leveldir_nr = y-3; + + SaveLevelSetup(); + + /* LoadPlayerInfo(PLAYER_LEVEL); SavePlayerInfo(PLAYER_SETUP); + */ + + +#if 0 CheckCheat(); +#endif + TapeErase(); LoadLevelTape(level_nr); @@ -895,6 +940,9 @@ void HandleHallOfFame(int button) void DrawSetupScreen() { int i; + + +#if 0 static struct setup { unsigned int bit; @@ -912,33 +960,73 @@ void DrawSetupScreen() {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, "Input Devices",{"", ""}, {0,0}}, + {0, "", {"", ""}, {0,0}}, {0, "", {"", ""}, {0,0}}, {0, "Exit", {"", ""}, {0,0}}, {0, "Save and exit",{"", ""}, {0,0}} }; +#endif + + static struct setup + { + boolean *value; + char *text, *mode[2]; + int color[2]; + } setup_info[] = + { + { &setup.sound_on, "Sound:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.sound_loops_on," Sound Loops:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.sound_music_on," Game Music:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.toons_on, "Toons:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.direct_draw_on,"Buffered gfx:",{"off","on" },{FC_BLUE,FC_YELLOW}}, + { &setup.scroll_delay_on,"Scroll Delay:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.soft_scrolling_on, "Soft Scroll.:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.fading_on, "Fading:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.quick_doors,"Quick Doors:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { &setup.autorecord_on,"Auto-Record:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, + { NULL, "Input Devices",{"", ""}, {0,0}}, + { NULL, "", {"", ""}, {0,0}}, + { NULL, "", {"", ""}, {0,0}}, + { NULL, "Exit", {"", ""}, {0,0}}, + { NULL, "Save and exit",{"", ""}, {0,0}} + }; CloseDoor(DOOR_CLOSE_2); ClearWindow(); - DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); + DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); + + + /* + printf("setup.sound_loops_on == %d\n", setup.sound_loops_on); + */ + for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) { int base = i - SETUP_SCREEN_POS_START; - if (i != SETUP_SCREEN_POS_EMPTY) + 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_EMPTY) +#if 0 + if (i < SETUP_SCREEN_POS_EMPTY1) { - int setting_bit = setup[base].bit; + int setting_bit = setup_info[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]); + } +#endif + + if (setup_info[base].value) + { + int setting_value = *setup_info[base].value; + int setting_pos = (setting_value != 0 ? 0 : 1); + + DrawText(SX+14*32, SY+i*32,setup_info[base].mode[setting_pos], + FS_BIG,setup_info[base].color[setting_pos]); } } @@ -952,9 +1040,10 @@ void HandleSetupScreen(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_empty = SETUP_SCREEN_POS_EMPTY + 1; - int pos_end = SETUP_SCREEN_POS_END + 1; + 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; if (button == MB_MENU_INITIALIZE) redraw = TRUE; @@ -978,8 +1067,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) else x = y = 0; - if (y == pos_empty) - y = (dy>0 ? pos_empty+1 : pos_empty-1); + if (y >= pos_empty1 && y <= pos_empty2) + y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); if (y < pos_start) y = pos_start; @@ -993,7 +1082,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) y = choice; } - if (x==1 && y>=pos_start && y<=pos_end && y!=pos_empty) + if (x==1 && y >= pos_start && y <= pos_end && + !(y >= pos_empty1 && y <= pos_empty2)) { if (button) { @@ -1010,121 +1100,117 @@ 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) { - 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(); - + game_status = SETUPINPUT; + DrawSetupInputScreen(); redraw = TRUE; } else if (y==pos_end-1 || y==pos_end) { if (y==pos_end) { + + + SaveSetup(); + + +#if 0 SavePlayerInfo(PLAYER_SETUP); +#endif + SaveJoystickData(); } @@ -1140,11 +1226,226 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DoAnimation(); } -void CustomizeKeyboard( /* int player_nr */ ) +void DrawSetupInputScreen() +{ + 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+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); +} + +static void drawPlayerSetupInputInfo(int player_nr) { - int player_nr = 0; + int i; + static struct SetupKeyboardInfo custom_key; + static struct + { + KeySym *keysym; + char *text; + } custom[] = + { + { &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+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW); + DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN); + } + + 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 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); + } +} + +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; + int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1 + 1; + int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2 + 1; + int pos_end = SETUPINPUT_SCREEN_POS_END + 1; + + if (button == MB_MENU_INITIALIZE) + { + drawPlayerSetupInputInfo(player_nr); + redraw = TRUE; + } + + if (redraw) + { + DrawGraphic(0,choice-1,GFX_KUGEL_ROT); + redraw = FALSE; + } + + if (button == MB_MENU_INITIALIZE) + return; + + if (dx || dy) + { + if (dx && choice == 3) + { + x = (dx < 0 ? 11 : 13); + y = 3; + } + else if (dx && choice == 4) + { + 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))) + { + 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) + { + DrawGraphic(0, y-1, GFX_KUGEL_ROT); + DrawGraphic(0, choice-1, GFX_KUGEL_BLAU); + } + choice = y; + } + else + { + if (y == 4) + { + 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; + } + + drawPlayerSetupInputInfo(player_nr); + } + else if (y == 5) + { + if (setup.input[player_nr].use_joystick) + CalibrateJoystick(setup.input[player_nr].joystick_nr); + else + CustomizeKeyboard(player_nr); + + redraw = TRUE; + } + else if (y == pos_end) + { + game_status = SETUP; + DrawSetupScreen(); + redraw = TRUE; + } + } + } + BackToFront(); + + out: + if (game_status == SETUPINPUT) + DoAnimation(); +} + +void CustomizeKeyboard(int player_nr) +{ int i; + int step_nr; boolean finished = FALSE; static struct SetupKeyboardInfo custom_key; static struct @@ -1161,19 +1462,23 @@ 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); + DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW); BackToFront(); InitAnimation(); - i = 0; - DrawText(SX, SY+(2+2*i)*32, customize_step[i].text, FS_BIG, FC_GREEN); - DrawText(SX, SY+(2+2*i+1)*32, "Key:", FS_BIG, FC_GREEN); - DrawText(SX + 5*32, SY+(2+2*i+1)*32, - getKeySymName(*customize_step[i].keysym), FS_BIG, FC_BLUE); + step_nr = 0; + DrawText(SX, SY + (2+2*step_nr)*32, + customize_step[step_nr].text, FS_BIG, FC_RED); + 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), + FS_BIG, FC_BLUE); while(!finished) { @@ -1182,63 +1487,70 @@ void CustomizeKeyboard( /* int player_nr */ ) XEvent event; XNextEvent(display, &event); + switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; - case KeyPress: + case KeyPress: { KeySym key = XLookupKeysym((XKeyEvent *)&event, ((XKeyEvent *)&event)->state); - if (key == XK_Escape || (key == XK_Return && i == 6)) + if (key == XK_Escape || (key == XK_Return && step_nr == 6)) { finished = TRUE; break; } - if (key == XK_Return || i == 6) + /* press 'Enter' to keep the existing key binding */ + if (key == XK_Return || step_nr == 6) + key = *customize_step[step_nr].keysym; + + /* check if key already used */ + for (i=0; istate)) @@ -1340,22 +1649,22 @@ void CalibrateJoystick() if (check_remaining == 0) result = 1; break; + case XK_Escape: result = 0; break; + + default: + break; } break; + case KeyRelease: key_joystick_mapping = 0; break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) &event); - break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); - break; + default: + HandleOtherEvents(&event); break; } } @@ -1428,18 +1737,18 @@ void CalibrateJoystick() StopAnimation(); - DrawSetupScreen(); + DrawSetupInputScreen(); while(Joystick() & JOY_BUTTON); return; - error_out: + error_out: ClearWindow(); DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW); DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW); BackToFront(); Delay(3000); - DrawSetupScreen(); + DrawSetupInputScreen(); } void CalibrateJoystick_OLD() @@ -1459,7 +1768,7 @@ void CalibrateJoystick_OLD() char joy_nr[4]; #endif - int joystick_nr = setup.joy_input[0].joystick_nr; + int joystick_nr = setup.input[0].joystick_nr; int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle; int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle; @@ -1614,7 +1923,7 @@ void CalibrateJoystick_OLD() DrawSetupScreen(); } -void HandleGameActions(byte player_action) +void HandleGameActions() { if (game_status != PLAYING) return; @@ -1625,7 +1934,7 @@ void HandleGameActions(byte player_action) if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) TapeStop(); - GameActions(player_action); + GameActions(); BackToFront(); } @@ -1743,14 +2052,12 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_music_on) { setup.sound_music_on = FALSE; - local_player->setup &= ~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); } @@ -1762,13 +2069,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 @@ -1779,13 +2084,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