diff options
| author | sapier <Sapier at GMX dot net> | 2014-04-28 23:41:27 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-05-07 21:46:27 +0200 |
| commit | d3ee617f37984b380ebe32cd37ef1cda66d96c48 (patch) | |
| tree | ff40e272e0b5ab7525d66ddd3b98fa3eed71a496 /src/client.cpp | |
| parent | c80d67f48e2011c88bbb9e755ee4f5e7f5391f63 (diff) | |
| download | minetest-d3ee617f37984b380ebe32cd37ef1cda66d96c48.tar.xz | |
Fix heart + bubble bar size on different texture packs
Add DPI support for statbar
Move heart+bubble bar to Lua HUD
Add statbar size (based upon an idea by blue42u)
Add support for customizing breath and statbar
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp index 50162b1e9..b0488500f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1787,9 +1787,13 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) v2f align = readV2F1000(is); v2f offset = readV2F1000(is); v3f world_pos; + v2s32 size; try{ world_pos = readV3F1000(is); }catch(SerializationError &e) {}; + try{ + size = readV2S32(is); + } catch(SerializationError &e) {}; ClientEvent event; event.type = CE_HUDADD; @@ -1805,6 +1809,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) event.hudadd.align = new v2f(align); event.hudadd.offset = new v2f(offset); event.hudadd.world_pos = new v3f(world_pos); + event.hudadd.size = new v2s32(size); m_client_event_queue.push_back(event); } else if(command == TOCLIENT_HUDRM) @@ -1825,6 +1830,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) v2f v2fdata; v3f v3fdata; u32 intdata = 0; + v2s32 v2s32data; std::string datastring((char *)&data[2], datasize - 2); std::istringstream is(datastring, std::ios_base::binary); @@ -1839,6 +1845,8 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) sdata = deSerializeString(is); else if (stat == HUD_STAT_WORLD_POS) v3fdata = readV3F1000(is); + else if (stat == HUD_STAT_SIZE ) + v2s32data = readV2S32(is); else intdata = readU32(is); @@ -1850,6 +1858,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) event.hudchange.v3fdata = new v3f(v3fdata); event.hudchange.sdata = new std::string(sdata); event.hudchange.data = intdata; + event.hudchange.v2s32data = new v2s32(v2s32data); m_client_event_queue.push_back(event); } else if(command == TOCLIENT_HUD_SET_FLAGS) |