client: add const where it needs to be
This commit is contained in:
parent
bcf6d80cf8
commit
0b242a0bc9
@ -22,9 +22,9 @@ public:
|
|||||||
int CheckMap();
|
int CheckMap();
|
||||||
private:
|
private:
|
||||||
char *ParseEntity( char *pBuf, int &error, CBspEntity *pEnt );
|
char *ParseEntity( char *pBuf, int &error, CBspEntity *pEnt );
|
||||||
void LumpPass( char *pBuf, char *pszClassname, CBspEntity *pEnt );
|
void LumpPass( char *pBuf, const char *pszClassname, CBspEntity *pEnt );
|
||||||
char *LoadEntityLump( char *pszFilename );
|
char *LoadEntityLump( char *pszFilename );
|
||||||
void ParseBsp( char *pszClassname, CBspEntity *pEnt );
|
void ParseBsp( const char *pszClassname, CBspEntity *pEnt );
|
||||||
|
|
||||||
char m_szCurrentLevel[256];
|
char m_szCurrentLevel[256];
|
||||||
};
|
};
|
||||||
|
@ -120,7 +120,7 @@ void CenterPrint(const char*);
|
|||||||
#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
|
#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
|
||||||
|
|
||||||
// sound functions
|
// sound functions
|
||||||
inline void PlaySound( char *szSound, float vol ) { gEngfuncs.pfnPlaySoundByName( szSound, vol ); }
|
inline void PlaySound( const char *szSound, float vol ) { gEngfuncs.pfnPlaySoundByName( szSound, vol ); }
|
||||||
inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex( iSound, vol ); }
|
inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex( iSound, vol ); }
|
||||||
|
|
||||||
#define Q_max(a, b) (((a) > (b)) ? (a) : (b))
|
#define Q_max(a, b) (((a) > (b)) ? (a) : (b))
|
||||||
|
@ -41,12 +41,12 @@ COM_Log
|
|||||||
Log debug messages to file ( appends )
|
Log debug messages to file ( appends )
|
||||||
====================
|
====================
|
||||||
*/
|
*/
|
||||||
void COM_Log( char *pszFile, char *fmt, ...)
|
void COM_Log( const char *pszFile, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
char string[1024];
|
char string[1024];
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
char *pfilename;
|
const char *pfilename;
|
||||||
|
|
||||||
if ( !pszFile )
|
if ( !pszFile )
|
||||||
{
|
{
|
||||||
@ -111,7 +111,7 @@ HUD_PlaySound
|
|||||||
Play a sound, if we are seeing this command for the first time
|
Play a sound, if we are seeing this command for the first time
|
||||||
=====================
|
=====================
|
||||||
*/
|
*/
|
||||||
void HUD_PlaySound( char *sound, float volume )
|
void HUD_PlaySound( const char *sound, float volume )
|
||||||
{
|
{
|
||||||
if ( !g_runfuncs || !g_finalstate )
|
if ( !g_runfuncs || !g_finalstate )
|
||||||
return;
|
return;
|
||||||
@ -270,8 +270,8 @@ stub functions for such things as precaching. So we don't have to modify weapon
|
|||||||
is compiled into both game and client .dlls.
|
is compiled into both game and client .dlls.
|
||||||
======================
|
======================
|
||||||
*/
|
*/
|
||||||
int stub_PrecacheModel ( char* s ) { return 0; }
|
int stub_PrecacheModel ( const char* s ) { return 0; }
|
||||||
int stub_PrecacheSound ( char* s ) { return 0; }
|
int stub_PrecacheSound ( const char* s ) { return 0; }
|
||||||
unsigned short stub_PrecacheEvent ( int type, const char *s ) { return 0; }
|
unsigned short stub_PrecacheEvent ( int type, const char *s ) { return 0; }
|
||||||
const char *stub_NameForFunction ( unsigned long function ) { return "func"; }
|
const char *stub_NameForFunction ( unsigned long function ) { return "func"; }
|
||||||
void stub_SetModel ( edict_t *e, const char *m ) {}
|
void stub_SetModel ( edict_t *e, const char *m ) {}
|
||||||
|
@ -20,7 +20,7 @@ extern "C"
|
|||||||
void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
|
void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
|
||||||
}
|
}
|
||||||
|
|
||||||
void COM_Log( char *pszFile, char *fmt, ...);
|
void COM_Log( const char *pszFile, const char *fmt, ...);
|
||||||
int CL_IsDead( void );
|
int CL_IsDead( void );
|
||||||
|
|
||||||
float UTIL_SharedRandomFloat( unsigned int seed, float low, float high );
|
float UTIL_SharedRandomFloat( unsigned int seed, float low, float high );
|
||||||
@ -28,11 +28,11 @@ int UTIL_SharedRandomLong( unsigned int seed, int low, int high );
|
|||||||
|
|
||||||
int HUD_GetWeaponAnim( void );
|
int HUD_GetWeaponAnim( void );
|
||||||
void HUD_SendWeaponAnim( int iAnim, int body, int force );
|
void HUD_SendWeaponAnim( int iAnim, int body, int force );
|
||||||
void HUD_PlaySound( char *sound, float volume );
|
void HUD_PlaySound( const char *sound, float volume );
|
||||||
void HUD_PlaybackEvent( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
|
void HUD_PlaybackEvent( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
|
||||||
void HUD_SetMaxSpeed( const struct edict_s *ed, float speed );
|
void HUD_SetMaxSpeed( const struct edict_s *ed, float speed );
|
||||||
int stub_PrecacheModel( char* s );
|
int stub_PrecacheModel( const char* s );
|
||||||
int stub_PrecacheSound( char* s );
|
int stub_PrecacheSound( const char* s );
|
||||||
unsigned short stub_PrecacheEvent( int type, const char *s );
|
unsigned short stub_PrecacheEvent( int type, const char *s );
|
||||||
const char *stub_NameForFunction ( unsigned long function );
|
const char *stub_NameForFunction ( unsigned long function );
|
||||||
void stub_SetModel ( struct edict_s *e, const char *m );
|
void stub_SetModel ( struct edict_s *e, const char *m );
|
||||||
|
@ -254,7 +254,7 @@ int CHudDeathNotice :: MsgFunc_DeathMsg( const char *pszName, int iSize, void *p
|
|||||||
rgDeathNoticeList[i].iSpecialDeath = special;
|
rgDeathNoticeList[i].iSpecialDeath = special;
|
||||||
|
|
||||||
// Get the Killer's name
|
// Get the Killer's name
|
||||||
char *killer_name = g_PlayerInfoList[ killer ].name;
|
const char *killer_name = g_PlayerInfoList[ killer ].name;
|
||||||
if ( !killer_name )
|
if ( !killer_name )
|
||||||
{
|
{
|
||||||
killer_name = "";
|
killer_name = "";
|
||||||
@ -268,7 +268,7 @@ int CHudDeathNotice :: MsgFunc_DeathMsg( const char *pszName, int iSize, void *p
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get the Victim's name
|
// Get the Victim's name
|
||||||
char *victim_name = NULL;
|
const char *victim_name = NULL;
|
||||||
// If victim is -1, the killer killed a specific, non-player object (like a sentrygun)
|
// If victim is -1, the killer killed a specific, non-player object (like a sentrygun)
|
||||||
if ( ((char)victim) != -1 )
|
if ( ((char)victim) != -1 )
|
||||||
victim_name = g_PlayerInfoList[ victim ].name;
|
victim_name = g_PlayerInfoList[ victim ].name;
|
||||||
|
@ -711,7 +711,7 @@ void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int
|
|||||||
|
|
||||||
// globals used by most Pistol events
|
// globals used by most Pistol events
|
||||||
// Some Ruger specific code is here too.
|
// Some Ruger specific code is here too.
|
||||||
int EV_PistolShoot( event_args_t *args , char *fire_sound,int iBulletType, char *loshell, char *hishell)
|
int EV_PistolShoot( event_args_t *args , const char *fire_sound,int iBulletType, const char *loshell, const char *hishell)
|
||||||
{
|
{
|
||||||
int idx = args->entindex;
|
int idx = args->entindex;
|
||||||
int empty = args->bparam1;
|
int empty = args->bparam1;
|
||||||
@ -2094,7 +2094,7 @@ void EV_CattleProd(event_args_t *args)
|
|||||||
/*************
|
/*************
|
||||||
Akimbo Weapons
|
Akimbo Weapons
|
||||||
*************/
|
*************/
|
||||||
void EV_AkimboWeapon(event_args_t *args, char *sound, char *loshell, char *hishell, int bullettype, int ptype )
|
void EV_AkimboWeapon(event_args_t *args, const char *sound, const char *loshell, const char *hishell, int bullettype, int ptype )
|
||||||
{
|
{
|
||||||
int idx;
|
int idx;
|
||||||
vec3_t origin, angles, up, right, forward, velocity;
|
vec3_t origin, angles, up, right, forward, velocity;
|
||||||
|
@ -572,8 +572,8 @@ public:
|
|||||||
|
|
||||||
//had to make these public so CHud could access them (to enable concussion icon)
|
//had to make these public so CHud could access them (to enable concussion icon)
|
||||||
//could use a friend declaration instead...
|
//could use a friend declaration instead...
|
||||||
void EnableIcon( char *pszIconName, unsigned char red, unsigned char green, unsigned char blue );
|
void EnableIcon( const char *pszIconName, unsigned char red, unsigned char green, unsigned char blue );
|
||||||
void DisableIcon( char *pszIconName );
|
void DisableIcon( const char *pszIconName );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ DECLARE_MESSAGE( m_Message, GameTitle )
|
|||||||
|
|
||||||
// 1 Global client_textmessage_t for custom messages that aren't in the titles.txt
|
// 1 Global client_textmessage_t for custom messages that aren't in the titles.txt
|
||||||
client_textmessage_t g_pCustomMessage;
|
client_textmessage_t g_pCustomMessage;
|
||||||
char *g_pCustomName = "Custom";
|
const char *g_pCustomName = "Custom";
|
||||||
char g_pCustomText[1024];
|
char g_pCustomText[1024];
|
||||||
|
|
||||||
int CHudMessage::Init(void)
|
int CHudMessage::Init(void)
|
||||||
|
@ -178,7 +178,7 @@ char *CParseBsp::LoadEntityLump( char *pszFilename )
|
|||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CParseBsp::LumpPass( char *pBuf, char *pszClassname, CBspEntity *pEnt )
|
void CParseBsp::LumpPass( char *pBuf, const char *pszClassname, CBspEntity *pEnt )
|
||||||
{
|
{
|
||||||
char szToken[ 1024 ];
|
char szToken[ 1024 ];
|
||||||
int error = 0;
|
int error = 0;
|
||||||
@ -210,7 +210,7 @@ void CParseBsp::LumpPass( char *pBuf, char *pszClassname, CBspEntity *pEnt )
|
|||||||
delete pEnt;
|
delete pEnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CParseBsp::ParseBsp( char *pszClassname, CBspEntity *pEnt )
|
void CParseBsp::ParseBsp( const char *pszClassname, CBspEntity *pEnt )
|
||||||
{
|
{
|
||||||
char szFilename[256];
|
char szFilename[256];
|
||||||
char *pBuf;
|
char *pBuf;
|
||||||
|
@ -102,10 +102,11 @@ int CHudStatusIcons::MsgFunc_StatusIcon( const char *pszName, int iSize, void *p
|
|||||||
}
|
}
|
||||||
|
|
||||||
// add the icon to the icon list, and set it's drawing color
|
// add the icon to the icon list, and set it's drawing color
|
||||||
void CHudStatusIcons::EnableIcon( char *pszIconName, unsigned char red, unsigned char green, unsigned char blue )
|
void CHudStatusIcons::EnableIcon( const char *pszIconName, unsigned char red, unsigned char green, unsigned char blue )
|
||||||
{
|
{
|
||||||
// check to see if the sprite is in the current list
|
// check to see if the sprite is in the current list
|
||||||
for ( int i = 0; i < MAX_ICONSPRITES; i++ )
|
int i;
|
||||||
|
for ( i = 0; i < MAX_ICONSPRITES; i++ )
|
||||||
{
|
{
|
||||||
if ( !stricmp( m_IconList[i].szSpriteName, pszIconName ) )
|
if ( !stricmp( m_IconList[i].szSpriteName, pszIconName ) )
|
||||||
break;
|
break;
|
||||||
@ -145,7 +146,7 @@ void CHudStatusIcons::EnableIcon( char *pszIconName, unsigned char red, unsigned
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CHudStatusIcons::DisableIcon( char *pszIconName )
|
void CHudStatusIcons::DisableIcon( const char *pszIconName )
|
||||||
{
|
{
|
||||||
// find the sprite is in the current list
|
// find the sprite is in the current list
|
||||||
for ( int i = 0; i < MAX_ICONSPRITES; i++ )
|
for ( int i = 0; i < MAX_ICONSPRITES; i++ )
|
||||||
|
@ -102,7 +102,7 @@ char *CHudTextMessage::BufferedLocaliseTextString( const char *msg )
|
|||||||
char *CHudTextMessage::LookupString( const char *msg, int *msg_dest )
|
char *CHudTextMessage::LookupString( const char *msg, int *msg_dest )
|
||||||
{
|
{
|
||||||
if ( !msg )
|
if ( !msg )
|
||||||
return "";
|
return (char*)"";
|
||||||
|
|
||||||
// '#' character indicates this is a reference to a string in titles.txt, and not the string itself
|
// '#' character indicates this is a reference to a string in titles.txt, and not the string itself
|
||||||
if ( msg[0] == '#' )
|
if ( msg[0] == '#' )
|
||||||
|
@ -99,7 +99,7 @@ AlertMessage
|
|||||||
Print debug messages to console
|
Print debug messages to console
|
||||||
======================
|
======================
|
||||||
*/
|
*/
|
||||||
void AlertMessage( ALERT_TYPE atype, char *szFmt, ... )
|
void AlertMessage( ALERT_TYPE atype, const char *szFmt, ... )
|
||||||
{
|
{
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
static char string[1024];
|
static char string[1024];
|
||||||
@ -269,7 +269,7 @@ CBasePlayerWeapon :: DefaultDeploy
|
|||||||
|
|
||||||
=====================
|
=====================
|
||||||
*/
|
*/
|
||||||
BOOL CBasePlayerWeapon :: DefaultDeploy( char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal, int body )
|
BOOL CBasePlayerWeapon :: DefaultDeploy( const char *szViewModel, const char *szWeaponModel, int iAnim, const char *szAnimExt, int skiplocal, int body )
|
||||||
{
|
{
|
||||||
if ( !CanDeploy() )
|
if ( !CanDeploy() )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -83,7 +83,7 @@ public:
|
|||||||
void paintBackground();
|
void paintBackground();
|
||||||
|
|
||||||
void SetInfo(char *pszClassname);
|
void SetInfo(char *pszClassname);
|
||||||
void SetImage( char *pszClassname, int iIndex );
|
void SetImage( const char *pszClassname, int iIndex );
|
||||||
void AddItem( playeritemlist_t *pList, int iSlot, int iIndex );
|
void AddItem( playeritemlist_t *pList, int iSlot, int iIndex );
|
||||||
void SendItems();
|
void SendItems();
|
||||||
private:
|
private:
|
||||||
@ -422,7 +422,7 @@ void CItemSelectionPanel::SetInfo(char *pszClassname)
|
|||||||
m_pInformationPanel->SetInfo(pszClassname);
|
m_pInformationPanel->SetInfo(pszClassname);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CItemSelectionPanel::SetImage(char *pszClassname,int iIndex)
|
void CItemSelectionPanel::SetImage(const char *pszClassname,int iIndex)
|
||||||
{
|
{
|
||||||
// Show image
|
// Show image
|
||||||
char szImageName[128];
|
char szImageName[128];
|
||||||
|
@ -46,7 +46,7 @@ int HUD_IsGame( const char *game );
|
|||||||
class SBColumnInfo
|
class SBColumnInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
char *m_pTitle; // If null, ignore, if starts with #, it's localized, otherwise use the string directly.
|
const char *m_pTitle; // If null, ignore, if starts with #, it's localized, otherwise use the string directly.
|
||||||
int m_Width; // Based on 640 width. Scaled to fit other resolutions.
|
int m_Width; // Based on 640 width. Scaled to fit other resolutions.
|
||||||
Label::Alignment m_Alignment;
|
Label::Alignment m_Alignment;
|
||||||
};
|
};
|
||||||
|
@ -89,7 +89,7 @@ public:
|
|||||||
m_nMouseOverRow = row;
|
m_nMouseOverRow = row;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DoSort( char *sortkey )
|
void DoSort( const char *sortkey )
|
||||||
{
|
{
|
||||||
// Request server list and refresh servers...
|
// Request server list and refresh servers...
|
||||||
SortServers( sortkey );
|
SortServers( sortkey );
|
||||||
@ -440,7 +440,7 @@ private:
|
|||||||
ServerBrowserTablePanel *m_pBrowser;
|
ServerBrowserTablePanel *m_pBrowser;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CSBLabel( char *name, char *sortkey ) : Label( name )
|
CSBLabel( const char *name, const char *sortkey ) : Label( name )
|
||||||
{
|
{
|
||||||
m_pBrowser = NULL;
|
m_pBrowser = NULL;
|
||||||
|
|
||||||
|
@ -322,7 +322,7 @@ public:
|
|||||||
void CreateCommandMenu( void );
|
void CreateCommandMenu( void );
|
||||||
void CreateScoreBoard( void );
|
void CreateScoreBoard( void );
|
||||||
void CreateServerBrowser( void );
|
void CreateServerBrowser( void );
|
||||||
CommandButton *CreateCustomButton( char *pButtonText, char *pButtonName );
|
CommandButton *CreateCustomButton( const char *pButtonText, const char *pButtonName );
|
||||||
CCommandMenu *CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText );
|
CCommandMenu *CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText );
|
||||||
|
|
||||||
void UpdateCursorState( void );
|
void UpdateCursorState( void );
|
||||||
@ -413,14 +413,14 @@ protected:
|
|||||||
char m_pszCommand[MAX_COMMAND_SIZE];
|
char m_pszCommand[MAX_COMMAND_SIZE];
|
||||||
int m_iCloseVGUIMenu;
|
int m_iCloseVGUIMenu;
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommand( char *pszCommand )
|
CMenuHandler_StringCommand( const char *pszCommand )
|
||||||
{
|
{
|
||||||
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
||||||
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
||||||
m_iCloseVGUIMenu = false;
|
m_iCloseVGUIMenu = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommand( char *pszCommand, int iClose )
|
CMenuHandler_StringCommand( const char *pszCommand, int iClose )
|
||||||
{
|
{
|
||||||
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
||||||
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
||||||
@ -444,11 +444,11 @@ class CMenuHandler_StringCommandWatch : public CMenuHandler_StringCommand
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommandWatch( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
CMenuHandler_StringCommandWatch( const char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommandWatch( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
CMenuHandler_StringCommandWatch( const char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -474,11 +474,11 @@ class CMenuHandler_StringCommandClassSelect : public CMenuHandler_StringCommand
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommandClassSelect( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
CMenuHandler_StringCommandClassSelect( const char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommandClassSelect( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
CMenuHandler_StringCommandClassSelect( const char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -543,7 +543,7 @@ void TheWastesViewport::Initialize( void )
|
|||||||
strcpy(m_sTeamNames[i], "");
|
strcpy(m_sTeamNames[i], "");
|
||||||
}
|
}
|
||||||
|
|
||||||
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
|
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_none) );
|
||||||
}
|
}
|
||||||
|
|
||||||
class CException;
|
class CException;
|
||||||
@ -773,7 +773,7 @@ catch( ... /* CException *e */ )
|
|||||||
// *pButtonName -
|
// *pButtonName -
|
||||||
// Output : CommandButton
|
// Output : CommandButton
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
CommandButton *TheWastesViewport::CreateCustomButton( char *pButtonText, char *pButtonName )
|
CommandButton *TheWastesViewport::CreateCustomButton( const char *pButtonText, const char *pButtonName )
|
||||||
{
|
{
|
||||||
CommandButton *pButton = NULL;
|
CommandButton *pButton = NULL;
|
||||||
CCommandMenu *pMenu = NULL;
|
CCommandMenu *pMenu = NULL;
|
||||||
@ -1444,7 +1444,7 @@ void TheWastesViewport::UpdateCursorState()
|
|||||||
if ( m_pCurrentMenu || m_pTeamMenu->isVisible() || m_pServerBrowser->isVisible() || GetClientVoiceMgr()->IsInSquelchMode() )
|
if ( m_pCurrentMenu || m_pTeamMenu->isVisible() || m_pServerBrowser->isVisible() || GetClientVoiceMgr()->IsInSquelchMode() )
|
||||||
{
|
{
|
||||||
g_iVisibleMouse = true;
|
g_iVisibleMouse = true;
|
||||||
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_arrow) );
|
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_arrow) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if ( m_pCurrentCommandMenu )
|
else if ( m_pCurrentCommandMenu )
|
||||||
@ -1453,14 +1453,14 @@ void TheWastesViewport::UpdateCursorState()
|
|||||||
if ( gHUD.m_pCvarStealMouse->value != 0.0f )
|
if ( gHUD.m_pCvarStealMouse->value != 0.0f )
|
||||||
{
|
{
|
||||||
g_iVisibleMouse = true;
|
g_iVisibleMouse = true;
|
||||||
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_arrow) );
|
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_arrow) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IN_ResetMouse();
|
IN_ResetMouse();
|
||||||
g_iVisibleMouse = false;
|
g_iVisibleMouse = false;
|
||||||
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
|
App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_none) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void TheWastesViewport::UpdateHighlights()
|
void TheWastesViewport::UpdateHighlights()
|
||||||
|
@ -325,7 +325,7 @@ public:
|
|||||||
void CreateCommandMenu( void );
|
void CreateCommandMenu( void );
|
||||||
void CreateScoreBoard( void );
|
void CreateScoreBoard( void );
|
||||||
void CreateServerBrowser( void );
|
void CreateServerBrowser( void );
|
||||||
CommandButton *CreateCustomButton( char *pButtonText, char *pButtonName );
|
CommandButton *CreateCustomButton( const char *pButtonText, const char *pButtonName );
|
||||||
CCommandMenu *CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText );
|
CCommandMenu *CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText );
|
||||||
|
|
||||||
void UpdateCursorState( void );
|
void UpdateCursorState( void );
|
||||||
@ -413,14 +413,14 @@ protected:
|
|||||||
char m_pszCommand[MAX_COMMAND_SIZE];
|
char m_pszCommand[MAX_COMMAND_SIZE];
|
||||||
int m_iCloseVGUIMenu;
|
int m_iCloseVGUIMenu;
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommand( char *pszCommand )
|
CMenuHandler_StringCommand( const char *pszCommand )
|
||||||
{
|
{
|
||||||
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
||||||
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
||||||
m_iCloseVGUIMenu = false;
|
m_iCloseVGUIMenu = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommand( char *pszCommand, int iClose )
|
CMenuHandler_StringCommand( const char *pszCommand, int iClose )
|
||||||
{
|
{
|
||||||
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
|
||||||
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
|
||||||
@ -444,11 +444,11 @@ class CMenuHandler_StringCommandWatch : public CMenuHandler_StringCommand
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommandWatch( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
CMenuHandler_StringCommandWatch( const char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommandWatch( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
CMenuHandler_StringCommandWatch( const char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -474,11 +474,11 @@ class CMenuHandler_StringCommandClassSelect : public CMenuHandler_StringCommand
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
public:
|
public:
|
||||||
CMenuHandler_StringCommandClassSelect( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
CMenuHandler_StringCommandClassSelect( const char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CMenuHandler_StringCommandClassSelect( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
CMenuHandler_StringCommandClassSelect( const char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,7 +169,7 @@ struct efx_api_s
|
|||||||
TEMPENTITY *( *R_DefaultSprite ) ( float *pos, int spriteIndex, float framerate );
|
TEMPENTITY *( *R_DefaultSprite ) ( float *pos, int spriteIndex, float framerate );
|
||||||
TEMPENTITY *( *R_TempSprite ) ( float *pos, float *dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags );
|
TEMPENTITY *( *R_TempSprite ) ( float *pos, float *dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags );
|
||||||
int ( *Draw_DecalIndex ) ( int id );
|
int ( *Draw_DecalIndex ) ( int id );
|
||||||
int ( *Draw_DecalIndexFromName ) ( char *name );
|
int ( *Draw_DecalIndexFromName ) ( const char *name );
|
||||||
void ( *R_DecalShoot ) ( int textureIndex, int entity, int modelIndex, float * position, int flags );
|
void ( *R_DecalShoot ) ( int textureIndex, int entity, int modelIndex, float * position, int flags );
|
||||||
void ( *R_AttachTentToPlayer ) ( int client, int modelIndex, float zoffset, float life );
|
void ( *R_AttachTentToPlayer ) ( int client, int modelIndex, float zoffset, float life );
|
||||||
void ( *R_KillAttachedTents ) ( int client );
|
void ( *R_KillAttachedTents ) ( int client );
|
||||||
|
@ -113,7 +113,7 @@ typedef struct cl_enginefuncs_s
|
|||||||
void ( *pfnSPR_DrawAdditive ) ( int frame, int x, int y, const wrect_t *prc );
|
void ( *pfnSPR_DrawAdditive ) ( int frame, int x, int y, const wrect_t *prc );
|
||||||
void ( *pfnSPR_EnableScissor ) ( int x, int y, int width, int height );
|
void ( *pfnSPR_EnableScissor ) ( int x, int y, int width, int height );
|
||||||
void ( *pfnSPR_DisableScissor ) ( void );
|
void ( *pfnSPR_DisableScissor ) ( void );
|
||||||
client_sprite_t *( *pfnSPR_GetList ) ( char *psz, int *piCount );
|
client_sprite_t *( *pfnSPR_GetList ) ( const char *psz, int *piCount );
|
||||||
|
|
||||||
// screen handlers
|
// screen handlers
|
||||||
void ( *pfnFillRGBA ) ( int x, int y, int width, int height, int r, int g, int b, int a );
|
void ( *pfnFillRGBA ) ( int x, int y, int width, int height, int r, int g, int b, int a );
|
||||||
@ -121,20 +121,20 @@ typedef struct cl_enginefuncs_s
|
|||||||
void ( *pfnSetCrosshair ) ( HSPRITE hspr, wrect_t rc, int r, int g, int b );
|
void ( *pfnSetCrosshair ) ( HSPRITE hspr, wrect_t rc, int r, int g, int b );
|
||||||
|
|
||||||
// cvar handlers
|
// cvar handlers
|
||||||
struct cvar_s *( *pfnRegisterVariable ) ( char *szName, char *szValue, int flags );
|
struct cvar_s *( *pfnRegisterVariable ) ( const char *szName, const char *szValue, int flags );
|
||||||
float ( *pfnGetCvarFloat ) ( char *szName );
|
float ( *pfnGetCvarFloat ) ( const char *szName );
|
||||||
char* ( *pfnGetCvarString ) ( char *szName );
|
char* ( *pfnGetCvarString ) ( const char *szName );
|
||||||
|
|
||||||
// command handlers
|
// command handlers
|
||||||
int ( *pfnAddCommand ) ( char *cmd_name, void (*function)(void) );
|
int ( *pfnAddCommand ) ( const char *cmd_name, void (*function)(void) );
|
||||||
int ( *pfnHookUserMsg ) ( char *szMsgName, pfnUserMsgHook pfn );
|
int ( *pfnHookUserMsg ) ( const char *szMsgName, pfnUserMsgHook pfn );
|
||||||
int ( *pfnServerCmd ) ( char *szCmdString );
|
int ( *pfnServerCmd ) ( const char *szCmdString );
|
||||||
int ( *pfnClientCmd ) ( char *szCmdString );
|
int ( *pfnClientCmd ) ( const char *szCmdString );
|
||||||
|
|
||||||
void ( *pfnGetPlayerInfo ) ( int ent_num, hud_player_info_t *pinfo );
|
void ( *pfnGetPlayerInfo ) ( int ent_num, hud_player_info_t *pinfo );
|
||||||
|
|
||||||
// sound handlers
|
// sound handlers
|
||||||
void ( *pfnPlaySoundByName ) ( char *szSound, float volume );
|
void ( *pfnPlaySoundByName ) ( const char *szSound, float volume );
|
||||||
void ( *pfnPlaySoundByIndex ) ( int iSound, float volume );
|
void ( *pfnPlaySoundByIndex ) ( int iSound, float volume );
|
||||||
|
|
||||||
// vector helpers
|
// vector helpers
|
||||||
@ -157,19 +157,19 @@ typedef struct cl_enginefuncs_s
|
|||||||
void ( *GetViewAngles ) ( float * );
|
void ( *GetViewAngles ) ( float * );
|
||||||
void ( *SetViewAngles ) ( float * );
|
void ( *SetViewAngles ) ( float * );
|
||||||
int ( *GetMaxClients ) ( void );
|
int ( *GetMaxClients ) ( void );
|
||||||
void ( *Cvar_SetValue ) ( char *cvar, float value );
|
void ( *Cvar_SetValue ) ( const char *cvar, float value );
|
||||||
|
|
||||||
int (*Cmd_Argc) (void);
|
int (*Cmd_Argc) (void);
|
||||||
char *( *Cmd_Argv ) ( int arg );
|
char *( *Cmd_Argv ) ( int arg );
|
||||||
void ( *Con_Printf ) ( char *fmt, ... );
|
void ( *Con_Printf ) ( const char *fmt, ... );
|
||||||
void ( *Con_DPrintf ) ( char *fmt, ... );
|
void ( *Con_DPrintf ) ( const char *fmt, ... );
|
||||||
void ( *Con_NPrintf ) ( int pos, char *fmt, ... );
|
void ( *Con_NPrintf ) ( int pos, const char *fmt, ... );
|
||||||
void ( *Con_NXPrintf ) ( struct con_nprint_s *info, char *fmt, ... );
|
void ( *Con_NXPrintf ) ( struct con_nprint_s *info, const char *fmt, ... );
|
||||||
|
|
||||||
const char *( *PhysInfo_ValueForKey ) ( const char *key );
|
const char *( *PhysInfo_ValueForKey ) ( const char *key );
|
||||||
const char *( *ServerInfo_ValueForKey )( const char *key );
|
const char *( *ServerInfo_ValueForKey )( const char *key );
|
||||||
float ( *GetClientMaxspeed ) ( void );
|
float ( *GetClientMaxspeed ) ( void );
|
||||||
int ( *CheckParm ) ( char *parm, char **ppnext );
|
int ( *CheckParm ) ( const char *parm, char **ppnext );
|
||||||
void ( *Key_Event ) ( int key, int down );
|
void ( *Key_Event ) ( int key, int down );
|
||||||
void ( *GetMousePosition ) ( int *mx, int *my );
|
void ( *GetMousePosition ) ( int *mx, int *my );
|
||||||
int ( *IsNoClipping ) ( void );
|
int ( *IsNoClipping ) ( void );
|
||||||
@ -190,14 +190,14 @@ typedef struct cl_enginefuncs_s
|
|||||||
int ( *CL_CreateVisibleEntity ) ( int type, struct cl_entity_s *ent );
|
int ( *CL_CreateVisibleEntity ) ( int type, struct cl_entity_s *ent );
|
||||||
|
|
||||||
const struct model_s * ( *GetSpritePointer ) ( HSPRITE hSprite );
|
const struct model_s * ( *GetSpritePointer ) ( HSPRITE hSprite );
|
||||||
void ( *pfnPlaySoundByNameAtLocation ) ( char *szSound, float volume, float *origin );
|
void ( *pfnPlaySoundByNameAtLocation ) ( const char *szSound, float volume, float *origin );
|
||||||
|
|
||||||
unsigned short ( *pfnPrecacheEvent ) ( int type, const char* psz );
|
unsigned short ( *pfnPrecacheEvent ) ( int type, const char* psz );
|
||||||
void ( *pfnPlaybackEvent ) ( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
|
void ( *pfnPlaybackEvent ) ( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
|
||||||
void ( *pfnWeaponAnim ) ( int iAnim, int body );
|
void ( *pfnWeaponAnim ) ( int iAnim, int body );
|
||||||
float ( *pfnRandomFloat ) ( float flLow, float flHigh );
|
float ( *pfnRandomFloat ) ( float flLow, float flHigh );
|
||||||
long ( *pfnRandomLong ) ( long lLow, long lHigh );
|
int ( *pfnRandomLong ) ( int lLow, int lHigh );
|
||||||
void ( *pfnHookEvent ) ( char *name, void ( *pfnEvent )( struct event_args_s *args ) );
|
void ( *pfnHookEvent ) ( const char *name, void ( *pfnEvent )( struct event_args_s *args ) );
|
||||||
int (*Con_IsVisible) ();
|
int (*Con_IsVisible) ();
|
||||||
const char *( *pfnGetGameDirectory ) ( void );
|
const char *( *pfnGetGameDirectory ) ( void );
|
||||||
struct cvar_s *( *pfnGetCvarPointer ) ( const char *szName );
|
struct cvar_s *( *pfnGetCvarPointer ) ( const char *szName );
|
||||||
@ -208,7 +208,7 @@ typedef struct cl_enginefuncs_s
|
|||||||
void *( *VGui_GetPanel ) ( );
|
void *( *VGui_GetPanel ) ( );
|
||||||
void ( *VGui_ViewportPaintBackground ) (int extents[4]);
|
void ( *VGui_ViewportPaintBackground ) (int extents[4]);
|
||||||
|
|
||||||
byte* (*COM_LoadFile) ( char *path, int usehunk, int *pLength );
|
byte* (*COM_LoadFile) ( const char *path, int usehunk, int *pLength );
|
||||||
char* (*COM_ParseFile) ( char *data, char *token );
|
char* (*COM_ParseFile) ( char *data, char *token );
|
||||||
void (*COM_FreeFile) ( void *buffer );
|
void (*COM_FreeFile) ( void *buffer );
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user