[ViewVC] Diff of: cvs/deliantra/server/server/time.C

Comparing deliantra/server/server/time.C (file contents):
Revision 1.45 by root, Sun Apr 22 13:06:45 2007 UTC vs.
Revision 1.46 by root, Sat Apr 28 21:34:38 2007 UTC

 }
 void
 move_gate (object *op)
-{                               /* 1 = going down, 0 = goind up */
+{                               /* 1 = going down, 0 = going up */
   object *tmp;
   if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))
     {
       LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));
        */
       if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2)
         {
           /* Halfway or further, check blocks */
           /* First, get the top object on the square. */
-          for (tmp = op->above; tmp != NULL && tmp->above != NULL; tmp = tmp->above);
+          for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
+            ;
-          if (tmp != NULL)
+          if (tmp)
             {
               if (QUERY_FLAG (tmp, FLAG_ALIVE))
                 {
-                  hit_player (tmp, random_roll (1, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
+                  hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
                   if (tmp->type == PLAYER)
                     new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
                 }
               else
                 /* If the object is not alive, and the object either can

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines