--- deliantra/server/server/c_object.C	2006/09/03 00:18:42	1.12
+++ deliantra/server/server/c_object.C	2006/09/07 10:01:57	1.13
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_c_object_c =
- *   "$Id: c_object.C,v 1.12 2006/09/03 00:18:42 root Exp $";
+ *   "$Id: c_object.C,v 1.13 2006/09/07 10:01:57 pippijn Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
@@ -203,9 +203,9 @@
             "You can't put the key into %s.", query_name(sack));
         return 0;
     }
-    if (sack->weight_limit && sack->carrying + (nrof ? nrof : 1) * 
-        (op->weight + (op->type==CONTAINER?(op->carrying*op->stats.Str):0))
-        * (100 - sack->stats.Str) / 100  > sack->weight_limit) {
+    if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 
+        (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
+        * (100 - sack->stats.Str) / 100) > sack->weight_limit) {
         new_draw_info_format(NDI_UNIQUE, 0, pl,
              "That won't fit in the %s!", query_name(sack));
     return 0;
@@ -1439,7 +1439,7 @@
 {
   char buf[VERY_BIG_BUF];
   int itemnumber;
-  object *item=NULL;
+  object *item = NULL;
   char *closebrace;
   size_t counter;
 
@@ -1449,7 +1449,7 @@
 
     /* Checking the first part */
     if ((itemnumber = atoi(params))!=0) {
-        for (item=op->inv; item && ((item->count != itemnumber) || item->invisible); item=item->below);
+        for (item = op->inv; item && ((item->count != (tag_t) itemnumber) || item->invisible); item = item->below);
         if (!item) {
             new_draw_info(NDI_UNIQUE,0,op,"Tried to rename an invalid item.");
             return 1;