FWGS
/
cs16-client-legacy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use BotVoice in HUD_VoiceStatus

This commit is contained in:
a1batross 2016-09-21 20:57:20 +03:00
parent 567c1f604a
commit 217ff810e7
5 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cl_dll/cdll_int.cpp
View File

@ -287,6 +287,7 @@ Called when a player starts or stops talking.
void DLLEXPORT HUD_VoiceStatus(int entindex, qboolean bTalking)
{
gHUD.m_Radio.Voice( entindex, bTalking );
}
/*
@ -342,20 +343,20 @@ int DLLEXPORT HUD_MobilityInterface( mobile_engfuncs_t *mobileapi )
{
if( mobileapi->version != MOBILITY_API_VERSION )
{
gEngfuncs.Con_Printf("Client Error: Mobile API version mismatch. Got: %i, want: %i\n",
mobileapi->version, MOBILITY_API_VERSION);
#ifdef __ANDROID__
if( gRenderAPI.Host_Error )
{
gRenderAPI.Host_Error("Xash3D Android version check failed!\nPlease update your Xash3D Android!\n");
}
#endif
gEngfuncs.Con_Printf("Client Error: Mobile API version mismatch. Got: %i, want: %i\n", mobileapi->version, MOBILITY_API_VERSION);
return 1;
}
g_iMobileAPIVersion = MOBILITY_API_VERSION;
gMobileAPI = *mobileapi;
return 0;
}

3
cl_dll/hud/nvg.cpp
View File

@ -52,6 +52,7 @@ int CHudNVG::Init()
return 0;
}
int CHudNVG::Draw(float flTime)
{
if ( !m_iEnable || gEngfuncs.IsSpectateOnly() )
@ -62,7 +63,7 @@ int CHudNVG::Draw(float flTime)
// draw a dynamic light on player's origin
dlight_t *dl = gEngfuncs.pEfxAPI->CL_AllocDlight ( 0 );
VectorCopy ( gHUD.m_vecOrigin, dl->origin );
dl->origin = gHUD.m_vecOrigin;
dl->radius = gEngfuncs.pfnRandomFloat( 750, 800 );
dl->die = flTime + 0.1f;
dl->color.r = 50;

94
cl_dll/hud/radio.cpp
View File

@ -47,19 +47,24 @@ int CHudRadio::Init( )
return 1;
}
static void Broadcast( const char *msg, int pitch )
{
if ( msg[0] == '%' && msg[1] == '!' )
gEngfuncs.pfnPlaySoundVoiceByName( &msg[1], 1.0f, pitch );
else
gEngfuncs.pfnPlaySoundVoiceByName( &msg[1], 1.0f, pitch );
}
int CHudRadio::MsgFunc_SendAudio( const char *pszName, int iSize, void *pbuf )
{
BufferReader reader( pszName, pbuf, iSize );
char sentence[64];
int SenderID = reader.ReadByte( );
strncpy( sentence, reader.ReadString( ), sizeof( sentence ) );
char *sentence = reader.ReadString( );
int pitch = reader.ReadShort( );
if ( sentence[0] == '%' && sentence[1] == '!' )
gEngfuncs.pfnPlaySoundByNameAtPitch( &sentence[1], 1.0f, pitch );
else
gEngfuncs.pfnPlaySoundVoiceByName( sentence, 1.0f, pitch );
Broadcast( sentence, pitch );
g_PlayerExtraInfo[SenderID].radarflashes = 22;
g_PlayerExtraInfo[SenderID].radarflash = gHUD.m_flTime;
@ -83,19 +88,52 @@ int CHudRadio::MsgFunc_ReloadSound( const char *pszName, int iSize, void *pbuf )
return 1;
}
void Broadcast( const char *msg )
{
if ( msg[0] == '%' && msg[1] == '!' )
PlaySound( &msg[1], 1.0f );
else
PlaySound( msg, 1.0f );
}
void VoiceIconCallback(struct tempent_s *ent, float frametime, float currenttime)
static void VoiceIconCallback(struct tempent_s *ent, float frametime, float currenttime)
{
int entIndex = ent->clientIndex;
if( !g_PlayerExtraInfo[entIndex].talking )
{
g_PlayerExtraInfo[entIndex].talking = false;
ent->die = 0.0f;
}
}
void CHudRadio::Voice(int entindex, bool bTalking)
{
extra_player_info_t *pplayer;
TEMPENTITY *temp;
int spr;
if( entindex < 0 || entindex > MAX_PLAYERS - 1) // bomb can't talk!
return;
pplayer = g_PlayerExtraInfo + entindex;
if( bTalking == pplayer->talking )
return; // user is talking already
if( !bTalking && pplayer->talking )
{
pplayer->talking = false;
return; // stop talking
}
spr = gEngfuncs.pEventAPI->EV_FindModelIndex( "sprites/voiceicon.spr" );
if( !spr ) return;
temp = gEngfuncs.pEfxAPI->R_DefaultSprite( vec3_origin, spr, 0 );
if( !temp ) return;
pplayer->talking = true; // sprite is created
temp->flags = FTENT_SPRANIMATELOOP | FTENT_CLIENTCUSTOM | FTENT_PLYRATTACHMENT;
temp->tentOffset.z = 40;
temp->clientIndex = entindex;
temp->callback = VoiceIconCallback;
temp->entity.curstate.scale = 0.60f;
temp->entity.curstate.rendermode = kRenderTransAdd;
temp->die = gHUD.m_flTime + 60.0f; // 60 seconds must be enough?
}
int CHudRadio::MsgFunc_BotVoice( const char *pszName, int iSize, void *buf )
@ -105,33 +143,7 @@ int CHudRadio::MsgFunc_BotVoice( const char *pszName, int iSize, void *buf )
int enable = reader.ReadByte();
int entIndex = reader.ReadByte();
if( entIndex < 0 || entIndex > 32 )
return 0;
if( !enable )
{
g_PlayerExtraInfo[entIndex].talking = false;
ConsolePrint("Removing bot voice icon\n");
return 1;
}
int spr = gEngfuncs.pEventAPI->EV_FindModelIndex( "sprites/voiceicon.spr" );
if( !spr )
return 0;
TEMPENTITY *temp = gEngfuncs.pEfxAPI->R_DefaultSprite( vec3_origin, spr, 0 );
if( !temp )
return 0;
temp->flags = FTENT_SPRANIMATELOOP | FTENT_CLIENTCUSTOM | FTENT_PLYRATTACHMENT;
temp->tentOffset.z = 40;
temp->clientIndex = entIndex;
temp->callback = VoiceIconCallback;
temp->entity.curstate.scale = 0.60f;
temp->entity.curstate.rendermode = kRenderTransAdd;
temp->die = gHUD.m_flTime + 60.0f; // 60 seconds must be enough?
g_PlayerExtraInfo[entIndex].talking = true;
Voice( entIndex, enable );
return 1;
}

1
cl_dll/include/hud/hud.h
View File

@ -690,6 +690,7 @@ class CHudRadio: public CHudBase
{
public:
int Init( void );
void Voice(int entindex, bool bTalking );
// play a sentence from a radio
// [byte] unknown (always 1)
// [string] sentence name

3
dlls/wpn_shared/wpn_c4.cpp
View File

@ -188,10 +188,11 @@ void CC4::PrimaryAttack(void)
{
m_bStartedArming = false;
m_fArmedTime = 0;
Broadcast("BOMBPL");
m_pPlayer->m_bHasC4 = false;
#ifndef CLIENT_WEAPONS
Broadcast("BOMBPL");
if (pev->speed != 0 && g_pGameRules)
g_pGameRules->m_iC4Timer = (int)pev->speed;