summaryrefslogtreecommitdiffstats
path: root/src/skel
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-17 00:16:38 +0200
committeraap <aap@papnet.eu>2019-06-17 00:23:19 +0200
commit0add48abf589330ae6fe11e304c111d9f52ce009 (patch)
treee9f4374bf520a2fdfb9f3d66cd4ed0aa822a020b /src/skel
parentupdated guidelines (diff)
downloadre3-0add48abf589330ae6fe11e304c111d9f52ce009.tar
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.gz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.bz2
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.lz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.xz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.zst
re3-0add48abf589330ae6fe11e304c111d9f52ce009.zip
Diffstat (limited to 'src/skel')
-rw-r--r--src/skel/events.cpp18
-rw-r--r--src/skel/win/win.cpp46
2 files changed, 32 insertions, 32 deletions
diff --git a/src/skel/events.cpp b/src/skel/events.cpp
index 46488a04..877b969e 100644
--- a/src/skel/events.cpp
+++ b/src/skel/events.cpp
@@ -726,8 +726,8 @@ KeyboardHandler(RsEvent event, void *param)
static RsEventStatus
HandlePadButtonDown(RsPadButtonStatus *padButtonStatus)
{
- Bool bPadTwo = false;
- Int32 padNumber = padButtonStatus->padID;
+ bool bPadTwo = false;
+ int32 padNumber = padButtonStatus->padID;
CPad *pad = CPad::GetPad(padNumber);
@@ -739,7 +739,7 @@ HandlePadButtonDown(RsPadButtonStatus *padButtonStatus)
ControlsManager.UpdateJoyButtonState(padNumber);
- for ( Int32 i = 0; i < _TODOCONST(16); i++ )
+ for ( int32 i = 0; i < _TODOCONST(16); i++ )
{
RsPadButtons btn = rsPADNULL;
if ( ControlsManager.m_aButtonStates[i] == TRUE )
@@ -761,8 +761,8 @@ HandlePadButtonDown(RsPadButtonStatus *padButtonStatus)
static RsEventStatus
HandlePadButtonUp(RsPadButtonStatus *padButtonStatus)
{
- Bool bPadTwo = false;
- Int32 padNumber = padButtonStatus->padID;
+ bool bPadTwo = false;
+ int32 padNumber = padButtonStatus->padID;
CPad *pad = CPad::GetPad(padNumber);
@@ -772,14 +772,14 @@ HandlePadButtonUp(RsPadButtonStatus *padButtonStatus)
if ( padNumber == 1 )
bPadTwo = true;
- Bool bCam = false;
- Int16 mode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
+ bool bCam = false;
+ int16 mode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
if ( mode == CCam::MODE_FLYBY || mode == CCam::MODE_FIXED )
- Bool bCam = true;
+ bool bCam = true;
ControlsManager.UpdateJoyButtonState(padNumber);
- for ( Int32 i = 1; i < _TODOCONST(16); i++ )
+ for ( int32 i = 1; i < _TODOCONST(16); i++ )
{
RsPadButtons btn = rsPADNULL;
if ( ControlsManager.m_aButtonStates[i] == FALSE )
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 81fe109b..e1090f72 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -113,9 +113,9 @@ DWORD _dwMemAvailVideo;
DWORD &_dwOperatingSystemVersion = *(DWORD*)0x70F290;
RwUInt32 &gGameState = *(RwUInt32*)0x8F5838;
-WRAPPER Bool InitialiseGame(void) { EAXJMP(0x48E7E0); }
+WRAPPER bool InitialiseGame(void) { EAXJMP(0x48E7E0); }
-WRAPPER const Char *GetLevelSplashScreen(Int32 number) { EAXJMP(0x48D750); }
+WRAPPER const char *GetLevelSplashScreen(int32 number) { EAXJMP(0x48D750); }
//
void LoadingScreen(char const *msg1, char const *msg2, char const *screen);
@@ -130,12 +130,12 @@ enum eJoypadState
struct tJoy
{
eJoypadState m_State;
- Bool m_bInitialised;
- Bool m_bHasAxisZ;
- Bool m_bHasAxisR;
+ bool m_bInitialised;
+ bool m_bHasAxisZ;
+ bool m_bHasAxisR;
char _pad0;
- Int32 m_nVendorID;
- Int32 m_nProductID;
+ int32 m_nVendorID;
+ int32 m_nProductID;
};
class CJoySticks
@@ -1210,7 +1210,7 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
PDEV_BROADCAST_VOLUME pVol = (PDEV_BROADCAST_VOLUME)pDev;
if ( pVol->dbcv_flags & DBTF_MEDIA )
{
- Char c = DMAudio.GetCDAudioDriveLetter();
+ char c = DMAudio.GetCDAudioDriveLetter();
if ( c >= 'A' && pVol->dbcv_unitmask & (1 << (c - 'A')) )
{
@@ -1578,7 +1578,7 @@ void InitialiseLanguage()
|| subLayout == SUBLANG_ENGLISH_AUS )
CGame::noProstitutes = true;
- Int32 lang;
+ int32 lang;
switch ( primSystemLCID )
{
@@ -1910,7 +1910,7 @@ _WinMain(HINSTANCE instance,
{
CFileMgr::SetDirMyDocuments();
- Int32 gta3set = CFileMgr::OpenFile("gta3.set", "r");
+ int32 gta3set = CFileMgr::OpenFile("gta3.set", "r");
if ( gta3set )
{
@@ -2112,10 +2112,10 @@ _WinMain(HINSTANCE instance,
case GS_PLAYING_GAME:
{
- Float ms = (Float)CTimer::GetCurrentTimeInCycles() / (Float)CTimer::GetCyclesPerMillisecond();
+ float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
if ( RwInitialised )
{
- if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (Float)RsGlobal.maxFPS) < ms)
+ if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
RsEventHandler(rsIDLE, (void *)TRUE);
}
break;
@@ -2335,16 +2335,16 @@ HRESULT CapturePad(RwInt32 padID)
RsPadEventHandler(rsPADBUTTONUP, (void *)&bs);
- Bool deviceAvailable = pPad != NULL;
+ bool deviceAvailable = pPad != NULL;
if ( deviceAvailable )
{
- leftStickPos.x = (Float)js.lX / (Float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
- leftStickPos.y = (Float)js.lY / (Float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
+ leftStickPos.x = (float)js.lX / (float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
+ leftStickPos.y = (float)js.lY / (float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
if (LOWORD(js.rgdwPOV[0]) != -1)
{
- Float angle = DEGTORAD((Float)js.rgdwPOV[0] / 100.0f);
+ float angle = DEGTORAD((float)js.rgdwPOV[0] / 100.0f);
leftStickPos.x = sin(angle);
leftStickPos.y = -cos(angle);
@@ -2352,8 +2352,8 @@ HRESULT CapturePad(RwInt32 padID)
if ( AllValidWinJoys.m_aJoys[bs.padID].m_bHasAxisR && AllValidWinJoys.m_aJoys[bs.padID].m_bHasAxisZ )
{
- rightStickPos.x = (Float)js.lZ / (Float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
- rightStickPos.y = (Float)js.lRz / (Float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
+ rightStickPos.x = (float)js.lZ / (float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
+ rightStickPos.y = (float)js.lRz / (float)((DEVICE_AXIS_MAX - DEVICE_AXIS_MIN) / 2);
}
}
@@ -2372,16 +2372,16 @@ HRESULT CapturePad(RwInt32 padID)
CPad *pad = CPad::GetPad(bs.padID);
if ( fabs(leftStickPos.x) > 0.3f )
- pad->PCTempJoyState.LeftStickX = (Int32)(leftStickPos.x * 128.0f);
+ pad->PCTempJoyState.LeftStickX = (int32)(leftStickPos.x * 128.0f);
if ( fabs(leftStickPos.y) > 0.3f )
- pad->PCTempJoyState.LeftStickY = (Int32)(leftStickPos.y * 128.0f);
+ pad->PCTempJoyState.LeftStickY = (int32)(leftStickPos.y * 128.0f);
if ( fabs(rightStickPos.x) > 0.3f )
- pad->PCTempJoyState.RightStickX = (Int32)(rightStickPos.x * 128.0f);
+ pad->PCTempJoyState.RightStickX = (int32)(rightStickPos.x * 128.0f);
if ( fabs(rightStickPos.y) > 0.3f )
- pad->PCTempJoyState.RightStickY = (Int32)(rightStickPos.y * 128.0f);
+ pad->PCTempJoyState.RightStickY = (int32)(rightStickPos.y * 128.0f);
}
return S_OK;
@@ -2392,7 +2392,7 @@ void _InputInitialiseJoys()
DIPROPDWORD prop;
DIDEVCAPS devCaps;
- for ( Int32 i = 0; i < _TODOCONST(2); i++ )
+ for ( int32 i = 0; i < _TODOCONST(2); i++ )
AllValidWinJoys.ClearJoyInfo(i);
_InputAddJoys();