Maintenance: Resubmission of 16340 over main 047268c0 (conflict in UICashEmotionPack::GetPriceText resolved keeping main's new body).
Batch #16351 by ragnarok-clanker: no function's compiled code changes; checked with 784 compiled unit(s), including every includer of Source/Archive/GPak.h, Source/Client/Browser/BrowserCommandTarget.h, Source/Client/Browser/BrowserDocumentUI.h, Source/Client/Browser/BrowserInPlace.h, Source/Client/Browser/WebBrowser.h, Source/Client/Input/Language.h, Source/Client/Input/LanguageTC.h, Source/Client/Input/Mouse.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Client/Stove/StovePCSDK.h, Source/Contents/AchievementMgr.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GndRiser.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/MousePointer.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/CashEmotionMgr.h, Source/Contents/ClanInfo.h, Source/Contents/Configuration/GameSettingsMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/ArrowEffect.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/DummyEffectLauncher.h, Source/Contents/Effects/EZ2STREffectEx.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/EffectTypes.h, Source/Contents/Effects/ElectricEffect.h, Source/Contents/Effects/EmitterEffect.h, Source/Contents/Effects/FortuneKissEffect.h, Source/Contents/Effects/MagicFloorEffect.h, Source/Contents/Effects/MandraAttackEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RichManKim.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/StarEffect.h, Source/Contents/Effects/WhirlwindEffect.h, Source/Contents/EnchantMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundSpatial.h, Source/Contents/GuildInfo.h, Source/Contents/Hotkeys/InterfaceHotkey.h, Source/Contents/Items/ItemInfo.h, Source/Contents/Items/RuneSystem.h, Source/Contents/MapSkyMgr.h, Source/Contents/Models/ModelActor.h, Source/Contents/Movies/BinkMovie.h, Source/Contents/NavigationManager.h, Source/Contents/Party/PartyBookingMgr.h, Source/Contents/PetEvolutionMgr.h, Source/Contents/RenewQuestMgr.h, Source/Contents/RodexMailStore.h, Source/Contents/Schedule/Schedule.h, Source/Contents/Schedule/ShutDownSchedule.h, Source/Contents/SignBoard/SignBoard.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/Contents/Sound/SoundMgr.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/Store/MCStoreInfoBackupAsyncWork.h, Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.h, Source/Contents/UserData/NormalItemSlots.h, Source/Contents/WorldView/WorldViewData.h, Source/Network/Connection/Connection.h, Source/Render/DX7/DeviceOwnerDX7.h, Source/Render/DX7/DirectDrawEnumeration.h, Source/Render/DX9/DeviceOwnerDX9.h, Source/Render/Primitives/LightmappedPrimitive.h, Source/Render/Primitives/RenderPrimitive.h, Source/Render/Renderer.h, Source/Render/RendererDX7.h, Source/Render/Text/EmbedFont.h, Source/Render/Text/TextContext.h, Source/Render/Textures/Texture.h, Source/Resource/BinkRuntime.h, Source/Resource/GifResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Models/ModelMesh.h, Source/Resource/ResourceMgr.h, Source/Resource/World/GroundResource.h, Source/Resource/World/WorldResource.h, Source/Security/NProtectGameGuardMgr.h, Source/Security/ReassemblyPacketMgr.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIBmpTextButton2.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITextureButton.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Dialogs/UILoadingWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIRestartWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIExchangeWnd.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemRepairWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Lists/TableBox.h, Source/UI/Lists/UIListBox.h, Source/UI/Lists/UIListBoxEx.h, Source/UI/Lists/UIListBoxID.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITreeView.h, Source/UI/Lists/UIVScrollBar.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/Navigation/UIPrivateAirplaneWnd.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIRequestJoinPartyWnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/Text/TextMarkup.h, Source/UI/Text/UIString.h, Source/UI/Text/UITextViewer.h, Source/UI/Text/UITransBalloonText.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBalloonOpenBtn.h, Source/UI/Window/UIBasicInfoWnd.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/WindowId.h, Source/Utility/Async/NAsyncWork.h, Source/Utility/Async/NRecycleObjectPoolMgr.h, Source/Utility/JsonCppLoader.h, Source/Utility/Lexicon/LexiconSerializer.h, Source/Utility/NFileLog.h, Source/Utility/Threading/NThread.h.
This commit is contained in:
parent
047268c0f5
commit
5ad8e0c58c
299 changed files with 2107 additions and 2107 deletions
|
|
@ -253,7 +253,7 @@ __declspec(noinline) int CSession::HasSwapEquipmentItem(std::uint32_t id) const
|
|||
|
||||
// OFFSET: 0x00E3DB20
|
||||
// FUNCTION: fn_24194
|
||||
bool CSession::ResetUnknownState() {
|
||||
bool CSession::ResetCharacterSlotState() {
|
||||
this->m_normalSlotCount = 1;
|
||||
this->m_premiumSlotCount = 1;
|
||||
this->m_billingSlotCount = 1;
|
||||
|
|
@ -1453,7 +1453,7 @@ int CSession::GetItem1718QuantityOf(const ITEM_INFO& item) const {
|
|||
|
||||
// OFFSET: 0x00DDFDE0
|
||||
// FUNCTION: fn_23447
|
||||
std::uint16_t CSession::GetItem1718Unknown006CByItemId(const ITEM_INFO& item) const {
|
||||
std::uint16_t CSession::GetShopItemPriceFactorByItemId(const ITEM_INFO& item) const {
|
||||
for (std::list<ITEM_INFO>::const_iterator it = this->shopItems.begin(); it != this->shopItems.end(); ++it) {
|
||||
if (std::atoi(it->itemId.c_str()) == std::atoi(item.itemId.c_str())) {
|
||||
return it->priceFactor;
|
||||
|
|
@ -1465,7 +1465,7 @@ std::uint16_t CSession::GetItem1718Unknown006CByItemId(const ITEM_INFO& item) co
|
|||
|
||||
// OFFSET: 0x00DDFE60
|
||||
// FUNCTION: fn_23448
|
||||
std::uint16_t CSession::GetItem1718Unknown006COf(const ITEM_INFO& item) const {
|
||||
std::uint16_t CSession::GetShopItemPriceFactor(const ITEM_INFO& item) const {
|
||||
for (auto it = this->shopItems.begin(); it != this->shopItems.end(); ++it) {
|
||||
if (it->identity[1] == item.identity[1]) {
|
||||
return it->priceFactor;
|
||||
|
|
@ -1477,10 +1477,10 @@ std::uint16_t CSession::GetItem1718Unknown006COf(const ITEM_INFO& item) const {
|
|||
|
||||
// OFFSET: 0x00DDFE90
|
||||
// FUNCTION: fn_23449
|
||||
std::uint16_t CSession::SumItem1720Unknown006CByItemId() const {
|
||||
std::uint16_t CSession::SumPurchasePriceFactorByItemId() const {
|
||||
std::uint16_t total = 0;
|
||||
for (std::list<ITEM_INFO>::const_iterator it = this->purchaseItems.begin(); it != this->purchaseItems.end(); ++it) {
|
||||
total += it->quantity * this->GetItem1718Unknown006CByItemId(*it);
|
||||
total += it->quantity * this->GetShopItemPriceFactorByItemId(*it);
|
||||
}
|
||||
|
||||
return total;
|
||||
|
|
@ -1488,10 +1488,10 @@ std::uint16_t CSession::SumItem1720Unknown006CByItemId() const {
|
|||
|
||||
// OFFSET: 0x00DDFF60
|
||||
// FUNCTION: fn_23450
|
||||
std::uint16_t CSession::SumItem1720Unknown006C() const {
|
||||
std::uint16_t CSession::SumPurchasePriceFactor() const {
|
||||
std::uint16_t total = 0;
|
||||
for (auto it = this->purchaseItems.begin(); it != this->purchaseItems.end(); ++it) {
|
||||
total += it->quantity * this->GetItem1718Unknown006COf(*it);
|
||||
total += it->quantity * this->GetShopItemPriceFactor(*it);
|
||||
}
|
||||
|
||||
return total;
|
||||
|
|
@ -2166,7 +2166,7 @@ void CSession::SetMercSkillLevel(int skillId, int level) {
|
|||
|
||||
// OFFSET: 0x00DFFC40
|
||||
// FUNCTION: fn_23630
|
||||
void CSession::SetItem1768Unknown0014(int index, std::uint32_t value) {
|
||||
void CSession::SetMerchantPurchaseSavedPrice(int index, std::uint32_t value) {
|
||||
int position = 0;
|
||||
for (ITEM_INFO& item : this->merchantPurchaseSavedItems) {
|
||||
if (position == index) {
|
||||
|
|
@ -6396,10 +6396,10 @@ void CSession::InitResourceNameTables() {
|
|||
shieldJobNames[403] = KarnosBodyPath1().Text();
|
||||
shieldJobNames[404] = KarnosBodyPath2().Text();
|
||||
shieldJobNames[405] = AliteaBodyPath1().Text();
|
||||
std::vector<const char*>& unknownNames = reinterpret_cast<std::vector<const char*>&>(this->additionalSpriteNames[0x08]);
|
||||
unknownNames.resize(2, "f");
|
||||
unknownNames[0] = "f";
|
||||
unknownNames[1] = "";
|
||||
std::vector<const char*>& femaleSuffixNames = reinterpret_cast<std::vector<const char*>&>(this->additionalSpriteNames[0x08]);
|
||||
femaleSuffixNames.resize(2, "f");
|
||||
femaleSuffixNames[0] = "f";
|
||||
femaleSuffixNames[1] = "";
|
||||
std::vector<const char*>& weaponNames = reinterpret_cast<std::vector<const char*>&>(this->m_weaponNamesBegin);
|
||||
weaponNames.resize(105, "");
|
||||
for (int index = 0; index < 105; ++index) {
|
||||
|
|
@ -6930,7 +6930,7 @@ void CSession::LoadSessionTables() {
|
|||
[](const char* left, const char* right) { return std::strcmp(left, right) < 0; });
|
||||
|
||||
session->LoadMapViewParameters();
|
||||
session->InitUnknownMapTables();
|
||||
session->InitSkillEffectIds();
|
||||
ImportMessageTable();
|
||||
g_forbiddenWords.Load("manner.txt");
|
||||
session->LoadXmlTables();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue