Remove total-ordering assumption.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index b0f24b803e328cec5e9e60f1a2067a8854049c34..e9b5c84e18c083819f1f9bca8ad67e5f9c34e94b 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -67,7 +67,7 @@ void newspeak(char* msg)
  
   // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s.
   int pi = 0; // parameter index
-  for (int i = 0; i < strlen(msg); ++i)
+  for (int i = 0; i < (int)strlen(msg); ++i)
     {
       if (msg[i] == '%')
        {
@@ -105,7 +105,7 @@ void newspeak(char* msg)
            {
              copy[i + 1] = 's';
              packed_to_token(PARMS[pi], parameters[pi]);
-             for (int j = 0; j < strlen(parameters[pi]); ++j)
+             for (int j = 0; j < (int)strlen(parameters[pi]); ++j)
                {
                  parameters[pi][j] = tolower(parameters[pi][j]);
                }
@@ -116,7 +116,7 @@ void newspeak(char* msg)
            {
              copy[i + 1] = 's';
              packed_to_token(PARMS[pi], parameters[pi]);
-             for (int j = 0; j < strlen(parameters[pi]); ++j)
+             for (int j = 0; j < (int)strlen(parameters[pi]); ++j)
                {
                  parameters[pi][j] = tolower(parameters[pi][j]);
                }
@@ -367,7 +367,7 @@ void MOVE(long object, long where)
        from=game.fixed[object-NOBJECTS];
     else
        from=game.place[object];
-    if (from > 0 && !SPECIAL(from))
+    if (from != NOWHERE && from != CARRIED && !SPECIAL(from))
        CARRY(object,from);
     DROP(object,where);
 }
@@ -388,9 +388,9 @@ void CARRY(long object, long where)
     long temp;
 
     if (object <= NOBJECTS) {
-       if (game.place[object] == -1)
+       if (game.place[object] == CARRIED)
            return;
-       game.place[object]= -1;
+       game.place[object] = CARRIED;
        ++game.holdng;
     }
     if (game.atloc[where] == object) {
@@ -412,7 +412,7 @@ void DROP(long object, long where)
        game.fixed[object-NOBJECTS] = where;
     else
     {
-       if (game.place[object] == -1)
+       if (game.place[object] == CARRIED)
            --game.holdng;
        game.place[object] = where;
     }