mirror of
https://github.com/MCLCE/4JLibs.git
synced 2026-07-17 20:30:38 +00:00
fix: input actually works when used in the game project
fix: now it also compiles using vs 2012 build tools
This commit is contained in:
@@ -56,8 +56,8 @@ void CInput::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char uc
|
||||
m_JoypadMap[i] = (unsigned int*)operator new[](ucActionC * sizeof(int));
|
||||
}
|
||||
|
||||
m_ucMapC = ucMapC;
|
||||
m_ucActionC = ucActionC;
|
||||
m_ucJoypadMapC = ucMapC;
|
||||
m_ucJoypadMapActionC = ucActionC;
|
||||
m_ucMenuActionC = ucMenuActionC;
|
||||
m_bJoypadMapArrayIsSetup = false;
|
||||
|
||||
@@ -282,7 +282,7 @@ unsigned char CInput::GetJoypadMapVal(int iPad)
|
||||
|
||||
void CInput::SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo)
|
||||
{
|
||||
float* pfTo{};
|
||||
float* pfTo = nullptr;
|
||||
|
||||
switch (uiTo)
|
||||
{
|
||||
@@ -319,7 +319,7 @@ void CInput::SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int u
|
||||
|
||||
void CInput::SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo)
|
||||
{
|
||||
unsigned char* pucTo{};
|
||||
unsigned char* pucTo = nullptr;
|
||||
|
||||
switch (uiTo)
|
||||
{
|
||||
|
||||
@@ -132,8 +132,8 @@ public:
|
||||
float m_fEffectiveRange;
|
||||
|
||||
unsigned char m_ucInputStateC;
|
||||
unsigned char m_ucMapC;
|
||||
unsigned char m_ucActionC;
|
||||
unsigned char m_ucJoypadMapC;
|
||||
unsigned char m_ucJoypadMapActionC;
|
||||
unsigned char m_ucMenuActionC;
|
||||
|
||||
unsigned int** m_JoypadMap;
|
||||
@@ -145,9 +145,6 @@ public:
|
||||
CForceFeedback m_ForceFeedback;
|
||||
CKeyboard m_Keyboard;
|
||||
|
||||
unsigned char m_ucJoypadMapC;
|
||||
unsigned char m_ucJoypadMapActionC;
|
||||
|
||||
float m_fTickToSeconds;
|
||||
float m_fRepeatDelaySecs;
|
||||
float m_fRepeatRateSecs;
|
||||
|
||||
Reference in New Issue
Block a user