chore: update hl2sdk (#227)

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

docfx/docs/guides/getting-started.md

@@ -20,7 +20,7 @@ If you're more of a visual person, here is a <a href="https://www.youtube.com/wa
 3. Create a new line underneath `Game_LowViolence    csgo_lv` and add `Game    csgo/addons/metamod`.
 4. Restart your game server.
 
-Your `gameinfo.gi` should look like <a href="images/gameinfogi-example.png" target="_blank">this</a>. Type `meta list` in your server console to see if Metamod is loaded.
+Your `gameinfo.gi` should look like <a href="../../images/gameinfogi-example.png" target="_blank">this</a>. Type `meta list` in your server console to see if Metamod is loaded.
 
 ## Installing CounterStrikeSharp
 

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)

managed/CounterStrikeSharp.API/CounterStrikeSharp.API.csproj

@@ -4,9 +4,8 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;CP0003</NoWarn>
     <Nullable>enable</Nullable>
-    
     <Authors>Roflmuffin</Authors>
     <Description>Official server side runtime assembly for CounterStrikeSharp</Description>
     <PackageProjectUrl>http://docs.cssharp.dev/</PackageProjectUrl>
@@ -16,6 +15,10 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApiCompatValidateAssemblies>true</ApiCompatValidateAssemblies>
+    <ApiCompatContractAssembly>.\ApiCompat\v133.dll</ApiCompatContractAssembly> 
+  </PropertyGroup>
   <ItemGroup>
     <None Remove="Modules\Commands\CommandInfo" />
     <None Remove="Modules\Disabled\**" />
@@ -23,6 +26,7 @@
   <ItemGroup>
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.DotNet.ApiCompat.Task" Version="7.0.404" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.3" />

managed/CounterStrikeSharp.API/Modules/Events/GameEvent.cs

@@ -76,8 +76,7 @@ namespace CounterStrikeSharp.API.Modules.Events
                     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);

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 {

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)