[Pingus-CVS] r3939 - in trunk/pingus/src: . display screen

[jsalmon3]

Author: jsalmon3
Date: 2008-11-22 21:40:01 +0100 (Sat, 22 Nov 2008)
New Revision: 3939

Modified:
   trunk/pingus/src/demo_session.hpp
   trunk/pingus/src/display/delta_framebuffer.cpp
   trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
   trunk/pingus/src/game_session.hpp
   trunk/pingus/src/goal_manager.cpp
   trunk/pingus/src/screen/screen.hpp
   trunk/pingus/src/screen/screen_manager.hpp
   trunk/pingus/src/server.cpp
Log:
Fixed compile warnings/errors with VC++



Modified: trunk/pingus/src/demo_session.hpp
===================================================================
--- trunk/pingus/src/demo_session.hpp   2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/demo_session.hpp   2008-11-22 20:40:01 UTC (rev 3939)
@@ -23,8 +23,8 @@
 #include "server_event.hpp"
 
 namespace Input {
-class Event;
-class ScrollEvent;
+struct Event;
+struct ScrollEvent;
 }
 
 class Server;

Modified: trunk/pingus/src/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.cpp      2008-09-24 14:03:56 UTC 
(rev 3938)
+++ trunk/pingus/src/display/delta_framebuffer.cpp      2008-11-22 20:40:01 UTC 
(rev 3939)
@@ -171,6 +171,7 @@
 
           default:
             assert(!"Never reached");
+            return false;
         }
     }
   else

Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp        
2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp        
2008-11-22 20:40:01 UTC (rev 3939)
@@ -17,12 +17,17 @@
 #ifndef HEADER_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
 #define HEADER_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
 
-#ifndef MACOSX
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX       /* Don't defined min() and max() */
+#include <windows.h>
 #include <GL/gl.h>
-#include <GL/glext.h>
-#else
+#elif defined(MACOSX)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
 #endif
 
 #include "SDL.h"

Modified: trunk/pingus/src/game_session.hpp
===================================================================
--- trunk/pingus/src/game_session.hpp   2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/game_session.hpp   2008-11-22 20:40:01 UTC (rev 3939)
@@ -24,9 +24,9 @@
 #include "pingu_enums.hpp"
 
 namespace Input {
-class ScrollEvent;
-class AxisEvent;
-class Event;
+struct ScrollEvent;
+struct AxisEvent;
+struct Event;
 }
 
 class ButtonPanel;

Modified: trunk/pingus/src/goal_manager.cpp
===================================================================
--- trunk/pingus/src/goal_manager.cpp   2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/goal_manager.cpp   2008-11-22 20:40:01 UTC (rev 3939)
@@ -55,6 +55,7 @@
 
       default:
         assert(!"GoalManager: unknown goal state");
+        return false;
     }
 }
 

Modified: trunk/pingus/src/screen/screen.hpp
===================================================================
--- trunk/pingus/src/screen/screen.hpp  2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/screen/screen.hpp  2008-11-22 20:40:01 UTC (rev 3939)
@@ -21,7 +21,7 @@
 #include "../math/size.hpp"
 
 namespace Input {
-class Event;
+struct Event;
 }
 
 class Size;

Modified: trunk/pingus/src/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.hpp  2008-09-24 14:03:56 UTC (rev 
3938)
+++ trunk/pingus/src/screen/screen_manager.hpp  2008-11-22 20:40:01 UTC (rev 
3939)
@@ -26,7 +26,7 @@
 
 namespace Input {
 class Manager;
-class Event;
+struct Event;
 class Controller;
 }
 

Modified: trunk/pingus/src/server.cpp
===================================================================
--- trunk/pingus/src/server.cpp 2008-09-24 14:03:56 UTC (rev 3938)
+++ trunk/pingus/src/server.cpp 2008-11-22 20:40:01 UTC (rev 3939)
@@ -14,6 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <time.h>
 #include <iostream>
 #include <fstream>
 #include "system.hpp"