Mercurial > mm7
comparison Chest.cpp @ 1110:cf6cd674c398
bitwise operator ambiguity reduced
author | Grumpy7 |
---|---|
date | Mon, 27 May 2013 23:05:32 +0200 |
parents | d48c762de563 |
children | 29a8defbad9e |
comparison
equal
deleted
inserted
replaced
1108:a1fd8045ffb1 | 1110:cf6cd674c398 |
---|---|
338 item_texture_id = pIcons_LOD->LoadTexture(pItemsTable->pItems[item_id].pIconName, TEXTURE_16BIT_PALETTE); | 338 item_texture_id = pIcons_LOD->LoadTexture(pItemsTable->pItems[item_id].pIconName, TEXTURE_16BIT_PALETTE); |
339 item_texture = pIcons_LOD->GetTexture(item_texture_id); | 339 item_texture = pIcons_LOD->GetTexture(item_texture_id); |
340 v6 = item_texture->uTextureWidth; | 340 v6 = item_texture->uTextureWidth; |
341 if ( v6 < 14 ) | 341 if ( v6 < 14 ) |
342 v6 = 14; | 342 v6 = 14; |
343 texture_cell_width = (v6 - 14 >> 5) + 1; | 343 texture_cell_width = ((v6 - 14) >> 5) + 1; |
344 v8 = item_texture->uTextureHeight; | 344 v8 = item_texture->uTextureHeight; |
345 if ( v8 < 14 ) | 345 if ( v8 < 14 ) |
346 v8 = 14; | 346 v8 = 14; |
347 texture_cell_height = ((v8 - 14) >> 5) + 1; | 347 texture_cell_height = ((v8 - 14) >> 5) + 1; |
348 if ( !areWeLoadingTexture ) | 348 if ( !areWeLoadingTexture ) |