Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-02-17 01:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated command line help

Browse source
This commit is contained in:
Ian Curtis 2018-09-14 20:31:34 +00:00
parent b5f9ad9651
commit a7e851d578
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Src/Inputs/Inputs.cpp
View file

@ -609,7 +609,7 @@ bool CInputs::ConfigureInputs(const Game *game, unsigned dispX, unsigned dispY,
void CInputs::CalibrateJoysticks() void CInputs::CalibrateJoysticks()
{ {
unsigned numJoys = m_system->GetNumJoysticks(); int numJoys = m_system->GetNumJoysticks();
if (numJoys == 0 || numJoys == ANY_JOYSTICK) if (numJoys == 0 || numJoys == ANY_JOYSTICK)
puts("No joysticks attached to calibrate!"); puts("No joysticks attached to calibrate!");
else else
@ -617,10 +617,10 @@ void CInputs::CalibrateJoysticks()
puts("Choose joystick to calibrate (or press Esc to cancel):"); puts("Choose joystick to calibrate (or press Esc to cancel):");
if (numJoys > 10) if (numJoys > 10)
numJoys = 10; numJoys = 10;
for (int joyNum = 0; joyNum < numJoys; joyNum++) for (int i = 0; i < numJoys; i++)
{ {
const JoyDetails *joyDetails = m_system->GetJoyDetails(joyNum); const JoyDetails *joyDetails = m_system->GetJoyDetails(i);
unsigned dispNum = (joyNum == 9 ? 0 : joyNum + 1); unsigned dispNum = (i == 9 ? 0 : i + 1);
printf(" %u: %s\n", dispNum, joyDetails->name); printf(" %u: %s\n", dispNum, joyDetails->name);
} }
@ -632,7 +632,7 @@ void CInputs::CalibrateJoysticks()
char c = mapping[4]; char c = mapping[4];
if (!isdigit(c)) if (!isdigit(c))
continue; continue;
unsigned joyNum = c - '0'; int joyNum = c - '0';
joyNum = (joyNum == 0 ? 9 : joyNum - 1); joyNum = (joyNum == 0 ? 9 : joyNum - 1);
if (joyNum >= numJoys) if (joyNum >= numJoys)
continue; continue;

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

@ -1406,6 +1406,7 @@ static void Help(void)
puts(" -crosshairs=<n> Crosshairs configuration for gun games:"); puts(" -crosshairs=<n> Crosshairs configuration for gun games:");
puts(" 0=none [Default], 1=P1 only, 2=P2 only, 3=P1 & P2"); puts(" 0=none [Default], 1=P1 only, 2=P2 only, 3=P1 & P2");
puts(" -new3d New 3D engine by Ian Curtis [Default]"); puts(" -new3d New 3D engine by Ian Curtis [Default]");
puts(" -quad-rendering Enable proper quad rendering");
puts(" -legacy3d Legacy 3D engine (faster but less accurate)"); puts(" -legacy3d Legacy 3D engine (faster but less accurate)");
puts(" -multi-texture Use 8 texture maps for decoding (legacy engine)"); puts(" -multi-texture Use 8 texture maps for decoding (legacy engine)");
puts(" -no-multi-texture Decode to single texture (legacy engine) [Default]"); puts(" -no-multi-texture Decode to single texture (legacy engine) [Default]");

2
Src/OSD/SDL/SDLInputSystem.cpp
View file

@ -369,7 +369,7 @@ int CSDLInputSystem::GetNumMice()
int CSDLInputSystem::GetNumJoysticks() int CSDLInputSystem::GetNumJoysticks()
{ {
// Return number of joysticks found // Return number of joysticks found
return m_joysticks.size(); return (int)m_joysticks.size();
} }
const KeyDetails *CSDLInputSystem::GetKeyDetails(int kbdNum) const KeyDetails *CSDLInputSystem::GetKeyDetails(int kbdNum)

2
Src/OSD/Windows/DirectInputSystem.cpp
View file

@ -1576,7 +1576,7 @@ bool CDirectInputSystem::InitializeSystem()
if (m_useRawInput) if (m_useRawInput)
{ {
// Get screen resolution (needed for absolute mouse devices) // Get screen resolution (needed for absolute mouse devices)
DEVMODEA settings; DEVMODEA settings = { 0 };
if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &settings)) if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &settings))
{ {
ErrorLog("Unable to read current display settings\n"); ErrorLog("Unable to read current display settings\n");