X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0e3954499aaf684f334f356771501335fb2df96d;hb=41364660abbcb81a83f5018be3655352ecdf1ac9;hp=bcf96b32d80c0d1a332af6274317b684ca4bfdf6;hpb=05651fcbc154b1d8321d6e4e9374cfcdd274feda;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index bcf96b32..0e395449 100644 --- a/src/screens.c +++ b/src/screens.c @@ -26,15 +26,30 @@ #include "network.h" #include "init.h" +/* for DrawSetupScreen(), HandleSetupScreen() */ +#define SETUP_SCREEN_POS_START 2 +#define SETUP_SCREEN_POS_END 16 +#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 15 +#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 15 + #ifdef MSDOS extern unsigned char get_ascii(KeySym); #endif void DrawHeadline() { - int x = SX + (SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2; + int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2; - DrawText(x, SY + 8, GAMETITLE_STRING, FS_BIG, FC_YELLOW); + DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW); DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING); } @@ -43,6 +58,20 @@ void DrawMainMenu() int i; char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); + XAutoRepeatOn(display); + + /* needed if last screen was the playing screen, invoked from level editor */ + if (level_editor_test_game) + { + game_status = LEVELED; + DrawLevelEd(); + return; + } + + /* unmap gadgets from last screen, map gadgets for main menu screen */ + UnmapAllGadgets(); + MapTapeButtons(); + FadeSounds(); GetPlayerConfig(); LoadLevel(level_nr); @@ -61,15 +90,23 @@ void DrawMainMenu() DrawText(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN); DrawText(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN); - DrawMicroLevel(MICROLEV_XPOS,MICROLEV_YPOS); + DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); + + DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d", + leveldir[leveldir_nr].first_level, + leveldir[leveldir_nr].last_level); + + if (leveldir[leveldir_nr].readonly) + { + DrawTextF(15*32 + 6, 3*32 + 9 - 7, FC_RED, "READ"); + DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY"); + } for(i=2; i<10; i++) DrawGraphic(0, i, GFX_KUGEL_BLAU); DrawGraphic(10, 3, GFX_PFEIL_L); DrawGraphic(14, 3, GFX_PFEIL_R); - DrawTextF(15*32 + 6, 3*32 + 9, FC_RED, "%d", leveldir[leveldir_nr].levels); - DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FS_SMALL, FC_RED); @@ -94,7 +131,6 @@ void DrawMainMenu() OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); ClearEventQueue(); - XAutoRepeatOn(display); } void HandleMainMenu(int mx, int my, int dx, int dy, int button) @@ -139,22 +175,23 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) y = choice; } - if (y == 4 && ((x == 11 && level_nr > 0) || - (x == 15 && level_nr < leveldir[leveldir_nr].levels - 1)) && + if (y == 4 && ((x == 11 && level_nr > leveldir[leveldir_nr].first_level) || + (x == 15 && level_nr < leveldir[leveldir_nr].last_level)) && button) { - static long level_delay = 0; + static unsigned long level_delay = 0; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int new_level_nr, old_level_nr = level_nr; int font_color = (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW); new_level_nr = level_nr + (x == 11 ? -step : +step); - if (new_level_nr < 0) - new_level_nr = 0; - if (new_level_nr > leveldir[leveldir_nr].levels - 1) - new_level_nr = leveldir[leveldir_nr].levels - 1; + if (new_level_nr < leveldir[leveldir_nr].first_level) + new_level_nr = leveldir[leveldir_nr].first_level; + if (new_level_nr > leveldir[leveldir_nr].last_level) + new_level_nr = leveldir[leveldir_nr].last_level; - if (old_level_nr == new_level_nr || !DelayReached(&level_delay, 150)) + if (old_level_nr == new_level_nr || + !DelayReached(&level_delay, GADGET_FRAME_DELAY)) goto out; level_nr = new_level_nr; @@ -165,7 +202,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) int2str(level_nr, 3), FS_BIG, font_color); LoadLevel(level_nr); - DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS); + DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); TapeErase(); LoadTape(level_nr); @@ -210,7 +247,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y == 6) { - if (leveldir[leveldir_nr].readonly) + if (leveldir[leveldir_nr].readonly && + strcmp(setup.player_name, "Artsoft") != 0) Request("This level is read only !", REQ_CONFIRM); game_status = LEVELED; DrawLevelEd(); @@ -225,9 +263,11 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (setup.autorecord) TapeStartRecording(); +#ifndef MSDOS if (options.network) SendToServer_StartPlaying(); else +#endif { game_status = PLAYING; InitGame(); @@ -253,7 +293,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) out: if (game_status == MAINMENU) + { + DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE); DoAnimation(); + } } #define MAX_HELPSCREEN_ELS 10 @@ -277,8 +320,10 @@ static int helpscreen_action[] = GFX_MORAST_LEER,1,100, HA_NEXT, GFX_BETON,1,100, HA_NEXT, GFX_MAUERWERK,1,100, HA_NEXT, - GFX_MAUER_R1,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, - GFX_MAUER_L1,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, HA_NEXT, + GFX_MAUER_L1, 3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, + GFX_MAUER_R1, 3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, + GFX_MAUER_UP, 3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, + GFX_MAUER_DOWN,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10, HA_NEXT, GFX_UNSICHTBAR,1,100, HA_NEXT, GFX_FELSBODEN,1,100, HA_NEXT, GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4, HA_NEXT, @@ -357,13 +402,17 @@ static int helpscreen_action[] = GFX_DIAMANT,1,10, HA_NEXT, GFX_LIFE,1,100, HA_NEXT, GFX_LIFE_ASYNC,1,100, HA_NEXT, - GFX_SIEB_LEER,4,2, HA_NEXT, - GFX_SIEB2_LEER,4,2, HA_NEXT, + GFX_SIEB_INAKTIV,4,2, HA_NEXT, + GFX_SIEB2_INAKTIV,4,2, HA_NEXT, GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2, GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2, GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2, HA_NEXT, GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2, GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2, HA_NEXT, + GFX_SOKOBAN_OBJEKT,1,100, HA_NEXT, + GFX_SOKOBAN_FELD_LEER,1,100, HA_NEXT, + GFX_SOKOBAN_FELD_VOLL,1,100, HA_NEXT, + GFX_SPEED_PILL,1,100, HA_NEXT, HA_END }; static char *helpscreen_eltext[][2] = @@ -374,7 +423,7 @@ static char *helpscreen_eltext[][2] = {"Quicksand: You cannot pass it,", "but rocks can fall though it"}, {"Massive Wall:", "Nothing can go through it"}, {"Normal Wall: You can't go through", "it, but you can bomb it away"}, - {"Growing Wall: Grows to the left or", "right if there is an empty field"}, + {"Growing Wall: Grows in several di-", "rections if there is an empty field"}, {"Invisible Wall: Behaves like normal","wall, but is invisible"}, {"Old Wall: Like normal wall, but", "some things can fall down from it"}, {"Letter Wall: Looks like a letter,", "behaves like a normal wall"}, @@ -425,6 +474,10 @@ static char *helpscreen_eltext[][2] = {"Magic Wall (BD style):", "Changes rocks and BD style diamonds"}, {"Exit door: Opens if you have enough","emeralds to finish the level"}, {"Open exit door: Enter here to leave","the level and exit the actual game"}, + {"Sokoban element: Object which must", "be pushed to an empty field"}, + {"Sokoban element: Empty field where", "a Sokoban object can be placed on"}, + {"Sokoban element: Field with object", "which can be pushed away"}, + {"Speed pill: Lets the player run", "twice as fast as normally"}, }; static int num_helpscreen_els = sizeof(helpscreen_eltext)/(2*sizeof(char *)); @@ -623,6 +676,7 @@ void DrawHelpScreen() { int i; + UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); for(i=0;i=XK_A && key<=XK_Z) || (key>=XK_a && key<=XK_z && - xpos= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && + xpos < MAX_NAMELEN - 1) { - if (key>=XK_A && key<=XK_Z) - ascii = 'A'+(char)(key-XK_A); - if (key>=XK_a && key<=XK_z) - ascii = 'a'+(char)(key-XK_a); + char ascii; + + if (key >= XK_A && key <= XK_Z) + ascii = 'A' + (char)(key - XK_A); + else + ascii = 'a' + (char)(key - XK_a); setup.player_name[xpos] = ascii; - setup.player_name[xpos+1] = 0; - xpos++; - DrawTextExt(drawto,gc,SX+6*32,SY+ypos*32, - setup.player_name,FS_BIG,FC_YELLOW); - DrawTextExt(window,gc,SX+6*32,SY+ypos*32, - setup.player_name,FS_BIG,FC_YELLOW); - DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); - } -#else - if ((ascii = get_ascii(key)) && xpos0) + else if ((key == XK_Delete || key == XK_BackSpace) && xpos > 0) { xpos--; setup.player_name[xpos] = 0; - DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); - DrawGraphic(xpos+7,ypos,GFX_LEERRAUM); + DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); + DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM); } - else if (key==XK_Return && xpos>0) + else if (key == XK_Return && xpos > 0) { - DrawText(SX+6*32,SY+ypos*32,setup.player_name,FS_BIG,FC_RED); - DrawGraphic(xpos+6,ypos,GFX_LEERRAUM); + DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED); + DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM); SaveSetup(); game_status = MAINMENU; @@ -755,6 +796,7 @@ void HandleTypeName(int newxpos, KeySym key) void DrawChooseLevel() { + UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); FadeToFront(); @@ -774,7 +816,8 @@ static void drawChooseLevelList(int first_entry, int num_page_entries) { strncpy(buffer, leveldir[first_entry + i].name , SCR_FIELDX - 1); buffer[SCR_FIELDX - 1] = '\0'; - DrawText(SX + 32, SY + (i + 2) * 32, buffer, FS_BIG, FC_YELLOW); + DrawText(SX + 32, SY + (i + 2) * 32, buffer, + FS_BIG, leveldir[first_entry + i].color); DrawGraphic(0, i + 2, GFX_KUGEL_BLAU); } @@ -782,30 +825,38 @@ static void drawChooseLevelList(int first_entry, int num_page_entries) DrawGraphic(0, 1, GFX_PFEIL_O); if (first_entry + num_page_entries < num_leveldirs) - DrawGraphic(0, MAX_VISIBLE_ENTRIES + 1, GFX_PFEIL_U); + DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U); } static void drawChooseLevelInfo(int leveldir_nr) { + int x, last_redraw_mask = redraw_mask; + XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32); DrawTextFCentered(40, FC_RED, "%3d levels (%s)", leveldir[leveldir_nr].levels, leveldir[leveldir_nr].readonly ? "readonly" : "writable"); + + /* let BackToFront() redraw only what is needed */ + redraw_mask = last_redraw_mask | REDRAW_TILES; + for (x=0; x 0 && - (dy || DelayReached(&choose_delay, 150))) + (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) { +#if 0 first_entry--; +#else + first_entry -= step; + if (first_entry < 0) + first_entry = 0; +#endif drawChooseLevelList(first_entry, num_page_entries); drawChooseLevelInfo(first_entry); DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); @@ -857,9 +914,15 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) else if (x == 1 && y > num_page_entries + 2) { if (first_entry + num_page_entries < num_leveldirs && - (dy || DelayReached(&choose_delay, 150))) + (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) { +#if 0 first_entry++; +#else + first_entry += step; + if (first_entry + num_page_entries > num_leveldirs) + first_entry = num_leveldirs - num_page_entries; +#endif drawChooseLevelList(first_entry, num_page_entries); drawChooseLevelInfo(first_entry + num_page_entries - 1); DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); @@ -910,6 +973,7 @@ void DrawHallOfFame(int highlight_position) { int i; + UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); if (highlight_position < 0) @@ -920,7 +984,7 @@ void DrawHallOfFame(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' && c <= '9') - joystick_nr = (int)(c - '0'); - - if (joystick_nr < 0 || joystick_nr >= MAX_PLAYERS) - joystick_nr = 0; - - return joystick_nr; } static void setJoystickDeviceToNr(char *device_name, int device_nr) @@ -1396,9 +1457,9 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (y == 3 && ((x == 1 && !button) || ((x == 11 || x == 13) && button))) { - static long delay = 0; + static unsigned long delay = 0; - if (!DelayReached(&delay, 150)) + if (!DelayReached(&delay, GADGET_FRAME_DELAY)) goto out; player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS; @@ -1472,7 +1533,9 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) if (setup.input[player_nr].use_joystick) { InitJoysticks(); + game_status = CALIBRATION; CalibrateJoystick(player_nr); + game_status = SETUPINPUT; } else CustomizeKeyboard(player_nr); @@ -1637,32 +1700,43 @@ void CalibrateJoystick(int player_nr) } joy_ctrl; #endif -#ifdef MSDOS - char joy_nr[4]; -#endif - - int joystick_fd = stored_player[player_nr].joystick_fd; +#ifndef MSDOS int new_joystick_xleft = 128, new_joystick_xright = 128; int new_joystick_yupper = 128, new_joystick_ylower = 128; int new_joystick_xmiddle, new_joystick_ymiddle; +#else + int calibration_step = 1; +#endif + + int joystick_fd = stored_player[player_nr].joystick_fd; int x, y, last_x, last_y, xpos = 8, ypos = 3; boolean check[3][3]; - int check_remaining = 3 * 3; - int joy; + int check_remaining; + int joy_value; int result = -1; - if (joystick_status == JOYSTICK_OFF) - return; - - if (!setup.input[player_nr].use_joystick || joystick_fd < 0) - return; + if (joystick_status == JOYSTICK_OFF || + joystick_fd < 0 || + !setup.input[player_nr].use_joystick) + goto error_out; ClearWindow(); - 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 BUTTON! ",FS_BIG,FC_YELLOW); + +#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 for(y=0; y<3; y++) { @@ -1673,9 +1747,9 @@ void CalibrateJoystick(int player_nr) } } - joy = Joystick(player_nr); - last_x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0); - last_y = (joy & JOY_UP ? -1 : joy & JOY_DOWN ? +1 : 0); + 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(); @@ -1728,6 +1802,7 @@ void CalibrateJoystick(int player_nr) } } +#ifndef MSDOS if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) { joystick_status = JOYSTICK_OFF; @@ -1752,18 +1827,60 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; CheckJoystickData(); +#endif - joy = Joystick(player_nr); + joy_value = Joystick(player_nr); - if (joy & JOY_BUTTON && check_remaining == 0) + if (joy_value & 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); +#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; @@ -1785,6 +1902,7 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.ymiddle, setup.input[player_nr].joy.ylower); #endif + } BackToFront(); @@ -1803,10 +1921,10 @@ void CalibrateJoystick(int player_nr) error_out: ClearWindow(); - DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW); - DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW); + DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW); + DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW); BackToFront(); - Delay(3000); + Delay(2000); DrawSetupInputScreen(); } @@ -2008,6 +2126,11 @@ void HandleGameActions() void HandleVideoButtons(int mx, int my, int button) { + return; + + + + if (game_status != MAINMENU && game_status != PLAYING) return; @@ -2043,9 +2166,11 @@ void HandleVideoButtons(int mx, int my, int button) { TapeStartRecording(); +#ifndef MSDOS if (options.network) SendToServer_StartPlaying(); else +#endif { game_status = PLAYING; InitGame(); @@ -2110,6 +2235,13 @@ void HandleVideoButtons(int mx, int my, int button) void HandleSoundButtons(int mx, int my, int button) { + + + + return; + + + if (game_status != PLAYING) return; @@ -2171,6 +2303,13 @@ void HandleSoundButtons(int mx, int my, int button) void HandleGameButtons(int mx, int my, int button) { + + + + return; + + + if (game_status != PLAYING) return; @@ -2188,9 +2327,11 @@ void HandleGameButtons(int mx, int my, int button) if (Request("Do you really want to quit the game ?", REQ_ASK | REQ_STAY_CLOSED)) { +#ifndef MSDOS if (options.network) SendToServer_StopPlaying(); else +#endif { game_status = MAINMENU; DrawMainMenu(); @@ -2203,10 +2344,12 @@ void HandleGameButtons(int mx, int my, int button) case BUTTON_GAME_PAUSE: if (options.network) { +#ifndef MSDOS if (tape.pausing) SendToServer_ContinuePlaying(); else SendToServer_PausePlaying(); +#endif } else TapeTogglePause(); @@ -2215,9 +2358,11 @@ void HandleGameButtons(int mx, int my, int button) case BUTTON_GAME_PLAY: if (tape.pausing) { +#ifndef MSDOS if (options.network) SendToServer_ContinuePlaying(); else +#endif { tape.pausing = FALSE; DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);