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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.156 by root, Thu Jul 26 00:27:09 2007 UTC

  *
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * Crossfire TRT is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <global.h>
   ns->reset_stats ();
   /* make sure he's a player -- needed because of class change. */
   ob->type = PLAYER; // we are paranoid
-  ob->race = ob->arch->clone.race;
+  ob->race = ob->arch->race;
   ob->carrying = sum_weight (ob);
   link_player_skills (ob);
   CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
-  assign (title, ob->arch->clone.name);
+  assign (title, ob->arch->object::name);
   /* if it's a dragon player, set the correct title here */
   if (is_dragon_pl (ob))
     {
       object *tmp, *abil = 0, *skin = 0;
-      shstr_cmp dragon_ability_force ("dragon_ability_force");
-      shstr_cmp dragon_skin_force    ("dragon_skin_force");
       for (tmp = ob->inv; tmp; tmp = tmp->below)
         if (tmp->type == FORCE)
-          if (tmp->arch->archname == dragon_ability_force)
+          if (tmp->arch->archname == shstr_dragon_ability_force)
             abil = tmp;
-          else if (tmp->arch->archname == dragon_skin_force)
+          else if (tmp->arch->archname == shstr_dragon_skin_force)
             skin = tmp;
       set_dragon_name (ob, abil, skin);
     }
       ns->pl = 0;
       ns = 0;
     }
   if (ob)
+    {
-    ob->close_container (); //TODO: client-specific
+      ob->close_container (); //TODO: client-specific
+      ob->drop_unpaid_items ();
+    }
+  observe = ob;
   deactivate ();
 }
 // the need for this function can be explained
   if (ob)
     {
       ob->destroy_inv (false);
       ob->destroy ();
     }
+  ob = observe = 0;
 }
 player::~player ()
 {
   /* Clear item stack */
  * Note: there MUST be at least one player archetype!
  */
 archetype *
 get_player_archetype (archetype *at)
 {
-  archetype *start = at;
+  archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
   for (;;)
     {
-      if (at == NULL || at->next == NULL)
+      if (++i == archetypes.end ())
-        at = first_archetype;
+        i = archetypes.begin ();
-      else
+      else if (*i == at)
-        at = at->next;
+        cleanup ("not a single player archetype found");
-      if (at->clone.type == PLAYER)
+      if ((*i)->type == PLAYER)
-        return at;
+        return *i;
-      if (at == start)
-        {
-          LOG (llevError, "No Player archetypes\n");
-          exit (-1);
-        }
     }
 }
 object *
 get_nearest_player (object *mon)
       int x = ob->x, y = ob->y;
       ob->remove_statbonus ();
       ob->remove ();
       ob->arch = get_player_archetype (ob->arch);
-      ob->arch->clone.copy_to (ob);
+      ob->arch->copy_to (ob);
       ob->instantiate ();
       ob->stats = ob->contr->orig_stats;
       ob->name = ob->name_pl = name;
       ob->x = x;
       ob->y = y;
       SET_ANIMATION (ob, 2);    /* So player faces south */
       insert_ob_in_map (ob, ob->map, ob, 0);
-      assign (ob->contr->title, ob->arch->clone.name);
+      assign (ob->contr->title, ob->arch->object::name);
       ob->add_statbonus ();
     }
   while (!allowed_class (ob));
   update_object (ob, UP_OBJ_FACE);
           else
             {
               for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
                 {
                   attacktype = 1 << attacknum;
-                  if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)
+                  if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
-                    if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)
+                    if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
                       {
                         tmp = arrow;
-                        betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;
+                        betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
                       }
                 }
               if ((2 + arrow->magic + arrow->stats.dam) > betterby)
                 {
                   tmp = arrow;
   arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
   arrow->move_type = MOVE_FLY_LOW;
   arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
-  play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
+  op->play_sound (sound_find ("fire_arrow"));
   m->insert (arrow, sx, sy, op);
   if (!arrow->destroyed ())
     move_arrow (arrow);
   if (item->type == WAND)
     {
       if (item->stats.food <= 0)
         {
-          play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
+          op->contr->play_sound (sound_find ("wand_poof"));
           new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
           return;
         }
     }
   else if (item->type == ROD || item->type == HORN)
     {
       if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
         {
-          play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
+          op->contr->play_sound (sound_find ("wand_poof"));
           if (item->type == ROD)
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
           else
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
               object *tmp;
               if (item->arch)
                 {
                   CLEAR_FLAG (item, FLAG_ANIMATE);
-                  item->face = item->arch->clone.face;
+                  item->face = item->arch->face;
                   item->set_speed (0);
                 }
               if ((tmp = item->in_player ()))
                 esrv_update_item (UPD_ANIM, tmp, item);
   /* If we found a key, do some extra work */
   if (key)
     {
       object *container = key->env;
-      play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
+      op->play_sound (sound_find ("open_door"));
       if (action_makes_visible (op))
         make_visible (op);
       if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
       if (op->speed_left > 0.f)
         {
           --op->speed_left;
-          play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+          op->play_sound (sound_find ("push_player"));
           push_ob (mon, dir, op);
           if (op->contr->tmp_invis || op->hide)
             make_visible (op);
         {
           --op->speed_left;
           if (!op->contr->braced)
             {
-              play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+              op->play_sound (sound_find ("push_player"));
               push_ob (mon, dir, op);
             }
           else
             new_draw_info (0, 0, op, "You withhold your attack");
     return 0;
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
       {
-        play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
+        op->play_sound (sound_find ("ob_evaporate"));
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
         if (op->contr)
           esrv_del_item (op->contr, tmp->count);
 /* This goes throws the inventory and removes unpaid objects, and puts them
  * back in the map (location and map determined by values of env).  This
  * function will descend into containers.  op is the object to start the search
  * from.
  */
-void
+static void
-remove_unpaid_objects (object *op, object *env)
+drop_unpaid_items (object *op, object *env)
 {
   while (op)
     {
       object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
             esrv_del_item (env->contr, op->count);
           op->insert_at (env);
         }
       else if (op->inv)
-        remove_unpaid_objects (op->inv, env);
+        drop_unpaid_items (op->inv, env);
       op = next;
     }
+}
+void
+object::drop_unpaid_items ()
+{
+  if (!flag [FLAG_REMOVED])
+    ::drop_unpaid_items (inv, this);
 }
 /*
  * Returns pointer a static string containing gravestone text
  * Moved from apply.c to player.c - player.c is what
         }
       /* Digestion */
       if (--op->last_eat < 0)
         {
-          int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
+          int bonus   = max (0,  op->contr->digestion),
+              penalty = max (0, -op->contr->digestion);
-          if (op->contr->gen_hp > 0)
-            op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
+          op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
-          else
-            op->last_eat = 25 * (1 + bonus) / (penalty + 1);
           /* dms do not consume food */
           if (!QUERY_FLAG (op, FLAG_WIZ))
             op->stats.food--;
         }
   object *tmp;
   if (save_life (op))
     return;
   /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
    * in cities ONLY!!! It is very important that this doesn't get abused.
    * Look at op_on_battleground() for more info       --AndreasV
    */
   if (op_on_battleground (op, &x, &y))
       strcpy (op->contr->killer, "starvation");
     }
   else
     sprintf (buf, "%s died.", &op->name);
-  play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
+  op->contr->play_sound (sound_find ("player_dies"));
   /*  save the map location for corpse, gravestone */
   x   = op->x;
   y   = op->y;
   map = op->map;
   /*
    * Check to see if the player has any unpaid items. If so, remove them
    * and put them back in the map.
    */
-  remove_unpaid_objects (op->inv, op);
+  op->drop_unpaid_items ();
   /****************************************/
   /*                                      */
   /* Move player to his current respawn-  */
   /* position (usually last savebed)      */
 }
 int
 is_true_undead (object *op)
 {
-  if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
+  if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
     return 1;
   return 0;
 }
    * a blocked los square.
    * we use the archetype to figure out offsets.
    */
   while (op)
     {
-      dx = rv.distance_x + op->arch->clone.x;
+      dx = rv.distance_x + op->arch->x;
-      dy = rv.distance_y + op->arch->clone.y;
+      dy = rv.distance_y + op->arch->y;
       /* only the viewable area the player sees is updated by LOS
        * code, so we need to restrict ourselves to that range of values
        * for any meaningful values.
        */
       /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
       return;
     }
   /* everything seems okay - now bring on the gift: */
-  item = &(tr->item->clone);
+  item = tr->item;
   if (item->type == SPELL)
     {
       if (check_spell_known (who, item->name))
         return;
     {
       /* forces in the treasurelist can alter the player's stats */
       object *skin;
       /* first get the dragon skin force */
-      shstr_cmp dragon_skin_force ("dragon_skin_force");
-      for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
+      for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
         ;
       if (!skin)
         return;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC vs. Revision 1.156 by root, Thu Jul 26 00:27:09 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.156 by root, Thu Jul 26 00:27:09 2007 UTC