Update with lua support

.gitignore

@@ -21,3 +21,5 @@ MSVC/Report*.csv
 
 *.sublime-project
 *.sublime-workspace
+
+libs/lua/

.vscode/c_cpp_properties.json

@@ -11,6 +11,7 @@
                 "${workspaceFolder}/libs/capstone/include",
                 "${workspaceFolder}/libs/ann/include",
                 "${workspaceFolder}/libs/fmt/include",
+                "${workspaceFolder}/libs/lua/src",
                 "${workspaceFolder}/../alliedmodders/sourcemod/public",
                 "${workspaceFolder}/../alliedmodders/sourcemod/public/extensions",
                 "${workspaceFolder}/../alliedmodders/sourcemod/sourcepawn/include",

.vscode/settings.json

@@ -2,6 +2,74 @@
     "files.associations": {
         "typeindex": "cpp",
         "typeinfo": "cpp",
-        "new": "cpp"
-    }
+        "new": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "chrono": "cpp",
+        "complex": "cpp",
+        "condition_variable": "cpp",
+        "cstdint": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "ostream": "cpp",
+        "shared_mutex": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "variant": "cpp",
+        "charconv": "cpp",
+        "bit": "cpp",
+        "forward_list": "cpp",
+        "*.inc": "cpp",
+        "unordered_set": "cpp",
+        "mutex": "cpp",
+        "thread": "cpp"
+    },
+    "Lua.runtime.fileEncoding": "utf8",
+    "Lua.diagnostics.disable": [
+        "lowercase-global"
+    ]
 }

AMBuildScript

@@ -165,6 +165,7 @@ class ExtensionConfig(object):
     cxx.defines += ['GNUC']
     cxx.defines += ['PLATFORM_X86']
     cxx.defines += ['FMT_HEADER_ONLY']
+    cxx.defines += ['LUAJIT_ENABLE_LUA52COMPAT']
 
     ############################################################################
     # C & C++ COMPILER #########################################################

AMBuilder

@@ -70,6 +70,7 @@ sourceFiles += [
   'src/util/firehose_base.cpp',
   'src/util/firehose_recv.cpp',
   'src/util/firehose_send.cpp',
+  'src/util/lua.cpp',
   'src/util/pooled_string.cpp',
   'src/util/misc.cpp',
   'src/util/rtti.cpp',
@@ -165,6 +166,7 @@ sourceFiles += [
   'src/mod/etc/limp_projectiles.cpp',
   'src/mod/etc/loose_cannon_damage_fix.cpp',
   'src/mod/etc/mapentity_additions.cpp',
+  'src/mod/etc/mapentity_inputs.cpp',
   'src/mod/etc/medicgun_beam_machinery.cpp',
   'src/mod/etc/melee_ignore_teammates.cpp',
   'src/mod/etc/misc.cpp',
@@ -474,6 +476,7 @@ binary.compiler.linkflags += [
   '-liberty',
 #  os.path.join(builder.currentSourcePath, 'libs', 'capstone', 'libcapstone.a'),
   os.path.join(builder.currentSourcePath, 'libs', 'ann', 'lib', 'libANN.a'),
+  os.path.join(builder.currentSourcePath, 'libs', 'lua', 'src', 'liblua.a'),
 ]
 
 if builder.options.debug == '1':
@@ -490,6 +493,7 @@ binary.compiler.includes += [
   os.path.join(builder.currentSourcePath, 'libs', 'capstone', 'include'),
   os.path.join(builder.currentSourcePath, 'libs', 'ann', 'include'),
   os.path.join(builder.currentSourcePath, 'libs', 'fmt', 'include'),
+  os.path.join(builder.currentSourcePath, 'libs', 'lua', 'src'),
 ]
 
 # add libstrcompat dependency (for Linux only)

PackageScript

@@ -100,6 +100,14 @@ CopyFiles('scripts', 'custom/sigsegv/scripts',
   ]
 )
 
+# Lua Script files
+CopyFiles('src/lua', 'custom/sigsegv/scripts',
+  [
+    'globals.lua',
+    'natives.lua'
+  ]
+)
+
 builder.AddCopy('cfg/sigsegv_convars.cfg', folder_map['cfg'])
 builder.AddCopy('sigsegv.autoload', folder_map['addons/sourcemod/extensions'])
 builder.AddCopy('scripts/mvm_bigrock_sigdemo.pop', folder_map['custom/sigsegv/scripts/population'])

src/abi.h

@@ -142,7 +142,7 @@ union MemberPtrUnion
 
 
 template<class C, typename RET, typename... PARAMS>
-MemberPtrType<C, RET, PARAMS...> MakePtrToMemberFunc(const void *ptr)
+inline MemberPtrType<C, RET, PARAMS...> MakePtrToMemberFunc(const void *ptr)
 {
 	MemberPtrUnion<C, RET, PARAMS...> u;
 
@@ -152,34 +152,34 @@ MemberPtrType<C, RET, PARAMS...> MakePtrToMemberFunc(const void *ptr)
 	return u.fptr;
 }
 template<class C, typename RET, typename... PARAMS>
-MemberPtrTypeConst<C, RET, PARAMS...> MakePtrToConstMemberFunc(const void *ptr)
+inline MemberPtrTypeConst<C, RET, PARAMS...> MakePtrToConstMemberFunc(const void *ptr)
 {
 	return reinterpret_cast<MemberPtrTypeConst<C, RET, PARAMS...>>(MakePtrToMemberFunc<C, RET, PARAMS...>(ptr));
 }
 
 
 template<class C, typename RET, typename... PARAMS>
-void *GetAddrOfMemberFunc(MemberPtrType<C, RET, PARAMS...> ptr)
+inline void *GetAddrOfMemberFunc(MemberPtrType<C, RET, PARAMS...> ptr)
 {
 	MemberPtrUnion<C, RET, PARAMS...> u;
 
 	u.fptr = ptr;
 
-	assert((uintptr_t)u.guts.ptr % 2 == 0);
+//	assert((uintptr_t)u.guts.ptr % 2 == 0);
 	return (void *)u.guts.ptr;
 }
 template<class C, typename RET, typename... PARAMS>
-void *GetAddrOfMemberFunc(MemberPtrTypeConst<C, RET, PARAMS...> ptr)
+inline void *GetAddrOfMemberFunc(MemberPtrTypeConst<C, RET, PARAMS...> ptr)
 {
 	return GetAddrOfMemberFunc(reinterpret_cast<MemberPtrType<C, RET, PARAMS...>>(ptr));
 }
 template<class C, typename RET, typename... PARAMS>
-void *GetAddrOfMemberFunc(MemberPtrTypeVa<C, RET, PARAMS...> ptr)
+inline void *GetAddrOfMemberFunc(MemberPtrTypeVa<C, RET, PARAMS...> ptr)
 {
 	return GetAddrOfMemberFunc(reinterpret_cast<MemberPtrType<C, RET, PARAMS...>>(ptr));
 }
 template<class C, typename RET, typename... PARAMS>
-void *GetAddrOfMemberFunc(MemberPtrTypeVaConst<C, RET, PARAMS...> ptr)
+inline void *GetAddrOfMemberFunc(MemberPtrTypeVaConst<C, RET, PARAMS...> ptr)
 {
 	return GetAddrOfMemberFunc(reinterpret_cast<MemberPtrType<C, RET, PARAMS...>>(ptr));
 }

src/common.h

@@ -355,7 +355,8 @@ WARN_RESTORE()
 #include <ehandle.h>
 #include <datamap.h>
 #include <predictioncopy.h>
-#include <takedamageinfo.h>
+#include "sdk2013/takedamageinfo.h"
+//#include <takedamageinfo.h>
 #include <iserverentity.h>
 WARN_IGNORE__ADDRESS()
 WARN_IGNORE__NONNULL_COMPARE()