From 76b0dc793d560812fb3e4740f9cbb5d1fb7cc193 Mon Sep 17 00:00:00 2001 From: d1str4ught <> Date: Thu, 25 Dec 2025 03:26:57 +0100 Subject: [PATCH] FIX_POS_SYNC removed --- src/GameLib/ActorInstance.h | 27 ---------- src/UserInterface/InstanceBase.cpp | 8 --- src/UserInterface/Packet.h | 22 -------- .../PythonNetworkStreamPhaseGame.cpp | 52 ------------------- 4 files changed, 109 deletions(-) diff --git a/src/GameLib/ActorInstance.h b/src/GameLib/ActorInstance.h index 8b3e5bc..ee6bb3e 100644 --- a/src/GameLib/ActorInstance.h +++ b/src/GameLib/ActorInstance.h @@ -362,22 +362,10 @@ class CActorInstance : public IActorInstance, public IFlyTargetableObject BOOL IsActEmotion(); DWORD GetComboIndex(); float GetAttackingElapsedTime(); -#ifdef FIX_POS_SYNC - void SetBlendingPosition(const TPixelPosition& c_rPosition, float fBlendingTime = 1.0f); -#else void SetBlendingPosition(const TPixelPosition & c_rPosition, float fBlendingTime = 1.0f); -#endif void ResetBlendingPosition(); void GetBlendingPosition(TPixelPosition * pPosition); -#ifdef FIX_POS_SYNC - struct BlendingPosition { - D3DXVECTOR3 source; - D3DXVECTOR3 dest; - float duration; - }; -#endif - BOOL NormalAttack(float fDirRot, float fBlendTime = 0.1f); BOOL ComboAttack(DWORD wMotionIndex, float fDirRot, float fBlendTime = 0.1f); @@ -491,13 +479,6 @@ class CActorInstance : public IActorInstance, public IFlyTargetableObject void RenderCollisionData(); void RenderToShadowMap(); -#ifdef FIX_POS_SYNC - void ClientAttack(DWORD dwVID); - void ServerAttack(DWORD dwVID); - bool ProcessingClientAttack(DWORD dwVID); - bool ServerAttackCameFirst(DWORD dwVID); -#endif - protected: void __AdjustCollisionMovement(const CGraphicObjectInstance * c_pGraphicObjectInstance); @@ -622,10 +603,6 @@ class CActorInstance : public IActorInstance, public IFlyTargetableObject void __ClearCombo(); void __OnEndCombo(); -#ifdef FIX_POS_SYNC - void __Push(const TPixelPosition& c_rkPPosDst, unsigned int unDuration); -#endif - void __ProcessDataAttackSuccess(const NRaceData::TAttackData & c_rAttackData, CActorInstance & rVictim, const D3DXVECTOR3 & c_rv3Position, UINT uiSkill = 0, BOOL isSendPacket = TRUE); void __ProcessMotionEventAttackSuccess(DWORD dwMotionKey, BYTE byEventIndex, CActorInstance & rVictim); void __ProcessMotionAttackSuccess(DWORD dwMotionKey, CActorInstance & rVictim); @@ -633,11 +610,7 @@ class CActorInstance : public IActorInstance, public IFlyTargetableObject void __HitStone(CActorInstance& rVictim); void __HitGood(CActorInstance& rVictim); -#ifdef FIX_POS_SYNC - void __HitGreate(CActorInstance& rVictim, UINT uiSkill); -#else void __HitGreate(CActorInstance& rVictim); -#endif void __PushDirect(CActorInstance & rVictim); void __PushCircle(CActorInstance & rVictim); diff --git a/src/UserInterface/InstanceBase.cpp b/src/UserInterface/InstanceBase.cpp index ef1cb90..5adbb32 100644 --- a/src/UserInterface/InstanceBase.cpp +++ b/src/UserInterface/InstanceBase.cpp @@ -1556,11 +1556,7 @@ void CInstanceBase::StateProcess() SetAdvancingRotation(fRotDst); SetRotation(fRotDst); -#ifdef FIX_POS_SYNC - NEW_UseSkill(1, eFunc& FUNC_SKILL - 1, uArg & 0x0f, (uArg >> 4) ? true : false); -#else NEW_UseSkill(0, eFunc & 0x7f, uArg&0x0f, (uArg>>4) ? true : false); -#endif //Tracen("가깝기 때문에 워프 공격"); } } @@ -1738,11 +1734,7 @@ void CInstanceBase::MovementProcess() { SetAdvancingRotation(m_fDstRot); BlendRotation(m_fDstRot); -#ifdef FIX_POS_SYNC - NEW_UseSkill(1, m_kMovAfterFunc.eFunc& FUNC_SKILL - 1, m_kMovAfterFunc.uArg & 0x0f, (m_kMovAfterFunc.uArg >> 4) ? true : false); -#else NEW_UseSkill(0, m_kMovAfterFunc.eFunc & 0x7f, m_kMovAfterFunc.uArg&0x0f, (m_kMovAfterFunc.uArg>>4) ? true : false); -#endif } else { diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index 0d39d1c..0a7b932 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -514,18 +514,6 @@ typedef struct command_attack uint32_t dwVictimVID; // 적 VID uint8_t bCRCMagicCubeProcPiece; uint8_t bCRCMagicCubeFilePiece; -#ifdef FIX_POS_SYNC - BOOL bPacket; - LONG lSX; - LONG lSY; - LONG lX; - LONG lY; - float fSyncDestX; - float fSyncDestY; - DWORD dwBlendDuration; - DWORD dwComboMotion; - DWORD dwTime; -#endif } TPacketCGAttack; typedef struct command_chat @@ -1878,16 +1866,6 @@ typedef struct packet_attack uint32_t dwVID; uint32_t dwVictimVID; // 적 VID uint8_t bType; // 공격 유형 -#ifdef FIX_POS_SYNC - BOOL bPacket; - LONG lSX; - LONG lSY; - LONG lX; - LONG lY; - float fSyncDestX; - float fSyncDestY; - DWORD dwBlendDuration; -#endif } TPacketGCAttack; typedef struct packet_c2c diff --git a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp index 4be97b6..8144fe5 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp @@ -2425,30 +2425,6 @@ bool CPythonNetworkStream::RecvDamageInfoPacket() return true; } -#ifdef FIX_POS_SYNC -bool CPythonNetworkStream::RecvCharacterAttackPacket() -{ - TPacketGCAttack kPacket; - - if (!Recv(sizeof(TPacketGCAttack), &kPacket)) - { - Tracen("CPythonNetworkStream::RecvCharacterAttackPacket - PACKET READ ERROR"); - return false; - } - - if (kPacket.lX && kPacket.lY) { - __GlobalPositionToLocalPosition(kPacket.lX, kPacket.lY); - } - __GlobalPositionToLocalPosition(kPacket.lSX, kPacket.lSY); - - TPixelPosition tSyncPosition = TPixelPosition{ kPacket.fSyncDestX, kPacket.fSyncDestY, 0 }; - - m_rokNetActorMgr->AttackActor(kPacket.dwVID, kPacket.dwVictimVID, kPacket.lX, kPacket.lY, tSyncPosition, kPacket.dwBlendDuration); - - return true; -} -#endif - bool CPythonNetworkStream::RecvTargetPacket() { TPacketGCTarget TargetPacket; @@ -2540,20 +2516,11 @@ bool CPythonNetworkStream::RecvChangeSpeedPacket() /////////////////////////////////////////////////////////////////////////////////////////////////// // Recv -#ifdef FIX_POS_SYNC -bool CPythonNetworkStream::SendAttackPacket(UINT uMotAttack, DWORD dwVIDVictim, BOOL bPacket, CActorInstance::BlendingPosition& sBlending) -#else bool CPythonNetworkStream::SendAttackPacket(UINT uMotAttack, DWORD dwVIDVictim) -#endif { if (!__CanActMainInstance()) return true; -#ifdef FIX_POS_SYNC - CPythonCharacterManager& rkChrMgr = CPythonCharacterManager::Instance(); - CInstanceBase* pkInstMain = rkChrMgr.GetMainInstancePtr(); -#endif - #ifdef ATTACK_TIME_LOG static DWORD prevTime = timeGetTime(); DWORD curTime = timeGetTime(); @@ -2566,25 +2533,6 @@ bool CPythonNetworkStream::SendAttackPacket(UINT uMotAttack, DWORD dwVIDVictim) kPacketAtk.header = HEADER_CG_ATTACK; kPacketAtk.bType = uMotAttack; kPacketAtk.dwVictimVID = dwVIDVictim; -#ifdef FIX_POS_SYNC - kPacketAtk.bPacket = bPacket; - kPacketAtk.lX = (long)sBlending.dest.x; - kPacketAtk.lY = (long)sBlending.dest.y; - kPacketAtk.lSX = (long)sBlending.source.x; - kPacketAtk.lSY = (long)sBlending.source.y; - kPacketAtk.fSyncDestX = sBlending.dest.x; - // sources and dest are normalized with both coordinates positive - // since fSync are ment to be broadcasted to other clients, the Y has to preserve the negative coord - kPacketAtk.fSyncDestY = -sBlending.dest.y; - kPacketAtk.dwBlendDuration = (unsigned int)(sBlending.duration * 1000); - kPacketAtk.dwComboMotion = pkInstMain->GetComboMotion(); - kPacketAtk.dwTime = ELTimer_GetServerMSec(); - - if (kPacketAtk.lX && kPacketAtk.lY) - __LocalPositionToGlobalPosition(kPacketAtk.lX, kPacketAtk.lY); - - __LocalPositionToGlobalPosition(kPacketAtk.lSX, kPacketAtk.lSY); -#endif if (!SendSpecial(sizeof(kPacketAtk), &kPacketAtk)) {