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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.78 by root, Sun Feb 7 04:22:33 2010 UTC vs.
Revision 1.82 by root, Sun Mar 28 16:17:28 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
 static int
 move_randomly (object *op)
 {
   /* Give up to 15 chances for a monster to move randomly */
   for (int i = 0; i < 15; i++)
-    if (move_object (op, rndm (8) + 1))
+    if (op->move (rndm (8) + 1))
       return 1;
   return 0;
 }
   static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };
   if (++ob->move_status > 11)
     ob->move_status = 0;
-  if (!(move_object (ob, circle[ob->move_status])))
+  if (!(ob->move (circle[ob->move_status])))
-    move_object (ob, rndm (8) + 1);
+    ob->move (rndm (8) + 1);
 }
 static void
 circ2_move (object *ob)
 {
   static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };
   if (++ob->move_status > 19)
     ob->move_status = 0;
-  if (!(move_object (ob, circle[ob->move_status])))
+  if (!(ob->move (circle[ob->move_status])))
-    move_object (ob, rndm (8) + 1);
+    ob->move (rndm (8) + 1);
 }
 static void
 pace_movev (object *ob)
 {
   if (ob->move_status++ > 6)
     ob->move_status = 0;
   if (ob->move_status < 4)
-    move_object (ob, 5);
+    ob->move (5);
   else
-    move_object (ob, 1);
+    ob->move (1);
 }
 static void
 pace_moveh (object *ob)
 {
   if (ob->move_status++ > 6)
     ob->move_status = 0;
   if (ob->move_status < 4)
-    move_object (ob, 3);
+    ob->move (3);
   else
-    move_object (ob, 7);
+    ob->move (7);
 }
 static void
 pace2_movev (object *ob)
 {
   if (ob->move_status++ > 16)
     ob->move_status = 0;
   if (ob->move_status < 6)
-    move_object (ob, 5);
+    ob->move (5);
   else if (ob->move_status < 8)
     return;
   else if (ob->move_status < 13)
-    move_object (ob, 1);
+    ob->move (1);
   else
     return;
 }
 static void
 {
   if (ob->move_status++ > 16)
     ob->move_status = 0;
   if (ob->move_status < 6)
-    move_object (ob, 3);
+    ob->move (3);
   else if (ob->move_status < 8)
     return;
   else if (ob->move_status < 13)
-    move_object (ob, 7);
+    ob->move (7);
   else
     return;
 }
 static void
 rand_move (object *ob)
 {
-  if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
+  if (ob->move_status < 1 || ob->move_status > 8 || !(ob->move (ob->move_status || !(rndm (9)))))
     for (int i = 0; i < 5; i++)
-      if (move_object (ob, ob->move_status = rndm (8) + 1))
+      if (ob->move (ob->move_status = rndm (8) + 1))
         return;
 }
 #define MAX_KNOWN_SPELLS 20
     }
   if (QUERY_FLAG (head, FLAG_CONFUSED))
     dir = absdir (dir + rndm (3) + rndm (3) - 2);
+  object *new_skill = 0;
-  /* skill selection - monster will use the next unused skill.
+  // skill selection - monster will use the last unused skill
-   * well...the following scenario will allow the monster to
+  // and rotate, eventually cycling through all skills.
-   * toggle between 2 skills. One day it would be nice to make
-   * more skills available to monsters.
-   */
   for (skill = head->inv; skill; skill = skill->below)
     if (skill->type == SKILL && skill != head->chosen_skill)
-      {
+      new_skill = skill;
+  if (new_skill)
-        head->chosen_skill = skill;
+    splay (head->chosen_skill = new_skill);
-        break;
-      }
-  if (!skill && !head->chosen_skill)
+  else if (!head->chosen_skill)
     {
       LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);
       CLEAR_FLAG (head, FLAG_READY_SKILL);
       return 0;
     }
   if (!dir)
     return 0;
   if (!QUERY_FLAG (op, FLAG_STAND_STILL))
     {
-      if (move_object (op, dir))        /* Can the monster move directly toward player? */
+      if (op->move (dir))        /* Can the monster move directly toward player? */
         {
           /* elmex: Turn our monster after it moved if it has DISTATT attack */
           if ((op->attack_movement & LO4) == DISTATT)
             op->direction = pre_att_dir;
           for (diff = 1; diff <= maxdiff; diff++)
             {
               /* try different detours */
               int m = 1 - rndm (2) * 2;      /* Try left or right first? */
-              if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))
+              if (op->move (absdir (dir + diff * m)) || op->move (absdir (dir - diff * m)))
                 return 0;
             }
         }
     }                           /* if monster is not standing still */

Diff Legend

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

Comparing deliantra/server/server/monster.C (file contents): Revision 1.78 by root, Sun Feb 7 04:22:33 2010 UTC vs. Revision 1.82 by root, Sun Mar 28 16:17:28 2010 UTC

Diff Legend

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.78 by root, Sun Feb 7 04:22:33 2010 UTC vs.
Revision 1.82 by root, Sun Mar 28 16:17:28 2010 UTC