From 513705e33f59273c5b463c0da874a0066e8d0589 Mon Sep 17 00:00:00 2001
From: F1F7Y <64418963+F1F7Y@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:28:35 +0200
Subject: Memory class renaming (#469)

- Renames `MemoryAddress` to `CMemoryAddress`
- Renames `CMemoryAddress::As` to `CMemoryAddress::RCast`
---
 NorthstarDLL/engine/hoststate.cpp |  2 +-
 NorthstarDLL/engine/r2engine.cpp  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'NorthstarDLL/engine')

diff --git a/NorthstarDLL/engine/hoststate.cpp b/NorthstarDLL/engine/hoststate.cpp
index 50862e99..2ad21fcf 100644
--- a/NorthstarDLL/engine/hoststate.cpp
+++ b/NorthstarDLL/engine/hoststate.cpp
@@ -194,5 +194,5 @@ ON_DLL_LOAD_RELIESON("engine.dll", HostState, ConVar, (CModule module))
 {
 	AUTOHOOK_DISPATCH()
 
-	g_pHostState = module.Offset(0x7CF180).As<CHostState*>();
+	g_pHostState = module.Offset(0x7CF180).RCast<CHostState*>();
 }
diff --git a/NorthstarDLL/engine/r2engine.cpp b/NorthstarDLL/engine/r2engine.cpp
index 303cfaf8..67a628fd 100644
--- a/NorthstarDLL/engine/r2engine.cpp
+++ b/NorthstarDLL/engine/r2engine.cpp
@@ -26,18 +26,18 @@ namespace R2
 
 ON_DLL_LOAD("engine.dll", R2Engine, (CModule module))
 {
-	Cbuf_GetCurrentPlayer = module.Offset(0x120630).As<Cbuf_GetCurrentPlayerType>();
-	Cbuf_AddText = module.Offset(0x1203B0).As<Cbuf_AddTextType>();
-	Cbuf_Execute = module.Offset(0x1204B0).As<Cbuf_ExecuteType>();
+	Cbuf_GetCurrentPlayer = module.Offset(0x120630).RCast<Cbuf_GetCurrentPlayerType>();
+	Cbuf_AddText = module.Offset(0x1203B0).RCast<Cbuf_AddTextType>();
+	Cbuf_Execute = module.Offset(0x1204B0).RCast<Cbuf_ExecuteType>();
 
-	CCommand__Tokenize = module.Offset(0x418380).As<bool (*)(CCommand&, const char*, R2::cmd_source_t)>();
+	CCommand__Tokenize = module.Offset(0x418380).RCast<bool (*)(CCommand&, const char*, R2::cmd_source_t)>();
 
-	g_pEngine = module.Offset(0x7D70C8).Deref().As<CEngine*>();
+	g_pEngine = module.Offset(0x7D70C8).Deref().RCast<CEngine*>();
 
-	CBaseClient__Disconnect = module.Offset(0x1012C0).As<void (*)(void*, uint32_t, const char*, ...)>();
-	g_pClientArray = module.Offset(0x12A53F90).As<CBaseClient*>();
+	CBaseClient__Disconnect = module.Offset(0x1012C0).RCast<void (*)(void*, uint32_t, const char*, ...)>();
+	g_pClientArray = module.Offset(0x12A53F90).RCast<CBaseClient*>();
 
-	g_pServerState = module.Offset(0x12A53D48).As<server_state_t*>();
+	g_pServerState = module.Offset(0x12A53D48).RCast<server_state_t*>();
 
-	g_pGlobals = module.Offset(0x7C6F70).As<CGlobalVars*>();
+	g_pGlobals = module.Offset(0x7C6F70).RCast<CGlobalVars*>();
 }
-- 
cgit v1.2.3