From: Ingo Ruhnke Date: Thu, 6 May 2004 20:02:27 +0000 (+0000) Subject: - made supertux g++295 friendly X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0a46f01c17567cbc7ed88777e59d693c33d2ff12;p=supertux.git - made supertux g++295 friendly SVN-Revision: 1012 --- diff --git a/src/level.cpp b/src/level.cpp index b062f5745..3df8c8946 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -626,10 +626,10 @@ Level::cleanup() } reset_points.clear(); - name.clear(); - author.clear(); - song_title.clear(); - bkgd_image.clear(); + name = ""; + author = ""; + song_title = ""; + bkgd_image = ""; badguy_data.clear(); } diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp index b12c6c2e0..5d6d15b61 100644 --- a/src/leveleditor.cpp +++ b/src/leveleditor.cpp @@ -298,7 +298,7 @@ int leveleditor(char* filename) 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 @@ int leveleditor(char* filename) 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 @@ void le_checkevents() } } - 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 @@ void le_checkevents() else cur_tilegroup = tilegroups_map.rbegin()->first; - cur_objects.clear(); + cur_objects = ""; break; default: break; @@ -1287,7 +1287,7 @@ void le_checkevents() 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 @@ void le_checkevents() 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 @@ void le_checkevents() else cur_objects = objects_map.rbegin()->first; - cur_tilegroup.clear(); + cur_tilegroup = ""; break; break; default: