pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src ButtonPanel.cc,1.34,1.35 ButtonPanel.


From: torangan
Subject: [Pingus-CVS] CVS: Games/Pingus/src ButtonPanel.cc,1.34,1.35 ButtonPanel.hh,1.18,1.19 Client.cc,1.87,1.88 Client.hh,1.41,1.42 EditorHotspot.hh,1.4,1.5 EntranceData.cc,1.11,1.12 ExitData.cc,1.14,1.15 LiquidData.cc,1.12,1.13 MultiplayerClientChild.cc,1.16,1.17 MultiplayerClientChild.hh,1.11,1.12 MultiplayerGame.cc,1.11,1.12 PingusMain.cc,1.64,1.65 PingusMenu.cc,1.57,1.58 PingusMenu.hh,1.25,1.26 Story.cc,1.16,1.17 SurfaceButton.cc,1.40,1.41 SurfaceButton.hh,1.24,1.25 TrapData.cc,1.14,1.15 WorldObjData.hh,1.14,1.15 WorldObjGroupData.cc,1.7,1.8 XMLPLF.cc,1.45,1.46
Date: 12 Jun 2002 14:37:39 -0000

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

Modified Files:
        ButtonPanel.cc ButtonPanel.hh Client.cc Client.hh 
        EditorHotspot.hh EntranceData.cc ExitData.cc LiquidData.cc 
        MultiplayerClientChild.cc MultiplayerClientChild.hh 
        MultiplayerGame.cc PingusMain.cc PingusMenu.cc PingusMenu.hh 
        Story.cc SurfaceButton.cc SurfaceButton.hh TrapData.cc 
        WorldObjData.hh WorldObjGroupData.cc XMLPLF.cc 
Log Message:
replaced shared_ptr<> with normal pointers


Index: ButtonPanel.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ButtonPanel.cc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ButtonPanel.cc      11 Jun 2002 09:55:12 -0000      1.34
+++ ButtonPanel.cc      12 Jun 2002 14:37:36 -0000      1.35
@@ -30,7 +30,6 @@
 #include "World.hh"
 #include "PLF.hh"
 
-using boost::shared_ptr;
 CL_Surface ButtonPanel::button_cap;
 
 ButtonPanel::ButtonPanel(PLF* plf, Controller* arg_controller,
@@ -56,19 +55,14 @@
 
   for(std::vector<ActionData>::size_type i = 0; i < buttons_data.size(); i++)
     {
-      a_buttons.push_back(shared_ptr<ActionButton>(new VerticalActionButton
-                                                  (x_pos,
-                                                   i * 38 + y_pos,
+      a_buttons.push_back(new VerticalActionButton (x_pos, i * 38 + y_pos,
                                                    buttons_data[i].name,
-                                                   controller->get_owner ())));
+                                                   controller->get_owner ()));
     }
 
-  armageddon = shared_ptr<ArmageddonButton>(new 
ArmageddonButton(CL_Display::get_width() - 40, 
-                                                                
CL_Display::get_height() - 62));
-  forward    = shared_ptr<ForwardButton>(new 
ForwardButton(CL_Display::get_width() - 40 * 2,
-                                                          
CL_Display::get_height() - 62));
-  pause      = shared_ptr<PauseButton>(new PauseButton(CL_Display::get_width() 
- 40 * 3,
-                                                      CL_Display::get_height() 
- 62));
+  armageddon = new ArmageddonButton(CL_Display::get_width() - 40,     
CL_Display::get_height() - 62);
+  forward    = new ForwardButton   (CL_Display::get_width() - 40 * 2, 
CL_Display::get_height() - 62);
+  pause      = new PauseButton     (CL_Display::get_width() - 40 * 3, 
CL_Display::get_height() - 62);
 
   forward->pressed = false;
   pause->pressed   = false;
@@ -81,6 +75,14 @@
 
 ButtonPanel::~ButtonPanel()
 {
+  for (AButtonIter it = a_buttons.begin(); it != a_buttons.end(); ++it) 
+  {
+    delete *it;
+  }
+  
+  delete armageddon;
+  delete forward;
+  delete pause;
 }
 
 void

Index: ButtonPanel.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ButtonPanel.hh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ButtonPanel.hh      10 Jun 2002 15:01:23 -0000      1.18
+++ ButtonPanel.hh      12 Jun 2002 14:37:36 -0000      1.19
@@ -21,7 +21,6 @@
 #define BUTTON_PANEL_HH
 
 #include <vector>
-#include "boost/smart_ptr.hpp"
 
 #include "GuiObj.hh"
 #include "ActionButton.hh"
@@ -37,12 +36,12 @@
 private:
   friend class ClientEvent;
 
-  std::vector<boost::shared_ptr<ActionButton> > a_buttons;
-  typedef std::vector<boost::shared_ptr<ActionButton> >::iterator AButtonIter;
+  std::vector<ActionButton*> a_buttons;
+  typedef std::vector<ActionButton*>::iterator AButtonIter;
   AButtonIter  pressed_button;
-  boost::shared_ptr<ArmageddonButton> armageddon;
-  boost::shared_ptr<ForwardButton>    forward;
-  boost::shared_ptr<PauseButton>      pause;
+  ArmageddonButton* armageddon;
+  ForwardButton*    forward;
+  PauseButton*      pause;
 
   Server* server;
   Client* client;

Index: Client.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.cc,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- Client.cc   11 Jun 2002 09:55:12 -0000      1.87
+++ Client.cc   12 Jun 2002 14:37:36 -0000      1.88
@@ -48,8 +48,6 @@
 #include "Server.hh"
 #include "ButtonPanel.hh"
 
-using boost::shared_ptr;
-
 Client::Client(Controller* arg_controller, Server * s)
   : // plf ?
     // result ?

Index: Client.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Client.hh,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Client.hh   10 Jun 2002 13:03:34 -0000      1.41
+++ Client.hh   12 Jun 2002 14:37:36 -0000      1.42
@@ -23,7 +23,6 @@
 #include <ClanLib/Signals/slot.h>
 #include <ClanLib/Display/Input/inputdevice.h>
 #include <vector>
-#include "boost/smart_ptr.hpp"
 
 #include "Result.hh"
 

Index: EditorHotspot.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EditorHotspot.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EditorHotspot.hh    8 Jun 2002 21:43:36 -0000       1.4
+++ EditorHotspot.hh    12 Jun 2002 14:37:36 -0000      1.5
@@ -23,6 +23,7 @@
 #include "HotspotData.hh"
 #include "StringConverter.hh"
 #include "editor/SpriteEditorObj.hh" 
+#include "boost/smart_ptr.hpp"
 
 class EditorHotspot : public HotspotData,
                      public SpriteEditorObj

Index: EntranceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- EntranceData.cc     11 Jun 2002 18:28:31 -0000      1.11
+++ EntranceData.cc     12 Jun 2002 14:37:36 -0000      1.12
@@ -24,6 +24,7 @@
 #include "PingusError.hh"
 #include "StringConverter.hh"
 #include "XMLhelper.hh"
+#include "boost/smart_ptr.hpp"
 
 EntranceData::EntranceData (xmlDocPtr doc, xmlNodePtr cur)
 {

Index: ExitData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ExitData.cc 11 Jun 2002 18:28:31 -0000      1.14
+++ ExitData.cc 12 Jun 2002 14:37:36 -0000      1.15
@@ -22,6 +22,7 @@
 #include "editor/PLFObj.hh"
 #include "StringConverter.hh"
 #include "XMLhelper.hh"
+#include "boost/smart_ptr.hpp"
 
 ExitData::ExitData (xmlDocPtr doc, xmlNodePtr cur)
 {

Index: LiquidData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- LiquidData.cc       11 Jun 2002 18:28:32 -0000      1.12
+++ LiquidData.cc       12 Jun 2002 14:37:36 -0000      1.13
@@ -23,6 +23,7 @@
 #include "StringConverter.hh"
 #include "LiquidData.hh"
 #include "XMLhelper.hh"
+#include "boost/smart_ptr.hpp"
 
 void 
 LiquidData::write_xml(std::ofstream* xml)

Index: MultiplayerClientChild.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MultiplayerClientChild.cc   10 Jun 2002 15:01:23 -0000      1.16
+++ MultiplayerClientChild.cc   12 Jun 2002 14:37:36 -0000      1.17
@@ -23,7 +23,6 @@
 #include "Server.hh"
 #include "Controller.hh"
 
-using boost::shared_ptr;
 
 MultiplayerClientChild::MultiplayerClientChild (Controller* arg_controller,
                                                Server * s, const CL_Rect& 
arg_rect)
@@ -43,20 +42,24 @@
   button_panel->set_server (server);
   
   //std::cout << "MultiplayerClientChild: Creating: " << server.get() << 
std::endl;
-  gui_objs.push_back (playfield.get());
-  gui_objs.push_back (button_panel.get());
-  gui_objs.push_back (counterbar.get());
+  gui_objs.push_back (playfield);
+  gui_objs.push_back (button_panel);
+  gui_objs.push_back (counterbar);
 
   controller->set_range (rect);
 
   set_clip_rect(rect.x1, rect.y1, rect.x2, rect.y2);
 
-  Display::add_flip_screen_hook (cursor.get ());
+  Display::add_flip_screen_hook (cursor);
 }
 
 MultiplayerClientChild::~MultiplayerClientChild ()
 {
-  Display::remove_flip_screen_hook (cursor.get ());
+  Display::remove_flip_screen_hook (cursor);
+  delete cursor;
+  delete button_panel;
+  delete playfield;
+  delete counterbar;
 }
 
 void 

Index: MultiplayerClientChild.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MultiplayerClientChild.hh   10 Jun 2002 15:01:23 -0000      1.11
+++ MultiplayerClientChild.hh   12 Jun 2002 14:37:36 -0000      1.12
@@ -33,16 +33,17 @@
                               public GuiObj
 {
 private:
-  Server * server;
-  boost::shared_ptr<Cursor> cursor;
-  boost::shared_ptr<ButtonPanel> button_panel;
-  Sprite capture_rect;
+
+  Server*      server;
+  Cursor*      cursor;
+  ButtonPanel* button_panel;
+  Sprite       capture_rect;
   
   std::vector<GuiObj*> gui_objs;
   typedef std::vector<GuiObj*>::iterator GuiObjIter;
 
-  boost::shared_ptr<PlayfieldView> playfield;
-  boost::shared_ptr<PingusCounterBar> counterbar;
+  PlayfieldView*    playfield;
+  PingusCounterBar* counterbar;
 
   CL_Rect rect;
 

Index: MultiplayerGame.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerGame.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MultiplayerGame.cc  10 Jun 2002 13:03:34 -0000      1.11
+++ MultiplayerGame.cc  12 Jun 2002 14:37:36 -0000      1.12
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <memory>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Display/display.h>
 #include "PathManager.hh"
@@ -46,27 +47,27 @@
   try {
     PLF* plf = new XMLPLF (path_manager.complete("levels/multi2-grumbel.xml"));
     shared_ptr<Server>     server (new TrueServer (plf));
-    shared_ptr<Controller> controller1;
-    shared_ptr<Controller> controller2;
-    shared_ptr<Controller> controller3;
-    shared_ptr<Controller> controller4;
+    std::auto_ptr<Controller> controller1;
+    std::auto_ptr<Controller> controller2;
+    std::auto_ptr<Controller> controller3;
+    std::auto_ptr<Controller> controller4;
 
     if (CL_Input::joysticks.size () > 0)
-      controller1 = shared_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[0], 0));
+      controller1 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[0], 0));
     else 
-      controller1 = shared_ptr<Controller>(new KeyboardController (0));
+      controller1 = std::auto_ptr<Controller>(new KeyboardController (0));
 
     if (CL_Input::joysticks.size () > 1)
-      controller2 = shared_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[1], 0));
+      controller2 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[1], 0));
     else
-      controller2 = shared_ptr<Controller>(new MouseController (1));
+      controller2 = std::auto_ptr<Controller>(new MouseController (1));
 
     if (CL_Input::joysticks.size () > 2)
-      controller3 = shared_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[2], 0));
+      controller3 = std::auto_ptr<Controller>(new GamepadController 
(CL_Input::joysticks[2], 0));
     else
-      controller3 = shared_ptr<Controller>(new KeyboardController (2));
+      controller3 = std::auto_ptr<Controller>(new KeyboardController (2));
 
-    controller4 = shared_ptr<Controller>(new MouseController (3));
+    controller4 = std::auto_ptr<Controller>(new MouseController (3));
 
     shared_ptr<MultiplayerClient> client;
     int player = 2;

Index: PingusMain.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMain.cc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- PingusMain.cc       10 Jun 2002 15:01:23 -0000      1.64
+++ PingusMain.cc       12 Jun 2002 14:37:36 -0000      1.65
@@ -69,7 +69,7 @@
 #include "PingusGameSession.hh"
 #include "Debug.hh"
 #include "editor/Editor.hh"
-
+#include "boost/smart_ptr.hpp"
 #include "PingusMenuManager.hh"
 #include "PingusSoundDummy.hh"
 

Index: PingusMenu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenu.cc,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- PingusMenu.cc       10 Jun 2002 11:00:27 -0000      1.57
+++ PingusMenu.cc       12 Jun 2002 14:37:36 -0000      1.58
@@ -22,6 +22,7 @@
 #include <ClanLib/Display/Input/inputdevice.h>
 #include "globals.hh"
 #include "AlphaButton.hh"
+#include "SurfaceButton.hh"
 #include "Credits.hh"
 #include "PingusResource.hh"
 #include "PingusMessageBox.hh"
@@ -47,7 +48,7 @@
       pout << "PingusMenu::init ()" << std::endl;
       event_enabled = true;
       is_init = true;
-      boost::shared_ptr<SurfaceButton> editor_button (new EditorButton (this));
+      SurfaceButton* editor_button (new EditorButton (this));
  
       if (start_editor)
        {
@@ -55,14 +56,14 @@
          editor_button->on_click ();
        }
 
-      background         = PingusResource::load_surface("misc/logo", "core");
+      background = PingusResource::load_surface("misc/logo", "core");
 
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new OptionsButton 
(this)));
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new PlayButton 
(this)));
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new QuitButton 
(this)));
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new MultiplayerButton 
(this)));
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new ThemeButton 
(this)));
-      buttons.push_back(boost::shared_ptr<SurfaceButton>(new StoryButton 
(this)));
+      buttons.push_back(new OptionsButton (this));
+      buttons.push_back(new PlayButton (this));
+      buttons.push_back(new QuitButton (this));
+      buttons.push_back(new MultiplayerButton (this));
+      buttons.push_back(new ThemeButton (this));
+      buttons.push_back(new StoryButton (this));
       buttons.push_back(editor_button);
     }
 
@@ -72,13 +73,17 @@
 }
 
 PingusMenu::~PingusMenu()
-{  
+{
+  for (std::list<SurfaceButton*>::iterator it = buttons.begin(); it != 
buttons.end(); ++it)
+  {
+    delete *it;
+  }
 }
 
 void
 PingusMenu::draw()
 {
-  for(std::list<boost::shared_ptr<SurfaceButton> >::iterator i = 
buttons.begin();
+  for(std::list<SurfaceButton*>::iterator i = buttons.begin();
       i != buttons.end(); ++i)
     (*i)->draw();
 }
@@ -140,7 +145,7 @@
     {
       if (verbose) pout << "PingusMenu::Event: on_button_press" << std::endl;
 
-      for(std::list<boost::shared_ptr<SurfaceButton> >::iterator i = 
buttons.begin(); 
+      for(std::list<SurfaceButton*>::iterator i = buttons.begin(); 
          i != buttons.end(); 
          i++)
        {

Index: PingusMenu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenu.hh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- PingusMenu.hh       10 Jun 2002 15:01:23 -0000      1.25
+++ PingusMenu.hh       12 Jun 2002 14:37:36 -0000      1.26
@@ -23,7 +23,6 @@
 #include <list>
 #include "PingusSubMenu.hh"
 #include "LayerManager.hh"
-#include "SurfaceButton.hh"
 
 class CL_Key;
 class CL_InputDevice;
@@ -37,7 +36,7 @@
   bool is_init;
 private:
   ///
-  std::list<boost::shared_ptr<SurfaceButton> > buttons;
+  std::list<SurfaceButton*> buttons;
   ///
   SurfaceButton * temp_button;
   ///

Index: Story.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Story.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Story.cc    10 Jun 2002 11:00:27 -0000      1.16
+++ Story.cc    12 Jun 2002 14:37:36 -0000      1.17
@@ -24,6 +24,7 @@
 #include "PingusResource.hh"
 #include "PingusMenuManager.hh"
 #include "Story.hh"
+#include "worldmap/PingusWorldMapManager.hh"
 
 Story::Story(PingusMenuManager* manager)
   : PingusSubMenu (manager)

Index: SurfaceButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.cc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- SurfaceButton.cc    10 Jun 2002 15:01:23 -0000      1.40
+++ SurfaceButton.cc    12 Jun 2002 14:37:36 -0000      1.41
@@ -29,6 +29,7 @@
 #include "Credits.hh"
 #include "editor/Editor.hh"
 #include "ThemeSelector.hh"
+#include "SurfaceButton.hh"
 
 /* Headers needed for i18n / gettext */
 #include <clocale>

Index: SurfaceButton.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.hh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- SurfaceButton.hh    10 Jun 2002 11:00:27 -0000      1.24
+++ SurfaceButton.hh    12 Jun 2002 14:37:36 -0000      1.25
@@ -23,6 +23,7 @@
 #include <string>
 #include "worldmap/PingusWorldMapManager.hh"
 #include "MultiplayerConfig.hh"
+#include <ClanLib/Display/Display/surface.h>
 
 class PingusMenu;
 

Index: TrapData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrapData.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TrapData.cc 11 Jun 2002 18:28:33 -0000      1.14
+++ TrapData.cc 12 Jun 2002 14:37:36 -0000      1.15
@@ -29,6 +29,7 @@
 #include "PingusError.hh"
 #include "editor/PLFObj.hh"
 #include "XMLhelper.hh"
+#include "boost/smart_ptr.hpp"
 
 TrapData::TrapData (xmlDocPtr doc, xmlNodePtr cur)
 {

Index: WorldObjData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjData.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- WorldObjData.hh     11 Jun 2002 18:28:35 -0000      1.14
+++ WorldObjData.hh     12 Jun 2002 14:37:36 -0000      1.15
@@ -23,13 +23,15 @@
 #include <list>
 
 #include "editor/EditorObj.hh"
-#include "boost/smart_ptr.hpp"
 
 class WorldObj;
+class EditorObj;
 
+namespace boost {
+  template <class T> class shared_ptr;
+}
 
 typedef std::list<boost::shared_ptr<EditorObj> > EditorObjLst;
-typedef EditorObjLst::iterator                   EditorObjLstIter;
 
 /** The root data class for all objects in the Pingus world.  Each
     objects needs a data object for creating, which should be

Index: WorldObjGroupData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjGroupData.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- WorldObjGroupData.cc        11 Jun 2002 18:28:35 -0000      1.7
+++ WorldObjGroupData.cc        12 Jun 2002 14:37:36 -0000      1.8
@@ -22,6 +22,9 @@
 #include "WorldObj.hh"
 #include "WorldObjGroupData.hh"
 
+typedef EditorObjLst::iterator EditorObjLstIter;
+
+
 WorldObjGroupData::WorldObjGroupData ()
 {
 }

Index: XMLPLF.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLPLF.cc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- XMLPLF.cc   9 Jun 2002 13:03:11 -0000       1.45
+++ XMLPLF.cc   12 Jun 2002 14:37:36 -0000      1.46
@@ -276,7 +276,7 @@
 {
   // The allocated objects are delete'd in the destructor
   //FIXME: Repair me backgrounds.push_back(BackgroundData::create (doc, cur));
-  boost::shared_ptr<WorldObjData> data;
+  //boost::shared_ptr<WorldObjData> data;
   char* type_cstr = (char*)xmlGetProp(cur, (xmlChar*)"type");
 
   if (type_cstr != 0)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]