Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-04-10 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Disabled Alt-O (dump timings) and Alt-U (dump input state) when

Browse source 
SUPERMODEL_DEBUGGER not defined
- Option '-print-inputs' works again if no ROM set specified
This commit is contained in:
SpinDizzy 2019-02-19 09:24:31 +00:00
parent 6fe878b1d3
commit c86dab0fe9
2 changed files with 7 additions and 5 deletions
Src
Inputs
Inputs.cpp
OSD/SDL
Main.cpp

3
Src/Inputs/Inputs.cpp
View file

@ -1,7 +1,8 @@
/** /**
** Supermodel ** Supermodel
** A Sega Model 3 Arcade Emulator. ** A Sega Model 3 Arcade Emulator.
** Copyright 2011 Bart Trzynadlowski, Nik Henson ** Copyright 2011-2019 Bart Trzynadlowski, Nik Henson, Ian Curtis,
** Harry Tuttle, and Spindizzi
** **
** This file is part of Supermodel. ** This file is part of Supermodel.
** **

9
Src/OSD/SDL/Main.cpp
View file

@ -1,7 +1,8 @@
/** /**
** Supermodel ** Supermodel
** A Sega Model 3 Arcade Emulator. ** A Sega Model 3 Arcade Emulator.
** Copyright 2011-2017 Bart Trzynadlowski, Nik Henson, Ian Curtis ** Copyright 2011-2019 Bart Trzynadlowski, Nik Henson, Ian Curtis,
** Harry Tuttle, and Spindizzi
** **
** This file is part of Supermodel. ** This file is part of Supermodel.
** **
@ -28,7 +29,6 @@
* ------------------------- * -------------------------
* - Thoroughly test config system (do overrides work as expected? XInput * - Thoroughly test config system (do overrides work as expected? XInput
* force settings?) * force settings?)
* - Make sure fragment and vertex shaders are configurable for 3D (and 2D?)
* - Remove all occurrences of "using namespace std" from Nik's code. * - Remove all occurrences of "using namespace std" from Nik's code.
* - Standardize variable naming (recently introduced vars_like_this should be * - Standardize variable naming (recently introduced vars_like_this should be
* converted back to varsLikeThis). * converted back to varsLikeThis).
@ -39,7 +39,6 @@
* - Make sure quitting while paused works. * - Make sure quitting while paused works.
* - Add UI keys for balance setting? * - Add UI keys for balance setting?
* - 5.1 audio support? * - 5.1 audio support?
* - Stretch video option
* *
* Compile-Time Options * Compile-Time Options
* -------------------- * --------------------
@ -1110,6 +1109,7 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
else else
printf("\n"); printf("\n");
} }
#ifdef SUPERMODEL_DEBUGGER
else if (Inputs->uiDumpInpState->Pressed()) else if (Inputs->uiDumpInpState->Pressed())
{ {
// Dump input states // Dump input states
@ -1119,6 +1119,7 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
{ {
dumpTimings = !dumpTimings; dumpTimings = !dumpTimings;
} }
#endif
else if (Inputs->uiSelectCrosshairs->Pressed() && gameHasLightguns) else if (Inputs->uiSelectCrosshairs->Pressed() && gameHasLightguns)
{ {
int crosshairs = (s_runtime_config["Crosshairs"].ValueAs<unsigned>() + 1) & 3; int crosshairs = (s_runtime_config["Crosshairs"].ValueAs<unsigned>() + 1) & 3;
@ -1679,7 +1680,7 @@ int main(int argc, char **argv)
#endif #endif
bool print_games = cmd_line.print_games; bool print_games = cmd_line.print_games;
bool rom_specified = !cmd_line.rom_files.empty(); bool rom_specified = !cmd_line.rom_files.empty();
if (!rom_specified && !print_games && !cmd_line.config_inputs) if (!rom_specified && !print_games && !cmd_line.config_inputs && !cmd_line.print_inputs)
{ {
ErrorLog("No ROM file specified."); ErrorLog("No ROM file specified.");
return 0; return 0;