Removed cmake windows.h detection

TODO.md

@@ -4,6 +4,7 @@
 
 * Endian dependence ugly, shouldn't dereference to different types?
     * TombRaider.h/cpp structs aren't aligned... unportable to some big endian & other archs?!
+    * Maybe replace loader with [VT](http://icculus.org/vt/), also used by OpenTomb.
 * Use more asserts
 * Don't use C-Style code, try to replace with C++ lib
     * Use std::strings
@@ -24,6 +25,6 @@
 ## Future Features
 
 * Cut TGA image reader, currently only used for menu background?!
-    * Abstract image reading/writing, like Font Engine selection
+    * Need useful, always available image writer alternative for screenshots then
 * When cutscene rendering is working, use TR4/5 style menu?
 

include/TombRaider.h

@@ -12,12 +12,6 @@
 #include <cstdint>
 #include <cstdio>
 
-#ifdef WIN32
-typedef uint8_t u_int8_t;
-typedef uint16_t u_int16_t;
-typedef uint32_t u_int32_t;
-#endif
-
 #include "TombRaiderData.h"
 
 /*!

include/config.h.in

@@ -24,10 +24,5 @@
 #cmakedefine HAVE_CLOSEDIR
 #cmakedefine HAVE_DT_DIR
 
-#cmakedefine HAVE_WINDOWS_H
-#cmakedefine HAVE_FINDFIRSTFILE
-#cmakedefine HAVE_FINDNEXTFILE
-#cmakedefine HAVE_FINDCLOSE
-
 #endif
 

include/global.h

@@ -98,7 +98,7 @@ KeyboardButton stringToKeyboardButton(const char *key);
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
-#ifdef HAVE_WINDOWS_H
+#ifdef _WIN32
 #include <windows.h>
 #endif
 #include <GL/gl.h>

src/CMakeLists.txt

@@ -120,12 +120,6 @@ check_function_exists (readdir_r HAVE_READDIR_R)
 check_function_exists (closedir HAVE_CLOSEDIR)
 check_symbol_exists (DT_DIR "dirent.h" HAVE_DT_DIR)
 
-# recursive folder traversal for Windows
-check_include_files (windows.h HAVE_WINDOWS_H)
-check_function_exists (FindFirstFile HAVE_FINDFIRSTFILE)
-check_function_exists (FindNextFile HAVE_FINDNEXTFILE)
-check_function_exists (FindClose HAVE_FINDCLOSE)
-
 #################################################################
 
 # Configuration Header file

src/Command.cpp

@@ -439,6 +439,7 @@ int OpenRaider::help(std::string &cmd) {
         getConsole().print("  crouch");
         getConsole().print("  use");
         getConsole().print("  holster");
+        getConsole().print("  walk");
         getConsole().print("Key-Format:");
         getConsole().print("  'a' or '1'    for character/number keys");
         getConsole().print("  \"leftctrl\"  for symbols and special keys");

src/Menu.cpp

@@ -18,7 +18,7 @@
 #if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
 #include <dirent.h>
 #define USE_DIRENT
-#elif (defined(HAVE_WINDOWS_H) && defined(HAVE_FINDFIRSTFILE) && defined(HAVE_FINDNEXTFILE) && defined(HAVE_FINDCLOSE)) || defined (_WIN32)
+#elif defined (_WIN32)
 #include <windows.h>
 #define USE_FINDFILE
 #else

src/TombRaider.cpp

@@ -1782,7 +1782,7 @@ int TombRaider::Load(char *filename)
             mFreadMode = TR_FREAD_NORMAL;
             // 0x46464952
 
-            //! \fixme (Endian) Read bitu32 / u_int32_t
+            //! \fixme (Endian) Read bitu32 / uint32_t
             Fread(&mNumTR4Samples, 4, 1, f);
             printDebug("Load", "mNumTR4Samples = %i", mNumTR4Samples);
 
@@ -4931,11 +4931,11 @@ int TombRaider::loadTR5(FILE *f)
     unsigned int level_data_sz, riffOffset, seperator0;
     unsigned int portalOffset, nextRoomOffset, thisRoomOffset;
     int i, j, k;
-    u_int16_t us;
+    uint16_t us;
 
-    u_int32_t numMeshData, numMeshPointers, u;
-    u_int32_t *meshPointers;
-    u_int8_t *meshData;
+    uint32_t numMeshData, numMeshPointers, u;
+    uint32_t *meshPointers;
+    uint8_t *meshData;
     char check[32];
 
     printDebug("Load", "mEngineVersion = 0x%x", mPakVersion);
@@ -5107,7 +5107,7 @@ int TombRaider::loadTR5(FILE *f)
 
     // Mongoose 2002.01.08, Michiel has discovered the
     //   first 4 bytes here are 2 bitu16 flags for Lara type and weather
-    u_int16_t laraType, weather;
+    uint16_t laraType, weather;
 
     Fread(&laraType, 2, 1, f);
     printDebug("LoadTR5", "laraType = 0x%x", laraType);
@@ -5850,7 +5850,7 @@ int TombRaider::loadTR5(FILE *f)
     // Use pointers array to index in meshData array for tr5_mesh_t's
     Fread(&numMeshPointers, 4, 1, f);
     printDebug("LoadTR5", "numMeshPointers = %u", numMeshPointers);
-    meshPointers = new u_int32_t[numMeshPointers];
+    meshPointers = new uint32_t[numMeshPointers];
     Fread(meshPointers, 4, numMeshPointers, f);
 
     Fread(&numAnimationsTR5, 4, 1, f);
@@ -5885,7 +5885,7 @@ int TombRaider::loadTR5(FILE *f)
     Fread(&u, 4, 1, f);
     _num_frames = u;
     printDebug("LoadTR5", "_num_frames = %u", _num_frames);
-    _frames = new u_int16_t[_num_frames];
+    _frames = new uint16_t[_num_frames];
     Fread(_frames, 2, _num_frames, f);
 
     Fread(&numMoveablesTR5, 4, 1, f);
@@ -6068,7 +6068,7 @@ int TombRaider::loadTR5(FILE *f)
         fseek(f, u, SEEK_SET);
     }
 
-    //! \fixme (Endian) Read bitu32 / u_int32_t
+    //! \fixme (Endian) Read bitu32 / uint32_t
     Fread(&mNumTR4Samples, 4, 1, f);
     printDebug("Load", "mNumTR4Samples = %i", mNumTR4Samples);
 

src/WindowSDL.cpp

@@ -24,12 +24,6 @@ WindowSDL::WindowSDL() {
     mTextInput = false;
     mWindow = NULL;
     mGLContext = NULL;
-
-#ifdef _WIN32
-    setDriver("libGL32.dll");
-#elif !defined(__APPLE__)
-    setDriver("/usr/lib/libGL.so.1");
-#endif
 }
 
 WindowSDL::~WindowSDL() {