From 568bec17fca7aeeab2616699d4ddf65fc59ecf3b Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Thu, 5 Sep 2013 19:51:52 -0500 Subject: [PATCH] Fixed building with newly updated SDK. Former-commit-id: bf0455aea7c54493b2b921a2fef52120163e0959 --- amxmodx/Makefile | 4 ++-- amxmodx/msvc10/amxmodx_mm.vcxproj | 4 ++-- amxmodx/sdk/amxxmodule.h | 16 ++++++++-------- dlls/cstrike/cstrike/CstrikeHacks.cpp | 14 +++++++------- dlls/cstrike/cstrike/Makefile | 4 ++-- dlls/cstrike/cstrike/msvc10/cstrike.vcxproj | 4 ++-- dlls/cstrike/cstrike/sdk/amxxmodule.h | 16 ++++++++-------- dlls/cstrike/csx/Makefile | 4 ++-- dlls/cstrike/csx/msvc10/csx.vcxproj | 4 ++-- dlls/cstrike/csx/sdk/amxxmodule.h | 16 ++++++++-------- dlls/dod/dodfun/Makefile | 4 ++-- dlls/dod/dodfun/msvc10/dodfun.vcxproj | 4 ++-- dlls/dod/dodfun/sdk/amxxmodule.h | 16 ++++++++-------- dlls/dod/dodx/Makefile | 4 ++-- dlls/dod/dodx/msvc10/dodx.vcxproj | 4 ++-- dlls/dod/dodx/sdk/amxxmodule.h | 16 ++++++++-------- dlls/engine/Makefile | 4 ++-- dlls/engine/amxxapi.cpp | 2 +- dlls/engine/engine.cpp | 2 +- dlls/engine/engine.h | 4 ++-- dlls/engine/forwards.cpp | 2 +- dlls/engine/msvc10/engine.vcxproj | 4 ++-- dlls/engine/sdk/amxxmodule.h | 16 ++++++++-------- dlls/fakemeta/Makefile | 4 ++-- dlls/fakemeta/engfunc.cpp | 2 +- dlls/fakemeta/engfunc.h | 2 +- dlls/fakemeta/forward.cpp | 2 +- dlls/fakemeta/msvc10/fakemeta.vcxproj | 4 ++-- dlls/fakemeta/sdk/amxxmodule.h | 16 ++++++++-------- dlls/fun/Makefile | 4 ++-- dlls/fun/msvc10/fun.vcxproj | 4 ++-- dlls/fun/sdk/amxxmodule.h | 16 ++++++++-------- dlls/geoip/Makefile | 4 ++-- dlls/geoip/sdk/amxxmodule.h | 16 ++++++++-------- dlls/hamsandwich/Makefile | 4 ++-- dlls/hamsandwich/msvc10/hamsandwich.vcxproj | 4 ++-- dlls/hamsandwich/sdk/amxxmodule.h | 16 ++++++++-------- dlls/mysqlx/Makefile | 4 ++-- dlls/mysqlx/msvc10/mysqlx.vcxproj | 4 ++-- dlls/mysqlx/sdk/amxxmodule.h | 16 ++++++++-------- dlls/ns/Makefile | 9 +++++++-- dlls/ns/msvc10/ns.vcxproj | 4 ++-- dlls/ns/sdk/amxxmodule.h | 16 ++++++++-------- dlls/nvault/Makefile | 4 ++-- dlls/nvault/sdk/amxxmodule.h | 16 ++++++++-------- dlls/regex/Makefile | 4 ++-- dlls/regex/sdk/amxxmodule.h | 16 ++++++++-------- dlls/sockets/Makefile | 4 ++-- dlls/sockets/sdk/amxxmodule.h | 16 ++++++++-------- dlls/sqlite/Makefile | 9 +++++++-- dlls/sqlite/msvc10/sqlite.vcxproj | 4 ++-- dlls/sqlite/sdk/amxxmodule.h | 16 ++++++++-------- dlls/tfcx/Makefile | 4 ++-- dlls/tfcx/msvc10/tfcx.vcxproj | 4 ++-- dlls/tfcx/sdk/amxxmodule.h | 16 ++++++++-------- dlls/ts/tsfun/Makefile | 4 ++-- dlls/ts/tsfun/sdk/amxxmodule.h | 16 ++++++++-------- dlls/ts/tsx/Makefile | 4 ++-- dlls/ts/tsx/msvc10/tsx.vcxproj | 4 ++-- dlls/ts/tsx/sdk/amxxmodule.h | 16 ++++++++-------- 60 files changed, 243 insertions(+), 233 deletions(-) diff --git a/amxmodx/Makefile b/amxmodx/Makefile index 9e077193..fceded03 100755 --- a/amxmodx/Makefile +++ b/amxmodx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../hlsdk/multiplayer +HLSDK = ../../hlsdk MM_ROOT = ../../metamod/metamod ##################################### @@ -37,7 +37,7 @@ CPP_OSX = clang LINK = -Lzlib INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) + -I$(HLSDK)/public -I$(MM_ROOT) ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/amxmodx/msvc10/amxmodx_mm.vcxproj b/amxmodx/msvc10/amxmodx_mm.vcxproj index 96e2cf73..e988f454 100644 --- a/amxmodx/msvc10/amxmodx_mm.vcxproj +++ b/amxmodx/msvc10/amxmodx_mm.vcxproj @@ -92,7 +92,7 @@ Disabled - $(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + $(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -143,7 +143,7 @@ true Speed true - $(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + $(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) false true diff --git a/amxmodx/sdk/amxxmodule.h b/amxmodx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/amxmodx/sdk/amxxmodule.h +++ b/amxmodx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/cstrike/cstrike/CstrikeHacks.cpp b/dlls/cstrike/cstrike/CstrikeHacks.cpp index fb86cbaa..97278dc7 100644 --- a/dlls/cstrike/cstrike/CstrikeHacks.cpp +++ b/dlls/cstrike/cstrike/CstrikeHacks.cpp @@ -52,13 +52,13 @@ void CtrlDetour_ClientCommand(bool set) #endif static unsigned char DetourOps[] = { - '\x50', /* push eax ; just for safety */ - '\xff', '\x74', '\x24', '\x08', /* push [esp+0x8] ; push the edict pointer */ - '\xe8', '\x00', '\x00', '\x00', '\x00', /* call ; call our function */ - '\x83', '\xc4', '\x08', /* add esp, 8 ; correct stack */ - '\x85', '\xc0', /* test eax, eax ; do != 0 test */ - '\x74', '\x01', /* je ; if == 0, jump to where old func is saved */ - '\xc3' /* ret ; return otherwise */ + 0x50, /* push eax ; just for safety */ + 0xff, 0x74, 0x24, 0x08, /* push [esp+0x8] ; push the edict pointer */ + 0xe8, 0x00, 0x00, 0x00, 0x00, /* call ; call our function */ + 0x83, 0xc4, 0x08, /* add esp, 8 ; correct stack */ + 0x85, 0xc0, /* test eax, eax ; do != 0 test */ + 0x74, 0x01, /* je ; if == 0, jump to where old func is saved */ + 0xc3 /* ret ; return otherwise */ }; static unsigned char DetourJmp = '\xE9'; diff --git a/dlls/cstrike/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile index adf9b459..2c9e6c3e 100755 --- a/dlls/cstrike/cstrike/Makefile +++ b/dlls/cstrike/cstrike/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj index 5331b6eb..23494392 100644 --- a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj +++ b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj @@ -62,7 +62,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -105,7 +105,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/dlls/cstrike/cstrike/sdk/amxxmodule.h b/dlls/cstrike/cstrike/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/cstrike/cstrike/sdk/amxxmodule.h +++ b/dlls/cstrike/cstrike/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/cstrike/csx/Makefile b/dlls/cstrike/csx/Makefile index 1670743c..826ceeff 100755 --- a/dlls/cstrike/csx/Makefile +++ b/dlls/cstrike/csx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/cstrike/csx/msvc10/csx.vcxproj b/dlls/cstrike/csx/msvc10/csx.vcxproj index a0fd486a..e83dd0aa 100644 --- a/dlls/cstrike/csx/msvc10/csx.vcxproj +++ b/dlls/cstrike/csx/msvc10/csx.vcxproj @@ -63,7 +63,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT;%(PreprocessorDefinitions) true MultiThreaded @@ -104,7 +104,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/dlls/cstrike/csx/sdk/amxxmodule.h b/dlls/cstrike/csx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/cstrike/csx/sdk/amxxmodule.h +++ b/dlls/cstrike/csx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/dod/dodfun/Makefile b/dlls/dod/dodfun/Makefile index 06ed287f..232f52d5 100755 --- a/dlls/dod/dodfun/Makefile +++ b/dlls/dod/dodfun/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/dod/dodfun/msvc10/dodfun.vcxproj b/dlls/dod/dodfun/msvc10/dodfun.vcxproj index db8bd54a..2c6514d4 100644 --- a/dlls/dod/dodfun/msvc10/dodfun.vcxproj +++ b/dlls/dod/dodfun/msvc10/dodfun.vcxproj @@ -62,7 +62,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) dodfun_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded @@ -103,7 +103,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;dodfun_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/dlls/dod/dodfun/sdk/amxxmodule.h b/dlls/dod/dodfun/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/dod/dodfun/sdk/amxxmodule.h +++ b/dlls/dod/dodfun/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/dod/dodx/Makefile b/dlls/dod/dodx/Makefile index 196b75c7..c8ef2419 100755 --- a/dlls/dod/dodx/Makefile +++ b/dlls/dod/dodx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/dod/dodx/msvc10/dodx.vcxproj b/dlls/dod/dodx/msvc10/dodx.vcxproj index 319c5ac0..318492e8 100644 --- a/dlls/dod/dodx/msvc10/dodx.vcxproj +++ b/dlls/dod/dodx/msvc10/dodx.vcxproj @@ -62,7 +62,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) dodx_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded @@ -103,7 +103,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;dodx_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/dlls/dod/dodx/sdk/amxxmodule.h b/dlls/dod/dodx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/dod/dodx/sdk/amxxmodule.h +++ b/dlls/dod/dodx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile index d22a273d..ff0bbd2a 100755 --- a/dlls/engine/Makefile +++ b/dlls/engine/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -31,7 +31,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(HLSDK)/pm_shared -I$(MM_ROOT) -Isdk + -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/engine/amxxapi.cpp b/dlls/engine/amxxapi.cpp index 72151d49..551a5f36 100755 --- a/dlls/engine/amxxapi.cpp +++ b/dlls/engine/amxxapi.cpp @@ -213,7 +213,7 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax) RETURN_META(MRES_IGNORED); } -void LightStyle(int style, char *val) { +void LightStyle(int style, const char *val) { if (!style) { memset(glinfo.szRealLights, 0x0, 128); memcpy(glinfo.szRealLights, val, strlen(val)); diff --git a/dlls/engine/engine.cpp b/dlls/engine/engine.cpp index 2969e510..14ce6a48 100755 --- a/dlls/engine/engine.cpp +++ b/dlls/engine/engine.cpp @@ -522,7 +522,7 @@ static cell AMX_NATIVE_CALL set_lights(AMX *amx, cell *params) { glinfo.bCheckLights = false; g_pFunctionTable_Post->pfnStartFrame = NULL; memset(glinfo.szLastLights, 0x0, 128); - (g_engfuncs.pfnLightStyle)(0, (char *)glinfo.szRealLights); + (g_engfuncs.pfnLightStyle)(0, glinfo.szRealLights); return 1; } diff --git a/dlls/engine/engine.h b/dlls/engine/engine.h index ed0b879a..2eacf4f9 100755 --- a/dlls/engine/engine.h +++ b/dlls/engine/engine.h @@ -106,8 +106,8 @@ struct PlayerInfo { struct GlobalInfo { float fNextLights; - char *szLastLights[128]; - char *szRealLights[128]; + char szLastLights[128]; + char szRealLights[128]; bool bCheckLights; }; diff --git a/dlls/engine/forwards.cpp b/dlls/engine/forwards.cpp index 72d71171..aa7f1069 100755 --- a/dlls/engine/forwards.cpp +++ b/dlls/engine/forwards.cpp @@ -111,7 +111,7 @@ void StartFrame_Post() { if (glinfo.fNextLights < gpGlobals->time) { - (g_engfuncs.pfnLightStyle)(0, (char *)glinfo.szLastLights); + (g_engfuncs.pfnLightStyle)(0, glinfo.szLastLights); glinfo.fNextLights = gpGlobals->time + 1; } } diff --git a/dlls/engine/msvc10/engine.vcxproj b/dlls/engine/msvc10/engine.vcxproj index 964f52e0..07d96890 100644 --- a/dlls/engine/msvc10/engine.vcxproj +++ b/dlls/engine/msvc10/engine.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -74,7 +74,7 @@ - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded 4Bytes diff --git a/dlls/engine/sdk/amxxmodule.h b/dlls/engine/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/engine/sdk/amxxmodule.h +++ b/dlls/engine/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/fakemeta/Makefile b/dlls/fakemeta/Makefile index 3281ef85..38891e0a 100755 --- a/dlls/fakemeta/Makefile +++ b/dlls/fakemeta/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -31,7 +31,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(HLSDK)/pm_shared -I$(MM_ROOT) -Isdk + -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/fakemeta/engfunc.cpp b/dlls/fakemeta/engfunc.cpp index d1078a7b..791754e7 100755 --- a/dlls/fakemeta/engfunc.cpp +++ b/dlls/fakemeta/engfunc.cpp @@ -579,7 +579,7 @@ static cell AMX_NATIVE_CALL engfunc(AMX *amx, cell *params) // pfnLightStyle - case EngFunc_LightStyle: // void ) (int style, char* val); + case EngFunc_LightStyle: // void ) (int style, const char* val); cRet = MF_GetAmxAddr(amx,params[2]); iparam1=cRet[0]; temp = MF_GetAmxString(amx,params[3],0,&len); diff --git a/dlls/fakemeta/engfunc.h b/dlls/fakemeta/engfunc.h index 5063a3e5..9d7e749b 100755 --- a/dlls/fakemeta/engfunc.h +++ b/dlls/fakemeta/engfunc.h @@ -40,7 +40,7 @@ enum { EngFunc_TraceSphere, // void ) (const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr); EngFunc_GetAimVector, // void ) (edict_t *ent, float speed, float *rgflReturn); EngFunc_ParticleEffect, // void ) (const float *org, const float *dir, float color, float count); - EngFunc_LightStyle, // void ) (int style, char *val); + EngFunc_LightStyle, // void ) (int style, const char *val); EngFunc_DecalIndex, // int ) (const char *name); EngFunc_PointContents, // int ) (const float *rgflVector); EngFunc_FreeEntPrivateData, // void ) (edict_t *pEdict); diff --git a/dlls/fakemeta/forward.cpp b/dlls/fakemeta/forward.cpp index 71a2f86e..009b9302 100755 --- a/dlls/fakemeta/forward.cpp +++ b/dlls/fakemeta/forward.cpp @@ -400,7 +400,7 @@ SIMPLE_VOID_HOOK_EDICT_FLOAT_VECT(GetAimVector); SIMPLE_VOID_HOOK_CONSTVECT_CONSTVECT_FLOAT_FLOAT(ParticleEffect); // pfnLightStyle -SIMPLE_VOID_HOOK_INT_STRING(LightStyle); +SIMPLE_VOID_HOOK_INT_CONSTSTRING(LightStyle); // pfnDecalIndex SIMPLE_INT_HOOK_CONSTSTRING(DecalIndex); diff --git a/dlls/fakemeta/msvc10/fakemeta.vcxproj b/dlls/fakemeta/msvc10/fakemeta.vcxproj index e891aa6a..a0d4e91f 100644 --- a/dlls/fakemeta/msvc10/fakemeta.vcxproj +++ b/dlls/fakemeta/msvc10/fakemeta.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -73,7 +73,7 @@ - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;%(PreprocessorDefinitions) MultiThreaded false diff --git a/dlls/fakemeta/sdk/amxxmodule.h b/dlls/fakemeta/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/fakemeta/sdk/amxxmodule.h +++ b/dlls/fakemeta/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index a8dd0cad..0a7292a3 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/fun/msvc10/fun.vcxproj b/dlls/fun/msvc10/fun.vcxproj index 9497c1ab..cf2231ac 100644 --- a/dlls/fun/msvc10/fun.vcxproj +++ b/dlls/fun/msvc10/fun.vcxproj @@ -63,7 +63,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded @@ -104,7 +104,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/dlls/fun/sdk/amxxmodule.h b/dlls/fun/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/fun/sdk/amxxmodule.h +++ b/dlls/fun/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile index 2eadc466..fce54680 100755 --- a/dlls/geoip/Makefile +++ b/dlls/geoip/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/geoip/sdk/amxxmodule.h b/dlls/geoip/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/geoip/sdk/amxxmodule.h +++ b/dlls/geoip/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/hamsandwich/Makefile b/dlls/hamsandwich/Makefile index cb8d1a03..d4cf1ee9 100644 --- a/dlls/hamsandwich/Makefile +++ b/dlls/hamsandwich/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -31,7 +31,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(HLSDK)/pm_shared -I$(MM_ROOT) -Isdk + -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/hamsandwich/msvc10/hamsandwich.vcxproj b/dlls/hamsandwich/msvc10/hamsandwich.vcxproj index 3feca42b..b0c9b7a6 100644 --- a/dlls/hamsandwich/msvc10/hamsandwich.vcxproj +++ b/dlls/hamsandwich/msvc10/hamsandwich.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -76,7 +76,7 @@ - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreaded false diff --git a/dlls/hamsandwich/sdk/amxxmodule.h b/dlls/hamsandwich/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100644 --- a/dlls/hamsandwich/sdk/amxxmodule.h +++ b/dlls/hamsandwich/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/mysqlx/Makefile b/dlls/mysqlx/Makefile index 072b63ca..3213b29d 100755 --- a/dlls/mysqlx/Makefile +++ b/dlls/mysqlx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod MYSQL_DIR = ../../../mysql-5.0 @@ -33,7 +33,7 @@ CPP_OSX = clang LINK = $(MYSQL_DIR)/lib/libmysqlclient_r.a -lz -lpthread -L$(MYSQL_DIR)/lib INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(MYSQL_DIR)/include -Ithread -Imysql -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -I$(MYSQL_DIR)/include -Ithread -Imysql -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/mysqlx/msvc10/mysqlx.vcxproj b/dlls/mysqlx/msvc10/mysqlx.vcxproj index c3a35e71..91917814 100644 --- a/dlls/mysqlx/msvc10/mysqlx.vcxproj +++ b/dlls/mysqlx/msvc10/mysqlx.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(MYSQL5)\include;%(AdditionalIncludeDirectories) + ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(MYSQL5)\include;%(AdditionalIncludeDirectories) + ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) MultiThreaded false diff --git a/dlls/mysqlx/sdk/amxxmodule.h b/dlls/mysqlx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/mysqlx/sdk/amxxmodule.h +++ b/dlls/mysqlx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/ns/Makefile b/dlls/ns/Makefile index 7510b4a4..ec1c9141 100755 --- a/dlls/ns/Makefile +++ b/dlls/ns/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -33,7 +33,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(HLSDK)/pm_shared -I$(MM_ROOT) -Isdk + -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### @@ -91,6 +91,11 @@ ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $( CPPFLAGS += -Wno-delete-non-virtual-dtor endif +# GCC >= 4.8 +ifeq "$(shell expr $(IS_CLANG) \= 0 \& \( \( $(CPP_MAJOR) \= 4 \& $(CPP_MINOR) \>= 8 \) \| $(CPP_MAJOR) \> 4 \))" "1" + CFLAGS += -Wno-unused-local-typedefs +endif + # OS is Linux and not using clang ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1" LINK += -static-libgcc diff --git a/dlls/ns/msvc10/ns.vcxproj b/dlls/ns/msvc10/ns.vcxproj index f16cfe5d..1d5cbcf5 100644 --- a/dlls/ns/msvc10/ns.vcxproj +++ b/dlls/ns/msvc10/ns.vcxproj @@ -63,7 +63,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded @@ -102,7 +102,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/dlls/ns/sdk/amxxmodule.h b/dlls/ns/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/ns/sdk/amxxmodule.h +++ b/dlls/ns/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/nvault/Makefile b/dlls/nvault/Makefile index dfd9212b..ae637778 100755 --- a/dlls/nvault/Makefile +++ b/dlls/nvault/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/nvault/sdk/amxxmodule.h b/dlls/nvault/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/nvault/sdk/amxxmodule.h +++ b/dlls/nvault/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile index 3ec23fed..36785782 100755 --- a/dlls/regex/Makefile +++ b/dlls/regex/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = -lpcre INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/regex/sdk/amxxmodule.h b/dlls/regex/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/regex/sdk/amxxmodule.h +++ b/dlls/regex/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile index 03db932b..e2677aed 100755 --- a/dlls/sockets/Makefile +++ b/dlls/sockets/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/sockets/sdk/amxxmodule.h b/dlls/sockets/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/sockets/sdk/amxxmodule.h +++ b/dlls/sockets/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile index 5ea09b66..0e92be87 100755 --- a/dlls/sqlite/Makefile +++ b/dlls/sqlite/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod SQL = sqlite-source @@ -42,7 +42,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(SQL) -Isqlitepp -Ithread -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -I$(SQL) -Isqlitepp -Ithread -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### @@ -96,6 +96,11 @@ ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1" CPPFLAGS += $(CPP_GCC4_FLAGS) endif +# GCC >= 4.6 +ifeq "$(shell expr $(IS_CLANG) \= 0 \& \( \( $(CPP_MAJOR) \= 4 \& $(CPP_MINOR) \>= 6 \) \| $(CPP_MAJOR) \> 4 \))" "1" + CFLAGS += -Wno-unused-but-set-variable +endif + # Clang >= 3 || GCC >= 4.7 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1" CPPFLAGS += -Wno-delete-non-virtual-dtor diff --git a/dlls/sqlite/msvc10/sqlite.vcxproj b/dlls/sqlite/msvc10/sqlite.vcxproj index 04b69eb7..123184fb 100644 --- a/dlls/sqlite/msvc10/sqlite.vcxproj +++ b/dlls/sqlite/msvc10/sqlite.vcxproj @@ -53,7 +53,7 @@ /D "NO_TCL" %(AdditionalOptions) Disabled - ..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;%(AdditionalIncludeDirectories) + ..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ MaxSpeed OnlyExplicitInline true - ..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;%(AdditionalIncludeDirectories) + ..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) true MultiThreaded diff --git a/dlls/sqlite/sdk/amxxmodule.h b/dlls/sqlite/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/sqlite/sdk/amxxmodule.h +++ b/dlls/sqlite/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/tfcx/Makefile b/dlls/tfcx/Makefile index 0d416c18..3482fd45 100755 --- a/dlls/tfcx/Makefile +++ b/dlls/tfcx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../hlsdk/multiplayer +HLSDK = ../../../hlsdk MM_ROOT = ../../../metamod/metamod ##################################### @@ -31,7 +31,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/tfcx/msvc10/tfcx.vcxproj b/dlls/tfcx/msvc10/tfcx.vcxproj index a61218b5..41a5d4f5 100644 --- a/dlls/tfcx/msvc10/tfcx.vcxproj +++ b/dlls/tfcx/msvc10/tfcx.vcxproj @@ -61,7 +61,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -103,7 +103,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/dlls/tfcx/sdk/amxxmodule.h b/dlls/tfcx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/tfcx/sdk/amxxmodule.h +++ b/dlls/tfcx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile index 8971dcfa..ee5436b3 100755 --- a/dlls/ts/tsfun/Makefile +++ b/dlls/ts/tsfun/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -30,7 +30,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/ts/tsfun/sdk/amxxmodule.h b/dlls/ts/tsfun/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/ts/tsfun/sdk/amxxmodule.h +++ b/dlls/ts/tsfun/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile index 94f6700b..ada599b2 100755 --- a/dlls/ts/tsx/Makefile +++ b/dlls/ts/tsx/Makefile @@ -5,7 +5,7 @@ ### EDIT THESE PATHS FOR YOUR OWN SETUP ### ########################################### -HLSDK = ../../../../hlsdk/multiplayer +HLSDK = ../../../../hlsdk MM_ROOT = ../../../../metamod/metamod ##################################### @@ -31,7 +31,7 @@ CPP_OSX = clang LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Isdk + -I$(HLSDK)/public -I$(MM_ROOT) -Isdk ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### diff --git a/dlls/ts/tsx/msvc10/tsx.vcxproj b/dlls/ts/tsx/msvc10/tsx.vcxproj index 4ab34080..968220f9 100644 --- a/dlls/ts/tsx/msvc10/tsx.vcxproj +++ b/dlls/ts/tsx/msvc10/tsx.vcxproj @@ -61,7 +61,7 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;tsx_amxx_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -103,7 +103,7 @@ MaxSpeed OnlyExplicitInline - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories) + ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) tsx_amxx_EXPORTS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/dlls/ts/tsx/sdk/amxxmodule.h b/dlls/ts/tsx/sdk/amxxmodule.h index 9e42b72f..bdf464cd 100755 --- a/dlls/ts/tsx/sdk/amxxmodule.h +++ b/dlls/ts/tsx/sdk/amxxmodule.h @@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co #endif // FN_ParticleEffect #ifdef FN_LightStyle -void FN_LightStyle(int style, char *val); +void FN_LightStyle(int style, const char *val); #endif // FN_LightStyle #ifdef FN_DecalIndex @@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle #ifdef FN_LoadFileForMe -byte *FN_LoadFileForMe(char *filename, int *pLength); +byte *FN_LoadFileForMe(const char *filename, int *pLength); #endif // FN_LoadFileForMe #ifdef FN_FreeFile @@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField #ifdef FN_DeltaAddEncoder -void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder #ifdef FN_GetCurrentPlayer @@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline #endif // FN_engCreateInstancedBaseline #ifdef FN_Cvar_DirectSet -void FN_Cvar_DirectSet(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet #ifdef FN_ForceUnmodified @@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo #endif // FN_ParticleEffect_Post #ifdef FN_LightStyle_Post -void FN_LightStyle_Post(int style, char *val); +void FN_LightStyle_Post(int style, const char *val); #endif // FN_LightStyle_Post #ifdef FN_DecalIndex_Post @@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw); #endif // FN_CrosshairAngle_Post #ifdef FN_LoadFileForMe_Post -byte *FN_LoadFileForMe_Post(char *filename, int *pLength); +byte *FN_LoadFileForMe_Post(const char *filename, int *pLength); #endif // FN_LoadFileForMe_Post #ifdef FN_FreeFile_Post @@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname); #endif // FN_DeltaUnsetField_Post #ifdef FN_DeltaAddEncoder_Post -void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); +void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) ); #endif // FN_DeltaAddEncoder_Post #ifdef FN_GetCurrentPlayer_Post @@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas #endif // FN_engCreateInstancedBaseline_Post #ifdef FN_Cvar_DirectSet_Post -void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value); +void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value); #endif // FN_Cvar_DirectSet_Post #ifdef FN_ForceUnmodified_Post