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.103 by root, Sun Apr 11 04:20:57 2010 UTC vs.
Revision 1.109 by root, Wed Jan 18 19:12:22 2012 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
… …
1129 || target->flag [FLAG_REFL_SPELL] 1129 || target->flag [FLAG_REFL_SPELL]
1130 || (!god && spell->stats.grace) 1130 || (!god && spell->stats.grace)
1131 || (god && target->title == god->name) 1131 || (god && target->title == god->name)
1132 || (god && target->race.contains (god->race))) 1132 || (god && target->race.contains (god->race)))
1133 { 1133 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1134 op->failmsg ("Your request is unheeded.");
1135 return 0; 1135 return 0;
1136 } 1136 }
1137 1137
1138 if (spell->other_arch) 1138 if (spell->other_arch)
1139 effect = spell->other_arch->instance (); 1139 effect = spell->other_arch->instance ();
… …
1147 { 1147 {
1148 if (tailor_god_spell (effect, op)) 1148 if (tailor_god_spell (effect, op))
1149 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op)); 1149 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1150 else 1150 else
1151 { 1151 {
1152 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1152 op->failmsg ("Your request is ignored.");
1153 return 0; 1153 return 0;
1154 } 1154 }
1155 } 1155 }
1156 1156
1157 /* size of the area of destruction */ 1157 /* size of the area of destruction */
… …
1264{ 1264{
1265 /* some things are unaffected... */ 1265 /* some things are unaffected... */
1266 if (op->path_denied & PATH_LIGHT) 1266 if (op->path_denied & PATH_LIGHT)
1267 return 0; 1267 return 0;
1268 1268
1269 object *tmp = get_archetype (FORCE_NAME); 1269 object *tmp = archetype::get (FORCE_NAME);
1270 tmp->speed = 0.01; 1270 tmp->set_speed (0.01);
1271 tmp->stats.food = time; 1271 tmp->stats.food = time;
1272 tmp->set_flag (FLAG_IS_USED_UP); 1272 tmp->set_flag (FLAG_IS_USED_UP);
1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1274 tmp = insert_ob_in_ob (tmp, op); 1274 tmp = insert_ob_in_ob (tmp, op);
1275 1275
… …
1337 object *tmp, *force; 1337 object *tmp, *force;
1338 1338
1339 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1339 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1340 if (!tmp) 1340 if (!tmp)
1341 { 1341 {
1342 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1342 op->failmsg ("There is no one in that direction to curse.");
1343 return 0; 1343 return 0;
1344 } 1344 }
1345 1345
1346 tmp = tmp->head_ (); 1346 tmp = tmp->head_ ();
1347 1347
… …
1362 } 1362 }
1363 } 1363 }
1364 1364
1365 if (!force) 1365 if (!force)
1366 { 1366 {
1367 force = get_archetype (FORCE_NAME); 1367 force = archetype::get (FORCE_NAME);
1368 force->subtype = FORCE_CHANGE_ABILITY; 1368 force->subtype = FORCE_CHANGE_ABILITY;
1369 1369
1370 if (spell_ob->race) 1370 if (spell_ob->race)
1371 force->name = spell_ob->race; 1371 force->name = spell_ob->race;
1372 else 1372 else
… …
1390 1390
1391 return 1; 1391 return 1;
1392 } 1392 }
1393 1393
1394 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1394 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1395 force->speed = 1.f;
1396 force->speed_left = -1.f; 1395 force->speed_left = -1.f;
1396 force->set_speed (1.f);
1397 force->set_flag (FLAG_APPLIED); 1397 force->set_flag (FLAG_APPLIED);
1398 1398
1399 if (god) 1399 if (god)
1400 { 1400 {
1401 if (spell_ob->last_grace) 1401 if (spell_ob->last_grace)
… …
1461 unordered_mapwalk (buf, op, -range, -range, range, range) 1461 unordered_mapwalk (buf, op, -range, -range, range, range)
1462 { 1462 {
1463 mapspace &ms = m->at (nx, ny); 1463 mapspace &ms = m->at (nx, ny);
1464 1464
1465 /* If there is nothing living on this space, no need to go further */ 1465 /* If there is nothing living on this space, no need to go further */
1466 if (!ms.flags () & P_IS_ALIVE) 1466 if (!(ms.flags () & P_IS_ALIVE))
1467 continue; 1467 continue;
1468 1468
1469 // players can only affect spaces that they can actually see 1469 // players can only affect spaces that they can actually see
1470 if (caster 1470 if (caster
1471 && caster->contr 1471 && caster->contr
… …
2008 if (infect_object (walk, disease, 1)) 2008 if (infect_object (walk, disease, 1))
2009 { 2009 {
2010 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name)); 2010 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2011 2011
2012 disease->destroy (); /* don't need this one anymore */ 2012 disease->destroy (); /* don't need this one anymore */
2013 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2013 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2014 return 1; 2014 return 1;
2015 } 2015 }
2016 2016
2017 disease->destroy (); 2017 disease->destroy ();
2018 } 2018 }

Diff Legend

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