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

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.19 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.44 by root, Fri Apr 2 03:41:24 2010 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation; either version 2 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program; if not, write to the Free Software
+ * and the GNU General Public License along with this program. If not, see
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * 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>
-int
-command_invoke (object *op, char *params)
-{
-  return command_cast_spell (op, params, 'i');
-}
-int
-command_cast (object *op, char *params)
-{
-  return command_cast_spell (op, params, 'c');
-}
-int
-command_prepare (object *op, char *params)
-{
-  return command_cast_spell (op, params, 'p');
-}
 /* 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.
  */
-int
+static int
 command_cast_spell (object *op, char *params, char command)
 {
   int castnow = 0;
   char *cp;
   object *spob;
   if (command == 'i')
     castnow = 1;
   /* Remove control of the golem */
-  if (object *golem = op->contr->ranges[range_golem])
+  if (object *golem = op->contr->golem)
-    golem->destroy ();
+    golem->drop_and_destroy ();
   if (params)
     {
       int spellnumber = 0;
                   cp++;
                   if (!strncmp (cp, "of ", 3))
                     cp += 3;
                 }
             }
-          else if (strlen (params) > (size_t) strlen (spob->name))
+          else if (strlen (params) > strlen (spob->name))
             {
               cp = params + strlen (spob->name);
               *cp = 0;
               cp++;
               if (!strncmp (cp, "of ", 3))
                 cp += 3;
             }
           else
             cp = NULL;
-          if (spob->skill && !find_skill_by_name (op, spob->skill))
+          if (!spob->skill)
             {
-              new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s!", &spob->skill, &spob->name);
+              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;
             }
           if (castnow)
             cast_spell (op, op, op->facing, spob, cp);
-          else
+          else if (op->apply (spob))
             {
-              op->contr->ranges[range_magic] = spob;
+              splay (spob);
-              op->contr->shoottype = range_magic;
               assign (op->contr->spellparam, cp ? cp : "");
-              new_draw_info_format (NDI_UNIQUE, 0, op, "You ready the spell %s", &spob->name);
             }
           return 0;
         }                       /* else fall through to below and print spells */
     }                           /* params supplied */
   /* We get here if cast was given without options or we could not find
    * the requested spell.  List all the spells the player knows.
    */
-  new_draw_info (NDI_UNIQUE, 0, op, "Cast what spell?  Choose one of:");
+  new_draw_info (NDI_UNIQUE, 0, op, "Cast what spell? Choose one of:");
   show_matching_spells (op, params);
   return 1;
 }
+int
+command_invoke (object *op, char *params)
+{
+  return command_cast_spell (op, params, 'i');
+}
+int
+command_cast (object *op, char *params)
+{
+  return command_cast_spell (op, params, 'c');
+}
+int
+command_prepare (object *op, char *params)
+{
+  return command_cast_spell (op, params, 'p');
+}
 /**************************************************************************/
-void
+static void
 change_spell (object *op, char k)
 {
-  int r = op->contr->shoottype;
+  if (op->contr->combat_ob && op->contr->ranged_ob)
+    op->change_weapon (
+      op->current_weapon == op->contr->combat_ob
+      ? op->contr->ranged_ob
+      : op->contr->combat_ob
+    );
-  do
+  //TODO: maybe switch to golem, if any?
-    r = (r + ((k == '+') ? 1 : -1) + range_size) % range_size;
-  while (!op->contr->legal_range ((rangetype) r));
-  op->contr->set_range ((rangetype) r);
-  /* Legal range has already checked that we have an appropriate item
-   * that uses the slot, so we don't need to be too careful about
-   * checking the status of the object.
-   */
-  switch (op->contr->shoottype)
-    {
-      case range_none:
-        new_draw_info (NDI_UNIQUE, 0, op, "No ranged attack chosen.");
-        break;
-      case range_golem:
-        new_draw_info (NDI_UNIQUE, 0, op, "You regain control of your golem.");
-        break;
-      case range_bow:
-        new_draw_info_format (NDI_UNIQUE, 0, op, "Switched to %s and %s.", query_name (op->contr->ranges[range_bow]),
-                              op->contr->ranges[range_bow]->race ? &op->contr->ranges[range_bow]->race : "nothing");
-        break;
-      case range_magic:
-        new_draw_info_format (NDI_UNIQUE, 0, op, "Switched to spells (%s).", &op->contr->ranges[range_magic]->name);
-        break;
-      case range_misc:
-        new_draw_info_format (NDI_UNIQUE, 0, op, "Switched to %s.", query_base_name (op->contr->ranges[range_misc], 0));
-        break;
-      case range_skill:
-        new_draw_info_format (NDI_UNIQUE, 0, op, "Switched to skill: %s", &op->chosen_skill->name);
-        break;
-    }
 }
 int
 command_rotateshoottype (object *op, char *params)
 {

Diff Legend

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

Comparing deliantra/server/server/c_range.C (file contents): Revision 1.19 by root, Sun Apr 29 21:44:35 2007 UTC vs. Revision 1.44 by root, Fri Apr 2 03:41:24 2010 UTC

Diff Legend

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.19 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.44 by root, Fri Apr 2 03:41:24 2010 UTC