Changeset 7463

Timestamp:

Sep 17, 2010, 9:41:17 PM (14 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.

Location:

code/trunk

Files:

• data/levels/Fight in our Back.oxw (modified) (1 diff)
• data/levels/Quest_PirateAttack.oxw (modified) (1 diff)
• data/levels/notifications.oxw (modified) (1 diff)
• data/levels/old/princessaeryn.oxw (modified) (1 diff)
• data/levels/old/questsystem.oxw (modified) (1 diff)
• data/levels/princessaeryn.oxw (modified) (1 diff)
• src/modules/notifications/Notification.cc (modified) (1 diff)
• src/modules/objects/Script.cc (modified) (4 diffs)
• src/modules/objects/Script.h (modified) (4 diffs)

code/trunk/data/levels/Fight in our Back.oxw

@@ -69 +69 @@
     >
 
-        <Script code="showGUI NotificationLayer false true" />
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
         <!--Light: noch zu aendern -->

code/trunk/data/levels/Quest_PirateAttack.oxw

@@ -35 +35 @@
     >
 
-        <Script code="showGUI NotificationLayer false true" />
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
         <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/trunk/data/levels/notifications.oxw

@@ -19 +19 @@
     >
 
-    <Script code="showGUI NotificationLayer false true" />
+    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/trunk/data/levels/old/princessaeryn.oxw

@@ -18 +18 @@
     >
 
-        <Script code="showGUI NotificationLayer false true" />
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
       <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/trunk/data/levels/old/questsystem.oxw

@@ -14 +14 @@
     >
 
-        <Script code="showGUI NotificationLayer false true" />
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
         <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">

code/trunk/data/levels/princessaeryn.oxw

@@ -24 +24 @@
   >
 
-    <Script code="showGUI NotificationLayer false true" />
+    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/trunk/src/modules/notifications/Notification.cc

@@ -114 +114 @@
     bool Notification::send(unsigned int clientId, const std::string & sender = NotificationManager::NONE)
     {
+        COUT(0) << "MUP: " << Host::getPlayerID() << "|" << clientId << std::endl;
         if(GameMode::isStandalone() || Host::getPlayerID() == clientId)
         {

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;
 

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

@@ -55 +55 @@
         'mode': The mode, specifying whether the set code should be executed the normal way ('normal') or in lua ('lua'). Default is 'normal'.
         'onLoad': Whether the code is executed upon loading (creation) of this object. Default is true.
+        'needsGraphics': Whether the code needs graphics to be executed or not. Default is false.
 
         Here are two examples illustrating the usage:
         @code
-        <Script code="showGUI QuestGUI" />
+        <Script code="showGUI QuestGUI" needsGraphics=true />
         @endcode
-        This would show the QuestGUI opon creation of the object. The mode is 'normal', not specified here since that is the default, also onLoad is true, also not specified, since it is the default as well.
+        This would show the QuestGUI opon creation of the object. The mode is 'normal', not specified here since that is the default, also onLoad is true, also not specified, since it is the default as well. Also needsGraphics is set to true because showGUI needs graphics to work.
 
         @code
-        <Script code="hideGUI QuestGUI" mode="normal" onLoad="false">
+        <Script code="hideGUI QuestGUI" mode="normal" onLoad="false" needsGraphics=true >
             <events>
                 <trigger>
@@ -71 +72 @@
         </Script>
         @endcode
-        This would hide the QuestGUI as soon as a Pawn got in range of the DistanceTrigger. The mode is 'normal', it is specified here, but could be ommitted as well, since it is the default. OnLoad is false, that is why it can't be ommitted.
+        This would hide the QuestGUI as soon as a Pawn got in range of the DistanceTrigger. The mode is 'normal', it is specified here, but could be ommitted as well, since it is the default. OnLoad is false, that is why it can't be ommitted. Also needsGraphics is set to true because showGUI needs graphics to work.
     @author
         Benjamin Knecht
@@ -125 +126 @@
                 { return this->times_; }
 
+            /**
+            @brief Set whether the code to be executed needs graphics to work.
+            @param needsGraphics True if the cde needs graphics to be executed properly.
+            */
+            void setNeedsGraphics(bool needsGraphics)
+                { this->needsGraphics_ = needsGraphics; }
+            /**
+            @brief Get whether the code to be executed needs graphics to work.
+            @return Returns true if the code needs graphic, false if not.
+            */
+            bool getNeedsGraphics(void)
+                { return this->needsGraphics_; }
+
         private:
             //! Static variables to avoid magic strings.
@@ -135 +149 @@
             bool onLoad_; //!< Whether the Scripts code is executed upon loading (creation) of this Script.
             int times_; //!< The number of times the Scripts code is executed at the most. -1 denotes infinity.
+            bool needsGraphics_; //!< Whether the code to be executed needs graphics.
 
             LuaState* luaState_; //!< The LuaState to execute the code in lua.