Changeset 8061 in orxonox.OLD for trunk/src

Timestamp:

Jun 1, 2006, 1:59:42 PM (19 years ago)

Author:

bensch

Message:

merged the scriptengine back to the trunk

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (1 diff)
• event/event_handler.cc (modified) (1 diff)
• script_engine (copied) (copied from branches/script_engine/src/lib/script_engine)
• script_engine/Makefile.am (copied) (copied from branches/script_engine/src/lib/script_engine/Makefile.am)
• script_engine/OLD (copied) (copied from branches/script_engine/src/lib/script_engine/OLD)
• script_engine/OLD/LuaCallback.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/LuaCallback.cc)
• script_engine/OLD/LuaCallback.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/LuaCallback.h)
• script_engine/OLD/RestoreStack.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/RestoreStack.cc)
• script_engine/OLD/RestoreStack.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/RestoreStack.h)
• script_engine/OLD/Script.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/Script.cc)
• script_engine/OLD/Script.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/Script.h)
• script_engine/OLD/This.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/This.cc)
• script_engine/OLD/This.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/This.h)
• script_engine/OLD/VirtualMachine.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/VirtualMachine.cc)
• script_engine/OLD/VirtualMachine.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/VirtualMachine.h)
• script_engine/OLD/main.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/main.cc)
• script_engine/OLD/scriptable.cc (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/scriptable.cc)
• script_engine/OLD/scriptable.h (copied) (copied from branches/script_engine/src/lib/script_engine/OLD/scriptable.h)
• script_engine/Script.cc (copied) (copied from branches/script_engine/src/lib/script_engine/Script.cc)
• script_engine/Script.h (copied) (copied from branches/script_engine/src/lib/script_engine/Script.h)
• script_engine/account.cc (copied) (copied from branches/script_engine/src/lib/script_engine/account.cc)
• script_engine/config.h (copied) (copied from branches/script_engine/src/lib/script_engine/config.h)
• script_engine/luaincl.h (copied) (copied from branches/script_engine/src/lib/script_engine/luaincl.h)
• script_engine/luna (copied) (copied from branches/script_engine/src/lib/script_engine/luna)
• script_engine/luna/account.cc (copied) (copied from branches/script_engine/src/lib/script_engine/luna/account.cc)
• script_engine/luna/account.lua (copied) (copied from branches/script_engine/src/lib/script_engine/luna/account.lua)
• script_engine/luna/luna.h (copied) (copied from branches/script_engine/src/lib/script_engine/luna/luna.h)
• script_engine/lunar.h (copied) (copied from branches/script_engine/src/lib/script_engine/lunar.h)
• script_engine/lunartest.lua (copied) (copied from branches/script_engine/src/lib/script_engine/lunartest.lua)
• script_engine/lunartest2.lua (copied) (copied from branches/script_engine/src/lib/script_engine/lunartest2.lua)
• scripting (copied) (copied from branches/script_engine/src/lib/scripting)

trunk/src/lib/Makefile.am

@@ -79 +79 @@
         parser \
         shell \
+        script_engine \
         gui

trunk/src/lib/event/event_handler.cc

@@ -337 +337 @@
   else
   {
-    //SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
     SDL_ShowCursor(SDL_DISABLE);
   }