fix: changed from CUtlStringToken to uint

roflmuffin · Oct 8, 2024 · 293a3a8 · 293a3a8
1 parent 32bd52c
commit 293a3a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/managed/CounterStrikeSharp.API/Modules/Utils/CEntityKeyValues.cs b/managed/CounterStrikeSharp.API/Modules/Utils/CEntityKeyValues.cs
@@ -117,7 +117,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
                         SetPointer(key, (nint)value);
                         break;
                     case KeyValuesType.TYPE_STRING_TOKEN:
-                        SetStringToken(key, (CUtlStringToken)value);
+                        // TODO: use 'CUtlStringToken' once we have it
+                        SetStringToken(key, (uint)value);
                         break;
                     case KeyValuesType.TYPE_EHANDLE:
                         SetEHandle(key, (CEntityHandle)value);
@@ -171,7 +172,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
 
         public nint GetPointer(string key, nint defaultValue = 0) => GetValue<nint>(key, KeyValuesType.TYPE_POINTER, defaultValue);
 
-        public CUtlStringToken? GetStringToken(string key, CUtlStringToken? defaultValue = null) => GetValue<CUtlStringToken>(key, KeyValuesType.TYPE_STRING_TOKEN, defaultValue);
+        // TODO: use 'CUtlStringToken' once we have it
+        public uint GetStringToken(string key, uint defaultValue = 0) => GetValue<uint>(key, KeyValuesType.TYPE_STRING_TOKEN, defaultValue);
 
         public CEntityHandle? GetEHandle(string key, CEntityHandle? defaultValue = null) => GetValue<CEntityHandle?>(key, KeyValuesType.TYPE_EHANDLE, defaultValue);
 
@@ -209,7 +211,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
 
         public void SetPointer(string key, nint value) => SetValue<nint>(key, KeyValuesType.TYPE_POINTER, value);
 
-        public void SetStringToken(string key, CUtlStringToken value) => SetValue<CUtlStringToken>(key, KeyValuesType.TYPE_STRING_TOKEN, value);
+        // TODO: use 'CUtlStringToken' once we have it
+        public void SetStringToken(string key, uint value) => SetValue<uint>(key, KeyValuesType.TYPE_STRING_TOKEN, value);
 
         public void SetEHandle(string key, CEntityHandle value) => SetValue<CEntityHandle>(key, KeyValuesType.TYPE_EHANDLE, value);
 

diff --git a/src/scripting/natives/natives_entities.cpp b/src/scripting/natives/natives_entities.cpp
@@ -343,7 +343,7 @@ void EntityKeyValuesSetValue(ScriptContext& script_context)
             break;
 
         case counterstrikesharp::TYPE_STRING_TOKEN:
-            keyValues->SetStringToken(key, script_context.GetArgument<unsigned int>(offset));
+            keyValues->SetStringToken(key, CUtlStringToken(script_context.GetArgument<unsigned int>(offset)));
             break;
 
         case counterstrikesharp::TYPE_EHANDLE:
@@ -487,7 +487,7 @@ void EntityKeyValuesGetValue(ScriptContext& script_context)
 
         case counterstrikesharp::TYPE_STRING_TOKEN:
         {
-            script_context.SetResult(keyValues->GetStringToken(key));
+            script_context.SetResult(keyValues->GetStringToken(key).GetHashCode());
         } break;
 
         case counterstrikesharp::TYPE_EHANDLE: