[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.16,1.17

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv1292/editor

Modified Files:
        object_selector.cxx 
Log Message:
splitted SolidColorBackground


Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- object_selector.cxx 14 Sep 2002 19:06:34 -0000      1.16
+++ object_selector.cxx 15 Sep 2002 09:54:33 -0000      1.17
@@ -41,9 +41,10 @@
 
 #include "../backgrounds/starfield_background.hxx"
 #include "../backgrounds/surface_background_data.hxx"
-#include "../backgrounds/solidcolor_background.hxx"
 #include "../backgrounds/thunderstorm_background.hxx"
 
+#include "../worldobjsdata/solid_color_background_data.hxx"
+
 #include "../editorobjs/bumper_obj.hxx"
 #include "../editorobjs/conveyor_belt_obj.hxx"
 #include "../editorobjs/fake_exit_obj.hxx"
@@ -59,6 +60,7 @@
 
 using namespace std;
 using namespace EditorObjs;
+using namespace WorldObjsData;
 
 namespace EditorNS {
 
@@ -375,7 +377,6 @@
 
   CL_Display::clear_display();
   font->print_left(20, 20, _("Which object do you want?"));
-  //font->print_left(20, 50, _("t - Trap"));
   font->print_left(20, 70, _("g - Groundpiece (ground)"));
   font->print_left(20, 90, _("s - Groundpiece (solid)"));
   font->print_left(20,110, _("b - Groundpiece (bridge)"));
@@ -524,15 +525,15 @@
          exit_loop = true;
          break;
        case CL_KEY_2:
-         lst = SolidColorBackgroundData ().create_EditorObj ();
+         lst = SolidColorBackgroundData().create_EditorObj();
          exit_loop = true;
          break;
        case CL_KEY_3:
-         lst = StarfieldBackgroundData ().create_EditorObj ();
+         lst = StarfieldBackgroundData().create_EditorObj();
          exit_loop = true;
          break;
        case CL_KEY_4:
-         lst = ThunderstormBackgroundData ().create_EditorObj ();
+         lst = ThunderstormBackgroundData ().create_EditorObj();
          exit_loop = true;
          break;
        }
@@ -541,7 +542,7 @@
 }
 
 std::string
-ObjectSelector::select_surface(vector<surface_obj>& sur_list)
+ObjectSelector::select_surface (vector<surface_obj>& sur_list)
 {
   std::cout << "ObjectSelector: Selecting surface out of: " << sur_list.size 
() << std::endl;
   SurfaceSelector sur_selector(&sur_list);
@@ -550,7 +551,7 @@
 }
 
 std::string
-ObjectSelector::select_surface(const std::string & resource_file)
+ObjectSelector::select_surface (const std::string & resource_file)
 {
   std::string str;
   bool datafile_loaded;