AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Windows build fixes and warning avoidance

Browse Source
This commit is contained in:
Jack Andersen
2018-05-24 20:39:38 -10:00
parent 3ceaa82035
commit 70b3404b7c
195 changed files with 428 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Runtime/Input/CFinalInput.cpp
View File

@@ -100,9 +100,9 @@ CFinalInput::CFinalInput(int cIdx, float dt, const boo::DolphinControllerState&
static float KBToAnaLeftX(const CKeyboardMouseControllerData& data)
{
float retval = 0.0;
if (data.m_charKeys['a'])
if (data.m_charKeys[int('a')])
retval -= 1.0;
if (data.m_charKeys['d'])
if (data.m_charKeys[int('d')])
retval += 1.0;
return retval;
}
@@ -110,9 +110,9 @@ static float KBToAnaLeftX(const CKeyboardMouseControllerData& data)
static float KBToAnaLeftY(const CKeyboardMouseControllerData& data)
{
float retval = 0.0;
if (data.m_charKeys['s'])
if (data.m_charKeys[int('s')])
retval -= 1.0;
if (data.m_charKeys['w'])
if (data.m_charKeys[int('w')])
retval += 1.0;
return retval;
}
@@ -120,9 +120,9 @@ static float KBToAnaLeftY(const CKeyboardMouseControllerData& data)
static float KBToAnaRightX(const CKeyboardMouseControllerData& data)
{
float retval = 0.0;
if (data.m_charKeys['2'])
if (data.m_charKeys[int('2')])
retval -= 1.0;
if (data.m_charKeys['4'])
if (data.m_charKeys[int('4')])
retval += 1.0;
return retval;
}
@@ -130,9 +130,9 @@ static float KBToAnaRightX(const CKeyboardMouseControllerData& data)
static float KBToAnaRightY(const CKeyboardMouseControllerData& data)
{
float retval = 0.0;
if (data.m_charKeys['3'])
if (data.m_charKeys[int('3')])
retval -= 1.0;
if (data.m_charKeys['1'])
if (data.m_charKeys[int('1')])
retval += 1.0;
return retval;
}
@@ -144,8 +144,8 @@ CFinalInput::CFinalInput(int cIdx, float dt, const CKeyboardMouseControllerData&
, xc_anaLeftY(KBToAnaLeftY(data))
, x10_anaRightX(KBToAnaRightX(data))
, x14_anaRightY(KBToAnaRightY(data))
, x18_anaLeftTrigger(data.m_charKeys['q'] ? 1.0 : 0.0)
, x1c_anaRightTrigger(data.m_charKeys['e'] ? 1.0 : 0.0)
, x18_anaLeftTrigger(data.m_charKeys[int('q')] ? 1.0 : 0.0)
, x1c_anaRightTrigger(data.m_charKeys[int('e')] ? 1.0 : 0.0)
, x20_enableAnaLeftXP(DLARight() && !prevInput.DLARight())
, x20_enableAnaLeftNegXP(DLALeft() && !prevInput.DLALeft())
, x21_enableAnaLeftYP(DLAUp() && !prevInput.DLAUp())
@@ -157,12 +157,12 @@ CFinalInput::CFinalInput(int cIdx, float dt, const CKeyboardMouseControllerData&
, x24_anaLeftTriggerP(DLTrigger() && !prevInput.DLTrigger())
, x28_anaRightTriggerP(DRTrigger() && !prevInput.DRTrigger())
, x2c_b24_A(data.m_mouseButtons[int(boo::EMouseButton::Primary)])
, x2c_b25_B(data.m_charKeys[' '])
, x2c_b26_X(data.m_charKeys['c'])
, x2c_b25_B(data.m_charKeys[int(' ')])
, x2c_b26_X(data.m_charKeys[int('c')])
, x2c_b27_Y(data.m_mouseButtons[int(boo::EMouseButton::Secondary)])
, x2c_b28_Z(data.m_charKeys['\t'])
, x2c_b29_L(data.m_charKeys['q'])
, x2c_b30_R(data.m_charKeys['e'])
, x2c_b28_Z(data.m_charKeys[int('\t')])
, x2c_b29_L(data.m_charKeys[int('q')])
, x2c_b30_R(data.m_charKeys[int('e')])
, x2c_b31_DPUp(data.m_specialKeys[int(boo::ESpecialKey::Up)])
, x2d_b24_DPRight(data.m_specialKeys[int(boo::ESpecialKey::Right)])
, x2d_b25_DPDown(data.m_specialKeys[int(boo::ESpecialKey::Down)])