X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=cf75e6442c42452ec02ca6db6ab75bb4a4e23c02;hb=3939cd4f963b485e1da42787f59fdbcfae23be19;hp=b0f24b803e328cec5e9e60f1a2067a8854049c34;hpb=f1f7cfd4e95d7c7e0022a320e6979403fc0a096b;p=open-adventure.git

diff --git a/misc.c b/misc.c
index b0f24b8..cf75e64 100644
--- 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]);
 		}
@@ -337,12 +337,6 @@ long VOCAB(long id, long init)
     BUG(21);
 }
 
-void DSTROY(long object)
-/*  Permanently eliminate "object" by moving to a non-existent location. */
-{
-    MOVE(object,0);
-}
-
 void JUGGLE(long object)
 /*  Juggle an object by picking it up and putting it down again, the purpose
  *  being to get the object to the front of the chain of things at its loc. */
@@ -367,7 +361,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 +382,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 +406,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;
     }