moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-22 23:58:48 -05:00
Code Issues Releases Wiki Activity

Hide minimap if it has been disabled by server

Browse Source
This commit is contained in:
est31 2015-09-01 03:07:02 +02:00
parent dce9468925
commit 0903190ba2
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client.cpp
View File

@ -228,6 +228,7 @@ Client::Client(
m_particle_manager(&m_env),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
m_device(device),
m_minimap_disabled_by_server(false),
m_server_ser_ver(SER_FMT_VER_INVALID),
m_proto_ver(0),
m_playeritem(0),

4
src/client.h
View File

@ -510,6 +510,9 @@ public:
Mapper* getMapper ()
{ return m_mapper; }
bool isMinimapDisabledByServer()
{ return m_minimap_disabled_by_server; }
// IGameDef interface
virtual IItemDefManager* getItemDefManager();
virtual INodeDefManager* getNodeDefManager();
@ -590,6 +593,7 @@ private:
con::Connection m_con;
IrrlichtDevice *m_device;
Mapper *m_mapper;
bool m_minimap_disabled_by_server;
// Server serialization version
u8 m_server_ser_ver;

3
src/game.cpp
View File

@ -1857,6 +1857,9 @@ void Game::run()
updateFrame(highlight_boxes, &graph, &stats, &runData, dtime,
flags, cam_view);
updateProfilerGraphs(&graph);
// Update if minimap has been disabled by the server
flags.show_minimap &= !client->isMinimapDisabledByServer();
}
}

4
src/hud.h
View File

@ -33,8 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define HUD_CORNER_CENTER 2
// Note that these visibility flags do not determine if the hud items are
// actually drawn, but rather, allows the item to be drawn should the rest of
// the game state permit it.
// actually drawn, but rather, whether to draw the item should the rest
// of the game state permit it.
#define HUD_FLAG_HOTBAR_VISIBLE (1 << 0)
#define HUD_FLAG_HEALTHBAR_VISIBLE (1 << 1)
#define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2)

12
src/network/clientpackethandler.cpp
View File

@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "map.h"
#include "mapsector.h"
#include "minimap.h"
#include "nodedef.h"
#include "serialization.h"
#include "server.h"
@ -1094,8 +1095,19 @@ void Client::handleCommand_HudSetFlags(NetworkPacket* pkt)
Player *player = m_env.getLocalPlayer();
assert(player != NULL);
bool was_minimap_visible = player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE;
player->hud_flags &= ~mask;
player->hud_flags |= flags;
m_minimap_disabled_by_server = !(player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE);
// Hide minimap if it has been disabled by the server
if (m_minimap_disabled_by_server && was_minimap_visible) {
// defers a minimap update, therefore only call it if really
// needed, by checking that minimap was visible before
m_mapper->setMinimapMode(MINIMAP_MODE_OFF);
}
}
void Client::handleCommand_HudSetParam(NetworkPacket* pkt)