Changeset 9805 in orxonox.OLD for branches/new_class_id/src/world_entities/space_ships

Timestamp:

Sep 24, 2006, 3:21:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

Location:

branches/new_class_id/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (4 diffs)
• helicopter.h (modified) (1 diff)

branches/new_class_id/src/world_entities/space_ships/helicopter.cc

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 
 #include "key_mapper.h"
@@ -63 +63 @@
 {
   this->setPlayer(NULL);
-
-  if (this->chopperBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->chopperBuffer);
 }
 
@@ -115 +112 @@
 
   //load sound
-  if (this->chopperBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->chopperBuffer);
-  this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/chopper.wav", WAV);
+  this->chopperBuffer = OrxSound::ResourceSoundBuffer("sound/engine/chopper.wav");
 
 }
@@ -127 +122 @@
 void Helicopter::init()
 {
-  this->chopperBuffer = NULL;
-
   this->registerObject(this, Helicopter::_objectList);
   PRINTF(4)("HELICOPTER INIT\n");

branches/new_class_id/src/world_entities/space_ships/helicopter.h

@@ -80 +80 @@
 
     OrxSound::SoundSource  soundSource;
-    OrxSound::SoundBuffer* chopperBuffer;
+    OrxSound::SoundBuffer  chopperBuffer;
 
 };