fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / gui / mousecursor.cpp

diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp
index bd3ff52..b2010c5 100644 (file)
--- a/src/gui/mousecursor.cpp
+++ b/src/gui/mousecursor.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Ricardo Cruz <rick2@aeiou.pt>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -19,26 +19,19 @@
 
 #include <config.h>
 
-#include "app/globals.h"
-#include "video/drawing_context.h"
-#include "gui/mousecursor.h"
-
-using namespace SuperTux;
+#include "video/drawing_context.hpp"
+#include "gui/mousecursor.hpp"
+#include "main.hpp"
 
 MouseCursor* MouseCursor::current_ = 0;
 extern SDL_Surface* screen;
 
-MouseCursor::MouseCursor(std::string cursor_file, int frames) : mid_x(0), mid_y(0)
+MouseCursor::MouseCursor(std::string cursor_file) : mid_x(0), mid_y(0)
 {
-  cursor = new Surface(cursor_file, true);
-  
+  cursor = new Surface(cursor_file);
+
   cur_state = MC_NORMAL;
-  cur_frame = 0;
-  tot_frames = frames;
 
-  timer.init(false);
-  timer.start(MC_FRAME_PERIOD);
-  
   SDL_ShowCursor(SDL_DISABLE);
 }
 
@@ -76,31 +69,18 @@ void MouseCursor::draw(DrawingContext& context)
   x = int(x * float(SCREEN_WIDTH)/screen->w);
   y = int(y * float(SCREEN_HEIGHT)/screen->h);
 
-  w = cursor->w / tot_frames;
-  h = cursor->h / MC_STATES_NB;
-  if(ispressed &SDL_BUTTON(1) || ispressed &SDL_BUTTON(2))
-    {
-      if(cur_state != MC_CLICK)
-        {
-          state_before_click = cur_state;
-          cur_state = MC_CLICK;
-        }
-    }
-  else
-    {
-      if(cur_state == MC_CLICK)
-        cur_state = state_before_click;
-    }
-
-  if(timer.get_left() < 0 && tot_frames > 1)
-    {
-      cur_frame++;
-      if(cur_frame++ >= tot_frames)
-        cur_frame = 0;
-
-      timer.start(MC_FRAME_PERIOD);
+  w = (int) cursor->get_width();
+  h = (int) (cursor->get_height() / MC_STATES_NB);
+  if(ispressed &SDL_BUTTON(1) || ispressed &SDL_BUTTON(2)) {
+    if(cur_state != MC_CLICK) {
+      state_before_click = cur_state;
+      cur_state = MC_CLICK;
     }
+  } else {
+    if(cur_state == MC_CLICK)
+      cur_state = state_before_click;
+  }
 
-  context.draw_surface_part(cursor, Vector(w*cur_frame, h*cur_state), Vector(w,
-        h), Vector(x-mid_x, y-mid_y), LAYER_GUI+100);
+  context.draw_surface_part(cursor, Vector(0, h*cur_state),
+          Vector(w, h), Vector(x-mid_x, y-mid_y), LAYER_GUI+100);
 }