Changeset 9709 in orxonox.OLD for branches/new_class_id/src/world_entities/script_trigger.cc

Timestamp:

Aug 31, 2006, 10:51:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

File:

• branches/new_class_id/src/world_entities/script_trigger.cc (modified) (4 diffs)

branches/new_class_id/src/world_entities/script_trigger.cc

@@ -16 +16 @@
 
 #include "script_trigger.h"
-#include "class_list.h"
 #include "script.h"
 
 #include "state.h"
 
-
-CREATE_SCRIPTABLE_CLASS(ScriptTrigger, CL_SCRIPT_TRIGGER,
+NewObjectListDefinition(ScriptTrigger);
+
+CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),
             // Coordinates
              addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
@@ -49 +49 @@
  */
 ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
-{ 
-  this->setClassID(CL_SCRIPT_TRIGGER, "ScriptTrigger");
+{
+  this->registerObject(this, ScriptTrigger::_objectList);
   this->toList(OM_COMMON);
 
@@ -139 +139 @@
 void ScriptTrigger::setTarget(const std::string& target)
 {
-  BaseObject* targetEntity = ClassList::getObject(target, CL_WORLD_ENTITY);
-
+
+  WorldEntity* targetEntity = WorldEntity::objectList().getObject(target);
   if (targetEntity != NULL)
   {
-    this->setTarget(dynamic_cast<WorldEntity*>(targetEntity));
+    this->setTarget(targetEntity);
   }
   else
@@ -157 +157 @@
 void ScriptTrigger::setTriggerParent(const std::string& parent)
 {
-  BaseObject* parentEntity = ClassList::getObject(parent, CL_WORLD_ENTITY);
+  WorldEntity* parentEntity = WorldEntity::objectList().getObject(parent);
 
   if (parentEntity != NULL)
   {
-    this->setParent(dynamic_cast<WorldEntity*>(parentEntity));
+    this->setParent(parentEntity);
     this->setParentMode(PNODE_MOVEMENT);
   }