diff --git a/src/GameLib/ActorInstance.h b/src/GameLib/ActorInstance.h index 55f7ebe..d1fc556 100644 --- a/src/GameLib/ActorInstance.h +++ b/src/GameLib/ActorInstance.h @@ -362,22 +362,11 @@ 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 +480,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 +604,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); @@ -636,11 +614,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 07280b3..81e41a3 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 {