Merge branch 'fixes' into atys

merge-requests/7/head
commit 458861951b

@ -3652,10 +3652,14 @@ void CInventoryManager::updateItemInfoQueue()
TItemInfoWaiters::iterator it; TItemInfoWaiters::iterator it;
for(it= _ItemInfoWaiters.begin();it!=_ItemInfoWaiters.end();it++) for(it= _ItemInfoWaiters.begin();it!=_ItemInfoWaiters.end();it++)
{ {
/* \todo yoyo remove: temp patch to be sure that the client does not send messages before the /* yoyo remove: temp patch to be sure that the client does not send messages before the
CONNECTION:READY is sent CONNECTION:READY is sent
Ulukyn: this only happens if player ask to reselect a char before end of update items.
On this case, skip it...
*/ */
nlassert(ConnectionReadySent);
if (!ConnectionReadySent)
continue;
IItemInfoWaiter *waiter=*it; IItemInfoWaiter *waiter=*it;
uint itemSlotId= waiter->ItemSlotId; uint itemSlotId= waiter->ItemSlotId;

Loading…
Cancel
Save