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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC vs.
Revision 1.264 by root, Sat May 15 23:41:05 2010 UTC

 static const struct apply_types_player_only : typeset
 {
   apply_types_player_only ()
   {
+    set (TRANSPORT);
     set (EXIT);
     set (BOOK);
     set (SIGN);
     set (BOOK);
     set (SKILLSCROLL);
  */
 static int
 prepare_weapon (object *op, object *improver, object *weapon)
 {
   int sacrifice_count, i;
-  char buf[MAX_BUF];
   if (weapon->level != 0)
     {
       op->failmsg ("Weapon is already prepared!");
       return 0;
     "Your sacrifice was accepted."
     "Your *%s may be improved %d times.",
     &weapon->name, weapon->level
   ));
-  sprintf (buf, "%s's %s", &op->name, &weapon->name);
+  weapon->name = weapon->name_pl = format ("%s's %s", &op->name, &weapon->name);
-  weapon->name = weapon->name_pl = buf;
   weapon->nrof = 0;             /*  prevents preparing n weapons in the same
                                    slot at once! */
   improver->decrease ();
   weapon->last_eat = 0;
   return 1;
        */
     }
   // elmex: only identify if we need to, for example so that generated money doesn't
   //        get an 'identified' flag so easily.
-  if (need_identify (item))
+  if (item->need_identify ())
     identify (item);
   insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
   return 1;
 }
           op->close_container ();
           return 1;
         }
       else if (!sack->env)
         {
-          // active, but not ours: some other player has opened it
+          // active on floor, but not ours: some other player has opened it
+          // normally this only happens to dms standing on the same space.
+          // but it doesn't hurt to handle it.
           op->failmsgf ("Somebody else is using the %s already.", query_name (sack));
           return 1;
         }
+    }
-      // fall through to opening it (active in inv)
+  // it's locked?
+  if (sack->slaying)
-    }
+    {
-  else if (sack->env)
+      if (object *tmp = find_key (op, op, sack))
+        {
+          op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
+        }
+      else
+        {
+          sack->flag [FLAG_APPLIED] = false; // might be applied in inv, let the user close it
+          esrv_update_item (UPD_FLAGS, op, sack);
+          op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
+          return 1;
+        }
+    }
+  if (sack->env && !sack->flag [FLAG_APPLIED])
     {
       // it is in our env, so activate it, do not open yet
       op->close_container ();
-      sack->flag [FLAG_APPLIED] = 1;
+      sack->flag [FLAG_APPLIED] = true;
       esrv_update_item (UPD_FLAGS, op, sack);
       op->statusmsg (format ("You ready %s.", query_name (sack)));
-      return 1;
-    }
-  // it's locked?
-  if (sack->slaying)
-    {
+    }
-      if (object *tmp = find_key (op, op, sack))
-        op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
-      else
+  else
-        {
-          op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
-          return 1;
-        }
-    }
-  op->open_container (sack);
+    op->open_container (sack);
   return 1;
 }
 /**
         who->flag [FLAG_READY_WEAPON] = false;
         // unapplying a weapon or skill tool should also unapply the skill it governs
         // but this is hard, as it shouldn't do so when the skill can
         // be used for other reasons
+        //TODO: really?
         if (who->chosen_skill)
           if (!who->chosen_skill->flag [FLAG_CAN_USE_SKILL])
-            unapply_special (who, op, 0);
+            unapply_special (who, who->chosen_skill, 0);
         break;
+      case RANGED:
       case BOW:
       case WAND:
       case ROD:
       case HORN:
-      case RANGED:
         if (player *pl = who->contr)
           {
             who->statusmsg (format ("You unready %s.", query_name (op)));
             change_abil (who, op);
           }
   /* if the player has a marked item, identify that if it needs to be
    * identified. If it doesn't, then go through the player inventory.
    */
   if (object *marked = pl->mark ())
-    if (!marked->flag [FLAG_IDENTIFIED] && need_identify (marked))
+    if (!marked->flag [FLAG_IDENTIFIED] && marked->need_identify ())
       {
         if (operate_altar (altar, &money, pl))
           {
             identify (marked);
           }
       }
   for (object *id = pl->inv; id; id = id->below)
     {
-      if (!id->flag [FLAG_IDENTIFIED] && !id->invisible && need_identify (id))
+      if (!id->flag [FLAG_IDENTIFIED] && !id->invisible && id->need_identify ())
         {
           if (operate_altar (altar, &money, pl))
             {
               identify (id);
 void
 move_apply (object *trap, object *victim, object *originator)
 {
   static int recursion_depth = 0;
+  trap = trap->head_ ();
   /* Only exits affect DMs. */
   if (victim->flag [FLAG_WIZPASS] && trap->type != EXIT && trap->type != SIGN)
     return;
   /* move_apply() is the most likely candidate for causing unwanted and
    * possibly unlimited recursion.
    */
   /* The following was changed because it was causing perfectly correct
    * maps to fail.  1)  it's not an error to recurse:
    * rune detonates, summoning monster.  monster lands on nearby rune.
    * nearby rune detonates.  This sort of recursion is expected and
    * proper.  This code was causing needless crashes.
            "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
       return;
     }
   recursion_depth++;
-  if (trap->head)
-    trap = trap->head;
   if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
     switch (trap->type)
       {
         case PLAYERMOVER:
               /* Just put in some sanity check.  I think there is a bug in the
                * above with some objects have zero speed, and thus the player
                * getting permanently paralyzed.
                */
-              if (victim->speed_left < -50.f)
+              victim->speed_left = max (-50.f, victim->speed_left);
-                victim->speed_left = -50.f;
               /*      LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
             }
           break;
         case SPINNER:
             check_improve_weapon (who, op);
             break;
           case CLOCK:
             {
-              char buf[MAX_BUF];
               timeofday_t tod;
               get_tod (&tod);
               who->play_sound (sound_find ("sound_clock"));
               who->statusmsg (format (
           case WEAPON:
             slot = &contr->combat_ob;
             oslot = contr->ranged_ob;
             break;
+          case RANGED:
           case BOW:
-          case RANGED:
           case SPELL:
           case WAND:
           case ROD:
           case HORN:
           case BUILDER:

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC vs. Revision 1.264 by root, Sat May 15 23:41:05 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC vs.
Revision 1.264 by root, Sat May 15 23:41:05 2010 UTC