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.106 by root, Sat Apr 23 04:56:57 2011 UTC vs.
Revision 1.107 by root, Sun May 1 16:58:17 2011 UTC

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->set_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);
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
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