player replaced by Person::players which is a vector of shared_ptr.

[lugaru.git] / Source / gamegl.h

diff --git a/Source/gamegl.h b/Source/gamegl.h
index 20d94ce125d9799cc2c84c6a1ecb9afe411f1991..7d6945d610366b45e56e5ef0b68a42bd18d3a7a4 100644 (file)
--- a/Source/gamegl.h
+++ b/Source/gamegl.h
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -30,42 +30,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <map>
 #include <string>
 
-#ifndef WIN32
-  #if PLATFORM_UNIX
-    #define GL_GLEXT_PROTOTYPES
-    #include "GL/gl.h"
-    #include "GL/glu.h"
-    #include "GL/glext.h"
-  #else
-    #include <GL/gl.h>
-    #include <GL/glu.h>
-    #include <GL/glext.h>
-  #endif
-#else
+#ifdef WIN32
   #define WIN32_LEAN_AND_MEAN
   #define Polygon WinPolygon
   #include <windows.h>
   #undef Polygon
-  #define GL_GLEXT_PROTOTYPES
-  #include <gl/gl.h>
-  #include <gl/glu.h>
-  //#include <gl/glaux.h> -- EVIL and OLD, NEVER USE IT!
-  #include <gl/glext.h>
-  #include "MacCompatibility.h"
-  //#include "il/ilut.h"
-
 #endif
 
-#if !PLATFORM_MACOSX
-struct RGBColor
-{
-       unsigned short red;
-       unsigned short green;
-       unsigned short blue;
-};
-typedef struct RGBColor RGBColor;
-typedef RGBColor * RGBColorPtr;
-#endif
+#define GL_GLEXT_PROTOTYPES 1
+#include "GL/gl.h"
+#include "GL/glu.h"
+#include "GL/glext.h"
+#include "MacCompatibility.h"
 
 using namespace std;