Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-09 17:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make blocks to be loaded from disk when the active block area reaches them

Browse Source
This commit is contained in:
Perttu Ahola 2011-11-27 12:50:35 +02:00
parent ec4f58741b
commit 5c1cb01936
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/environment.cpp
View File

@ -273,10 +273,11 @@ void ActiveBlockList::update(core::list<v3s16> &active_positions,
*/
ServerEnvironment::ServerEnvironment(ServerMap *map, lua_State *L,
IGameDef *gamedef):
IGameDef *gamedef, IBackgroundBlockEmerger *emerger):
m_map(map),
m_lua(L),
m_gamedef(gamedef),
m_emerger(emerger),
m_random_spawn_timer(3),
m_send_recommended_timer(0),
m_game_time(0),
@ -891,8 +892,12 @@ void ServerEnvironment::step(float dtime)
<<") became active"<<std::endl;*/
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
if(block==NULL)
if(block==NULL){
// Block needs to be fetched first
m_emerger->queueBlockEmerge(p, false);
m_active_blocks.m_list.remove(p);
continue;
}
activateBlock(block);
}

11
src/environment.h
View File

@ -120,6 +120,12 @@ public:
private:
};
class IBackgroundBlockEmerger
{
public:
virtual void queueBlockEmerge(v3s16 blockpos, bool allow_generate)=0;
};
/*
The server-side environment.
@ -129,7 +135,8 @@ private:
class ServerEnvironment : public Environment
{
public:
ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef);
ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef,
IBackgroundBlockEmerger *emerger);
~ServerEnvironment();
Map & getMap()
@ -279,6 +286,8 @@ private:
lua_State *m_lua;
// Game definition
IGameDef *m_gamedef;
// Background block emerger (the server, in practice)
IBackgroundBlockEmerger *m_emerger;
// Active object list
core::map<u16, ServerActiveObject*> m_active_objects;
// Outgoing network message buffer for active objects

11
src/server.cpp
View File

@ -1078,7 +1078,8 @@ Server::Server(
// Initialize Environment
m_env = new ServerEnvironment(new ServerMap(mapsavedir, this), m_lua, this);
m_env = new ServerEnvironment(new ServerMap(mapsavedir, this), m_lua,
this, this);
// Give environment reference to scripting api
scriptapi_add_environment(m_lua, m_env);
@ -4590,6 +4591,14 @@ void Server::notifyPlayers(const std::wstring msg)
BroadcastChatMessage(msg);
}
void Server::queueBlockEmerge(v3s16 blockpos, bool allow_generate)
{
u8 flags = 0;
if(!allow_generate)
flags |= BLOCK_EMERGE_FLAG_FROMDISK;
m_emerge_queue.addBlock(PEER_ID_INEXISTENT, blockpos, flags);
}
// IGameDef interface
// Under envlock
IToolDefManager* Server::getToolDefManager()

5
src/server.h
View File

@ -366,7 +366,8 @@ private:
};
class Server : public con::PeerHandler, public MapEventReceiver,
public InventoryManager, public IGameDef
public InventoryManager, public IGameDef,
public IBackgroundBlockEmerger
{
public:
/*
@ -483,6 +484,8 @@ public:
// Envlock and conlock should be locked when calling this
void notifyPlayer(const char *name, const std::wstring msg);
void notifyPlayers(const std::wstring msg);
void queueBlockEmerge(v3s16 blockpos, bool allow_generate);
// Envlock and conlock should be locked when using Lua
lua_State *getLua(){ return m_lua; }