Changeset 880

Timestamp:

02/28/10 23:41:33 (5 months ago)

Author:

zoogie

Message:

We can now specify a Lua script to run at startup. This script can then set callback functions to run in a special system context (currently, only "on_init" is supported).

Location:

trunk

Files:

• client/client.vcproj (modified) (1 diff)
• client/Game2/GameApp.cpp (modified) (8 diffs)
• client/Game2/GameApp.h (modified) (2 diffs)
• client/Game2/main.cpp (modified) (3 diffs)
• client/Game2/SysConsole.cpp (added)
• client/Game2/SysConsole.h (added)
• engine/Util/Config.h (modified) (1 diff)

trunk/client/client.vcproj

@@ -459 +459 @@
             </File>
             <File
+                RelativePath=".\Game2\SysConsole.cpp"
+                >
+            </File>
+            <File
+                RelativePath=".\Game2\SysConsole.h"
+                >
+            </File>
+            <File
                 RelativePath=".\Game2\TrackDownloadDialog.cpp"
                 >

trunk/client/Game2/GameApp.cpp

@@ -36 +36 @@
 #include "IntroMovie.h"
 #include "Rulebook.h"
+#include "SysConsole.h"
 #include "TrackSelect.h"
 #include "TrackDownloadDialog.h"
@@ -100 +101 @@
 #define MRM_RETURN2WINDOWMODE  1
 #define MRM_EXIT_MENU_LOOP     2
+
+#define MR_WM_ON_INIT (WM_APP + 0x0042)
 
 #ifdef WITH_OPENAL
@@ -566 +569 @@
 
 MR_GameApp::MR_GameApp(HINSTANCE pInstance, bool safeMode) :
-    introMovie(NULL)
+    introMovie(NULL), sysConsole(NULL)
 {
     This = this;
@@ -606 +609 @@
 MR_GameApp::~MR_GameApp()
 {
+    if (sysConsole != NULL) {
+        delete sysConsole;
+        sysConsole = NULL;
+    }
+
     delete controller;
 
@@ -1097 +1105 @@
     BOOL lReturnValue = TRUE;
     Config *cfg = Config::GetInstance();
+    std::string &initScript = cfg->runtime.initScript;
 
     InitCommonControls();                         // Allow some special and complex controls
@@ -1183 +1192 @@
 
     // play the opening movie
-    if(lReturnValue && cfg->misc.introMovie) {
+    if(lReturnValue && cfg->misc.introMovie && initScript.empty()) {
         introMovie = new IntroMovie(mMainWindow, mInstance);
         introMovie->Play();
@@ -1201 +1210 @@
 
     // show "click OK to play on the internet" dialog
-    if(lReturnValue && cfg->misc.displayFirstScreen) {
+    if(lReturnValue && cfg->misc.displayFirstScreen && initScript.empty()) {
         if (FirstChoiceDialog().ShowModal(mInstance, mMainWindow))
             SendMessage(mMainWindow, WM_COMMAND, ID_GAME_NETWORK_INTERNET, 0);
+    }
+
+    // Create the system console and execute the init script.
+    sysConsole = new SysConsole();
+    sysConsole->Init();
+    if (!initScript.empty()) {
+        sysConsole->RunScript(initScript);
     }
 
@@ -1982 +1998 @@
                break;
          */
+        case WM_CREATE:
+            // Trigger the scripting "on_init" call later.
+            PostMessage(pWindow, MR_WM_ON_INIT, 0, 0);
+            break;
+
+        case MR_WM_ON_INIT:
+            This->sysConsole->OnInit();
+            break;
 
         case WM_DISPLAYCHANGE:

trunk/client/Game2/GameApp.h

@@ -36 +36 @@
         class Rulebook;
         typedef boost::shared_ptr<Rulebook> RulebookPtr;
+        class SysConsole;
     }
 }
@@ -82 +83 @@
         HoverRace::Client::IntroMovie *introMovie;
         HoverRace::Client::FullscreenTest *fullscreenTest;
+        HoverRace::Client::SysConsole *sysConsole;
         MR_ClientSession *mCurrentSession;
         MR_GameThread *mGameThread;

trunk/client/Game2/main.cpp

@@ -46 +46 @@
 using HoverRace::Util::OS;
 
+static std::string initScript;
 static bool debugMode = false;
 static bool safeMode = false;
@@ -80 +81 @@
         if (strcmp("-D", arg) == 0) {
             debugMode = true;
+        }
+        else if (strcmp("--exec", arg) == 0) {
+            if (i < argc) {
+                initScript = argv[i++];
+            }
+            else {
+                ShowMessage("Expected: --exec (script filename)");
+                return false;
+            }
         }
         else if (strcmp("-L", arg) == 0) {
@@ -204 +214 @@
     cfg->runtime.aieeee = experimentalMode;
     cfg->runtime.showFramerate = showFramerate;
+    cfg->runtime.initScript = initScript;
 
 #ifdef ENABLE_NLS

trunk/engine/Util/Config.h

@@ -220 +220 @@
             bool showFramerate;
             bool enableConsole;
+            std::string initScript;
         } runtime;
 };