projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020323-2-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 8a6a486d2e270fd675a56601979cc41df605ef4d..5c317af059ce93235d035ca5b9ca007e46dd2e85 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-20,7
+20,6
@@
#include "editor.h"
#include "files.h"
#include "tape.h"
#include "editor.h"
#include "files.h"
#include "tape.h"
-#include "joystick.h"
#include "cartoons.h"
#include "network.h"
#include "init.h"
#include "cartoons.h"
#include "network.h"
#include "init.h"
@@
-94,6
+93,7
@@
void DrawMainMenu()
UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
+ ActivateJoystickIfAvailable();
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
@@
-1635,6
+1635,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);
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");
DrawTextFCentered(SYSIZE - 20, FC_BLUE,
"Joysticks deactivated on this screen");
@@
-1660,7
+1661,8
@@
static void setJoystickDeviceToNr(char *device_name, int device_nr)
device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10);
}
else
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)
}
static void drawPlayerSetupInputInfo(int player_nr)
@@
-2052,14
+2054,14
@@
void CalibrateJoystick(int player_nr)
int calibration_step = 1;
#endif
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 joy_value;
int result = -1;
int x, y, last_x, last_y, xpos = 8, ypos = 3;
boolean check[3][3];
int check_remaining;
int joy_value;
int result = -1;
- if (joystick
_status == JOYSTICK_OFF
||
+ if (joystick
.status == JOYSTICK_NOT_AVAILABLE
||
joystick_fd < 0 ||
!setup.input[player_nr].use_joystick)
goto error_out;
joystick_fd < 0 ||
!setup.input[player_nr].use_joystick)
goto error_out;
@@
-2153,7
+2155,7
@@
void CalibrateJoystick(int player_nr)
#else
if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
{
#else
if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
{
- joystick
_status = JOYSTICK_OFF
;
+ joystick
.status = JOYSTICK_NOT_AVAILABLE
;
goto error_out;
}
#endif
goto error_out;
}
#endif
@@
-2192,7
+2194,7
@@
void CalibrateJoystick(int player_nr)
}
else if (calibrate_joystick(joystick_fd) != 0)
{
}
else if (calibrate_joystick(joystick_fd) != 0)
{
- joystick
_status = JOYSTICK_OFF
;
+ joystick
.status = JOYSTICK_NOT_AVAILABLE
;
goto error_out;
}
goto error_out;
}