Changeset 8705

Timestamp:

Jun 14, 2011, 8:04:44 PM (14 years ago)

Author:

dafrick

Message:

The calling of tthe docking dialog is now synchronized (but not the docking).

Location:

code/branches/presentation/src/modules/docking

Files:

• Dock.cc (modified) (4 diffs)
• Dock.h (modified) (2 diffs)

code/branches/presentation/src/modules/docking/Dock.cc

@@ -37 +37 @@
 #include "core/LuaState.h"
 #include "core/GUIManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "network/NetworkFunction.h"
+
 #include "infos/HumanPlayer.h"
+#include "interfaces/PlayerTrigger.h"
 #include "worldentities/pawns/Pawn.h"
-#include "interfaces/PlayerTrigger.h"
-#include "core/command/ConsoleCommand.h"
 
 #include "ToluaBindDocking.h"
@@ -53 +55 @@
     SetConsoleCommand("Dock", "dock",    &Dock::cmdDock).addShortcut().setAsInputCommand();
     SetConsoleCommand("Dock", "undock",  &Dock::cmdUndock).addShortcut().setAsInputCommand();
+
+    registerStaticNetworkFunction(Dock::showDockingDialog);
 
     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
@@ -110 +114 @@
 
             // Show docking dialog
-            GUIManager::showGUI("DockingDialog");
+            this->showDockingDialogHelper(player);
         }
         else
@@ -119 +123 @@
 
         return true;
+    }
+
+    void Dock::showDockingDialogHelper(PlayerInfo* player)
+    {
+        assert(player);
+        
+        if(!player->isHumanPlayer())
+            return;
+        
+        if(GameMode::isMaster())
+        {
+            if(GameMode::showsGraphics())
+                GUIManager::showGUI("DockingDialog");
+        }
+        else
+            callStaticNetworkFunction(Dock::showDockingDialog, player->getClientID());
+
+    }
+
+    /*static*/ void Dock::showDockingDialog()
+    {
+        if(GameMode::showsGraphics())
+            GUIManager::showGUI("DockingDialog");
     }
 

code/branches/presentation/src/modules/docking/Dock.h

@@ -36 +36 @@
 #define _Dock_H__
 
+#include "DockingPrereqs.h"
+
 #include <set>
 
 #include "core/CoreIncludes.h"
+#include "core/EventIncludes.h"
 #include "core/XMLPort.h"
-#include "core/EventIncludes.h"
+
+#include "controllers/HumanController.h"
+
+#include "DockingAnimation.h"
+#include "DockingEffect.h"
 
 #include "worldentities/StaticEntity.h"
-#include "controllers/HumanController.h"
-
-#include "DockingEffect.h"
-#include "DockingAnimation.h"
-#include "DockingPrereqs.h"
 
 namespace orxonox // tolua_export
@@ -92 +94 @@
             static void cmdUndock();
 
+            // Network functions
+            void showDockingDialogHelper(PlayerInfo* player);
+            static void showDockingDialog();
+
         private:
             std::set<PlayerInfo*> candidates_; //!< A set of all players which are allowed to dock using the console command.