Changeset 10606 in orxonox.OLD

Timestamp:

Mar 29, 2007, 4:54:30 PM (17 years ago)

Author:

snellen

Message:

moved scripttrigger to the subfolder script_triggers/ in world_entities

Location:

branches/scriptimprovements/src

Files:

• lib/script_engine/script_manager.cc (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (3 diffs)
• world_entities/script_triggers (added)
• world_entities/script_triggers/script_trigger.cc (moved) (moved from branches/scriptimprovements/src/world_entities/script_trigger.cc)
• world_entities/script_triggers/script_trigger.h (moved) (moved from branches/scriptimprovements/src/world_entities/script_trigger.h)

branches/scriptimprovements/src/lib/script_engine/script_manager.cc

@@ -25 +25 @@
 
 #include "script.h"
-#include "script_trigger.h"
+#include "script_triggers/script_trigger.h"
 #include "luaincl.h"
 #include "loading/load_param_xml.h"

branches/scriptimprovements/src/world_entities/WorldEntities.am

@@ -102 +102 @@
                 world_entities/effects/blink.cc \
                 \
-                world_entities/script_trigger.cc \
+                world_entities/script_triggers/script_trigger.cc \
                 \
                 \
@@ -109 +109 @@
                 world_entities/particles/box_emitter.cc \
                 world_entities/particles/plane_emitter.cc \
-        world_entities/particles/emitter_node.cc \
+                world_entities/particles/emitter_node.cc \
                 \
                 world_entities/particles/particle_system.cc \
@@ -235 +235 @@
                 effects/blink.h \
                 \
-                script_trigger.h \
+                script_triggers/script_trigger.h \
                 \
                 \