Fixed building with newly updated SDK.
Fixed building with newly updated SDK.
1.1 --- a/metamod/Makefile Fri Mar 15 15:01:20 2013 -0500
1.2 +++ b/metamod/Makefile Thu Sep 05 19:50:27 2013 -0500
1.3 @@ -74,7 +74,7 @@
1.4 TEST_DIR=/data/hlds_l/Admin/dlls
1.5 endif
1.6
1.7 -SDKSRC=$(SDKTOP)/multiplayer
1.8 +SDKSRC=$(SDKTOP)
1.9
1.10 #############################################################################
1.11 # OS DEPENDENCIES
1.12 @@ -187,7 +187,8 @@
1.13
1.14
1.15 SRCDIR=.
1.16 -INCLUDEDIRS=-I$(SRCDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC)
1.17 +INCLUDEDIRS=-I$(SRCDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common \
1.18 + -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC)/public -I$(SDKSRC)
1.19 FILES_ALL = *.cpp *.h [A-Z]* *.rc
1.20
1.21 CFLAGS=-Wall -Wno-unknown-pragmas
2.1 --- a/metamod/api_info.h Fri Mar 15 15:01:20 2013 -0500
2.2 +++ b/metamod/api_info.h Thu Sep 05 19:50:27 2013 -0500
2.3 @@ -285,7 +285,7 @@
2.4 // Added 2005/11/22 (no SDK update)
2.5 api_info_t pfnQueryClientCvarValue2;
2.6 // Added 2009/06/17 (no SDK update)
2.7 - api_info_t pfnEngCheckParm;
2.8 + api_info_t pfnCheckParm;
2.9 // end
2.10 api_info_t END;
2.11 } engine_info_t;
3.1 --- a/metamod/engine_api.cpp Fri Mar 15 15:01:20 2013 -0500
3.2 +++ b/metamod/engine_api.cpp Thu Sep 05 19:50:27 2013 -0500
3.3 @@ -272,7 +272,7 @@
3.4 META_ENGINE_HANDLE_void(FN_PARTICLEEFFECT, pfnParticleEffect, (org, dir, color, count));
3.5 RETURN_API_void()
3.6 }
3.7 -void mm_LightStyle(int style, char *val) {
3.8 +void mm_LightStyle(int style, const char *val) {
3.9 META_ENGINE_HANDLE_void(FN_LIGHTSTYLE, pfnLightStyle, (style, val));
3.10 RETURN_API_void()
3.11 }
3.12 @@ -577,7 +577,7 @@
3.13 RETURN_API_void()
3.14 }
3.15
3.16 -byte * mm_LoadFileForMe(char *filename, int *pLength) {
3.17 +byte * mm_LoadFileForMe(const char *filename, int *pLength) {
3.18 META_ENGINE_HANDLE(byte *, NULL, FN_LOADFILEFORME, pfnLoadFileForMe, (filename, pLength));
3.19 RETURN_API()
3.20 }
3.21 @@ -729,7 +729,7 @@
3.22 META_ENGINE_HANDLE_void(FN_DELTAUNSETFIELD, pfnDeltaUnsetField, (pFields, fieldname));
3.23 RETURN_API_void()
3.24 }
3.25 -void mm_DeltaAddEncoder( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
3.26 +void mm_DeltaAddEncoder( const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
3.27 META_ENGINE_HANDLE_void(FN_DELTAADDENCODER, pfnDeltaAddEncoder, (name, conditionalencode));
3.28 RETURN_API_void()
3.29 }
3.30 @@ -763,7 +763,7 @@
3.31 META_ENGINE_HANDLE(int, 0, FN_CREATEINSTANCEDBASELINE, pfnCreateInstancedBaseline, (classname, baseline));
3.32 RETURN_API()
3.33 }
3.34 -void mm_Cvar_DirectSet( struct cvar_s *var, char *value ) {
3.35 +void mm_Cvar_DirectSet( struct cvar_s *var, const char *value ) {
3.36 META_ENGINE_HANDLE_void(FN_CVAR_DIRECTSET, pfnCvar_DirectSet, (var, value));
3.37 RETURN_API_void()
3.38 }
3.39 @@ -880,9 +880,9 @@
3.40 }
3.41
3.42 //Added 2009-06-17 (no SDK update)
3.43 -int mm_EngCheckParm(const char *pchCmdLineToken, char **pchNextVal)
3.44 +int mm_CheckParm(const char *pchCmdLineToken, char **ppnext)
3.45 {
3.46 - META_ENGINE_HANDLE(int, 0, FN_ENGCHECKPARM, pfnEngCheckParm, (pchCmdLineToken, pchNextVal));
3.47 + META_ENGINE_HANDLE(int, 0, FN_CHECKPARM, pfnCheckParm, (pchCmdLineToken, ppnext));
3.48 RETURN_API();
3.49 }
3.50
3.51 @@ -1097,7 +1097,7 @@
3.52 &mm_QueryClientCvarValue2, // pfnQueryClientCvarValue2()
3.53
3.54 // Added 2009-06-17 (no SDK update)
3.55 - &mm_EngCheckParm // pfnEngCheckParm()
3.56 + &mm_CheckParm // pfnCheckParm()
3.57 );
3.58
3.59
4.1 --- a/metamod/engine_api.h Fri Mar 15 15:01:20 2013 -0500
4.2 +++ b/metamod/engine_api.h Thu Sep 05 19:50:27 2013 -0500
4.3 @@ -111,7 +111,7 @@
4.4 extern void ClientCommand(edict_t *pEdict, const char *szFmt, ...);
4.5
4.6 extern void mm_ParticleEffect(const float *org, const float *dir, float color, float count);
4.7 -extern void mm_LightStyle(int style, char *val);
4.8 +extern void mm_LightStyle(int style, const char *val);
4.9 extern int mm_DecalIndex(const char *name);
4.10 extern int mm_PointContents(const float *rgflVector);
4.11
4.12 @@ -197,7 +197,7 @@
4.13 extern float mm_Time( void );
4.14 extern void mm_CrosshairAngle(const edict_t *pClient, float pitch, float yaw);
4.15
4.16 -extern byte * mm_LoadFileForMe(char *filename, int *pLength);
4.17 +extern byte * mm_LoadFileForMe(const char *filename, int *pLength);
4.18 extern void mm_FreeFile(void *buffer);
4.19
4.20 extern void mm_EndSection(const char *pszSectionName); //! trigger_endsection
4.21 @@ -239,7 +239,7 @@
4.22
4.23 extern void mm_DeltaSetField( struct delta_s *pFields, const char *fieldname );
4.24 extern void mm_DeltaUnsetField( struct delta_s *pFields, const char *fieldname );
4.25 -extern void mm_DeltaAddEncoder( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
4.26 +extern void mm_DeltaAddEncoder( const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
4.27 extern int mm_GetCurrentPlayer( void );
4.28 extern int mm_CanSkipPlayer( const edict_t *player );
4.29 extern int mm_DeltaFindField( struct delta_s *pFields, const char *fieldname );
4.30 @@ -249,7 +249,7 @@
4.31 extern void mm_SetGroupMask( int mask, int op );
4.32
4.33 extern int CreateInstancedBaseline( int classname, struct entity_state_s *baseline );
4.34 -extern void mm_Cvar_DirectSet( struct cvar_s *var, char *value );
4.35 +extern void mm_Cvar_DirectSet( struct cvar_s *var, const char *value );
4.36
4.37 //! Forces the client and server to be running with the same version of the specified file
4.38 //!( e.g., a player model ).
4.39 @@ -281,7 +281,7 @@
4.40 //Added 2005-11-22 (no SDK update)
4.41 extern void mm_QueryClientCvarValue2(const edict_t *pEdict, const char *cvarName, int requestID);
4.42 //Added 2009-06-17 (no SDK update)
4.43 -extern int mm_EngCheckParm(const char *pchCmdLineToken, char **pchNextVal);
4.44 +extern int mm_CheckParm(const char *pchCmdLineToken, char **ppnext);
4.45
4.46
4.47 // Typedefs for the above functions:
4.48 @@ -329,7 +329,7 @@
4.49 typedef void (*FN_SERVEREXECUTE) (void);
4.50 typedef void (*FN_CLIENTCOMMAND_ENG) (edict_t *pEdict, const char *szFmt, ...);
4.51 typedef void (*FN_PARTICLEEFFECT) (const float *org, const float *dir, float color, float count);
4.52 -typedef void (*FN_LIGHTSTYLE) (int style, char *val);
4.53 +typedef void (*FN_LIGHTSTYLE) (int style, const char *val);
4.54 typedef int (*FN_DECALINDEX) (const char *name);
4.55 typedef int (*FN_POINTCONTENTS) (const float *rgflVector);
4.56 typedef void (*FN_MESSAGEBEGIN) (int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
4.57 @@ -395,7 +395,7 @@
4.58 typedef void (*FN_SETVIEW) (const edict_t *pClient, const edict_t *pViewent );
4.59 typedef float (*FN_TIME) ( void );
4.60 typedef void (*FN_CROSSHAIRANGLE) (const edict_t *pClient, float pitch, float yaw);
4.61 -typedef byte * (*FN_LOADFILEFORME) (char *filename, int *pLength);
4.62 +typedef byte * (*FN_LOADFILEFORME) (const char *filename, int *pLength);
4.63 typedef void (*FN_FREEFILE) (void *buffer);
4.64 typedef void (*FN_ENDSECTION) (const char *pszSectionName);
4.65 typedef int (*FN_COMPAREFILETIME) (char *filename1, char *filename2, int *iCompare);
4.66 @@ -429,7 +429,7 @@
4.67 typedef int (*FN_CHECKVISIBILITY) ( const edict_t *entity, unsigned char *pset );
4.68 typedef void (*FN_DELTASETFIELD) ( struct delta_s *pFields, const char *fieldname );
4.69 typedef void (*FN_DELTAUNSETFIELD) ( struct delta_s *pFields, const char *fieldname );
4.70 -typedef void (*FN_DELTAADDENCODER) ( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
4.71 +typedef void (*FN_DELTAADDENCODER) ( const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
4.72 typedef int (*FN_GETCURRENTPLAYER) ( void );
4.73 typedef int (*FN_CANSKIPPLAYER) ( const edict_t *player );
4.74 typedef int (*FN_DELTAFINDFIELD) ( struct delta_s *pFields, const char *fieldname );
4.75 @@ -437,7 +437,7 @@
4.76 typedef void (*FN_DELTAUNSETFIELDBYINDEX) ( struct delta_s *pFields, int fieldNumber );
4.77 typedef void (*FN_SETGROUPMASK) ( int mask, int op );
4.78 typedef int (*FN_CREATEINSTANCEDBASELINE) ( int classname, struct entity_state_s *baseline );
4.79 -typedef void (*FN_CVAR_DIRECTSET) ( struct cvar_s *var, char *value );
4.80 +typedef void (*FN_CVAR_DIRECTSET) ( struct cvar_s *var, const char *value );
4.81 typedef void (*FN_FORCEUNMODIFIED) ( FORCE_TYPE type, float *mins, float *maxs, const char *filename );
4.82 typedef void (*FN_GETPLAYERSTATS) ( const edict_t *pClient, int *ping, int *packet_loss );
4.83 typedef void (*FN_ADDSERVERCOMMAND) ( const char *cmd_name, void (*function) (void) );
4.84 @@ -463,6 +463,6 @@
4.85 //Added 2005-11-22 (no SDK update)
4.86 typedef void (*FN_QUERYCLIENTCVARVALUE2)(const edict_t *pEdict, const char *cvarName, int requestID);
4.87 //Added 2009-06-17 (no SDK update)
4.88 -typedef int (*FN_ENGCHECKPARM)(const char *pchCmdLineToken, char **pchNextVal);
4.89 +typedef int (*FN_CHECKPARM)(const char *pchCmdLineToken, char **ppnext);
4.90
4.91 #endif /* ENGINE_API_H */
5.1 --- a/metamod/meta_eiface.cpp Fri Mar 15 15:01:20 2013 -0500
5.2 +++ b/metamod/meta_eiface.cpp Thu Sep 05 19:50:27 2013 -0500
5.3 @@ -216,7 +216,7 @@
5.4 void (*_pfnServerExecute) (void),
5.5 void (*_pfnClientCommand) (edict_t*, const char*, ...),
5.6 void (*_pfnParticleEffect) (const float*, const float*, float, float),
5.7 - void (*_pfnLightStyle) (int, char*),
5.8 + void (*_pfnLightStyle) (int, const char*),
5.9 int (*_pfnDecalIndex) (const char*),
5.10 int (*_pfnPointContents) (const float*),
5.11 void (*_pfnMessageBegin) (int, int, const float*, edict_t*),
5.12 @@ -268,7 +268,7 @@
5.13 void (*_pfnSetView) (const edict_t*, const edict_t*),
5.14 float (*_pfnTime) (void),
5.15 void (*_pfnCrosshairAngle) (const edict_t*, float, float),
5.16 - byte* (*_pfnLoadFileForMe) (char*, int*),
5.17 + byte* (*_pfnLoadFileForMe) (const char*, int*),
5.18 void (*_pfnFreeFile) (void*),
5.19 void (*_pfnEndSection) (const char*),
5.20 int (*_pfnCompareFileTime) (char*, char*, int*),
5.21 @@ -302,7 +302,7 @@
5.22 int (*_pfnCheckVisibility) (const edict_t*, unsigned char*),
5.23 void (*_pfnDeltaSetField) (struct delta_s*, const char*),
5.24 void (*_pfnDeltaUnsetField) (struct delta_s*, const char*),
5.25 - void (*_pfnDeltaAddEncoder) (char*, void (*)(struct delta_s*, const unsigned char*, const unsigned char*)),
5.26 + void (*_pfnDeltaAddEncoder) (const char*, void (*)(struct delta_s*, const unsigned char*, const unsigned char*)),
5.27 int (*_pfnGetCurrentPlayer) (void),
5.28 int (*_pfnCanSkipPlayer) (const edict_t*),
5.29 int (*_pfnDeltaFindField) (struct delta_s*, const char*),
5.30 @@ -310,7 +310,7 @@
5.31 void (*_pfnDeltaUnsetFieldByIndex) (struct delta_s*, int),
5.32 void (*_pfnSetGroupMask) (int, int),
5.33 int (*_pfnCreateInstancedBaseline) (int, struct entity_state_s*),
5.34 - void (*_pfnCvar_DirectSet) (struct cvar_s*, char*),
5.35 + void (*_pfnCvar_DirectSet) (struct cvar_s*, const char*),
5.36 void (*_pfnForceUnmodified) (FORCE_TYPE, float*, float*, const char*),
5.37 void (*_pfnGetPlayerStats) (const edict_t*, int*, int*),
5.38 void (*_pfnAddServerCommand) (const char*, void (*) (void)),
5.39 @@ -330,7 +330,7 @@
5.40 void (*_pfnResetTutorMessageDecayData) (void),
5.41 void (*_pfnQueryClientCvarValue) (const edict_t*, const char*),
5.42 void (*_pfnQueryClientCvarValue2) (const edict_t*, const char*, int),
5.43 - int (*_pfnEngCheckParm) (const char*, char**)
5.44 + int (*_pfnCheckParm) (const char*, char**)
5.45 )
5.46 {
5.47 pfnPrecacheModel = _pfnPrecacheModel;
5.48 @@ -490,7 +490,7 @@
5.49 pfnResetTutorMessageDecayData = _pfnResetTutorMessageDecayData;
5.50 pfnQueryClientCvarValue = _pfnQueryClientCvarValue;
5.51 pfnQueryClientCvarValue2 = _pfnQueryClientCvarValue2;
5.52 - pfnEngCheckParm = _pfnEngCheckParm;
5.53 + pfnCheckParm = _pfnCheckParm;
5.54
5.55 memset( dummies, 0, sizeof(pdummyfunc) * c_NumDummies );
5.56 }
5.57 @@ -531,7 +531,7 @@
5.58 // sentenceEntry_s* (*pfnSequencePickSentence) ( const char* groupName, int pickMethod, int *picked );
5.59 //
5.60 // // LH: Give access to filesize via filesystem
5.61 -// 147: int (*pfnGetFileSize) ( char *filename );
5.62 +// 147: int (*pfnGetFileSize) ( const char *filename );
5.63 //
5.64 // unsigned int (*pfnGetApproxWavePlayLen) (const char *filepath);
5.65 // // MDC: Added for CZ career-mode
5.66 @@ -551,7 +551,7 @@
5.67
5.68 // 156: void (*pfnQueryClientCvarValue) ( const edict_t *player, const char *cvarName );
5.69 // 157: void (*pfnQueryClientCvarValue2) ( const edict_t *player, const char *cvarName, int requestID );
5.70 -// 158: int (*pfnEngCheckParm) ( const char *pchCmdLineToke, char **pchNextValue );
5.71 +// 158: int (*pfnCheckParm) ( const char *pchCmdLineToke, char **ppnext );
5.72
5.73
5.74 void HL_enginefuncs_t::determine_engine_interface_version( void )
5.75 @@ -605,8 +605,8 @@
5.76 if ( ! Engine.info.is_valid_code_pointer(pfnQueryClientCvarValue2) ) {
5.77 pfnQueryClientCvarValue2 = NULL;
5.78 }
5.79 - if ( ! Engine.info.is_valid_code_pointer(pfnEngCheckParm) ) {
5.80 - pfnEngCheckParm = NULL;
5.81 + if ( ! Engine.info.is_valid_code_pointer(pfnCheckParm) ) {
5.82 + pfnCheckParm = NULL;
5.83 }
5.84
5.85 // Now begins our heuristic, where we try to determine the engine
5.86 @@ -679,10 +679,10 @@
5.87 }
5.88 sm_version = 157;
5.89
5.90 - // All functions up to EngCheckParm() are valid.
5.91 - // If EngCheckParm() is not valid, leave it at the so far determined
5.92 + // All functions up to CheckParm() are valid.
5.93 + // If CheckParm() is not valid, leave it at the so far determined
5.94 // version. Otherwise the version is at least 158.
5.95 - if ( pfnEngCheckParm == NULL) {
5.96 + if ( pfnCheckParm == NULL) {
5.97 return;
5.98 }
5.99 sm_version = 158;
5.100 @@ -720,7 +720,7 @@
5.101 case 156:
5.102 pfnQueryClientCvarValue2 = NULL;
5.103 case 157:
5.104 - pfnEngCheckParm = NULL;
5.105 + pfnCheckParm = NULL;
5.106 }
5.107 }
5.108
6.1 --- a/metamod/meta_eiface.h Fri Mar 15 15:01:20 2013 -0500
6.2 +++ b/metamod/meta_eiface.h Thu Sep 05 19:50:27 2013 -0500
6.3 @@ -231,7 +231,7 @@
6.4 void (*_pfnServerExecute) (void),
6.5 void (*_pfnClientCommand) (edict_t*, const char*, ...),
6.6 void (*_pfnParticleEffect) (const float*, const float*, float, float),
6.7 - void (*_pfnLightStyle) (int, char*),
6.8 + void (*_pfnLightStyle) (int, const char*),
6.9 int (*_pfnDecalIndex) (const char*),
6.10 int (*_pfnPointContents) (const float*),
6.11 void (*_pfnMessageBegin) (int, int, const float*, edict_t*),
6.12 @@ -283,7 +283,7 @@
6.13 void (*_pfnSetView) (const edict_t*, const edict_t*),
6.14 float (*_pfnTime) (void),
6.15 void (*_pfnCrosshairAngle) (const edict_t*, float, float),
6.16 - byte* (*_pfnLoadFileForMe) (char*, int*),
6.17 + byte* (*_pfnLoadFileForMe) (const char*, int*),
6.18 void (*_pfnFreeFile) (void*),
6.19 void (*_pfnEndSection) (const char*),
6.20 int (*_pfnCompareFileTime) (char*, char*, int*),
6.21 @@ -317,7 +317,7 @@
6.22 int (*_pfnCheckVisibility) (const edict_t*, unsigned char*),
6.23 void (*_pfnDeltaSetField) (struct delta_s*, const char*),
6.24 void (*_pfnDeltaUnsetField) (struct delta_s*, const char*),
6.25 - void (*_pfnDeltaAddEncoder) (char*, void (*)(struct delta_s*, const unsigned char*, const unsigned char*)),
6.26 + void (*_pfnDeltaAddEncoder) (const char*, void (*)(struct delta_s*, const unsigned char*, const unsigned char*)),
6.27 int (*_pfnGetCurrentPlayer) (void),
6.28 int (*_pfnCanSkipPlayer) (const edict_t*),
6.29 int (*_pfnDeltaFindField) (struct delta_s*, const char*),
6.30 @@ -325,7 +325,7 @@
6.31 void (*_pfnDeltaUnsetFieldByIndex) (struct delta_s*, int),
6.32 void (*_pfnSetGroupMask) (int, int),
6.33 int (*_pfnCreateInstancedBaseline) (int, struct entity_state_s*),
6.34 - void (*_pfnCvar_DirectSet) (struct cvar_s*, char*),
6.35 + void (*_pfnCvar_DirectSet) (struct cvar_s*, const char*),
6.36 void (*_pfnForceUnmodified) (FORCE_TYPE, float*, float*, const char*),
6.37 void (*_pfnGetPlayerStats) (const edict_t*, int*, int*),
6.38 void (*_pfnAddServerCommand) (const char*, void (*) (void)),
7.1 --- a/metamod/mplugin.h Fri Mar 15 15:01:20 2013 -0500
7.2 +++ b/metamod/mplugin.h Thu Sep 05 19:50:27 2013 -0500
7.3 @@ -417,7 +417,7 @@
7.4 SHOW_IFDEF(api_table, engine_info, pfnConstructTutorMessageDecayBuffer, pre_str, post_str); \
7.5 SHOW_IFDEF(api_table, engine_info, pfnResetTutorMessageDecayData, pre_str, post_str); \
7.6 SHOW_IFDEF(api_table, engine_info, pfnQueryClientCvarValue, pre_str, post_str); \
7.7 - SHOW_IFDEF(api_table, engine_info, pfnEngCheckParm, pre_str, post_str);
7.8 + SHOW_IFDEF(api_table, engine_info, pfnCheckParm, pre_str, post_str);
7.9
7.10
7.11 #endif /* MPLUGIN_H */
8.1 --- a/metamod/msvc/metamod.dsp Fri Mar 15 15:01:20 2013 -0500
8.2 +++ b/metamod/msvc/metamod.dsp Thu Sep 05 19:50:27 2013 -0500
8.3 @@ -43,7 +43,7 @@
8.4 # PROP Ignore_Export_Lib 1
8.5 # PROP Target_Dir ""
8.6 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.7 -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\..\hlsdk\multiplayer\common" /I "..\..\..\hlsdk\multiplayer\engine" /I "..\..\..\hlsdk\multiplayer\dlls" /I "..\..\..\hlsdk\multiplayer\pm_shared" /I "..\..\..\hlsdk\multiplayer source\common" /I "..\..\..\hlsdk\multiplayer source\engine" /I "..\..\..\hlsdk\multiplayer source\dlls" /I "..\..\..\hlsdk\multiplayer source\pm_shared" /D "METAMOD_CORE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.8 +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\..\hlsdk\common" /I "..\..\..\hlsdk\engine" /I "..\..\..\hlsdk\dlls" /I "..\..\..\hlsdk\pm_shared" /I "..\..\..\hlsdk\public" /D "METAMOD_CORE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.9 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
8.10 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
8.11 # ADD BASE RSC /l 0x409 /d "NDEBUG"
8.12 @@ -70,7 +70,7 @@
8.13 # PROP Ignore_Export_Lib 1
8.14 # PROP Target_Dir ""
8.15 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.16 -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\..\hlsdk\multiplayer\common" /I "..\..\..\hlsdk\multiplayer\engine" /I "..\..\..\hlsdk\multiplayer\dlls" /I "..\..\..\hlsdk\multiplayer\pm_shared" /I "..\..\..\hlsdk\multiplayer source\common" /I "..\..\..\hlsdk\multiplayer source\engine" /I "..\..\..\hlsdk\multiplayer source\dlls" /I "..\..\..\hlsdk\multiplayer source\pm_shared" /D "METAMOD_CORE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.17 +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\..\hlsdk\common" /I "..\..\..\hlsdk\engine" /I "..\..\..\hlsdk\dlls" /I "..\..\..\hlsdk\pm_shared" /I "..\..\..\hlsdk\public" /D "METAMOD_CORE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "METAMOD_EXPORTS" /YX /FD /c
8.18 # SUBTRACT CPP /Fr
8.19 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
8.20 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
9.1 --- a/metamod/msvc/metamod.vcproj Fri Mar 15 15:01:20 2013 -0500
9.2 +++ b/metamod/msvc/metamod.vcproj Thu Sep 05 19:50:27 2013 -0500
9.3 @@ -22,7 +22,7 @@
9.4 <Tool
9.5 Name="VCCLCompilerTool"
9.6 Optimization="0"
9.7 - AdditionalIncludeDirectories="..,..\..\..\hlsdk\multiplayer\common,..\..\..\hlsdk\multiplayer\engine,..\..\..\hlsdk\multiplayer\dlls,..\..\..\hlsdk\multiplayer\pm_shared,..\..\..\hlsdk\multiplayer source\common,..\..\..\hlsdk\multiplayer source\engine,..\..\..\hlsdk\multiplayer source\dlls,..\..\..\hlsdk\multiplayer source\pm_shared"
9.8 + AdditionalIncludeDirectories="..,..\..\..\hlsdk\common,..\..\..\hlsdk\engine,..\..\..\hlsdk\dlls,..\..\..\hlsdk\pm_shared,..\..\..\hlsdk\public"
9.9 PreprocessorDefinitions="METAMOD_CORE;WIN32;_DEBUG;_WINDOWS;_USRDLL;METAMOD_EXPORTS"
9.10 RuntimeLibrary="1"
9.11 UsePrecompiledHeader="2"
9.12 @@ -88,7 +88,7 @@
9.13 Name="VCCLCompilerTool"
9.14 Optimization="2"
9.15 InlineFunctionExpansion="1"
9.16 - AdditionalIncludeDirectories="..,..\..\..\hlsdk\multiplayer\common,..\..\..\hlsdk\multiplayer\engine,..\..\..\hlsdk\multiplayer\dlls,..\..\..\hlsdk\multiplayer\pm_shared,..\..\..\hlsdk\multiplayer source\common,..\..\..\hlsdk\multiplayer source\engine,..\..\..\hlsdk\multiplayer source\dlls,..\..\..\hlsdk\multiplayer source\pm_shared"
9.17 + AdditionalIncludeDirectories="..,..\..\..\hlsdk\common,..\..\..\hlsdk\engine,..\..\..\hlsdk\dlls,..\..\..\hlsdk\pm_shared,..\..\..\hlsdk\public" PreprocessorDefinitions="METAMOD_CORE;WIN32;NDEBUG;_WINDOWS;_USRDLL;METAMOD_EXPORTS"
9.18 PreprocessorDefinitions="METAMOD_CORE;WIN32;NDEBUG;_WINDOWS;_USRDLL;METAMOD_EXPORTS"
9.19 StringPooling="TRUE"
9.20 RuntimeLibrary="0"
10.1 --- a/metamod/msvc/metamod.vcxproj Fri Mar 15 15:01:20 2013 -0500
10.2 +++ b/metamod/msvc/metamod.vcxproj Thu Sep 05 19:50:27 2013 -0500
10.3 @@ -34,7 +34,6 @@
10.4 <PropertyGroup Label="UserMacros" />
10.5 <PropertyGroup>
10.6 <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
10.7 - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
10.8 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
10.9 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
10.10 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
10.11 @@ -46,7 +45,7 @@
10.12 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
10.13 <ClCompile>
10.14 <Optimization>Disabled</Optimization>
10.15 - <AdditionalIncludeDirectories>..;..\..\..\hlsdk\multiplayer\common;..\..\..\hlsdk\multiplayer\engine;..\..\..\hlsdk\multiplayer\dlls;..\..\..\hlsdk\multiplayer\pm_shared;..\..\..\hlsdk\multiplayer source\common;..\..\..\hlsdk\multiplayer source\engine;..\..\..\hlsdk\multiplayer source\dlls;..\..\..\hlsdk\multiplayer source\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10.16 + <AdditionalIncludeDirectories>..;..\..\..\hlsdk\common;..\..\..\hlsdk\engine;..\..\..\hlsdk\dlls;..\..\..\hlsdk\pm_shared;..\..\..\hlsdk\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10.17 <PreprocessorDefinitions>METAMOD_CORE;WIN32;_DEBUG;_WINDOWS;_USRDLL;METAMOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10.18 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
10.19 <PrecompiledHeader>
10.20 @@ -88,7 +87,7 @@
10.21 <ClCompile>
10.22 <Optimization>MaxSpeed</Optimization>
10.23 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
10.24 - <AdditionalIncludeDirectories>..;..\..\..\hlsdk\multiplayer\common;..\..\..\hlsdk\multiplayer\engine;..\..\..\hlsdk\multiplayer\dlls;..\..\..\hlsdk\multiplayer\pm_shared;..\..\..\hlsdk\multiplayer source\common;..\..\..\hlsdk\multiplayer source\engine;..\..\..\hlsdk\multiplayer source\dlls;..\..\..\hlsdk\multiplayer source\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10.25 + <AdditionalIncludeDirectories>..;..\..\..\hlsdk\common;..\..\..\hlsdk\engine;..\..\..\hlsdk\dlls;..\..\..\hlsdk\pm_shared;..\..\..\hlsdk\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10.26 <PreprocessorDefinitions>METAMOD_CORE;WIN32;NDEBUG;_WINDOWS;_USRDLL;METAMOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10.27 <StringPooling>true</StringPooling>
10.28 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
11.1 --- a/stub_plugin/msvc/stub_mm.dsp Fri Mar 15 15:01:20 2013 -0500
11.2 +++ b/stub_plugin/msvc/stub_mm.dsp Thu Sep 05 19:50:27 2013 -0500
11.3 @@ -43,7 +43,7 @@
11.4 # PROP Ignore_Export_Lib 1
11.5 # PROP Target_Dir ""
11.6 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /c
11.7 -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\metamod" /I "..\..\..\hlsdk\multiplayer\common" /I "..\..\..\hlsdk\multiplayer\engine" /I "..\..\..\hlsdk\multiplayer\dlls" /I "..\..\..\hlsdk\multiplayer\pm_shared" /I "..\..\..\hlsdk\multiplayer source\common" /I "..\..\..\hlsdk\multiplayer source\engine" /I "..\..\..\hlsdk\multiplayer source\dlls" /I "..\..\..\hlsdk\multiplayer source\pm_shared" /I "..\..\metamod" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /c
11.8 +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\metamod" /I "..\..\..\hlsdk\common" /I "..\..\..\hlsdk\engine" /I "..\..\..\hlsdk\dlls" /I "..\..\..\hlsdk\pm_shared" /I "..\..\..\hlsdk\public" /I "..\..\metamod" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /c
11.9 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
11.10 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
11.11 # ADD BASE RSC /l 0x409 /d "NDEBUG"
11.12 @@ -70,7 +70,7 @@
11.13 # PROP Ignore_Export_Lib 1
11.14 # PROP Target_Dir ""
11.15 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /GZ /c
11.16 -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod" /I "..\..\..\hlsdk\multiplayer\common" /I "..\..\..\hlsdk\multiplayer\engine" /I "..\..\..\hlsdk\multiplayer\dlls" /I "..\..\..\hlsdk\multiplayer\pm_shared" /I "..\..\..\hlsdk\multiplayer source\common" /I "..\..\..\hlsdk\multiplayer source\engine" /I "..\..\..\hlsdk\multiplayer source\dlls" /I "..\..\..\hlsdk\multiplayer source\pm_shared" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /GZ /c
11.17 +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\metamod" /I "..\..\..\hlsdk\common" /I "..\..\..\hlsdk\engine" /I "..\..\..\hlsdk\dlls" /I "..\..\..\hlsdk\pm_shared" /I "..\..\..\hlsdk\public" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUB_MM_EXPORTS" /YX /FD /GZ /c
11.18 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
11.19 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
11.20 # ADD BASE RSC /l 0x409 /d "_DEBUG"
12.1 --- a/stub_plugin/msvc/stub_mm.vcproj Fri Mar 15 15:01:20 2013 -0500
12.2 +++ b/stub_plugin/msvc/stub_mm.vcproj Thu Sep 05 19:50:27 2013 -0500
12.3 @@ -22,7 +22,7 @@
12.4 <Tool
12.5 Name="VCCLCompilerTool"
12.6 Optimization="0"
12.7 - AdditionalIncludeDirectories="..\..\metamod;..\..\..\hlsdk\multiplayer\common;..\..\..\hlsdk\multiplayer\engine;..\..\..\hlsdk\multiplayer\dlls;..\..\..\hlsdk\multiplayer\pm_shared;"..\..\..\hlsdk\multiplayer source\common";"..\..\..\hlsdk\multiplayer source\engine";"..\..\..\hlsdk\multiplayer source\dlls";"..\..\..\hlsdk\multiplayer source\pm_shared""
12.8 + AdditionalIncludeDirectories="..\..\metamod;..\..\..\hlsdk\common;..\..\..\hlsdk\engine;..\..\..\hlsdk\dlls;..\..\..\hlsdk\pm_shared;..\..\..\hlsdk\public"
12.9 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STUB_MM_EXPORTS"
12.10 BasicRuntimeChecks="3"
12.11 RuntimeLibrary="1"
12.12 @@ -88,7 +88,7 @@
12.13 Name="VCCLCompilerTool"
12.14 Optimization="2"
12.15 InlineFunctionExpansion="1"
12.16 - AdditionalIncludeDirectories="..\..\metamod;..\..\..\hlsdk\multiplayer\common;..\..\..\hlsdk\multiplayer\engine;..\..\..\hlsdk\multiplayer\dlls;..\..\..\hlsdk\multiplayer\pm_shared;"..\..\..\hlsdk\multiplayer source\common";"..\..\..\hlsdk\multiplayer source\engine";"..\..\..\hlsdk\multiplayer source\dlls";"..\..\..\hlsdk\multiplayer source\pm_shared""
12.17 + AdditionalIncludeDirectories="..\..\metamod;..\..\..\hlsdk\common;..\..\..\hlsdk\engine;..\..\..\hlsdk\dlls;..\..\..\hlsdk\pm_shared;..\..\..\hlsdk\public"
12.18 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;STUB_MM_EXPORTS"
12.19 StringPooling="TRUE"
12.20 RuntimeLibrary="0"
13.1 --- a/trace_plugin/engine_api.cpp Fri Mar 15 15:01:20 2013 -0500
13.2 +++ b/trace_plugin/engine_api.cpp Thu Sep 05 19:50:27 2013 -0500
13.3 @@ -245,7 +245,7 @@
13.4 ENGINE_TRACE(pfnParticleEffect, P_PRE, (""));
13.5 RETURN_META(MRES_IGNORED);
13.6 }
13.7 -void LightStyle(int style, char *val) {
13.8 +void LightStyle(int style, const char *val) {
13.9 ENGINE_TRACE(pfnLightStyle, P_PRE, (""));
13.10 RETURN_META(MRES_IGNORED);
13.11 }
13.12 @@ -547,7 +547,7 @@
13.13 RETURN_META(MRES_IGNORED);
13.14 }
13.15
13.16 -byte *LoadFileForMe(char *filename, int *pLength) {
13.17 +byte *LoadFileForMe(const char *filename, int *pLength) {
13.18 ENGINE_TRACE(pfnLoadFileForMe, P_PRE, ("file=%s", filename));
13.19 RETURN_META_VALUE(MRES_IGNORED, NULL);
13.20 }
13.21 @@ -708,7 +708,7 @@
13.22 ENGINE_TRACE(pfnDeltaUnsetField, P_PRE, ("field=%s", fieldname));
13.23 RETURN_META(MRES_IGNORED);
13.24 }
13.25 -void DeltaAddEncoder( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
13.26 +void DeltaAddEncoder( const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
13.27 ENGINE_TRACE(pfnDeltaAddEncoder, P_PRE, (""));
13.28 RETURN_META(MRES_IGNORED);
13.29 }
13.30 @@ -743,7 +743,7 @@
13.31 ENGINE_TRACE(pfnCreateInstancedBaseline, P_PRE, (""));
13.32 RETURN_META_VALUE(MRES_IGNORED, 0);
13.33 }
13.34 -void Cvar_DirectSet( struct cvar_s *var, char *value ) {
13.35 +void Cvar_DirectSet( struct cvar_s *var, const char *value ) {
13.36 ENGINE_TRACE(pfnCvar_DirectSet, P_PRE, ("cvar=%s", var->name));
13.37 RETURN_META(MRES_IGNORED);
13.38 }
13.39 @@ -856,9 +856,9 @@
13.40 RETURN_META(MRES_IGNORED);
13.41 }
13.42
13.43 -int EngCheckParm(const char *pchCmdLineToken, char **pchNextVal)
13.44 +int CheckParm(const char *pchCmdLineToken, char **ppnext)
13.45 {
13.46 - ENGINE_TRACE(pfnEngCheckParm, P_PRE, ("token=%s",pchCmdLineToken?pchCmdLineToken:"nil"));
13.47 + ENGINE_TRACE(pfnCheckParm, P_PRE, ("token=%s",pchCmdLineToken?pchCmdLineToken:"nil"));
13.48 RETURN_META_VALUE(MRES_IGNORED, 0);
13.49 }
13.50
13.51 @@ -1068,7 +1068,7 @@
13.52 ResetTutorMessageDecayData, // pfnResetTutorMessageDecayData()
13.53 QueryClientCvarValue, // pfnQueryClientCvarValue()
13.54 QueryClientCvarValue2, // pfnQueryClientCvarValue2()
13.55 - EngCheckParm, // pfnEngCheckParm()
13.56 + CheckParm, // pfnCheckParm()
13.57 };
13.58
13.59 C_DLLEXPORT int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine,
14.1 --- a/trace_plugin/engine_api_post.cpp Fri Mar 15 15:01:20 2013 -0500
14.2 +++ b/trace_plugin/engine_api_post.cpp Thu Sep 05 19:50:27 2013 -0500
14.3 @@ -242,7 +242,7 @@
14.4 ENGINE_TRACE(pfnParticleEffect, P_POST, (""));
14.5 RETURN_META(MRES_IGNORED);
14.6 }
14.7 -void LightStyle_Post(int style, char *val) {
14.8 +void LightStyle_Post(int style, const char *val) {
14.9 ENGINE_TRACE(pfnLightStyle, P_POST, (""));
14.10 RETURN_META(MRES_IGNORED);
14.11 }
14.12 @@ -514,7 +514,7 @@
14.13 RETURN_META(MRES_IGNORED);
14.14 }
14.15
14.16 -byte *LoadFileForMe_Post(char *filename, int *pLength) {
14.17 +byte *LoadFileForMe_Post(const char *filename, int *pLength) {
14.18 ENGINE_TRACE(pfnLoadFileForMe, P_POST, (""));
14.19 RETURN_META_VALUE(MRES_IGNORED, NULL);
14.20 }
14.21 @@ -680,7 +680,7 @@
14.22 ENGINE_TRACE(pfnDeltaUnsetField, P_POST, (""));
14.23 RETURN_META(MRES_IGNORED);
14.24 }
14.25 -void DeltaAddEncoder_Post( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
14.26 +void DeltaAddEncoder_Post( const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ) {
14.27 ENGINE_TRACE(pfnDeltaAddEncoder, P_POST, (""));
14.28 RETURN_META(MRES_IGNORED);
14.29 }
14.30 @@ -715,7 +715,7 @@
14.31 ENGINE_TRACE(pfnCreateInstancedBaseline, P_POST, (""));
14.32 RETURN_META_VALUE(MRES_IGNORED, 0);
14.33 }
14.34 -void Cvar_DirectSet_Post( struct cvar_s *var, char *value ) {
14.35 +void Cvar_DirectSet_Post( struct cvar_s *var, const char *value ) {
14.36 ENGINE_TRACE(pfnCvar_DirectSet, P_POST, (""));
14.37 RETURN_META(MRES_IGNORED);
14.38 }
14.39 @@ -855,9 +855,9 @@
14.40
14.41 // Added 2009-06-17 (no SDK update):
14.42
14.43 -int EngCheckParm_Post(const char *pchCmdLineToken, char **pchNextVal) {
14.44 +int CheckParm_Post(const char *pchCmdLineToken, char **ppnext) {
14.45 // trace output in Post
14.46 - ENGINE_TRACE(pfnEngCheckParm, P_POST, ("token=%s, nextval=%s",pchCmdLineToken?pchCmdLineToken:"nil",pchNextVal?*pchNextVal:"nil"));
14.47 + ENGINE_TRACE(pfnCheckParm, P_POST, ("token=%s, nextval=%s",pchCmdLineToken?pchCmdLineToken:"nil",ppnext?*ppnext:"nil"));
14.48 RETURN_META_VALUE(MRES_IGNORED, 0);
14.49 }
14.50
14.51 @@ -1069,7 +1069,7 @@
14.52 // Added 2005-11-22 (no SDK update):
14.53 QueryClientCvarValue2_Post, // pfnQueryClientCvarValue2()
14.54 // Added 2009-06-17 (no SDK update):
14.55 - EngCheckParm_Post, // pfnEngCheckParm()
14.56 + CheckParm_Post, // pfnCheckParm()
14.57 };
14.58
14.59 C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int *interfaceVersion )