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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.140 by root, Sun May 2 20:37:58 2010 UTC vs.
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 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,2012,2013,2014,2015,2016 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <assert.h>
 #include <global.h>
 #include <living.h>
 #include <material.h>
 #include <skills.h>
 #include <sounds.h>
 #include <sproto.h>
-typedef struct att_msg_str
-{
-  char *msg1;
-  char *msg2;
-} att_msg;
 /*#define ATTACK_DEBUG*/
 /* did_make_save_item just checks to make sure the item actually
  * made its saving throw based on the tables.  It does not take
  * returns 1 if it hits something, 0 otherwise.
  */
 int
 hit_map (object *op, int dir, uint32_t type, int full_hit)
 {
-  maptile *map;
   sint16 x, y;
   int retflag = 0;              /* added this flag..  will return 1 if it hits a monster */
   if (op->flag [FLAG_FREED])
     {
           if (op->destroyed ())
             break;
         }
     }
-  return 0;
+  return retflag;
 }
 static void
 attack_message (int dam, int type, object *op, object *hitter)
 {
    * arrow, move_apply() calls this function, arrow sticks in demon,
    * attack_ob_simple() returns, and we've got an arrow that still exists
    * but is no longer on the map. Ugh. (Beware: Such things can happen at
    * other places as well!)
    */
-  if (hitter->destroyed () || hitter->env != NULL)
+  if (hitter->destroyed () || hitter->env)
     {
       if (container)
         container->destroy ();
       return 0;
     }
   /* Missile hit victim */
-  /* if the speed is > 10, then this is a fast moving arrow, we go straight
+  /* if the speed is >= 10, then this is a fast moving arrow, we go straight
    * through the target
    */
-  if (hit_something && op->speed <= 10.0)
+  if (hit_something)
+    if (op->speed < 10.0)
-    {
+      {
-      /* Stop arrow */
+        /* Stop arrow */
-      if (!container)
+        if (!container)
-        {
+          {
-          hitter = fix_stopped_arrow (hitter);
+            hitter = fix_stopped_arrow (hitter);
-          if (!hitter)
+            if (!hitter)
-            return 0;
+              return 0;
-        }
+          }
-      else
+        else
-        container->destroy ();
+          container->destroy ();
-      /* Try to stick arrow into victim */
+        /* Try to stick arrow into victim */
-      if (!victim->destroyed () && stick_arrow (hitter, victim))
+        if (!victim->destroyed () && stick_arrow (hitter, victim))
+          return 0;
+        /* Else try to put arrow on victim's map square
+         * remove check for P_WALL here. If the arrow got to this
+         * space, that is good enough - with the new movement code,
+         * there is now the potential for lots of spaces where something
+         * can fly over but not otherwise move over. What is the correct
+         * way to handle those otherwise?
+         */
+        if (victim->x != hitter->x || victim->y != hitter->y)
+          {
+            if (victim->destroyed ())
+              hitter->destroy ();
+            else
+              {
+                hitter->remove ();
+                hitter->x = victim->x;
+                hitter->y = victim->y;
+                insert_ob_in_map (hitter, victim->map, hitter, 0);
+              }
+          }
+        else
+          /* Else leave arrow where it is */
+          merge_ob (hitter, NULL);
         return 0;
-      /* Else try to put arrow on victim's map square
-       * remove check for P_WALL here.  If the arrow got to this
-       * space, that is good enough - with the new movement code,
-       * there is now the potential for lots of spaces where something
-       * can fly over but not otherwise move over.  What is the correct
-       * way to handle those otherwise?
-       */
-      if (victim->x != hitter->x || victim->y != hitter->y)
-        {
-          if (victim->destroyed ())
-            hitter->destroy ();
-          else
-            {
-              hitter->remove ();
-              hitter->x = victim->x;
-              hitter->y = victim->y;
-              insert_ob_in_map (hitter, victim->map, hitter, 0);
-            }
-        }
+      }
-      else
+    else
-        /* Else leave arrow where it is */
+      op->set_speed (op->speed - 1.f);
-        merge_ob (hitter, NULL);
-      return 0;
-    }
-  if (hit_something && op->speed >= 10.0)
-    --op->speed;
   /* Missile missed victim - reassemble missile */
   if (container)
     {
       hitter->remove ();
  * MSW 2002-07-17
  */
 int
 kill_object (object *op, int dam, object *hitter, int type)
 {
-  char buf[MAX_BUF];
   shstr skill;
   int maxdam = 0;
   int battleg = 0;              /* true if op standing on battleground */
   int pk = 0;                   /* true if op and what controls hitter are both players */
   object *owner = 0;
         skill = owner->current_weapon->skill;
       else
         {
           LOG (llevError | logBacktrace,
                "BUG: kill_object - unable to find skill that killed monster\n"
-               "op: %s\n"           "hitter: %s\n"          "owner: %s\n",
+               "op: %s\n"         "hitter: %s\n"         "op: %s\n",
-               owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
+               op->debug_desc (), hitter->debug_desc (), op->debug_desc ());
           skill = 0;
         }
       /* We have the skill we want to credit to - now find the object this goes
        * to. Make sure skop is an actual skill, and not a skill tool!
 int
 hit_player (object *op, int dam, object *hitter, uint32_t type, int full_hit)
 {
   int magic = type & AT_MAGIC;
   int body_attack = op && op->head;     /* Did we hit op's head? */
-  int maxdam = 0, ndam = 0, attacktype = 1;
+  int maxdam = 0, ndam = 0;
   int maxattacktype;
   int simple_attack;
   int rtn_kill = 0;
   int friendlyfire;
   int maxduration;
   tmp = present_in_ob_by_name (FORCE, shstr_confusion, op);
   if (!tmp)
     {
-      tmp = get_archetype (FORCE_NAME);
+      tmp = archetype::get (FORCE_NAME);
       tmp = insert_ob_in_ob (tmp, op);
     }
   /* Duration added per hit and max. duration of confusion both depend
    *  on the player's resistance
    */
-  tmp->speed = 0.05;
+  tmp->set_speed (0.05);
   tmp->subtype = FORCE_CONFUSION;
   tmp->duration = 8 + max (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
   tmp->name = shstr_confusion;
   maxduration = max (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
 }
 void
 blind_player (object *op, object *hitter, int dam)
 {
-  object *tmp, *owner;
   /* Save some work if we know it isn't going to affect the player */
   if (op->resist[ATNR_BLIND] == 100)
     return;
-  tmp = present_in_ob (BLINDNESS, op);
+  object *tmp = present_in_ob (BLINDNESS, op);
   if (!tmp)
     {
-      tmp = get_archetype (shstr_blindness);
+      tmp = archetype::get (shstr_blindness);
       tmp->set_flag (FLAG_BLIND);
       tmp->set_flag (FLAG_APPLIED);
-      /* use floats so we don't lose too much precision due to rounding errors.
+      // use floats so we don't lose too much precision due to rounding errors.
-       * speed is a float anyways.
+      tmp->set_speed (lerp<float> (op->resist [ATNR_BLIND], 0, 100, tmp->speed, MIN_ACTIVE_SPEED));
-       */
-      tmp->speed *= (100 - op->resist[ATNR_BLIND]) * .01f;
       tmp = insert_ob_in_ob (tmp, op);
       change_abil (op, tmp);    /* Mostly to display any messages */
       op->update_stats ();          /* This takes care of some other stuff */
-      if (hitter->owner)
-        owner = hitter->owner;
-      else
-        owner = hitter;
-      new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
+      new_draw_info_format (NDI_UNIQUE, 0, hitter->outer_owner (), "Your attack blinds %s!", query_name (op));
     }
   tmp->stats.food += dam;
   min_it (tmp->stats.food, 10);
 }

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.140 by root, Sun May 2 20:37:58 2010 UTC vs. Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.140 by root, Sun May 2 20:37:58 2010 UTC vs.
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC