--- deliantra/server/socket/item.C	2006/12/15 19:59:20	1.23
+++ deliantra/server/socket/item.C	2006/12/16 22:14:42	1.24
@@ -32,7 +32,6 @@
  * the logic for what items should be sent.
  */
 
-
 #include <global.h>
 #include <object.h>             /* LOOK_OBJ */
 #include <sproto.h>
@@ -48,7 +47,7 @@
 
 /**
  *  This is a similar to query_name, but returns flags
- *  to be sended to client. 
+ *  to be sent to client. 
  */
 unsigned int
 query_flags (object *op)
@@ -59,36 +58,37 @@
     {
       switch (op->type)
         {
-            case BOW:
-            case WAND:
-            case ROD:
-            case HORN:
-              flags = a_readied;
-              break;
-            case WEAPON:
-              flags = a_wielded;
-              break;
-            case SKILL:
-            case ARMOUR:
-            case HELMET:
-            case SHIELD:
-            case RING:
-            case BOOTS:
-            case GLOVES:
-            case AMULET:
-            case GIRDLE:
-            case BRACERS:
-            case CLOAK:
-              flags = a_worn;
-              break;
-            case CONTAINER:
-              flags = a_active;
-              break;
-            default:
-              flags = a_applied;
-              break;
+          case BOW:
+          case WAND:
+          case ROD:
+          case HORN:
+            flags = a_readied;
+            break;
+          case WEAPON:
+            flags = a_wielded;
+            break;
+          case SKILL:
+          case ARMOUR:
+          case HELMET:
+          case SHIELD:
+          case RING:
+          case BOOTS:
+          case GLOVES:
+          case AMULET:
+          case GIRDLE:
+          case BRACERS:
+          case CLOAK:
+            flags = a_worn;
+            break;
+          case CONTAINER:
+            flags = a_active;
+            break;
+          default:
+            flags = a_applied;
+            break;
         }
     }
+
   if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
     flags |= F_OPEN;
 
@@ -99,6 +99,7 @@
       else if (QUERY_FLAG (op, FLAG_CURSED))
         flags |= F_CURSED;
     }
+
   if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
     flags |= F_MAGIC;
   if (QUERY_FLAG (op, FLAG_UNPAID))
@@ -187,11 +188,10 @@
 
 
 /**
- * Send the look window.  Don't need to do animations here 
- * This sends all the faces to the client, not just updates.  This is
- * because object ordering would otherwise be inconsistent
+ * Send the look window. Don't need to do animations here 
+ * This sends all the faces to the client, not just updates. This is
+ * because object ordering would otherwise be inconsistent.
  */
-
 void
 esrv_draw_look (object *pl)
 {
@@ -300,7 +300,7 @@
               sl << uint32 (0);
               got_one = 0;
             }
-        }                       /* If LOOK_OBJ() */
+        }
     }
   
   if (got_one)
@@ -360,7 +360,6 @@
 
   if (got_one)
     pl->contr->socket->send_packet (sl);
-
 }
 
 /**
@@ -525,7 +524,6 @@
 
   pl->contr->socket->send_packet (sl);
   SET_FLAG (op, FLAG_CLIENT_SENT);
-
 }
 
 /**
@@ -573,7 +571,7 @@
           return tmp;
 
   for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
-    if (op->head != NULL && op->head->count == count)
+    if (op->head && op->head->count == count)
       return op;
     else if (op->count == count)
       return op;
@@ -582,7 +580,7 @@
         if (tmp->count == count)
           return tmp;
 
-  return NULL;
+  return 0;
 }
 
 
@@ -607,7 +605,7 @@
   examine (pl->ob, op);
 }
 
-/** Client wants to apply some object.  Lets do so. */
+/** Client wants to apply some object. Lets do so. */
 void
 ApplyCmd (char *buf, int len, player *pl)
 {
@@ -801,9 +799,8 @@
           esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
-        {
-          drop_object (pl, op, nrof);
-        }
+        drop_object (pl, op, nrof);
+
       return;
     }
   else if (to == pl->count)
@@ -830,8 +827,6 @@
    * an make sure env is in fact a container for that matter.
    */
   if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
-    {
-      put_object_in_sack (pl, env, op, nrof);
-    }
+    put_object_in_sack (pl, env, op, nrof);
 }