[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.12,1.13 editor_groundpiece_obj.hxx,1.9,1.10 groundpiece_window.cxx,1.8,1.9 object_manager.cxx,1.33,1.34 object_selector.cxx,1.20,1.21 object_selector.hxx,1.10,1.11

[grumbel]

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

Modified Files:
        editor_groundpiece_obj.cxx editor_groundpiece_obj.hxx 
        groundpiece_window.cxx object_manager.cxx object_selector.cxx 
        object_selector.hxx 
Log Message:
- some groundpiece splitting/moving

Index: editor_groundpiece_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editor_groundpiece_obj.cxx  11 Sep 2002 12:45:58 -0000      1.12
+++ editor_groundpiece_obj.cxx  16 Sep 2002 20:31:09 -0000      1.13
@@ -38,7 +38,7 @@
 EditorGroundpieceObj::status_line()
 {
   char str[1024];  
-  std::string type_name = GroundpieceData::type_to_string(gptype);
+  std::string type_name = Groundtype::type_to_string(gptype);
   
   snprintf (str, 1024, "Groundpiece: %s Type: %s",
           desc.res_name.c_str(), type_name.c_str());

Index: editor_groundpiece_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editor_groundpiece_obj.hxx  11 Sep 2002 12:45:58 -0000      1.9
+++ editor_groundpiece_obj.hxx  16 Sep 2002 20:31:09 -0000      1.10
@@ -21,10 +21,10 @@
 #define HEADER_PINGUS_EDITOR_EDITOR_GROUNDPIECE_OBJ_HXX
 
 #include "sprite_editorobj.hxx"
-#include "../groundpiece_data.hxx"
+#include "../worldobjsdata/groundpiece_data.hxx"
 
 ///
-class EditorGroundpieceObj : public GroundpieceData,
+class EditorGroundpieceObj : public WorldObjsData::GroundpieceData,
                             public SpriteEditorObj
 {
 public:

Index: groundpiece_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/groundpiece_window.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- groundpiece_window.cxx      11 Sep 2002 12:45:58 -0000      1.8
+++ groundpiece_window.cxx      16 Sep 2002 20:31:09 -0000      1.9
@@ -31,6 +31,8 @@
  [ok] [cancel]
 *************************/
 
+using namespace WorldObjsData;
+
 namespace EditorNS {
 
 GroundpieceWindow::GroundpieceWindow (CL_Component* parent,  
EditorGroundpieceObj* arg_data)
@@ -73,16 +75,16 @@
 {
   switch (data->gptype)
     {
-    case GroundpieceData::GP_SOLID:
+    case Groundtype::GP_SOLID:
       solid_radiobutton.set_checked (true);
       break;
-    case GroundpieceData::GP_BRIDGE:
+    case Groundtype::GP_BRIDGE:
       bridge_radiobutton.set_checked (true);
       break;
-    case GroundpieceData::GP_TRANSPARENT:
+    case Groundtype::GP_TRANSPARENT:
       transparent_radiobutton.set_checked (true);
       break;
-    case GroundpieceData::GP_GROUND:
+    case Groundtype::GP_GROUND:
       ground_radiobutton.set_checked (true);
       break;
     default:
@@ -97,13 +99,13 @@
   if (EditorObj::get_editor ()->get_object_manager ()->has_object (data))
     {
       if (ground_radiobutton.is_checked ())
-       data->gptype = GroundpieceData::GP_GROUND;
+       data->gptype = Groundtype::GP_GROUND;
       else if (transparent_radiobutton.is_checked ())
-       data->gptype = GroundpieceData::GP_TRANSPARENT;
+       data->gptype = Groundtype::GP_TRANSPARENT;
       else if (solid_radiobutton.is_checked ())
-       data->gptype = GroundpieceData::GP_SOLID;
+       data->gptype = Groundtype::GP_SOLID;
       else if (bridge_radiobutton.is_checked ())
-       data->gptype = GroundpieceData::GP_BRIDGE;
+       data->gptype = Groundtype::GP_BRIDGE;
       else
        {
          std::cout << "Unhandled" << std::endl;

Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- object_manager.cxx  16 Sep 2002 15:47:35 -0000      1.33
+++ object_manager.cxx  16 Sep 2002 20:31:09 -0000      1.34
@@ -34,6 +34,7 @@
 
 using namespace std;
 using namespace Actions;
+using namespace WorldObjsData;
 
 namespace EditorNS {
 

Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- object_selector.cxx 16 Sep 2002 17:17:17 -0000      1.20
+++ object_selector.cxx 16 Sep 2002 20:31:09 -0000      1.21
@@ -130,10 +130,10 @@
 }
 
 EditorObjLst
-ObjectSelector::get_groundpiece(const GroundpieceData::GPType & gptype)
+ObjectSelector::get_groundpiece(const Groundtype::GPType & gptype)
 {
   GroundpieceData data;
-  std::string datafile = std::string("groundpieces-") + 
GroundpieceData::type_to_string (gptype);
+  std::string datafile = std::string("groundpieces-") + 
Groundtype::type_to_string (gptype);
 
   data.pos = pos;
 
@@ -405,19 +405,19 @@
          return get_trap();
 
        case CL_KEY_B:
-         return get_groundpiece(GroundpieceData::GP_BRIDGE);
+         return get_groundpiece(Groundtype::GP_BRIDGE);
          
        case CL_KEY_R:
-         return get_groundpiece(GroundpieceData::GP_REMOVE);
+         return get_groundpiece(Groundtype::GP_REMOVE);
          
        case CL_KEY_S:
-         return get_groundpiece(GroundpieceData::GP_SOLID);
+         return get_groundpiece(Groundtype::GP_SOLID);
 
        case CL_KEY_G:
-         return get_groundpiece(GroundpieceData::GP_GROUND);
+         return get_groundpiece(Groundtype::GP_GROUND);
 
        case CL_KEY_N:
-         return get_groundpiece(GroundpieceData::GP_TRANSPARENT);
+         return get_groundpiece(Groundtype::GP_TRANSPARENT);
 
        case CL_KEY_H:
          return get_hotspot("hotspots");

Index: object_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- object_selector.hxx 11 Sep 2002 12:45:58 -0000      1.10
+++ object_selector.hxx 16 Sep 2002 20:31:09 -0000      1.11
@@ -23,8 +23,9 @@
 #include <config.h>
 #include <map>
 #include <list>
-#include "../groundpiece_data.hxx"
+#include "../groundtype.hxx"
 #include "surface_selector.hxx"
+#include "editorobj.hxx"
 
 class EditorObj;
 
@@ -58,7 +59,7 @@
   
   EditorObjLst get_obj(int, int);
   EditorObjLst get_trap();
-  EditorObjLst get_groundpiece(const GroundpieceData::GPType & gptype);
+  EditorObjLst get_groundpiece(const Groundtype::GPType& gptype);
   EditorObjLst get_hotspot(const std::string&);
   EditorObjLst get_entrance();
   EditorObjLst get_exit();