Changeset 888

Timestamp:

03/02/10 16:50:04 (5 months ago)

Author:

zoogie

Message:

The first-choice dialog is causing the scripting on_init bit to be called too early, before it's actually initialized.

Temporarily disabling on_init in this case.

Files:

• trunk/client/Game2/GameApp.cpp (modified) (2 diffs)

trunk/client/Game2/GameApp.cpp

@@ -1216 +1216 @@
 
     // Create the system console and execute the init script.
+    OutputDebugString("Creating system console.\n");
     sysConsole = new SysConsole();
     sysConsole->Init();
@@ -2004 +2005 @@
 
         case MR_WM_ON_INIT:
-            This->sysConsole->OnInit();
+            //FIXME: First choice dialog causing this to be called prematurely.
+            if (This->sysConsole)
+                This->sysConsole->OnInit();
             break;