Changeset 8705 for code/branches/presentation/src/modules/docking/Dock.h

Timestamp:

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

Author:

dafrick

Message:

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

File:

• code/branches/presentation/src/modules/docking/Dock.h (modified) (2 diffs)

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.