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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC vs.
Revision 1.260 by root, Fri Apr 2 03:41:25 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 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.
   link_skills ();
   assign (title, ob->arch->object::name);
   /* if it's a dragon player, set the correct title here */
-  if (is_dragon_pl (ob))
+  if (ob->is_dragon ())
     {
       object *tmp, *abil = 0, *skin = 0;
       for (tmp = ob->inv; tmp; tmp = tmp->below)
         if (tmp->type == FORCE)
   esrv_send_inventory (ob, ob);
   esrv_add_spells (this, 0);
   ob->flag [FLAG_READY_WEAPON] = false;
   ob->flag [FLAG_READY_SKILL]  = false;
+  ob->flag [FLAG_READY_RANGE]  = false;
   ob->flag [FLAG_READY_BOW]    = false;
   for (object *op = ob->inv; op; op = op->below)
     if (op->flag [FLAG_APPLIED])
       switch (op->type)
         {
           case SKILL:
             op->flag [FLAG_APPLIED] = false;
             break;
+          case SPELL:
           case WAND:
           case ROD:
           case HORN:
           case BOW:
+          case RANGED:
             ranged_ob = op;
+            op->flag [FLAG_APPLIED] = false;
             break;
           case WEAPON:
             combat_ob = op;
+            op->flag [FLAG_APPLIED] = false;
             break;
         }
+  ob->update_stats (); // we unapplied stuff above
   ob->current_weapon = 0;
-  ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
+  if (object *item = combat_ob ? combat_ob : ranged_ob)
-  activate (); // change_weapon also activates, but this doesn't hurt
+    ob->apply (item);
+  activate ();
   INVOKE_PLAYER (CONNECT, this);
   INVOKE_PLAYER (LOGIN, this);
 }
   dir = absdir (4 + rv.direction);
   for (diff = 0; diff < 3; diff++)
     {
       int m = 1 - rndm (2) * 2;
-      if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
+      if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
         return;
     }
   /* Cornered, get rid of scared */
   CLEAR_FLAG (op, FLAG_SCARED);
 {
   object *tmp, *next;
   int stop = 0;
   int wvratio;
-  /* if you're flying, you cna't pick up anything */
+  /* if you're flying, you can't pick up anything */
   if (op->move_type & MOVE_FLYING)
     return 1;
   next = op->below;
     {
       LOG (llevError, "Object %s lacks a spell\n", &item->name);
       return;
     }
-  if (!op->change_weapon (item))
+  if (!op->apply (item))
     return;
   if (item->type == WAND)
     {
       if (item->stats.food <= 0)
   if (op->speed_left > 0.f)
     --op->speed_left;
   else
     return false;
-  if (!op->change_weapon (ob))
+  if (!op->apply (ob))
     return false;
   /* check for loss of invisiblity/hide */
   if (action_makes_visible (op))
     make_visible (op);
  * going to try and move (not fire weapons).
  */
 bool
 move_player_attack (object *op, int dir)
 {
-  if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
+  if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
     {
       --op->speed_left;
       return true;
     }
-  int on_battleground;
   sint16 nx = freearr_x[dir] + op->x;
   sint16 ny = freearr_y[dir] + op->y;
-  on_battleground = op_on_battleground (op, 0, 0);
   if (out_of_map (op->map, nx, ny))
     return false;
   /* If braced, or can't move to the square, and it is not out of the
         }
       else
         return false;
     }
+  bool on_battleground = op_on_battleground (op, 0, 0);
   /* in certain circumstances, you shouldn't attack friendly
    * creatures.  Note that if you are braced, you can't push
    * someone, but put it inside this loop so that you won't
    * attack them either.
    */
 {
   if (!op->map || op->map->in_memory != MAP_ACTIVE)
     return 0;
   /* Sanity check: make sure dir is valid */
-  if ((dir < 0) || (dir >= 9))
+  if (dir < 0 || dir >= 9)
     {
       LOG (llevError, "move_player: invalid direction %d\n", dir);
       return 0;
     }
         if (op->stats.hp < 0)
           op->stats.hp = op->stats.maxhp;
         if (op->stats.food < 0)
-          op->stats.food = 999;
+          op->stats.food = MAX_FOOD;
         op->update_stats ();
         return 1;
       }
   cure_disease (op, 0, 0);     /* remove any disease */
   max_it (op->stats.hp   , op->stats.maxhp);
   max_it (op->stats.sp   , op->stats.maxsp);
   max_it (op->stats.grace, op->stats.maxgrace);
-  if (op->stats.food <= 0)
+  max_it (op->stats.food , 200);
-    op->stats.food = 999;
   // remove all spell effects that are active
   // to avoid long-term effects such as word-of-recall
   for (object *item = op->inv; item; )
     {
               && tmp->name == shstr_battleground
               && EXIT_X (tmp) && EXIT_Y (tmp))
             {
               /* before we assign the exit, check if this is a teambattle */
               if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
-                {
-                  for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
+                for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
+                  if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
                     {
-                      if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
-                        {
-                          if (x && y)
+                      if (x && y)
-                            *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
+                        *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
-                          return 1;
+                      return 1;
-                        }
                     }
-                }
               if (x && y)
                 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
               return 1;
       new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
       who->insert (tmp);
     }
 }
-/**
- * Unready an object for a player. This function does nothing if the object was
- * not readied.
- */
-void
-player_unready_range_ob (player *pl, object *ob)
-{
-  if (pl->ob->current_weapon == ob)
-    pl->ob->current_weapon = 0;
-  if (pl->combat_ob == ob)
-    pl->combat_ob = 0;
-  if (pl->ranged_ob == ob)
-    pl->ranged_ob = 0;
-}
 //-GPL
 sint8
 player::darkness_at (maptile *map, int x, int y) const
 {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC vs. Revision 1.260 by root, Fri Apr 2 03:41:25 2010 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC vs.
Revision 1.260 by root, Fri Apr 2 03:41:25 2010 UTC