Maintenance: Resubmission of 14942 (gate: three existing in-class helpers whose lines changed lacked an annotation; marked // INLINED
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:
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -31,7 +31,7 @@ bool CreateSignBoardMgr() {
|
|||
if (s_signBoardMgr == nullptr) {
|
||||
s_signBoardMgr = new (std::nothrow) CSignBoardMgr();
|
||||
if (s_signBoardMgr != nullptr) {
|
||||
if (!s_signBoardMgr->unknown_0000) {
|
||||
if (!s_signBoardMgr->initialized) {
|
||||
delete s_signBoardMgr;
|
||||
s_signBoardMgr = nullptr;
|
||||
} else {
|
||||
|
|
@ -116,7 +116,7 @@ void CSignBoardMgr::Initialize() {
|
|||
}
|
||||
image += it->image;
|
||||
object->SetWindowImage(image);
|
||||
object->SetBoard(std::string(it->unknown_0014), std::string(it->unknown_001C));
|
||||
object->SetBoard(std::string(it->text), std::string(it->color));
|
||||
|
||||
vector3d position = {0.0f, 0.0f, 0.0f};
|
||||
static_cast<CGameMode*>(g_modeMgr.GetGameMode())->CellCenter(it->column, it->row, position.x, position.z);
|
||||
|
|
@ -136,7 +136,7 @@ void CSignBoardMgr::LoadList() {
|
|||
SignBoardInfo defaults;
|
||||
g_session.m_hotkeyScript->Call(
|
||||
"GetSignBoardListTable", "d>sddddsss", 1, &defaults.map, &defaults.column, &defaults.row, &defaults.offset, &defaults.type, &defaults.image,
|
||||
&defaults.unknown_0014, &defaults.unknown_001C
|
||||
&defaults.text, &defaults.color
|
||||
);
|
||||
|
||||
int count = 0;
|
||||
|
|
@ -144,8 +144,8 @@ void CSignBoardMgr::LoadList() {
|
|||
for (int index = 2; index < count + 1; ++index) {
|
||||
SignBoardInfo info;
|
||||
g_session.m_hotkeyScript->Call(
|
||||
"GetSignBoardListTable", "d>sddddsss", index, &info.map, &info.column, &info.row, &info.offset, &info.type, &info.image, &info.unknown_0014,
|
||||
&info.unknown_001C
|
||||
"GetSignBoardListTable", "d>sddddsss", index, &info.map, &info.column, &info.row, &info.offset, &info.type, &info.image, &info.text,
|
||||
&info.color
|
||||
);
|
||||
switch (info.type) {
|
||||
case 2:
|
||||
|
|
@ -153,11 +153,11 @@ void CSignBoardMgr::LoadList() {
|
|||
break;
|
||||
case 3:
|
||||
info.type = 3;
|
||||
if (info.unknown_0014 == nullptr) {
|
||||
info.unknown_0014 = defaults.unknown_0014;
|
||||
if (info.text == nullptr) {
|
||||
info.text = defaults.text;
|
||||
}
|
||||
if (info.unknown_001C == nullptr) {
|
||||
info.unknown_001C = defaults.unknown_001C;
|
||||
if (info.color == nullptr) {
|
||||
info.color = defaults.color;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
|
|
@ -216,12 +216,12 @@ void CSignBoardWnd::ApplyColor() {
|
|||
int red = 0;
|
||||
int green = 0;
|
||||
int blue = 0;
|
||||
if (this->unknown_00B0.size() != 0) {
|
||||
if (this->colorText.size() != 0) {
|
||||
int values[3] = {0, 0, 0};
|
||||
int index = 0;
|
||||
std::string rest = this->unknown_00B0;
|
||||
std::string token = this->unknown_00B0;
|
||||
std::size_t comma = this->unknown_00B0.find(",");
|
||||
std::string rest = this->colorText;
|
||||
std::string token = this->colorText;
|
||||
std::size_t comma = this->colorText.find(",");
|
||||
if (comma != std::string::npos) {
|
||||
while (comma != std::string::npos) {
|
||||
token = rest.substr(0, comma);
|
||||
|
|
@ -235,8 +235,8 @@ void CSignBoardWnd::ApplyColor() {
|
|||
red = values[0];
|
||||
green = values[1];
|
||||
blue = values[2];
|
||||
if (this->unknown_00B0.find("#") != std::string::npos) {
|
||||
std::string hex = this->unknown_00B0;
|
||||
if (this->colorText.find("#") != std::string::npos) {
|
||||
std::string hex = this->colorText;
|
||||
hex = hex.substr(hex.find("#") + 1);
|
||||
const unsigned long color = std::strtoul(hex.c_str(), nullptr, 16);
|
||||
red = static_cast<int>((color >> 16) & 0xff);
|
||||
|
|
@ -319,7 +319,7 @@ bool C3DCooRendering::OnProcess() {
|
|||
const int lift = g_renderer->viewport.height * 81 / 480;
|
||||
window->Move(
|
||||
this->render.screenX - window->geometry.width / 2,
|
||||
static_cast<int>(static_cast<float>(this->render.screenY - window->geometry.height / 2) - static_cast<float>(lift) * this->render.unknown_005C)
|
||||
static_cast<int>(static_cast<float>(this->render.screenY - window->geometry.height / 2) - static_cast<float>(lift) * this->render.distanceScale)
|
||||
);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -328,7 +328,7 @@ bool C3DCooRendering::OnProcess() {
|
|||
// OFFSET: 0x00821F50
|
||||
// FUNCTION: fn_10270
|
||||
bool CIcon::OnProcess() {
|
||||
const float frame = static_cast<float>(static_cast<double>(timeGetTime() - this->render.unknown_008C) / 24.0);
|
||||
const float frame = static_cast<float>(static_cast<double>(timeGetTime() - this->render.motionStartTime) / 24.0);
|
||||
this->render.previousAnimation = this->render.animation;
|
||||
this->render.curMotion = static_cast<int>(frame / this->render.speed) % static_cast<int>(this->GetActRes()->FrameCount(this->render.previousAnimation));
|
||||
return true;
|
||||
|
|
@ -341,7 +341,7 @@ void C3DCooRendering::Render(int argument) {
|
|||
float y;
|
||||
float reciprocalDepth;
|
||||
g_renderer->ProjectViewport(&this->render.position.x, reinterpret_cast<const float*>(argument), &x, &y, &reciprocalDepth);
|
||||
this->render.unknown_005C = g_renderer->ScaleDistance(reciprocalDepth) / g_heightScale;
|
||||
this->render.distanceScale = g_renderer->ScaleDistance(reciprocalDepth) / g_heightScale;
|
||||
this->SetTlvert(x, y);
|
||||
}
|
||||
|
||||
|
|
@ -379,11 +379,11 @@ void CIcon::Load(const std::string& name) {
|
|||
// OFFSET: 0x00822310
|
||||
// FUNCTION: fn_10276
|
||||
void C3DCooRendering::SetBoard(const std::string& text, const std::string& color) {
|
||||
static_cast<CSignBoardWnd*>(this->window)->unknown_0080 = text;
|
||||
static_cast<CSignBoardWnd*>(this->window)->unknown_00B0 = color;
|
||||
static_cast<CSignBoardWnd*>(this->window)->boardText = text;
|
||||
static_cast<CSignBoardWnd*>(this->window)->colorText = color;
|
||||
CSignBoardWnd* board = static_cast<CSignBoardWnd*>(this->window);
|
||||
board->ApplyColor();
|
||||
board->text->SetTextFitted(board->unknown_0080.c_str());
|
||||
board->text->SetTextFitted(board->boardText.c_str());
|
||||
}
|
||||
|
||||
// OFFSET: 0x00822390
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue