From cd0019acd28bf7d2b6de44fc366804f0d17c80b2 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 2 Jan 2012 17:44:00 +0200
Subject: Fix server sending stuff before textures have been sent

---
 src/game.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index 13d1e0c7d..0d08074ad 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1011,6 +1011,7 @@ void the_game(
 	bool invert_mouse = g_settings->getBool("invert_mouse");
 
 	bool respawn_menu_active = false;
+	bool update_wielded_item_trigger = false;
 
 	bool show_profiler = false;
 	bool force_fog_off = false;
@@ -1663,6 +1664,8 @@ void the_game(
 				else if(event.type == CE_TEXTURES_UPDATED)
 				{
 					update_skybox(driver, tsrc, smgr, skybox, brightness);
+					
+					update_wielded_item_trigger = true;
 				}
 			}
 		}
@@ -2274,7 +2277,12 @@ void the_game(
 		{
 			//infostream<<"Updating local inventory"<<std::endl;
 			client.getLocalInventory(local_inventory);
-
+			
+			update_wielded_item_trigger = true;
+		}
+		if(update_wielded_item_trigger)
+		{
+			update_wielded_item_trigger = false;
 			// Update wielded tool
 			InventoryList *mlist = local_inventory.getList("main");
 			InventoryItem *item = NULL;
-- 
cgit v1.2.3