Browse Source

Disable voice manager

AR2
mittorn 9 years ago
parent
commit
fae0f3e1c0
  1. 4
      dlls/Android.mk
  2. 8
      dlls/client.cpp
  3. 12
      dlls/multiplay_gamerules.cpp
  4. 8
      dlls/teamplay_gamerules.cpp

4
dlls/Android.mk

@ -128,8 +128,8 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \ @@ -128,8 +128,8 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
gravgun.cpp \
../pm_shared/pm_debug.c \
../pm_shared/pm_math.c \
../pm_shared/pm_shared.c \
../game_shared/voice_gamemgr.cpp
../pm_shared/pm_shared.c
# ../game_shared/voice_gamemgr.cpp
LOCAL_LDLIBS := -llog

8
dlls/client.cpp

@ -204,8 +204,8 @@ void ClientPutInServer( edict_t *pEntity ) @@ -204,8 +204,8 @@ void ClientPutInServer( edict_t *pEntity )
}
#include "voice_gamemgr.h"
extern CVoiceGameMgr g_VoiceGameMgr;
//#include "voice_gamemgr.h"
//extern CVoiceGameMgr g_VoiceGameMgr;
//// HOST_SAY
// String comes in as
@ -314,8 +314,8 @@ void Host_Say( edict_t *pEntity, int teamonly ) @@ -314,8 +314,8 @@ void Host_Say( edict_t *pEntity, int teamonly )
continue;
// can the receiver hear the sender? or has he muted him?
if ( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) )
continue;
//if ( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) )
//continue;
if ( teamonly && g_pGameRules->PlayerRelationship(client, CBaseEntity::Instance(pEntity)) != GR_TEAMMATE )
continue;

12
dlls/multiplay_gamerules.cpp

@ -43,7 +43,7 @@ extern int g_teamplay; @@ -43,7 +43,7 @@ extern int g_teamplay;
float g_flIntermissionStartTime = 0;
CVoiceGameMgr g_VoiceGameMgr;
//CVoiceGameMgr g_VoiceGameMgr;
class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper
{
@ -69,7 +69,7 @@ static CMultiplayGameMgrHelper g_GameMgrHelper; @@ -69,7 +69,7 @@ static CMultiplayGameMgrHelper g_GameMgrHelper;
CHalfLifeMultiplay :: CHalfLifeMultiplay()
{
g_VoiceGameMgr.Init(&g_GameMgrHelper, gpGlobals->maxClients);
//g_VoiceGameMgr.Init(&g_GameMgrHelper, gpGlobals->maxClients);
RefreshSkillData();
m_flIntermissionEndTime = 0;
@ -116,8 +116,8 @@ CHalfLifeMultiplay :: CHalfLifeMultiplay() @@ -116,8 +116,8 @@ CHalfLifeMultiplay :: CHalfLifeMultiplay()
BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{
if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
return TRUE;
//if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
//return TRUE;
return CGameRules::ClientCommand(pPlayer, pcmd);
}
@ -186,7 +186,7 @@ extern cvar_t mp_chattime; @@ -186,7 +186,7 @@ extern cvar_t mp_chattime;
//=========================================================
void CHalfLifeMultiplay :: Think ( void )
{
g_VoiceGameMgr.Update(gpGlobals->frametime);
//g_VoiceGameMgr.Update(gpGlobals->frametime);
///// Check game rules /////
static int last_frags;
@ -397,7 +397,7 @@ BOOL CHalfLifeMultiplay :: GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerI @@ -397,7 +397,7 @@ BOOL CHalfLifeMultiplay :: GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerI
//=========================================================
BOOL CHalfLifeMultiplay :: ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] )
{
g_VoiceGameMgr.ClientConnected(pEntity);
//g_VoiceGameMgr.ClientConnected(pEntity);
return TRUE;
}

8
dlls/teamplay_gamerules.cpp

@ -69,7 +69,7 @@ CHalfLifeTeamplay :: CHalfLifeTeamplay() @@ -69,7 +69,7 @@ CHalfLifeTeamplay :: CHalfLifeTeamplay()
extern cvar_t timeleft, fragsleft;
#include "voice_gamemgr.h"
extern CVoiceGameMgr g_VoiceGameMgr;
//extern CVoiceGameMgr g_VoiceGameMgr;
void CHalfLifeTeamplay :: Think ( void )
{
@ -80,7 +80,7 @@ void CHalfLifeTeamplay :: Think ( void ) @@ -80,7 +80,7 @@ void CHalfLifeTeamplay :: Think ( void )
int frags_remaining = 0;
int time_remaining = 0;
g_VoiceGameMgr.Update(gpGlobals->frametime);
//g_VoiceGameMgr.Update(gpGlobals->frametime);
if ( g_fGameOver ) // someone else quit the game already
{
@ -145,8 +145,8 @@ void CHalfLifeTeamplay :: Think ( void ) @@ -145,8 +145,8 @@ void CHalfLifeTeamplay :: Think ( void )
//=========================================================
BOOL CHalfLifeTeamplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{
if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
return TRUE;
//if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
//return TRUE;
if ( FStrEq( pcmd, "menuselect" ) )
{

Loading…
Cancel
Save