Ticket #3806: 3556_dedServer_v0.2.patch

source/gui/scripting/ScriptFunctions.cpp

@@ -332 +332 @@
 
 void SetNetworkGameAttributes(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue attribs1)
 {
-    ENSURE(g_NetServer);
+    ENSURE(g_NetClient);
     //TODO: This is a workaround because we need to pass a MutableHandle to a JSAPI functions somewhere
     // (with no obvious reason).
     JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
@@ -339 +339 @@
     JSAutoRequest rq(cx);
     JS::RootedValue attribs(cx, attribs1);
 
-    g_NetServer->UpdateGameAttributes(&attribs, *(pCxPrivate->pScriptInterface));
+    g_NetClient->SendGameSetupMessage(&attribs, *(pCxPrivate->pScriptInterface));
 }
 
 void StartNetworkHost(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& playerName)
@@ -425 +425 @@
 
 void AssignNetworkPlayer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), int playerID, const std::string& guid)
 {
-    ENSURE(g_NetServer);
+    ENSURE(g_NetClient);
 
-    g_NetServer->AssignPlayer(playerID, guid);
+    g_NetClient->SendAssignPlayerMessage(playerID, guid);
 }
 
 void SetNetworkPlayerStatus(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& guid, int ready)

source/network/NetClient.cpp

@@ -323 +323 @@
     SetCurrState(NCS_UNCONNECTED);
 }
 
+void CNetClient::SendGameSetupMessage(JS::MutableHandleValue attrs, ScriptInterface& scriptInterface)
+{
+    JSContext* cx = scriptInterface.GetContext();
+    JS::RootedValue attrsRooted(cx);
+    attrsRooted = attrs;
+
+    CGameSetupMessage gameSetup(scriptInterface);
+    gameSetup.m_Data = attrsRooted;
+    SendMessage(&gameSetup);
+}
+
+void CNetClient::SendAssignPlayerMessage(const int playerID, const std::string& guid)
+{
+    CAssignPlayerMessage assignPlayer;
+    assignPlayer.m_PlayerID = playerID;
+    assignPlayer.m_GUIDToAssign = guid;
+    SendMessage(&assignPlayer);
+}
+
 void CNetClient::SendChatMessage(const std::wstring& text)
 {
     CChatMessage chat;

source/network/NetClient.h

@@ -187 +187 @@
      */
     void LoadFinished();
 
+    void SendGameSetupMessage(JS::MutableHandleValue attrs, ScriptInterface& scriptInterface);
+
+    void SendAssignPlayerMessage(const int playerID, const std::string& guid);
+
     void SendChatMessage(const std::wstring& text);
 
     void SendReadyMessage(const int status);

source/network/NetMessage.cpp

@@ -203 +203 @@
         pNewMessage = new CSimulationMessage(scriptInterface);
         break;
 
+    case NMT_ASSIGN_PLAYER:
+        pNewMessage = new CAssignPlayerMessage;
+        break;
+
     default:
         LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
         break;

source/network/NetMessages.h

@@ -28 +28 @@
 
 #define PS_PROTOCOL_MAGIC               0x5073013f      // 'P', 's', 0x01, '?'
 #define PS_PROTOCOL_MAGIC_RESPONSE      0x50630121      // 'P', 'c', 0x01, '!'
-#define PS_PROTOCOL_VERSION             0x01010013      // Arbitrary protocol
+#define PS_PROTOCOL_VERSION             0x01010014      // Arbitrary protocol
 #define PS_DEFAULT_PORT                 0x5073          // 'P', 's'
 
 // Defines the list of message types. The order of the list must not change.
@@ -51 +51 @@
     NMT_CHAT,
     NMT_READY,
     NMT_GAME_SETUP,
+    NMT_ASSIGN_PLAYER,
     NMT_PLAYER_ASSIGNMENT,
 
     NMT_FILE_TRANSFER_REQUEST,
@@ -218 +219 @@
     NMT_END_ARRAY()
 END_NMT_CLASS()
 
+START_NMT_CLASS_(AssignPlayer, NMT_ASSIGN_PLAYER)
+    NMT_FIELD_INT(m_PlayerID, i8, 1)
+    NMT_FIELD(CStr, m_GUIDToAssign)
+END_NMT_CLASS()
+
 END_NMTS()
 
 #else

source/network/NetServer.cpp

@@ -649 +649 @@
     session->AddTransition(NSS_PREGAME, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, (void*)&OnDisconnect, context);
     session->AddTransition(NSS_PREGAME, (uint)NMT_CHAT, NSS_PREGAME, (void*)&OnChat, context);
     session->AddTransition(NSS_PREGAME, (uint)NMT_READY, NSS_PREGAME, (void*)&OnReady, context);
+    session->AddTransition(NSS_PREGAME, (uint)NMT_GAME_SETUP, NSS_PREGAME, (void*)&OnGameSetup, context);
+    session->AddTransition(NSS_PREGAME, (uint)NMT_ASSIGN_PLAYER, NSS_PREGAME, (void*)&OnAssignPlayer, context);
     session->AddTransition(NSS_PREGAME, (uint)NMT_LOADED_GAME, NSS_INGAME, (void*)&OnLoadedGame, context);
 
     session->AddTransition(NSS_JOIN_SYNCING, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, (void*)&OnDisconnect, context);
@@ -1111 +1113 @@
     return true;
 }
 
+bool CNetServerWorker::OnGameSetup(void* context, CFsmEvent* event)
+{
+    ENSURE(event->GetType() == (uint)NMT_GAME_SETUP);
+
+    CNetServerSession* session = (CNetServerSession*)context;
+    CNetServerWorker& server = session->GetServer();
+
+    if (session->GetGUID() != server.m_HostGUID) // Client wasn't allowed to send new attributes
+        return true;
+
+    CGameSetupMessage* message = (CGameSetupMessage*)event->GetParamRef();
+
+    server.UpdateGameAttributes(&(message->m_Data));
+    return true;
+}
+
+bool CNetServerWorker::OnAssignPlayer(void* context, CFsmEvent* event)
+{
+    ENSURE(event->GetType() == (uint)NMT_ASSIGN_PLAYER);
+    CNetServerSession* session = (CNetServerSession*)context;
+    CNetServerWorker& server = session->GetServer();
+
+    if (session->GetGUID() != server.m_HostGUID) // Client wasn't allowed to assign a player
+        return true;
+
+    CAssignPlayerMessage* message = (CAssignPlayerMessage*)event->GetParamRef();
+    server.m_AssignPlayerQueue.emplace_back(message->m_PlayerID, message->m_GUIDToAssign);
+    return true;
+}
+
 bool CNetServerWorker::OnLoadedGame(void* context, CFsmEvent* event)
 {
     ENSURE(event->GetType() == (uint)NMT_LOADED_GAME);

source/network/NetServer.h

@@ -270 +270 @@
     static bool OnInGame(void* context, CFsmEvent* event);
     static bool OnChat(void* context, CFsmEvent* event);
     static bool OnReady(void* context, CFsmEvent* event);
+    static bool OnGameSetup(void* context, CFsmEvent* event);
+    static bool OnAssignPlayer(void* context, CFsmEvent* event);
     static bool OnLoadedGame(void* context, CFsmEvent* event);
     static bool OnJoinSyncingLoadedGame(void* context, CFsmEvent* event);
     static bool OnRejoined(void* context, CFsmEvent* event);