diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-04 06:10:04 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-04 06:10:04 +0000 |
| commit | cdcf380b7b7e82444b3039effa2742cf59acf4ec (patch) | |
| tree | 591deb6925c30e9e5d83e939c395327e4c35f1f4 /crawl-ref/source/tilesdl.cc | |
| parent | 8079104c39087532a85fa9bdee1c7b66ceeb7cee (diff) | |
| download | crawl-ref-cdcf380b7b7e82444b3039effa2742cf59acf4ec.tar.gz crawl-ref-cdcf380b7b7e82444b3039effa2742cf59acf4ec.zip | |
[2424512] Fixing pink square appearing at random in the message window. On a related note, making more variables int instead of unsigned int where it made sense and fixing a number of int/unsigned int comparison warnings.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8199 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index bcd6432337..daae2ab5c1 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1239,7 +1239,7 @@ void TilesFramework::update_inventory() for (unsigned int c = 0; c < strlen(Options.tile_show_items); c++) { - if (inv.size() >= max_pack_items) + if ((int)inv.size() >= max_pack_items) break; const char *find = strchr(obj_syms, Options.tile_show_items[c]); @@ -1250,7 +1250,7 @@ void TilesFramework::update_inventory() // First, normal inventory for (int i = 0; i < ENDOFPACK; i++) { - if (inv.size() >= max_pack_items) + if ((int)inv.size() >= max_pack_items) break; if (!is_valid_item(you.inv[i]) || you.inv[i].quantity == 0) @@ -1282,7 +1282,7 @@ void TilesFramework::update_inventory() int empty_on_this_row = mx - inv.size() % mx; // If we're not on the last row... - if (inv.size() < mx * (my-1)) + if ((int)inv.size() < mx * (my-1)) { if (num_ground > remaining - empty_on_this_row) { @@ -1291,7 +1291,7 @@ void TilesFramework::update_inventory() for (int i = 0; i < fill; i++) { InventoryTile desc; - if (inv.size() >= max_pack_items) + if ((int)inv.size() >= max_pack_items) desc.flag |= TILEI_FLAG_INVALID; inv.push_back(desc); } @@ -1302,7 +1302,7 @@ void TilesFramework::update_inventory() while (inv.size() % mx != 0) { InventoryTile desc; - if (inv.size() >= max_pack_items) + if ((int)inv.size() >= max_pack_items) desc.flag |= TILEI_FLAG_INVALID; inv.push_back(desc); } @@ -1311,13 +1311,13 @@ void TilesFramework::update_inventory() unsigned int ground_rows = std::max((num_ground-1) / mx + 1, 1); - while (inv.size() / mx + ground_rows < my - && inv.size() < max_pack_items) + while ((int)(inv.size() / mx + ground_rows) < my + && ((int)inv.size()) < max_pack_items) { - for (unsigned int i = 0; i < mx; i++) + for (int i = 0; i < mx; i++) { InventoryTile desc; - if (inv.size() >= max_pack_items) + if ((int)inv.size() >= max_pack_items) desc.flag |= TILEI_FLAG_INVALID; inv.push_back(desc); } @@ -1328,7 +1328,7 @@ void TilesFramework::update_inventory() // Then, as many ground items as we can fit. for (unsigned int c = 0; c < strlen(Options.tile_show_items); c++) { - if (inv.size() >= mx * my) + if ((int)inv.size() >= mx * my) break; const char *find = strchr(obj_syms, Options.tile_show_items[c]); @@ -1338,7 +1338,7 @@ void TilesFramework::update_inventory() for (int i = igrd(you.pos()); i != NON_ITEM; i = mitm[i].link) { - if (inv.size() >= mx * my) + if ((int)inv.size() >= mx * my) break; if (mitm[i].base_type != type) @@ -1352,7 +1352,7 @@ void TilesFramework::update_inventory() } } - while (inv.size() < mx * my) + while ((int)inv.size() < mx * my) { InventoryTile desc; desc.flag = TILEI_FLAG_FLOOR; |