nolok dies properly now :)

[supertux.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index 18d2894..0765626 100644 (file)
--- 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
@@ -47,9 +56,8 @@ public:
 
   virtual void action(float elapsed_time);
 
-  virtual void draw(DrawingContext& context)
+  virtual void draw(DrawingContext& )
   {
-    (void) context;
   }
 
   void set_scrolling(int scroll_x, int scroll_y)
@@ -94,5 +102,5 @@ private:
   Vector current_dir;
 };
 
-#endif
+#endif /*SUPERTUX_CAMERA_H*/