- fixed rising specials
[supertux.git] / src / leveleditor.cpp
index c6ef0ba..e48e4a1 100644 (file)
@@ -66,7 +66,7 @@
 /* crutial ones (main loop) */
 int le_init();
 void le_quit();
-int le_load_level(char *filename);
+int le_load_level_subset(char *filename);
 void le_drawlevel();
 void le_drawinterface();
 void le_checkevents();
@@ -75,7 +75,7 @@ void le_testlevel();
 void le_showhelp();
 void le_set_defaults(void);
 void le_activate_bad_guys(void);
-
+void le_goto_level(int levelnb);
 void le_highlight_selection();
 
 void apply_level_settings_menu();
@@ -92,6 +92,8 @@ struct TileOrObject
   bool IsTile() { return is_tile; };
   //Returns true for a GameObject
   bool IsObject() { return !is_tile; };
+
+
   void Init() { tile = 0; obj = NULL; is_tile = true; };
 
   bool is_tile; //true for tile (false for object)
@@ -103,6 +105,7 @@ struct TileOrObject
 static string_list_type level_subsets;
 static bool le_level_changed;  /* if changes, ask for saving, when quiting*/
 static bool show_minimap;
+static bool show_selections;
 static bool le_help_shown;
 static int pos_x, cursor_x, cursor_y, fire;
 static int le_level;
@@ -128,6 +131,8 @@ static Button* le_select_mode_two_bt;
 static Button* le_settings_bt;
 static Button* le_tilegroup_bt;
 static Button* le_objects_bt;
+static Button* le_object_select_bt;
+static Button* le_object_properties_bt;
 static ButtonPanel* le_tilemap_panel;
 static Menu* leveleditor_menu;
 static Menu* subset_load_menu;
@@ -138,11 +143,14 @@ static Menu* select_tilegroup_menu;
 static Menu* select_objects_menu;
 static Timer select_tilegroup_menu_effect;
 static Timer select_objects_menu_effect;
+static Timer display_level_info;
 typedef std::map<std::string, ButtonPanel*> ButtonPanelMap;
 static ButtonPanelMap tilegroups_map;
 static ButtonPanelMap objects_map;
 static std::string cur_tilegroup;
 static std::string cur_objects;
+static MouseCursor* mouse_select_object;
+static GameObject* selected_game_object;
 
 static square selection;
 static int le_selection_mode;
@@ -169,7 +177,7 @@ int leveleditor(char* filename)
   {}
 
   if(filename != NULL)
-    if(le_load_level(filename))
+    if(le_load_level_subset(filename))
       return 1;
 
   while(true)
@@ -294,7 +302,7 @@ int leveleditor(char* filename)
         default:
           if(i >= 1)
           {
-            if(le_load_level(level_subsets.item[i-1]))
+            if(le_load_level_subset(level_subsets.item[i-1]))
               return 1;
           }
           break;
@@ -314,8 +322,7 @@ int leveleditor(char* filename)
             LevelSubset::create(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
             le_level_subset->load(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
             leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
-            delete le_world;
-            le_world = new World(le_level_subset->name,1);
+            le_goto_level(1);
             subset_new_menu->get_item_by_id(MNID_SUBSETNAME).change_input("");
 
             Menu::set_current(subset_settings_menu);
@@ -340,7 +347,7 @@ int leveleditor(char* filename)
       }
     }
 
-    mouse_cursor->draw();
+    MouseCursor::current()->draw();
 
     if(done)
     {
@@ -361,13 +368,12 @@ int leveleditor(char* filename)
   return done;
 }
 
-int le_load_level(char *filename)
+int le_load_level_subset(char *filename)
 {
   le_level_subset->load(filename);
   leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
   le_level = 1;
-  delete le_world;
-  le_world = new World(filename,le_level);
+  le_goto_level(1);
 
   //GameSession* session = new GameSession(datadir + "/levels/" + le_level_subset->name + "/level1.stl", 0, ST_GL_DEMO_GAME);
 
@@ -434,22 +440,22 @@ void le_init_menus()
   level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0,MNID_BGIMG);
   level_settings_menu->additem(MN_STRINGSELECT,"Particle",0,0,MNID_PARTICLE);
   level_settings_menu->additem(MN_NUMFIELD,    "Length  ",0,0,MNID_LENGTH);
+  level_settings_menu->additem(MN_NUMFIELD,    "Height  ",0,0,MNID_HEIGHT);
   level_settings_menu->additem(MN_NUMFIELD,    "Time    ",0,0,MNID_TIME);
   level_settings_menu->additem(MN_NUMFIELD,    "Gravity ",0,0,MNID_GRAVITY);
   level_settings_menu->additem(MN_NUMFIELD,    "Bg-Img-Speed",0,0,MNID_BGSPEED);
-  level_settings_menu->additem(MN_NUMFIELD,    "Top Red    ",0,0,MNID_TopRed);
-  level_settings_menu->additem(MN_NUMFIELD,    "Top Green  ",0,0,MNID_TopGreen);
-  level_settings_menu->additem(MN_NUMFIELD,    "Top Blue   ",0,0,MNID_TopBlue);
-  level_settings_menu->additem(MN_NUMFIELD,    "Bottom Red ",0,0,MNID_BottomRed);
+  level_settings_menu->additem(MN_NUMFIELD,    "Top Red     ",0,0,MNID_TopRed);
+  level_settings_menu->additem(MN_NUMFIELD,    "Top Green   ",0,0,MNID_TopGreen);
+  level_settings_menu->additem(MN_NUMFIELD,    "Top Blue    ",0,0,MNID_TopBlue);
+  level_settings_menu->additem(MN_NUMFIELD,    "Bottom Red  ",0,0,MNID_BottomRed);
   level_settings_menu->additem(MN_NUMFIELD,    "Bottom Green",0,0,MNID_BottomGreen);
-  level_settings_menu->additem(MN_NUMFIELD,    "Bottom Blue",0,0,MNID_BottomBlue);
+  level_settings_menu->additem(MN_NUMFIELD,    "Bottom Blue ",0,0,MNID_BottomBlue);
   level_settings_menu->additem(MN_HL,"",0,0);
   level_settings_menu->additem(MN_ACTION,"Apply Changes",0,0,MNID_APPLY);
 
   select_tilegroup_menu->arrange_left = true;
   select_tilegroup_menu->additem(MN_LABEL,"Tilegroup",0,0);
   select_tilegroup_menu->additem(MN_HL,"",0,0);
-  select_tilegroup_menu->additem(MN_ACTION,"asd",0,0);
   std::set<TileGroup>* tilegroups = TileManager::tilegroups();
   int tileid = 1;
   for(std::set<TileGroup>::iterator it = tilegroups->begin();
@@ -516,9 +522,11 @@ int le_init()
   le_level_subset = new LevelSubset;
 
   le_world = NULL;
+  selected_game_object = NULL;
 
   active_tm = TM_IA;
   le_show_grid = true;
+  show_selections = true;
   scroll_x = 0;
 
   fire = DOWN;
@@ -537,10 +545,11 @@ int le_init()
 
   select_tilegroup_menu_effect.init(false);
   select_objects_menu_effect.init(false);
+  display_level_info.init(false);
 
   /* Load buttons */
   le_save_level_bt = new Button("/images/icons/save.png","Save level", SDLK_F6,screen->w-64,32);
-  le_exit_bt = new Button("/images/icons/exit.png","Exit", SDLK_F6,screen->w-32,32);
+  le_exit_bt = new Button("/images/icons/exit.png","Exit", SDLK_F10,screen->w-32,32);
   le_next_level_bt = new Button("/images/icons/up.png","Next level", SDLK_PAGEUP,screen->w-64,0);
   le_previous_level_bt = new Button("/images/icons/down.png","Previous level",SDLK_PAGEDOWN,screen->w-32,0);
   le_rubber_bt = new Button("/images/icons/rubber.png","Rubber",SDLK_DELETE,screen->w-32,48);
@@ -551,7 +560,13 @@ int le_init()
   le_move_left_bt = new Button("/images/icons/left.png","Move left",SDLK_LEFT,0,0);
   le_move_right_bt = new Button("/images/icons/right.png","Move right",SDLK_RIGHT,screen->w-80,0);
   le_tilegroup_bt = new Button("/images/icons/tilegroup.png","Select Tilegroup", SDLK_F7,screen->w-64,64);
-  le_objects_bt = new Button("/images/icons/objects.png","Select Objects", SDLK_F7,screen->w-64,80);
+  le_objects_bt = new Button("/images/icons/objects.png","Select Objects", SDLK_F8,screen->w-64,80);
+  le_object_select_bt = new Button("/images/icons/select-one.png","Select an Object", SDLK_s, screen->w - 64, screen->h-98);
+  le_object_properties_bt = new Button("/images/icons/properties.png","Edit object properties", SDLK_p, screen->w - 32, screen->h-98);
+  le_object_properties_bt->set_active(false);
+
+  mouse_select_object = new MouseCursor(datadir + "/images/status/select-cursor.png",1);
+  mouse_select_object->set_mid(16,16);
 
   le_tilemap_panel = new ButtonPanel(screen->w-64,screen->h-32,32,32);
   le_tilemap_panel->set_button_size(32,10);
@@ -595,6 +610,8 @@ void update_level_settings_menu()
 
   sprintf(str,"%d",le_world->get_level()->width);
   level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str);
+  sprintf(str,"%d",le_world->get_level()->height);
+  level_settings_menu->get_item_by_id(MNID_HEIGHT).change_input(str);
   sprintf(str,"%d",le_world->get_level()->time_left);
   level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
   sprintf(str,"%2.0f",le_world->get_level()->gravity);
@@ -647,7 +664,8 @@ void apply_level_settings_menu()
 
   le_world->get_level()->song_title = string_list_active(level_settings_menu->get_item_by_id(MNID_SONG).list);
 
-  le_world->get_level()->change_size(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
+  le_world->get_level()->change_width(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
+  le_world->get_level()->change_height(atoi(level_settings_menu->get_item_by_id(MNID_HEIGHT).input));
   le_world->get_level()->time_left = atoi(level_settings_menu->get_item_by_id(MNID_TIME).input);
   le_world->get_level()->gravity = atof(level_settings_menu->get_item_by_id(MNID_GRAVITY).input);
   le_world->get_level()->bkgd_speed = atoi(level_settings_menu->get_item_by_id(MNID_BGSPEED).input);
@@ -666,20 +684,37 @@ void save_subset_settings_menu()
   le_level_subset->save();
 }
 
-void le_goto_level(int levelnb)
+void le_unload_level()
 {
+  if(le_level_changed)
+  {
+    le_drawlevel();
+    le_drawinterface();
+    char str[1024];
+    sprintf(str,"Save changes to level %d of %s?",le_level,le_level_subset->name.c_str());
+    if(confirm_dialog(str))
+    {
+      le_world->get_level()->save(le_level_subset->name.c_str(),le_level);
+    }
+  }
+
   delete le_world;
+  le_level_changed = false;
+}
+
+void le_goto_level(int levelnb)
+{
+  le_unload_level();
   le_world = new World(le_level_subset->name, levelnb);
+  display_level_info.start(2500);
+  le_level = levelnb;
 }
 
 void le_quit(void)
 {
-  /*if(level_changed == true)
-    if(askforsaving() == CANCEL)
-      return;*/ //FIXME
-
   SDL_EnableKeyRepeat(0, 0);    // disables key repeating
 
+  le_unload_level();
   delete le_selection;
   delete leveleditor_menu;
   delete subset_load_menu;
@@ -702,6 +737,9 @@ void le_quit(void)
   delete le_tilegroup_bt;
   delete le_objects_bt;
   delete le_tilemap_panel;
+  delete le_object_select_bt;
+  delete le_object_properties_bt;
+  delete mouse_select_object;
 
   delete le_level_subset;
   le_level_subset = 0;
@@ -773,11 +811,13 @@ void le_drawinterface()
   if(show_minimap) // use_gl because the minimap isn't shown correctly in software mode. Any idea? FIXME Possible reasons: SDL_SoftStretch is a hack itsself || an alpha blitting issue SDL can't handle in software mode
     le_drawminimap();
 
-  if(le_selection_mode == CURSOR)
+  if(show_selections && MouseCursor::current() != mouse_select_object)
   {
-    if(le_current.IsTile())
-      le_selection->draw( cursor_x - pos_x, cursor_y);
-      }
+    if(le_selection_mode == CURSOR)
+    {
+      if(le_current.IsTile())
+        le_selection->draw( cursor_x - pos_x, cursor_y);
+    }
     else if(le_selection_mode == SQUARE)
     {
       int w, h;
@@ -790,6 +830,7 @@ void le_drawinterface()
       fillrect(selection.x1 - pos_x, selection.y1 + h, w, SELECT_W, SELECT_CLR);
       fillrect(selection.x1 - pos_x, selection.y1, SELECT_W, h, SELECT_CLR);
     }
+  }
 
 
   /* draw button bar */
@@ -801,12 +842,20 @@ void le_drawinterface()
     if(TileManager::instance()->get(le_current.tile)->editor_images.size() > 0)
       TileManager::instance()->get(le_current.tile)->editor_images[0]->draw( 19 * 32, 14 * 32);
   }
-  if(le_current.IsObject())
+  if(le_current.IsObject() && MouseCursor::current() != mouse_select_object)
   {
     le_current.obj->draw_on_screen(19 * 32, 14 * 32);
     le_current.obj->draw_on_screen(cursor_x,cursor_y);
   }
 
+  if(mouse_select_object && selected_game_object != NULL)
+  {
+    fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y,selected_game_object->base.width,3,255,0,0,255);
+    fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y,3,selected_game_object->base.height,255,0,0,255);
+    fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y+selected_game_object->base.height,selected_game_object->base.width,3,255,0,0,255);
+    fillrect(selected_game_object->base.x-pos_x+selected_game_object->base.width,selected_game_object->base.y,3,selected_game_object->base.height,255,0,0,255);
+  }
+
   if(le_world != NULL)
   {
     le_save_level_bt->draw();
@@ -833,11 +882,20 @@ void le_drawinterface()
 
     le_tilemap_panel->draw();
 
+    if(!cur_objects.empty())
+    {
+      le_object_select_bt->draw();
+      le_object_properties_bt->draw();
+    }
+
     sprintf(str, "%d/%d", le_level,le_level_subset->levels);
     white_text->drawf(str, (le_level_subset->levels < 10) ? -10 : 0, 16, A_RIGHT, A_TOP, 0);
 
     if(!le_help_shown)
       white_small_text->draw("F1 for Help", 10, 430, 1);
+
+    if(display_level_info.check())
+      white_text->drawf(le_world->get_level()->name.c_str(), 0, 0, A_HMIDDLE, A_TOP, 0);
   }
   else
   {
@@ -857,7 +915,7 @@ void le_drawlevel()
   /* Draw the real background */
   if(le_world->get_level()->bkgd_image[0] != '\0')
   {
-    s = (int)((float)pos_x * ((float)le_world->get_level()->bkgd_speed/60.)) % screen->w;
+    s = (int)((float)pos_x * ((float)le_world->get_level()->bkgd_speed/100.0f)) % screen->w;
     le_world->get_level()->img_bkgd->draw_part(s,0,0,0,
         le_world->get_level()->img_bkgd->w - s - 32, le_world->get_level()->img_bkgd->h);
     le_world->get_level()->img_bkgd->draw_part(0,0,screen->w - s - 32 ,0,s,
@@ -931,17 +989,79 @@ void le_drawlevel()
 
 void le_change_object_properties(GameObject *pobj)
 {
+  Surface* cap_screen = Surface::CaptureScreen();
   Menu* object_properties_menu = new Menu();
+  bool loop = true;
 
   object_properties_menu->additem(MN_LABEL,pobj->type() + " Properties",0,0);
   object_properties_menu->additem(MN_HL,"",0,0);
-  /*object_properties_menu->additem(MN_TEXTFIELD,"Title",0,0,MNID_SUBSETTITLE);
-  object_properties_menu->additem(MN_TEXTFIELD,"Description",0,0,MNID_SUBSETDESCRIPTION);
-  object_properties_menu->additem(MN_HL,"",0,0);
-  object_properties_menu->additem(MN_ACTION,"Save Changes",0,0,MNID_SUBSETSAVECHANGES);*/
+
+  if(pobj->type() == "BadGuy")
+  {
+    BadGuy* pbad = dynamic_cast<BadGuy*>(pobj);
+    object_properties_menu->additem(MN_STRINGSELECT,"Kind",0,0,1);
+    for(int i = 0; i < NUM_BadGuyKinds; ++i)
+    {
+      string_list_add_item(object_properties_menu->get_item_by_id(1).list,badguykind_to_string(static_cast<BadGuyKind>(i)).c_str());
+      if(pbad->kind == i)
+        object_properties_menu->get_item_by_id(1).list->active_item = i;
+    }
+    object_properties_menu->additem(MN_TOGGLE,"StayOnPlatform",pbad->stay_on_platform,0,2);
+  }
+
   object_properties_menu->additem(MN_HL,"",0,0);
-  object_properties_menu->additem(MN_BACK,"Apply",0,0);
+  object_properties_menu->additem(MN_ACTION,"Ok",0,0,3);
+
+  Menu::set_current(object_properties_menu);
 
+  while(loop)
+  {
+    SDL_Event event;
+
+    while (SDL_PollEvent(&event))
+    {
+      object_properties_menu->event(event);
+    }
+
+    cap_screen->draw(0,0);
+
+    object_properties_menu->draw();
+    object_properties_menu->action();
+
+    switch (object_properties_menu->check())
+    {
+    case 3:
+      if(pobj->type() == "BadGuy")
+      {
+        BadGuy* pbad = dynamic_cast<BadGuy*>(pobj);
+        pbad->kind =  badguykind_from_string(string_list_active(object_properties_menu->get_item_by_id(1).list));
+        pbad->stay_on_platform = object_properties_menu->get_item_by_id(2).toggled;
+       int i = 0;
+       std::list<BadGuy*>::iterator it;
+        for(it = le_world->bad_guys.begin(); it != le_world->bad_guys.end(); ++it, ++i)
+          if((*it) == pbad)
+            break;
+        le_world->get_level()->badguy_data[i].kind = pbad->kind;
+       le_world->get_level()->badguy_data[i].stay_on_platform = pbad->stay_on_platform;
+       delete (*it);
+       (*it) = new BadGuy(le_world->get_level()->badguy_data[i].x,le_world->get_level()->badguy_data[i].y,le_world->get_level()->badguy_data[i].kind,le_world->get_level()->badguy_data[i].stay_on_platform);
+      }
+      loop = false;
+      break;
+    default:
+      break;
+    }
+
+    if(Menu::current() == NULL)
+      loop = false;
+
+    mouse_cursor->draw();
+    flipscreen();
+    SDL_Delay(25);
+  }
+
+  delete cap_screen;
+  Menu::set_current(0);
   delete object_properties_menu;
 }
 
@@ -961,7 +1081,7 @@ void le_checkevents()
     {
       Menu::current()->event(event);
       if(!le_world && !Menu::current())
-      Menu::set_current(leveleditor_menu);
+        Menu::set_current(leveleditor_menu);
     }
     else
     {
@@ -982,7 +1102,7 @@ void le_checkevents()
           {
           case SDLK_ESCAPE:
             Menu::set_current(leveleditor_menu);
-           break;
+            break;
           case SDLK_LEFT:
             if(fire == DOWN)
               cursor_x -= KEY_CURSOR_SPEED;
@@ -1110,13 +1230,14 @@ void le_checkevents()
             }
           }
           break;
-        case SDL_QUIT: // window closed
-          done = 1;
-          break;
         default:
           break;
         }
       }
+      else if(event.type == SDL_QUIT) /* window closing */
+      {
+      done = 1;
+      }
     }
 
     if(le_world != NULL)
@@ -1146,7 +1267,7 @@ void le_checkevents()
           {
             if(le_level < le_level_subset->levels)
             {
-              le_goto_level(++le_level);
+              le_goto_level(le_level+1);
             }
             else
             {
@@ -1156,7 +1277,7 @@ void le_checkevents()
               if(confirm_dialog(str))
               {
                 new_lev.init_defaults();
-                new_lev.save(le_level_subset->name.c_str(),++le_level);
+                new_lev.save(le_level_subset->name.c_str(),le_level+1);
                 le_level_subset->levels = le_level;
                 le_goto_level(le_level);
               }
@@ -1166,12 +1287,28 @@ void le_checkevents()
           if(le_previous_level_bt->get_state() == BUTTON_CLICKED)
           {
             if(le_level > 1)
-              le_goto_level(--le_level);
+              le_goto_level(le_level -1);
           }
           le_rubber_bt->event(event);
           if(le_rubber_bt->get_state() == BUTTON_CLICKED)
             le_current.Tile(0);
 
+          if(!cur_objects.empty())
+          {
+            le_object_select_bt->event(event);
+            if(le_object_select_bt->get_state() == BUTTON_CLICKED)
+            {
+              MouseCursor::set_current(mouse_select_object);
+            }
+
+            le_object_properties_bt->event(event);
+            if(le_object_properties_bt->get_state() == BUTTON_CLICKED)
+            {
+              le_change_object_properties(selected_game_object);
+            }
+          }
+
+
           if(le_selection_mode == SQUARE)
           {
             le_select_mode_one_bt->event(event);
@@ -1334,23 +1471,69 @@ void le_checkevents()
       {
         if(le_mouse_pressed[LEFT])
         {
-          if(le_current.IsTile())
-            le_change(cursor_x, cursor_y, active_tm, le_current.tile);
+          if(MouseCursor::current() != mouse_select_object)
+          {
+            if(le_current.IsTile())
+              le_change(cursor_x, cursor_y, active_tm, le_current.tile);
+          }
         }
         else if(le_mouse_clicked[LEFT])
         {
-          if(le_current.IsObject())
+          if(MouseCursor::current() == mouse_select_object)
           {
-            std::string type = le_current.obj->type();
-            if(type == "BadGuy")
+            int i = 0;
+            bool object_got_hit = false;
+            base_type cursor_base;
+           if(le_current.IsTile())
+           {
+            cursor_base.x = cursor_x;
+            cursor_base.y = cursor_y;
+           }
+           else if(le_current.IsObject())
+           {
+            cursor_base.x = cursor_x + pos_x;
+            cursor_base.y = cursor_y + pos_x;      
+           }
+            cursor_base.width = 32;
+            cursor_base.height = 32;
+
+            for(std::list<BadGuy*>::iterator it = le_world->bad_guys.begin(); it != le_world->bad_guys.end(); ++it, ++i)
+              if(rectcollision(cursor_base,(*it)->base))
+              {
+                selected_game_object = (*it);
+                object_got_hit = true;
+                break;
+              }
+
+            if(!object_got_hit)
             {
-              BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj);
+              selected_game_object = NULL;
+              le_object_properties_bt->set_active(false);
+            }
+            else
+              le_object_properties_bt->set_active(true);
+
+            MouseCursor::set_current(mouse_cursor);
 
-              le_world->bad_guys.push_back(new BadGuy(cursor_x+scroll_x, cursor_y,pbadguy->kind,false));
-              le_world->get_level()->badguy_data.push_back(le_world->bad_guys.back());
+          }
+          else
+          {
+            if(le_current.IsObject())
+            {
+              le_level_changed  = true;
+              std::string type = le_current.obj->type();
+              if(type == "BadGuy")
+              {
+                BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj);
+
+                le_world->bad_guys.push_back(new BadGuy(cursor_x+scroll_x, cursor_y,pbadguy->kind,false));
+                le_world->get_level()->badguy_data.push_back(le_world->bad_guys.back());
+              }
             }
           }
+         
           le_mouse_clicked[LEFT] = false;
+
         }
       }
     }
@@ -1440,7 +1623,7 @@ void le_change(float x, float y, int tm, unsigned int c)
     int x1, x2, y1, y2;
     unsigned int i = 0;
 
-    /*  level_changed = true; */
+    le_level_changed = true;
 
     switch(le_selection_mode)
     {
@@ -1546,6 +1729,7 @@ void le_showhelp()
   bool tmp_show_grid = le_show_grid;
   int temp_le_selection_mode = le_selection_mode;
   le_selection_mode = NONE;
+  show_selections = true;
   le_show_grid = false;
   le_help_shown = true;
 
@@ -1565,6 +1749,7 @@ void le_showhelp()
                    "the left mouse button over the map",
                    "to \"paint\" your selection over",
                    "the screen.",
+                   "",
                    "There are three layers for painting",
                    "tiles upon, Background layer,",
                    "the Interactive layer, and the",
@@ -1585,24 +1770,36 @@ void le_showhelp()
                     "the Interactive layer are those",
                     "which actually effect Tux in the",
                     "game.",
+                    "",
                     "Click the objects menu to put ",
                     "bad guys and other objects in the",
                     "game. Unlike placing tiles, you",
                     "cannot \"paint\" enemies. Click",
                     "them onto the screen one at a time.",
+                    "",
                     "To change the settings of your",
                     "level, click the button with the",
                     "screwdriver and wrench. From here",
                     "you can change the background,",
-                    "music, length of the level, and more.",
-                    "You may have more than one levelset.",
+                    "music, length of the level,",
+                    "and more."
+                  };
+
+  char *text3[] = {
+
+                    " - Supertux level editor tutorial - ",
+                    "",
+                    "You may have more than one level.",
                     "Pressing the up and down buttons",
-                    "above the button bar lets you choose",
-                    "which one you are working on.",
+                    "above the button bar lets you",
+                    "choose which one you are working on.",
+                    "",
                     "If you would like to speed up your",
                     "level editing, a useful trick is",
-                    "to learn the keyboard shortcuts. They",
-                    "are easy to learn, just right-",
+                    "to learn the keyboard shortcuts.",
+                    "They are easy to learn, just right-",
+                    "click on the buttons.",
+                    "",
                     "Have fun making levels! If you make",
                     "some good ones, send them to us on",
                     "the SuperTux mailing list!",
@@ -1610,12 +1807,13 @@ void le_showhelp()
                   };
 
 
+
   blue_text->drawf("- Help -", 0, 30, A_HMIDDLE, A_TOP, 2);
 
   for(i = 0; i < sizeof(text)/sizeof(char *); i++)
     white_text->draw(text[i], 5, 80+(i*white_text->h), 1);
 
-  gold_text->drawf("Press Any Key to Continue - Page 1/2", 0, 0, A_LEFT, A_BOTTOM, 1);
+  gold_text->drawf("Press Anything to Continue - Page 1/3", 0, 0, A_LEFT, A_BOTTOM, 1);
 
   flipscreen();
 
@@ -1636,7 +1834,28 @@ void le_showhelp()
   for(i = 0; i < sizeof(text2)/sizeof(char *); i++)
     white_text->draw(text2[i], 5, 80+(i*white_text->h), 1);
 
-  gold_text->drawf("Press Any Key to Continue - Page 2/2", 0, 0, A_LEFT, A_BOTTOM, 1);
+  gold_text->drawf("Press Anything to Continue - Page 2/3", 0, 0, A_LEFT, A_BOTTOM, 1);
+
+  flipscreen();
+
+  done_ = 0;
+
+  while(done_ == 0)
+  {
+    done_ = wait_for_event(event);
+    SDL_Delay(50);
+  }
+
+  drawgradient(Color(0,0,0), Color(255,255,255));
+  le_drawinterface();
+
+
+  blue_text->drawf("- Help -", 0, 30, A_HMIDDLE, A_TOP, 2);
+
+  for(i = 0; i < sizeof(text3)/sizeof(char *); i++)
+    white_text->draw(text3[i], 5, 80+(i*white_text->h), 1);
+
+  gold_text->drawf("Press Anything to Continue - Page 3/3", 0, 0, A_LEFT, A_BOTTOM, 1);
 
   flipscreen();
 
@@ -1648,7 +1867,8 @@ void le_showhelp()
     SDL_Delay(50);
   }
 
+  show_selections = true;
   le_show_grid = tmp_show_grid;
-  le_help_shown = false;
   le_selection_mode = temp_le_selection_mode;
+  le_help_shown = false;
 }