[Pingus-CVS] r4058 - in trunk/pingus: . src/engine/display src/engine/gui src/engine/input src/engine/screen src/engine/sound src/math src/pingus src/pingus/components src/pingus/screens src/pingus/worldmap src/util

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-06 17:01:42 +0100 (Fri, 06 Nov 2009)
New Revision: 4058

Removed:
   trunk/pingus/src/pingus/pingus.hpp
Modified:
   trunk/pingus/TODO
   trunk/pingus/src/engine/display/blitter.hpp
   trunk/pingus/src/engine/display/blitter_impl.hpp
   trunk/pingus/src/engine/gui/button.hpp
   trunk/pingus/src/engine/gui/component.hpp
   trunk/pingus/src/engine/gui/surface_button.cpp
   trunk/pingus/src/engine/input/event.hpp
   trunk/pingus/src/engine/screen/screen_manager.hpp
   trunk/pingus/src/engine/sound/sound_impl.hpp
   trunk/pingus/src/math/math.hpp
   trunk/pingus/src/pingus/collider.cpp
   trunk/pingus/src/pingus/components/action_button.cpp
   trunk/pingus/src/pingus/components/menu_button.cpp
   trunk/pingus/src/pingus/components/menu_button.hpp
   trunk/pingus/src/pingus/components/smallmap.cpp
   trunk/pingus/src/pingus/direction.hpp
   trunk/pingus/src/pingus/game_event.hpp
   trunk/pingus/src/pingus/game_time.hpp
   trunk/pingus/src/pingus/global_event.hpp
   trunk/pingus/src/pingus/globals.hpp
   trunk/pingus/src/pingus/layer_manager.hpp
   trunk/pingus/src/pingus/path_manager.hpp
   trunk/pingus/src/pingus/pingu_enums.hpp
   trunk/pingus/src/pingus/pingus_main.hpp
   trunk/pingus/src/pingus/resource_modifier.hpp
   trunk/pingus/src/pingus/result.hpp
   trunk/pingus/src/pingus/screens/game_session.cpp
   trunk/pingus/src/pingus/smallmap_image.hpp
   trunk/pingus/src/pingus/world.hpp
   trunk/pingus/src/pingus/worldmap/level_dot.cpp
   trunk/pingus/src/pingus/worldmap/path_drawable.cpp
   trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
   trunk/pingus/src/pingus/worldobj.cpp
   trunk/pingus/src/pingus/worldobj.hpp
   trunk/pingus/src/util/debug_stream.hpp
   trunk/pingus/src/util/system.hpp
Log:
Removed src/pingus/pingus.hpp, if the MSVC warning stuff is still needed it 
should be moved to the project files


Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/TODO   2009-11-06 16:01:42 UTC (rev 4058)
@@ -39,8 +39,6 @@
 
 * reduce global variables
 
-* get rid of "pingus/pingus.cpp"
-
 * make pingu.hpp use int not float
 
 * data/prefab/ completly obsolete? if so remove

Modified: trunk/pingus/src/engine/display/blitter.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.hpp 2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/engine/display/blitter.hpp 2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,8 +17,8 @@
 #ifndef HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_HPP
 #define HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_HPP
 
-#include "SDL.h"
-#include "pingus/pingus.hpp"
+#include <SDL.h>
+
 #include "math/color.hpp"
 #include "math/rect.hpp"
 

Modified: trunk/pingus/src/engine/display/blitter_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter_impl.hpp    2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/engine/display/blitter_impl.hpp    2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -18,8 +18,8 @@
 #define HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_IMPL_HPP
 
 #include <iostream>
+
 #include "engine/display/surface.hpp"
-#include "pingus/pingus.hpp"
 
 /** A collection of helper functions for the blitter class */
 namespace BlitterImpl {
@@ -46,20 +46,23 @@
 /** Rotate a surface 180 degree */
 struct transform_rot180
 {
-  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) {
+  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) 
+  {
     return (spitch * height) - (y * spitch + x) - 1;
   }
 
-  static inline int get_x(int width, int height, int x, int y) { 
UNUSED_ARG(height); UNUSED_ARG(y);
+  static inline int get_x(int width, int height, int x, int y) 
+  {
     return width - x - 1;
   }
 
-  static inline int get_y(int width, int height, int x, int y) { 
UNUSED_ARG(width);  UNUSED_ARG(x);
+  static inline int get_y(int width, int height, int x, int y) 
+  {
     return height - y - 1;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(height); 
return width; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(width);  
return height; }
+  static inline int get_width (int width, int height) { return width; }
+  static inline int get_height(int width, int height) { return height; }
 };
 
 /** Rotate a surface 270 degree */
@@ -69,64 +72,60 @@
     return ((width - x - 1) * tpitch) + y;
   }
 
-  static inline int get_x(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
+  static inline int get_x(int width, int height, int x, int y) 
+  {
     return y;
   }
 
-  static inline int get_y(int width, int height, int x, int y) {
-    UNUSED_ARG(height);
-    UNUSED_ARG(y);
-
+  static inline int get_y(int width, int height, int x, int y) 
+  {
     return width - x - 1;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(width);  
return height; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(height); 
return width; }
+  static inline int get_width (int width, int height) { return height; }
+  static inline int get_height(int width, int height) { return width; }
 };
 
 /** flip a surface  */
 struct transform_flip
 {
-  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) {
-    UNUSED_ARG(height);
+  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) 
+  {
     return (y * spitch) + (width - x - 1);
   }
 
-  static inline int get_x(int width, int height, int x, int y) {
-    UNUSED_ARG(height); UNUSED_ARG(y);
+  static inline int get_x(int width, int height, int x, int y) 
+  {
     return width - x - 1;
   }
 
-  static inline int get_y(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
+  static inline int get_y(int width, int height, int x, int y) 
+  {
     return y;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(height);  
return width; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(width); 
return height; }
+  static inline int get_width (int width, int height) { return width; }
+  static inline int get_height(int width, int height) { return height; }
 };
 
 /** Rotate a surface 90 degree and then flip it */
 struct transform_rot90_flip
 {
-  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) {
-    UNUSED_ARG(width);
+  static inline int get_index(int width, int height, int spitch, int tpitch, 
int x, int y) 
+  {
     return (x * tpitch) + y;
   }
 
   static inline int get_x(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
     return y;
   }
 
   static inline int get_y(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(y);
     return x;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(width);  
return height; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(height); 
return width; }
+  static inline int get_width (int width, int height) { return height; }
+  static inline int get_height(int width, int height) { return width; }
 };
 
 /** Rotate a surface 180 degree and then flip it */
@@ -137,17 +136,15 @@
   }
 
   static inline int get_x(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(y);
     return x;
   }
 
   static inline int get_y(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(x);
     return height - y - 1;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(height);  
return width; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(width); 
return height; }
+  static inline int get_width (int width, int height) { return width; }
+  static inline int get_height(int width, int height) { return height; }
 };
 
 /** Rotate a surface 270 degree and then flip it */
@@ -158,17 +155,15 @@
   }
 
   static inline int get_x(int width, int height, int x, int y) {
-    UNUSED_ARG(width); UNUSED_ARG(x);
     return height - y - 1;
   }
 
   static inline int get_y(int width, int height, int x, int y) {
-    UNUSED_ARG(height); UNUSED_ARG(y);
     return width - x - 1;
   }
 
-  static inline int get_width (int width, int height) { UNUSED_ARG(width);  
return height; }
-  static inline int get_height(int width, int height) { UNUSED_ARG(height); 
return width; }
+  static inline int get_width (int width, int height) { return height; }
+  static inline int get_height(int width, int height) { return width; }
 };
 
 template<class TransF>

Modified: trunk/pingus/src/engine/gui/button.hpp
===================================================================
--- trunk/pingus/src/engine/gui/button.hpp      2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/engine/gui/button.hpp      2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,9 +17,8 @@
 #ifndef HEADER_PINGUS_ENGINE_GUI_BUTTON_HPP
 #define HEADER_PINGUS_ENGINE_GUI_BUTTON_HPP
 
-#include "pingus/pingus.hpp"
-
 namespace GUI {
+
 class Button
 {
 protected:

Modified: trunk/pingus/src/engine/gui/component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/component.hpp   2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/engine/gui/component.hpp   2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,8 +17,6 @@
 #ifndef HEADER_PINGUS_ENGINE_GUI_COMPONENT_HPP
 #define HEADER_PINGUS_ENGINE_GUI_COMPONENT_HPP
 
-#include "pingus/pingus.hpp"
-
 class DrawingContext;
 
 namespace GUI {
@@ -51,25 +49,25 @@
   virtual bool is_visible() const { return visible; }
 
   virtual void draw (DrawingContext& gc) =0;
-  virtual void update (float delta) { UNUSED_ARG(delta);}
+  virtual void update (float delta) { }
 
-  virtual bool is_at (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); return 
false; }
+  virtual bool is_at (int x, int y) { return false; }
 
   // Events
   /** Gets issued once the primary button is pressed */
-  virtual void on_primary_button_press (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_primary_button_press (int x, int y) { }
 
   /** Gets issued once the primary button is released */
-  virtual void on_primary_button_release (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_primary_button_release (int x, int y) { }
 
-  virtual void on_secondary_button_press (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
-  virtual void on_secondary_button_release (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_secondary_button_press (int x, int y) { }
+  virtual void on_secondary_button_release (int x, int y) { }
 
   /** Gets emmited when a button is pressed and released over the
       same component */
-  virtual void on_primary_button_click (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_primary_button_click (int x, int y) {}
 
-  virtual void on_secondary_button_click (int x, int y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_secondary_button_click (int x, int y) {}
 
   /** Emmitted when pointer enters the region of the component */
   virtual void on_pointer_enter () {}
@@ -79,13 +77,13 @@
 
   /** Emitted when the pointer moved, x and y are the new pointer
       coordinates */
-  virtual void on_pointer_move (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); }
+  virtual void on_pointer_move (int x, int y) {}
        
-  virtual void on_scroller_move (float x, float y) { UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  virtual void on_scroller_move (float x, float y) {}
 
   /** Emitted whenever a keyboard character is pressed.  Only certain 
       components should implement this */
-  virtual void on_key_pressed(const unsigned short c) { UNUSED_ARG(c); }
+  virtual void on_key_pressed(const unsigned short c) {}
 
   GroupComponent* get_parent() const;
   void set_parent(GroupComponent* p);

Modified: trunk/pingus/src/engine/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.cpp      2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/engine/gui/surface_button.cpp      2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -69,18 +69,12 @@
 SurfaceButton::on_primary_button_press (int x, int y)
 {
   pressed = true;
-
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 void
 SurfaceButton::on_primary_button_release (int x, int y)
 {
   pressed = false;
-
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 void
@@ -99,8 +93,6 @@
 SurfaceButton::on_primary_button_click (int x, int y)
 {
   on_click();
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 void

Modified: trunk/pingus/src/engine/input/event.hpp
===================================================================
--- trunk/pingus/src/engine/input/event.hpp     2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/engine/input/event.hpp     2009-11-06 16:01:42 UTC (rev 
4058)
@@ -19,7 +19,6 @@
 
 #include <vector>
 #include <string>
-#include "pingus/pingus.hpp"
 
 namespace Input {
 

Modified: trunk/pingus/src/engine/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.hpp   2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/engine/screen/screen_manager.hpp   2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -17,12 +17,12 @@
 #ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
 #define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
 
-#include "pingus/pingus.hpp"
 #include <memory>
 #include <boost/smart_ptr.hpp>
 #include <vector>
+
+#include "engine/display/sprite.hpp"
 #include "math/vector2f.hpp"
-#include "engine/display/sprite.hpp"
 
 namespace Input {
 class Manager;

Modified: trunk/pingus/src/engine/sound/sound_impl.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_impl.hpp        2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/engine/sound/sound_impl.hpp        2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -19,8 +19,6 @@
 
 #include <string>
 
-#include "pingus/pingus.hpp"
-
 namespace Sound {
 
 class PingusSoundImpl

Modified: trunk/pingus/src/math/math.hpp
===================================================================
--- trunk/pingus/src/math/math.hpp      2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/math/math.hpp      2009-11-06 16:01:42 UTC (rev 4058)
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string>
-#include "pingus/pingus.hpp"
 
 /** A collection of small math helper functions, some of them might be
     equal in functionality to standard STL functions, but provided

Modified: trunk/pingus/src/pingus/collider.cpp
===================================================================
--- trunk/pingus/src/pingus/collider.cpp        2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/collider.cpp        2009-11-06 16:01:42 UTC (rev 
4058)
@@ -31,10 +31,6 @@
 bool Collider::operator() (World* const world, Vector3f current_pos,
                            const Vector3f& step_vector) const
 {
-  UNUSED_ARG(world);
-  UNUSED_ARG(current_pos);
-  UNUSED_ARG(step_vector);
-
   return false;
 }
 

Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp        2009-11-06 
15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/components/action_button.cpp        2009-11-06 
16:01:42 UTC (rev 4058)
@@ -95,9 +95,6 @@
     {
       pressed = true;
     }
-
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 ForwardButton::ForwardButton(GameSession* s, int x, int y) :
@@ -133,9 +130,6 @@
 ForwardButton::on_primary_button_click (int x, int y)
 {
   session->set_fast_forward(!session->get_fast_forward());
-
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 PauseButton::PauseButton(GameSession* s, int x, int y) :
@@ -173,9 +167,6 @@
 PauseButton::on_primary_button_click (int x, int y)
 {
   session->set_pause(!session->get_pause());
-
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 /* EOF */

Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp  2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/components/menu_button.cpp  2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -81,13 +81,11 @@
       gc.draw(surface_p, Vector2i(x_pos, y_pos));
       gc.print_center(font_large, Vector2i(x_pos, y_pos - 28), text);
     }
-  UNUSED_ARG(gc);
 }
 
 void
 MenuButton::update (float delta)
 {
-  UNUSED_ARG(delta);
 }
 
 void

Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp  2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/components/menu_button.hpp  2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -59,7 +59,7 @@
   void on_pointer_press ();
   void on_pointer_release ();
 
-  void on_primary_button_click (int x, int y) { on_click (); UNUSED_ARG(x); 
UNUSED_ARG(y); }
+  void on_primary_button_click (int x, int y) { on_click (); }
 
   virtual void on_click ();
 

Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp     2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/components/smallmap.cpp     2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -161,8 +161,6 @@
 SmallMap::on_primary_button_release(int x, int y)
 {
   scroll_mode = false;
-  UNUSED_ARG(x);
-  UNUSED_ARG(y);
 }
 
 void

Modified: trunk/pingus/src/pingus/direction.hpp
===================================================================
--- trunk/pingus/src/pingus/direction.hpp       2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/direction.hpp       2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,9 +17,6 @@
 #ifndef HEADER_PINGUS_PINGUS_DIRECTION_HPP
 #define HEADER_PINGUS_PINGUS_DIRECTION_HPP
 
-#include "pingus/pingus.hpp"
-
-
 /// Simple class for managing the direction of a pingu
 class Direction
 {
@@ -45,7 +42,6 @@
   bool is_right () const;
 };
 
-
 #endif
 
 /* EOF */

Modified: trunk/pingus/src/pingus/game_event.hpp
===================================================================
--- trunk/pingus/src/pingus/game_event.hpp      2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/game_event.hpp      2009-11-06 16:01:42 UTC (rev 
4058)
@@ -19,10 +19,8 @@
 
 #error "Don't used this the moment, its underdevelopment and not compilable"
 
-#include "pingus/pingus.hpp"
 #include <string>
 
-
 /** This will need some^H^H^H^H a lot of work */
 typedef enum {
   /** Pointer Events (pos contains the move-delta) */

Modified: trunk/pingus/src/pingus/game_time.hpp
===================================================================
--- trunk/pingus/src/pingus/game_time.hpp       2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/game_time.hpp       2009-11-06 16:01:42 UTC (rev 
4058)
@@ -19,8 +19,6 @@
 
 #include <string>
 
-#include "pingus/pingus.hpp"
-
 /** The GameTime represents the time which passes in the Pingus World.
     Its behaviour is analogue to CL_System::get_time (), but with the
     difference that it only increases if the game runs, if the game is

Modified: trunk/pingus/src/pingus/global_event.hpp
===================================================================
--- trunk/pingus/src/pingus/global_event.hpp    2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/global_event.hpp    2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,8 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_GLOBAL_EVENT_HPP
 #define HEADER_PINGUS_PINGUS_GLOBAL_EVENT_HPP
 
-#include "SDL.h"
-#include "pingus/pingus.hpp"
+#include <SDL.h>
 
 class GlobalEvent
 {

Modified: trunk/pingus/src/pingus/globals.hpp
===================================================================
--- trunk/pingus/src/pingus/globals.hpp 2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/globals.hpp 2009-11-06 16:01:42 UTC (rev 4058)
@@ -20,7 +20,6 @@
 #ifndef HEADER_PINGUS_PINGUS_GLOBALS_HPP
 #define HEADER_PINGUS_PINGUS_GLOBALS_HPP
 
-#include "pingus/pingus.hpp"
 #include <string>
 
 extern int         game_speed;                      ///< -t, --set-speed

Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp   2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/layer_manager.hpp   2009-11-06 16:01:42 UTC (rev 
4058)
@@ -19,7 +19,6 @@
 
 #include "math/math.hpp"
 #include "pingus/globals.hpp"
-#include "pingus/pingus.hpp"
 #include "engine/display/sprite.hpp"
 #include "engine/display/display.hpp"
 #include "engine/display/drawing_context.hpp"

Modified: trunk/pingus/src/pingus/path_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.hpp    2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/path_manager.hpp    2009-11-06 16:01:42 UTC (rev 
4058)
@@ -20,8 +20,6 @@
 #include <string>
 #include <list>
 
-#include "pingus/pingus.hpp"
-
 class PathManager
 {
 private:

Modified: trunk/pingus/src/pingus/pingu_enums.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.hpp     2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/pingu_enums.hpp     2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,7 +17,6 @@
 #ifndef HEADER_PINGUS_PINGUS_PINGU_ENUMS_HPP
 #define HEADER_PINGUS_PINGUS_PINGU_ENUMS_HPP
 
-#include "pingus/pingus.hpp"
 #include <string>
 
 /** The Pingus Status shows the current status of a Pingu, as

Deleted: trunk/pingus/src/pingus/pingus.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus.hpp  2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/pingus.hpp  2009-11-06 16:01:42 UTC (rev 4058)
@@ -1,47 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 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.  See the
-//  GNU General Public License for more details.
-//  
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PINGUS_PINGUS_PINGUS_HPP
-#define HEADER_PINGUS_PINGUS_PINGUS_HPP
-
-/**
- * Multiple hacks, workarounds and helper things which are included
- * everywhere and are used to fix broken compilers or supress
- * warrnings.
- *
- * @file pingus.hxx
- **/
-
-#if defined(WIN32) && !defined(__GNUC__)
-#  define for if(0);else for
-
-#  define snprintf _snprintf
-
-#  pragma warning(disable:4786) //over 255 characters in debug indentifier, 
due to STL instantiation
-   //sadly this does not actually work on 6.0, but it does in .NET
-
-#  pragma warning(disable:4355) //this used in constructor base
-
-#  pragma warning(disable:4800) //'int' : forcing value to bool 'true' or 
'false' (performance warning)
-
-#  include <assert.h>
-#endif
-
-#define UNUSED_ARG(expr) do { (void)(expr); } while (0)
-
-#endif
-
-/* EOF */

Modified: trunk/pingus/src/pingus/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.hpp     2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/pingus_main.hpp     2009-11-06 16:01:42 UTC (rev 
4058)
@@ -18,8 +18,7 @@
 #define HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
 
 #include <string>
-#include "pingus/pingus.hpp"
-#include "SDL.h"
+#include <SDL.h>
 
 #include "pingus/pingus_options.hpp"
 #include "util/pathname.hpp"

Modified: trunk/pingus/src/pingus/resource_modifier.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -17,7 +17,6 @@
 #ifndef HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
 #define HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
 
-#include "pingus/pingus.hpp"
 #include <string>
 
 namespace ResourceModifierNS {

Modified: trunk/pingus/src/pingus/result.hpp
===================================================================
--- trunk/pingus/src/pingus/result.hpp  2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/result.hpp  2009-11-06 16:01:42 UTC (rev 4058)
@@ -18,9 +18,7 @@
 #define HEADER_PINGUS_PINGUS_RESULT_HPP
 
 #include "pingus/pingus_level.hpp"
-#include "pingus/pingus.hpp"
 
-
 /** Result of a Pingus game */
 struct Result
 {
@@ -60,7 +58,6 @@
   }
 };
 
-
 #endif
 
 /* EOF */

Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp    2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/screens/game_session.cpp    2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -264,7 +264,6 @@
 GameSession::process_axis_event (const Input::AxisEvent& event)
 {
   // std::cout << "GameSession::process_axis_event ()" << std::endl;
-  UNUSED_ARG(event);
 }
 
 void

Modified: trunk/pingus/src/pingus/smallmap_image.hpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.hpp  2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/smallmap_image.hpp  2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,7 +17,6 @@
 #ifndef HEADER_PINGUS_PINGUS_SMALLMAP_IMAGE_HPP
 #define HEADER_PINGUS_PINGUS_SMALLMAP_IMAGE_HPP
 
-#include "pingus/pingus.hpp"
 #include "engine/display/sprite.hpp"
 #include "engine/display/surface.hpp"
 

Modified: trunk/pingus/src/pingus/world.hpp
===================================================================
--- trunk/pingus/src/pingus/world.hpp   2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/world.hpp   2009-11-06 16:01:42 UTC (rev 4058)
@@ -17,14 +17,14 @@
 #ifndef HEADER_PINGUS_PINGUS_WORLD_HPP
 #define HEADER_PINGUS_PINGUS_WORLD_HPP
 
-#include "pingus/pingus.hpp"
+#include <memory>
+#include <string>
 #include <vector>
-#include <string>
-#include <memory>
+
+#include "math/color.hpp"
 #include "math/vector2i.hpp"
-#include "math/color.hpp"
+#include "pingus/collision_mask.hpp"
 #include "pingus/groundtype.hpp"
-#include "pingus/collision_mask.hpp"
 
 class Vector3f;
 class GroundMap;

Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp      2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp      2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -95,7 +95,6 @@
 void
 LevelDot::update(float delta)
 {
-  UNUSED_ARG(delta);
 }
 
 void

Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.cpp  2009-11-06 15:48:32 UTC 
(rev 4057)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp  2009-11-06 16:01:42 UTC 
(rev 4058)
@@ -44,7 +44,6 @@
 void
 PathDrawable::update (float delta)
 {
-  UNUSED_ARG(delta);
 }
 
 } // namespace WorldmapNS

Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp        2009-11-06 
15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp        2009-11-06 
16:01:42 UTC (rev 4058)
@@ -46,7 +46,6 @@
 void
 SpriteDrawable::update(float delta)
 {
-  UNUSED_ARG(delta);
 }
 
 void

Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp        2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/worldobj.cpp        2009-11-06 16:01:42 UTC (rev 
4058)
@@ -69,7 +69,6 @@
 void
 WorldObj::draw_smallmap(SmallMap* smallmap)
 {
-  UNUSED_ARG(smallmap);
 }
 
 void

Modified: trunk/pingus/src/pingus/worldobj.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.hpp        2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/pingus/worldobj.hpp        2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,10 +17,9 @@
 #ifndef HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
 #define HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
 
-#include "pingus/pingus.hpp"
-#include "util/file_reader.hpp"
 #include "engine/display/sprite.hpp"
 #include "pingus/collision_mask.hpp"
+#include "util/file_reader.hpp"
 
 class FileReader;
 class SceneContext;

Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp      2009-11-06 15:48:32 UTC (rev 
4057)
+++ trunk/pingus/src/util/debug_stream.hpp      2009-11-06 16:01:42 UTC (rev 
4058)
@@ -17,13 +17,10 @@
 #ifndef HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
 #define HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
 
-#include "pingus/pingus.hpp"
-
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
 
-
 class NilStream;
 
 class DebugStream : public std::ostream
@@ -116,7 +113,6 @@
   friend class DebugStream;
 };
 
-
 #endif
 
 /* EOF */

Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp    2009-11-06 15:48:32 UTC (rev 4057)
+++ trunk/pingus/src/util/system.hpp    2009-11-06 16:01:42 UTC (rev 4058)
@@ -17,12 +17,10 @@
 #ifndef HEADER_PINGUS_UTIL_SYSTEM_HPP
 #define HEADER_PINGUS_UTIL_SYSTEM_HPP
 
-#include "pingus/pingus.hpp"
-
 #include <string>
 #include <vector>
 #include <map>
-#include "SDL.h"
+#include <stdint.h>
 
 class Pathname;