[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src groundpiece_data.cxx,1.7,1.8 groundpi
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src groundpiece_data.cxx,1.7,1.8 groundpiece_data.hxx,1.10,1.11 |
Date: |
24 Aug 2002 11:37:50 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv15440
Modified Files:
groundpiece_data.cxx groundpiece_data.hxx
Log Message:
dereferencing a null-pointer isn't really a good idea
Index: groundpiece_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/groundpiece_data.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- groundpiece_data.cxx 23 Aug 2002 15:49:48 -0000 1.7
+++ groundpiece_data.cxx 24 Aug 2002 11:37:48 -0000 1.8
@@ -22,13 +22,12 @@
#include "editor/editor_groundpiece_obj.hxx"
#include "xml_helper.hxx"
-GroundpieceData::GroundpieceData () : resource(0)
+GroundpieceData::GroundpieceData ()
{
// do nothing
}
GroundpieceData::GroundpieceData (xmlDocPtr doc, xmlNodePtr cur)
- : resource(0)
{
gptype = GroundpieceData::GP_GROUND;
@@ -69,7 +68,6 @@
GroundpieceData::GroundpieceData (const GroundpieceData& old)
: surface(old.surface),
- resource(new CL_Resource(*(old.resource))),
desc(old.desc),
pos(old.pos),
gptype(old.gptype)
@@ -83,7 +81,6 @@
return *this;
surface = old.surface;
- resource = new CL_Resource(*(old.resource));
desc = old.desc;
pos = old.pos;
gptype = old.gptype;
@@ -93,7 +90,6 @@
GroundpieceData::~GroundpieceData ()
{
- delete resource;
}
GroundpieceData::GPType
Index: groundpiece_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/groundpiece_data.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- groundpiece_data.hxx 23 Aug 2002 15:49:48 -0000 1.10
+++ groundpiece_data.hxx 24 Aug 2002 11:37:48 -0000 1.11
@@ -33,7 +33,6 @@
{
public:
CL_Surface surface;
- CL_Resource* resource;
ResDescriptor desc;
CL_Vector pos;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src groundpiece_data.cxx,1.7,1.8 groundpiece_data.hxx,1.10,1.11,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/input/buttons Makefile.am,NONE,1.1 button.hxx,NONE,1.1 double_button.cxx,NONE,1.1 double_button.hxx,NONE,1.1 dummy_button.hxx,NONE,1.1 joystick_button.cxx,NONE,1.1 joystick_button.hxx,NONE,1.1 key_button.cxx,NONE,1.1 key_button.hxx,NONE,1.1 mouse_button.cxx,NONE,1.1 mouse_button.hxx,NONE,1.1 multiple_button.cxx,NONE,1.1 multiple_button.hxx,NONE,1.1 triple_button.cxx,NONE,1.1 triple_button.hxx,NONE,1.1
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.65,1.66
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/input/buttons Makefile.am,NONE,1.1 button.hxx,NONE,1.1 double_button.cxx,NONE,1.1 double_button.hxx,NONE,1.1 dummy_button.hxx,NONE,1.1 joystick_button.cxx,NONE,1.1 joystick_button.hxx,NONE,1.1 key_button.cxx,NONE,1.1 key_button.hxx,NONE,1.1 mouse_button.cxx,NONE,1.1 mouse_button.hxx,NONE,1.1 multiple_button.cxx,NONE,1.1 multiple_button.hxx,NONE,1.1 triple_button.cxx,NONE,1.1 triple_button.hxx,NONE,1.1
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.65,1.66
- Index(es):