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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.39 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.46 by root, Sat Apr 28 21:34:38 2007 UTC

     }
   op->destroy ();
 }
-/* Will generate a monster according to content
- * of generator.
- */
 void
-generate_monster_inv (object *gen)
+generate_monster (object *gen)
 {
-  int i;
-  object *op, *head = NULL;
-  int qty = 0;
-  /* Code below assumes the generator is on a map, as it tries
-   * to place the monster on the map.  So if the generator
-   * isn't on a map, complain and exit.
-   */
-  if (gen->map == NULL)
-    {
-      //LOG(llevError,"Generator (%s) not on a map?\n", gen->name);
-      return;
-    }
-  /*First count numer of objects in inv */
-  for (op = gen->inv; op; op = op->below)
-    qty++;
-  if (!qty)
-    {
-      LOG (llevError, "Generator (%s) has no inventory in generate_monster_inv?\n", &gen->name);
-      return;                   /*No inventory */
-    }
-  qty = rndm (0, qty - 1);
-  for (op = gen->inv; qty; qty--)
-    op = op->below;
-  i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
-  if (i == -1)
-    return;
-  head = object_create_clone (op);
-  CLEAR_FLAG (head, FLAG_IS_A_TEMPLATE);
-  unflag_inv (head, FLAG_IS_A_TEMPLATE);
-  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 (head->has_random_items ())
-    create_treasure (head->randomitems, head, GT_APPLY, gen->map->difficulty, 0);
-}
-void
-generate_monster_arch (object *gen)
-{
-  int i;
-  object *op, *head = NULL, *prev = NULL;
-  archetype *at = gen->other_arch;
-  if (!gen->other_arch)
-    return;
-  /* Code below assumes the generator is on a map, as it tries
-   * to place the monster on the map.  So if the generator
-   * isn't on a map, complain and exit.
-   */
   if (!gen->map)
     return;
-  i = find_free_spot (&at->clone, gen->map, gen->x, gen->y, 1, 9);
-  if (i == -1)
-    return;
-  while (at)
-    {
-      op = arch_to_object (at);
-      op->x = gen->x + freearr_x[i] + at->clone.x;
-      op->y = gen->y + freearr_y[i] + at->clone.y;
-      if (head)
-        op->head = head, prev->more = op;
-      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 (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;
-    }
-}
-void
-generate_monster (object *gen)
-{
   if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
     return;
+  object *op;
   if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
-    generate_monster_inv (gen);
+    {
+      // either copy one item form the inventory...
+      if (!gen->inv)
+        return;
+      // first select one item from the inventory
+      int index = 0;
+      for (object *tmp = gen->inv; tmp; tmp = tmp->below)
+        if (!rndm (++index))
+          op = tmp;
+      op = object_create_clone (op);
+      CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
+      unflag_inv (op, FLAG_IS_A_TEMPLATE);
+    }
   else
-    generate_monster_arch (gen);
+    {
+      // ...or use other_arch
+      if (archetype *at = gen->other_arch)
+        op = arch_to_object (at);
+      else
+        return;
+    }
+  op->expand_tail ();
+  int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
+  if (i >= 0)
+    {
+      if (insert_ob_in_map_at (op, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]))
+        {
+          if (rndm (0, 9))
+            generate_artifact (op, gen->map->difficulty);
+          if (op->has_random_items ())
+            create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
+          return;
+        }
+    }
+  op->destroy ();
 }
 void
 remove_force (object *op)
 {
 }
 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
 void
 fix_stopped_item (object *op, maptile *map, object *originator)
 {
   if (map == NULL)
     return;
   if (QUERY_FLAG (op, FLAG_REMOVED))
     insert_ob_in_map (op, map, originator, 0);
   else if (op->type == ARROW)
     merge_ob (op, NULL);        /* only some arrows actually need this */
 }
 object *
 fix_stopped_arrow (object *op)
 {
   if (rndm (0, 99) < op->stats.food)
   op->stats.hp = 0;
   op->stats.grace = 0;
   op->level = 0;
   op->face = op->arch->clone.face;
   op->owner = NULL;             /* So that stopped arrows will be saved */
-  update_object (op, UP_OBJ_FACE);
+  update_object (op, UP_OBJ_CHANGE);
   return op;
 }
 /* stop_arrow() - what to do when a non-living flying object
  * has to stop. Sept 96 - I added in thrown object code in
     }
 }
 /* Move an arrow along its course.  op is the arrow or thrown object.
  */
 void
 move_arrow (object *op)
 {
   object *tmp;
   sint16 new_x, new_y;
           if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE) && (rndm (0, 99)) < (90 - op->level / 10))
             {
               int number = op->face;
               op->direction = absdir (op->direction + 4);
-              op->state = 0;
+              update_turn_face (op);
-              if (GET_ANIM_ID (op))
-                {
-                  number += 4;
-                  if (number > GET_ANIMATION (op, 8))
-                    number -= 8;
-                  op->face = number;
-                }
               was_reflected = 1;        /* skip normal movement calculations */
             }
           else
             {
               /* Attack the object. */

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.39 by root, Sun Mar 11 02:12:45 2007 UTC vs. Revision 1.46 by root, Sat Apr 28 21:34:38 2007 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.39 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.46 by root, Sat Apr 28 21:34:38 2007 UTC