- just doing some C++ifying

[supertux.git] / src / mousecursor.h

diff --git a/src/mousecursor.h b/src/mousecursor.h
index 16b0ba6..a9b89bc 100644 (file)
--- a/src/mousecursor.h
+++ b/src/mousecursor.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include "timer.h"
-#include "texture.h"
+#include "screen/texture.h"
 
 #define MC_FRAME_PERIOD 800  // in ms
 
@@ -34,26 +34,26 @@ enum {
 };
 
 class MouseCursor
-  {
-    public:
-    MouseCursor(std::string cursor_file, int frames);
-    ~MouseCursor();
-    int state();
-    void set_state(int nstate);
-    void set_mid(int x, int y);
-    void draw();
+{
+public:
+  MouseCursor(std::string cursor_file, int frames);
+  ~MouseCursor();
+  int state();
+  void set_state(int nstate);
+  void set_mid(int x, int y);
+  void draw(DrawingContext& context);
     
-    static MouseCursor* current() { return current_; };
-    static void set_current(MouseCursor* pcursor) {  current_ = pcursor; };
+  static MouseCursor* current() { return current_; };
+  static void set_current(MouseCursor* pcursor) {  current_ = pcursor; };
     
-    private:
-    int mid_x, mid_y;
-    static MouseCursor* current_;    
-    int state_before_click;
-    int cur_state;
-    int cur_frame, tot_frames;
-    Surface* cursor;
-    Timer timer;
-  };
+private:
+  int mid_x, mid_y;
+  static MouseCursor* current_;    
+  int state_before_click;
+  int cur_state;
+  int cur_frame, tot_frames;
+  Surface* cursor;
+  Timer timer;
+};
 
 #endif /*SUPERTUX_MOUSECURSOR_H*/