chore: update hl2sdk (#227)

roflmuffin · Dec 27, 2023 · 8dbcb6d · 8dbcb6d
1 parent 2f0d34b
commit 8dbcb6d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(SOURCE_FILES
     src/mm_plugin.h
     libraries/hl2sdk-cs2/tier1/convar.cpp
     libraries/hl2sdk-cs2/tier1/generichash.cpp
+    libraries/hl2sdk-cs2/entity2/entityidentity.cpp
     libraries/hl2sdk-cs2/entity2/entitysystem.cpp
     libraries/dotnet/hostfxr.h
     libraries/dotnet/coreclr_delegates.h

diff --git a/libraries/hl2sdk-cs2 b/libraries/hl2sdk-cs2
diff --git a/makefiles/shared.cmake b/makefiles/shared.cmake
@@ -14,8 +14,11 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING
 # TODO: Use C++20 instead.
 set(CMAKE_CXX_STANDARD 17)
 
-Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-Set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+if (LINUX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+endif()
+
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 
 set(SOURCESDK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2)
@@ -51,8 +54,4 @@ include_directories(
     libraries
 )
 
-include(${CMAKE_CURRENT_LIST_DIR}/metamod/configure_metamod.cmake)
-
-if (LINUX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/metamod/configure_metamod.cmake)
diff --git a/managed/CounterStrikeSharp.API/Modules/Events/GameEvent.cs b/managed/CounterStrikeSharp.API/Modules/Events/GameEvent.cs
@@ -76,8 +76,7 @@ public void Set<T>(string name, T value)
                     SetInt(name, i);
                     break;
                 case var _ when value is CCSPlayerController player:
-                    // When I was testing this, the code seems to expect a slot, even though it is called index
-                    SetEntityIndex(name, (int)player.Index - 1);
+                    NativeAPI.SetEventPlayerController(Handle, name, player.Handle);
                     break;
                 case var _ when value is string s:
                     SetString(name, s);

diff --git a/src/core/managers/entity_manager.h b/src/core/managers/entity_manager.h
@@ -25,9 +25,6 @@
 #include "entitysystem.h"
 #include "scripting/callback_manager.h"
 
-// variant.h depends on ivscript.h, lets not include the whole thing
-DECLARE_POINTER_HANDLE(HSCRIPT);
-
 #include <variant.h>
 
 namespace counterstrikesharp {

diff --git a/src/mm_plugin.cpp b/src/mm_plugin.cpp
@@ -31,9 +31,13 @@
 #include "entity2/entitysystem.h"
 #include "interfaces/cs2_interfaces.h"
 
-
 counterstrikesharp::GlobalClass* counterstrikesharp::GlobalClass::head = nullptr;
 
+CGameEntitySystem *GameEntitySystem()
+{
+    return counterstrikesharp::globals::entitySystem;
+}
+
 // TODO: Workaround for windows, we __MUST__ have COUNTERSTRIKESHARP_API to handle it.
 // like on windows it should be `extern "C" __declspec(dllexport)`, on linux it should be anything else.
 DLL_EXPORT void InvokeNative(counterstrikesharp::fxNativeContext& context)
+4 −0		common/netmessages.proto
+16 −0		entity2/entityidentity.cpp
+335 −0		entity2/entitykeyvalues.cpp
+328 −4		entity2/entitysystem.cpp
+4 −0		game/server/eventqueue.h
+1 −0		game/shared/cs/cs_gameevents.proto
+10 −0		game/shared/cs/cs_usercmd.proto
+1 −2		game/shared/ehandle.h
+0 −443		game/shared/igamesystem.cpp
+315 −181		game/shared/igamesystem.h
+174 −0		game/shared/igamesystemfactory.h
+ −		lib/linux64/libtier0.so
+ −		lib/linux64/tier1.a
+ −		lib/public/win64/tier0.lib
+ −		lib/public/win64/tier1.lib
+0 −1		linux_sdk/Makefile.tier1
+4 −4		public/const.h
+37 −32		public/datamap.h
+1 −1		public/eiface.h
+49 −0		public/entity2/entityclass.h
+7 −2		public/entity2/entityidentity.h
+480 −0		public/entity2/entitykeyvalues.h
+244 −23		public/entity2/entitysystem.h
+51 −99		public/filesystem.h
+4 −4		public/igameevents.h
+1 −1		public/mathlib/mathlib.h
+18 −55		public/server_class.h
+3 −3		public/tier1/UtlStringMap.h
+39 −8		public/tier1/bufferstring.h
+193 −117		public/tier1/keyvalues3.h
+1 −1		public/tier1/utlhashtable.h
+71 −64		public/tier1/utlleanvector.h
+1 −1		public/tier1/utlmemory.h
+2 −2		public/tier1/utlstring.h
+5 −5		public/tier1/utlsymbol.h
+36 −35		public/tier1/utlsymbollarge.h
+7 −5		public/variant.h
+36 −36		public/vscript/ivscript.h
+356 −123		tier1/keyvalues3.cpp
+0 −1		tier1/tier1.vcxproj
+0 −3		tier1/tier1.vcxproj.filters
+0 −397		tier1/utlsymbol.cpp