Changeset 7463 for code/trunk/src/modules/objects/Script.cc

Timestamp:

Sep 17, 2010, 9:41:17 PM (15 years ago)

Author:

dafrick

Message:

Fixing "bug", that caused crash in dedicated mode.
Script object can now specify whether the code that is executed by it needs graphics to work.

File:

• code/trunk/src/modules/objects/Script.cc (modified) (4 diffs)

code/trunk/src/modules/objects/Script.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
+#include "core/GameMode.h"
 #include "core/LuaState.h"
 #include "core/XMLPort.h"
@@ -57 +58 @@
         this->luaState_ = NULL;
         this->remainingExecutions_ = Script::INF;
+        this->mode_ = ScriptMode::normal;
+        this->onLoad_ = true;
+        this->times_ = Script::INF;
+        this->needsGraphics_ = false;
 
     }
@@ -86 +91 @@
         XMLPortParam(Script, "onLoad", setOnLoad, isOnLoad, xmlelement, mode).defaultValues(true);
         XMLPortParam(Script, "times", setTimes, getTimes, xmlelement, mode).defaultValues(Script::INF);
+        XMLPortParam(Script, "needsGraphics", setNeedsGraphics, getNeedsGraphics, xmlelement, mode).defaultValues(false);
 
         XMLPortEventSink(Script, BaseObject, "trigger", trigger, xmlelement, mode);
@@ -127 +133 @@
     {
         if(this->times_ != Script::INF && this->remainingExecutions_ == 0)
+            return;
+
+        // If the code needs graphics to be executed but the GameMode doesn't show graphics the code isn't executed.
+        if(this->needsGraphics_ && !GameMode::showsGraphics())
             return;