clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: Resubmission of the alias fold (10419 returned: it changed compiled code of fn_24380, fn_09591, fn_12755). The 7 aliases

Browse source 
Batch #10430 by ragnarok-clanker: no function's compiled code changes; checked with 530 compiled unit(s), including every includer of Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Contents/AchievementMgr.h, Source/Contents/Actors/RenderObject.h, Source/Contents/ClientState.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Messenger/MessengerMember.h, Source/UI/Dialogs/UIMemorialDunWnd.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/UIBartermarketWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UIWindowMgr.h.
This commit is contained in:
ragnarok-clanker 2026-11-03 23:00:04 +00:00
commit 6a2a80e18e
45 changed files with 129 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Client/Application/ApplicationWindow.cpp
View file

@ -195,7 +195,7 @@ LRESULT CALLBACK sub_E5C430(HWND window, UINT message, WPARAM wParam, LPARAM lPa
if (!g_windowMgr.GetHoverWindow() || g_windowMgr.GetHoverWindow()->SendMsg(nullptr, WM_KEYDOWN, wParam, lParam, 0, 0) != 3) {
g_serverLanguage->KeyDown(wParam, lParam);
}
if (g_dialogKeyboardEnabled && !g_dialogKeyboardBlocked) {
if (g_session.unknown_5480 && !g_session.unknown_5488) {
g_windowMgr.RefreshWindow01C8Edits();
}
return 0;

1
Source/Client/Mode/CGameMode.h
View file

@ -1028,7 +1028,6 @@ extern char g_pendingWhisperCount;
extern int g_whisperRecord;
extern int g_timeAttackStart;
void sub_CCFF10();
extern int g_localMapMove;
extern unsigned char g_gameModePacketBuffer[0x10000];
extern int g_unknown173A5BC;
extern int g_unknown_01738268;

1
Source/Client/Mode/CLoginMode.h
View file

@ -178,7 +178,6 @@ extern std::list<std::uint32_t> g_pingLogTicks;
extern char g_zoneServerIp[16];
extern int g_zoneServerPort;
extern char g_zoneServerHost[129];
extern int g_hangameLogin;
extern CharacterInfo g_charInfo;
extern bool g_replayMode;
extern int g_restoreSurfaces;

2
Source/Client/Mode/GameMode.cpp
View file

@ -3283,7 +3283,7 @@ void CGameMode::InitializeState() {
g_windowMgr.EnsureWindow(190);
}
if (g_closeWindow137State) {
if (g_session.unknown_593C) {
g_windowMgr.EnsureWindow(137);
}

10
Source/Client/Mode/GameModeHandlers.cpp
View file

@ -2194,10 +2194,10 @@ void CGameMode::ReceiveAchievementUpdate(
}
}
g_unknown_01738784 = unknown01738784;
g_unknown_01738788 = unknown01738788;
g_achievementCompleted = completed;
g_achievementTotal = total;
g_session.unknown_614C = unknown01738784;
g_session.unknown_6150 = unknown01738788;
g_session.unknown_6154 = completed;
g_session.unknown_6158 = total;
AchievementRecordPacket record;
record.id = id;
@ -2902,7 +2902,7 @@ void CGameMode::ReceivePendingItem1718List(const unsigned char* packet) {
}
g_session.ClearTradeItems();
if (g_hangameLogin == 1) {
if (g_session.m_channelCopId == 1) {
g_windowMgr.SendNotice(3, 0, 0, 0, 0, 0);
g_windowMgr.SendNotice(1, reinterpret_cast<std::intptr_t>("한게임 유저는 12월 3일부로 유료아이템 구매가 불가능합니다."), 0xFF, 0, 0, 0);
return;

6
Source/Client/Mode/GameModeItemLists.cpp
View file

@ -86,8 +86,6 @@ namespace {
}
}
// GLOBAL: gl_24395
int g_activePetEggIndex;
// OFFSET: 0x00D42FB0
// FUNCTION: fn_21831
@ -118,7 +116,7 @@ void CGameMode::ReceiveEquipListPart(unsigned char listType, int count, const un
FillEquipListItem(item, record, options);
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
g_activePetEggIndex = item.unknown_0000[1];
g_session.unknown_1050 = item.unknown_0000[1];
}
if (item.unknown_0000[3] == 0) {
@ -134,7 +132,7 @@ void CGameMode::ReceiveEquipListPart(unsigned char listType, int count, const un
}
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_activePetEggIndex).itemId.c_str());
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_session.unknown_1050).itemId.c_str());
if (!g_petEvolutionMgr->IsAutoFeeding(petEgg) && g_petAutoFeed == true) {
g_session.SendPetAutoFeedOption(0);
}

10
Source/Client/Mode/GameModeMiniMap.cpp
View file

@ -26,10 +26,6 @@
#include <timeapi.h>
#include <windows.h>
// GLOBAL: gl_24934
int g_searchStoreX;
// GLOBAL: gl_24935
int g_searchStoreY;
// GLOBAL: gl_25107
CFile g_whisperFile;
@ -160,10 +156,10 @@ void CGameMode::DrawMiniMapMembers(const TextureRegion& view) {
}
}
if (g_searchStoreX > -1) {
const int y = g_searchStoreY;
if (g_session.unknown_5BE8 > -1) {
const int y = g_session.unknown_5BEC;
if (y > -1) {
this->DrawMiniMapMarker(view, g_searchStoreX, y, 4, "유저인터페이스\\basic_interface\\search_store.bmp", 0, 0, true);
this->DrawMiniMapMarker(view, g_session.unknown_5BE8, y, 4, "유저인터페이스\\basic_interface\\search_store.bmp", 0, 0, true);
}
}
}

25
Source/Client/Mode/GameModeNotices.cpp
View file

@ -85,8 +85,6 @@
#include <vector>
#include <xtimec.h>
// GLOBAL: gl_25253
int g_localMapMove;
// GLOBAL: gl_25441
static const std::string g_whisperItemLinkTag = "<ITEML>";
@ -1772,17 +1770,8 @@ int g_unknown_0173826C;
// GLOBAL: gl_25113
int g_unknown_01738270;
// GLOBAL: gl_25114
int g_unknown_01738784;
// GLOBAL: gl_25115
short g_unknown_01738788;
// GLOBAL: gl_24957
int g_achievementCompleted;
// GLOBAL: gl_24958
int g_achievementTotal;
// OFFSET: 0x00D1C050
// FUNCTION: fn_21624
@ -1812,10 +1801,10 @@ void CGameMode::sub_D1C050(const AchievementStatePacket* packet) {
// OFFSET: 0x00D6C460
// FUNCTION: fn_22081
void CGameMode::sub_D6C460(int count, int unknown01738784, short unknown01738788, int completed, int total, const AchievementRecordPacket* packets) {
g_unknown_01738784 = unknown01738784;
g_unknown_01738788 = unknown01738788;
g_achievementCompleted = completed;
g_achievementTotal = total;
g_session.unknown_614C = unknown01738784;
g_session.unknown_6150 = unknown01738788;
g_session.unknown_6154 = completed;
g_session.unknown_6158 = total;
for (int i = 0; i < count; ++i) {
g_session.UpdateRecord6144(packets[i]);
@ -5137,7 +5126,7 @@ void CGameMode::RequestLocalMapMove(const char* mapName, std::uint16_t x, std::u
/* 0014 */ std::uint16_t y;
} packet;
g_localMapMove = 1;
g_session.m_localMapMove = 1;
packet.id = 0x91;
strcpy_s(packet.mapName, sizeof(packet.mapName), mapName);
packet.x = x;
@ -6084,7 +6073,7 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) {
break;
case 260:
if (packet->aid == g_session.m_aid) {
g_seasonalMonsterSprites = 1;
g_session.unknown_5450 = 1;
}
std::sprintf(message, "");
break;
@ -6725,7 +6714,7 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) {
break;
case 260:
if (packet->aid == g_session.m_aid) {
g_seasonalMonsterSprites = 0;
g_session.unknown_5450 = 0;
}
std::sprintf(message, "");
break;

16
Source/Client/Mode/GameModePackets.cpp
View file

@ -1526,7 +1526,7 @@ void CGameMode::ReceiveZoneServerChange(const unsigned char* packet) {
// OFFSET: 0x00D79F00
// FUNCTION: fn_22184
void CGameMode::ReceiveZoneServerChange(const char* mapName, std::int16_t x, std::int16_t y, int ip, std::int16_t port) {
g_localMapMove = 1;
g_session.m_localMapMove = 1;
this->ChangeZoneServer(mapName, x, y, ip, port, std::string());
}
@ -5495,7 +5495,7 @@ void CGameMode::ApplyStatusChange(
break;
case 260:
if (aid == g_session.m_aid) {
g_seasonalMonsterSprites = 1;
g_session.unknown_5450 = 1;
}
std::sprintf(message, "");
break;
@ -6225,7 +6225,7 @@ void CGameMode::ApplyStatusChange(
break;
case 260:
if (aid == g_session.m_aid) {
g_seasonalMonsterSprites = 0;
g_session.unknown_5450 = 0;
}
std::sprintf(message, "");
break;
@ -7862,7 +7862,7 @@ namespace {
// INLINED
__forceinline void EquipWindowItem(const ITEM_INFO& item) {
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
g_activePetEggIndex = item.unknown_0000[1];
g_session.unknown_1050 = item.unknown_0000[1];
}
if (item.unknown_0000[3] != 0) {
@ -7874,7 +7874,7 @@ namespace {
}
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_activePetEggIndex).itemId.c_str());
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_session.unknown_1050).itemId.c_str());
if (!g_petEvolutionMgr->IsAutoFeeding(petEgg) && g_petAutoFeed == true) {
g_session.SendPetAutoFeedOption(0);
}
@ -7998,7 +7998,7 @@ namespace {
// INLINED
__forceinline void AddInventoryEquipItem(const ITEM_INFO& item) {
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
g_activePetEggIndex = item.unknown_0000[1];
g_session.unknown_1050 = item.unknown_0000[1];
}
if (item.unknown_0000[3] == 0) {
@ -8014,7 +8014,7 @@ namespace {
}
if (g_session.IsPetEgg(std::atoi(item.itemId.c_str())) && item.unknown_005D) {
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_activePetEggIndex).itemId.c_str());
const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_session.unknown_1050).itemId.c_str());
if (!g_petEvolutionMgr->IsAutoFeeding(petEgg) && g_petAutoFeed == true) {
g_session.SendPetAutoFeedOption(0);
}
@ -9034,7 +9034,7 @@ void CGameMode::ReceivePetChangeState(const unsigned char* data) {
if (found == 1) {
item.unknown_005D = 1;
g_session.UpdateInventoryItem(item, 1);
g_activePetEggIndex = item.unknown_0000[1];
g_session.unknown_1050 = item.unknown_0000[1];
if (UIWindow* inventory = g_windowMgr.LookupWindow(8)) {
inventory->Invalidate();
}

8
Source/Client/Mode/LoginMode.cpp
View file

@ -1965,8 +1965,6 @@ void CLoginMode::Zc_Accept_Enter2(const AcceptEnterPositionPacket* packet) {
// GLOBAL: gl_25155
char g_loginFailCount;
// GLOBAL: gl_25156
int g_hangameLogin;
// OFFSET: 0x00D91790
// FUNCTION: fn_22289
@ -2053,7 +2051,7 @@ void CLoginMode::ShowLoginError(int code, int argument) {
if (g_serviceType == 0 && ++g_loginFailCount >= 3) {
message = std::string(PasswordRetryExceededMessage{}().Text());
if (g_windowMgr.Confirm(message.c_str(), 0, true, true, 0, "Message", 280, 120, 0) == 0xB8) {
if (g_hangameLogin == 1) {
if (g_session.m_channelCopId == 1) {
const std::uint8_t urlSource[] = {0x17, 0x67, 0xAB, 0xA1, 0xBF, 0x48, 0x56, 0x9A, 0x08, 0x64, 0xF1, 0xB9,
0xE4, 0x09, 0x1E, 0x8C, 0x12, 0x76, 0xF1, 0xB2, 0xEA, 0x0A, 0x79};
thread_local EncryptedName<sizeof(urlSource), 0xED796785D1DF137FULL> url(urlSource);
@ -2637,7 +2635,7 @@ void CLoginMode::PollNetworkStatus() {
const unsigned int dataLength = packet->length - offsetof(AcceptEnterNeoUnionPacket, characters);
this->characterCount = dataLength / sizeof(CharacterInfo);
g_charViewCount = this->characterCount;
g_session.unknown_0E94 = this->characterCount;
const unsigned char* characters = reinterpret_cast<const unsigned char*>(packet->characters) + dataLength % sizeof(CharacterInfo);
memcpy_s(this->characters, sizeof(this->characters), characters, this->characterCount * sizeof(CharacterInfo));
this->pendingCursorType = 19;
@ -2951,7 +2949,7 @@ void CLoginMode::PollNetworkStatus() {
case 0xB18: {
const std::int16_t slots = reinterpret_cast<const ShortResultPacket*>(g_gameModePacketBuffer)->result;
if (slots <= 100) {
g_extraInventorySlots = slots;
g_session.unknown_7FBC = slots;
}
break;
}