#include "common_irrlicht.h"
#include "jmutex.h"
#include <ostream>
+#include <set>
+#include <vector>
#include "clientobject.h"
#include "utility.h" // For IntervalLimiter
#include "gamedef.h"
+#include "inventorymanager.h"
+#include "filesys.h"
struct MeshMakeData;
+class MapBlockMesh;
class IGameDef;
class IWritableTextureSource;
-class IWritableToolDefManager;
+class IWritableItemDefManager;
class IWritableNodeDefManager;
+//class IWritableCraftDefManager;
+class ClientEnvironment;
+struct MapDrawControl;
class ClientNotReadyException : public BaseException
{
/*
peer_id=0 adds with nobody to send to
*/
- void addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server);
+ void addBlock(v3s16 p, MeshMakeData *data,
+ bool ack_block_to_server, bool urgent);
// Returned pointer must be deleted
// Returns NULL if queue is empty
}
private:
- core::list<QueuedMeshUpdate*> m_queue;
+ std::vector<QueuedMeshUpdate*> m_queue;
+ std::set<v3s16> m_urgents;
JMutex m_mutex;
};
struct MeshUpdateResult
{
v3s16 p;
- scene::SMesh *mesh;
+ MapBlockMesh *mesh;
bool ack_block_to_server;
MeshUpdateResult():
std::string password,
MapDrawControl &control,
IWritableTextureSource *tsrc,
- IWritableToolDefManager *tooldef,
+ IWritableItemDefManager *itemdef,
IWritableNodeDefManager *nodedef
);
*/
void step(float dtime);
- // Called from updater thread
- // Returns dtime
- //float asyncStep();
-
void ProcessData(u8 *data, u32 datasize, u16 sender_peer_id);
// Returns true if something was received
bool AsyncProcessPacket();
bool AsyncProcessData();
void Send(u16 channelnum, SharedBuffer<u8> data, bool reliable);
- // Pops out a packet from the packet queue
- //IncomingPacket getPacket();
-
- void groundAction(u8 action, v3s16 nodepos_undersurface,
- v3s16 nodepos_oversurface, u16 item);
- void clickActiveObject(u8 button, u16 id, u16 item_i);
+ void interact(u8 action, const PointedThing& pointed);
void sendSignNodeText(v3s16 p, std::string text);
void sendInventoryAction(InventoryAction *a);
const std::wstring newpassword);
void sendDamage(u8 damage);
void sendRespawn();
+
+ ClientEnvironment& getEnv()
+ { return m_env; }
- // locks envlock
+ // Causes urgent mesh updates (unlike Map::add/removeNodeWithEvent)
void removeNode(v3s16 p);
- // locks envlock
void addNode(v3s16 p, MapNode n);
- void updateCamera(v3f pos, v3f dir, f32 fov);
-
- void renderPostFx();
-
- // Returns InvalidPositionException if not found
- MapNode getNode(v3s16 p);
- // Wrapper to Map
- NodeMetadata* getNodeMetadata(v3s16 p);
-
- LocalPlayer* getLocalPlayer();
-
void setPlayerControl(PlayerControl &control);
void selectPlayerItem(u16 item);
+ u16 getPlayerItem() const
+ { return m_playeritem; }
// Returns true if the inventory of the local player has been
// updated from the server. If it is true, it is set to false.
// Copies the inventory of the local player to parameter
void getLocalInventory(Inventory &dst);
- InventoryContext *getInventoryContext();
-
- Inventory* getInventory(InventoryContext *c, std::string id);
+ /* InventoryManager interface */
+ Inventory* getInventory(const InventoryLocation &loc);
void inventoryAction(InventoryAction *a);
// Gets closest object pointed by the shootline
// Prints a line or two of info
void printDebugInfo(std::ostream &os);
- u32 getDayNightRatio();
+ core::list<std::wstring> getConnectedPlayerNames();
- u16 getHP();
+ float getAnimationTime();
- void setTempMod(v3s16 p, NodeMod mod);
- void clearTempMod(v3s16 p);
+ int getCrackLevel();
+ void setCrack(int level, v3s16 pos);
+
+ u16 getHP();
float getAvgRtt()
{
}
}
- bool getChatMessage(std::wstring &message)
- {
- if(m_chat_queue.size() == 0)
- return false;
- message = m_chat_queue.pop_front();
- return true;
- }
-
- void addChatMessage(const std::wstring &message)
- {
- if (message[0] == L'/') {
- m_chat_queue.push_back(
- (std::wstring)L"issued command: "+message);
- return;
- }
-
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- LocalPlayer *player = m_env.getLocalPlayer();
- assert(player != NULL);
- std::wstring name = narrow_to_wide(player->getName());
- m_chat_queue.push_back(
- (std::wstring)L"<"+name+L"> "+message);
- }
+ bool getChatMessage(std::wstring &message);
+ void typeChatMessage(const std::wstring& message);
u64 getMapSeed(){ return m_map_seed; }
- void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false);
+ void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false, bool urgent=false);
// Including blocks at appropriate edges
- void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false);
+ void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false, bool urgent=false);
+ void addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server=false, bool urgent=false);
// Get event from queue. CE_NONE is returned if queue is empty.
ClientEvent getClientEvent();
- inline bool accessDenied()
+ bool accessDenied()
{ return m_access_denied; }
- inline std::wstring accessDeniedReason()
+ std::wstring accessDeniedReason()
{ return m_access_denied_reason; }
+
+ float textureReceiveProgress()
+ { return m_texture_receive_progress; }
+
+ bool texturesReceived()
+ { return m_textures_received; }
+ bool itemdefReceived()
+ { return m_itemdef_received; }
+ bool nodedefReceived()
+ { return m_nodedef_received; }
+ void afterContentReceived();
+
float getRTT(void);
// IGameDef interface
- // Under envlock
- virtual IToolDefManager* getToolDefManager();
+ virtual IItemDefManager* getItemDefManager();
virtual INodeDefManager* getNodeDefManager();
+ virtual ICraftDefManager* getCraftDefManager();
virtual ITextureSource* getTextureSource();
+ virtual u16 allocateUnknownNodeId(const std::string &name);
private:
IntervalLimiter m_map_timer_and_unload_interval;
IWritableTextureSource *m_tsrc;
- IWritableToolDefManager *m_tooldef;
+ IWritableItemDefManager *m_itemdef;
IWritableNodeDefManager *m_nodedef;
MeshUpdateThread m_mesh_update_thread;
ClientEnvironment m_env;
IrrlichtDevice *m_device;
// Server serialization version
u8 m_server_ser_ver;
- // This is behind m_env_mutex.
+ u16 m_playeritem;
bool m_inventory_updated;
+ Inventory *m_inventory_from_server;
+ float m_inventory_from_server_age;
core::map<v3s16, bool> m_active_blocks;
PacketCounter m_packetcounter;
- // Received from the server. 0-23999
- u32 m_time_of_day;
+ // Block mesh animation parameters
+ float m_animation_time;
+ int m_crack_level;
+ v3s16 m_crack_pos;
// 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT
//s32 m_daynight_i;
//u32 m_daynight_ratio;
std::string m_password;
bool m_access_denied;
std::wstring m_access_denied_reason;
- InventoryContext m_inventory_context;
Queue<ClientEvent> m_client_event_queue;
+ float m_texture_receive_progress;
+ bool m_textures_received;
+ bool m_itemdef_received;
+ bool m_nodedef_received;
friend class FarMesh;
+
+ // time_of_day speed approximation for old protocol
+ bool m_time_of_day_set;
+ float m_last_time_of_day_f;
+ float m_time_of_day_update_timer;
};
#endif // !SERVER