super-tux-commit

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4552/src

Modified Files:
	button.cpp leveleditor.cpp 
Log Message:
Fixed Objects drag+drop bug. LevelEditor cursor tuning.

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- button.cpp	5 May 2004 16:59:41 -0000	1.25
+++ button.cpp	5 May 2004 20:05:09 -0000	1.26
@@ -86,7 +86,7 @@
   
   if(game_object != NULL)
   {
-    game_object->draw_on_screen();
+    game_object->draw_on_screen(rect.x,rect.y);
   }
 
   if(show_info)

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- leveleditor.cpp	5 May 2004 16:59:41 -0000	1.86
+++ leveleditor.cpp	5 May 2004 20:05:09 -0000	1.87
@@ -560,6 +560,8 @@
 
 int le_init()
 {
+  
+
   level_subsets = dsubdirs("/levels", "info");
   le_level_subset = new LevelSubset;
 
@@ -798,7 +800,10 @@
   }
 
   if(le_selection_mode == CURSOR)
-    le_selection->draw( cursor_x - scroll_x, cursor_y);
+    if(le_current.IsTile())
+    le_selection->draw( cursor_x - pos_x, cursor_y);
+    else
+    le_selection->draw( cursor_x, cursor_y);
   else if(le_selection_mode == SQUARE)
   {
     int w, h;
@@ -825,11 +830,9 @@
   if(le_current.IsObject())
   {
     le_current.obj->draw_on_screen(19 * 32, 14 * 32);
+    le_current.obj->draw_on_screen(cursor_x,cursor_y);
   }
 
-  //if(le_current.IsObject())
-  //printf("");
-
   if(le_current_level != NULL)
   {
     le_save_level_bt->draw();
@@ -892,9 +895,9 @@
 
   if(le_current.IsTile())
   {
-    Tile::draw(cursor_x, cursor_y,le_current.tile,128);
+    Tile::draw(cursor_x-pos_x, cursor_y,le_current.tile,128);
     if(!TileManager::instance()->get(le_current.tile)->images.empty())
-      fillrect(cursor_x,cursor_y,TileManager::instance()->get(le_current.tile)->images[0]->w,TileManager::instance()->get(le_current.tile)->images[0]->h,50,50,50,50);
+      fillrect(cursor_x-pos_x,cursor_y,TileManager::instance()->get(le_current.tile)->images[0]->w,TileManager::instance()->get(le_current.tile)->images[0]->h,50,50,50,50);
   }
   if(le_current.IsObject())
   {
@@ -1282,8 +1285,6 @@
             {
               if(pbutton->get_state() == BUTTON_CLICKED)
               {
-                if(le_current.IsObject())
-                  le_current.obj->move_to(pbutton->get_pos().x,pbutton->get_pos().y);
                 le_current.Tile(pbutton->get_tag());
               }
             }
@@ -1294,8 +1295,6 @@
             {
               if(pbutton->get_state() == BUTTON_CLICKED)
               {
-                if(le_current.IsObject())
-                  le_current.obj->move_to(pbutton->get_pos().x,pbutton->get_pos().y);
                 le_current.Object(pbutton->get_game_object());
               }
             }