ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/rune.C
(Generate patch)

Comparing deliantra/server/server/rune.C (file contents):
Revision 1.20 by root, Sun Feb 18 18:30:28 2007 UTC vs.
Revision 1.25 by root, Mon May 28 21:28:36 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <spells.h> 27#include <spells.h>
194 } 194 }
195 else 195 else
196 op->invisible = 1; 196 op->invisible = 1;
197 197
198 if (op->invisible != det) 198 if (op->invisible != det)
199 update_object (op, UP_OBJ_FACE); 199 update_object (op, UP_OBJ_CHANGE);
200} 200}
201
202 201
203/* peterm: rune_attack 202/* peterm: rune_attack
204 * function handles those runes which detonate but do not cast spells. 203 * function handles those runes which detonate but do not cast spells.
205 */ 204 */
206
207
208void 205void
209rune_attack (object *op, object *victim) 206rune_attack (object *op, object *victim)
210{ 207{
211 if (victim) 208 if (victim)
212 { 209 {
274 if (rv.distance > 1) 271 if (rv.distance > 1)
275 return; 272 return;
276 273
277 trap_show (trap, env); 274 trap_show (trap, env);
278 275
276 if (victim->type == PLAYER) // only count players as enemies
277 trap->enemy = victim; // set the victim as the traps enemy, so that summoned
278 // creatures know who to attack.
279
279 /* Only if it is a spell do we proceed here */ 280 /* Only if it is a spell do we proceed here */
280 if ((trap->inv && trap->inv->type == SPELL) || (trap->other_arch && trap->other_arch->clone.type == SPELL)) 281 if ((trap->inv && trap->inv->type == SPELL) || (trap->other_arch && trap->other_arch->clone.type == SPELL))
281 { 282 {
282 283
283 if (trap->destroyed ()) 284 if (trap->destroyed ())
410{ 411{
411 if (where == NULL) 412 if (where == NULL)
412 return 0; 413 return 0;
413 414
414 object *tmp = get_archetype ("runedet"); 415 object *tmp = get_archetype ("runedet");
415 tmp->face = &new_faces[GET_ANIMATION (trap, 0)]; 416 tmp->face = GET_ANIMATION (trap, 0);
416 tmp->insert_at (where, 0); 417 tmp->insert_at (where, 0);
417 418
418 return 1; 419 return 1;
419} 420}
420 421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines