forked from metin-server/m2dev-client-src
FIX_POS_SYNC removed
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user