clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: Resubmission of 14942 (gate: three existing in-class helpers whose lines changed lacked an annotation; marked // INLINED

Browse source 
Batch #14943 by ragnarok-clanker: no function's compiled code changes; checked with 741 compiled unit(s), including every includer of Source/ActorPickNode.h, Source/Client/Browser/BrowserClientSite.h, Source/Client/Browser/BrowserPopupDispatch.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Mode/CMode.h, Source/Client/Mode/ModeDragState.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Client/Stove/StoveMgr.h, Source/Contents/AchievementMgr.h, Source/Contents/ActorNameCard.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/GroundScope.h, Source/Contents/Actors/Item.h, Source/Contents/Actors/Npc.h, Source/Contents/Actors/Pc.h, Source/Contents/Actors/RenderObjectState.h, Source/Contents/Actors/Skill.h, Source/Contents/AdventureGuideMgr.h, Source/Contents/Camera/Camera.h, Source/Contents/Camera/CameraState.h, Source/Contents/CashEmotionMgr.h, Source/Contents/Configuration/GameSettingsMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/ThrowEffects.h, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundGeometry.h, Source/Contents/GuildInfo.h, Source/Contents/Items/ItemDescription.h, Source/Contents/Items/ItemInfo.h, Source/Contents/MapSkyMgr.h, Source/Contents/Messenger/MessengerWindows.h, Source/Contents/Models/ModelNode.h, Source/Contents/NavigationManager.h, Source/Contents/Party/AdventurerAgencyMgr.h, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.h, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.h, Source/Contents/Schedule/Schedule.h, Source/Contents/SignBoard/SignBoard.h, Source/Contents/Skills/ClientSkills.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/Contents/Skills/SkillInfo.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/TipBoxTitles.h, Source/Contents/UserData/AccountLinkedUserDataMgr.h, Source/Contents/UserData/NormalItemSlots.h, Source/Contents/World/World.h, Source/Contents/WorldView/WorldViewData.h, Source/Render/Primitives/LightmappedPrimitive.h, Source/Render/Primitives/RenderPrimitive.h, Source/Render/Renderer.h, Source/Render/Textures/SpritePixels.h, Source/Render/Textures/Texture.h, Source/Resource/EZeffectResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Sprites/ActionResource.h, Source/Resource/World/GroundResource.h, Source/Resource/World/WorldResource.h, Source/Resource/XmlNode.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITextureButton.h, Source/UI/CashEmotion/UICashEmotionListWnd.h, Source/UI/CashEmotion/UICashEmotionPack.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UISubChatMiniWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Gauges/UIPcGage.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIExchangeWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UIItemParamChangeDisplayWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Layout/WindowGeometry.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIImgMenu.h, Source/UI/Lists/UIListBoxID.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITagListBox.h, Source/UI/Lists/UITreeView.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIString.h, Source/UI/Text/UITextViewerControl.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRegisterMgr.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl, Source/Utility/Lexicon/LexiconSerializer.h.
This commit is contained in:
ragnarok-clanker 2026-11-08 16:44:36 +00:00
commit dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
Download patch file Download diff file Expand all files Collapse all files

104
Source/Contents/NavigationSource.cpp
View file

@ -57,7 +57,7 @@ NaviCell* CNavigationManager::GetDestinationCell(NaviCell* out) {
// OFFSET: 0x00B96F10
// FUNCTION: fn_19594
void CNavigationManager::ClearData() {
this->unknown_12B4 = false;
this->drawDestination = false;
this->data.Clear();
}
@ -203,16 +203,16 @@ NavigationTarget::~NavigationTarget() {
// FUNCTION: fn_19551
CNavigationManager::CNavigationManager() {
this->viewIcon = 1;
this->unknown_127C = false;
this->unknown_127D = false;
this->unknown_127E = false;
this->unknown_1250 = -1;
this->unknown_124C = -1;
this->unknown_1248 = false;
this->unknown_1254 = false;
this->allowGates = false;
this->includeObjects = false;
this->allowWarps = false;
this->savedCellY = -1;
this->savedCellX = -1;
this->hideWindow = false;
this->expandedMap = false;
this->Reset(true);
this->pathFinder.useNodePool = true;
this->unknown_1244 = nullptr;
this->playerMapInfo = nullptr;
char buffer[0x104];
for (int i = 0; i < 8; ++i) {
@ -221,7 +221,7 @@ CNavigationManager::CNavigationManager() {
this->labels[i].assign(buffer, std::strlen(buffer));
}
this->unknown_12B4 = false;
this->drawDestination = false;
}
// OFFSET: 0x00B92950
@ -239,7 +239,7 @@ NaviRouteLine::NaviRouteLine(int kind, int x, int y, const char* text, int color
// FUNCTION: fn_45448
CNavigationManager::~CNavigationManager() {
this->Reset(true);
this->unknown_1244 = nullptr;
this->playerMapInfo = nullptr;
}
// OFFSET: 0x00B959D0
@ -263,10 +263,10 @@ void CNavigationManager::ClearNodePaths() {
// OFFSET: 0x00B961A0
// FUNCTION: fn_45452
CNaviInfo* CNavigationManager::GetLinkedPlayerInfo() {
if (!this->unknown_1244->HasName(g_session.m_navigationPlayerMap)) {
this->unknown_1244 = this->FindObject(g_session.m_navigationPlayerMap);
if (!this->playerMapInfo->HasName(g_session.m_navigationPlayerMap)) {
this->playerMapInfo = this->FindObject(g_session.m_navigationPlayerMap);
}
return this->unknown_1244;
return this->playerMapInfo;
}
// OFFSET: 0x00B96BA0
@ -274,8 +274,8 @@ CNaviInfo* CNavigationManager::GetLinkedPlayerInfo() {
void CNavigationManager::Reset(bool clearAll) {
if (clearAll) {
this->ClearNodePaths();
this->unknown_12C4 = -1;
this->unknown_12C8 = -1;
this->selectedPath = -1;
this->selectedPathNode = -1;
this->states.clear();
}
@ -283,22 +283,22 @@ void CNavigationManager::Reset(bool clearAll) {
this->currentTarget = NavigationTarget();
this->routeResult = 0;
this->nodes.clear();
this->unknown_115C = false;
this->routeFlag = false;
this->selectedNode = -1;
this->movementRoute.segment = 0;
this->unknown_117C = false;
this->drawRoute = false;
this->ground = nullptr;
this->unknown_1258 = 0;
this->unknown_1260 = 0;
this->unknown_1264.clear();
this->unknown_1280 = 0;
this->unknown_1284 = 0;
this->unknown_1288 = nullptr;
this->unknown_128C = -1;
this->unknown_1290 = -1;
this->viewMode = 0;
this->searchType = 0;
this->searchText.clear();
this->routeSide = 0;
this->previewType = 0;
this->previewTexture = nullptr;
this->previewX = -1;
this->previewY = -1;
this->cells.clear();
this->unknown_12A0 = nullptr;
this->unknown_12A4 = nullptr;
this->previewAction = nullptr;
this->previewSprite = nullptr;
this->ClearRouteNodes();
}
@ -596,15 +596,15 @@ CNavi_Link* CNavigationManager::ReadObject(const char* record) {
// FUNCTION: fn_19571
void CNavigationManager::ClearSavedTarget() {
this->savedTarget = NavigationTarget();
this->unknown_115C = false;
this->routeFlag = false;
this->routeResult = 0;
this->nodes.clear();
this->selectedNode = -1;
this->movementRoute.segment = 0;
this->unknown_117C = false;
this->drawRoute = false;
this->ground = nullptr;
this->cells.clear();
this->unknown_1258 = 1;
this->viewMode = 1;
}
// OFFSET: 0x00B95260
@ -622,17 +622,17 @@ int CNavigationManager::RouteFromPlayer() {
const std::string resolved = ResourceMgr::Instance().aliases.ResolveMapName(g_session.m_navigationPlayerMap);
info = this->FindObject(resolved.c_str());
if (info == nullptr) {
this->unknown_117C = false;
this->unknown_115C = false;
this->unknown_12B4 = false;
this->drawRoute = false;
this->routeFlag = false;
this->drawDestination = false;
return -93;
}
}
int result = -96;
this->unknown_117C = false;
this->unknown_115C = false;
this->unknown_12B4 = false;
this->drawRoute = false;
this->routeFlag = false;
this->drawDestination = false;
NaviCell player;
player.x = 0;
player.y = 0;
@ -669,16 +669,16 @@ int CNavigationManager::RouteFromPlayer() {
this->LoadTargetPreview();
const int targetType = this->savedTarget.type;
result = targetType == 2 ? 7 : -96;
this->unknown_117C = true;
this->unknown_115C = true;
this->unknown_12B4 = true;
this->drawRoute = true;
this->routeFlag = true;
this->drawDestination = true;
if (targetType == 0) {
result = 9;
this->unknown_1258 = 2;
this->viewMode = 2;
return result;
}
if (targetType == 2) {
this->unknown_1258 = 2;
this->viewMode = 2;
return result;
}
}
@ -709,7 +709,7 @@ int CNavigationManager::RouteFromPlayer() {
if (this->BuildRoute(start.x, start.y, this->nodes[index]->GetCell(&cellX)->x, this->nodes[index]->GetCell(&cellY)->y, true)) {
this->selectedNode = index;
this->SelectTarget(index);
this->unknown_117C = true;
this->drawRoute = true;
goto selected;
}
} else {
@ -729,7 +729,7 @@ int CNavigationManager::RouteFromPlayer() {
}
this->selectedNode = 0;
this->SelectTarget(0);
this->unknown_117C = true;
this->drawRoute = true;
goto selected;
}
@ -740,12 +740,12 @@ int CNavigationManager::RouteFromPlayer() {
if (this->BuildRoute(start.x, start.y, this->nodes[candidates[index]]->GetCell(&cellX)->x, this->nodes[candidates[index]]->GetCell(&cellY)->y, true)) {
this->selectedNode = candidates[index];
this->SelectTarget(candidates[index]);
this->unknown_117C = true;
this->drawRoute = true;
goto selected;
}
}
this->unknown_117C = false;
this->drawRoute = false;
if (this->nodes[0]->GetType() != 400) {
return result;
}
@ -759,7 +759,7 @@ selected:
} else {
result = 5;
}
this->unknown_1258 = 2;
this->viewMode = 2;
return result;
}
@ -933,7 +933,7 @@ std::string CNavigationManager::StateMapName(int index, int* distance) {
// OFFSET: 0x00B96520
// FUNCTION: fn_19585
bool CNavigationManager::GetRouteFlag() const {
return this->unknown_115C;
return this->routeFlag;
}
// OFFSET: 0x00B96910
@ -962,11 +962,11 @@ void CNavigationManager::ResetCurrentTarget() {
// OFFSET: 0x00B94E90
// FUNCTION: fn_19570
void CNavigationManager::CheckArrival(int cellX, int cellY) {
if (this->unknown_1258 == 2) {
if (this->viewMode == 2) {
if (g_windowMgr.window_4F174 != nullptr) {
g_windowMgr.window_4F174->Invalidate();
}
if (this->unknown_115C) {
if (this->routeFlag) {
NaviCell cell;
this->data.GetCell(&cell);
if (std::abs(cell.x - cellX) <= 5 && std::abs(cell.y - cellY) <= 5) {
@ -981,7 +981,7 @@ void CNavigationManager::CheckArrival(int cellX, int cellY) {
void CNavigationManager::BuildNodePaths() {
this->ClearNodePaths();
if (this->unknown_1260 == 0 || this->unknown_1260 == 1) {
if (this->searchType == 0 || this->searchType == 1) {
for (int index = 0; index < this->states.size(); ++index) {
if (this->states[index].type == 1) {
std::vector<int> path;
@ -992,7 +992,7 @@ void CNavigationManager::BuildNodePaths() {
}
for (int index = 0; index < this->states.size(); ++index) {
if (this->unknown_1260 != 0 && this->states[index].type != this->unknown_1260) {
if (this->searchType != 0 && this->states[index].type != this->searchType) {
continue;
}
if (this->states[index].type == 1) {