Changeset 9869 in orxonox.OLD for trunk/src/world_entities/space_ships/helicopter.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/space_ships/helicopter.cc (modified) (6 diffs)

trunk/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"
@@ -34 +34 @@
 #include "debug.h"
 
-CREATE_FACTORY(Helicopter, CL_HELICOPTER);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+CREATE_FACTORY(Helicopter);
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
-                        addMethod("moveUp", ExecutorLua1<Helicopter,bool>(&Helicopter::moveUp))
-                            ->addMethod("moveDown", ExecutorLua1<Helicopter,bool>(&Helicopter::moveDown))
-                            ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
-                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
-                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
-                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+CREATE_SCRIPTABLE_CLASS(Helicopter,
+                        addMethod("moveUp", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveUp))
+                            ->addMethod("moveDown", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveDown))
+                            ->addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                            ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
 
                        );
 
+
 /**
  *  creates the controlable Helicopter
@@ -60 +63 @@
 {
   this->setPlayer(NULL);
-
-  if (this->chopperBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->chopperBuffer);
 }
 
@@ -100 +100 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate("Cannon"));
 
   cannon->setName("BFG");
@@ -112 +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");
 
 }
@@ -124 +122 @@
 void Helicopter::init()
 {
-  this->chopperBuffer = NULL;
-
-  this->setClassID(CL_HELICOPTER, "Helicopter");
+  this->registerObject(this, Helicopter::_objectList);
   PRINTF(4)("HELICOPTER INIT\n");