[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1.20,1.21 StarfieldBackground.cc,1.24,1.25 StarfieldBackground.hh,1.18,1.19 SurfaceBackground.cc,1.21,1.22 SurfaceBackground.hh,1.10,1.11 SurfaceBackgroundData.hh,1.17,1.18 ThunderstormBackground.cc,1.10,1.11 ThunderstormBackground.hh,1.12,1.13 ThunderstormBackgroundData.hh,1.10,1.11 |
Date: |
12 Jun 2002 14:37:39 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/backgrounds
In directory dark:/tmp/cvs-serv5186/backgrounds
Modified Files:
SolidColorBackground.hh StarfieldBackground.cc
StarfieldBackground.hh SurfaceBackground.cc
SurfaceBackground.hh SurfaceBackgroundData.hh
ThunderstormBackground.cc ThunderstormBackground.hh
ThunderstormBackgroundData.hh
Log Message:
replaced shared_ptr<> with normal pointers
Index: SolidColorBackground.hh
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/SolidColorBackground.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- SolidColorBackground.hh 11 Jun 2002 18:28:37 -0000 1.20
+++ SolidColorBackground.hh 12 Jun 2002 14:37:37 -0000 1.21
@@ -26,6 +26,7 @@
#include "../WorldObjData.hh"
#include "../editor/RectEditorObj.hh"
#include "../editor/EditorView.hh"
+#include "../boost/smart_ptr.hpp"
class _xmlDoc; typedef _xmlDoc* xmlDocPtr;
class _xmlNode; typedef _xmlNode* xmlNodePtr;
Index: StarfieldBackground.cc
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/StarfieldBackground.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- StarfieldBackground.cc 11 Jun 2002 18:28:37 -0000 1.24
+++ StarfieldBackground.cc 12 Jun 2002 14:37:37 -0000 1.25
@@ -193,13 +193,6 @@
}
-/*
-boost::shared_ptr<StarfieldBackground>
-StarfieldBackground::create (boost::shared_ptr<BackgroundData> arg_data)
-{
- StarfieldBackgroundData* data =
dynamic_cast<StarfieldBackgroundData*>(arg_data.get());
- return boost::shared_ptr<StarfieldBackground>(new StarfieldBackground
(data));
-}*/
///
void
Index: StarfieldBackground.hh
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/StarfieldBackground.hh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- StarfieldBackground.hh 11 Jun 2002 18:28:37 -0000 1.18
+++ StarfieldBackground.hh 12 Jun 2002 14:37:37 -0000 1.19
@@ -23,6 +23,7 @@
#include "../StringConverter.hh"
#include "../WorldObj.hh"
#include "../WorldObjData.hh"
+#include "../boost/smart_ptr.hpp"
class _xmlDoc; typedef _xmlDoc* xmlDocPtr;
class _xmlNode; typedef _xmlNode* xmlNodePtr;
@@ -39,7 +40,6 @@
virtual ~StarfieldBackgroundData () {}
void write_xml(std::ofstream* xml);
- static boost::shared_ptr<WorldObjData> create(xmlDocPtr doc, xmlNodePtr cur);
WorldObj* create_WorldObj();
EditorObjLst create_EditorObj();
@@ -84,7 +84,6 @@
public:
StarfieldBackground (const StarfieldBackgroundData&);
///
- ///static boost::shared_ptr<StarfieldBackground> create
(boost::shared_ptr<BackgroundData> arg_data);
virtual ~StarfieldBackground ();
Index: SurfaceBackground.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/backgrounds/SurfaceBackground.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- SurfaceBackground.cc 10 Jun 2002 11:00:28 -0000 1.21
+++ SurfaceBackground.cc 12 Jun 2002 14:37:37 -0000 1.22
@@ -123,14 +123,6 @@
}
/*
-boost::shared_ptr<SurfaceBackground>
-SurfaceBackground::create (boost::shared_ptr<BackgroundData> arg_data)
-{
- SurfaceBackgroundData* data =
dynamic_cast<SurfaceBackgroundData*>(arg_data.get());
- return boost::shared_ptr<SurfaceBackground>(new SurfaceBackground (data));
-}*/
-
-/*
void
SurfaceBackground::load (SurfaceBackgroundData bg_data)
{
Index: SurfaceBackground.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/backgrounds/SurfaceBackground.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SurfaceBackground.hh 10 Jun 2002 11:00:28 -0000 1.10
+++ SurfaceBackground.hh 12 Jun 2002 14:37:37 -0000 1.11
@@ -45,7 +45,6 @@
float get_z_pos() const { return pos.z; }
- //static boost::shared_ptr<SurfaceBackground> create
(boost::shared_ptr<BackgroundData>);
///
void update(float delta);
///
Index: SurfaceBackgroundData.hh
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/SurfaceBackgroundData.hh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- SurfaceBackgroundData.hh 11 Jun 2002 18:28:37 -0000 1.17
+++ SurfaceBackgroundData.hh 12 Jun 2002 14:37:37 -0000 1.18
@@ -25,15 +25,11 @@
#include "../WorldObjData.hh"
#include "../Color.hh"
#include "../ResDescriptor.hh"
+#include "../boost/smart_ptr.hpp"
class SurfaceBackground;
class _xmlDoc; typedef _xmlDoc* xmlDocPtr;
class _xmlNode; typedef _xmlNode* xmlNodePtr;
-
-namespace boost {
-
- template <class T> class shared_ptr;
-}
class SurfaceBackgroundData : public WorldObjData
{
Index: ThunderstormBackground.cc
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/ThunderstormBackground.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ThunderstormBackground.cc 1 Jun 2002 18:05:36 -0000 1.10
+++ ThunderstormBackground.cc 12 Jun 2002 14:37:37 -0000 1.11
@@ -32,12 +32,6 @@
{
}
-/*
-boost::shared_ptr<ThunderstormBackground>
-ThunderstormBackground::create (boost::shared_ptr<BackgroundData>)
-{
- return boost::shared_ptr<ThunderstormBackground>(new
ThunderstormBackground());
-}*/
void
ThunderstormBackground::update(float /*delta*/)
Index: ThunderstormBackground.hh
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/ThunderstormBackground.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ThunderstormBackground.hh 9 Jun 2002 14:04:10 -0000 1.12
+++ ThunderstormBackground.hh 12 Jun 2002 14:37:37 -0000 1.13
@@ -38,7 +38,6 @@
///
virtual ~ThunderstormBackground();
///
- //static boost::shared_ptr<ThunderstormBackground> create
(boost::shared_ptr<BackgroundData>);
float get_z_pos() const { return pos.z; }
Index: ThunderstormBackgroundData.hh
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/ThunderstormBackgroundData.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ThunderstormBackgroundData.hh 11 Jun 2002 18:28:37 -0000 1.10
+++ ThunderstormBackgroundData.hh 12 Jun 2002 14:37:37 -0000 1.11
@@ -22,6 +22,7 @@
#include "../WorldObjData.hh"
#include "../editor/SpriteEditorObj.hh"
+#include "../boost/smart_ptr.hpp"
class _xmlDoc; typedef _xmlDoc* xmlDocPtr;
class _xmlNode; typedef _xmlNode* xmlNodePtr;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1.20,1.21 StarfieldBackground.cc,1.24,1.25 StarfieldBackground.hh,1.18,1.19 SurfaceBackground.cc,1.21,1.22 SurfaceBackground.hh,1.10,1.11 SurfaceBackgroundData.hh,1.17,1.18 ThunderstormBackground.cc,1.10,1.11 ThunderstormBackground.hh,1.12,1.13 ThunderstormBackgroundData.hh,1.10,1.11,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.38,1.39 IceBlock.cc,1.31,1.32 InfoBox.cc,1.10,1.11 SwitchDoor.cc,1.33,1.34 Teleporter.hh,1.31,1.32
- Next by Date:
[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
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.38,1.39 IceBlock.cc,1.31,1.32 InfoBox.cc,1.10,1.11 SwitchDoor.cc,1.33,1.34 Teleporter.hh,1.31,1.32
- Next by thread:
[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
- Index(es):