# HG changeset patch # User Grumpy7 # Date 1378581467 -7200 # Node ID 9c4cf5b07e982ea1fff5c80ad55158d144024695 # Parent e303d8a9bcdc5a411f576ecb80fae608c75e871b Minor assert fixes in players.cpp diff -r e303d8a9bcdc -r 9c4cf5b07e98 Player.cpp --- a/Player.cpp Sat Sep 07 21:14:48 2013 +0200 +++ b/Player.cpp Sat Sep 07 21:17:47 2013 +0200 @@ -340,7 +340,6 @@ int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) { uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); - Assert (price > 0); if (price < uRealValue) price = uRealValue; @@ -810,8 +809,7 @@ texture->Release(); pIcons_LOD->SyncLoadedFilesCount(); } - - assert("Items should have nonzero dimensions"); + Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) { for (unsigned int x = 0; x < slotWidth; x++)