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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.107 by root, Sun Apr 11 18:50:04 2010 UTC vs.
Revision 1.115 by root, Tue May 3 17:12:15 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
               move_apply (op, tmp, tmp);
             }
         }
       SET_ANIMATION (op, op->stats.wc);
-      update_object (op, UP_OBJ_FACE);
+      update_object (op, UP_OBJ_CHANGE);
       return;
     }
   /* We're closing */
   op->move_on = 0;
   op->stats.wc++;
-  if ((int) op->stats.wc >= NUM_ANIMATIONS (op))
+  if (op->stats.wc >= NUM_ANIMATIONS (op))
     op->stats.wc = NUM_ANIMATIONS (op) - 1;
   SET_ANIMATION (op, op->stats.wc);
-  update_object (op, UP_OBJ_FACE);
+  update_object (op, UP_OBJ_CHANGE);
-  if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))
+  if (op->stats.wc == (NUM_ANIMATIONS (op) - 1))
     op->set_speed (0);     /* closed, let's stop */
 }
 /* stop_item() returns a pointer to the stopped object.  The stopped object
 {
   int was_reflected;
   if (!op->map)
     {
-      LOG (llevError, "BUG: Arrow had no map.\n");
+      LOG (llevError | logBacktrace, "BUG: Arrow %s had no map.\n", op->debug_desc ());
       op->destroy ();
       return;
     }
   /* we need to stop thrown objects at some point. Like here. */
     }
   /* decrease the speed as it flies. 0.05 means a standard bow will shoot
    * about 17 squares. Tune as needed.
    */
-  op->speed -= 0.05;
+  op->set_speed (op->speed - 0.05);
   /* if the arrow is moving too slow.. stop it.  0.5 was chosen as lower
      values look rediculous. */
-  if (op->speed < (op->type == ARROW ? 0.05 : MIN_ACTIVE_SPEED))
+  if (op->speed < (op->type == ARROW ? 0.5 : MIN_ACTIVE_SPEED))
     {
       stop_arrow (op);
       return;
     }
     }
   cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);
 }
-/*  move_player_mover:  this function takes a "player mover" as an
+/* move_player_mover:  this function takes a "player mover" as an
  * argument, and performs the function of a player mover, which is:
  *
  * a player mover finds any players that are sitting on it.  It
  * moves them in the op->stats.sp direction.  speed is how often it'll move.
  * If attacktype is nonzero it will paralyze the player.  If lifesave is set,
  * it'll paralyze the victim for hp*his speed/op->speed
  */
 static void
 move_player_mover (object *op)
 {
-  int dir = op->stats.sp;
+  int dir = 0;
-  sint16 nx, ny;
-  maptile *m;
-  /* Determine direction now for random movers so we do the right thing */
-  if (!dir)
-    dir = rndm (1, 8);
   for (object *victim = op->ms ().bot; victim; victim = victim->above)
     {
-      if (victim->flag [FLAG_ALIVE] && !victim->flag [FLAG_WIZPASS] &&
+      if (victim->flag [FLAG_ALIVE]
+          && !victim->flag [FLAG_WIZPASS]
-          (victim->move_type & op->move_type || !victim->move_type))
+          && (victim->move_type & op->move_type || !victim->move_type))
+        {
+          if (op->flag [FLAG_LIFESAVE] && op->stats.hp-- < 0)
-        {
+            {
+              op->destroy ();
+              return;
+            }
+          /* Determine direction only once so we do the right thing */
+          // why is it the right thing, though?
+          if (!dir)
+            dir = op->stats.sp ? op->stats.sp : rndm (1, 8);
+          sint16 nx = op->x + freearr_x[dir];
+          sint16 ny = op->y + freearr_y[dir];
+          maptile *m = op->map;
+          if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
+            {
+              LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
+              return;
+            }
           if (victim->head)
             victim = victim->head;
-          if (op->flag [FLAG_LIFESAVE] && op->stats.hp-- < 0)
-            {
-              op->remove ();
-              return;
-            }
-          nx = op->x + freearr_x[dir];
-          ny = op->y + freearr_y[dir];
-          m = op->map;
-          if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
-            {
-              LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
-              return;
-            }
           if (should_director_abort (op, victim))
             return;
           for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
       int i;
       object *ob_to_copy;
       /* select random object from inventory to copy */
       ob_to_copy = creator->inv;
-      for (ob = creator->inv->below, i = 1; ob != NULL; ob = ob->below, i++)
+      for (ob = creator->inv->below, i = 1; ob; ob = ob->below, i++)
         {
           if (rndm (0, i) == 0)
             {
               ob_to_copy = ob;
             }
         }
       new_ob = ob_to_copy->deep_clone ();
       new_ob->clr_flag (FLAG_IS_A_TEMPLATE);
       unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
     }
   else
       return;
     }
   // for now lets try to identify everything generated here, it mostly
   // happens automated, so this will at least fix many identify-experience holes
+  if (new_ob->need_identify ())
-  new_ob->set_flag (FLAG_IDENTIFIED);
+    new_ob->set_flag (FLAG_IDENTIFIED);
   insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
   if (new_ob->flag [FLAG_FREED])
     return;
       case LAMP:
       case TORCH:
         move_lamp (op);
         break;
-    }
-}
+      case PHYSICS: // hmm, bad naming
+        move_physics (op);
+        break;
+    }
+}

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.107 by root, Sun Apr 11 18:50:04 2010 UTC vs. Revision 1.115 by root, Tue May 3 17:12:15 2011 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.107 by root, Sun Apr 11 18:50:04 2010 UTC vs.
Revision 1.115 by root, Tue May 3 17:12:15 2011 UTC