X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ed3ca8f9d0d03d2e970436305245fd230f88ab46;hb=1146572677fd6858df5fc1fabfd7f7294bdefed7;hp=bc9412d2a3422b3f748ce15074d64dd54542befd;hpb=35a6bb2e02a14cb70796f2a165736f515669208c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index bc9412d2..ed3ca8f9 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); @@ -215,16 +217,16 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==8) { - if (autorecord_on) + if (setup.autorecord_on) TapeStartRecording(); - if (standalone) + if (options.network) + SendToServer_StartPlaying(); + else { game_status = PLAYING; InitGame(); } - else - SendToServer_StartPlaying(); } else if (y==9) { @@ -234,7 +236,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (y==10) { SavePlayerInfo(PLAYER_LEVEL); - if (Request("Do you really want to quit ?",REQ_ASK|REQ_STAY_CLOSED)) + if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -912,8 +914,8 @@ 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}} @@ -921,19 +923,19 @@ void DrawSetupScreen() 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); 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); } - if (i < SETUP_SCREEN_POS_EMPTY) + if (i < SETUP_SCREEN_POS_EMPTY1) { int setting_bit = setup[base].bit; int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); @@ -952,9 +954,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 +981,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 +996,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) { @@ -1104,15 +1108,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } 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(); + game_status = SETUPINPUT; + DrawSetupInputScreen(); redraw = TRUE; } else if (y==pos_end-1 || y==pos_end) @@ -1135,7 +1132,531 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DoAnimation(); } -void CalibrateJoystick() +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 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 : + getKeySymName(*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 + { + KeySym *keysym; + char *text; + } customize_step[] = + { + { &custom_key.left, "Move Left" }, + { &custom_key.right, "Move Right" }, + { &custom_key.up, "Move Up" }, + { &custom_key.down, "Move Down" }, + { &custom_key.snap, "Snap Field" }, + { &custom_key.bomb, "Place Bomb" } + }; + + /* 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); + + BackToFront(); + InitAnimation(); + + 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, + getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE); + + while(!finished) + { + if (XPending(display)) /* got event from X server */ + { + XEvent event; + + XNextEvent(display, &event); + + switch(event.type) + { + case KeyPress: + { + KeySym key = XLookupKeysym((XKeyEvent *)&event, + ((XKeyEvent *)&event)->state); + + if (key == XK_Escape || (key == XK_Return && step_nr == 6)) + { + finished = TRUE; + break; + } + + /* 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)) + { + case XK_Return: + if (check_remaining == 0) + result = 1; + break; + + case XK_Escape: + result = 0; + break; + + default: + break; + } + break; + + case KeyRelease: + key_joystick_mapping = 0; + break; + + default: + HandleOtherEvents(&event); + break; + } + } + + if (read(joystick_device, &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); + + 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; + + joystick[joystick_nr].xleft = new_joystick_xleft; + joystick[joystick_nr].yupper = new_joystick_yupper; + joystick[joystick_nr].xright = new_joystick_xright; + joystick[joystick_nr].ylower = new_joystick_ylower; + joystick[joystick_nr].xmiddle = new_joystick_xmiddle; + joystick[joystick_nr].ymiddle = new_joystick_ymiddle; + + CheckJoystickData(); + + joy = Joystick(); + + if (joy & JOY_BUTTON && check_remaining == 0) + result = 1; + + x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0); + y = (joy & JOY_UP ? -1 : joy & JOY_DOWN ? +1 : 0); + + if (x != last_x || y != last_y) + { + DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB); + DrawGraphic(xpos + x, ypos + y, GFX_KUGEL_ROT); + + last_x = x; + last_y = y; + + if (check_remaining > 0 && !check[x+1][y+1]) + { + check[x+1][y+1] = TRUE; + check_remaining--; + } + +#if 0 + printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n", + joystick[joystick_nr].xleft, + joystick[joystick_nr].xmiddle, + joystick[joystick_nr].xright); + printf("UP / MIDDLE / DOWN == %d / %d / %d\n", + joystick[joystick_nr].yupper, + joystick[joystick_nr].ymiddle, + joystick[joystick_nr].ylower); +#endif + } + + BackToFront(); + DoAnimation(); + + /* don't eat all CPU time */ + Delay(10); + } + + StopAnimation(); + + DrawSetupInputScreen(); + while(Joystick() & JOY_BUTTON); + return; + + 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); + DrawSetupInputScreen(); +} + +void CalibrateJoystick_OLD() { #ifdef __FreeBSD__ struct joystick joy_ctrl; @@ -1152,10 +1673,11 @@ void CalibrateJoystick() char joy_nr[4]; #endif + 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; - if (joystick_status==JOYSTICK_OFF) + if (joystick_status == JOYSTICK_OFF) goto error_out; #ifndef MSDOS @@ -1172,7 +1694,7 @@ void CalibrateJoystick() #endif while(Joystick() & JOY_BUTTON); #ifdef __FreeBSD__ - while(!(joy_ctrl.b1||joy_ctrl.b2)) + while(!(joy_ctrl.b1 || joy_ctrl.b2)) #else while(!joy_ctrl.buttons) #endif @@ -1201,7 +1723,7 @@ void CalibrateJoystick() #endif while(Joystick() & JOY_BUTTON); #ifdef __FreeBSD__ - while(!(joy_ctrl.b1||joy_ctrl.b2)) + while(!(joy_ctrl.b1 || joy_ctrl.b2)) #else while(!joy_ctrl.buttons) #endif @@ -1229,7 +1751,7 @@ void CalibrateJoystick() #endif while(Joystick() & JOY_BUTTON); #ifdef __FreeBSD__ - while(!(joy_ctrl.b1||joy_ctrl.b2)) + while(!(joy_ctrl.b1 || joy_ctrl.b2)) #else while(!joy_ctrl.buttons) #endif @@ -1306,7 +1828,7 @@ void CalibrateJoystick() DrawSetupScreen(); } -void HandleGameActions(byte player_action) +void HandleGameActions() { if (game_status != PLAYING) return; @@ -1317,7 +1839,7 @@ void HandleGameActions(byte player_action) if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) TapeStop(); - GameActions(player_action); + GameActions(); BackToFront(); } @@ -1345,24 +1867,27 @@ void HandleVideoButtons(int mx, int my, int button) } DrawCompleteVideoDisplay(); break; + case BUTTON_VIDEO_STOP: TapeStop(); break; + case BUTTON_VIDEO_PAUSE: TapeTogglePause(); break; + case BUTTON_VIDEO_REC: if (TAPE_IS_STOPPED(tape)) { TapeStartRecording(); - if (standalone) + if (options.network) + SendToServer_StartPlaying(); + else { game_status = PLAYING; InitGame(); } - else - SendToServer_StartPlaying(); } else if (tape.pausing) { @@ -1379,6 +1904,7 @@ void HandleVideoButtons(int mx, int my, int button) TapeTogglePause(); } break; + case BUTTON_VIDEO_PLAY: if (TAPE_IS_EMPTY(tape)) break; @@ -1387,13 +1913,8 @@ void HandleVideoButtons(int mx, int my, int button) { TapeStartPlaying(); - if (standalone) - { - game_status = PLAYING; - InitGame(); - } - else - SendToServer_StartPlaying(); + game_status = PLAYING; + InitGame(); } else if (tape.playing) { @@ -1417,6 +1938,7 @@ void HandleVideoButtons(int mx, int my, int button) } } break; + default: break; } @@ -1432,16 +1954,16 @@ void HandleSoundButtons(int mx, int my, int button) switch(CheckSoundButtons(mx,my,button)) { case BUTTON_SOUND_MUSIC: - if (sound_music_on) + if (setup.sound_music_on) { - sound_music_on = FALSE; + 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) { - sound_on = sound_music_on = TRUE; + 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); @@ -1449,38 +1971,41 @@ void HandleSoundButtons(int mx, int my, int button) else DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF); break; + case BUTTON_SOUND_LOOPS: - if (sound_loops_on) + if (setup.sound_loops_on) { - sound_loops_on = FALSE; + setup.sound_loops_on = FALSE; local_player->setup &= ~SETUP_SOUND_LOOPS; DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); } else if (sound_loops_allowed) { - sound_on = sound_loops_on = TRUE; + setup.sound_on = setup.sound_loops_on = TRUE; local_player->setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS); DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON); } else DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); break; + case BUTTON_SOUND_SIMPLE: - if (sound_simple_on) + if (setup.sound_simple_on) { - sound_simple_on = FALSE; + setup.sound_simple_on = FALSE; local_player->setup &= ~SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); } else if (sound_status==SOUND_AVAILABLE) { - sound_on = sound_simple_on = TRUE; + setup.sound_on = setup.sound_simple_on = TRUE; local_player->setup |= SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON); } else DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); break; + default: break; } @@ -1507,31 +2032,67 @@ void HandleGameButtons(int mx, int my, int button) if (Request("Do you really want to quit the game ?", REQ_ASK | REQ_STAY_CLOSED)) { - game_status = MAINMENU; - DrawMainMenu(); + if (options.network) + SendToServer_StopPlaying(); + else + { + game_status = MAINMENU; + DrawMainMenu(); + } } else OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); break; + case BUTTON_GAME_PAUSE: + if (options.network) + { + if (tape.pausing) + SendToServer_ContinuePlaying(); + else + SendToServer_PausePlaying(); + } + else + TapeTogglePause(); + + /* if (tape.pausing) { - tape.pausing = FALSE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + if (options.network) + SendToServer_ContinuePlaying(); + else + { + tape.pausing = FALSE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + } } else { - tape.pausing = TRUE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); + if (options.network) + SendToServer_PausePlaying(); + else + { + tape.pausing = TRUE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); + } } + */ + break; + case BUTTON_GAME_PLAY: if (tape.pausing) { - tape.pausing = FALSE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + if (options.network) + SendToServer_ContinuePlaying(); + else + { + tape.pausing = FALSE; + DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + } } break; + default: break; }