X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ec2e0e6db510f38d5a56be64b594216b850e95c2;hb=a4d4e8e444b21b58dcc88b52ff22726c545142a4;hp=86a1235d1549547c18ff94da1a756e22e5dd7862;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 86a1235d..ec2e0e6d 100644 --- a/src/screens.c +++ b/src/screens.c @@ -23,6 +23,7 @@ #include "tape.h" #include "joystick.h" #include "cartoons.h" +#include "network.h" #ifdef MSDOS extern unsigned char get_ascii(KeySym); @@ -204,7 +205,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { game_status = LEVELED; if (leveldir[leveldir_nr].readonly) - AreYouSure("This level is read only !",AYS_CONFIRM); + Request("This level is read only !",REQ_CONFIRM); DrawLevelEd(); } else if (y==7) @@ -214,11 +215,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(); - game_status = PLAYING; - InitGame(); + if (options.network) + SendToServer_StartPlaying(); + else + { + game_status = PLAYING; + InitGame(); + } } else if (y==9) { @@ -228,7 +234,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (y==10) { SavePlayerInfo(PLAYER_LEVEL); - if (AreYouSure("Do you really want to quit ?",AYS_ASK|AYS_STAY_CLOSED)) + if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -679,7 +685,9 @@ 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) @@ -887,6 +895,266 @@ void HandleHallOfFame(int button) void DrawSetupScreen() { int i; + 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}}, + {0, "Input Setup", {"", ""}, {0,0}}, + {0, "", {"", ""}, {0,0}}, + {0, "", {"", ""}, {0,0}}, + {0, "Exit", {"", ""}, {0,0}}, + {0, "Save and exit",{"", ""}, {0,0}} + }; + + CloseDoor(DOOR_CLOSE_2); + ClearWindow(); + 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_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_EMPTY1) + { + 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]); + } + } + + FadeToFront(); + InitAnimation(); + HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); +} + +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_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; + + if (redraw) + { + DrawGraphic(0,choice-1,GFX_KUGEL_ROT); + redraw = FALSE; + } + + if (button == MB_MENU_INITIALIZE) + return; + + if (dx || dy) + { + 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 (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 + { + int yy = y-1; + + if (y==3 && sound_status==SOUND_AVAILABLE) + { + 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 + { + 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; + } + 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; + } + 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) + { + game_status = SETUPINPUT; + 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); + SaveJoystickData(); + } + + game_status = MAINMENU; + DrawMainMenu(); + redraw = TRUE; + } + } + } + BackToFront(); + + if (game_status==SETUP) + DoAnimation(); +} + +void DrawSetupInputScreen() +{ +#if 0 static struct setup { unsigned int bit; @@ -910,11 +1178,38 @@ void DrawSetupScreen() {0, "Exit", {"", ""}, {0,0}}, {0, "Save and exit",{"", ""}, {0,0}} }; +#endif - CloseDoor(DOOR_CLOSE_2); ClearWindow(); - DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); + 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); + + 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, "Inputdevice:", FS_BIG, FC_GREEN); + if (setup.joy_input[0].use_joystick) + { + DrawText(SX+13*32, SY+3*32, + (setup.joy_input[0].joystick_nr == 0 ? "JOY1" : "JOY2"), + 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+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++) { int base = i - SETUP_SCREEN_POS_START; @@ -933,20 +1228,22 @@ void DrawSetupScreen() FS_BIG,setup[base].color[setting_pos]); } } +#endif FadeToFront(); InitAnimation(); - HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); + HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE); } -void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +void HandleSetupInputScreen(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 = 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) redraw = TRUE; @@ -970,8 +1267,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; @@ -985,7 +1282,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) { @@ -998,6 +1296,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } else { +#if 0 int yy = y-1; if (y==3 && sound_status==SOUND_AVAILABLE) @@ -1104,7 +1403,12 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } else if (y==14) { + /* CalibrateJoystick(); + */ + + CustomizeKeyboard(); + redraw = TRUE; } else if (y==pos_end-1 || y==pos_end) @@ -1119,6 +1423,17 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawMainMenu(); redraw = TRUE; } +#endif + + + if (y==pos_end) + { + game_status = SETUP; + DrawSetupScreen(); + redraw = TRUE; + } + + } } BackToFront(); @@ -1127,6 +1442,129 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DoAnimation(); } +void CustomizeKeyboard( /* int player_nr */ ) +{ + int player_nr = 0; + + 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" } + }; + + custom_key = setup.key_input[player_nr]; + + 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; + } + + if (key == XK_Return || step_nr == 6) + break; + + /* 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(); + + DrawSetupScreen(); + 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); + DrawSetupScreen(); +} + +void CalibrateJoystick_OLD() +{ +#ifdef __FreeBSD__ + struct joystick joy_ctrl; +#else + struct joystick_control + { + int buttons; + int x; + int y; + } joy_ctrl; +#endif + +#ifdef MSDOS + char joy_nr[4]; +#endif + + int joystick_nr = setup.joy_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 @@ -1164,7 +1786,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 @@ -1193,7 +1815,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 @@ -1221,7 +1843,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 @@ -1298,7 +1920,7 @@ void CalibrateJoystick() DrawSetupScreen(); } -void HandleGameActions(int player_action) +void HandleGameActions(byte player_action) { if (game_status != PLAYING) return; @@ -1327,7 +1949,7 @@ void HandleVideoButtons(int mx, int my, int button) { LoadLevelTape(level_nr); if (TAPE_IS_EMPTY(tape)) - AreYouSure("No tape for this level !",AYS_CONFIRM); + Request("No tape for this level !",REQ_CONFIRM); } else { @@ -1337,18 +1959,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(); - game_status = PLAYING; - InitGame(); + + if (options.network) + SendToServer_StartPlaying(); + else + { + game_status = PLAYING; + InitGame(); + } } else if (tape.pausing) { @@ -1365,6 +1996,7 @@ void HandleVideoButtons(int mx, int my, int button) TapeTogglePause(); } break; + case BUTTON_VIDEO_PLAY: if (TAPE_IS_EMPTY(tape)) break; @@ -1372,6 +2004,7 @@ void HandleVideoButtons(int mx, int my, int button) if (TAPE_IS_STOPPED(tape)) { TapeStartPlaying(); + game_status = PLAYING; InitGame(); } @@ -1397,6 +2030,7 @@ void HandleVideoButtons(int mx, int my, int button) } } break; + default: break; } @@ -1412,16 +2046,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); @@ -1429,38 +2063,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; } @@ -1484,34 +2121,70 @@ void HandleGameButtons(int mx, int my, int button) break; } - if (AreYouSure("Do you really want to quit the game ?", - AYS_ASK | AYS_STAY_CLOSED)) + 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; }