Skip to content

Commit 2e1b3fd

Browse files
committed
Enable Joysticks by default on all platforms, it's 2024 after all
1 parent b8d0482 commit 2e1b3fd

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

src/settings.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,8 @@ void load_config(void) {
513513
config.unlimited_gas = 0;
514514

515515
for (int idx = 0; idx < MAX_JOYSTICK_COUNT; idx++) {
516-
#ifdef __SWITCH__
517516
config.joystick[idx] = idx;
518517
config.joystick_calibrated[idx] = 1;
519-
#else
520-
config.joystick[idx] = -1;
521-
config.joystick_calibrated[idx] = 0;
522-
#endif
523518
}
524519

525520
faili = settings_open(CONFIGURATION_FILENAME, "rb");

src/triplane.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3609,7 +3609,6 @@ int main(int argc, char *argv[]) {
36093609

36103610
parametri_kpl = argc;
36113611

3612-
36133612
if (findparameter("-?") || findparameter("-h") || findparameter("--help") || findparameter("-help")) {
36143613
printf("Triplane Classic " TRIPLANE_VERSION " - a side-scrolling dogfighting game.\n");
36153614
printf("Copyright (C) 1996,1997,2009 Dodekaedron Software Creations Oy\n");
@@ -3666,13 +3665,8 @@ int main(int argc, char *argv[]) {
36663665
if (anyJoystickCalibrated) {
36673666
if (!load_joysticks_data(CALIBRATION_FILENAME)) {
36683667
for (int idx = 0; idx < MAX_JOYSTICK_COUNT; idx++) {
3669-
#ifdef __SWITCH__
36703668
config.joystick_calibrated[idx] = 1;
36713669
config.joystick[idx] = idx;
3672-
#else
3673-
config.joystick_calibrated[idx] = 0;
3674-
config.joystick[idx] = -1;
3675-
#endif
36763670
}
36773671
loading_text("Unable to load calibration data.");
36783672
}

0 commit comments

Comments
 (0)