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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.48 by root, Tue Apr 24 16:33:38 2007 UTC vs.
Revision 1.49 by root, Mon Apr 30 04:25:30 2007 UTC

2264 /* exit if it's not a player using this spell. */ 2264 /* exit if it's not a player using this spell. */
2265 if (op->type != PLAYER) 2265 if (op->type != PLAYER)
2266 return 0; 2266 return 0;
2267 2267
2268 /* if player already has a golem, abort */ 2268 /* if player already has a golem, abort */
2269 if (object *golem = op->contr->ranges[range_golem]) 2269 if (object *golem = op->contr->golem)
2270 { 2270 {
2271 control_golem (golem, dir); 2271 control_golem (golem, dir);
2272 return 0; 2272 return 0;
2273 } 2273 }
2274 2274
2326 CLEAR_FLAG (tmp, FLAG_MONSTER); 2326 CLEAR_FLAG (tmp, FLAG_MONSTER);
2327 tmp->stats.exp = 0; 2327 tmp->stats.exp = 0;
2328 add_friendly_object (tmp); 2328 add_friendly_object (tmp);
2329 tmp->type = GOLEM; 2329 tmp->type = GOLEM;
2330 tmp->set_owner (op); 2330 tmp->set_owner (op);
2331 op->contr->ranges[range_golem] = tmp; 2331 op->contr->golem = tmp;
2332 op->contr->shoottype = range_golem;
2333 set_spell_skill (op, caster, spell, tmp); 2332 set_spell_skill (op, caster, spell, tmp);
2334 2333
2335 /* Give the weapon to the golem now. A bit of a hack to check the 2334 /* Give the weapon to the golem now. A bit of a hack to check the
2336 * removed flag - it should only be set if get_split_object was 2335 * removed flag - it should only be set if get_split_object was
2337 * used above. 2336 * used above.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines