Remove typedef bool -> Boolean, using standard bool instead

diff --git a/Source/Input.cpp b/Source/Input.cpp
index 6080516a86d684165ee3e5c53eabe5e54f89ba41..ae4f68fb711fe9ec90dcd0b59100a63637b847a3 100644 (file)
--- a/Source/Input.cpp
+++ b/Source/Input.cpp
@@ -88,7 +88,7 @@ unsigned short Input::CharToKey(const char* which)
     return SDL_NUM_SCANCODES;
 }
 
-Boolean Input::MouseClicked()
+bool Input::MouseClicked()
 {
     return isKeyPressed(SDL_NUM_SCANCODES + SDL_BUTTON_LEFT);
 }

diff --git a/Source/Input.h b/Source/Input.h
index e1fb6f0f6ec09b6d7db7dc765da2f6a7351bddf1..302b4f4155bb786b68ff0e157ed31df4b11b23fb 100644 (file)
--- a/Source/Input.h
+++ b/Source/Input.h
@@ -39,7 +39,7 @@ public:
     static bool isKeyPressed(int k);
     static const char* keyToChar(unsigned short which);
     static unsigned short CharToKey(const char* which);
-    static Boolean MouseClicked();
+    static bool MouseClicked();
 };
 
 #endif

diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
index 7786a95088582c5b1cca4bb16795cbf976a21b26..07c2bc70cd76d9bfe8310e0a46403703a2567892 100644 (file)
--- a/Source/MacCompatibility.h
+++ b/Source/MacCompatibility.h
@@ -48,9 +48,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #  endif
 #endif
 
-typedef bool Boolean;
-
-
 struct Point {
     short v;
     short h;

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 475cd99bf1632e6a85f0a5f752b1cf8d691bf384..18f7d25bec4198ef7c5b99a160e6901dc1f6b674 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -70,7 +70,7 @@ using namespace std;
 
 set<pair<int,int>> resolutions;
 
-Boolean SetUp ();
+bool SetUp ();
 void DoUpdate ();
 
 void CleanUp (void);
@@ -135,7 +135,7 @@ static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textu
 int kContextWidth;
 int kContextHeight;
 
-Boolean gDone = false;
+bool gDone = false;
 
 static int _argc = 0;
 static char **_argv = NULL;
@@ -256,7 +256,7 @@ static SDL_bool sdlEventProc(const SDL_Event &e)
 
 static Point gMidPoint;
 
-Boolean SetUp ()
+bool SetUp ()
 {
     LOGFUNC;
 

diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index 3ac74d54144266f59092e488972cc5d95200f53a..94b9da098ba275d10f847d990a484abec80244b6 100644 (file)
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -38,8 +38,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 // disable warning about unreferenced local variables
 #pragma warning(disable:4101)
 
-typedef bool Boolean;
-
 struct Point {
     short v;
     short h;