Changeset 8246 in orxonox.OLD

Timestamp:

Jun 8, 2006, 2:53:10 PM (18 years ago)

Author:

snellen

Message:

moved example.cc to scripttrigger, object.cc, account.cc

Location:

branches/script_engine/src

Files:

• lib/script_engine/Makefile.am (modified) (2 diffs)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/script_trigger.cc (moved) (moved from branches/script_engine/src/lib/script_engine/script_trigger.cc) (3 diffs)
• world_entities/script_trigger.h (moved) (moved from branches/script_engine/src/lib/script_engine/script_trigger.h)

branches/script_engine/src/lib/script_engine/Makefile.am

@@ -15 +15 @@
                 script.cc\
                 script_manager.cc\
-                script_class.cc \
-                script_trigger.cc
+                script_class.cc\
+                account.cc\
+                object.cc
+                
 
 AM_CPPFLAGS= @LUA_INCLUDES@
@@ -24 +26 @@
                 script.h\
                 script_manager.h\
-                script_class.h \
-                script_trigger.h
+                script_class.h
+                
 
 

branches/script_engine/src/world_entities/WorldEntities.am

@@ -49 +49 @@
                 world_entities/elements/text_element.cc \
                 \
-                world_entities/effects/lightning_bolt.cc
+                world_entities/effects/lightning_bolt.cc \
+                \
+                world_entities/script_trigger.cc
 
 
@@ -99 +101 @@
                 elements/text_element.h \
                 \
-                effects/lightning_bolt.h
+                effects/lightning_bolt.h \
+                \
+                script_trigger.h

branches/script_engine/src/world_entities/script_trigger.cc

@@ +1 @@
+//for testing
+#include "luaincl.h"
 #include "script_trigger.h"
 #include "class_list.h"
@@ -4 +6 @@
 
 #include "state.h"
-
+ 
+ 
+ 
 ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
 {
@@ -127 +131 @@
    std::string file("lunartest2.lua");
      // Script script;
-   Script* script = ScriptManager::getInstance()->getScriptByFile(file);
+   Script* script = State::getScriptManager()->getScriptByFile(file);
    printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));