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:
ragnarok-clanker
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -41,10 +41,10 @@ struct SkillHitMessage {
|
|||
/* 0008 */ int unknown_0008;
|
||||
/* 000C */ std::uint32_t targetAid;
|
||||
/* 0010 */ int unknown_0010;
|
||||
/* 0014 */ int unknown_0014;
|
||||
/* 0014 */ int monsterValue;
|
||||
/* 0018 */ int hitCount;
|
||||
/* 001C */ int unknown_001C;
|
||||
/* 0020 */ int unknown_0020;
|
||||
/* 001C */ int cellX;
|
||||
/* 0020 */ int cellY;
|
||||
/* 0024 */ int unknown_0024;
|
||||
/* 0028 */ int motionSpeed;
|
||||
};
|
||||
|
|
@ -77,12 +77,12 @@ CSkill::CSkill(std::uint32_t aid) {
|
|||
this->skillAid = aid;
|
||||
this->SetActorJob(0x7E);
|
||||
this->m_effectTimer = 0x8CA0;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
this->render.enabled = 0;
|
||||
this->unknown_0264[0] = 0;
|
||||
this->actorWindows[0] = 0;
|
||||
this->m_model = nullptr;
|
||||
this->m_effect = nullptr;
|
||||
this->unknown_0410 = 0;
|
||||
this->sourceActorId = 0;
|
||||
this->range = 0;
|
||||
this->m_hasEffect = false;
|
||||
this->m_targets.clear();
|
||||
|
|
@ -91,9 +91,9 @@ CSkill::CSkill(std::uint32_t aid) {
|
|||
// OFFSET: 0x00E4AA30
|
||||
// FUNCTION: fn_24259
|
||||
CSkill::~CSkill() {
|
||||
if (this->unknown_0264[0] != 0) {
|
||||
g_windowMgr.Schedule(reinterpret_cast<UIWindow*>(this->unknown_0264[0]));
|
||||
this->unknown_0264[0] = 0;
|
||||
if (this->actorWindows[0] != 0) {
|
||||
g_windowMgr.Schedule(reinterpret_cast<UIWindow*>(this->actorWindows[0]));
|
||||
this->actorWindows[0] = 0;
|
||||
}
|
||||
|
||||
this->ReleaseModel();
|
||||
|
|
@ -204,7 +204,7 @@ void CSkill::Render(int argument) {
|
|||
g_renderer->ProjectViewport(&this->render.position.x, reinterpret_cast<const float*>(argument), &x, &y, &reciprocalDepth);
|
||||
CRenderer* renderer = g_renderer;
|
||||
const float scale = renderer->ScaleDistance(reciprocalDepth) / g_heightScale;
|
||||
this->render.unknown_005C = scale;
|
||||
this->render.distanceScale = scale;
|
||||
|
||||
float bounds[5];
|
||||
bounds[0] = x - (renderer->viewport.uiScaleX + renderer->viewport.uiScaleX) * scale;
|
||||
|
|
@ -271,7 +271,7 @@ static_assert(sizeof(SkillPickInfo) == 0x28);
|
|||
// OFFSET: 0x00E55100
|
||||
// FUNCTION: fn_24303
|
||||
void CSkill::SetRenderInfo(const float* box, float x, float y) {
|
||||
if (this->render.unknown_00A4Bytes[1] != 0) {
|
||||
if (this->render.visibilityOptions[1] != 0) {
|
||||
// GLOBAL: gl_25171
|
||||
static int minimum = static_cast<int>(g_renderer->UiScaleX() * 34.0f);
|
||||
auto* info = static_cast<SkillPickInfo*>(operator new(sizeof(SkillPickInfo)));
|
||||
|
|
@ -354,29 +354,29 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
return;
|
||||
}
|
||||
|
||||
this->unknown_0248 = timeGetTime();
|
||||
if (this->unknown_0264[0] == 0) {
|
||||
this->chatTick = timeGetTime();
|
||||
if (this->actorWindows[0] == 0) {
|
||||
UITransBalloonText* balloon =
|
||||
new UITransBalloonText();
|
||||
this->unknown_0264[0] = reinterpret_cast<int>(balloon);
|
||||
this->actorWindows[0] = reinterpret_cast<int>(balloon);
|
||||
balloon->SetSize(8, 8);
|
||||
g_windowMgr.AddRenderedFront(reinterpret_cast<UIWindow*>(this->unknown_0264[0]));
|
||||
g_windowMgr.AddRenderedFront(reinterpret_cast<UIWindow*>(this->actorWindows[0]));
|
||||
}
|
||||
|
||||
UITransBalloonText* balloon = reinterpret_cast<UITransBalloonText*>(this->unknown_0264[0]);
|
||||
UITransBalloonText* balloon = reinterpret_cast<UITransBalloonText*>(this->actorWindows[0]);
|
||||
balloon->SetText(text, 35);
|
||||
balloon->SetColors(0xFF8080, 0);
|
||||
this->unknown_0288 = balloon->geometry.width;
|
||||
this->unknown_028C = balloon->geometry.height;
|
||||
balloon->Move(this->render.screenX - this->unknown_0288 / 2, this->render.screenY - g_renderer->viewport.height * 110 / 480);
|
||||
this->chatWidth = balloon->geometry.width;
|
||||
this->chatHeight = balloon->geometry.height;
|
||||
balloon->Move(this->render.screenX - this->chatWidth / 2, this->render.screenY - g_renderer->viewport.height * 110 / 480);
|
||||
return;
|
||||
}
|
||||
case AM_SKILL: {
|
||||
const SkillHitMessage* hit = reinterpret_cast<const SkillHitMessage*>(b);
|
||||
const int skillId = hit->skillId;
|
||||
const int unknown_0014 = hit->unknown_0014;
|
||||
const int unknown_001C = hit->unknown_001C;
|
||||
const int unknown_0020 = hit->unknown_0020;
|
||||
const int unknown_0014 = hit->monsterValue;
|
||||
const int unknown_001C = hit->cellX;
|
||||
const int unknown_0020 = hit->cellY;
|
||||
const int motionSpeed = hit->motionSpeed;
|
||||
int hitCount = hit->hitCount;
|
||||
if (hitCount == 0) {
|
||||
|
|
@ -467,15 +467,15 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
damageMessage.damage = damage;
|
||||
damageMessage.time = timeGetTime();
|
||||
damageMessage.attackerAid = this->skillAid;
|
||||
damageMessage.unknown_0014 = unknown_001C;
|
||||
damageMessage.unknown_0018 = unknown_0020;
|
||||
damageMessage.unknown_001C = effectId;
|
||||
damageMessage.cellX = unknown_001C;
|
||||
damageMessage.cellY = unknown_0020;
|
||||
damageMessage.hitEffect = effectId;
|
||||
damageMessage.effectId = -1;
|
||||
damageMessage.unknown_0024 = unknown_0014;
|
||||
damageMessage.monsterValue = unknown_0014;
|
||||
damageMessage.motionSpeed = static_cast<float>(motionSpeed) / 288.0f;
|
||||
damageMessage.unknown_002C = 0;
|
||||
damageMessage.unknown_0030 = skillId;
|
||||
damageMessage.unknown_0034 = 0;
|
||||
damageMessage.blueDamage = 0;
|
||||
damageMessage.skillId = skillId;
|
||||
damageMessage.skillTarget = 0;
|
||||
|
||||
const int address = reinterpret_cast<int>(&damageMessage);
|
||||
int total = damage;
|
||||
|
|
@ -484,7 +484,7 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
++index;
|
||||
damageMessage.time += g_multiHitInterval;
|
||||
total += damage;
|
||||
damageMessage.unknown_0034 = index;
|
||||
damageMessage.skillTarget = index;
|
||||
target->SendMsg(this, AM_WILL_BE_ATTACKED, 0, address, address >> 31, total, total >> 31, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -517,54 +517,54 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
const vector3d& position = this->render.position;
|
||||
switch (this->GetEffectiveJob(-1)) {
|
||||
case UNT_ICEWALL:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
return;
|
||||
case UNT_FIREWALL:
|
||||
case UNT_FIRE_MANTLE: {
|
||||
const vector3d& player = mode->scene->player->render.position;
|
||||
g_soundMgr->PlayWave("effect\\EF_FireWall.wav", position.x - player.x, 0.0f, position.z - player.z, 250, 40, 1.0f, 0);
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
}
|
||||
case UNT_TATAMIGAESHI:
|
||||
case UNT_FIREWALK:
|
||||
case UNT_ELECTRICWALK:
|
||||
case UNT_VACUUM_EXTREME:
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_GROUNDDRIFT_WIND:
|
||||
this->m_effectId = 0x6B;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_WALLOFTHORN:
|
||||
this->m_effectId = 0x6A;
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
return;
|
||||
case UNT_WARMER:
|
||||
this->m_effectId = 0x6A;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_GROUNDDRIFT_DARK:
|
||||
case UNT_GROUNDDRIFT_FIRE:
|
||||
case UNT_GROUNDDRIFT_NEUTRAL:
|
||||
this->m_effectId = 0x63;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_GROUNDDRIFT_POISON:
|
||||
this->m_effectId = 0x8B;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_MAGENTATRAP:
|
||||
case UNT_COBALTTRAP:
|
||||
case UNT_MAIZETRAP:
|
||||
case UNT_VERDURETRAP:
|
||||
this->m_effectId = 0x8B;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_ELECTRICSHOCKER:
|
||||
this->m_effectId = 0x6B;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (!this->HasId(0x91)) {
|
||||
this->LaunchEffect(0x91, vector3d{0.0f, 0.0f, 0.0f}, 0.0f);
|
||||
|
|
@ -573,37 +573,37 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
case UNT_FIRINGTRAP:
|
||||
case UNT_CLUSTERBOMB:
|
||||
this->m_effectId = 0x6B;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_ICEBOUNDTRAP:
|
||||
this->m_effectId = 0x6C;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_GROUNDDRIFT_WATER:
|
||||
this->m_effectId = 0x6C;
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_KAEN:
|
||||
if (rand() % 8 == 0) {
|
||||
const vector3d& player = mode->scene->player->render.position;
|
||||
g_soundMgr->PlayWave("effect\\화염진.wav", position.x - player.x, 0.0f, position.z - player.z, 250, 40, 1.0f, 0);
|
||||
}
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
case UNT_TRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_BLASTMINE:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x6A;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_REVERBERATION:
|
||||
case UNT_NETHERWORLD:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x1D0;
|
||||
return;
|
||||
case UNT_SKIDTRAP:
|
||||
|
|
@ -611,31 +611,31 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
case UNT_LANDMINE:
|
||||
case UNT_TALKIEBOX:
|
||||
case UNT_THORNS_TRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_SANDMAN:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x8B;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_FLASHER:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x63;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_FREEZINGTRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x6C;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_CLAYMORETRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->m_effectId = 0x6B;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
return;
|
||||
case UNT_SHOCKWAVE:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (this->render.enabled && !this->HasId(0x91)) {
|
||||
this->LaunchEffect(0x91, vector3d{0.0f, 0.0f, 0.0f}, 0.0f);
|
||||
|
|
@ -646,12 +646,12 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
if (unit->owner == g_session.m_aid) {
|
||||
source = reinterpret_cast<CPc*>(static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->player);
|
||||
} else {
|
||||
source = static_cast<CPc*>(static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->GetGameActorByAID(this->unknown_0410));
|
||||
source = static_cast<CPc*>(static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->GetGameActorByAID(this->sourceActorId));
|
||||
}
|
||||
if (source != nullptr) {
|
||||
CreateHallucinationPc(
|
||||
source->GetEffectiveJob(-1), source->unknown_0260, source->unknown_0440, &this->render.position, 180, source->render.unknown_0048,
|
||||
source->unknown_0444, source->GetBodyCostume()
|
||||
source->GetEffectiveJob(-1), source->sex, source->head, &this->render.position, 180, source->render.bodyPalette,
|
||||
source->headPalette, source->GetBodyCostume()
|
||||
);
|
||||
}
|
||||
return;
|
||||
|
|
@ -659,13 +659,13 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
case UNT_KINGS_GRACE: {
|
||||
const vector3d& player = mode->scene->player->render.position;
|
||||
g_soundMgr->PlayWave("effect\\lg_kings_grace.wav", position.x - player.x, 0.0f, position.z - player.z, 250, 40, 1.0f, 0);
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
}
|
||||
case UNT_MAGMA_ERUPTION: {
|
||||
const vector3d& player = mode->scene->player->render.position;
|
||||
g_soundMgr->PlayWave("effect\\NC_MAGMA_ERUPTION.wav", position.x - player.x, 0.0f, position.z - player.z, 250, 40, 1.0f, 0);
|
||||
this->render.unknown_00A4Bytes[1] = 0;
|
||||
this->render.visibilityOptions[1] = 0;
|
||||
return;
|
||||
}
|
||||
case UNT_PNEUMA:
|
||||
|
|
@ -863,35 +863,35 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int
|
|||
g_effectMgr->Spawn(this->render.accountId, 0x903, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0);
|
||||
return;
|
||||
case UNT_DEEPBLINDTRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (this->render.enabled) {
|
||||
g_effectMgr->Spawn(this->render.accountId, 0x752, position.x, position.y, position.z, 0, -1, 0, 0);
|
||||
}
|
||||
return;
|
||||
case UNT_SWIFTTRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (this->render.enabled) {
|
||||
g_effectMgr->Spawn(this->render.accountId, 0x756, position.x, position.y, position.z, 0, -1, 0, 0);
|
||||
}
|
||||
return;
|
||||
case UNT_SOLIDTRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (this->render.enabled) {
|
||||
g_effectMgr->Spawn(this->render.accountId, 0x75A, position.x, position.y, position.z, 0, -1, 0, 0);
|
||||
}
|
||||
return;
|
||||
case UNT_FLAMETRAP:
|
||||
this->render.unknown_00A4Bytes[1] = 1;
|
||||
this->render.visibilityOptions[1] = 1;
|
||||
this->ShowModel(this->GetTrapModelName());
|
||||
if (this->render.enabled) {
|
||||
g_effectMgr->Spawn(this->render.accountId, 0x77F, position.x, position.y, position.z, 0, -1, 0, 0);
|
||||
}
|
||||
return;
|
||||
default: {
|
||||
CRenderObject* source = static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->GetGameActorByAidIncludeMe(this->unknown_0410);
|
||||
CRenderObject* source = static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->GetGameActorByAidIncludeMe(this->sourceActorId);
|
||||
CSkillActionMgr* actions = CSkillActionMgr::GetInstance();
|
||||
actions->OnSkillObjectCreate(this->GetEffectiveJob(-1), unit->level, this, static_cast<CGameActor*>(source));
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue