--- deliantra/server/server/spell_attack.C 2009/09/01 22:40:26 1.85
+++ deliantra/server/server/spell_attack.C 2010/04/11 00:34:06 1.102
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002-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 GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -38,7 +39,7 @@
* but moved here so it could be applied to bolts too
* op is the spell object.
*/
-void
+static void
check_spell_knockback (object *op)
{
int weight_move;
@@ -60,7 +61,7 @@
int num_sections = 1;
/* don't move DM */
- if (QUERY_FLAG (tmp, FLAG_WIZ))
+ if (tmp->flag [FLAG_WIZ])
return;
/* don't move parts of objects */
@@ -68,7 +69,7 @@
continue;
/* don't move floors or immobile objects */
- if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
+ if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
continue;
/* count the object's sections */
@@ -94,7 +95,7 @@
* I don't see us doing anything useful with that information
* right now.
*/
- move_object (tmp, absdir (op->stats.sp));
+ tmp->move (absdir (op->stats.sp));
}
}
@@ -109,7 +110,7 @@
/* Causes op to fork. op is the original bolt, tmp
* is the first piece of the fork.
*/
-void
+static void
forklightning (object *op, object *tmp)
{
int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
@@ -195,7 +196,7 @@
*/
if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
{
- if (!QUERY_FLAG (op, FLAG_REFLECTING))
+ if (!op->flag [FLAG_REFLECTING])
return;
/* Since walls don't run diagonal, if the bolt is in
@@ -278,7 +279,7 @@
if (!spob->other_arch)
return 0;
- tmp = arch_to_object (spob->other_arch);
+ tmp = spob->other_arch->instance ();
if (tmp == NULL)
return 0;
@@ -295,7 +296,7 @@
tmp->stats.Con = spob->stats.Con;
tmp->direction = dir;
- if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
+ if (tmp->flag [FLAG_IS_TURNABLE])
SET_ANIMATION (tmp, dir);
tmp->set_owner (op);
@@ -317,7 +318,7 @@
if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
{
- if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
+ if (!tmp->flag [FLAG_REFLECTING])
{
tmp->drop_and_destroy ();
return 0;
@@ -390,7 +391,7 @@
* poison cloud ball, etc. op is the object to
* explode.
*/
-void
+static void
explode_bullet (object *op)
{
object *tmp, *owner;
@@ -440,7 +441,7 @@
}
/* other_arch contains what this explodes into */
- tmp = arch_to_object (op->other_arch);
+ tmp = op->other_arch->instance ();
tmp->set_owner (op);
tmp->skill = op->skill;
@@ -522,14 +523,14 @@
for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
{
- if (QUERY_FLAG (tmp, FLAG_ALIVE))
+ if (tmp->flag [FLAG_ALIVE])
{
dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
// TODO: can't understand the following if's
if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
{
- if (!QUERY_FLAG (op, FLAG_REMOVED))
+ if (!op->flag [FLAG_REMOVED])
{
op->destroy ();
return;
@@ -547,10 +548,6 @@
void
move_bullet (object *op)
{
- sint16 new_x, new_y;
- int mflags;
- maptile *m;
-
#if 0
/* We need a better general purpose way to do this */
@@ -575,18 +572,20 @@
return;
}
- new_x = op->x + DIRX (op);
- new_y = op->y + DIRY (op);
- m = op->map;
- mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
+ mapxy pos (op);
+ pos.move (op->direction);
- if (mflags & P_OUT_OF_MAP)
+ if (!pos.normalise ())
{
op->destroy ();
return;
}
- if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
+ mapspace &ms = pos.ms ();
+
+ ms.update ();
+
+ if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
{
if (op->other_arch)
explode_bullet (op);
@@ -596,7 +595,7 @@
return;
}
- if (!(op = m->insert (op, new_x, new_y, op)))
+ if (!(op = pos.insert (op, op)))
return;
if (reflwall (op->map, op->x, op->y, op))
@@ -643,7 +642,7 @@
tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
tmp->direction = dir;
- if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
+ if (tmp->flag [FLAG_IS_TURNABLE])
SET_ANIMATION (tmp, dir);
tmp->set_owner (op);
@@ -663,9 +662,22 @@
tmp->map = newmap;
+ // in case the bullet has direction 0 we explode it in place.
+ // direction 0 is possible for instance when a poison cloud trap springs.
+ if (tmp->direction == 0)
+ {
+ if (tmp->other_arch
+ && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
+ explode_bullet (tmp); // explode object will/should remove tmp
+ else
+ tmp->destroy ();
+
+ return 0;
+ }
+
if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
{
- if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
+ if (!tmp->flag [FLAG_REFLECTING])
{
tmp->destroy ();
return 0;
@@ -690,10 +702,10 @@
*****************************************************************************/
/* drops an object based on what is in the cone's "other_arch" */
-void
+static void
cone_drop (object *op)
{
- object *new_ob = arch_to_object (op->other_arch);
+ object *new_ob = op->other_arch->instance ();
new_ob->level = op->level;
new_ob->set_owner (op->owner);
@@ -719,7 +731,7 @@
}
/* lava saves it's life, but not yours :) */
- if (QUERY_FLAG (op, FLAG_LIFESAVE))
+ if (op->flag [FLAG_LIFESAVE])
{
hit_map (op, 0, op->attacktype, 0);
return;
@@ -810,7 +822,7 @@
if (!spell->other_arch)
return 0;
- if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD)
+ if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
{
new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!");
return 0;
@@ -864,7 +876,7 @@
continue;
success = 1;
- tmp = arch_to_object (spell->other_arch);
+ tmp = spell->other_arch->instance ();
tmp->set_owner (op);
set_spell_skill (op, caster, spell, tmp);
tmp->level = casting_level (caster, spell);
@@ -976,7 +988,7 @@
if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
continue;
- object *tmp = arch_to_object (at);
+ object *tmp = at->instance ();
tmp->direction = i;
tmp->range = op->range;
tmp->stats.dam = op->stats.dam;
@@ -986,7 +998,7 @@
if (op->skill && op->skill != tmp->skill)
tmp->skill = op->skill;
- if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
+ if (tmp->flag [FLAG_IS_TURNABLE])
SET_ANIMATION (tmp, i);
op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
@@ -1020,7 +1032,7 @@
}
}
- tmp = arch_to_object (spell->other_arch);
+ tmp = spell->other_arch->instance ();
/* level dependencies for bomb */
tmp->range = spell->range + SP_level_range_adjust (caster, spell);
@@ -1050,7 +1062,7 @@
* type is the type of spell - either SPELL_MANA or SPELL_GRACE.
* this info is used for blocked magic/unholy spaces.
*/
-object *
+static object *
get_pointed_target (object *op, int dir, int range, int type)
{
object *target;
@@ -1079,7 +1091,7 @@
if (mflags & P_IS_ALIVE)
for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
- if (QUERY_FLAG (target, FLAG_MONSTER))
+ if (target->flag [FLAG_MONSTER])
return target;
}
@@ -1124,7 +1136,7 @@
}
if (spell->other_arch)
- effect = arch_to_object (spell->other_arch);
+ effect = spell->other_arch->instance ();
else
return 0;
@@ -1151,7 +1163,7 @@
effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
/* casting death spells at undead isn't a good thing */
- if (QUERY_FLAG (target, FLAG_UNDEAD))
+ if (target->flag [FLAG_UNDEAD])
{
if (random_roll (0, 2, op, PREFER_LOW))
{
@@ -1247,7 +1259,7 @@
* make this work for non-living objects, we would have to
* give them the capability to have an inventory. b.t.
*/
-int
+static int
make_object_glow (object *op, int radius, int time)
{
/* some things are unaffected... */
@@ -1257,7 +1269,7 @@
object *tmp = get_archetype (FORCE_NAME);
tmp->speed = 0.01;
tmp->stats.food = time;
- SET_FLAG (tmp, FLAG_IS_USED_UP);
+ tmp->set_flag (FLAG_IS_USED_UP);
tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
tmp = insert_ob_in_ob (tmp, op);
@@ -1276,50 +1288,40 @@
bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
- /* destruction doesn't use another spell object, so we need
- * update op's skill pointer so that exp is properly awarded.
- */
- const shstr skill = op->skill;
-
- if (caster == op)
- op->skill = spell_ob->skill;
- else if (caster->skill)
- op->skill = caster->skill;
- else
- op->skill = 0;
-
- op->change_skill (find_skill_by_name (op, op->skill));
-
- unordered_mapwalk (op, -range, -range, range, range)
+ dynbuf buf;
+ unordered_mapwalk (buf, op, -range, -range, range, range)
{
mapspace &ms = m->at (nx, ny);
if (ms.flags () & P_IS_ALIVE)
- for (object *tmp = ms.bot; tmp; tmp = tmp->above)
- if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
- {
- tmp = tmp->head_ ();
+ for (object *next, *tmp = ms.bot; tmp; tmp = next)
+ {
+ next = tmp->above;
- if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
- || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
- {
- if (spell_ob->subtype == SP_DESTRUCTION)
- {
- hit_player (tmp, dam, op, spell_ob->attacktype, 0);
-
- if (spell_ob->other_arch)
- m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
- }
- else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
- {
- if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
- m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
- }
- }
- }
+ if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
+ {
+ tmp = tmp->head_ ();
+
+ if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
+ || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
+ {
+ if (spell_ob->subtype == SP_DESTRUCTION)
+ {
+ hit_player (tmp, dam, op, spell_ob->attacktype, 0);
+
+ if (spell_ob->other_arch)
+ m->insert (spell_ob->other_arch->instance (), nx, ny, op);
+ }
+ else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
+ {
+ if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
+ m->insert (spell_ob->other_arch->instance (), nx, ny, op);
+ }
+ }
+ }
+ }
}
- op->skill = skill;
return 1;
}
@@ -1328,7 +1330,6 @@
* CURSE
*
***************************************************************************/
-
int
cast_curse (object *op, object *caster, object *spell_ob, int dir)
{
@@ -1393,7 +1394,7 @@
force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
force->speed = 1.f;
force->speed_left = -1.f;
- SET_FLAG (force, FLAG_APPLIED);
+ force->set_flag (FLAG_APPLIED);
if (god)
{
@@ -1416,8 +1417,8 @@
change_abil (tmp, force); /* Mostly to display any messages */
insert_ob_in_ob (force, tmp);
tmp->update_stats ();
- return 1;
+ return 1;
}
/**********************************************************************
@@ -1456,7 +1457,8 @@
else
race = spell->race;
- unordered_mapwalk (op, -range, -range, range, range)
+ dynbuf buf;
+ unordered_mapwalk (buf, op, -range, -range, range, range)
{
mapspace &ms = m->at (nx, ny);
@@ -1485,7 +1487,7 @@
if (race && head->race && !strstr (race, head->race))
continue;
- if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
+ if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
continue;
/* Now do a bunch of stuff related to saving throws */
@@ -1528,7 +1530,7 @@
if (head->level > level)
continue;
- if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
+ if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
/* Failed, no effect */
continue;
}
@@ -1537,38 +1539,38 @@
done_one = 0;
/* aggravation */
- if (QUERY_FLAG (spell, FLAG_MONSTER))
+ if (spell->flag [FLAG_MONSTER])
{
- CLEAR_FLAG (head, FLAG_SLEEP);
+ head->clr_flag (FLAG_SLEEP);
remove_friendly_object (head);
done_one = 1;
head->enemy = op;
}
/* calm monsters */
- if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
+ if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
{
- SET_FLAG (head, FLAG_UNAGGRESSIVE);
+ head->set_flag (FLAG_UNAGGRESSIVE);
head->enemy = NULL;
done_one = 1;
}
/* berserk monsters */
- if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
+ if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
{
- SET_FLAG (head, FLAG_BERSERK);
+ head->set_flag (FLAG_BERSERK);
done_one = 1;
}
/* charm */
- if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
+ if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
{
INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
/* Prevent uncontrolled outbreaks of self replicating monsters.
Typical use case is charm, go somwhere, use aggravation to make hostile.
This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
- CLEAR_FLAG (head, FLAG_GENERATOR);
+ head->clr_flag (FLAG_GENERATOR);
head->set_owner (op);
set_spell_skill (op, caster, spell, head);
add_friendly_object (head);
@@ -1580,7 +1582,7 @@
/* If a monster was effected, put an effect in */
if (done_one && spell->other_arch)
- m->insert (arch_to_object (spell->other_arch), nx, ny, op);
+ m->insert (spell->other_arch->instance (), nx, ny, op);
}
return 1;
@@ -1673,7 +1675,7 @@
/* insert the other arch */
if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
- m->insert (arch_to_object (op->other_arch), hx, hy, op);
+ m->insert (op->other_arch->instance (), hx, hy, op);
}
/* restore to the center location and damage */
@@ -1879,7 +1881,7 @@
if (mflags & P_IS_ALIVE && spell->attacktype)
{
for (target = GET_MAP_OB (m, x, y); target; target = target->above)
- if (QUERY_FLAG (target, FLAG_MONSTER))
+ if (target->flag [FLAG_MONSTER])
{
/* oky doky. got a target monster. Lets make a blinding attack */
if (target->head)
@@ -1899,7 +1901,7 @@
}
/* ok, looks groovy to just insert a new light on the map */
- tmp = arch_to_object (spell->other_arch);
+ tmp = spell->other_arch->instance ();
if (!tmp)
{
LOG (llevError, "Error: spell arch for cast_light() missing.\n");
@@ -1916,7 +1918,7 @@
if (dir)
m->insert (tmp, x, y, op);
else
- caster->outer_env ()->insert (tmp);
+ caster->outer_env_or_self ()->insert (tmp);
return 1;
}
@@ -1973,9 +1975,9 @@
{
/* search this square for a victim */
for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
- if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
+ if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
{ /* found a victim */
- object *disease = arch_to_object (spell->other_arch);
+ object *disease = spell->other_arch->instance ();
disease->set_owner (op);
set_spell_skill (op, caster, spell, disease);
@@ -1983,59 +1985,32 @@
disease->level = casting_level (caster, spell);
/* do level adjustments */
- if (disease->stats.wc)
- disease->stats.wc += dur_mod / 2;
-
- if (disease->magic > 0)
- disease->magic += dur_mod / 8;
-
- if (disease->stats.maxhp > 0)
- disease->stats.maxhp += dur_mod;
-
- if (disease->stats.maxgrace > 0)
- disease->stats.maxgrace += dur_mod;
-
- if (disease->stats.dam)
- {
- if (disease->stats.dam > 0)
- disease->stats.dam += dam_mod;
- else
- disease->stats.dam -= dam_mod;
- }
+ if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
+ if (disease->magic > 0) disease->magic += dur_mod / 8;
+ if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
+ if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
if (disease->last_sp)
{
disease->last_sp -= 2 * dam_mod;
+
if (disease->last_sp < 1)
disease->last_sp = 1;
}
- if (disease->stats.maxsp)
- {
- if (disease->stats.maxsp > 0)
- disease->stats.maxsp += dam_mod;
- else
- disease->stats.maxsp -= dam_mod;
- }
-
- if (disease->stats.ac)
- disease->stats.ac += dam_mod;
-
- if (disease->last_eat)
- disease->last_eat -= dam_mod;
-
- if (disease->stats.hp)
- disease->stats.hp -= dam_mod;
-
- if (disease->stats.sp)
- disease->stats.sp -= dam_mod;
+ if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
+ if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
+ if (disease->stats.ac ) disease->stats.ac += dam_mod;
+ if (disease->last_eat ) disease->last_eat -= dam_mod;
+ if (disease->stats.hp ) disease->stats.hp -= dam_mod;
+ if (disease->stats.sp ) disease->stats.sp -= dam_mod;
if (infect_object (walk, disease, 1))
{
- new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
+ op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
disease->destroy (); /* don't need this one anymore */
- walk->map->insert (get_archetype ("detect_magic"), x, y, op);
+ walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
return 1;
}