X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=99cbd2eafe450e464fa46e9bdb3e38511aeb6ead;hb=fe158e864d3fa4b0221e9c88d8dfff0157051396;hp=f90b6e55dc882487691298f5cf74e69992eeeb36;hpb=01a911493067452c475a31b76a3b33154b6dd10f;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index f90b6e55..99cbd2ea 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2000 Artsoft Entertainment * +* (c) 1995-2001 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -20,7 +20,6 @@ #include "editor.h" #include "files.h" #include "tape.h" -#include "joystick.h" #include "cartoons.h" #include "network.h" #include "init.h" @@ -94,6 +93,7 @@ void DrawMainMenu() UnmapAllGadgets(); FadeSounds(); KeyboardAutoRepeatOn(); + ActivateJoystickIfAvailable(); /* needed if last screen was the playing screen, invoked from level editor */ if (level_editor_test_game) @@ -1049,7 +1049,8 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) leveldir_current->cl_first); drawChooseLevelList(leveldir_current->cl_first, num_page_entries); - drawChooseLevelInfo(leveldir_pos); + drawChooseLevelInfo(leveldir_current->cl_first + + leveldir_current->cl_cursor - 3); redraw = TRUE; } @@ -1172,15 +1173,19 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) node_cursor->cl_first = leveldir_current->cl_first; node_cursor->cl_cursor = leveldir_current->cl_cursor; leveldir_current = node_cursor->node_group; + DrawChooseLevel(); } else if (node_cursor->parent_link) { leveldir_current = node_cursor->node_parent; + DrawChooseLevel(); } else { + node_cursor->cl_first = leveldir_current->cl_first; + node_cursor->cl_cursor = leveldir_current->cl_cursor; leveldir_current = node_cursor; LoadLevelSetup_SeriesInfo(); @@ -1204,6 +1209,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) void DrawHallOfFame(int highlight_position) { UnmapAllGadgets(); + FadeSounds(); CloseDoor(DOOR_CLOSE_2); if (highlight_position < 0) @@ -1583,23 +1589,11 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawSetupInputScreen(); redraw = TRUE; } - else if (y==pos_end-1 || y==pos_end) + else if (y == pos_end - 1 || y == pos_end) { - if (y==pos_end) - { + if (y == pos_end) SaveSetup(); - /* - SaveJoystickData(); - */ - -#if defined(PLATFORM_MSDOS) - save_joystick_data(JOYSTICK_FILENAME); -#endif - - - } - game_status = MAINMENU; DrawMainMenu(); redraw = TRUE; @@ -1629,6 +1623,7 @@ void DrawSetupInputScreen() DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); + DeactivateJoystickForCalibration(); DrawTextFCentered(SYSIZE - 20, FC_BLUE, "Joysticks deactivated on this screen"); @@ -1654,7 +1649,8 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr) device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10); } else - strncpy(device_name, joystick_device_name[device_nr], strlen(device_name)); + strncpy(device_name, getDeviceNameFromJoystickNr(device_nr), + strlen(device_name)); } static void drawPlayerSetupInputInfo(int player_nr) @@ -1837,30 +1833,6 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) setJoystickDeviceToNr(device_name, new_device_nr); } - - /* - InitJoysticks(); - */ - - -#if 0 - 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; - } -#endif - drawPlayerSetupInputInfo(player_nr); } else if (y == 5) @@ -2025,56 +1997,29 @@ void CustomizeKeyboard(int player_nr) DrawSetupInputScreen(); } -void CalibrateJoystick(int player_nr) +static boolean CalibrateJoystickMain(int player_nr) { -#ifdef __FreeBSD__ - struct joystick joy_ctrl; -#else - struct joystick_control - { - int buttons; - int x; - int y; - } joy_ctrl; -#endif - -#if !defined(PLATFORM_MSDOS) - int new_joystick_xleft = 128, new_joystick_xright = 128; - int new_joystick_yupper = 128, new_joystick_ylower = 128; + int new_joystick_xleft = JOYSTICK_XMIDDLE; + int new_joystick_xright = JOYSTICK_XMIDDLE; + int new_joystick_yupper = JOYSTICK_YMIDDLE; + int new_joystick_ylower = JOYSTICK_YMIDDLE; int new_joystick_xmiddle, new_joystick_ymiddle; -#else - int calibration_step = 1; -#endif - int joystick_fd = stored_player[player_nr].joystick_fd; + int joystick_fd = joystick.fd[player_nr]; int x, y, last_x, last_y, xpos = 8, ypos = 3; boolean check[3][3]; - int check_remaining; + int check_remaining = 3 * 3; + int joy_x, joy_y; int joy_value; int result = -1; - if (joystick_status == JOYSTICK_OFF || - joystick_fd < 0 || - !setup.input[player_nr].use_joystick) - goto error_out; + if (joystick.status == JOYSTICK_NOT_AVAILABLE) + return FALSE; - ClearWindow(); + if (joystick_fd < 0 || !setup.input[player_nr].use_joystick) + return FALSE; -#if !defined(PLATFORM_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 + ClearWindow(); for(y=0; y<3; y++) { @@ -2085,21 +2030,29 @@ void CalibrateJoystick(int player_nr) } } + 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, " CENTER JOYSTICK ", FS_BIG, FC_YELLOW); + DrawText(SX, SY + 12 * 32, " AND ", FS_BIG, FC_YELLOW); + DrawText(SX, SY + 13 * 32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW); + 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(); + /* eventually uncalibrated center position (joystick could be uncentered) */ + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; -#ifdef __FreeBSD__ - joy_ctrl.b1 = joy_ctrl.b2 = 0; -#else - joy_ctrl.buttons = 0; -#endif + new_joystick_xmiddle = joy_x; + new_joystick_ymiddle = joy_y; - while(Joystick(player_nr) & JOY_BUTTON); + DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); + BackToFront(); + while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ InitAnimation(); while(result < 0) @@ -2139,28 +2092,13 @@ void CalibrateJoystick(int player_nr) } } -#if !defined(PLATFORM_MSDOS) + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; -#if defined(TARGET_SDL) - joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0); - joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1); -#else - if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) - { - joystick_status = JOYSTICK_OFF; - goto error_out; - } -#endif - - 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; + new_joystick_xleft = MIN(new_joystick_xleft, joy_x); + new_joystick_xright = MAX(new_joystick_xright, joy_x); + new_joystick_yupper = MIN(new_joystick_yupper, joy_y); + new_joystick_ylower = MAX(new_joystick_ylower, joy_y); setup.input[player_nr].joy.xleft = new_joystick_xleft; setup.input[player_nr].joy.yupper = new_joystick_yupper; @@ -2170,60 +2108,18 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; CheckJoystickData(); -#endif joy_value = Joystick(player_nr); if (joy_value & JOY_BUTTON && check_remaining == 0) - { result = 1; -#if defined(PLATFORM_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) { -#if !defined(PLATFORM_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; @@ -2236,6 +2132,7 @@ void CalibrateJoystick(int player_nr) } #if 0 +#ifdef DEBUG printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n", setup.input[player_nr].joy.xleft, setup.input[player_nr].joy.xmiddle, @@ -2244,6 +2141,7 @@ void CalibrateJoystick(int player_nr) setup.input[player_nr].joy.yupper, setup.input[player_nr].joy.ymiddle, setup.input[player_nr].joy.ylower); +#endif #endif } @@ -2255,12 +2153,19 @@ void CalibrateJoystick(int player_nr) Delay(10); } + /* calibrated center position (joystick should now be centered) */ + if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL)) + return FALSE; + + new_joystick_xmiddle = joy_x; + new_joystick_ymiddle = joy_y; + StopAnimation(); DrawSetupInputScreen(); /* wait until the last pressed button was released */ - while(Joystick(player_nr) & JOY_BUTTON) + while (Joystick(player_nr) & JOY_BUTTON) { if (PendingEvent()) /* got event */ { @@ -2272,16 +2177,21 @@ void CalibrateJoystick(int player_nr) Delay(10); } } - return; - error_out: + return TRUE; +} - ClearWindow(); - DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW); - DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW); - BackToFront(); - Delay(2000); - DrawSetupInputScreen(); +void CalibrateJoystick(int player_nr) +{ + if (!CalibrateJoystickMain(player_nr)) + { + ClearWindow(); + + DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW); + DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW); + BackToFront(); + Delay(2000); /* show error message for two seconds */ + } } void HandleGameActions()