Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed building with newly updated SDK.

Browse Source 
Former-commit-id: bf0455aea7c54493b2b921a2fef52120163e0959
This commit is contained in:
Scott Ehlert
2013-09-05 19:51:52 -05:00
parent 2a458530b7
commit 568bec17fc
60 changed files with 243 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/cstrike/cstrike/CstrikeHacks.cpp
View File

@ -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 <gate> ; call our function */
'\x83', '\xc4', '\x08', /* add esp, 8 ; correct stack */
'\x85', '\xc0', /* test eax, eax ; do != 0 test */
'\x74', '\x01', /* je <cont> ; 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 <gate> ; call our function */
0x83, 0xc4, 0x08, /* add esp, 8 ; correct stack */
0x85, 0xc0, /* test eax, eax ; do != 0 test */
0x74, 0x01, /* je <cont> ; if == 0, jump to where old func is saved */
0xc3 /* ret ; return otherwise */
};
static unsigned char DetourJmp = '\xE9';

4
dlls/cstrike/cstrike/Makefile
View File

@ -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 ###

4
dlls/cstrike/cstrike/msvc10/cstrike.vcxproj
View File

@ -62,7 +62,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -105,7 +105,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

16
dlls/cstrike/cstrike/sdk/amxxmodule.h
View File

@ -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

4
dlls/cstrike/csx/Makefile
View File

@ -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 ###

4
dlls/cstrike/csx/msvc10/csx.vcxproj
View File

@ -63,7 +63,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -104,7 +104,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(HLSDK)\multiplayer\pm_shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

16
dlls/cstrike/csx/sdk/amxxmodule.h
View File

@ -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