super-tux-commit

[Ingo R. <gr...@us...>]

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

Modified Files:
	level.cpp leveleditor.cpp 
Log Message:
- made supertux g++295 friendly

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- level.cpp	3 May 2004 23:06:19 -0000	1.64
+++ level.cpp	6 May 2004 20:02:26 -0000	1.65
@@ -626,10 +626,10 @@
     }
 
   reset_points.clear();
-  name.clear();
-  author.clear();
-  song_title.clear();
-  bkgd_image.clear();
+  name = "";
+  author = "";
+  song_title = "";
+  bkgd_image = "";
 
   badguy_data.clear();
 }

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- leveleditor.cpp	6 May 2004 19:55:39 -0000	1.90
+++ leveleditor.cpp	6 May 2004 20:02:27 -0000	1.91
@@ -298,7 +298,7 @@
             cur_tilegroup
             = select_tilegroup_menu->get_item_by_id(it).text;
             Menu::set_current(0);
-            cur_objects.clear();
+            cur_objects = "";
 
           }
           break;
@@ -313,7 +313,7 @@
           if(it >= 0)
           {
             cur_objects = select_objects_menu->get_item_by_id(it).text;
-            cur_tilegroup.clear();
+            cur_tilegroup = "";
 
             Menu::set_current(0);
           }
@@ -1253,14 +1253,14 @@
               }
             }
 
-            cur_objects.clear();
+            cur_objects = "";
             break;
           case BUTTON_WHEELDOWN:
             it = tilegroups_map.find(cur_tilegroup);
             if(it == tilegroups_map.begin())
             {
               cur_tilegroup = tilegroups_map.rbegin()->first;
-              cur_objects.clear();
+              cur_objects = "";
               break;
             }
             if(--it != --tilegroups_map.begin())
@@ -1268,7 +1268,7 @@
             else
               cur_tilegroup = tilegroups_map.rbegin()->first;
 
-            cur_objects.clear();
+            cur_objects = "";
             break;
           default:
             break;
@@ -1287,7 +1287,7 @@
             if(it == objects_map.end())
             {
               cur_objects = objects_map.begin()->first;
-              cur_tilegroup.clear();
+              cur_tilegroup = "";
               break;
             }
             if(++it != objects_map.end())
@@ -1295,14 +1295,14 @@
             else
               cur_objects = objects_map.begin()->first;
 
-            cur_tilegroup.clear();
+            cur_tilegroup = "";
             break;
           case BUTTON_WHEELDOWN:
             it = objects_map.find(cur_objects);
             if(it == objects_map.begin())
             {
               cur_objects = objects_map.rbegin()->first;
-              cur_tilegroup.clear();
+              cur_tilegroup = "";
               break;
             }
             if(--it != --objects_map.begin())
@@ -1310,7 +1310,7 @@
             else
               cur_objects = objects_map.rbegin()->first;
 
-            cur_tilegroup.clear();
+            cur_tilegroup = "";
             break;
             break;
           default: