aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/alan3/container.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2019-06-25 22:37:19 -0700
committerPaul Gilbert2019-07-06 15:27:07 -0700
commit822cd6f16564a4fbb3436600894c144bf9e160d6 (patch)
tree876058f5583b98c9458c79b866b0b61746c5c380 /engines/glk/alan3/container.cpp
parentcd7cf4141425e3e77b164d2dbcbae8de1eacb035 (diff)
downloadscummvm-rg350-822cd6f16564a4fbb3436600894c144bf9e160d6.tar.gz
scummvm-rg350-822cd6f16564a4fbb3436600894c144bf9e160d6.tar.bz2
scummvm-rg350-822cd6f16564a4fbb3436600894c144bf9e160d6.zip
GLK: ALAN3: Further warning fixes
Diffstat (limited to 'engines/glk/alan3/container.cpp')
-rw-r--r--engines/glk/alan3/container.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/glk/alan3/container.cpp b/engines/glk/alan3/container.cpp
index 4b812c98d6..b9508f55db 100644
--- a/engines/glk/alan3/container.cpp
+++ b/engines/glk/alan3/container.cpp
@@ -71,7 +71,7 @@ static int sumAttributeInContainer(
/*----------------------------------------------------------------------*/
static bool containerIsEmpty(int container)
{
- int i;
+ uint i;
for (i = 1; i <= header->instanceMax; i++)
if (isDescribable(i) && isIn(i, container, TRANSITIVE))
@@ -102,7 +102,7 @@ bool passesContainerLimits(Aint theContainer, Aint theAddedInstance) {
if (containers[props].limits != 0) { /* Any limits at all? */
for (limit = (LimitEntry *) pointerTo(containers[props].limits); !isEndOfArray(limit); limit++)
if (limit->atr == 1-I_COUNT) { /* TODO This is actually some encoding of the attribute number, right? */
- if (countInContainer(theContainer) >= limit->val) {
+ if (countInContainer(theContainer) >= (int)limit->val) {
interpret(limit->stms);
return(FALSE);
}
@@ -119,7 +119,7 @@ bool passesContainerLimits(Aint theContainer, Aint theAddedInstance) {
/*======================================================================*/
int containerSize(int container, ATrans trans) {
- Aint i;
+ Aword i;
Aint count = 0;
for (i = 1; i <= header->instanceMax; i++) {
@@ -132,7 +132,7 @@ int containerSize(int container, ATrans trans) {
/*======================================================================*/
void list(int container)
{
- int i;
+ uint i;
Aword props;
Aword foundInstance[2] = {0,0};
int found = 0;