Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove outdated '-slowkey', '-alternatejoy' & '-directinput' options

Browse Source 
Removes key_emulation and joy_emulation toggles from ddio_init_info structures, that were not used in the SDL implementation.
All input is now handled using SDL for all platforms, alternatejoy/directinput options were only relevant for Windows-specific DirectInput. 'slowkey' was an unimplemented feature.
This commit is contained in:
Louis Gombert 2024-09-16 21:15:00 +02:00
parent d7063e7ff7
commit 6c533364f6
7 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Descent3/init.cpp
View File

@ -1433,8 +1433,7 @@ void InitIOSystems(bool editor) {
// do io init stuff
io_info.obj = Descent;
io_info.joy_emulation = (bool)((FindArg("-alternatejoy") == 0) && (FindArg("-directinput") == 0));
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0); WIN95: DirectInput is flaky for some keys.
INIT_MESSAGE(("Initializing DDIO systems."));
if (!ddio_Init(&io_info)) {
Error("I/O initialization failed.");
@ -2136,8 +2135,6 @@ void RestartD3() {
// startup io
io_info.obj = Descent;
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0);
io_info.joy_emulation = (bool)((FindArg("-alternatejoy") == 0) && (FindArg("-directinput") == 0));
if (!ddio_Init(&io_info)) {
Error("I/O initialization failed.");
}

2
ddio/ddio.cpp
View File

@ -119,7 +119,7 @@ bool ddio_Init(ddio_init_info *init_info) {
}
first_time = false;
DDIO_initialized = true;
joy_Init(init_info->joy_emulation);
joy_Init();
return res;
}
void ddio_Close() {

2
ddio/ddio_common.h
View File

@ -124,8 +124,6 @@
struct ddio_init_info {
oeApplication *obj; // App object used to initialize to IO system
bool key_emulation; // keyboard emulation
bool joy_emulation; // joystick emulation
};
// ----------------------------------------------------------------------------

4
ddio/sdljoy.cpp
View File

@ -97,7 +97,7 @@ static bool joy_InitStick(tJoystick joy, char *server_adr);
// functions
// joystick system initialization
bool joy_Init(bool remote) {
bool joy_Init() {
// reinitialize joystick if already initialized.
joy_Close();
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) {
@ -106,7 +106,7 @@ bool joy_Init(bool remote) {
}
// check if this OS supports joysticks
if (!joyGetNumDevs() && !remote) {
if (!joyGetNumDevs()) {
return false;
}

6
editor/gameeditor.cpp
View File

@ -670,10 +670,6 @@ void GameToEditor(bool set_viewer_from_player) {
SetWindowLong(theApp.main_frame->m_hWnd, GWL_STYLE, EditorWndStyle);
}
// this uses information defined above
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0);
io_info.joy_emulation = (bool)((FindArg("-alternatejoy") == 0) && (FindArg("-directinput") == 0));
ddio_Init(&io_info);
Cinematic_Init();
@ -871,8 +867,6 @@ void EditorToGame() {
// Initialize IO System for child window
io_info.obj = Descent;
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0);
io_info.joy_emulation = (bool)((FindArg("-alternatejoy") == 0) && (FindArg("-directinput") == 0));
ddio_Init(&io_info);
// Init force feedback

2
legacy/FontEditor/FontEditor.cpp
View File

@ -181,8 +181,6 @@ void InitIO(oeApplication *app) {
ddio_init_data.obj = app;
ddio_init_data.use_lo_res_time = true;
ddio_init_data.key_emulation = true;
ddio_init_data.joy_emulation = true;
ddio_Init(&ddio_init_data);
GetCurrentDirectory(sizeof(path), path);

2
lib/joystick.h
View File

@ -138,7 +138,7 @@ struct tJoyPos {
};
// joystick system initialization
bool joy_Init(bool emulation);
bool joy_Init();
void joy_Close();
// retreive information about joystick.