diff --git a/src/game/char.cpp b/src/game/char.cpp index 5316b45..a9311de 100644 --- a/src/game/char.cpp +++ b/src/game/char.cpp @@ -114,9 +114,6 @@ CHARACTER::CHARACTER() m_stateIdle.Set(this, &CHARACTER::BeginStateEmpty, &CHARACTER::StateIdle, &CHARACTER::EndStateEmpty); m_stateMove.Set(this, &CHARACTER::BeginStateEmpty, &CHARACTER::StateMove, &CHARACTER::EndStateEmpty); m_stateBattle.Set(this, &CHARACTER::BeginStateEmpty, &CHARACTER::StateBattle, &CHARACTER::EndStateEmpty); -#ifdef FIX_POS_SYNC - m_stateSyncing.Set(this, &CHARACTER::BeginStateEmpty, &CHARACTER::StateSyncing, &CHARACTER::EndStateEmpty); -#endif Initialize(); } diff --git a/src/game/char.h b/src/game/char.h index c3b3344..2f7088b 100644 --- a/src/game/char.h +++ b/src/game/char.h @@ -522,17 +522,10 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider CStateTemplate m_stateMove; CStateTemplate m_stateBattle; CStateTemplate m_stateIdle; -#ifdef FIX_POS_SYNC - CStateTemplate m_stateSyncing; -#endif public: virtual void StateMove(); virtual void StateBattle(); -#ifdef FIX_POS_SYNC - virtual void StateSyncing(); - virtual bool BlendSync(long x, long y, unsigned int unDuration); -#endif virtual void StateIdle(); virtual void StateFlag(); virtual void StateFlagBase(); diff --git a/src/game/packet.h b/src/game/packet.h index 9ae4391..85bcf56 100644 --- a/src/game/packet.h +++ b/src/game/packet.h @@ -599,38 +599,8 @@ typedef struct command_attack uint32_t dwVID; 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; -#ifdef FIX_POS_SYNC -typedef struct packet_attack -{ - BYTE bHeader; - BYTE bType; - DWORD dwAttacakerVID; - DWORD dwVID; - BOOL bPacket; - LONG lSX; - LONG lSY; - LONG lX; - LONG lY; - float fSyncDestX; - float fSyncDestY; - DWORD dwBlendDuration; -} TPacketGCAttack; -#endif - enum EMoveFuncType { FUNC_WAIT,