forked from CSSZombieEscape/sm-ext-CSSFixes
initial commit
This commit is contained in:
commit
dbff71cc89
406
AMBuildScript
Normal file
406
AMBuildScript
Normal file
@ -0,0 +1,406 @@
|
|||||||
|
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
|
||||||
|
import os, sys
|
||||||
|
|
||||||
|
# Simple extensions do not need to modify this file.
|
||||||
|
|
||||||
|
class SDK(object):
|
||||||
|
def __init__(self, sdk, ext, aDef, name, platform, dir):
|
||||||
|
self.folder = 'hl2sdk-' + dir
|
||||||
|
self.envvar = sdk
|
||||||
|
self.ext = ext
|
||||||
|
self.code = aDef
|
||||||
|
self.define = name
|
||||||
|
self.platform = platform
|
||||||
|
self.name = dir
|
||||||
|
self.path = None
|
||||||
|
|
||||||
|
WinOnly = ['windows']
|
||||||
|
WinLinux = ['windows', 'linux']
|
||||||
|
WinLinuxMac = ['windows', 'linux', 'mac']
|
||||||
|
|
||||||
|
PossibleSDKs = {
|
||||||
|
'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
|
||||||
|
}
|
||||||
|
|
||||||
|
def ResolveEnvPath(env, folder):
|
||||||
|
if env in os.environ:
|
||||||
|
path = os.environ[env]
|
||||||
|
if os.path.isdir(path):
|
||||||
|
return path
|
||||||
|
return None
|
||||||
|
|
||||||
|
head = os.getcwd()
|
||||||
|
oldhead = None
|
||||||
|
while head != None and head != oldhead:
|
||||||
|
path = os.path.join(head, folder)
|
||||||
|
if os.path.isdir(path):
|
||||||
|
return path
|
||||||
|
oldhead = head
|
||||||
|
head, tail = os.path.split(head)
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def Normalize(path):
|
||||||
|
return os.path.abspath(os.path.normpath(path))
|
||||||
|
|
||||||
|
class ExtensionConfig(object):
|
||||||
|
def __init__(self):
|
||||||
|
self.sdks = {}
|
||||||
|
self.binaries = []
|
||||||
|
self.extensions = []
|
||||||
|
self.generated_headers = None
|
||||||
|
self.mms_root = None
|
||||||
|
self.sm_root = None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def tag(self):
|
||||||
|
if builder.options.debug == '1':
|
||||||
|
return 'Debug'
|
||||||
|
return 'Release'
|
||||||
|
|
||||||
|
def detectSDKs(self):
|
||||||
|
sdk_list = builder.options.sdks.split(',')
|
||||||
|
use_all = sdk_list[0] == 'all'
|
||||||
|
use_present = sdk_list[0] == 'present'
|
||||||
|
|
||||||
|
for sdk_name in PossibleSDKs:
|
||||||
|
sdk = PossibleSDKs[sdk_name]
|
||||||
|
if builder.target_platform in sdk.platform:
|
||||||
|
if builder.options.hl2sdk_root:
|
||||||
|
sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
|
||||||
|
else:
|
||||||
|
sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
|
||||||
|
if sdk_path is None or not os.path.isdir(sdk_path):
|
||||||
|
if use_all or sdk_name in sdk_list:
|
||||||
|
raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
|
||||||
|
continue
|
||||||
|
if use_all or use_present or sdk_name in sdk_list:
|
||||||
|
sdk.path = Normalize(sdk_path)
|
||||||
|
self.sdks[sdk_name] = sdk
|
||||||
|
|
||||||
|
if len(self.sdks) < 1:
|
||||||
|
raise Exception('At least one SDK must be available.')
|
||||||
|
|
||||||
|
if builder.options.sm_path:
|
||||||
|
self.sm_root = builder.options.sm_path
|
||||||
|
else:
|
||||||
|
self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
|
||||||
|
if not self.sm_root:
|
||||||
|
self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
|
||||||
|
if not self.sm_root:
|
||||||
|
self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
|
||||||
|
|
||||||
|
if not self.sm_root or not os.path.isdir(self.sm_root):
|
||||||
|
raise Exception('Could not find a source copy of SourceMod')
|
||||||
|
self.sm_root = Normalize(self.sm_root)
|
||||||
|
|
||||||
|
if builder.options.mms_path:
|
||||||
|
self.mms_root = builder.options.mms_path
|
||||||
|
else:
|
||||||
|
self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
|
||||||
|
if not self.mms_root:
|
||||||
|
self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
|
||||||
|
if not self.mms_root:
|
||||||
|
self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
|
||||||
|
|
||||||
|
if not self.mms_root or not os.path.isdir(self.mms_root):
|
||||||
|
raise Exception('Could not find a source copy of Metamod:Source')
|
||||||
|
self.mms_root = Normalize(self.mms_root)
|
||||||
|
|
||||||
|
def configure(self):
|
||||||
|
cxx = builder.DetectCompilers()
|
||||||
|
|
||||||
|
if cxx.like('gcc'):
|
||||||
|
cxx.defines += [
|
||||||
|
'stricmp=strcasecmp',
|
||||||
|
'_stricmp=strcasecmp',
|
||||||
|
'_snprintf=snprintf',
|
||||||
|
'_vsnprintf=vsnprintf',
|
||||||
|
'HAVE_STDINT_H',
|
||||||
|
'GNUC',
|
||||||
|
]
|
||||||
|
cxx.cflags += [
|
||||||
|
'-pipe',
|
||||||
|
'-fno-strict-aliasing',
|
||||||
|
'-Wall',
|
||||||
|
'-Werror',
|
||||||
|
'-Wno-unused',
|
||||||
|
'-Wno-switch',
|
||||||
|
'-Wno-array-bounds',
|
||||||
|
'-msse',
|
||||||
|
'-m32',
|
||||||
|
]
|
||||||
|
cxx.cxxflags += [
|
||||||
|
'-std=c++11',
|
||||||
|
]
|
||||||
|
|
||||||
|
have_gcc = cxx.vendor == 'gcc'
|
||||||
|
have_clang = cxx.vendor == 'clang'
|
||||||
|
if have_clang or (have_gcc and cxx.version >= '4'):
|
||||||
|
cxx.cflags += ['-fvisibility=hidden']
|
||||||
|
cxx.cxxflags += ['-fvisibility-inlines-hidden']
|
||||||
|
if have_clang or (have_gcc and cxx.version >= '4.6'):
|
||||||
|
cxx.cflags += ['-Wno-narrowing']
|
||||||
|
if (have_gcc and cxx.version >= '4.7') or (have_clang and cxx.version >= '3'):
|
||||||
|
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
|
||||||
|
if have_gcc and cxx.version >= '4.8':
|
||||||
|
cxx.cflags += ['-Wno-unused-result']
|
||||||
|
if have_clang:
|
||||||
|
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
||||||
|
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
||||||
|
cxx.cxxflags += ['-Wno-deprecated-register']
|
||||||
|
else:
|
||||||
|
cxx.cxxflags += ['-Wno-deprecated']
|
||||||
|
cxx.cflags += ['-Wno-sometimes-uninitialized']
|
||||||
|
|
||||||
|
cxx.linkflags += ['-m32']
|
||||||
|
cxx.cxxflags += [
|
||||||
|
'-fno-exceptions',
|
||||||
|
'-fno-threadsafe-statics',
|
||||||
|
'-Wno-non-virtual-dtor',
|
||||||
|
'-Wno-overloaded-virtual',
|
||||||
|
]
|
||||||
|
|
||||||
|
if have_gcc:
|
||||||
|
cxx.cflags += ['-mfpmath=sse']
|
||||||
|
elif cxx.vendor == 'msvc':
|
||||||
|
if builder.options.debug == '1':
|
||||||
|
cxx.cflags += ['/MTd']
|
||||||
|
cxx.linkflags += ['/NODEFAULTLIB:libcmt']
|
||||||
|
else:
|
||||||
|
cxx.cflags += ['/MT']
|
||||||
|
cxx.defines += [
|
||||||
|
'_CRT_SECURE_NO_DEPRECATE',
|
||||||
|
'_CRT_SECURE_NO_WARNINGS',
|
||||||
|
'_CRT_NONSTDC_NO_DEPRECATE',
|
||||||
|
'_ITERATOR_DEBUG_LEVEL=0',
|
||||||
|
]
|
||||||
|
cxx.cflags += [
|
||||||
|
'/W3',
|
||||||
|
]
|
||||||
|
cxx.cxxflags += [
|
||||||
|
'/EHsc',
|
||||||
|
'/GR-',
|
||||||
|
'/TP',
|
||||||
|
]
|
||||||
|
cxx.linkflags += [
|
||||||
|
'/MACHINE:X86',
|
||||||
|
'kernel32.lib',
|
||||||
|
'user32.lib',
|
||||||
|
'gdi32.lib',
|
||||||
|
'winspool.lib',
|
||||||
|
'comdlg32.lib',
|
||||||
|
'advapi32.lib',
|
||||||
|
'shell32.lib',
|
||||||
|
'ole32.lib',
|
||||||
|
'oleaut32.lib',
|
||||||
|
'uuid.lib',
|
||||||
|
'odbc32.lib',
|
||||||
|
'odbccp32.lib',
|
||||||
|
]
|
||||||
|
|
||||||
|
# Optimization
|
||||||
|
if builder.options.opt == '1':
|
||||||
|
cxx.defines += ['NDEBUG']
|
||||||
|
if cxx.like('gcc'):
|
||||||
|
cxx.cflags += ['-O3']
|
||||||
|
elif cxx.like('msvc'):
|
||||||
|
cxx.cflags += ['/Ox', '/Zo']
|
||||||
|
cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
|
||||||
|
|
||||||
|
# Debugging
|
||||||
|
if builder.options.debug == '1':
|
||||||
|
cxx.defines += ['DEBUG', '_DEBUG']
|
||||||
|
if cxx.like('msvc'):
|
||||||
|
cxx.cflags += ['/Od', '/RTC1']
|
||||||
|
|
||||||
|
# This needs to be after our optimization flags which could otherwise disable it.
|
||||||
|
if cxx.vendor == 'msvc':
|
||||||
|
# Don't omit the frame pointer.
|
||||||
|
cxx.cflags += ['/Oy-']
|
||||||
|
|
||||||
|
# Platform-specifics
|
||||||
|
if builder.target_platform == 'linux':
|
||||||
|
cxx.defines += ['_LINUX', 'POSIX']
|
||||||
|
cxx.linkflags += ['-lm']
|
||||||
|
if cxx.vendor == 'gcc':
|
||||||
|
cxx.linkflags += ['-static-libgcc']
|
||||||
|
elif cxx.vendor == 'clang':
|
||||||
|
cxx.linkflags += ['-lgcc_eh']
|
||||||
|
elif builder.target_platform == 'mac':
|
||||||
|
cxx.defines += ['OSX', '_OSX', 'POSIX']
|
||||||
|
cxx.cflags += ['-mmacosx-version-min=10.5']
|
||||||
|
cxx.linkflags += [
|
||||||
|
'-mmacosx-version-min=10.5',
|
||||||
|
'-arch', 'i386',
|
||||||
|
'-lstdc++',
|
||||||
|
'-stdlib=libstdc++',
|
||||||
|
]
|
||||||
|
cxx.cxxflags += ['-stdlib=libstdc++']
|
||||||
|
elif builder.target_platform == 'windows':
|
||||||
|
cxx.defines += ['WIN32', '_WINDOWS']
|
||||||
|
|
||||||
|
# Finish up.
|
||||||
|
cxx.includes += [
|
||||||
|
os.path.join(self.sm_root, 'public'),
|
||||||
|
]
|
||||||
|
|
||||||
|
def ConfigureForHL2(self, binary, sdk):
|
||||||
|
compiler = binary.compiler
|
||||||
|
|
||||||
|
if sdk.name == 'episode1':
|
||||||
|
mms_path = os.path.join(self.mms_root, 'core-legacy')
|
||||||
|
else:
|
||||||
|
mms_path = os.path.join(self.mms_root, 'core')
|
||||||
|
|
||||||
|
compiler.cxxincludes += [
|
||||||
|
os.path.join(mms_path),
|
||||||
|
os.path.join(mms_path, 'sourcehook'),
|
||||||
|
]
|
||||||
|
|
||||||
|
defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
|
||||||
|
compiler.defines += defines
|
||||||
|
|
||||||
|
paths = [
|
||||||
|
['public'],
|
||||||
|
['public', 'engine'],
|
||||||
|
['public', 'mathlib'],
|
||||||
|
['public', 'vstdlib'],
|
||||||
|
['public', 'tier0'],
|
||||||
|
['public', 'tier1']
|
||||||
|
]
|
||||||
|
if sdk.name == 'episode1' or sdk.name == 'darkm':
|
||||||
|
paths.append(['public', 'dlls'])
|
||||||
|
paths.append(['game_shared'])
|
||||||
|
else:
|
||||||
|
paths.append(['public', 'game', 'server'])
|
||||||
|
paths.append(['public', 'toolframework'])
|
||||||
|
paths.append(['game', 'shared'])
|
||||||
|
paths.append(['common'])
|
||||||
|
|
||||||
|
compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
|
||||||
|
|
||||||
|
if sdk.name in ['sdk2013', 'bms'] and compiler.like('gcc'):
|
||||||
|
# The 2013 SDK already has these in public/tier0/basetypes.h
|
||||||
|
compiler.defines.remove('stricmp=strcasecmp')
|
||||||
|
compiler.defines.remove('_stricmp=strcasecmp')
|
||||||
|
compiler.defines.remove('_snprintf=snprintf')
|
||||||
|
compiler.defines.remove('_vsnprintf=vsnprintf')
|
||||||
|
|
||||||
|
if compiler.like('msvc'):
|
||||||
|
compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
|
||||||
|
else:
|
||||||
|
compiler.defines += ['COMPILER_GCC']
|
||||||
|
|
||||||
|
# For everything after Swarm, this needs to be defined for entity networking
|
||||||
|
# to work properly with sendprop value changes.
|
||||||
|
if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
|
||||||
|
compiler.defines += ['NETWORK_VARS_ENABLED']
|
||||||
|
|
||||||
|
if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']:
|
||||||
|
if builder.target_platform in ['linux', 'mac']:
|
||||||
|
compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
|
||||||
|
|
||||||
|
if sdk.name == 'csgo' and builder.target_platform == 'linux':
|
||||||
|
compiler.linkflags += ['-lstdc++']
|
||||||
|
|
||||||
|
for path in paths:
|
||||||
|
compiler.cxxincludes += [os.path.join(sdk.path, *path)]
|
||||||
|
|
||||||
|
if builder.target_platform == 'linux':
|
||||||
|
if sdk.name == 'episode1':
|
||||||
|
lib_folder = os.path.join(sdk.path, 'linux_sdk')
|
||||||
|
elif sdk.name in ['sdk2013', 'bms']:
|
||||||
|
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
|
||||||
|
else:
|
||||||
|
lib_folder = os.path.join(sdk.path, 'lib', 'linux')
|
||||||
|
elif builder.target_platform == 'mac':
|
||||||
|
if sdk.name in ['sdk2013', 'bms']:
|
||||||
|
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
|
||||||
|
else:
|
||||||
|
lib_folder = os.path.join(sdk.path, 'lib', 'mac')
|
||||||
|
|
||||||
|
if builder.target_platform in ['linux', 'mac']:
|
||||||
|
if sdk.name in ['sdk2013', 'bms']:
|
||||||
|
compiler.postlink += [
|
||||||
|
compiler.Dep(os.path.join(lib_folder, 'tier1.a')),
|
||||||
|
compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))
|
||||||
|
]
|
||||||
|
else:
|
||||||
|
compiler.postlink += [
|
||||||
|
compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')),
|
||||||
|
compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
|
||||||
|
]
|
||||||
|
|
||||||
|
if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
|
||||||
|
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
|
||||||
|
|
||||||
|
dynamic_libs = []
|
||||||
|
if builder.target_platform == 'linux':
|
||||||
|
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2']:
|
||||||
|
dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
|
||||||
|
elif sdk.name in ['l4d', 'blade', 'insurgency', 'csgo', 'dota']:
|
||||||
|
dynamic_libs = ['libtier0.so', 'libvstdlib.so']
|
||||||
|
else:
|
||||||
|
dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
|
||||||
|
elif builder.target_platform == 'mac':
|
||||||
|
compiler.linkflags.append('-liconv')
|
||||||
|
dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
|
||||||
|
elif builder.target_platform == 'windows':
|
||||||
|
libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
|
||||||
|
if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
|
||||||
|
libs.append('interfaces')
|
||||||
|
for lib in libs:
|
||||||
|
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
|
||||||
|
compiler.linkflags.append(compiler.Dep(lib_path))
|
||||||
|
|
||||||
|
for library in dynamic_libs:
|
||||||
|
source_path = os.path.join(lib_folder, library)
|
||||||
|
output_path = os.path.join(binary.localFolder, library)
|
||||||
|
|
||||||
|
def make_linker(source_path, output_path):
|
||||||
|
def link(context, binary):
|
||||||
|
cmd_node, (output,) = context.AddSymlink(source_path, output_path)
|
||||||
|
return output
|
||||||
|
return link
|
||||||
|
|
||||||
|
linker = make_linker(source_path, output_path)
|
||||||
|
compiler.linkflags[0:0] = [compiler.Dep(library, linker)]
|
||||||
|
|
||||||
|
return binary
|
||||||
|
|
||||||
|
def ConfigureForExtension(self, context, compiler):
|
||||||
|
compiler.cxxincludes += [
|
||||||
|
os.path.join(context.currentSourcePath),
|
||||||
|
os.path.join(context.currentSourcePath, 'sdk'),
|
||||||
|
os.path.join(self.sm_root, 'public'),
|
||||||
|
os.path.join(self.sm_root, 'public', 'extensions'),
|
||||||
|
os.path.join(self.sm_root, 'sourcepawn', 'include'),
|
||||||
|
os.path.join(self.sm_root, 'public', 'amtl', 'include'),
|
||||||
|
]
|
||||||
|
return compiler
|
||||||
|
|
||||||
|
def HL2Project(self, context, name):
|
||||||
|
project = context.compiler.LibraryProject(name)
|
||||||
|
self.ConfigureForExtension(context, project.compiler)
|
||||||
|
return project
|
||||||
|
|
||||||
|
def HL2Config(self, project, name, sdk):
|
||||||
|
binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name))
|
||||||
|
return self.ConfigureForHL2(binary, sdk)
|
||||||
|
|
||||||
|
Extension = ExtensionConfig()
|
||||||
|
Extension.detectSDKs()
|
||||||
|
Extension.configure()
|
||||||
|
|
||||||
|
# Add additional buildscripts here
|
||||||
|
BuildScripts = [
|
||||||
|
'AMBuilder',
|
||||||
|
]
|
||||||
|
|
||||||
|
if builder.backend == 'amb2':
|
||||||
|
BuildScripts += [
|
||||||
|
'PackageScript',
|
||||||
|
]
|
||||||
|
|
||||||
|
builder.RunBuildScripts(BuildScripts, { 'Extension': Extension})
|
||||||
26
AMBuilder
Normal file
26
AMBuilder
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
|
||||||
|
import os
|
||||||
|
|
||||||
|
if not "SM" in globals():
|
||||||
|
SM = Extension
|
||||||
|
|
||||||
|
projectName = 'CSSFixes'
|
||||||
|
|
||||||
|
project = SM.HL2Project(builder, projectName + '.ext')
|
||||||
|
project.sources += [
|
||||||
|
'extension.cpp',
|
||||||
|
'../../public/smsdk_ext.cpp',
|
||||||
|
'../../public/CDetour/detours.cpp',
|
||||||
|
'../../public/asm/asm.c'
|
||||||
|
]
|
||||||
|
|
||||||
|
for sdk_name in SM.sdks:
|
||||||
|
sdk = SM.sdks[sdk_name]
|
||||||
|
binary = SM.HL2Config(project, projectName + '.ext', sdk)
|
||||||
|
binary.compiler.cxxincludes += [
|
||||||
|
os.path.join(SM.sm_root, 'public', 'extensions'),
|
||||||
|
os.path.join(SM.sm_root, 'public', 'sourcepawn'),
|
||||||
|
os.path.join(SM.sm_root, 'public', 'amtl')
|
||||||
|
]
|
||||||
|
|
||||||
|
SM.extensions += builder.Add(project)
|
||||||
233
Makefile
Normal file
233
Makefile
Normal file
@ -0,0 +1,233 @@
|
|||||||
|
# (C)2004-2010 SourceMod Development Team
|
||||||
|
# Makefile written by David "BAILOPAN" Anderson
|
||||||
|
|
||||||
|
###########################################
|
||||||
|
### EDIT THESE PATHS FOR YOUR OWN SETUP ###
|
||||||
|
###########################################
|
||||||
|
|
||||||
|
SMSDK = ../..
|
||||||
|
HL2SDK_ORIG = ../../../hl2sdk
|
||||||
|
HL2SDK_OB = ../../../hl2sdk-ob
|
||||||
|
HL2SDK_CSS = ../../../hl2sdk-css
|
||||||
|
HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
|
||||||
|
HL2SDK_L4D = ../../../hl2sdk-l4d
|
||||||
|
HL2SDK_L4D2 = ../../../hl2sdk-l4d2
|
||||||
|
HL2SDK_CSGO = ../../../hl2sdk-csgo
|
||||||
|
MMSOURCE19 = ../../../mmsource-1.9
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
### EDIT BELOW FOR OTHER PROJECTS ###
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
PROJECT = sample
|
||||||
|
|
||||||
|
#Uncomment for Metamod: Source enabled extension
|
||||||
|
#USEMETA = true
|
||||||
|
|
||||||
|
OBJECTS = smsdk_ext.cpp extension.cpp
|
||||||
|
|
||||||
|
##############################################
|
||||||
|
### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
|
||||||
|
##############################################
|
||||||
|
|
||||||
|
C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
|
||||||
|
C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
|
||||||
|
C_GCC4_FLAGS = -fvisibility=hidden
|
||||||
|
CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
|
||||||
|
CPP = gcc
|
||||||
|
CPP_OSX = clang
|
||||||
|
|
||||||
|
##########################
|
||||||
|
### SDK CONFIGURATIONS ###
|
||||||
|
##########################
|
||||||
|
|
||||||
|
override ENGSET = false
|
||||||
|
|
||||||
|
# Check for valid list of engines
|
||||||
|
ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE)))
|
||||||
|
override ENGSET = true
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(ENGINE)" "original"
|
||||||
|
HL2SDK = $(HL2SDK_ORIG)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=1
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "orangebox"
|
||||||
|
HL2SDK = $(HL2SDK_OB)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=3
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "css"
|
||||||
|
HL2SDK = $(HL2SDK_CSS)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=6
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "orangeboxvalve"
|
||||||
|
HL2SDK = $(HL2SDK_OB_VALVE)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=7
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "left4dead"
|
||||||
|
HL2SDK = $(HL2SDK_L4D)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=8
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "left4dead2"
|
||||||
|
HL2SDK = $(HL2SDK_L4D2)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=9
|
||||||
|
endif
|
||||||
|
ifeq "$(ENGINE)" "csgo"
|
||||||
|
HL2SDK = $(HL2SDK_CSGO)
|
||||||
|
CFLAGS += -DSOURCE_ENGINE=12
|
||||||
|
endif
|
||||||
|
|
||||||
|
HL2PUB = $(HL2SDK)/public
|
||||||
|
|
||||||
|
ifeq "$(ENGINE)" "original"
|
||||||
|
INCLUDE += -I$(HL2SDK)/public/dlls
|
||||||
|
METAMOD = $(MMSOURCE19)/core-legacy
|
||||||
|
else
|
||||||
|
INCLUDE += -I$(HL2SDK)/public/game/server
|
||||||
|
METAMOD = $(MMSOURCE19)/core
|
||||||
|
endif
|
||||||
|
|
||||||
|
OS := $(shell uname -s)
|
||||||
|
|
||||||
|
ifeq "$(OS)" "Darwin"
|
||||||
|
LIB_EXT = dylib
|
||||||
|
HL2LIB = $(HL2SDK)/lib/mac
|
||||||
|
else
|
||||||
|
LIB_EXT = so
|
||||||
|
ifeq "$(ENGINE)" "original"
|
||||||
|
HL2LIB = $(HL2SDK)/linux_sdk
|
||||||
|
else
|
||||||
|
HL2LIB = $(HL2SDK)/lib/linux
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# if ENGINE is original or OB
|
||||||
|
ifneq (,$(filter original orangebox,$(ENGINE)))
|
||||||
|
LIB_SUFFIX = _i486.$(LIB_EXT)
|
||||||
|
else
|
||||||
|
LIB_PREFIX = lib
|
||||||
|
LIB_SUFFIX = .$(LIB_EXT)
|
||||||
|
endif
|
||||||
|
|
||||||
|
INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
|
||||||
|
|
||||||
|
ifeq "$(USEMETA)" "true"
|
||||||
|
LINK_HL2 = $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
|
||||||
|
ifeq "$(ENGINE)" "csgo"
|
||||||
|
LINK_HL2 += $(HL2LIB)/interfaces_i486.a
|
||||||
|
endif
|
||||||
|
|
||||||
|
LINK += $(LINK_HL2)
|
||||||
|
|
||||||
|
INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) \
|
||||||
|
-I$(METAMOD)/sourcehook
|
||||||
|
CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
|
||||||
|
-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
|
||||||
|
-DSE_PORTAL2=11 -DSE_CSGO=12
|
||||||
|
endif
|
||||||
|
|
||||||
|
LINK += -m32 -lm -ldl
|
||||||
|
|
||||||
|
CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
|
||||||
|
-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Werror \
|
||||||
|
-Wno-overloaded-virtual -Wno-switch -Wno-unused -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
|
||||||
|
CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
|
||||||
|
|
||||||
|
################################################
|
||||||
|
### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
|
||||||
|
################################################
|
||||||
|
|
||||||
|
BINARY = $(PROJECT).ext.$(LIB_EXT)
|
||||||
|
|
||||||
|
ifeq "$(DEBUG)" "true"
|
||||||
|
BIN_DIR = Debug
|
||||||
|
CFLAGS += $(C_DEBUG_FLAGS)
|
||||||
|
else
|
||||||
|
BIN_DIR = Release
|
||||||
|
CFLAGS += $(C_OPT_FLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(USEMETA)" "true"
|
||||||
|
BIN_DIR := $(BIN_DIR).$(ENGINE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(OS)" "Darwin"
|
||||||
|
CPP = $(CPP_OSX)
|
||||||
|
LIB_EXT = dylib
|
||||||
|
CFLAGS += -DOSX -D_OSX
|
||||||
|
LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
|
||||||
|
else
|
||||||
|
LIB_EXT = so
|
||||||
|
CFLAGS += -D_LINUX
|
||||||
|
LINK += -shared
|
||||||
|
endif
|
||||||
|
|
||||||
|
IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
|
||||||
|
|
||||||
|
ifeq "$(IS_CLANG)" "1"
|
||||||
|
CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
|
||||||
|
CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
|
||||||
|
else
|
||||||
|
CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
|
||||||
|
CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# If not clang
|
||||||
|
ifeq "$(IS_CLANG)" "0"
|
||||||
|
CFLAGS += -mfpmath=sse
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Clang || GCC >= 4
|
||||||
|
ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
|
||||||
|
CFLAGS += $(C_GCC4_FLAGS)
|
||||||
|
CPPFLAGS += $(CPP_GCC4_FLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Clang >= 3 || GCC >= 4.7
|
||||||
|
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
||||||
|
CFLAGS += -Wno-delete-non-virtual-dtor
|
||||||
|
endif
|
||||||
|
|
||||||
|
# OS is Linux and not using clang
|
||||||
|
ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
|
||||||
|
LINK += -static-libgcc
|
||||||
|
endif
|
||||||
|
|
||||||
|
OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
|
||||||
|
|
||||||
|
# This will break if we include other Makefiles, but is fine for now. It allows
|
||||||
|
# us to make a copy of this file that uses altered paths (ie. Makefile.mine)
|
||||||
|
# or other changes without mucking up the original.
|
||||||
|
MAKEFILE_NAME := $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
|
||||||
|
|
||||||
|
$(BIN_DIR)/%.o: %.cpp
|
||||||
|
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
|
all: check
|
||||||
|
mkdir -p $(BIN_DIR)
|
||||||
|
ln -sf ../smsdk_ext.cpp
|
||||||
|
if [ "$(USEMETA)" = "true" ]; then \
|
||||||
|
ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX); \
|
||||||
|
ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX); \
|
||||||
|
fi
|
||||||
|
$(MAKE) -f $(MAKEFILE_NAME) extension
|
||||||
|
|
||||||
|
check:
|
||||||
|
if [ "$(USEMETA)" = "true" ] && [ "$(ENGSET)" = "false" ]; then \
|
||||||
|
echo "You must supply one of the following values for ENGINE:"; \
|
||||||
|
echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
extension: check $(OBJ_BIN)
|
||||||
|
$(CPP) $(INCLUDE) $(OBJ_BIN) $(LINK) -o $(BIN_DIR)/$(BINARY)
|
||||||
|
|
||||||
|
debug:
|
||||||
|
$(MAKE) -f $(MAKEFILE_NAME) all DEBUG=true
|
||||||
|
|
||||||
|
default: all
|
||||||
|
|
||||||
|
clean: check
|
||||||
|
rm -rf $(BIN_DIR)/*.o
|
||||||
|
rm -rf $(BIN_DIR)/$(BINARY)
|
||||||
|
|
||||||
36
PackageScript
Normal file
36
PackageScript
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
|
||||||
|
import os
|
||||||
|
|
||||||
|
# This is where the files will be output to
|
||||||
|
# package is the default
|
||||||
|
builder.SetBuildFolder('package')
|
||||||
|
|
||||||
|
# Add any folders you need to this list
|
||||||
|
folder_list = [
|
||||||
|
'addons/sourcemod/extensions',
|
||||||
|
'addons/sourcemod/gamedata',
|
||||||
|
]
|
||||||
|
|
||||||
|
# Create the distribution folder hierarchy.
|
||||||
|
folder_map = {}
|
||||||
|
for folder in folder_list:
|
||||||
|
norm_folder = os.path.normpath(folder)
|
||||||
|
folder_map[folder] = builder.AddFolder(norm_folder)
|
||||||
|
|
||||||
|
# Do all straight-up file copies from the source tree.
|
||||||
|
def CopyFiles(src, dest, files):
|
||||||
|
if not dest:
|
||||||
|
dest = src
|
||||||
|
dest_entry = folder_map[dest]
|
||||||
|
for source_file in files:
|
||||||
|
source_path = os.path.join(builder.sourcePath, src, source_file)
|
||||||
|
builder.AddCopy(source_path, dest_entry)
|
||||||
|
|
||||||
|
# Gamedata
|
||||||
|
CopyFiles('gamedata', 'addons/sourcemod/gamedata',
|
||||||
|
[ 'CSSFixes.txt' ]
|
||||||
|
)
|
||||||
|
|
||||||
|
# Copy binaries.
|
||||||
|
for cxx_task in Extension.extensions:
|
||||||
|
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
|
||||||
34
README.md
Normal file
34
README.md
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# Counter-Strike: Source bug fixes
|
||||||
|
### Fixes crash in filter_activator_*->TestActivator() when activator isn't valid anymore.
|
||||||
|
### Fixes game_ui lag and player_speedmod turning off your flashlight.
|
||||||
|
|
||||||
|
# Patchnotes
|
||||||
|
### Thanks to the leaked Source Engine 2007 sourcecode.
|
||||||
|
|
||||||
|
#### File: se2007/game/server/game_ui.cpp
|
||||||
|
##### Line 292:
|
||||||
|
|
||||||
|
```C
|
||||||
|
void CGameUI::Think( void )
|
||||||
|
[...]
|
||||||
|
pPlayer->AddFlag( FL_ONTRAIN );
|
||||||
|
[...]
|
||||||
|
```
|
||||||
|
Replaced **pPlayer->AddFlag( FL_ONTRAIN );** with **NOP** to fix prediction issues
|
||||||
|
while having game_ui active.
|
||||||
|
|
||||||
|
#### File: se2007/game/server/player.cpp
|
||||||
|
##### Line: 7587
|
||||||
|
|
||||||
|
```C
|
||||||
|
void CMovementSpeedMod::InputSpeedMod(inputdata_t &data)
|
||||||
|
[...]
|
||||||
|
// Turn off the flashlight
|
||||||
|
if ( pPlayer->FlashlightIsOn() )
|
||||||
|
{
|
||||||
|
pPlayer->FlashlightTurnOff();
|
||||||
|
}
|
||||||
|
[...]
|
||||||
|
```
|
||||||
|
|
||||||
|
**NOP**'d out the block.
|
||||||
23
configure.py
Executable file
23
configure.py
Executable file
@ -0,0 +1,23 @@
|
|||||||
|
# vim: set sts=2 ts=8 sw=2 tw=99 et:
|
||||||
|
import sys
|
||||||
|
from ambuild2 import run
|
||||||
|
|
||||||
|
# Simple extensions do not need to modify this file.
|
||||||
|
|
||||||
|
builder = run.PrepareBuild(sourcePath = sys.path[0])
|
||||||
|
|
||||||
|
builder.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
|
||||||
|
help='Root search folder for HL2SDKs')
|
||||||
|
builder.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
|
||||||
|
help='Path to Metamod:Source')
|
||||||
|
builder.options.add_option('--sm-path', type=str, dest='sm_path', default=None,
|
||||||
|
help='Path to SourceMod')
|
||||||
|
builder.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
|
||||||
|
help='Enable debugging symbols')
|
||||||
|
builder.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
|
||||||
|
help='Enable optimization')
|
||||||
|
builder.options.add_option('-s', '--sdks', default='all', dest='sdks',
|
||||||
|
help='Build against specified SDKs; valid args are "all", "present", or '
|
||||||
|
'comma-delimited list of engine names (default: %default)')
|
||||||
|
|
||||||
|
builder.Configure()
|
||||||
226
extension.cpp
Normal file
226
extension.cpp
Normal file
@ -0,0 +1,226 @@
|
|||||||
|
/**
|
||||||
|
* vim: set ts=4 :
|
||||||
|
* =============================================================================
|
||||||
|
* SourceMod Sample Extension
|
||||||
|
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
|
||||||
|
* =============================================================================
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it under
|
||||||
|
* the terms of the GNU General Public License, version 3.0, as published by the
|
||||||
|
* Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
* details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* As a special exception, AlliedModders LLC gives you permission to link the
|
||||||
|
* code of this program (as well as its derivative works) to "Half-Life 2," the
|
||||||
|
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
|
||||||
|
* by the Valve Corporation. You must obey the GNU General Public License in
|
||||||
|
* all respects for all other code used. Additionally, AlliedModders LLC grants
|
||||||
|
* this exception to all derivative works. AlliedModders LLC defines further
|
||||||
|
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
|
||||||
|
* or <http://www.sourcemod.net/license.php>.
|
||||||
|
*
|
||||||
|
* Version: $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "extension.h"
|
||||||
|
#include "CDetour/detours.h"
|
||||||
|
#include <sh_memory.h>
|
||||||
|
|
||||||
|
static struct SrcdsPatch
|
||||||
|
{
|
||||||
|
const char *pSignature;
|
||||||
|
const unsigned char *pPatchSignature;
|
||||||
|
const char *pPatchPattern;
|
||||||
|
const unsigned char *pPatch;
|
||||||
|
|
||||||
|
unsigned char *pOriginal;
|
||||||
|
uintptr_t pAddress;
|
||||||
|
uintptr_t pPatchAddress;
|
||||||
|
} gs_Patches[] = {
|
||||||
|
{
|
||||||
|
"_ZN7CGameUI5ThinkEv",
|
||||||
|
(unsigned char *)"\xC7\x44\x24\x04\x10\x00\x00\x00\x89\x34\x24\xE8\x00\x00\x00\x00",
|
||||||
|
"xxxxxxxxxxxx????",
|
||||||
|
(unsigned char *)"\xC7\x44\x24\x04\x10\x00\x00\x00\x89\x34\x24\x90\x90\x90\x90\x90",
|
||||||
|
0, 0, 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"_ZN17CMovementSpeedMod13InputSpeedModER11inputdata_t",
|
||||||
|
(unsigned char *)"\xFF\x90\x8C\x05\x00\x00\x85\xC0\x0F\x85\x75\x02\x00\x00",
|
||||||
|
"xxxxxxxxxxxxxx",
|
||||||
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
||||||
|
0, 0, 0
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class CBaseEntity;
|
||||||
|
struct variant_hax
|
||||||
|
{
|
||||||
|
const char *pszValue;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct inputdata_t
|
||||||
|
{
|
||||||
|
// The entity that initially caused this chain of output events.
|
||||||
|
CBaseEntity *pActivator;
|
||||||
|
// The entity that fired this particular output.
|
||||||
|
CBaseEntity *pCaller;
|
||||||
|
// The data parameter for this output.
|
||||||
|
variant_hax value;
|
||||||
|
// The unique ID of the output that was fired.
|
||||||
|
int nOutputID;
|
||||||
|
};
|
||||||
|
|
||||||
|
uintptr_t FindPattern(uintptr_t BaseAddr, const unsigned char *pData, const char *pPattern, size_t MaxSize);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file extension.cpp
|
||||||
|
* @brief Implement extension code here.
|
||||||
|
*/
|
||||||
|
|
||||||
|
CSSFixes g_Interface;
|
||||||
|
SMEXT_LINK(&g_Interface);
|
||||||
|
|
||||||
|
IGameConfig *g_pGameConf = NULL;
|
||||||
|
|
||||||
|
CDetour *detourInputTestActivator = NULL;
|
||||||
|
|
||||||
|
DETOUR_DECL_MEMBER1(InputTestActivator, void, inputdata_t *, inputdata)
|
||||||
|
{
|
||||||
|
if(!inputdata || !inputdata->pActivator || !inputdata->pCaller)
|
||||||
|
return;
|
||||||
|
|
||||||
|
DETOUR_MEMBER_CALL(InputTestActivator)(inputdata);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
||||||
|
{
|
||||||
|
char conf_error[255] = "";
|
||||||
|
if(!gameconfs->LoadGameConfigFile("CSSFixes", &g_pGameConf, conf_error, sizeof(conf_error)))
|
||||||
|
{
|
||||||
|
if(conf_error[0])
|
||||||
|
snprintf(error, maxlength, "Could not read CSSFixes.txt: %s", conf_error);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
CDetourManager::Init(g_pSM->GetScriptingEngine(), g_pGameConf);
|
||||||
|
|
||||||
|
detourInputTestActivator = DETOUR_CREATE_MEMBER(InputTestActivator, "CBaseFilter_InputTestActivator");
|
||||||
|
|
||||||
|
if(detourInputTestActivator == NULL)
|
||||||
|
{
|
||||||
|
snprintf(error, maxlength, "Could not create detour for CBaseFilter_InputTestActivator");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
detourInputTestActivator->EnableDetour();
|
||||||
|
|
||||||
|
void *pServerSo = dlopen("cstrike/bin/server_srv.so", RTLD_NOW);
|
||||||
|
if(!pServerSo)
|
||||||
|
{
|
||||||
|
snprintf(error, maxlength, "Could not dlopen server_srv.so");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for(int i = 0; i < sizeof(gs_Patches) / sizeof(*gs_Patches); i++)
|
||||||
|
{
|
||||||
|
struct SrcdsPatch *pPatch = &gs_Patches[i];
|
||||||
|
int PatchLen = strlen(pPatch->pPatchPattern);
|
||||||
|
|
||||||
|
pPatch->pAddress = (uintptr_t)memutils->ResolveSymbol(pServerSo, pPatch->pSignature);
|
||||||
|
if(!pPatch->pAddress)
|
||||||
|
{
|
||||||
|
snprintf(error, maxlength, "Could not find symbol: %s", pPatch->pSignature);
|
||||||
|
dlclose(pServerSo);
|
||||||
|
SDK_OnUnload();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pPatch->pPatchAddress = FindPattern(pPatch->pAddress, pPatch->pPatchSignature, pPatch->pPatchPattern, 1024);
|
||||||
|
if(!pPatch->pPatchAddress)
|
||||||
|
{
|
||||||
|
snprintf(error, maxlength, "Could not find patch signature for symbol: %s", pPatch->pSignature);
|
||||||
|
dlclose(pServerSo);
|
||||||
|
SDK_OnUnload();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pPatch->pOriginal = (unsigned char *)malloc(PatchLen * sizeof(unsigned char));
|
||||||
|
|
||||||
|
SourceHook::SetMemAccess((void *)pPatch->pPatchAddress, PatchLen, SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
|
||||||
|
for(int j = 0; j < PatchLen; j++)
|
||||||
|
{
|
||||||
|
pPatch->pOriginal[j] = *(unsigned char *)(pPatch->pPatchAddress + j);
|
||||||
|
*(unsigned char *)(pPatch->pPatchAddress + j) = pPatch->pPatch[j];
|
||||||
|
}
|
||||||
|
SourceHook::SetMemAccess((void *)pPatch->pPatchAddress, PatchLen, SH_MEM_READ|SH_MEM_EXEC);
|
||||||
|
}
|
||||||
|
|
||||||
|
dlclose(pServerSo);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSSFixes::SDK_OnUnload()
|
||||||
|
{
|
||||||
|
if(detourInputTestActivator != NULL)
|
||||||
|
{
|
||||||
|
detourInputTestActivator->Destroy();
|
||||||
|
detourInputTestActivator = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
gameconfs->CloseGameConfigFile(g_pGameConf);
|
||||||
|
|
||||||
|
for(int i = 0; i < sizeof(gs_Patches) / sizeof(*gs_Patches); i++)
|
||||||
|
{
|
||||||
|
struct SrcdsPatch *pPatch = &gs_Patches[i];
|
||||||
|
int PatchLen = strlen(pPatch->pPatchPattern);
|
||||||
|
|
||||||
|
if(!pPatch->pOriginal)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SourceHook::SetMemAccess((void *)pPatch->pPatchAddress, PatchLen, SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
|
||||||
|
for(int j = 0; j < PatchLen; j++)
|
||||||
|
{
|
||||||
|
*(unsigned char *)(pPatch->pPatchAddress + j) = pPatch->pOriginal[j];
|
||||||
|
}
|
||||||
|
SourceHook::SetMemAccess((void *)pPatch->pPatchAddress, PatchLen, SH_MEM_READ|SH_MEM_EXEC);
|
||||||
|
|
||||||
|
free(pPatch->pOriginal);
|
||||||
|
pPatch->pOriginal = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CSSFixes::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
uintptr_t FindPattern(uintptr_t BaseAddr, const unsigned char *pData, const char *pPattern, size_t MaxSize)
|
||||||
|
{
|
||||||
|
unsigned char *pMemory;
|
||||||
|
uintptr_t PatternLen = strlen(pPattern);
|
||||||
|
|
||||||
|
pMemory = reinterpret_cast<unsigned char *>(BaseAddr);
|
||||||
|
|
||||||
|
for(uintptr_t i = 0; i < MaxSize; i++)
|
||||||
|
{
|
||||||
|
uintptr_t Matches = 0;
|
||||||
|
while(*(pMemory + i + Matches) == pData[Matches] || pPattern[Matches] != 'x')
|
||||||
|
{
|
||||||
|
Matches++;
|
||||||
|
if(Matches == PatternLen)
|
||||||
|
return (uintptr_t)(pMemory + i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0x00;
|
||||||
|
}
|
||||||
119
extension.h
Normal file
119
extension.h
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
/**
|
||||||
|
* vim: set ts=4 :
|
||||||
|
* =============================================================================
|
||||||
|
* SourceMod Sample Extension
|
||||||
|
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
|
||||||
|
* =============================================================================
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it under
|
||||||
|
* the terms of the GNU General Public License, version 3.0, as published by the
|
||||||
|
* Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
* details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* As a special exception, AlliedModders LLC gives you permission to link the
|
||||||
|
* code of this program (as well as its derivative works) to "Half-Life 2," the
|
||||||
|
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
|
||||||
|
* by the Valve Corporation. You must obey the GNU General Public License in
|
||||||
|
* all respects for all other code used. Additionally, AlliedModders LLC grants
|
||||||
|
* this exception to all derivative works. AlliedModders LLC defines further
|
||||||
|
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
|
||||||
|
* or <http://www.sourcemod.net/license.php>.
|
||||||
|
*
|
||||||
|
* Version: $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
|
||||||
|
#define _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file extension.h
|
||||||
|
* @brief Sample extension code header.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "smsdk_ext.h"
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Sample implementation of the SDK Extension.
|
||||||
|
* Note: Uncomment one of the pre-defined virtual functions in order to use it.
|
||||||
|
*/
|
||||||
|
class CSSFixes : public SDKExtension
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* @brief This is called after the initial loading sequence has been processed.
|
||||||
|
*
|
||||||
|
* @param error Error message buffer.
|
||||||
|
* @param maxlength Size of error message buffer.
|
||||||
|
* @param late Whether or not the module was loaded after map load.
|
||||||
|
* @return True to succeed loading, false to fail.
|
||||||
|
*/
|
||||||
|
virtual bool SDK_OnLoad(char *error, size_t maxlength, bool late);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief This is called right before the extension is unloaded.
|
||||||
|
*/
|
||||||
|
virtual void SDK_OnUnload();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief This is called once all known extensions have been loaded.
|
||||||
|
* Note: It is is a good idea to add natives here, if any are provided.
|
||||||
|
*/
|
||||||
|
//virtual void SDK_OnAllLoaded();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Called when the pause state is changed.
|
||||||
|
*/
|
||||||
|
//virtual void SDK_OnPauseChange(bool paused);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief this is called when Core wants to know if your extension is working.
|
||||||
|
*
|
||||||
|
* @param error Error message buffer.
|
||||||
|
* @param maxlength Size of error message buffer.
|
||||||
|
* @return True if working, false otherwise.
|
||||||
|
*/
|
||||||
|
//virtual bool QueryRunning(char *error, size_t maxlength);
|
||||||
|
public:
|
||||||
|
#if defined SMEXT_CONF_METAMOD
|
||||||
|
/**
|
||||||
|
* @brief Called when Metamod is attached, before the extension version is called.
|
||||||
|
*
|
||||||
|
* @param error Error buffer.
|
||||||
|
* @param maxlength Maximum size of error buffer.
|
||||||
|
* @param late Whether or not Metamod considers this a late load.
|
||||||
|
* @return True to succeed, false to fail.
|
||||||
|
*/
|
||||||
|
virtual bool SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlength, bool late);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Called when Metamod is detaching, after the extension version is called.
|
||||||
|
* NOTE: By default this is blocked unless sent from SourceMod.
|
||||||
|
*
|
||||||
|
* @param error Error buffer.
|
||||||
|
* @param maxlength Maximum size of error buffer.
|
||||||
|
* @return True to succeed, false to fail.
|
||||||
|
*/
|
||||||
|
//virtual bool SDK_OnMetamodUnload(char *error, size_t maxlength);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Called when Metamod's pause state is changing.
|
||||||
|
* NOTE: By default this is blocked unless sent from SourceMod.
|
||||||
|
*
|
||||||
|
* @param paused Pause state being set.
|
||||||
|
* @param error Error buffer.
|
||||||
|
* @param maxlength Maximum size of error buffer.
|
||||||
|
* @return True to succeed, false to fail.
|
||||||
|
*/
|
||||||
|
//virtual bool SDK_OnMetamodPauseChange(bool paused, char *error, size_t maxlength);
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
|
||||||
14
gamedata/CSSFixes.txt
Normal file
14
gamedata/CSSFixes.txt
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
"Games"
|
||||||
|
{
|
||||||
|
"#default"
|
||||||
|
{
|
||||||
|
"Signatures"
|
||||||
|
{
|
||||||
|
"CBaseFilter_InputTestActivator"
|
||||||
|
{
|
||||||
|
"library" "server"
|
||||||
|
"linux" "@_ZN11CBaseFilter18InputTestActivatorER11inputdata_t"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
81
smsdk_config.h
Normal file
81
smsdk_config.h
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
/**
|
||||||
|
* vim: set ts=4 :
|
||||||
|
* =============================================================================
|
||||||
|
* SourceMod Sample Extension
|
||||||
|
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
|
||||||
|
* =============================================================================
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it under
|
||||||
|
* the terms of the GNU General Public License, version 3.0, as published by the
|
||||||
|
* Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
* details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* As a special exception, AlliedModders LLC gives you permission to link the
|
||||||
|
* code of this program (as well as its derivative works) to "Half-Life 2," the
|
||||||
|
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
|
||||||
|
* by the Valve Corporation. You must obey the GNU General Public License in
|
||||||
|
* all respects for all other code used. Additionally, AlliedModders LLC grants
|
||||||
|
* this exception to all derivative works. AlliedModders LLC defines further
|
||||||
|
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
|
||||||
|
* or <http://www.sourcemod.net/license.php>.
|
||||||
|
*
|
||||||
|
* Version: $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
|
||||||
|
#define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file smsdk_config.h
|
||||||
|
* @brief Contains macros for configuring basic extension information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Basic information exposed publicly */
|
||||||
|
#define SMEXT_CONF_NAME "CSSFixes"
|
||||||
|
#define SMEXT_CONF_DESCRIPTION "Patches bugs in the CSS server binary."
|
||||||
|
#define SMEXT_CONF_VERSION "1.0"
|
||||||
|
#define SMEXT_CONF_AUTHOR "BotoX"
|
||||||
|
#define SMEXT_CONF_URL ""
|
||||||
|
#define SMEXT_CONF_LOGTAG "CSSFIXES"
|
||||||
|
#define SMEXT_CONF_LICENSE "GPL"
|
||||||
|
#define SMEXT_CONF_DATESTRING __DATE__
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Exposes plugin's main interface.
|
||||||
|
*/
|
||||||
|
#define SMEXT_LINK(name) SDKExtension *g_pExtensionIface = name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Sets whether or not this plugin required Metamod.
|
||||||
|
* NOTE: Uncomment to enable, comment to disable.
|
||||||
|
*/
|
||||||
|
#define SMEXT_CONF_METAMOD
|
||||||
|
|
||||||
|
/** Enable interfaces you want to use here by uncommenting lines */
|
||||||
|
//#define SMEXT_ENABLE_FORWARDSYS
|
||||||
|
//#define SMEXT_ENABLE_HANDLESYS
|
||||||
|
//#define SMEXT_ENABLE_PLAYERHELPERS
|
||||||
|
//#define SMEXT_ENABLE_DBMANAGER
|
||||||
|
#define SMEXT_ENABLE_GAMECONF
|
||||||
|
#define SMEXT_ENABLE_MEMUTILS
|
||||||
|
//#define SMEXT_ENABLE_GAMEHELPERS
|
||||||
|
//#define SMEXT_ENABLE_TIMERSYS
|
||||||
|
//#define SMEXT_ENABLE_THREADER
|
||||||
|
//#define SMEXT_ENABLE_LIBSYS
|
||||||
|
//#define SMEXT_ENABLE_MENUS
|
||||||
|
//#define SMEXT_ENABLE_ADTFACTORY
|
||||||
|
//#define SMEXT_ENABLE_PLUGINSYS
|
||||||
|
//#define SMEXT_ENABLE_ADMINSYS
|
||||||
|
//#define SMEXT_ENABLE_TEXTPARSERS
|
||||||
|
//#define SMEXT_ENABLE_USERMSGS
|
||||||
|
//#define SMEXT_ENABLE_TRANSLATOR
|
||||||
|
//#define SMEXT_ENABLE_ROOTCONSOLEMENU
|
||||||
|
|
||||||
|
#endif // _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
|
||||||
Loading…
Reference in New Issue
Block a user