diff options
| author | sapier <Sapier at GMX dot net> | 2014-02-13 20:17:42 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-04-08 21:12:20 +0200 |
| commit | 142e2d3b74ad886eed83b0fc9d6cfea100dae10a (patch) | |
| tree | 869bd3599c590e062bc838013b83088280734a81 /src/hud.cpp | |
| parent | 556bdc260a6938ddab8db22e2ebc4033ec3757eb (diff) | |
| download | minetest-142e2d3b74ad886eed83b0fc9d6cfea100dae10a.tar.gz minetest-142e2d3b74ad886eed83b0fc9d6cfea100dae10a.tar.bz2 minetest-142e2d3b74ad886eed83b0fc9d6cfea100dae10a.zip | |
Cleanup client init states by bumping protocol version
Don't use TOSERVER_RECEIVED_MEDIA but TOSERVER_CLIENT_READY as indicatio for client ready
Handle clients with protocol version < 23 (almost) same way as before
Make client tell server about it's version
Add client state to not send bogus player position updates prior init complete
Add access to statistics information (peer connction time,rtt,version)
Fix clients standing stalled in world while preloading item visuals (new clients only)
Add get_player_information to read client specific information from lua
Diffstat (limited to 'src/hud.cpp')
| -rw-r--r-- | src/hud.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hud.cpp b/src/hud.cpp index 80112a6ec..f87fdfc14 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -143,7 +143,7 @@ void Hud::drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount, steppos = v2s32(padding, -(padding + i * fullimglen)); break; default: - steppos = v2s32(padding + i * fullimglen, padding); + steppos = v2s32(padding + i * fullimglen, padding); } core::rect<s32> rect = imgrect + pos + steppos; @@ -334,7 +334,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s steppos = v2s32(0, -1); break; default: - steppos = v2s32(1, 0); + steppos = v2s32(1, 0); } steppos.X *= srcd.Width; steppos.Y *= srcd.Height; @@ -363,7 +363,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, s32 breath) { InventoryList *mainlist = inventory->getList("main"); if (mainlist == NULL) { - errorstream << "draw_hotbar(): mainlist == NULL" << std::endl; + //silently ignore this we may not be initialized completely return; } |