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

Comparing deliantra/server/server/rune.C (file contents):
Revision 1.55 by root, Mon Oct 29 23:55:55 2012 UTC vs.
Revision 1.59 by root, Wed Nov 14 20:34:58 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2003 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
 #ifndef sqr
 # define sqr(x) ((x)*(x))
 #endif
 /*  peterm:
  *  write_rune:
  *  op:  rune writer
  *  skop: skill object used for casting this rune
  *  dir:  orientation of rune, direction rune's contained spell will
  *	    be cast in, if applicable
  *  spell: spell object to put into the rune
  *  level:  level of casting of the rune
  *  runename:  name of the rune or message displayed by the rune for
  *		a rune of marking
  */
 int
 write_rune (object *op, object *caster, object *spell, int dir, const char *runename)
 {
   object *tmp, *rune_spell, *rune;
-  maptile *m;
-  sint16 nx, ny;
   if (!dir)
     dir = 1;
-  nx = op->x + freearr_x[dir];
+  mapxy pos (op);
-  ny = op->y + freearr_y[dir];
+  pos.move (dir);
-  m = op->map;
-  if (get_map_flags (m, &m, nx, ny, &nx, &ny) & (P_OUT_OF_MAP | P_SAFE | P_NO_MAGIC | P_NO_CLERIC))
+  if (!pos.normalise () || pos.ms ().flags () & (P_SAFE | P_NO_MAGIC | P_NO_CLERIC))
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Can't make a rune there!");
+      new_draw_info (NDI_UNIQUE, 0, op, "Your rune doesn't stick! H<You cannot place a rune on safe ground or outside the map.>");
       return 0;
     }
+  if (pos->blocks (op))
+    {
+      new_draw_info (NDI_UNIQUE, 0, op, "You cannot reach there! H<You cannot place a rune where you can't go.>");
+      return 0;
+    }
-  for (tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
+  for (tmp = pos->bot; tmp; tmp = tmp->above)
     if (tmp->type == RUNE)
       break;
   if (tmp)
     {
   rune->stats.Cha = rune->level / 2;    /* the invisibility parameter */
   rune->direction = dir;        /* where any spell will go upon detonation */
   rune->set_owner (op);         /* runes without need no owner */
   set_spell_skill (op, caster, spell, rune);
-  m->insert (rune, nx, ny, op);
+  pos.insert (rune, op);
   return 1;
 }
 /*  move_rune:  peterm
   comments on runes:
   if (op->invisible != det)
     update_object (op, UP_OBJ_CHANGE);
 }
 /*  peterm: rune_attack
  * function handles those runes which detonate but do not cast spells.
  */
 static void
 rune_attack (object *op, object *victim)
 {
   if (victim)
   else
     hit_map (op, 0, op->attacktype, 1);
 }
 /*  This function generalizes attacks by runes/traps.  This ought to make
  *  it possible for runes to attack from the inventory,
  *  it'll spring the trap on the victim.
  */
 void
 spring_trap (object *trap, object *victim)
 {
   if (victim && victim->type == PLAYER)
     new_draw_info (NDI_UNIQUE, 0, victim, trap->msg);
   /*  Flash an image of the trap on the map so the poor sod
    *   knows what hit him.
    */
   env = trap->outer_env_or_self ();
   /* If the victim is not next to this trap, don't set it off.
    * players shouldn't get hit by firing arrows at a door for example.
       trap->stats.food = 20;    /* make it stick around until its spells are gone */
       trap->set_flag (FLAG_IS_USED_UP);
     }
 }
 /* dispel_rune:  by peterm
  * dispels the target rune, depending on the level of the actor
  * and the level of the rune  risk flag, if true, means that there is
  * a chance that the trap/rune will detonate
  */
 int
 dispel_rune (object *op, object *caster, object *spell, object *skill, int dir)
 {
   object *tmp, *tmp2;
   int searchflag = 1, mflags;
   sint16 x, y;
   maptile *m;
-  x = op->x + freearr_x[dir];
+  x = op->x + DIRX (dir);
-  y = op->y + freearr_y[dir];
+  y = op->y + DIRY (dir);
   m = op->map;
   mflags = get_map_flags (m, &m, x, y, &x, &y);
   /* Should we perhaps not allow player to disable traps if a monster/
    * player is standing on top?
    */
   if (mflags & P_OUT_OF_MAP)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "There's nothing there!");
       return 0;
       return 0;
     }
 }
 /*  traps need to be adjusted for the difficulty of the map.  The
  * default traps are too strong for wimpy level 1 players, and
  * unthreatening to anyone of high level
  */
 void
 trap_adjust (object *trap, int difficulty)
 {
   int i;
   /* now we set the trap level to match the difficulty of the level
    * the formula below will give a level from 1 to (2*difficulty) with
    * a peak probability at difficulty
    */
   trap->level = rndm (0, difficulty - 1) + rndm (0, difficulty - 1);
   if (trap->level < 1)
     trap->level = 1;

Diff Legend

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

Comparing deliantra/server/server/rune.C (file contents): Revision 1.55 by root, Mon Oct 29 23:55:55 2012 UTC vs. Revision 1.59 by root, Wed Nov 14 20:34:58 2018 UTC

Diff Legend

Comparing deliantra/server/server/rune.C (file contents):
Revision 1.55 by root, Mon Oct 29 23:55:55 2012 UTC vs.
Revision 1.59 by root, Wed Nov 14 20:34:58 2018 UTC