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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.95 by elmex, Tue Jan 19 16:13:05 2010 UTC vs.
Revision 1.98 by root, Fri Mar 26 00:59:22 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
1300 else 1300 else
1301 op->skill = 0; 1301 op->skill = 0;
1302 1302
1303 op->change_skill (find_skill_by_name (op, op->skill)); 1303 op->change_skill (find_skill_by_name (op, op->skill));
1304 1304
1305 dynbuf buf;
1305 unordered_mapwalk (op, -range, -range, range, range) 1306 unordered_mapwalk (buf, op, -range, -range, range, range)
1306 { 1307 {
1307 mapspace &ms = m->at (nx, ny); 1308 mapspace &ms = m->at (nx, ny);
1308 1309
1309 if (ms.flags () & P_IS_ALIVE) 1310 if (ms.flags () & P_IS_ALIVE)
1310 for (object *next, *tmp = ms.bot; tmp; tmp = next) 1311 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1469 else if (god && spell->race == shstr_GOD_FRIEND) 1470 else if (god && spell->race == shstr_GOD_FRIEND)
1470 race = god->race; 1471 race = god->race;
1471 else 1472 else
1472 race = spell->race; 1473 race = spell->race;
1473 1474
1475 dynbuf buf;
1474 unordered_mapwalk (op, -range, -range, range, range) 1476 unordered_mapwalk (buf, op, -range, -range, range, range)
1475 { 1477 {
1476 mapspace &ms = m->at (nx, ny); 1478 mapspace &ms = m->at (nx, ny);
1477 1479
1478 /* If there is nothing living on this space, no need to go further */ 1480 /* If there is nothing living on this space, no need to go further */
1479 if (!ms.flags () & P_IS_ALIVE) 1481 if (!ms.flags () & P_IS_ALIVE)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines