From ea1b19245de11d9bc455180461c99a8df4c206e4 Mon Sep 17 00:00:00 2001
From: nukeulater <nukeulater@gmail.com>
Date: Sat, 4 Nov 2023 12:18:49 +0200
Subject: [PATCH] update function name

---
 xlive/Blam/Engine/game/players.cpp                 | 4 ++--
 xlive/Blam/Engine/game/players.h                   | 2 +-
 xlive/H2MOD/GUI/XLiveRendering.cpp                 | 2 +-
 xlive/H2MOD/GUI/imgui_integration/Console/ComVar.h | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xlive/Blam/Engine/game/players.cpp b/xlive/Blam/Engine/game/players.cpp
index 1f8da23ae..e401d9ce9 100644
--- a/xlive/Blam/Engine/game/players.cpp
+++ b/xlive/Blam/Engine/game/players.cpp
@@ -97,7 +97,7 @@ datum s_player::get_unit_index(datum player_index)
 	return get(player_index)->unit_index;
 }
 
-uint8* s_player::get_player_unit(datum player_index) 
+uint8* s_player::get_player_unit_data(datum player_index)
 {
     datum unit_datum = s_player::get_unit_index(player_index);
     if (DATUM_IS_NONE(unit_datum))
@@ -108,7 +108,7 @@ uint8* s_player::get_player_unit(datum player_index)
 
 real_vector3d* s_player::get_unit_coords(datum player_index)
 {
-    uint8* player_unit = get_player_unit(player_index);
+    uint8* player_unit = get_player_unit_data(player_index);
     if (player_unit != nullptr)
         return reinterpret_cast<real_point3d*>(player_unit + 0x64);
 
diff --git a/xlive/Blam/Engine/game/players.h b/xlive/Blam/Engine/game/players.h
index d1a7b14ba..37a8787bb 100644
--- a/xlive/Blam/Engine/game/players.h
+++ b/xlive/Blam/Engine/game/players.h
@@ -171,7 +171,7 @@ struct s_player
 	static void set_unit_speed(datum player_index, float speed);
 	static const wchar_t* get_name(datum player_index);
 	static datum get_unit_index(datum player_index);
-	static uint8* get_player_unit(datum player_index);
+	static uint8* get_player_unit_data(datum player_index);
 	static real_vector3d* get_unit_coords(datum player_index);
 	static uint64 get_id(datum player_index);
 };
diff --git a/xlive/H2MOD/GUI/XLiveRendering.cpp b/xlive/H2MOD/GUI/XLiveRendering.cpp
index 7a07f2d59..e81f034f9 100644
--- a/xlive/H2MOD/GUI/XLiveRendering.cpp
+++ b/xlive/H2MOD/GUI/XLiveRendering.cpp
@@ -709,7 +709,7 @@ HRESULT WINAPI XLiveRender()
 		while (player_it.get_next_active_player())
 		{
 			real_point3d* player_position = s_player::get_unit_coords(player_it.get_current_player_index());
-			object_datum* biped_unit = (object_datum*)s_player::get_player_unit(player_it.get_current_player_index());
+			object_datum* biped_unit = (object_datum*)s_player::get_player_unit_data(player_it.get_current_player_index());
 			if (player_position != nullptr) {
 				std::wstring playerNameWide(player_it.get_current_player_name());
 				std::string playerName(playerNameWide.begin(), playerNameWide.end());
diff --git a/xlive/H2MOD/GUI/imgui_integration/Console/ComVar.h b/xlive/H2MOD/GUI/imgui_integration/Console/ComVar.h
index bfa3075c4..52783e057 100644
--- a/xlive/H2MOD/GUI/imgui_integration/Console/ComVar.h
+++ b/xlive/H2MOD/GUI/imgui_integration/Console/ComVar.h
@@ -103,17 +103,17 @@ class ComVarT : public IComVar
 	}
 
 	template<>
-	void SetValFromStrInternal<long>(const std::string& str, int _Base)
+	void SetValFromStrInternal<unsigned int>(const std::string& str, int _Base)
 	{
 		baseTypeT& val = Get();
-		val = std::stol(str, nullptr, _Base);
+		val = std::stoul(str, nullptr, _Base);
 	}
 
 	template<>
-	void SetValFromStrInternal<unsigned int>(const std::string& str, int _Base)
+	void SetValFromStrInternal<long>(const std::string& str, int _Base)
 	{
 		baseTypeT& val = Get();
-		val = std::stoul(str, nullptr, _Base);
+		val = std::stol(str, nullptr, _Base);
 	}
 
 	template<>