X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcamera.h;h=bad7fdf2a442fc3596af617651670491a56528ba;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=18d289414385fbe39eda8ae76392f516870d75b2;hpb=8b6a2842d48b1fc14156b9c5e99e079d6cc34ccb;p=supertux.git

diff --git a/src/camera.h b/src/camera.h
index 18d289414..bad7fdf2a 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -16,16 +16,25 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __VIEWPORT_H__
-#define __VIEWPORT_H__
+
+#ifndef SUPERTUX_CAMERA_H
+#define SUPERTUX_CAMERA_H
 
 #include <vector>
-#include "vector.h"
-#include "game_object.h"
-#include "serializable.h"
 #include <cassert>
 
+#include "defines.h"
+#include "math/vector.h"
+#include "special/game_object.h"
+#include "video/drawing_context.h"
+#include "serializable.h"
+
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispReader;
+}
+
 class Sector;
 
 class Camera : public GameObject, public Serializable
@@ -49,7 +58,7 @@ public:
 
   virtual void draw(DrawingContext& context)
   {
-    (void) context;
+    UNUSED_ARG(context);
   }
 
   void set_scrolling(int scroll_x, int scroll_y)
@@ -94,5 +103,5 @@ private:
   Vector current_dir;
 };
 
-#endif
+#endif /*SUPERTUX_CAMERA_H*/