diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
| commit | 61e8cfc1d553b2bc0cce6b0dd56b03f51f187423 (patch) | |
| tree | 4988afbe6ad84804444d0dc3151d300e22d1a80e /src/util.cc | |
| parent | b1f5178bdabafde20eb65df6256b53dc5968b2e2 (diff) | |
Clean up warnings about signed/unsigned comparisons
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util.cc b/src/util.cc index a4c00a26..550fc9e4 100644 --- a/src/util.cc +++ b/src/util.cc @@ -3516,6 +3516,7 @@ int ask_menu(cptr ask, const std::vector<std::string> &items) { int ret = -1, i, start = 0; char c; + int size = items.size(); // Convert to int to avoid warnings /* Enter "icky" mode */ character_icky = TRUE; @@ -3529,7 +3530,7 @@ int ask_menu(cptr ask, const std::vector<std::string> &items) Term_load(); Term_save(); prt(ask, 0, 0); - for (i = start; (i < items.size()) && (i < start + 20); i++) + for (i = start; (i < size) && (i < start + 20); i++) { prt(format("%c) %s", I2A(i - start), items[i].c_str()), i - start + 1, 0); } @@ -3543,7 +3544,7 @@ int ask_menu(cptr ask, const std::vector<std::string> &items) /* Scroll */ else if (c == '+') { - if (start + 20 < items.size()) + if (start + 20 < size) start += 20; continue; } @@ -3560,7 +3561,7 @@ int ask_menu(cptr ask, const std::vector<std::string> &items) else { c = tolower(c); - if (A2I(c) + start >= items.size()) + if (A2I(c) + start >= size) { bell(); continue; |