mirror of
https://github.com/FWGS/xash3d-fwgs.git
synced 2026-08-09 13:51:45 +08:00
Add forgotten const-qualifiers in interface headers. Remove unneeded PM headers
This commit is contained in:
Alibek Omarov
+18
-18
@@ -135,20 +135,20 @@ typedef struct cl_enginefuncs_s
|
||||
void (*pfnSetCrosshair)( HSPRITE hspr, wrect_t rc, int r, int g, int b );
|
||||
|
||||
// cvar handlers
|
||||
struct cvar_s *(*pfnRegisterVariable)( char *szName, char *szValue, int flags );
|
||||
float (*pfnGetCvarFloat)( char *szName );
|
||||
char* (*pfnGetCvarString)( char *szName );
|
||||
struct cvar_s *(*pfnRegisterVariable)( const char *szName, const char *szValue, int flags );
|
||||
float (*pfnGetCvarFloat)( const char *szName );
|
||||
const char* (*pfnGetCvarString)( const char *szName );
|
||||
|
||||
// command handlers
|
||||
int (*pfnAddCommand)( char *cmd_name, void (*function)(void) );
|
||||
int (*pfnHookUserMsg)( char *szMsgName, pfnUserMsgHook pfn );
|
||||
int (*pfnServerCmd)( char *szCmdString );
|
||||
int (*pfnClientCmd)( char *szCmdString );
|
||||
int (*pfnAddCommand)( const char *cmd_name, void (*function)(void) );
|
||||
int (*pfnHookUserMsg)( const char *szMsgName, pfnUserMsgHook pfn );
|
||||
int (*pfnServerCmd)( const char *szCmdString );
|
||||
int (*pfnClientCmd)( const char *szCmdString );
|
||||
|
||||
void (*pfnGetPlayerInfo)( int ent_num, hud_player_info_t *pinfo );
|
||||
|
||||
// sound handlers
|
||||
void (*pfnPlaySoundByName)( char *szSound, float volume );
|
||||
void (*pfnPlaySoundByName)( const char *szSound, float volume );
|
||||
void (*pfnPlaySoundByIndex)( int iSound, float volume );
|
||||
|
||||
// vector helpers
|
||||
@@ -170,14 +170,14 @@ typedef struct cl_enginefuncs_s
|
||||
void (*GetViewAngles)( float * );
|
||||
void (*SetViewAngles)( float * );
|
||||
int (*GetMaxClients)( void );
|
||||
void (*Cvar_SetValue)( char *cvar, float value );
|
||||
void (*Cvar_SetValue)( const char *cvar, float value );
|
||||
|
||||
int (*Cmd_Argc)( void );
|
||||
char *(*Cmd_Argv)( int arg );
|
||||
void (*Con_Printf)( char *fmt, ... );
|
||||
void (*Con_DPrintf)( char *fmt, ... );
|
||||
void (*Con_NPrintf)( int pos, char *fmt, ... );
|
||||
void (*Con_NXPrintf)( struct con_nprint_s *info, char *fmt, ... );
|
||||
const char *(*Cmd_Argv)( int arg );
|
||||
void (*Con_Printf)( const char *fmt, ... );
|
||||
void (*Con_DPrintf)( const char *fmt, ... );
|
||||
void (*Con_NPrintf)( int pos, const char *fmt, ... );
|
||||
void (*Con_NXPrintf)( struct con_nprint_s *info, const char *fmt, ... );
|
||||
|
||||
const char* (*PhysInfo_ValueForKey)( const char *key );
|
||||
const char* (*ServerInfo_ValueForKey)( const char *key );
|
||||
@@ -196,8 +196,8 @@ typedef struct cl_enginefuncs_s
|
||||
void (*V_CalcShake)( void );
|
||||
void (*V_ApplyShake)( float *origin, float *angles, float factor );
|
||||
|
||||
int (*PM_PointContents)( float *point, int *truecontents );
|
||||
int (*PM_WaterEntity)( float *p );
|
||||
int (*PM_PointContents)( const float *point, int *truecontents );
|
||||
int (*PM_WaterEntity)( const float *p );
|
||||
struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehull, int ignore_pe );
|
||||
|
||||
struct model_s *(*CL_LoadModel)( const char *modelname, int *index );
|
||||
@@ -211,7 +211,7 @@ typedef struct cl_enginefuncs_s
|
||||
void (*pfnWeaponAnim)( int iAnim, int body );
|
||||
float (*pfnRandomFloat)( float flLow, float flHigh );
|
||||
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) ();
|
||||
const char *(*pfnGetGameDirectory)( void );
|
||||
struct cvar_s *(*pfnGetCvarPointer)( const char *szName );
|
||||
@@ -222,7 +222,7 @@ typedef struct cl_enginefuncs_s
|
||||
void* (*VGui_GetPanel)( );
|
||||
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 );
|
||||
void (*COM_FreeFile)( void *buffer );
|
||||
|
||||
|
||||
@@ -72,8 +72,6 @@ int RankForContents( int contents );
|
||||
|
||||
#define check_angles( x ) ( (int)x == 90 || (int)x == 180 || (int)x == 270 || (int)x == -90 || (int)x == -180 || (int)x == -270 )
|
||||
|
||||
#include "pm_shared.h"
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
@@ -104,4 +102,4 @@ typedef struct event_state_s
|
||||
event_info_t ei[MAX_EVENT_QUEUE];
|
||||
} event_state_t;
|
||||
|
||||
#endif//WORLD_H
|
||||
#endif//WORLD_H
|
||||
|
||||
+16
-16
@@ -94,7 +94,7 @@ typedef struct
|
||||
int fPlayTrack;
|
||||
} CDStatus;
|
||||
|
||||
typedef unsigned long CRC32_t;
|
||||
typedef unsigned int CRC32_t;
|
||||
|
||||
typedef struct delta_s delta_t;
|
||||
struct entity_state_s;
|
||||
@@ -102,13 +102,13 @@ struct entity_state_s;
|
||||
// Engine hands this to DLLs for functionality callbacks
|
||||
typedef struct enginefuncs_s
|
||||
{
|
||||
int (*pfnPrecacheModel)( char* s );
|
||||
int (*pfnPrecacheSound)( char* s );
|
||||
int (*pfnPrecacheModel)( const char* s );
|
||||
int (*pfnPrecacheSound)( const char* s );
|
||||
void (*pfnSetModel)( edict_t *e, const char *m );
|
||||
int (*pfnModelIndex)( const char *m );
|
||||
int (*pfnModelFrames)( int modelIndex );
|
||||
void (*pfnSetSize)( edict_t *e, const float *rgflMin, const float *rgflMax );
|
||||
void (*pfnChangeLevel)( char* s1, char* s2 );
|
||||
void (*pfnChangeLevel)( const char* s1, const char* s2 );
|
||||
void (*pfnGetSpawnParms)( edict_t *ent );
|
||||
void (*pfnSaveSpawnParms)( edict_t *ent );
|
||||
float (*pfnVecToYaw)( const float *rgflVector );
|
||||
@@ -141,11 +141,11 @@ typedef struct enginefuncs_s
|
||||
const char *(*pfnTraceTexture)( edict_t *pTextureEntity, const float *v1, const float *v2 );
|
||||
void (*pfnTraceSphere)( const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr );
|
||||
void (*pfnGetAimVector)( edict_t* ent, float speed, float *rgflReturn );
|
||||
void (*pfnServerCommand)( char* str );
|
||||
void (*pfnServerCommand)( const char* str );
|
||||
void (*pfnServerExecute)( void );
|
||||
void (*pfnClientCommand)( edict_t* pEdict, char* szFmt, ... );
|
||||
void (*pfnParticleEffect)( const float *org, const float *dir, float color, float count );
|
||||
void (*pfnLightStyle)( int style, char* val );
|
||||
void (*pfnLightStyle)( int style, const char* val );
|
||||
int (*pfnDecalIndex)( const char *name );
|
||||
int (*pfnPointContents)( const float *rgflVector );
|
||||
void (*pfnMessageBegin)( int msg_dest, int msg_type, const float *pOrigin, edict_t *ed );
|
||||
@@ -189,18 +189,18 @@ typedef struct enginefuncs_s
|
||||
int (*pfnCmd_Argc)( void ); // access client 'cmd' strings
|
||||
void (*pfnGetAttachment)( const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles );
|
||||
void (*pfnCRC32_Init)( CRC32_t *pulCRC );
|
||||
void (*pfnCRC32_ProcessBuffer)( CRC32_t *pulCRC, void *p, int len );
|
||||
void (*pfnCRC32_ProcessBuffer)( CRC32_t *pulCRC, const void *p, int len );
|
||||
void (*pfnCRC32_ProcessByte)( CRC32_t *pulCRC, unsigned char ch );
|
||||
CRC32_t (*pfnCRC32_Final)( CRC32_t pulCRC );
|
||||
long (*pfnRandomLong)( long lLow, long lHigh );
|
||||
int (*pfnRandomLong)( int lLow, int lHigh );
|
||||
float (*pfnRandomFloat)( float flLow, float flHigh );
|
||||
void (*pfnSetView)( const edict_t *pClient, const edict_t *pViewent );
|
||||
float (*pfnTime)( void );
|
||||
void (*pfnCrosshairAngle)( const edict_t *pClient, float pitch, float yaw );
|
||||
byte* (*pfnLoadFileForMe)( char *filename, int *pLength );
|
||||
byte* (*pfnLoadFileForMe)( const char *filename, int *pLength );
|
||||
void (*pfnFreeFile)( void *buffer );
|
||||
void (*pfnEndSection)( const char *pszSectionName ); // trigger_endsection
|
||||
int (*pfnCompareFileTime)( char *filename1, char *filename2, int *iCompare );
|
||||
int (*pfnCompareFileTime)( const char *filename1, const char *filename2, int *iCompare );
|
||||
void (*pfnGetGameDir)( char *szGetGameDir );
|
||||
void (*pfnCvar_RegisterVariable)( cvar_t *variable );
|
||||
void (*pfnFadeClientVolume)( const edict_t *pEdict, int fadePercent, int fadeOutSeconds, int holdTime, int fadeInSeconds );
|
||||
@@ -209,12 +209,12 @@ typedef struct enginefuncs_s
|
||||
void (*pfnRunPlayerMove)( edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec );
|
||||
int (*pfnNumberOfEntities)( void );
|
||||
char* (*pfnGetInfoKeyBuffer)( edict_t *e ); // passing in NULL gets the serverinfo
|
||||
char* (*pfnInfoKeyValue)( char *infobuffer, char *key );
|
||||
const char* (*pfnInfoKeyValue)( const char *infobuffer, const char *key );
|
||||
void (*pfnSetKeyValue)( char *infobuffer, char *key, char *value );
|
||||
void (*pfnSetClientKeyValue)( int clientIndex, char *infobuffer, char *key, char *value );
|
||||
int (*pfnIsMapValid)( char *filename );
|
||||
void (*pfnStaticDecal)( const float *origin, int decalIndex, int entityIndex, int modelIndex );
|
||||
int (*pfnPrecacheGeneric)( char *s );
|
||||
int (*pfnPrecacheGeneric)( const char *s );
|
||||
int (*pfnGetPlayerUserId)( edict_t *e ); // returns the server assigned userid for this player. useful for logging frags, etc. returns -1 if the edict couldn't be found in the list of clients
|
||||
void (*pfnBuildSoundMsg)( edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed );
|
||||
int (*pfnIsDedicatedServer)( void ); // is this a dedicated server?
|
||||
@@ -229,8 +229,8 @@ typedef struct enginefuncs_s
|
||||
unsigned short (*pfnPrecacheEvent)( int type, const char*psz );
|
||||
void (*pfnPlaybackEvent)( int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
|
||||
|
||||
unsigned char *(*pfnSetFatPVS)( float *org );
|
||||
unsigned char *(*pfnSetFatPAS)( float *org );
|
||||
unsigned char *(*pfnSetFatPVS)( const float *org );
|
||||
unsigned char *(*pfnSetFatPAS)( const float *org );
|
||||
|
||||
int (*pfnCheckVisibility )( const edict_t *entity, unsigned char *pset );
|
||||
|
||||
@@ -244,7 +244,7 @@ typedef struct enginefuncs_s
|
||||
void (*pfnDeltaUnsetFieldByIndex)( delta_t *pFields, int fieldNumber );
|
||||
void (*pfnSetGroupMask)( int mask, int op );
|
||||
int (*pfnCreateInstancedBaseline)( int classname, struct entity_state_s *baseline );
|
||||
void (*pfnCvar_DirectSet)( struct cvar_s *var, char *value );
|
||||
void (*pfnCvar_DirectSet)( struct cvar_s *var, const char *value );
|
||||
|
||||
// Forces the client and server to be running with the same version of the specified file
|
||||
// ( e.g., a player model ).
|
||||
@@ -253,7 +253,7 @@ typedef struct enginefuncs_s
|
||||
|
||||
void (*pfnGetPlayerStats)( const edict_t *pClient, int *ping, int *packet_loss );
|
||||
|
||||
void (*pfnAddServerCommand)( char *cmd_name, void (*function) (void) );
|
||||
void (*pfnAddServerCommand)( const char *cmd_name, void (*function) (void) );
|
||||
|
||||
// For voice communications, set which clients hear eachother.
|
||||
// NOTE: these functions take player entity indices (starting at 1).
|
||||
|
||||
+6
-6
@@ -70,7 +70,7 @@ typedef struct ui_enginefuncs_s
|
||||
// cvar handlers
|
||||
cvar_t* (*pfnRegisterVariable)( const char *szName, const char *szValue, int flags );
|
||||
float (*pfnGetCvarFloat)( const char *szName );
|
||||
char* (*pfnGetCvarString)( const char *szName );
|
||||
const char* (*pfnGetCvarString)( const char *szName );
|
||||
void (*pfnCvarSetString)( const char *szName, const char *szValue );
|
||||
void (*pfnCvarSetValue)( const char *szName, float flValue );
|
||||
|
||||
@@ -79,8 +79,8 @@ typedef struct ui_enginefuncs_s
|
||||
void (*pfnClientCmd)( int execute_now, const char *szCmdString );
|
||||
void (*pfnDelCommand)( const char *cmd_name );
|
||||
int (*pfnCmdArgc)( void );
|
||||
char* (*pfnCmdArgv)( int argc );
|
||||
char* (*pfnCmd_Args)( void );
|
||||
const char* (*pfnCmdArgv)( int argc );
|
||||
const char* (*pfnCmd_Args)( void );
|
||||
|
||||
// debug messages (in-menu shows only notify)
|
||||
void (*Con_Printf)( const char *fmt, ... );
|
||||
@@ -145,7 +145,7 @@ typedef struct ui_enginefuncs_s
|
||||
int (*pfnGetGameInfo)( GAMEINFO *pgameinfo );
|
||||
GAMEINFO **(*pfnGetGamesList)( int *numGames ); // collect info about all mods
|
||||
char **(*pfnGetFilesList)( const char *pattern, int *numFiles, int gamedironly ); // find in files
|
||||
int (*pfnGetSaveComment)( const char *savename, char *comment );
|
||||
int (*pfnGetSaveComment)( const char *savename, char *comment );
|
||||
int (*pfnGetDemoComment)( const char *demoname, char *comment );
|
||||
int (*pfnCheckGameDll)( void ); // returns false if hl.dll is missed or invalid
|
||||
char *(*pfnGetClipboardData)( void );
|
||||
@@ -160,12 +160,12 @@ typedef struct ui_enginefuncs_s
|
||||
// menu interface is freezed at version 0.75
|
||||
// new functions starts here
|
||||
float (*pfnRandomFloat)( float flLow, float flHigh );
|
||||
long (*pfnRandomLong)( long lLow, long lHigh );
|
||||
int (*pfnRandomLong)( int lLow, int lHigh );
|
||||
|
||||
void (*pfnSetCursor)( void *hCursor ); // change cursor
|
||||
int (*pfnIsMapValid)( char *filename );
|
||||
void (*pfnProcessImage)( int texnum, float gamma, int topColor, int bottomColor );
|
||||
int (*pfnCompareFileTime)( char *filename1, char *filename2, int *iCompare );
|
||||
int (*pfnCompareFileTime)( const char *filename1, const char *filename2, int *iCompare );
|
||||
|
||||
const char *(*pfnGetModeString)( int vid_mode );
|
||||
} ui_enginefuncs_t;
|
||||
|
||||
+4
-4
@@ -75,8 +75,8 @@ typedef struct server_physics_api_s
|
||||
int ( *pfnDrawConsoleString )( int x, int y, char *string );
|
||||
void ( *pfnDrawSetTextColor )( float r, float g, float b );
|
||||
void ( *pfnDrawConsoleStringLen )( const char *string, int *length, int *height );
|
||||
void ( *Con_NPrintf )( int pos, char *fmt, ... );
|
||||
void ( *Con_NXPrintf )( struct con_nprint_s *info, char *fmt, ... );
|
||||
void ( *Con_NPrintf )( int pos, const char *fmt, ... );
|
||||
void ( *Con_NXPrintf )( struct con_nprint_s *info, const char *fmt, ... );
|
||||
const char *( *pfnGetLightStyle )( int style ); // read custom appreance for selected lightstyle
|
||||
void ( *pfnUpdateFogSettings )( unsigned int packed_fog );
|
||||
char **(*pfnGetFilesList)( const char *pattern, int *numFiles, int gamedironly );
|
||||
@@ -94,7 +94,7 @@ typedef struct server_physics_api_s
|
||||
int (*pfnBoxInPVS)( const float *org, const float *boxmins, const float *boxmaxs );
|
||||
|
||||
// message handler (missed function to write raw bytes)
|
||||
void (*pfnWriteBytes)( byte *bytes, int count );
|
||||
void (*pfnWriteBytes)( const byte *bytes, int count );
|
||||
|
||||
// BSP lump management
|
||||
int (*pfnCheckLump)( const char *filename, const int lump, int *lumpsize );
|
||||
@@ -161,4 +161,4 @@ typedef struct physics_interface_s
|
||||
int (*SV_PlayerThink)( edict_t *ent, float frametime, double time );
|
||||
} physics_interface_t;
|
||||
|
||||
#endif//PHYSINT_H
|
||||
#endif//PHYSINT_H
|
||||
|
||||
Reference in New Issue
Block a user