TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-20 15:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/windowManager/platformInterface.cpp
View file

@ -70,7 +70,7 @@ static struct ModifierBitMap {
{ IM_LOPT, SI_MAC_LOPT },
{ IM_ROPT, SI_MAC_ROPT },
};
static int _ModifierBitMapCount = sizeof(_ModifierBitMap) / sizeof(ModifierBitMap);
static S32 _ModifierBitMapCount = sizeof(_ModifierBitMap) / sizeof(ModifierBitMap);
InputModifiers convertModifierBits(const U32 in)
{

2
Engine/source/windowManager/win32/win32Window.cpp
View file

@ -1068,7 +1068,7 @@ bool Win32Window::translateMessage(MSG &msg)
if(mAccelHandle == NULL || mWindowHandle == NULL || !mEnableAccelerators)
return false;
int ret = TranslateAccelerator(mWindowHandle, mAccelHandle, &msg);
S32 ret = TranslateAccelerator(mWindowHandle, mAccelHandle, &msg);
return ret != 0;
}

2
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -452,7 +452,7 @@ void Win32WindowManager::_processCmdLineArgs( const S32 argc, const char **argv
{
if (argc > 1)
{
for (int i = 1; i < argc; i++)
for (S32 i = 1; i < argc; i++)
{
if ( dStrnicmp( argv[i], "-window", 7 ) == 0 )
{

4
Engine/source/windowManager/win32/winDispatch.cpp
View file

@ -283,7 +283,7 @@ static bool _dispatch(HWND hWnd,UINT message,WPARAM wParam,WPARAM lParam)
case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: {
int index = (message - WM_LBUTTONDOWN) / 3;
S32 index = (message - WM_LBUTTONDOWN) / 3;
button[index] = true;
// Capture the mouse on button down to allow dragging outside
@ -299,7 +299,7 @@ static bool _dispatch(HWND hWnd,UINT message,WPARAM wParam,WPARAM lParam)
case WM_LBUTTONUP:
case WM_MBUTTONUP:
case WM_RBUTTONUP: {
int index = (message - WM_LBUTTONUP) / 3;
S32 index = (message - WM_LBUTTONUP) / 3;
button[index] = false;
// Release mouse capture from button down.