From 3287f166fe5558e409dac722d702eba0ae2721ef Mon Sep 17 00:00:00 2001
From: ragnarok-clanker <ragnarok-clanker>
Date: Sat, 31 Oct 2026 22:04:17 +0000
Subject: [PATCH] Maintenance: Replace raw address calls in
 UINewSelectCharWnd::Slot19: 0x00A8CF20 -> g_windowMgr.CloseWindow(0x12)
 (fn_17143); 0x00A97

Batch #8860 by ragnarok-clanker: forced by an admin (0 lower score(s), 1 changed function(s)); checked with 1 compiled unit(s).
---
 Source/UI/Window/UINewSelectCharWnd.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp
index aaad355c0..2c92648e9 100644
--- a/Source/UI/Window/UINewSelectCharWnd.cpp
+++ b/Source/UI/Window/UINewSelectCharWnd.cpp
@@ -5,6 +5,7 @@
 #include "UI/Text/UIStaticText.h"
 #include "UI/Window/UIControl.h"
 #include "UI/Window/UIWindowMgr.h"
+#include "UI/Window/WindowOrdering.h"
 #include "UI/Window/FuncDrawWNDChar.h"
 #include "Client/Registry.h"
 #include "Client/Mode/ModeMgr.h"
@@ -214,7 +215,7 @@ void __stdcall Nullsub244(int, int) {
 void UINewSelectCharWnd::Slot19() {
   if (g_sub_1319eb4 == 3) {
     if (g_windowMgr.unknown_0210 != 0) {
-      reinterpret_cast<void(__thiscall*)(UIWindowMgr*, int)>(0x00A8CF20)(&g_windowMgr, 0x12);
+      g_windowMgr.CloseWindow(0x12);
     }
   }
   if (g_sub_1319eb4 != 0) {
@@ -223,7 +224,7 @@ void UINewSelectCharWnd::Slot19() {
 
   UIWindow* wnd = g_windowMgr.LookupWindow(93);
   if (wnd) {
-    reinterpret_cast<void(__thiscall*)(UIWindowMgr*, UIWindow*)>(0x00A976C0)(&g_windowMgr, wnd);
+    reinterpret_cast<WindowOrdering&>(g_windowMgr).Promote(wnd);
   }
 
   if (this->m_pageSlot >= 0 && this->m_pageSlot < static_cast<int>(this->m_slotButtons2.size())) {