Changeset 10616 in orxonox.OLD for branches/scriptimprovements/src/world_entities/script_triggers

Timestamp:

Mar 31, 2007, 12:06:51 PM (18 years ago)

Author:

snellen

Message:

shame on me: how could I forget to add the new classes to Makefile.am , removed obsolete lua_vector.*

Location:

branches/scriptimprovements/src/world_entities/script_triggers

Files:

• script_trigger.h (modified) (2 diffs)
• space_trigger.cc (modified) (2 diffs)
• tick_trigger.cc (modified) (2 diffs)

branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h

@@ -44 +44 @@
   private:
 
-    Script*      script;
-    std::string  functionName;
     bool         doDebugDraw;
-   
     
     //for internal use
@@ -54 +51 @@
     
   protected:
-    
+    Script*      script;
+    std::string  functionName;
     bool         scriptCalled;
     bool         scriptIsOk;

branches/scriptimprovements/src/world_entities/script_triggers/space_trigger.cc

@@ -14 +14 @@
 */
 
-
+#include "util/loading/factory.h"
 #include "space_trigger.h"
 #include "debug.h"
@@ -49 +49 @@
 {
   this->registerObject(this, SpaceTrigger::_objectList);
-  this->toList(OM_COMMON);
+  //this->toList(OM_COMMON);
 
   radius = 10;

branches/scriptimprovements/src/world_entities/script_triggers/tick_trigger.cc

@@ -14 +14 @@
 */
 
-
+#include "util/loading/factory.h"
 #include "tick_trigger.h"
 #include "debug.h"
@@ -43 +43 @@
 {
   this->registerObject(this, TickTrigger::_objectList);
-  this->toList(OM_COMMON);
+  //this->toList(OM_COMMON);
 
   if(root != NULL)