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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC vs.
Revision 1.191 by elmex, Thu Apr 24 10:42:22 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
       set_dragon_name (ob, abil, skin);
     }
   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
-  esrv_new_player (this, ob->weight + ob->carrying);
+  esrv_new_player (this);
   ob->update_stats ();
   ns->floorbox_update ();
   esrv_send_inventory (ob, ob);
 player::set_object (object *op)
 {
   ob = observe = op;
   ob->contr = this;              /* this aren't yet in archetype */
-  ob->speed          = 1.0f;
+  ob->speed      = 1.0f;
-  ob->speed_left     = 0.5f;
+  ob->speed_left = 0.5f;
-  ob->direction      = 5;            /* So player faces south */
+  ob->direction  = 5;            /* So player faces south */
   ob->flag [FLAG_READY_WEAPON] = false;
   ob->flag [FLAG_READY_SKILL]  = false;
   ob->flag [FLAG_READY_BOW]    = false;
  */
 void
 player::chargen_race_done ()
 {
   /* this must before then initial items are given */
-  esrv_new_player (ob->contr, ob->weight + ob->carrying);
+  esrv_new_player (ob->contr);
   treasurelist *tl = treasurelist::find ("starting_wealth");
   if (tl)
     create_treasure (tl, ob, 0, 0, 0);
           return;
         }
     }
   else if (item->type == ROD || item->type == HORN)
     {
-      if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
+      sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
+      // using the maximum of the rods charge allows at least one spell cast
+      // for a rod or horn, this fixes some broken rods.
+      if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
         {
           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));
                   CLEAR_FLAG (item, FLAG_ANIMATE);
                   item->face = item->arch->face;
                   item->set_speed (0);
                 }
-              if ((tmp = item->in_player ()))
+              if (object *pl = item->visible_to ())
-                esrv_update_item (UPD_ANIM, tmp, item);
+                esrv_update_item (UPD_ANIM, pl, item);
             }
         }
       else if (item->type == ROD || item->type == HORN)
         drain_rod_charge (item);
     }
           remove_door2 (door);  /* remove door without violence ;-) */
         }
       /* Do this after we print the message */
       key->decrease (); /* Use up one of the keys */
-      /* Need to update the weight the container the key was in */
-      if (container != op)
-        esrv_update_item (UPD_WEIGHT, op, container);
       return 1;                 /* Nothing more to do below */
     }
   else if (door->type == LOCKED_DOOR)
     {
     if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
       {
         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);
         tmp->destroy ();
         CLEAR_FLAG (op, FLAG_LIFESAVE);
         if (op->stats.hp < 0)
           op->stats.hp = op->stats.maxhp;
   return 0;
 }
 /* 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
+ * function will descend into containers. op is the object to start the search
  * from.
  */
 static void
 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' */
       if (QUERY_FLAG (op, FLAG_UNPAID))
-        {
-          if (env->type == PLAYER)
-            esrv_del_item (env->contr, op->count);
-          op->insert_at (env);
+        op->insert_at (env);
-        }
       else if (op->inv)
         drop_unpaid_items (op->inv, env);
       op = next;
     }
   else
     {
       /* generate misc. treasure */
       tmp = arch_to_object (tr->item);
       new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
-      tmp = insert_ob_in_ob (tmp, who);
+      who->insert (tmp);
-      if (who->type == PLAYER)
-        esrv_send_item (who, tmp);
     }
 }
 /**
  * Unready an object for a player. This function does nothing if the object was

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC vs. Revision 1.191 by elmex, Thu Apr 24 10:42:22 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC vs.
Revision 1.191 by elmex, Thu Apr 24 10:42:22 2008 UTC