Changeset 8679 in orxonox.OLD

Timestamp:

Jun 21, 2006, 5:15:26 PM (18 years ago)

Author:

snellen

Message:

all scripts now get loaded from datadir/scripts

Location:

branches/script_engine/src

Files:

• lib/script_engine/lunartest.lua (deleted)
• lib/script_engine/movechopper.lua (deleted)
• lib/script_engine/script.cc (modified) (3 diffs)
• movechopper.lua (deleted)

branches/script_engine/src/lib/script_engine/script.cc

@@ -3 +3 @@
 #include "luaincl.h"
 
-#include "filesys/file.h"
 #include "util/loading/resource_manager.h"
 
@@ -60 +59 @@
  {
 
-   File scriptFile;
-
+   std::string filedest(ResourceManager::getInstance()->getDataDir());
+   filedest += "scripts/" + filename;
+   
    if(currentFile.length() != 0)
    {
@@ -68 +68 @@
     }
 
-   int error = luaL_loadfile (luaState, filename.c_str());
+   int error = luaL_loadfile (luaState, filedest.c_str());
 
    if(error == 0)