Skip to content

Commit 7d346df

Browse files
committed
fix: changed from CUtlStringToken to uint
1 parent b684fef commit 7d346df

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

managed/CounterStrikeSharp.API/Modules/Utils/CEntityKeyValues.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
117117
SetPointer(key, (nint)value);
118118
break;
119119
case KeyValuesType.TYPE_STRING_TOKEN:
120-
SetStringToken(key, (CUtlStringToken)value);
120+
// TODO: use 'CUtlStringToken' once we have it
121+
SetStringToken(key, (uint)value);
121122
break;
122123
case KeyValuesType.TYPE_EHANDLE:
123124
SetEHandle(key, (CEntityHandle)value);
@@ -171,7 +172,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
171172

172173
public nint GetPointer(string key, nint defaultValue = 0) => GetValue<nint>(key, KeyValuesType.TYPE_POINTER, defaultValue);
173174

174-
public CUtlStringToken? GetStringToken(string key, CUtlStringToken? defaultValue = null) => GetValue<CUtlStringToken>(key, KeyValuesType.TYPE_STRING_TOKEN, defaultValue);
175+
// TODO: use 'CUtlStringToken' once we have it
176+
public uint GetStringToken(string key, uint defaultValue = 0) => GetValue<uint>(key, KeyValuesType.TYPE_STRING_TOKEN, defaultValue);
175177

176178
public CEntityHandle? GetEHandle(string key, CEntityHandle? defaultValue = null) => GetValue<CEntityHandle?>(key, KeyValuesType.TYPE_EHANDLE, defaultValue);
177179

@@ -209,7 +211,8 @@ public CEntityKeyValues(nint pointer) : base(pointer)
209211

210212
public void SetPointer(string key, nint value) => SetValue<nint>(key, KeyValuesType.TYPE_POINTER, value);
211213

212-
public void SetStringToken(string key, CUtlStringToken value) => SetValue<CUtlStringToken>(key, KeyValuesType.TYPE_STRING_TOKEN, value);
214+
// TODO: use 'CUtlStringToken' once we have it
215+
public void SetStringToken(string key, uint value) => SetValue<uint>(key, KeyValuesType.TYPE_STRING_TOKEN, value);
213216

214217
public void SetEHandle(string key, CEntityHandle value) => SetValue<CEntityHandle>(key, KeyValuesType.TYPE_EHANDLE, value);
215218

src/scripting/natives/natives_entities.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void EntityKeyValuesSetValue(ScriptContext& script_context)
343343
break;
344344

345345
case counterstrikesharp::TYPE_STRING_TOKEN:
346-
keyValues->SetStringToken(key, script_context.GetArgument<unsigned int>(offset));
346+
keyValues->SetStringToken(key, CUtlStringToken(script_context.GetArgument<unsigned int>(offset)));
347347
break;
348348

349349
case counterstrikesharp::TYPE_EHANDLE:
@@ -487,7 +487,7 @@ void EntityKeyValuesGetValue(ScriptContext& script_context)
487487

488488
case counterstrikesharp::TYPE_STRING_TOKEN:
489489
{
490-
script_context.SetResult(keyValues->GetStringToken(key));
490+
script_context.SetResult(keyValues->GetStringToken(key).GetHashCode());
491491
} break;
492492

493493
case counterstrikesharp::TYPE_EHANDLE:

0 commit comments

Comments
 (0)