Properly display kicked status

KD-lab-Open-Source · Jun 3, 2024 · af63cfe · af63cfe
1 parent 1015306
commit af63cfe
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 11 deletions.
diff --git a/Source/Game/Texts.cpp b/Source/Game/Texts.cpp
@@ -836,6 +836,7 @@ void qdTextDB::load_supplementary_texts(const std::string& locale) {
            "Interface.Menu.Messages.Multiplayer.HostTerminated=Хост прекратил игру или отключился",
            "Interface.Menu.Messages.Multiplayer.StartingGame=Игра начинается...",
            "Interface.Menu.Messages.Multiplayer.ChatTip=Нажмите &00FFFF\"Insert\"&FFFFFF чтобы написать игрокам из своего клана, &00FFFF\"Control + Insert\"&FFFFFF или &00FFFF\"Control + Space\"&FFFFFF чтобы написать всем игрокам.",
+           "Interface.Menu.Messages.Multiplayer.Kicked=Вас кикнули.",
            "Interface.Menu.Messages.Confirmations.PendingChanges=Отложенные изменения не будут применены, вернуться в главное меню?",
            "Interface.Menu.Messages.Confirmations.ApplyChangesRestart=Чтобы применить изменения, требуется перезапуск игры, вы уверены?",
            "Interface.Menu.Messages.Confirmations.OpenWeb=Открыть сайт?",
@@ -913,6 +914,7 @@ void qdTextDB::load_supplementary_texts(const std::string& locale) {
            "Interface.Menu.Messages.Multiplayer.HostTerminated=Host has terminated session or disconnected",
            "Interface.Menu.Messages.Multiplayer.StartingGame=Starting the game...",
            "Interface.Menu.Messages.Multiplayer.ChatTip=Press &00FFFF\"Insert\"&FFFFFF to chat with your clan players, &00FFFF\"Control + Insert\"&FFFFFF or &00FFFF\"Control + Space\"&FFFFFF to chat with all players.",
+           "Interface.Menu.Messages.Multiplayer.Kicked=You got kicked.",
            "Interface.Menu.Messages.Confirmations.PendingChanges=Pending changes will not be applied, return to main menu?",
            "Interface.Menu.Messages.Confirmations.ApplyChangesRestart=Game restart is required to apply changes, are you sure?",
            "Interface.Menu.Messages.Confirmations.OpenWeb=Open the website?",

diff --git a/Source/Network/P2P_interface.h b/Source/Network/P2P_interface.h
@@ -214,7 +214,7 @@ struct PClientData
 enum e_PNCInterfaceCommands {
 	PNC_INTERFACE_COMMAND_NONE,
 	PNC_INTERFACE_COMMAND_CONNECTION_FAILED,
-	PNC_INTERFACE_COMMAND_CONNECTION_DROPPED,
+    PNC_INTERFACE_COMMAND_KICKED,
 	PNC_INTERFACE_COMMAND_INFO_PLAYER_EXIT,
 	PNC_INTERFACE_COMMAND_INFO_PLAYER_DISCONNECTED,
     PNC_INTERFACE_COMMAND_INFO_MESSAGE,
@@ -531,6 +531,7 @@ class PNetCenter {
 
 	bool Init();
 	void SetConnectionTimeout(int ms);
+    void KickPlayer(NETID netid);
 	void RemovePlayer(NETID netid);
 
 	bool isConnected() const;

diff --git a/Source/Network/P2P_interface1Th.cpp b/Source/Network/P2P_interface1Th.cpp
@@ -343,7 +343,12 @@ void PNetCenter::HandlerInputNetCommand()
             netCommand4G_Exit nc4g_exit(in_ClientBuf);
             //Host already does this before relaying to itself
             if (!isHost()) {
-                ExitClient(nc4g_exit.netid);
+                if (nc4g_exit.netid == m_localNETID) {
+                    ExecuteInternalCommand(PNC_COMMAND__RESET, false);
+                    ExecuteInterfaceCommand(PNC_INTERFACE_COMMAND_KICKED);
+                } else {
+                    ExitClient(nc4g_exit.netid);
+                }
             }
             break;
         }
@@ -533,8 +538,8 @@ void PNetCenter::P2PIQuant()
 		gameShell->generalErrorOccured(GameShell::GENERAL_CONNECTION_FAILED);
         end_game = true;
 		break;
-	case PNC_INTERFACE_COMMAND_CONNECTION_DROPPED:
-		gameShell->generalErrorOccured(GameShell::CLIENT_DROPPED);
+	case PNC_INTERFACE_COMMAND_KICKED:
+		gameShell->generalErrorOccured(GameShell::KICKED);
         end_game = true;
 		break;
 	case PNC_INTERFACE_COMMAND_HOST_TERMINATED_GAME:

diff --git a/Source/Network/P2P_interface2Th_Host.cpp b/Source/Network/P2P_interface2Th_Host.cpp
@@ -329,7 +329,7 @@ void PNetCenter::CheckClients()
         {
             LogMsg("Client NID 0x%" PRIX64 " is not ready. removing.\n", (*i)->netidPlayer);
 
-            RemovePlayer((*i)->netidPlayer);
+            KickPlayer((*i)->netidPlayer);
 
             delete *i;
             m_clients.erase(i++);
@@ -523,7 +523,7 @@ void PNetCenter::hostProcessPlayerClientPackets(PClientData* client) {
                                     pd.realPlayerType = ncChRT.newRealPlayerType_;
                                 }
                             }
-                            RemovePlayer(delPlayerNETID);
+                            KickPlayer(delPlayerNETID);
                         } else if (pd.realPlayerType==REAL_PLAYER_TYPE_PLAYER_AI) {
                             if (ncChRT.newRealPlayerType_ == REAL_PLAYER_TYPE_OPEN) {
                                 mission.disconnect2PlayerData(ncChRT.idxPlayerData_);
@@ -679,7 +679,7 @@ void PNetCenter::hostProcessPlayerClientPackets(PClientData* client) {
                             NETID delPlayerNETID=hostMissionDescription->playersData[i].netid;
                             hostMissionDescription->disconnect2PlayerData(i);
                             //hostMissionDescription->playersData[i].realPlayerType=REAL_PLAYER_TYPE_CLOSE;
-                            RemovePlayer(delPlayerNETID); //Полное удаление по DPN_MSGID_DESTROY_PLAYER
+                            KickPlayer(delPlayerNETID); //Полное удаление по DPN_MSGID_DESTROY_PLAYER
                         }
                     }
                     *hostMissionDescription = nc_changeMap.missionDescription_;

diff --git a/Source/Network/P2P_interface2Th_NetConn.cpp b/Source/Network/P2P_interface2Th_NetConn.cpp
@@ -7,10 +7,20 @@
 #include "ServerList.h"
 
 void PNetCenter::SetConnectionTimeout(int _ms) {
-    //Unused since SDL_net doesn't have any way to set connect or send timeouts 
+    //Unused since SDL_net doesn't have any way to set connect or send timeouts
+    //TODO we do have timeout now but is hardcoded as constant, remove it and use this
     //connectionHandler->connection_timeout = ms;
 }
 
+void PNetCenter::KickPlayer(NETID netid) {
+    fprintf(stdout, "KickPlayer: 0x%" PRIX64 "\n", netid);
+
+    netCommand4G_Exit ex(netid);
+    SendEvent(ex, netid);
+
+    RemovePlayer(netid);
+}
+
 void PNetCenter::RemovePlayer(NETID netid)
 {
     fprintf(stdout, "RemovePlayer: 0x%" PRIX64 "\n", netid);

diff --git a/Source/UserInterface/GameShell.h b/Source/UserInterface/GameShell.h
@@ -260,7 +260,7 @@ class GameShell
 
 	enum GeneralErrorType {
 		GENERAL_CONNECTION_FAILED,
-        CLIENT_DROPPED,
+        KICKED,
 		HOST_TERMINATED,
         DESYNC
 	};

diff --git a/Source/UserInterface/Menu/MultiplayerCommon.cpp b/Source/UserInterface/Menu/MultiplayerCommon.cpp
@@ -325,8 +325,8 @@ int showGeneralErrorMessageQuant(float, float ) {
             case GameShell::GENERAL_CONNECTION_FAILED:
                 textID = "Interface.Menu.Messages.Multiplayer.ConnectionFailed";
                 break;
-            case GameShell::CLIENT_DROPPED:
-                textID = "Interface.Menu.Messages.Multiplayer.ClientDropped";
+            case GameShell::KICKED:
+                textID = "Interface.Menu.Messages.Multiplayer.Kicked";
                 break;
             case GameShell::HOST_TERMINATED:
                 textID = "Interface.Menu.Messages.Multiplayer.HostTerminated";