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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.20 by root, Wed Dec 20 09:14:22 2006 UTC

   if (rndm (0, 9))
     generate_artifact (head, gen->map->difficulty);
   insert_ob_in_map_at (head, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]);
   if (QUERY_FLAG (head, FLAG_FREED))
     return;
-  if (HAS_RANDOM_ITEMS (head))
+  if (head->has_random_items ())
     create_treasure (head->randomitems, head, GT_APPLY, gen->map->difficulty, 0);
 }
 void
 generate_monster_arch (object *gen)
       if (rndm (0, 9))
         generate_artifact (op, gen->map->difficulty);
       insert_ob_in_map (op, gen->map, gen, 0);
       if (QUERY_FLAG (op, FLAG_FREED))
         return;
-      if (HAS_RANDOM_ITEMS (op))
+      if (op->has_random_items ())
         create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty, 0);
       if (head == NULL)
         head = op;
       prev = op;
       at = at->more;
   int last = op->value;
   int detected;
   detected = 0;
-  for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)
     {
       object *tmp2;
       if (op->stats.hp)
         {
       op->spellarg = NULL;
     }
   else
     op->slaying = NULL;
-  /* Reset these to zero, so that CAN_MERGE will work properly */
+  /* Reset these to zero, so that object::can_merge will work properly */
   op->spellarg = NULL;
   op->stats.sp = 0;
   op->stats.hp = 0;
   op->stats.grace = 0;
   op->level = 0;
   if (op->inv)
     {
       object *payload = op->inv;
       payload->remove ();
-      clear_owner (payload);
+      payload->owner = 0;
       insert_ob_in_map (payload, op->map, payload, 0);
       op->destroy ();
     }
   else
     {
     }
   /* only need to look for living creatures if this flag is set */
   if (mflags & P_IS_ALIVE)
     {
-      for (tmp = get_map_ob (m, new_x, new_y); tmp != NULL; tmp = tmp->above)
+      for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above)
         if (QUERY_FLAG (tmp, FLAG_ALIVE))
           break;
       /* Not really fair, but don't let monsters hit themselves with
        * their own arrow - this can be because they fire it then
  * Modified this routine to allow held objects. b.t. */
 void
 change_object (object *op)
 {                               /* Doesn`t handle linked objs yet */
-  object *tmp, *env, *pl;
   int i, j;
   if (op->other_arch == NULL)
     {
       LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name);
       if (op->stats.food-- > 0)
         return;
       else
         op->stats.food = 1;     /* so 1 other_arch is made */
     }
+  object *pl = op->in_player ();
-  env = op->env;
+  object *env = op->env;
   op->remove ();
   for (i = 0; i < NROFNEWOBJS (op); i++)
     {
-      tmp = arch_to_object (op->other_arch);
+      object *tmp = arch_to_object (op->other_arch);
       if (op->type == LAMP)
         tmp->stats.food = op->stats.food - 1;
       tmp->stats.hp = op->stats.hp;     /* The only variable it keeps. */
       if (env)
         {
           tmp->x = env->x, tmp->y = env->y;
           tmp = insert_ob_in_ob (tmp, env);
           /* If this object is the players inventory, we need to tell the
            * client of the change.  Insert_ob_in_map takes care of the
            * updating the client, so we don't need to do that below.
            */
-          if ((pl = is_player_inv (env)) != NULL)
+          if (pl)
             {
               esrv_del_item (pl->contr, op->count);
               esrv_send_item (pl, tmp);
             }
         }
   /* Determine direction now for random movers so we do the right thing */
   if (!dir)
     dir = rndm (1, 8);
-  for (victim = get_map_ob (op->map, op->x, op->y); victim != NULL; victim = victim->above)
+  for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above)
     {
       if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&
           (victim->move_type & op->move_type || !victim->move_type))
         {
             }
           if (should_director_abort (op, victim))
             return;
-          for (nextmover = get_map_ob (m, nx, ny); nextmover != NULL; nextmover = nextmover->above)
+          for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above)
             {
               if (nextmover->type == PLAYERMOVER)
                 nextmover->speed_left = -.99;
               if (QUERY_FLAG (nextmover, FLAG_ALIVE))
                 {
 void
 move_marker (object *op)
 {
   object *tmp, *tmp2;
-  for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       if (tmp->type == PLAYER)
         {                       /* we've got someone to MARK */
           /* remove an old force with a slaying field == op->name */
       if (QUERY_FLAG (op, FLAG_APPLIED))
         remove_force (op);
       else
         {
           /* IF necessary, delete the item from the players inventory */
-          object *pl = is_player_inv (op);
+          object *pl = op->in_player ();
           if (pl)
             esrv_del_item (pl->contr, op->count);
           op->remove ();

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.17 by root, Tue Dec 12 21:39:57 2006 UTC vs. Revision 1.20 by root, Wed Dec 20 09:14:22 2006 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.20 by root, Wed Dec 20 09:14:22 2006 UTC