Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP refactor input caching - second attempt #1044

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
spacing
  • Loading branch information
markwkidd committed May 28, 2021
commit 081ff47e79a356f8a1557b0f19eecb6bf4400356
4 changes: 2 additions & 2 deletions src/mame2003/mame2003.c
Original file line number Diff line number Diff line change
@@ -270,9 +270,9 @@ static void init_core_options(void)
{
init_default(&default_options[OPT_4WAY], APPNAME"_four_way_emulation", "4-way joystick emulation on 8-way joysticks; disabled|enabled");
#if defined(__IOS__)
init_default(&default_options[OPT_MOUSE_DEVICE], APPNAME"_mouse_device", "X-Y Device; pointer|mouse|lightgun|disabled");
init_default(&default_options[OPT_MOUSE_DEVICE], APPNAME"_mouse_device", "X-Y Device; pointer|mouse|lightgun|disabled");
#else
init_default(&default_options[OPT_MOUSE_DEVICE], APPNAME"_mouse_device", "X-Y Device; mouse|pointer|lightgun|disabled");
init_default(&default_options[OPT_MOUSE_DEVICE], APPNAME"_mouse_device", "X-Y Device; mouse|pointer|lightgun|disabled");
#endif
init_default(&default_options[OPT_CROSSHAIR_ENABLED], APPNAME"_crosshair_enabled", "Show Lightgun crosshairs; enabled|disabled");
init_default(&default_options[OPT_SKIP_DISCLAIMER], APPNAME"_skip_disclaimer", "Skip Disclaimer; disabled|enabled");
10 changes: 1 addition & 9 deletions src/mame2003/mame2003.h
Original file line number Diff line number Diff line change
@@ -61,26 +61,18 @@ extern "C" {
#define MAX_GFX_ELEMENTS 32
#define MAX_MEMORY_REGIONS 32

<<<<<<< HEAD
#define INPUT_BUTTON_AXIS_THRESHOLD 64
#define LIBRETRO_ANALOG_MIN -32768
#define LIBRETRO_ANALOG_MAX 32767
#define ANALOG_MIN -128
#define ANALOG_MAX 128
=======
#define LIBRETRO_ANALOG_MIN -32768
#define LIBRETRO_ANALOG_MAX 32767
#define MAME_ANALOG_MIN -128
#define MAME_ANALOG_MAX 128
#define MAX_ANALOG_AXES 4
>>>>>>> 8c2f4704 (refactor: less input caching)

enum
{
X_AXIS = 0,
Y_AXIS,
Z_AXIS,
PEDAL_AXIS,
MAX_ANALOG_AXES
};

enum