From 0ea023310b93c89f0e24873afb8726f38c140e45 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 20 Apr 2004 11:37:10 +0000 Subject: [PATCH] - fixed level editor menus a bit (still not 100% working) - added resetpoint saving to Level SVN-Revision: 587 --- src/level.cpp | 7 +++++++ src/leveleditor.cpp | 19 ++++++++++--------- src/setup.cpp | 29 ++++++++++++++++++----------- src/special.cpp | 21 ++++++++++++++------- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/src/level.cpp b/src/level.cpp index c22db5e52..43fd6a46a 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -560,6 +560,13 @@ Level::save(const char * subset, int level) } fprintf( fi,")\n"); + + fprintf( fi,"(reset-points\n"); + for(std::vector::iterator i = reset_points.begin(); + i != reset_points.end(); ++i) + fprintf( fi,"(point (x %d) (y %d))\n",i->x, i->y); + fprintf( fi,")\n"); + fprintf( fi,"(objects\n"); for(std::vector::iterator it = badguy_data.begin(); diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp index fd4893ae0..92c8ec57b 100644 --- a/src/leveleditor.cpp +++ b/src/leveleditor.cpp @@ -213,12 +213,13 @@ int leveleditor(int levelnb) /* draw editor interface */ le_drawinterface(); - if(Menu::current()) + Menu* menu = Menu::current(); + if(menu) { - Menu::current()->draw(); - Menu::current()->action(); + menu->draw(); + menu->action(); - if(Menu::current() == leveleditor_menu) + if(menu == leveleditor_menu) { switch (leveleditor_menu->check()) { @@ -233,7 +234,7 @@ int leveleditor(int levelnb) break; } } - else if(Menu::current() == level_settings_menu) + else if(menu == level_settings_menu) { switch (level_settings_menu->check()) { @@ -247,7 +248,7 @@ int leveleditor(int levelnb) break; } } - else if(Menu::current() == select_tilegroup_menu) + else if(menu == select_tilegroup_menu) { int it = -1; switch (it = select_tilegroup_menu->check()) @@ -263,7 +264,7 @@ int leveleditor(int levelnb) break; } } - else if(Menu::current() == subset_load_menu) + else if(menu == subset_load_menu) { switch (i = subset_load_menu->check()) { @@ -292,7 +293,7 @@ int leveleditor(int levelnb) break; } } - else if(Menu::current() == subset_new_menu) + else if(menu == subset_new_menu) { if(subset_new_menu->item[2].input[0] == '\0') subset_new_menu->item[3].kind = MN_DEACTIVE; @@ -324,7 +325,7 @@ int leveleditor(int levelnb) } } } - else if(Menu::current() == subset_settings_menu) + else if(menu == subset_settings_menu) { if(le_level_subset.title.compare(subset_settings_menu->item[2].input) == 0 && le_level_subset.description.compare(subset_settings_menu->item[3].input) == 0 ) subset_settings_menu->item[5].kind = MN_DEACTIVE; diff --git a/src/setup.cpp b/src/setup.cpp index 5389142e9..dca1cf2b2 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -1,14 +1,21 @@ -/* - setup.c - - Super Tux - Setup - - by Bill Kendrick - bill@newbreedsoftware.com - http://www.newbreedsoftware.com/supertux/ - - April 11, 2000 - March 15, 2004 -*/ +// $Id$ +// +// SuperTux - A Jump'n Run +// Copyright (C) 2000 Bill Kendrick +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include diff --git a/src/special.cpp b/src/special.cpp index 752d60f16..8016dc549 100644 --- a/src/special.cpp +++ b/src/special.cpp @@ -1,14 +1,21 @@ +// $Id$ // -// C Implementation: special +// SuperTux - A Jump'n Run +// Copyright (C) 2003 Tobias Glaesser // -// Description: -// -// -// Author: Tobias Glaesser & Bill Kendrick, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. // +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "SDL.h" -- 2.11.0