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

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.42 by root, Fri Mar 26 00:59:22 2010 UTC vs.
Revision 1.52 by root, Wed Nov 21 12:12:03 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* This file deals with range related commands (casting, shooting,
  * throwing, etc.
 #include <global.h>
 #include <sproto.h>
 #include <spells.h>
 #include <skills.h>
-#include <commands.h>
 /* Shows all spells that op knows.  If params is supplied, the must match
  * that.  Given there is more than one skill, we can't supply break
  * them down to cleric/wizardry.
  */
         }
     }
 }
 /* sets up to cast a spell.  op is the caster, params is the spell name,
  * and command is the first letter of the spell type (c=cast, i=invoke,
  * p=prepare).  Invoke casts a spell immediately, where as cast (and I believe
  * prepare) just set up the range type.
  */
 static int
 command_cast_spell (object *op, char *params, char command)
       if ((spellnumber = atoi (params)))
         for (spob = op->inv; spob && spob->count != spellnumber; spob = spob->below)
           /* nop */;
       else
-        spob = lookup_spell_by_name (op, params);
+        spob = op->find_spell (params);
       if (spob && spob->type == SPELL)
         {
           /* Now grab any extra data, if there is any.  Forward pass
            * any 'of' delimiter
                 cp += 3;
             }
           else
             cp = NULL;
-          if (!spob->skill)
-            {
-              new_draw_info_format (NDI_UNIQUE, 0, op, "%s is a weird spell, please report it to the dungeon master!", &spob->name);
-              LOG (llevError, "spell without skill found: %s", spob->debug_desc ());
-              return 1;
-            }
-          object *skill = find_skill_by_name (op, spob->skill);
-          if (!skill)
-            {
-              op->failmsg (format ("You need the skill %s to cast %s!", &spob->skill, &spob->name));
-              return 1;
-            }
-          splay (spob);
           if (castnow)
             cast_spell (op, op, op->facing, spob, cp);
-          else
+          else if (op->apply (spob))
-            {
-              if (op->contr->ranged_ob)
-                if (op->contr->ranged_ob->flag [FLAG_APPLIED])
-                  apply_special (op, op->contr->ranged_ob, AP_UNAPPLY);
-                else
-                  op->contr->ranged_ob = 0;
-              if (op->contr->ranged_ob)
-                op->failmsg (format ("You have to unapply the %s first to ready a spell.", &op->contr->ranged_ob->name));
-              else
-                {
+            {
-                  op->change_weapon (op->contr->ranged_ob = spob);
+              splay (spob);
-                  assign (op->contr->spellparam, cp ? cp : "");
+              assign (op->contr->spellparam, cp ? cp : "");
-                  op->statusmsg (format ("You ready the spell %s", &spob->name));
-                }
             }
           return 0;
         }                       /* else fall through to below and print spells */
     }                           /* params supplied */
   return command_cast_spell (op, params, 'p');
 }
 /**************************************************************************/
-static void
+int
-change_spell (object *op, char k)
+command_rotateshoottype (object *op, char *params)
 {
-  if (op->contr->combat_ob == op->current_weapon)
+  if (op->contr->combat_ob && op->contr->ranged_ob)
-    {
+    op->apply (
+      op->current_weapon == op->contr->combat_ob
-      if (op->contr->ranged_ob)
+      ? 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->contr->combat_ob
-        op->change_weapon (op->contr->combat_ob);
+    );
-    }
   //TODO: maybe switch to golem, if any?
-}
-int
-command_rotateshoottype (object *op, char *params)
-{
-  if (!params)
-    change_spell (op, '+');
-  else
-    change_spell (op, params[0]);
   return 0;
 }

Diff Legend

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

Comparing deliantra/server/server/c_range.C (file contents): Revision 1.42 by root, Fri Mar 26 00:59:22 2010 UTC vs. Revision 1.52 by root, Wed Nov 21 12:12:03 2012 UTC

Diff Legend

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.42 by root, Fri Mar 26 00:59:22 2010 UTC vs.
Revision 1.52 by root, Wed Nov 21 12:12:03 2012 UTC