Changeset 9087 in orxonox.OLD for branches/presentation/src/world_entities/npcs

Timestamp:

Jul 4, 2006, 1:57:44 AM (18 years ago)

Author:

bensch

Message:

some valgrind bugs

Location:

branches/presentation/src/world_entities/npcs

Files:

• door.cc (modified) (3 diffs)
• door.h (modified) (2 diffs)
• generic_npc.cc (modified) (1 diff)

branches/presentation/src/world_entities/npcs/door.cc

@@ -45 +45 @@
 
 
-Door::Door ()
-{
-  this->init();
-}
-
-
 Door::Door(const TiXmlElement* root)
 {
@@ -56 +50 @@
   this->setClassID(CL_DOOR, "Door");
   this->scale = 1.0f;
+  this->actionRadius = 1.0;
 
   if( root != NULL)
@@ -62 +57 @@
   this->toList(OM_COMMON);
   this->bLocked = false;
+  this->bOpen = false;
 
   this->loadMD2Texture("maps/doors.jpg");

branches/presentation/src/world_entities/npcs/door.h

@@ -22 +22 @@
 {
   public:
-    Door ();
-    Door(const TiXmlElement* root);
+    Door(const TiXmlElement* root = NULL);
     virtual ~Door ();
 
@@ -43 +42 @@
 
   private:
+    void init();
     bool checkOpen();
     void setAnimation(int animNum, int playbackMode = 0);

branches/presentation/src/world_entities/npcs/generic_npc.cc

@@ -84 +84 @@
   this->toList(OM_GROUP_00);
 
-  if (this->soundBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->soundBuffer);
   this->soundBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);