Node highlighting.

[oweals/minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 23194a3fff88b0cc9f9a8ceb4da2aeb5600d6a6f..cb0baceced8fd1358980192a9d8ae9b9cd2653e7 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -322,7 +322,7 @@ public:
        inline Address getPeerAddress(u16 peer_id)
                        { return m_con.GetPeerAddress(peer_id); }
                        
-       bool setLocalPlayerAnimations(Player *player, v2f animation_frames[4], f32 frame_speed);
+       bool setLocalPlayerAnimations(Player *player, v2s32 animation_frames[4], f32 frame_speed);
        bool setPlayerEyeOffset(Player *player, v3f first, v3f third);
 
        bool setSky(Player *player, const video::SColor &bgcolor,
@@ -364,7 +364,7 @@ private:
        void SendPlayerHP(u16 peer_id);
        void SendPlayerBreath(u16 peer_id);
        void SendMovePlayer(u16 peer_id);
-       void SendLocalPlayerAnimations(u16 peer_id, v2f animation_frames[4], f32 animation_speed);
+       void SendLocalPlayerAnimations(u16 peer_id, v2s32 animation_frames[4], f32 animation_speed);
        void SendEyeOffset(u16 peer_id, v3f first, v3f third);
        void SendPlayerPrivileges(u16 peer_id);
        void SendPlayerInventoryFormspec(u16 peer_id);
@@ -432,8 +432,8 @@ private:
        void UpdateCrafting(u16 peer_id);
 
        // When called, connection mutex should be locked
-       RemoteClient* getClient(u16 peer_id,ClientState state_min=Active);
-       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=Active);
+       RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
+       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);
 
        // When called, environment mutex should be locked
        std::string getPlayerName(u16 peer_id);