X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmousecursor.cpp;h=51bf984829f91b69930584b71d653d2673c7acd0;hb=ba9907babbb17fadee52f1653f7ad6adf362c6fd;hp=5a935635c5f2a762720de8cc20798b878e9687ad;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp index 5a935635c..51bf98482 100644 --- a/src/gui/mousecursor.cpp +++ b/src/gui/mousecursor.cpp @@ -18,16 +18,16 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "video/drawing_context.h" -#include "gui/mousecursor.h" -#include "main.h" +#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) : mid_x(0), mid_y(0) { - cursor = new Surface(cursor_file, true); + cursor = new Surface(cursor_file); cur_state = MC_NORMAL; @@ -68,8 +68,8 @@ void MouseCursor::draw(DrawingContext& context) x = int(x * float(SCREEN_WIDTH)/screen->w); y = int(y * float(SCREEN_HEIGHT)/screen->h); - w = cursor->w; - h = cursor->h / MC_STATES_NB; + 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; @@ -80,6 +80,6 @@ void MouseCursor::draw(DrawingContext& context) cur_state = state_before_click; } - context.draw_surface_part(cursor, Vector(w, h*cur_state), + context.draw_surface_part(cursor, Vector(0, h*cur_state), Vector(w, h), Vector(x-mid_x, y-mid_y), LAYER_GUI+100); }