Skip to content
Permalink
Browse files

[CSM] Fix minimap problems (#5405)

This fixes issue #5404
  • Loading branch information...
nerzhul committed Mar 17, 2017
1 parent 0891975 commit 7b74f04a611ddaf36d79c0c9ebbf7f2b89c12a64
Showing with 18 additions and 17 deletions.
  1. +6 −2 clientmods/preview/init.lua
  2. +1 −6 src/client.cpp
  3. +0 −2 src/client.h
  4. +1 −1 src/game.cpp
  5. +10 −6 src/script/lua_api/l_minimap.cpp
@@ -49,8 +49,8 @@ core.register_chatcommand("test_node", {

local function preview_minimap()
local minimap = core.ui.minimap
minimap:show()
minimap:set_mode(4)
minimap:show()
minimap:set_pos({x=5, y=50, z=5})
minimap:toggle_shape()

@@ -61,9 +61,13 @@ end

core.after(2, function()
print("[PREVIEW] loaded " .. modname .. " mod")
preview_minimap()
modstorage:set_string("current_mod", modname)
print(modstorage:get_string("current_mod"))
preview_minimap()
end)

core.after(5, function()
core.ui.minimap:show()

print("[PREVIEW] Day count: " .. core.get_day_count() ..
" time of day " .. core.get_timeofday())
@@ -224,7 +224,6 @@ Client::Client(
m_device(device),
m_camera(NULL),
m_minimap_disabled_by_server(false),
m_minimap_shown_by_mod(false),
m_server_ser_ver(SER_FMT_VER_INVALID),
m_proto_ver(0),
m_playeritem(0),
@@ -1933,11 +1932,7 @@ void Client::makeScreenshot(IrrlichtDevice *device)

bool Client::shouldShowMinimap() const
{
if (m_minimap_disabled_by_server) {
return false;
}

return m_minimap_shown_by_mod;
return !m_minimap_disabled_by_server;
}

// IGameDef interface
@@ -532,7 +532,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
{ return m_camera; }

bool shouldShowMinimap() const;
void setMinimapShownByMod(bool state) { m_minimap_shown_by_mod = state; }

// IGameDef interface
virtual IItemDefManager* getItemDefManager();
@@ -634,7 +633,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
Camera *m_camera;
Minimap *m_minimap;
bool m_minimap_disabled_by_server;
bool m_minimap_shown_by_mod;
// Server serialization version
u8 m_server_ser_ver;

@@ -1769,7 +1769,7 @@ void Game::run()
updateProfilerGraphs(&graph);

// Update if minimap has been disabled by the server
flags.show_minimap = client->shouldShowMinimap();
flags.show_minimap &= client->shouldShowMinimap();
}
}

@@ -118,17 +118,21 @@ int LuaMinimap::l_toggle_shape(lua_State *L)

int LuaMinimap::l_show(lua_State *L)
{
Client *client = getClient(L);
assert(client);
client->setMinimapShownByMod(true);
LuaMinimap *ref = checkobject(L, 1);
Minimap *m = getobject(ref);

if (m->getMinimapMode() == MINIMAP_MODE_OFF)
m->setMinimapMode(MINIMAP_MODE_SURFACEx1);
return 1;
}

int LuaMinimap::l_hide(lua_State *L)
{
Client *client = getClient(L);
assert(client);
client->setMinimapShownByMod(false);
LuaMinimap *ref = checkobject(L, 1);
Minimap *m = getobject(ref);

if (m->getMinimapMode() != MINIMAP_MODE_OFF)
m->setMinimapMode(MINIMAP_MODE_OFF);
return 1;
}

0 comments on commit 7b74f04

Please sign in to comment.
You can’t perform that action at this time.