Changeset 8271 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 8, 2006, 4:50:50 PM (18 years ago)

Author:

bensch

Message:

merge

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• script_trigger.cc (copied) (copied from branches/script_engine/src/world_entities/script_trigger.cc)
• script_trigger.h (copied) (copied from branches/script_engine/src/world_entities/script_trigger.h)

trunk/src/world_entities/WorldEntities.am

@@ -51 +51 @@
                 world_entities/elements/text_element.cc \
                 \
-                world_entities/effects/lightning_bolt.cc
+                world_entities/effects/lightning_bolt.cc \
+                \
+                world_entities/script_trigger.cc
 
 
@@ -103 +105 @@
                 elements/text_element.h \
                 \
-                effects/lightning_bolt.h
+                effects/lightning_bolt.h \
+                \
+                script_trigger.h