Changeset 9235 in orxonox.OLD for trunk/src/world_entities/script_trigger.cc

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

File:

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

trunk/src/world_entities/script_trigger.cc

@@ -29 +29 @@
              ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
             //Properties
+             ->addMethod("setName", ExecutorLua1<BaseObject, const std::string&>(&BaseObject::setName))
              ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTarget))
              ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTriggerParent))
@@ -51 +52 @@
   this->toList(OM_COMMON);
 
+  radius = 10;
   returnCount = 1;
   scriptFinished = false;
@@ -71 +73 @@
   
   }
+  
 }
 
@@ -215 +218 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
-
   ScriptManager* scriptManager = State::getScriptManager();
   if (scriptManager != NULL)