X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=adbda0da2bd2ee927b9dd54fc5f3d26353361997;hp=87d7c39c995a1037b839115094bac5a5af6f210d;hb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;hpb=a4bf969413cdda68ab8bb54a2a1181bdc09cf63a diff --git a/src/screens.c b/src/screens.c index 87d7c39c..adbda0da 100644 --- a/src/screens.c +++ b/src/screens.c @@ -26,19 +26,31 @@ #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 x1 = SX + (SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2; - int y1 = SY + 8; - int x2 = SX + (SXSIZE - strlen(COPYRIGHT_STRING) * FONT2_XSIZE) / 2; - int y2 = SY + 46; + int x = SX + (SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2; - DrawText(x1, y1, GAMETITLE_STRING, FS_BIG, FC_YELLOW); - DrawText(x2, y2, COPYRIGHT_STRING, FS_SMALL, FC_RED); + DrawText(x, SY + 8, GAMETITLE_STRING, FS_BIG, FC_YELLOW); + DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING); } void DrawMainMenu() @@ -71,6 +83,8 @@ void DrawMainMenu() 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); @@ -144,7 +158,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) (x == 15 && level_nr < leveldir[leveldir_nr].levels - 1)) && 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); @@ -185,8 +199,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { DrawGraphic(0, y-1, GFX_KUGEL_ROT); DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU); + choice = y; } - choice = y; } else { @@ -226,9 +240,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(); @@ -513,7 +529,7 @@ void DrawHelpScreenElText(int start) ClearWindow(); DrawHeadline(); - DrawTextCentered(100, FC_GREEN, "The game elements:"); + DrawTextFCentered(100, FC_GREEN, "The game elements:"); for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++) { @@ -524,7 +540,7 @@ void DrawHelpScreenElText(int start) helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW); } - DrawTextCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); } void DrawHelpScreenMusicText(int num) @@ -536,22 +552,22 @@ void DrawHelpScreenMusicText(int num) ClearWindow(); DrawHeadline(); - DrawTextCentered(100, FC_GREEN, "The game background music loops:"); + DrawTextFCentered(100, FC_GREEN, "The game background music loops:"); - DrawTextCentered(ystart + 0 * ystep, FC_YELLOW, - "Excerpt from"); - DrawTextCentered(ystart + 1 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][0]); - DrawTextCentered(ystart + 2 * ystep, FC_YELLOW, - "by"); - DrawTextCentered(ystart + 3 * ystep, FC_RED, - "%s", helpscreen_music[num][1]); - DrawTextCentered(ystart + 4 * ystep, FC_YELLOW, - "from the album"); - DrawTextCentered(ystart + 5 * ystep, FC_RED, "\"%s\"", - helpscreen_music[num][2]); + DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + "Excerpt from"); + DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"", + helpscreen_music[num][0]); + DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, + "by"); + DrawTextFCentered(ystart + 3 * ystep, FC_RED, + "%s", helpscreen_music[num][1]); + DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW, + "from the album"); + DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"", + helpscreen_music[num][2]); - DrawTextCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); PlaySoundLoop(background_loop[num]); } @@ -565,22 +581,22 @@ void DrawHelpScreenCreditsText() ClearWindow(); DrawHeadline(); - DrawTextCentered(100, FC_GREEN, - "Credits:"); - DrawTextCentered(ystart + 0 * ystep, FC_YELLOW, - "DOS/Windows port of the game:"); - DrawTextCentered(ystart + 1 * ystep, FC_RED, - "Guido Schulz"); - DrawTextCentered(ystart + 2 * ystep, FC_YELLOW, - "Additional toons:"); - DrawTextCentered(ystart + 3 * ystep, FC_RED, - "Karl Hörnell"); - DrawTextCentered(ystart + 5 * ystep, FC_YELLOW, - "...and many thanks to all contributors"); - DrawTextCentered(ystart + 6 * ystep, FC_YELLOW, - "of new levels!"); - - DrawTextCentered(ybottom, FC_BLUE, "Press any key or button for next page"); + DrawTextFCentered(100, FC_GREEN, + "Credits:"); + DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + "DOS/Windows port of the game:"); + DrawTextFCentered(ystart + 1 * ystep, FC_RED, + "Guido Schulz"); + DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW, + "Additional toons:"); + DrawTextFCentered(ystart + 3 * ystep, FC_RED, + "Karl Hörnell"); + DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW, + "...and many thanks to all contributors"); + DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW, + "of new levels!"); + + DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page"); } void DrawHelpScreenContactText() @@ -591,34 +607,33 @@ void DrawHelpScreenContactText() ClearWindow(); DrawHeadline(); - DrawTextCentered(100, FC_GREEN, "Program information:"); - - DrawTextCentered(ystart + 0 * ystep, FC_YELLOW, - "This game is Freeware!"); - DrawTextCentered(ystart + 1 * ystep, FC_YELLOW, - "If you like it, send e-mail to:"); - DrawTextCentered(ystart + 2 * ystep, FC_RED, - "aeglos@valinor.owl.de"); - DrawTextCentered(ystart + 3 * ystep, FC_YELLOW, - "or SnailMail to:"); - DrawTextCentered(ystart + 4 * ystep + 0, FC_RED, - "Holger Schemel"); - DrawTextCentered(ystart + 4 * ystep + 20, FC_RED, - "Oststrasse 11a"); - DrawTextCentered(ystart + 4 * ystep + 40, FC_RED, - "33604 Bielefeld"); - DrawTextCentered(ystart + 4 * ystep + 60, FC_RED, - "Germany"); - - DrawTextCentered(ystart + 7 * ystep, FC_YELLOW, - "If you have created new levels,"); - DrawTextCentered(ystart + 8 * ystep, FC_YELLOW, - "send them to me to include them!"); - DrawTextCentered(ystart + 9 * ystep, FC_YELLOW, - ":-)"); - - DrawTextCentered(ybottom, FC_BLUE, - "Press any key or button for main menu"); + DrawTextFCentered(100, FC_GREEN, "Program information:"); + + DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW, + "This game is Freeware!"); + DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW, + "If you like it, send e-mail to:"); + DrawTextFCentered(ystart + 2 * ystep, FC_RED, + "aeglos@valinor.owl.de"); + DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW, + "or SnailMail to:"); + DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED, + "Holger Schemel"); + DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED, + "Oststrasse 11a"); + DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED, + "33604 Bielefeld"); + DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED, + "Germany"); + + DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW, + "If you have created new levels,"); + DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW, + "send them to me to include them!"); + DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW, + ":-)"); + + DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu"); } void DrawHelpScreen() @@ -641,7 +656,7 @@ void DrawHelpScreen() void HandleHelpScreen(int button) { - static long hs_delay = 0; + static unsigned long hs_delay = 0; int num_helpscreen_els_pages = (num_helpscreen_els + MAX_HELPSCREEN_ELS-1) / MAX_HELPSCREEN_ELS; int button_released = !button; @@ -695,48 +710,45 @@ void HandleHelpScreen(int button) void HandleTypeName(int newxpos, KeySym key) { static int xpos = 0, ypos = 2; - unsigned char ascii; if (newxpos) { xpos = newxpos; - DrawText(SX+6*32, SY+ypos*32, setup.player_name, FS_BIG, FC_YELLOW); - DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); + DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW); + DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); return; } -#ifndef MSDOS - if ((key>=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); -#else - if((ascii = get_ascii(key)) && xpos= 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; + 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); + 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 ((key==XK_Delete || key==XK_BackSpace) && xpos>0) + 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; @@ -747,39 +759,76 @@ void HandleTypeName(int newxpos, KeySym key) void DrawChooseLevel() { - int i; - CloseDoor(DOOR_CLOSE_2); + FadeToFront(); + InitAnimation(); + HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE); +} + +static void drawChooseLevelList(int first_entry, int num_page_entries) +{ + int i; + char buffer[SCR_FIELDX]; + ClearWindow(); DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN); - for(i=0; i 0) + DrawGraphic(0, 1, GFX_PFEIL_O); + + if (first_entry + num_page_entries < num_leveldirs) + DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U); +} + +static void drawChooseLevelInfo(int leveldir_nr) +{ + 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"); } void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { static int choice = 3; + static int first_entry = 0; + static unsigned long choose_delay = 0; static int redraw = TRUE; - int x = (mx+32-SX)/32, y = (my+32-SY)/32; + int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32; + int num_page_entries; + + if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN) + num_page_entries = num_leveldirs; + else + num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1; if (button == MB_MENU_INITIALIZE) { redraw = TRUE; - choice = leveldir_nr + 3; + choice = leveldir_nr + 3 - first_entry; + + if (choice > num_page_entries + 2) + { + choice = num_page_entries + 2; + first_entry = num_leveldirs - num_page_entries; + } + + drawChooseLevelList(first_entry, num_page_entries); + drawChooseLevelInfo(leveldir_nr); } if (redraw) { - DrawGraphic(0,choice-1,GFX_KUGEL_ROT); + DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); redraw = FALSE; } @@ -791,15 +840,35 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) if (dy) { x = 1; - y = choice+dy; + y = choice + dy; } else x = y = 0; + } - if (y<3) - y = 3; - else if (y>num_leveldirs+2) - y = num_leveldirs+2; + if (x == 1 && y == 2) + { + if (first_entry > 0 && + (dy || DelayReached(&choose_delay, 150))) + { + first_entry--; + drawChooseLevelList(first_entry, num_page_entries); + drawChooseLevelInfo(first_entry); + DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); + return; + } + } + else if (x == 1 && y > num_page_entries + 2) + { + if (first_entry + num_page_entries < num_leveldirs && + (dy || DelayReached(&choose_delay, 150))) + { + first_entry++; + drawChooseLevelList(first_entry, num_page_entries); + drawChooseLevelInfo(first_entry + num_page_entries - 1); + DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); + return; + } } if (!mx && !my && !dx && !dy) @@ -808,27 +877,26 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) y = choice; } - if (x==1 && y>=3 && y<=num_leveldirs+2) + if (x == 1 && y >= 3 && y <= num_page_entries + 2) { 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); + drawChooseLevelInfo(first_entry + y - 3); + choice = y; } - choice = y; } else { - leveldir_nr = y-3; + leveldir_nr = first_entry + y - 3; level_nr = getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename); SaveLevelSetup(); - TapeErase(); - LoadTape(level_nr); game_status = MAINMENU; DrawMainMenu(); @@ -838,32 +906,33 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) BackToFront(); - if (game_status==CHOOSELEVEL) + if (game_status == CHOOSELEVEL) DoAnimation(); } -void DrawHallOfFame(int pos) +void DrawHallOfFame(int highlight_position) { - int y; - char txt[40]; + int i; CloseDoor(DOOR_CLOSE_2); - if (pos<0) + if (highlight_position < 0) LoadScore(level_nr); + ClearWindow(); - DrawText(SX+64,SY+10,"Hall Of Fame",FS_BIG,FC_YELLOW); - sprintf(txt,"HighScores of Level %d",level_nr); - DrawText(SX+256-strlen(txt)*7,SY+48,txt,FS_SMALL,FC_RED); - for(y=0; y<15; y++) + + 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) @@ -1331,7 +1389,7 @@ 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)) goto out; @@ -1407,7 +1465,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); @@ -1572,32 +1632,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++) { @@ -1608,9 +1679,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(); @@ -1663,6 +1734,7 @@ void CalibrateJoystick(int player_nr) } } +#ifndef MSDOS if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) { joystick_status = JOYSTICK_OFF; @@ -1687,18 +1759,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; @@ -1720,6 +1834,7 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.ymiddle, setup.input[player_nr].joy.ylower); #endif + } BackToFront(); @@ -1738,10 +1853,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(); } @@ -1978,9 +2093,11 @@ void HandleVideoButtons(int mx, int my, int button) { TapeStartRecording(); +#ifndef MSDOS if (options.network) SendToServer_StartPlaying(); else +#endif { game_status = PLAYING; InitGame(); @@ -2123,9 +2240,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(); @@ -2138,10 +2257,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(); @@ -2150,9 +2271,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);