[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.22 by root, Fri May 11 20:06:33 2007 UTC vs.
Revision 1.25 by root, Sat May 12 16:06:42 2007 UTC

           if (castnow)
             cast_spell (op, op, op->facing, spob, cp);
           else
             {
-              if (op->contr->ranged_ob)
-                apply_special (op, op->contr->ranged_ob, AP_UNAPPLY);
               op->contr->ranged_ob = spob;
               assign (op->contr->spellparam, cp ? cp : "");
               new_draw_info_format (NDI_UNIQUE, 0, op, "You ready the spell %s", &spob->name);
             }
 /**************************************************************************/
 void
 change_spell (object *op, char k)
 {
+  if (op->contr->combat_ob == op->current_weapon)
+    {
+      if (op->contr->ranged_ob)
+        op->change_weapon (op->contr->ranged_ob);
+    }
+  else if (op->contr->ranged_ob == op->current_weapon)
+    {
+      if (op->contr->combat_ob)
+        op->change_weapon (op->contr->combat_ob);
+    }
   //TODO: maybe switch to golem, if any?
-  // does nothing
 }
 int
 command_rotateshoottype (object *op, char *params)
 {

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