From d3c7ea2e53495ab13441a6237cc75757266fd1e7 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 11:32:57 +0200 Subject: [PATCH 01/18] Lower Epsilonon Pandora --- Sources/Engine/Math/Quaternion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index b46c078..d9d51e4 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,7 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { - if ((orig <= 10e-6f) && (orig >= -10e-6f)) + if ((orig <= 1e-4f) && (orig >= -1e-4f)) return(0.0f); return(orig); @@ -384,9 +384,9 @@ void Quaternion::ToMatrix(Matrix &m) const Type yy = 2*q_y*q_y; Type yz = 2*q_y*q_z; Type zz = 2*q_z*q_z; Type wx = 2*q_w*q_x; Type wy = 2*q_w*q_y; Type wz = 2*q_w*q_z; - m(1,1) = EPS(1.0f-(yy+zz));m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); - m(2,1) = EPS(xy+wz); m(2,2) = EPS(1.0f-(xx+zz));m(2,3) = EPS(yz-wx); - m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = EPS(1.0f-(xx+yy)); + m(1,1) = 1.0f-EPS(yy+zz); m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); + m(2,1) = EPS(xy+wz); m(2,2) = 1.0f-EPS(xx+zz); m(2,3) = EPS(yz-wx); + m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = 1.0f-EPS(xx+yy); } // conversion from matrix From acd39526c9eca68684858c4047f63cf1d5e1c5b5 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 13:10:32 +0200 Subject: [PATCH 02/18] fix Inverted Right and Middle button on certain case with SDL --- Sources/Engine/Base/SDL/SDLInput.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index d378cc1..0eab255 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -314,8 +314,16 @@ static void sdl_event_handler(const SDL_Event *event) case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: - if (event->button.button <= 5) - _abKeysPressed[KID_MOUSE1 + (event->button.button-1)] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + if (event->button.button <= 5) { + int button = KID_MOUSE1; + switch(event->button.button) { + case SDL_BUTTON_RIGHT: button = KID_MOUSE2; break; + case SDL_BUTTON_MIDDLE: button = KID_MOUSE3; break; + case 4: button = KID_MOUSE4; break; + case 5: button = KID_MOUSE5; break; + } + _abKeysPressed[button] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + } break; case SDL_MOUSEWHEEL: From fb73e85d7401e510f7740ce840e262b263fbc02e Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 11:32:57 +0200 Subject: [PATCH 03/18] Lower Epsilonon Pandora --- Sources/Engine/Math/Quaternion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index b46c078..d9d51e4 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,7 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { - if ((orig <= 10e-6f) && (orig >= -10e-6f)) + if ((orig <= 1e-4f) && (orig >= -1e-4f)) return(0.0f); return(orig); @@ -384,9 +384,9 @@ void Quaternion::ToMatrix(Matrix &m) const Type yy = 2*q_y*q_y; Type yz = 2*q_y*q_z; Type zz = 2*q_z*q_z; Type wx = 2*q_w*q_x; Type wy = 2*q_w*q_y; Type wz = 2*q_w*q_z; - m(1,1) = EPS(1.0f-(yy+zz));m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); - m(2,1) = EPS(xy+wz); m(2,2) = EPS(1.0f-(xx+zz));m(2,3) = EPS(yz-wx); - m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = EPS(1.0f-(xx+yy)); + m(1,1) = 1.0f-EPS(yy+zz); m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); + m(2,1) = EPS(xy+wz); m(2,2) = 1.0f-EPS(xx+zz); m(2,3) = EPS(yz-wx); + m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = 1.0f-EPS(xx+yy); } // conversion from matrix From 25d405c3a070f20c993874b27462f313d6e0cd2e Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 13:10:32 +0200 Subject: [PATCH 04/18] fix Inverted Right and Middle button on certain case with SDL --- Sources/Engine/Base/SDL/SDLInput.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index d378cc1..0eab255 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -314,8 +314,16 @@ static void sdl_event_handler(const SDL_Event *event) case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: - if (event->button.button <= 5) - _abKeysPressed[KID_MOUSE1 + (event->button.button-1)] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + if (event->button.button <= 5) { + int button = KID_MOUSE1; + switch(event->button.button) { + case SDL_BUTTON_RIGHT: button = KID_MOUSE2; break; + case SDL_BUTTON_MIDDLE: button = KID_MOUSE3; break; + case 4: button = KID_MOUSE4; break; + case 5: button = KID_MOUSE5; break; + } + _abKeysPressed[button] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + } break; case SDL_MOUSEWHEEL: From 630f636b0eaa2719adfe6151b1fcb97d55d82f19 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 17 Apr 2016 09:45:01 +0200 Subject: [PATCH 05/18] Restrict the Eps precision change only to Pandora platform --- Sources/Engine/Math/Quaternion.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index d9d51e4..abb483b 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,11 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { +#ifdef PLATFORM_PANDORA if ((orig <= 1e-4f) && (orig >= -1e-4f)) +#else + if ((orig <= 10e-6f) && (orig >= -10e-6f)) +#endif return(0.0f); return(orig); From 2dc1c2502a96cf71192e47f73aa80c1a246f469e Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 11:32:57 +0200 Subject: [PATCH 06/18] Lower Epsilonon Pandora --- Sources/Engine/Math/Quaternion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index b46c078..d9d51e4 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,7 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { - if ((orig <= 10e-6f) && (orig >= -10e-6f)) + if ((orig <= 1e-4f) && (orig >= -1e-4f)) return(0.0f); return(orig); @@ -384,9 +384,9 @@ void Quaternion::ToMatrix(Matrix &m) const Type yy = 2*q_y*q_y; Type yz = 2*q_y*q_z; Type zz = 2*q_z*q_z; Type wx = 2*q_w*q_x; Type wy = 2*q_w*q_y; Type wz = 2*q_w*q_z; - m(1,1) = EPS(1.0f-(yy+zz));m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); - m(2,1) = EPS(xy+wz); m(2,2) = EPS(1.0f-(xx+zz));m(2,3) = EPS(yz-wx); - m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = EPS(1.0f-(xx+yy)); + m(1,1) = 1.0f-EPS(yy+zz); m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); + m(2,1) = EPS(xy+wz); m(2,2) = 1.0f-EPS(xx+zz); m(2,3) = EPS(yz-wx); + m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = 1.0f-EPS(xx+yy); } // conversion from matrix From 031223de356a524f44d6d8c6eeb7ce5dfc73a1da Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 13:10:32 +0200 Subject: [PATCH 07/18] fix Inverted Right and Middle button on certain case with SDL --- Sources/Engine/Base/SDL/SDLInput.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index d378cc1..0eab255 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -314,8 +314,16 @@ static void sdl_event_handler(const SDL_Event *event) case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: - if (event->button.button <= 5) - _abKeysPressed[KID_MOUSE1 + (event->button.button-1)] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + if (event->button.button <= 5) { + int button = KID_MOUSE1; + switch(event->button.button) { + case SDL_BUTTON_RIGHT: button = KID_MOUSE2; break; + case SDL_BUTTON_MIDDLE: button = KID_MOUSE3; break; + case 4: button = KID_MOUSE4; break; + case 5: button = KID_MOUSE5; break; + } + _abKeysPressed[button] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + } break; case SDL_MOUSEWHEEL: From 0d4437a1ac2a45ac233f61616250625a18d4afec Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 17 Apr 2016 09:45:01 +0200 Subject: [PATCH 08/18] Restrict the Eps precision change only to Pandora platform --- Sources/Engine/Math/Quaternion.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index d9d51e4..abb483b 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,11 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { +#ifdef PLATFORM_PANDORA if ((orig <= 1e-4f) && (orig >= -1e-4f)) +#else + if ((orig <= 10e-6f) && (orig >= -10e-6f)) +#endif return(0.0f); return(orig); From c5148824b2a7dd8030e4f09b23243d146850db76 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 07:20:41 +0200 Subject: [PATCH 09/18] Don't regulate Framerate on Pandora --- Sources/SeriousSam/SeriousSam.cpp | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 Sources/SeriousSam/SeriousSam.cpp diff --git a/Sources/SeriousSam/SeriousSam.cpp b/Sources/SeriousSam/SeriousSam.cpp old mode 100644 new mode 100755 index 9b76471..b28ffff --- a/Sources/SeriousSam/SeriousSam.cpp +++ b/Sources/SeriousSam/SeriousSam.cpp @@ -281,6 +281,8 @@ static void UpdatePauseState(void) // limit current frame rate if neeeded void LimitFrameRate(void) { + // do not limit FPS on the Pandora, it's not powerfull enough and doesn't "iconise" games either + #ifndef PLATFORM_PANDORA // measure passed time for each loop static CTimerValue tvLast(-1.0f); CTimerValue tvNow = _pTimer->GetHighPrecisionTimer(); @@ -299,6 +301,7 @@ void LimitFrameRate(void) // remember new time tvLast = _pTimer->GetHighPrecisionTimer(); + #endif } // load first demo From f5d397ebc668787671a2f08723a2d64885074c66 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 07:30:43 +0200 Subject: [PATCH 10/18] Nedd __STDC_LIMIT_MACROS for *_MAX constant to be defined --- Sources/Engine/Base/Types.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 Sources/Engine/Base/Types.h diff --git a/Sources/Engine/Base/Types.h b/Sources/Engine/Base/Types.h old mode 100644 new mode 100755 index 1cf1903..e1b994c --- a/Sources/Engine/Base/Types.h +++ b/Sources/Engine/Base/Types.h @@ -70,6 +70,7 @@ typedef unsigned int UINT; #else // AFAIK there were versions of MSVC where UINTPTR_MAX was incorrect, // so I use different code for Windows above + #define __STDC_LIMIT_MACROS 1 #include // UINTPTR_MAX #ifdef UINTPTR_MAX #if UINTPTR_MAX == 0xffffffffuL From 4bbe57bccbd808fe64e38810c358871108dd61bf Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 08:24:43 +0200 Subject: [PATCH 11/18] Need __STDC_LIMIT_MACROS macro here too --- Sources/Engine/StdH.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 Sources/Engine/StdH.h diff --git a/Sources/Engine/StdH.h b/Sources/Engine/StdH.h old mode 100644 new mode 100755 index 8547abf..562d53f --- a/Sources/Engine/StdH.h +++ b/Sources/Engine/StdH.h @@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define ENGINE_INTERNAL 1 #define ENGINE_EXPORTS 1 +#define __STDC_LIMIT_MACROS 1 #include #include #include From 7c1cc68d6f06bfdd05719a589952dba8ddd2c81c Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 11:32:57 +0200 Subject: [PATCH 12/18] Lower Epsilonon Pandora --- Sources/Engine/Math/Quaternion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index b46c078..d9d51e4 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,7 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { - if ((orig <= 10e-6f) && (orig >= -10e-6f)) + if ((orig <= 1e-4f) && (orig >= -1e-4f)) return(0.0f); return(orig); @@ -384,9 +384,9 @@ void Quaternion::ToMatrix(Matrix &m) const Type yy = 2*q_y*q_y; Type yz = 2*q_y*q_z; Type zz = 2*q_z*q_z; Type wx = 2*q_w*q_x; Type wy = 2*q_w*q_y; Type wz = 2*q_w*q_z; - m(1,1) = EPS(1.0f-(yy+zz));m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); - m(2,1) = EPS(xy+wz); m(2,2) = EPS(1.0f-(xx+zz));m(2,3) = EPS(yz-wx); - m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = EPS(1.0f-(xx+yy)); + m(1,1) = 1.0f-EPS(yy+zz); m(1,2) = EPS(xy-wz); m(1,3) = EPS(xz+wy); + m(2,1) = EPS(xy+wz); m(2,2) = 1.0f-EPS(xx+zz); m(2,3) = EPS(yz-wx); + m(3,1) = EPS(xz-wy); m(3,2) = EPS(yz+wx); m(3,3) = 1.0f-EPS(xx+yy); } // conversion from matrix From 9288c42268f5ffe67568691e0b17c2bd5a251991 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sat, 16 Apr 2016 13:10:32 +0200 Subject: [PATCH 13/18] fix Inverted Right and Middle button on certain case with SDL --- Sources/Engine/Base/SDL/SDLInput.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index d378cc1..0eab255 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -314,8 +314,16 @@ static void sdl_event_handler(const SDL_Event *event) case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: - if (event->button.button <= 5) - _abKeysPressed[KID_MOUSE1 + (event->button.button-1)] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + if (event->button.button <= 5) { + int button = KID_MOUSE1; + switch(event->button.button) { + case SDL_BUTTON_RIGHT: button = KID_MOUSE2; break; + case SDL_BUTTON_MIDDLE: button = KID_MOUSE3; break; + case 4: button = KID_MOUSE4; break; + case 5: button = KID_MOUSE5; break; + } + _abKeysPressed[button] = (event->button.state == SDL_PRESSED) ? TRUE : FALSE; + } break; case SDL_MOUSEWHEEL: From 484d49434beed41fe72ec2ba3edcb8974a431bb7 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 17 Apr 2016 09:45:01 +0200 Subject: [PATCH 14/18] Restrict the Eps precision change only to Pandora platform --- Sources/Engine/Math/Quaternion.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/Engine/Math/Quaternion.h b/Sources/Engine/Math/Quaternion.h index d9d51e4..abb483b 100755 --- a/Sources/Engine/Math/Quaternion.h +++ b/Sources/Engine/Math/Quaternion.h @@ -370,7 +370,11 @@ void Quaternion::FromEuler(const Vector &a) template Type Quaternion::EPS(Type orig) const { +#ifdef PLATFORM_PANDORA if ((orig <= 1e-4f) && (orig >= -1e-4f)) +#else + if ((orig <= 10e-6f) && (orig >= -10e-6f)) +#endif return(0.0f); return(orig); From b9bb24e608bf823d30b0c67c3d953c53bc9286cf Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 07:20:41 +0200 Subject: [PATCH 15/18] Don't regulate Framerate on Pandora --- Sources/SeriousSam/SeriousSam.cpp | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 Sources/SeriousSam/SeriousSam.cpp diff --git a/Sources/SeriousSam/SeriousSam.cpp b/Sources/SeriousSam/SeriousSam.cpp old mode 100644 new mode 100755 index 9b76471..b28ffff --- a/Sources/SeriousSam/SeriousSam.cpp +++ b/Sources/SeriousSam/SeriousSam.cpp @@ -281,6 +281,8 @@ static void UpdatePauseState(void) // limit current frame rate if neeeded void LimitFrameRate(void) { + // do not limit FPS on the Pandora, it's not powerfull enough and doesn't "iconise" games either + #ifndef PLATFORM_PANDORA // measure passed time for each loop static CTimerValue tvLast(-1.0f); CTimerValue tvNow = _pTimer->GetHighPrecisionTimer(); @@ -299,6 +301,7 @@ void LimitFrameRate(void) // remember new time tvLast = _pTimer->GetHighPrecisionTimer(); + #endif } // load first demo From 4b47c278bbb49b8803bc218493885487c8970414 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 07:30:43 +0200 Subject: [PATCH 16/18] Nedd __STDC_LIMIT_MACROS for *_MAX constant to be defined --- Sources/Engine/Base/Types.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 Sources/Engine/Base/Types.h diff --git a/Sources/Engine/Base/Types.h b/Sources/Engine/Base/Types.h old mode 100644 new mode 100755 index 1cf1903..e1b994c --- a/Sources/Engine/Base/Types.h +++ b/Sources/Engine/Base/Types.h @@ -70,6 +70,7 @@ typedef unsigned int UINT; #else // AFAIK there were versions of MSVC where UINTPTR_MAX was incorrect, // so I use different code for Windows above + #define __STDC_LIMIT_MACROS 1 #include // UINTPTR_MAX #ifdef UINTPTR_MAX #if UINTPTR_MAX == 0xffffffffuL From e077fd664da8b5d226b22435db0d3ee1697a33ce Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 08:24:43 +0200 Subject: [PATCH 17/18] Need __STDC_LIMIT_MACROS macro here too --- Sources/Engine/StdH.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 Sources/Engine/StdH.h diff --git a/Sources/Engine/StdH.h b/Sources/Engine/StdH.h old mode 100644 new mode 100755 index 8547abf..562d53f --- a/Sources/Engine/StdH.h +++ b/Sources/Engine/StdH.h @@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define ENGINE_INTERNAL 1 #define ENGINE_EXPORTS 1 +#define __STDC_LIMIT_MACROS 1 #include #include #include From c8291e6d37cb476a2d1e7d29d1712d93f3706ff3 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Tue, 19 Apr 2016 21:54:31 +0200 Subject: [PATCH 18/18] More macro for UNIPTR_MAX --- Sources/Engine/Base/SDL/SDLInput.cpp | 1 + Sources/Engine/Base/SDL/SDLTimer.cpp | 1 + Sources/Engine/Engine.h | 2 ++ Sources/Engine/Graphics/SDL/SDLAdapter.cpp | 1 + 4 files changed, 5 insertions(+) mode change 100644 => 100755 Sources/Engine/Base/SDL/SDLTimer.cpp mode change 100644 => 100755 Sources/Engine/Engine.h mode change 100644 => 100755 Sources/Engine/Graphics/SDL/SDLAdapter.cpp diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index 0eab255..902e81a 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -2,6 +2,7 @@ /* rcg10072001 Moved stuff into this file. */ +#define __STDC_LIMIT_MACROS 1 #include "SDL.h" #include diff --git a/Sources/Engine/Base/SDL/SDLTimer.cpp b/Sources/Engine/Base/SDL/SDLTimer.cpp old mode 100644 new mode 100755 index 86a80bb..ab5a1b2 --- a/Sources/Engine/Base/SDL/SDLTimer.cpp +++ b/Sources/Engine/Base/SDL/SDLTimer.cpp @@ -1,6 +1,7 @@ /* Copyright (c) 2002-2012 Croteam Ltd. All rights reserved. */ /* rcg10072001 Moved stuff into this file. */ +#define __STDC_LIMIT_MACROS 1 #include "SDL.h" #include diff --git a/Sources/Engine/Engine.h b/Sources/Engine/Engine.h old mode 100644 new mode 100755 index 538a294..8c46684 --- a/Sources/Engine/Engine.h +++ b/Sources/Engine/Engine.h @@ -28,6 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc., // set this to 1 to enable checks whether somethig is deleted while iterating some array/container #define CHECKARRAYLOCKING 0 +#define __STDC_LIMIT_MACROS 1 + #include #include #include diff --git a/Sources/Engine/Graphics/SDL/SDLAdapter.cpp b/Sources/Engine/Graphics/SDL/SDLAdapter.cpp old mode 100644 new mode 100755 index 7f867c0..625044c --- a/Sources/Engine/Graphics/SDL/SDLAdapter.cpp +++ b/Sources/Engine/Graphics/SDL/SDLAdapter.cpp @@ -1,4 +1,5 @@ /* Copyright (c) 2002-2012 Croteam Ltd. All rights reserved. */ +#define __STDC_LIMIT_MACROS 1 #include