Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-01-08 14:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Controls: extract init_joysticks (#15597)

Browse Source
This commit is contained in:
wrrrzr 2024-12-29 00:05:01 +03:00 committed by GitHub
parent 35bc217ba8
commit cca65fde08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/client/clientlauncher.cpp
View File

@ -301,24 +301,29 @@ void ClientLauncher::init_input()
else else
input = new RealInputHandler(receiver); input = new RealInputHandler(receiver);
if (g_settings->getBool("enable_joysticks")) { if (g_settings->getBool("enable_joysticks"))
irr::core::array<irr::SJoystickInfo> infos; init_joysticks();
std::vector<irr::SJoystickInfo> joystick_infos; }
// Make sure this is called maximum once per void ClientLauncher::init_joysticks()
// irrlicht device, otherwise it will give you {
// multiple events for the same joystick. irr::core::array<irr::SJoystickInfo> infos;
if (m_rendering_engine->get_raw_device()->activateJoysticks(infos)) { std::vector<irr::SJoystickInfo> joystick_infos;
infostream << "Joystick support enabled" << std::endl;
joystick_infos.reserve(infos.size()); // Make sure this is called maximum once per
for (u32 i = 0; i < infos.size(); i++) { // irrlicht device, otherwise it will give you
joystick_infos.push_back(infos[i]); // multiple events for the same joystick.
} if (!m_rendering_engine->get_raw_device()->activateJoysticks(infos)) {
input->joystick.onJoystickConnect(joystick_infos); errorstream << "Could not activate joystick support." << std::endl;
} else { return;
errorstream << "Could not activate joystick support." << std::endl;
}
} }
infostream << "Joystick support enabled" << std::endl;
joystick_infos.reserve(infos.size());
for (u32 i = 0; i < infos.size(); i++) {
joystick_infos.push_back(infos[i]);
}
input->joystick.onJoystickConnect(joystick_infos);
} }
void ClientLauncher::setting_changed_callback(const std::string &name, void *data) void ClientLauncher::setting_changed_callback(const std::string &name, void *data)

1
src/client/clientlauncher.h
View File

@ -26,6 +26,7 @@ private:
void init_args(GameStartData &start_data, const Settings &cmd_args); void init_args(GameStartData &start_data, const Settings &cmd_args);
bool init_engine(); bool init_engine();
void init_input(); void init_input();
void init_joysticks();
static void setting_changed_callback(const std::string &name, void *data); static void setting_changed_callback(const std::string &name, void *data);
void config_guienv(); void config_guienv();