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.50 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.53 by root, Tue Apr 22 07:01:47 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
948 if (op->env) 948 if (op->env)
949 { 949 {
950 if (env->map == NULL) 950 if (env->map == NULL)
951 return; 951 return;
952 952
953 if (env->type == PLAYER)
954 esrv_del_item (env->contr, op->count);
955
956 if (!(op = op->insert_at (env, op))) 953 if (!(op = op->insert_at (env, op)))
957 return; 954 return;
958 } 955 }
959 956
960 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 957 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
999} 996}
1000 997
1001int 998int
1002create_bomb (object *op, object *caster, int dir, object *spell) 999create_bomb (object *op, object *caster, int dir, object *spell)
1003{ 1000{
1004
1005 object *tmp; 1001 object *tmp;
1006 int mflags; 1002 int mflags;
1007 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1003 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1008 maptile *m; 1004 maptile *m;
1009 1005
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1007 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1008 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1009 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1014 return 0; 1010 return 0;
1015 } 1011 }
1012
1016 tmp = arch_to_object (spell->other_arch); 1013 tmp = arch_to_object (spell->other_arch);
1017 1014
1018 /* level dependencies for bomb */ 1015 /* level dependencies for bomb */
1019 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1016 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1020 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1017 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines