[xrGame] Fix voice chat, enable it for all mp modes

Author: yohjimane

src/xrGame/game_cl_freemp.cpp

@@ -200,8 +200,3 @@ void game_cl_freemp::OnScreenResolutionChanged()
 	}
 }
 
-void game_cl_freemp::OnVoiceMessage(NET_Packet* P)
-{
-	m_pVoiceChat->ReceiveMessage(P);
-}
-

src/xrGame/game_cl_freemp.h

@@ -38,9 +38,6 @@ class game_cl_freemp :public game_cl_mp
 
 	virtual void OnScreenResolutionChanged();
 
-private:
-	void OnVoiceMessage(NET_Packet* P);
-
 private:
 
 };

src/xrGame/game_cl_mp.cpp

@@ -1895,3 +1895,8 @@ void game_cl_mp::ProcessPlayersInfoReply(NET_Packet& P)
         tmp_cb(info_count);
     }
 }
+
+void game_cl_mp::OnVoiceMessage(NET_Packet* P)
+{
+    m_pVoiceChat->ReceiveMessage(P);
+}

src/xrGame/game_cl_mp.h

@@ -180,10 +180,6 @@ class game_cl_mp : public game_cl_GameState
     virtual void TranslateGameMessage(u32 msg, NET_Packet& P);
     virtual void CommonMessageOut(pcstr msg);
 
-    virtual bool OnKeyboardPress(int key);
-    virtual	bool OnKeyboardRelease(int key);
-    CVoiceChat* m_pVoiceChat = nullptr;
-
     virtual bool CanBeReady() { return true; };
     virtual void shedule_Update(u32 dt);
     bool IsLocalPlayerInitialized() const;
@@ -313,6 +309,12 @@ class game_cl_mp : public game_cl_GameState
     //-------------------------------------------------------------------------------------------------
     static xr_string generate_file_name(const xr_string& base_name, const time_t* date_time = nullptr);
     static xr_string sanitize_filename(const xr_string& base_name);
+
+    virtual bool OnKeyboardPress(int key);
+    virtual	bool OnKeyboardRelease(int key);
+    CVoiceChat* m_pVoiceChat = nullptr;
+private:
+    virtual void OnVoiceMessage(NET_Packet* P);
 //-------------------------------------------------------------------------------------------------
 #include "game_cl_mp_messages_menu.h"
 };

src/xrGame/xrGame.vcxproj.filters

@@ -6374,6 +6374,8 @@
     <ClInclude Include="net_physics_state.h">
       <Filter>AI\AMonsters\common\net</Filter>
     </ClInclude>
+    <ClInclude Include="VoiceChat.h" />
+    <ClInclude Include="VoiceSender.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -9624,6 +9626,8 @@
     <ClCompile Include="game_sv_freemp_upgrade_and_repair.cpp">
       <Filter>Core\Server\Games\client\freemp</Filter>
     </ClCompile>
+    <ClCompile Include="VoiceChat.cpp" />
+    <ClCompile Include="VoiceSender.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\OpenXRay.natvis" />