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.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.7 by root, Sun Sep 3 00:18:42 2006 UTC

1/* 1/*
2 * static char *rcsid_spell_attack_c = 2 * static char *rcsid_spell_attack_c =
3 * "$Id: spell_attack.C,v 1.1 2006/08/13 17:16:04 elmex Exp $"; 3 * "$Id: spell_attack.C,v 1.7 2006/09/03 00:18:42 root Exp $";
4 */ 4 */
5 5
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
… …
48 */ 48 */
49 49
50void check_spell_knockback(object *op) { 50void check_spell_knockback(object *op) {
51 object *tmp, *tmp2; /* object on the map */ 51 object *tmp, *tmp2; /* object on the map */
52 int weight_move; 52 int weight_move;
53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */ 53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */
54 54
55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/ 55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/
56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/ 56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/
57 return; 57 return;
58 }else{ 58 }else{
59 weight_move = op->weight +(op->weight * op->level) / 3; 59 weight_move = op->weight +(op->weight * op->level) / 3;
60 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level);*/ 60 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level);*/
61 } 61 }
62 62
63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) 63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above)
64 { 64 {
65 int num_sections = 1; 65 int num_sections = 1;
66 66
67 /* don't move DM */ 67 /* don't move DM */
68 if(QUERY_FLAG(tmp, FLAG_WIZ)) 68 if(QUERY_FLAG(tmp, FLAG_WIZ))
69 return; 69 return;
70 70
71 /* don't move parts of objects */ 71 /* don't move parts of objects */
72 if(tmp->head) continue; 72 if(tmp->head) continue;
73 73
74 /* don't move floors or immobile objects */ 74 /* don't move floors or immobile objects */
75 if(QUERY_FLAG(tmp,FLAG_IS_FLOOR)||(!QUERY_FLAG(tmp,FLAG_ALIVE)&&QUERY_FLAG(tmp,FLAG_NO_PICK))) continue; 75 if(QUERY_FLAG(tmp,FLAG_IS_FLOOR)||(!QUERY_FLAG(tmp,FLAG_ALIVE)&&QUERY_FLAG(tmp,FLAG_NO_PICK))) continue;
76 76
77 /* count the object's sections */ 77 /* count the object's sections */
78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++; 78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++;
79 79
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 80 /* I'm not sure if it makes sense to divide by num_sections - bigger
81 * objects should be harder to move, and we are moving the entire 81 * objects should be harder to move, and we are moving the entire
82 * object, not just the head, so the total weight should be relevant. 82 * object, not just the head, so the total weight should be relevant.
83 */ 83 */
84 84
85 /* surface area? -tm */ 85 /* surface area? -tm */
86 86
87 if (tmp->move_type & MOVE_FLYING) 87 if (tmp->move_type & MOVE_FLYING)
88 frictionmod = 1 ; /* flying objects loose the friction modifier */ 88 frictionmod = 1 ; /* flying objects loose the friction modifier */
89 89
90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */ 90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */
91 /* move_object is really for monsters, but looking at 91 /* move_object is really for monsters, but looking at
92 * the move_object function, it appears that it should 92 * the move_object function, it appears that it should
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 move_object(tmp, absdir(op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
104/*************************************************************************** 104/***************************************************************************
… …
121 /* pick a fork direction. tmp->stats.Con is the left bias 121 /* pick a fork direction. tmp->stats.Con is the left bias
122 * i.e., the chance in 100 of forking LEFT 122 * i.e., the chance in 100 of forking LEFT
123 * Should start out at 50, down to 25 for one already going left 123 * Should start out at 50, down to 25 for one already going left
124 * down to 0 for one going 90 degrees left off original path 124 * down to 0 for one going 90 degrees left off original path
125 */ 125 */
126 126
127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */ 127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */
128 new_dir = -1; 128 new_dir = -1;
129 129
130 /* check the new dir for a wall and in the map*/ 130 /* check the new dir for a wall and in the map*/
131 t_dir = absdir(tmp->direction + new_dir); 131 t_dir = absdir(tmp->direction + new_dir);
132 132
133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir], 133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir],
134 &sx, &sy) & P_OUT_OF_MAP) 134 &sx, &sy) & P_OUT_OF_MAP)
135 return; 135 return;
136 136
137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy))) 137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy)))
138 return; 138 return;
139 139
140 /* OK, we made a fork */ 140 /* OK, we made a fork */
141 new_bolt = get_object(); 141 new_bolt = get_object();
142
143 copy_object(tmp,new_bolt); 142 copy_object(tmp,new_bolt);
144 143
145 /* reduce chances of subsequent forking */ 144 /* reduce chances of subsequent forking */
146 new_bolt->stats.Dex -= 10; 145 new_bolt->stats.Dex -= 10;
147 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 146 tmp->stats.Dex -= 10; /* less forks from main bolt too */
… …
168 int mflags; 167 int mflags;
169 sint16 x, y; 168 sint16 x, y;
170 mapstruct *m; 169 mapstruct *m;
171 170
172 if(--(op->duration)<0) { 171 if(--(op->duration)<0) {
173 remove_ob(op); 172 remove_ob(op);
174 free_object(op); 173 free_object(op);
175 return; 174 return;
176 } 175 }
177 hit_map(op,0,op->attacktype,1); 176 hit_map(op,0,op->attacktype,1);
178 177
179 if(!op->direction) 178 if(!op->direction)
180 return; 179 return;
181 180
182 if (--op->range<0) { 181 if (--op->range<0) {
183 op->range=0; 182 op->range=0;
184 } else { 183 } else {
185 x = op->x+DIRX(op); 184 x = op->x+DIRX(op);
186 y = op->y+DIRY(op); 185 y = op->y+DIRY(op);
187 m = op->map; 186 m = op->map;
188 mflags = get_map_flags(m, &m, x, y, &x, &y); 187 mflags = get_map_flags(m, &m, x, y, &x, &y);
189 188
190 if (mflags & P_OUT_OF_MAP) return; 189 if (mflags & P_OUT_OF_MAP) return;
191 190
192 /* We are about to run into something - we may bounce */ 191 /* We are about to run into something - we may bounce */
193 /* Calling reflwall is pretty costly, as it has to look at all the objects 192 /* Calling reflwall is pretty costly, as it has to look at all the objects
194 * on the space. So only call reflwall if we think the data it returns 193 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 194 * will be useful.
196 */ 195 */
197 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) || 196 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) ||
198 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) { 197 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) {
199 198
200 if(!QUERY_FLAG(op, FLAG_REFLECTING)) 199 if(!QUERY_FLAG(op, FLAG_REFLECTING))
201 return; 200 return;
202 201
203 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
204 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
205 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
206 * on the diagonal, it is trickier - eg, a bolt travelling 205 * on the diagonal, it is trickier - eg, a bolt travelling
207 * northwest bounces different if it hits a north/south 206 * northwest bounces different if it hits a north/south
208 * wall (bounces to northeast) vs an east/west (bounces 207 * wall (bounces to northeast) vs an east/west (bounces
209 * to the southwest. 208 * to the southwest.
210 */ 209 */
211 if(op->direction&1) 210 if(op->direction&1)
212 op->direction=absdir(op->direction+4); 211 op->direction=absdir(op->direction+4);
213 else { 212 else {
214 int left, right; 213 int left, right;
215 int mflags; 214 int mflags;
216 215
217 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 216 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling
218 * over a corner in a tiled map, it is possible that 217 * over a corner in a tiled map, it is possible that
219 * op->direction is within an adjacent map but either 218 * op->direction is within an adjacent map but either
220 * op->direction-1 or op->direction+1 does not exist. 219 * op->direction-1 or op->direction+1 does not exist.
221 */ 220 */
222 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)], 221 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)],
223 op->y+freearr_y[absdir(op->direction-1)], &x, &y); 222 op->y+freearr_y[absdir(op->direction-1)], &x, &y);
224 223
225 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
226 225
227 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)], 226 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)],
228 op->y+freearr_y[absdir(op->direction+1)], &x, &y); 227 op->y+freearr_y[absdir(op->direction+1)], &x, &y);
229 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 228 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
230 229
231 if(left==right) 230 if(left==right)
232 op->direction=absdir(op->direction+4); 231 op->direction=absdir(op->direction+4);
233 else if(left) 232 else if(left)
234 op->direction=absdir(op->direction+2); 233 op->direction=absdir(op->direction+2);
235 else if(right) 234 else if(right)
236 op->direction=absdir(op->direction-2); 235 op->direction=absdir(op->direction-2);
237 } 236 }
238 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */ 237 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */
239 return; 238 return;
240 } 239 }
241 else { /* Create a copy of this object and put it ahead */ 240 else { /* Create a copy of this object and put it ahead */
242 tmp=get_object(); 241 tmp=get_object();
243 copy_object(op,tmp); 242 copy_object(op,tmp);
244 tmp->speed_left= -0.1; 243 tmp->speed_left= -0.1;
245 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp); 244 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp);
246 tmp = insert_ob_in_map(tmp,op->map,op,0); 245 tmp = insert_ob_in_map(tmp,op->map,op,0);
247 /* To make up for the decrease at the top of the function */ 246 /* To make up for the decrease at the top of the function */
248 tmp->duration++; 247 tmp->duration++;
249 248
250 /* New forking code. Possibly create forks of this object 249 /* New forking code. Possibly create forks of this object
251 * going off in other directions. 250 * going off in other directions.
252 */ 251 */
253 252
254 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */ 253 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */
255 forklightning(op,tmp); 254 forklightning(op,tmp);
256 } 255 }
257 /* In this way, the object left behind sticks on the space, but 256 /* In this way, the object left behind sticks on the space, but
258 * doesn't create any bolts that continue to move onward. 257 * doesn't create any bolts that continue to move onward.
259 */ 258 */
260 op->range = 0; 259 op->range = 0;
261 } /* copy object and move it along */ 260 } /* copy object and move it along */
262 } /* if move bolt along */ 261 } /* if move bolt along */
263} 262}
264 263
265/* fire_bolt 264/* fire_bolt
266 * object op (cast from caster) files a bolt in dir. 265 * object op (cast from caster) files a bolt in dir.
… …
274int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) { 273int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) {
275 object *tmp=NULL; 274 object *tmp=NULL;
276 int mflags; 275 int mflags;
277 276
278 if (!spob->other_arch) 277 if (!spob->other_arch)
279 return 0; 278 return 0;
280 279
281 tmp=arch_to_object(spob->other_arch); 280 tmp=arch_to_object(spob->other_arch);
282 if(tmp==NULL) 281 if(tmp==NULL)
283 return 0; 282 return 0;
284 283
285 /* peterm: level dependency for bolts */ 284 /* peterm: level dependency for bolts */
286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 285 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
287 tmp->attacktype = spob->attacktype; 286 tmp->attacktype = spob->attacktype;
288 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 287 if (spob->slaying) tmp->slaying = spob->slaying;
289 tmp->range = spob->range + SP_level_range_adjust(caster,spob); 288 tmp->range = spob->range + SP_level_range_adjust(caster,spob);
290 tmp->duration = spob->duration + SP_level_duration_adjust(caster,spob); 289 tmp->duration = spob->duration + SP_level_duration_adjust(caster,spob);
291 tmp->stats.Dex = spob->stats.Dex; 290 tmp->stats.Dex = spob->stats.Dex;
292 tmp->stats.Con = spob->stats.Con; 291 tmp->stats.Con = spob->stats.Con;
293 292
294 tmp->direction=dir; 293 tmp->direction=dir;
295 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 294 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
296 SET_ANIMATION(tmp, dir); 295 SET_ANIMATION(tmp, dir);
297 296
298 set_owner(tmp,op); 297 set_owner(tmp,op);
299 set_spell_skill(op, caster, spob, tmp); 298 set_spell_skill(op, caster, spob, tmp);
300 299
301 tmp->x=op->x + DIRX(tmp); 300 tmp->x=op->x + DIRX(tmp);
302 tmp->y=op->y + DIRY(tmp); 301 tmp->y=op->y + DIRY(tmp);
303 tmp->map = op->map; 302 tmp->map = op->map;
304 303
305 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 304 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
306 if (mflags & P_OUT_OF_MAP) { 305 if (mflags & P_OUT_OF_MAP) {
307 free_object(tmp); 306 free_object(tmp);
308 return 0; 307 return 0;
309 } 308 }
310 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 309 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
311 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 310 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
312 free_object(tmp); 311 free_object(tmp);
313 return 0; 312 return 0;
314 } 313 }
315 tmp->x=op->x; 314 tmp->x=op->x;
316 tmp->y=op->y; 315 tmp->y=op->y;
317 tmp->direction=absdir(tmp->direction+4); 316 tmp->direction=absdir(tmp->direction+4);
318 tmp->map = op->map; 317 tmp->map = op->map;
319 } 318 }
320 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) 319 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL)
321 move_bolt (tmp); 320 move_bolt (tmp);
322 return 1; 321 return 1;
323} 322}
… …
338 object *tmp; 337 object *tmp;
339 mapstruct *m=op->map; 338 mapstruct *m=op->map;
340 int i; 339 int i;
341 340
342 if(--(op->duration)<0) { 341 if(--(op->duration)<0) {
343 remove_ob(op); 342 remove_ob(op);
344 free_object(op); 343 free_object(op);
345 return; 344 return;
346 } 345 }
347 hit_map(op,0,op->attacktype,0); 346 hit_map(op,0,op->attacktype,0);
348 347
349 if(op->range>0) { 348 if(op->range>0) {
350 for(i=1;i<9;i++) { 349 for(i=1;i<9;i++) {
351 sint16 dx,dy; 350 sint16 dx,dy;
352 351
353 dx=op->x+freearr_x[i]; 352 dx=op->x+freearr_x[i];
354 dy=op->y+freearr_y[i]; 353 dy=op->y+freearr_y[i];
355 /* ok_to_put_more already does things like checks for walls, 354 /* ok_to_put_more already does things like checks for walls,
356 * out of map, etc. 355 * out of map, etc.
357 */ 356 */
358 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) { 357 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) {
359 tmp=get_object(); 358 tmp=get_object();
360 copy_object(op,tmp); 359 copy_object(op,tmp);
361 tmp->state=0; 360 tmp->state=0;
362 tmp->speed_left= -0.21; 361 tmp->speed_left= -0.21;
363 tmp->range--; 362 tmp->range--;
364 tmp->value=0; 363 tmp->value=0;
365 tmp->x=dx; 364 tmp->x=dx;
366 tmp->y=dy; 365 tmp->y=dy;
367 insert_ob_in_map(tmp,m,op,0); 366 insert_ob_in_map(tmp,m,op,0);
368 } 367 }
369 } 368 }
370 } 369 }
371} 370}
372 371
373 372
374/* Causes an object to explode, eg, a firebullet, 373/* Causes an object to explode, eg, a firebullet,
… …
379{ 378{
380 tag_t op_tag = op->count; 379 tag_t op_tag = op->count;
381 object *tmp, *owner; 380 object *tmp, *owner;
382 381
383 if (op->other_arch == NULL) { 382 if (op->other_arch == NULL) {
384 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 383 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
385 remove_ob (op); 384 remove_ob (op);
386 free_object (op); 385 free_object (op);
387 return; 386 return;
388 } 387 }
389 388
390 if (op->env) { 389 if (op->env) {
391 object *env; 390 object *env;
392 391
393 env = object_get_env_recursive(op); 392 env = object_get_env_recursive(op);
394 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) { 393 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) {
395 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 394 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
395 remove_ob (op);
396 free_object (op);
397 return;
398 }
396 remove_ob (op); 399 remove_ob (op);
397 free_object (op);
398 return;
399 }
400 remove_ob (op);
401 op->x = env->x; 400 op->x = env->x;
402 op->y = env->y; 401 op->y = env->y;
403 insert_ob_in_map(op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 402 insert_ob_in_map(op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
404 } else if (out_of_map (op->map, op->x, op->y)) { 403 } else if (out_of_map (op->map, op->x, op->y)) {
405 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 404 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
406 remove_ob (op); 405 remove_ob (op);
407 free_object (op); 406 free_object (op);
408 return; 407 return;
408 }
409
410 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
411 // NOTE: If this breaks something important: remove this. I can't think of anything
412 // bad at the moment that might happen from this.
413 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
414 {
415 remove_ob (op);
416 free_object (op);
417 return;
409 } 418 }
410 419
411 if (op->attacktype) { 420 if (op->attacktype) {
412 hit_map (op, 0, op->attacktype, 1); 421 hit_map (op, 0, op->attacktype, 1);
413 if (was_destroyed (op, op_tag)) 422 if (was_destroyed (op, op_tag))
414 return; 423 return;
415 } 424 }
416 425
417 /* other_arch contains what this explodes into */ 426 /* other_arch contains what this explodes into */
418 tmp = arch_to_object (op->other_arch); 427 tmp = arch_to_object (op->other_arch);
419 428
420 copy_owner (tmp, op); 429 copy_owner (tmp, op);
421 if (tmp->skill) FREE_AND_CLEAR_STR(tmp->skill); 430 tmp->skill = op->skill;
422 if (op->skill) tmp->skill = add_refcount(op->skill);
423 431
424 owner = get_owner(op); 432 owner = get_owner(op);
425 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 433 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner &&
426 !tailor_god_spell(tmp, owner)) { 434 !tailor_god_spell(tmp, owner)) {
427 remove_ob (op); 435 remove_ob (op);
428 free_object (op); 436 free_object (op);
429 return; 437 return;
430 } 438 }
431 tmp->x = op->x; 439 tmp->x = op->x;
432 tmp->y = op->y; 440 tmp->y = op->y;
433 441
434 /* special for bombs - it actually has sane values for these */ 442 /* special for bombs - it actually has sane values for these */
435 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 443 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) {
436 tmp->attacktype = op->attacktype; 444 tmp->attacktype = op->attacktype;
437 tmp->range = op->range; 445 tmp->range = op->range;
438 tmp->stats.dam = op->stats.dam; 446 tmp->stats.dam = op->stats.dam;
439 tmp->duration = op->duration; 447 tmp->duration = op->duration;
440 } else { 448 } else {
441 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 449 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC;
442 /* Spell doc describes what is going on here */ 450 /* Spell doc describes what is going on here */
443 tmp->stats.dam = op->dam_modifier; 451 tmp->stats.dam = op->dam_modifier;
444 tmp->range = op->stats.maxhp; 452 tmp->range = op->stats.maxhp;
445 tmp->duration = op->stats.hp; 453 tmp->duration = op->stats.hp;
446 /* Used for spell tracking - just need a unique val for this spell - 454 /* Used for spell tracking - just need a unique val for this spell -
447 * the count of the parent should work fine. 455 * the count of the parent should work fine.
448 */ 456 */
449 tmp->stats.maxhp = op->count; 457 tmp->stats.maxhp = op->count;
450 } 458 }
451 459
452 /* Set direction of cone explosion */ 460 /* Set direction of cone explosion */
453 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 461 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
454 tmp->stats.sp = op->direction; 462 tmp->stats.sp = op->direction;
455 463
456 /* Prevent recursion */ 464 /* Prevent recursion */
457 op->move_on = 0; 465 op->move_on = 0;
458 466
459 insert_ob_in_map(tmp, op->map, op, 0); 467 insert_ob_in_map(tmp, op->map, op, 0);
460 /* remove the firebullet */ 468 /* remove the firebullet */
461 if ( ! was_destroyed (op, op_tag)) { 469 if ( ! was_destroyed (op, op_tag)) {
462 remove_ob (op); 470 remove_ob (op);
463 free_object (op); 471 free_object (op);
464 } 472 }
465} 473}
466 474
467 475
468 476
… …
482 490
483 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy))) 491 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy)))
484 return; 492 return;
485 493
486 if (op->other_arch) { 494 if (op->other_arch) {
487 /* explode object will also remove op */ 495 /* explode object will also remove op */
488 explode_bullet (op); 496 explode_bullet (op);
489 return; 497 return;
490 } 498 }
491 499
492 /* If nothing alive on this space, no reason to do anything further */ 500 /* If nothing alive on this space, no reason to do anything further */
… …
498 tmp_tag = tmp->count; 506 tmp_tag = tmp->count;
499 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 507 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
500 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 508 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag)
501 || (op->stats.dam -= dam) < 0) 509 || (op->stats.dam -= dam) < 0)
502 { 510 {
503 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 511 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
504 remove_ob (op); 512 remove_ob (op);
505 free_object(op); 513 free_object(op);
506 return; 514 return;
507 } 515 }
508 } 516 }
509 } 517 }
510 } 518 }
511} 519}
512 520
… …
525 533
526#if 0 534#if 0
527 /* We need a better general purpose way to do this */ 535 /* We need a better general purpose way to do this */
528 536
529 /* peterm: added to make comet leave a trail of burnouts 537 /* peterm: added to make comet leave a trail of burnouts
530 it's an unadulterated hack, but the effect is cool. */ 538 it's an unadulterated hack, but the effect is cool. */
531 if(op->stats.sp == SP_METEOR) { 539 if(op->stats.sp == SP_METEOR) {
532 replace_insert_ob_in_map("fire_trail",op); 540 replace_insert_ob_in_map("fire_trail",op);
533 if (was_destroyed (op, op_tag)) 541 if (was_destroyed (op, op_tag))
534 return; 542 return;
535 } /* end addition. */ 543 } /* end addition. */
… …
537 545
538 /* Reached the end of its life - remove it */ 546 /* Reached the end of its life - remove it */
539 if (--op->range <=0) { 547 if (--op->range <=0) {
540 if (op->other_arch) { 548 if (op->other_arch) {
541 explode_bullet (op); 549 explode_bullet (op);
542 } else { 550 } else {
543 remove_ob (op); 551 remove_ob (op);
544 free_object (op); 552 free_object (op);
545 } 553 }
546 return; 554 return;
547 } 555 }
548 556
549 new_x = op->x + DIRX(op); 557 new_x = op->x + DIRX(op);
550 new_y = op->y + DIRY(op); 558 new_y = op->y + DIRY(op);
… …
596int fire_bullet(object *op,object *caster,int dir,object *spob) { 604int fire_bullet(object *op,object *caster,int dir,object *spob) {
597 object *tmp=NULL; 605 object *tmp=NULL;
598 int mflags; 606 int mflags;
599 607
600 if (!spob->other_arch) 608 if (!spob->other_arch)
601 return 0; 609 return 0;
602 610
603 tmp=arch_to_object(spob->other_arch); 611 tmp=arch_to_object(spob->other_arch);
604 if(tmp==NULL) 612 if(tmp==NULL)
605 return 0; 613 return 0;
606 614
607 /* peterm: level dependency for bolts */ 615 /* peterm: level dependency for bolts */
608 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 616 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
609 tmp->attacktype = spob->attacktype; 617 tmp->attacktype = spob->attacktype;
610 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 618 if (spob->slaying) tmp->slaying = spob->slaying;
611 619
612 tmp->range = 50; 620 tmp->range = 50;
613 621
614 /* Need to store duration/range for the ball to use */ 622 /* Need to store duration/range for the ball to use */
615 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob); 623 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob);
616 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 624 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob);
617 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob); 625 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob);
618 626
619 tmp->direction=dir; 627 tmp->direction=dir;
620 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 628 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
621 SET_ANIMATION(tmp, dir); 629 SET_ANIMATION(tmp, dir);
622 630
623 set_owner(tmp,op); 631 set_owner(tmp,op);
624 set_spell_skill(op, caster, spob, tmp); 632 set_spell_skill(op, caster, spob, tmp);
625 633
626 tmp->x=op->x + freearr_x[dir]; 634 tmp->x=op->x + freearr_x[dir];
627 tmp->y=op->y + freearr_y[dir]; 635 tmp->y=op->y + freearr_y[dir];
628 tmp->map = op->map; 636 tmp->map = op->map;
629 637
630 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 638 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
631 if (mflags & P_OUT_OF_MAP) { 639 if (mflags & P_OUT_OF_MAP) {
632 free_object(tmp); 640 free_object(tmp);
633 return 0; 641 return 0;
634 } 642 }
635 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 643 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
636 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 644 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
637 free_object(tmp); 645 free_object(tmp);
638 return 0; 646 return 0;
639 } 647 }
640 tmp->x=op->x; 648 tmp->x=op->x;
641 tmp->y=op->y; 649 tmp->y=op->y;
642 tmp->direction=absdir(tmp->direction+4); 650 tmp->direction=absdir(tmp->direction+4);
643 tmp->map = op->map; 651 tmp->map = op->map;
644 } 652 }
645 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) { 653 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) {
646 check_bullet (tmp); 654 check_bullet (tmp);
647 } 655 }
648 return 1; 656 return 1;
649} 657}
650 658
651 659
… …
667 new_ob->level = op->level; 675 new_ob->level = op->level;
668 set_owner(new_ob,op->owner); 676 set_owner(new_ob,op->owner);
669 677
670 /* preserve skill ownership */ 678 /* preserve skill ownership */
671 if(op->skill && op->skill != new_ob->skill) { 679 if(op->skill && op->skill != new_ob->skill) {
672 if (new_ob->skill) free_string(new_ob->skill); 680 new_ob->skill = op->skill;
673 new_ob->skill = add_refcount(op->skill);
674 } 681 }
675 insert_ob_in_map(new_ob,op->map,op,0); 682 insert_ob_in_map(new_ob,op->map,op,0);
676 683
677} 684}
678 685
… …
682 int i; 689 int i;
683 tag_t tag; 690 tag_t tag;
684 691
685 /* if no map then hit_map will crash so just ignore object */ 692 /* if no map then hit_map will crash so just ignore object */
686 if (! op->map) { 693 if (! op->map) {
687 LOG(llevError,"Tried to move_cone object %s without a map.\n", 694 LOG(llevError,"Tried to move_cone object %s without a map.\n",
688 op->name ? op->name : "unknown"); 695 op->name ? &op->name : "unknown");
689 op->speed = 0; 696 op->speed = 0;
690 update_ob_speed (op); 697 update_ob_speed (op);
691 return; 698 return;
692 } 699 }
693 700
694 /* lava saves it's life, but not yours :) */ 701 /* lava saves it's life, but not yours :) */
695 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) {
696 hit_map(op,0,op->attacktype,0); 703 hit_map(op,0,op->attacktype,0);
697 return; 704 return;
698 } 705 }
699 706
700#if 0 707#if 0
701 /* Disable this - enabling it makes monsters easier, as 708 /* Disable this - enabling it makes monsters easier, as
702 * when their cone dies when they die. 709 * when their cone dies when they die.
703 */ 710 */
704 /* If no owner left, the spell dies out. */ 711 /* If no owner left, the spell dies out. */
705 if(get_owner(op)==NULL) { 712 if(get_owner(op)==NULL) {
706 remove_ob(op); 713 remove_ob(op);
707 free_object(op); 714 free_object(op);
708 return; 715 return;
709 } 716 }
710#endif 717#endif
711 718
712 tag = op->count; 719 tag = op->count;
713 hit_map(op,0,op->attacktype,0); 720 hit_map(op,0,op->attacktype,0);
… …
720 727
721 if (was_destroyed (op, tag)) 728 if (was_destroyed (op, tag))
722 return; 729 return;
723 730
724 if((op->duration--)<0) { 731 if((op->duration--)<0) {
725 remove_ob(op); 732 remove_ob(op);
726 free_object(op); 733 free_object(op);
727 return; 734 return;
728 } 735 }
729 /* Object has hit maximum range, so don't have it move 736 /* Object has hit maximum range, so don't have it move
730 * any further. When the duration above expires, 737 * any further. When the duration above expires,
731 * then the object will get removed. 738 * then the object will get removed.
732 */ 739 */
733 if (--op->range < 0) { 740 if (--op->range < 0) {
734 op->range=0; /* just so it doesn't wrap */ 741 op->range=0; /* just so it doesn't wrap */
735 return; 742 return;
736 } 743 }
737 744
738 for(i= -1;i<2;i++) { 745 for(i= -1;i<2;i++) {
739 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
740 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 747 y=op->y+freearr_y[absdir(op->stats.sp+i)];
741 748
742 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) { 749 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) {
743 object *tmp=get_object(); 750 object *tmp=get_object();
744 copy_object(op, tmp); 751 copy_object(op, tmp);
745 tmp->x=x; 752 tmp->x=x;
746 tmp->y=y; 753 tmp->y=y;
747 754
748 tmp->duration = op->duration + 1; 755 tmp->duration = op->duration + 1;
749 756
750 /* Use for spell tracking - see ok_to_put_more() */ 757 /* Use for spell tracking - see ok_to_put_more() */
751 tmp->stats.maxhp = op->stats.maxhp; 758 tmp->stats.maxhp = op->stats.maxhp;
752 insert_ob_in_map(tmp,op->map,op,0); 759 insert_ob_in_map(tmp,op->map,op,0);
753 if (tmp->other_arch) cone_drop(tmp); 760 if (tmp->other_arch) cone_drop(tmp);
754 } 761 }
755 } 762 }
756} 763}
757 764
758/* cast_cone: casts a cone spell. 765/* cast_cone: casts a cone spell.
759 * op: person firing the object. 766 * op: person firing the object.
… …
773 780
774 if (!spell->other_arch) return 0; 781 if (!spell->other_arch) return 0;
775 782
776 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) &&
777 op->attacktype & AT_TURN_UNDEAD) { 784 op->attacktype & AT_TURN_UNDEAD) {
778 new_draw_info(NDI_UNIQUE, 0,op, 785 new_draw_info(NDI_UNIQUE, 0,op,
779 "Your undead nature prevents you from turning undead!"); 786 "Your undead nature prevents you from turning undead!");
780 return 0; 787 return 0;
781 } 788 }
782 789
783 if(!dir) { 790 if(!dir) {
784 range_min= 0; 791 range_min= 0;
785 range_max=8; 792 range_max=8;
786 } 793 }
787 794
788 /* Need to know what the movetype of the object we are about 795 /* Need to know what the movetype of the object we are about
789 * to create is, so we can know if the space we are about to 796 * to create is, so we can know if the space we are about to
790 * insert it into is blocked. 797 * insert it into is blocked.
791 */ 798 */
792 movetype = spell->other_arch->clone.move_type; 799 movetype = spell->other_arch->clone.move_type;
793 800
794 for(i=range_min;i<=range_max;i++) { 801 for(i=range_min;i<=range_max;i++) {
795 sint16 x,y, d; 802 sint16 x,y, d;
796 803
797 /* We can't use absdir here, because it never returns 804 /* We can't use absdir here, because it never returns
798 * 0. If this is a rune, we want to hit the person on top 805 * 0. If this is a rune, we want to hit the person on top
799 * of the trap (d==0). If it is not a rune, then we don't want 806 * of the trap (d==0). If it is not a rune, then we don't want
800 * to hit that person. 807 * to hit that person.
801 */ 808 */
802 d = dir + i; 809 d = dir + i;
803 while (d < 0) d+=8; 810 while (d < 0) d+=8;
804 while (d > 8) d-=8; 811 while (d > 8) d-=8;
805 812
806 /* If it's not a rune, we don't want to blast the caster. 813 /* If it's not a rune, we don't want to blast the caster.
807 * In that case, we have to see - if dir is specified, 814 * In that case, we have to see - if dir is specified,
808 * turn this into direction 8. If dir is not specified (all 815 * turn this into direction 8. If dir is not specified (all
809 * direction) skip - otherwise, one line would do more damage 816 * direction) skip - otherwise, one line would do more damage
810 * becase 0 direction will go through 9 directions - necessary 817 * becase 0 direction will go through 9 directions - necessary
811 * for the rune code. 818 * for the rune code.
812 */ 819 */
813 if (caster->type != RUNE && d==0) { 820 if (caster->type != RUNE && d==0) {
814 if (dir!=0) d=8; 821 if (dir!=0) d=8;
815 else continue; 822 else continue;
816 } 823 }
817 824
818 x = op->x+freearr_x[d]; 825 x = op->x+freearr_x[d];
819 y = op->y+freearr_y[d]; 826 y = op->y+freearr_y[d];
820 827
821 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP) 828 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP)
822 continue; 829 continue;
823 830
824 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
825 continue; 832 continue;
826 833
827 success=1; 834 success=1;
828 tmp=arch_to_object(spell->other_arch); 835 tmp=arch_to_object(spell->other_arch);
829 set_owner(tmp,op); 836 set_owner(tmp,op);
830 set_spell_skill(op, caster, spell, tmp); 837 set_spell_skill(op, caster, spell, tmp);
831 tmp->level = caster_level (caster, spell); 838 tmp->level = caster_level (caster, spell);
832 tmp->x = sx; 839 tmp->x = sx;
833 tmp->y = sy; 840 tmp->y = sy;
834 tmp->attacktype=spell->attacktype; 841 tmp->attacktype=spell->attacktype;
835 842
836 /* holy word stuff */ 843 /* holy word stuff */
837 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) {
838 if(!tailor_god_spell(tmp,op)) return 0; 845 if(!tailor_god_spell(tmp,op)) return 0;
839 } 846 }
840 847
841 if(dir) 848 if(dir)
842 tmp->stats.sp=dir; 849 tmp->stats.sp=dir;
843 else 850 else
844 tmp->stats.sp=i; 851 tmp->stats.sp=i;
845 852
846 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 853 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
847 854
848 /* If casting it in all directions, it doesn't go as far */ 855 /* If casting it in all directions, it doesn't go as far */
849 if (dir == 0) { 856 if (dir == 0) {
850 tmp->range /= 4; 857 tmp->range /= 4;
851 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2;
852 } 859 }
853 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell); 860 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell);
854 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell);
855 862
856 /* Special bonus for fear attacks */ 863 /* Special bonus for fear attacks */
857 if (tmp->attacktype & AT_FEAR) { 864 if (tmp->attacktype & AT_FEAR) {
858 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha];
859 else 866 else
860 tmp->duration += caster->level/3; 867 tmp->duration += caster->level/3;
861 } 868 }
862 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) {
863 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5; 870 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5;
864 else 871 else
865 tmp->duration += caster->level/3; 872 tmp->duration += caster->level/3;
866 } 873 }
867 874
868 875
869 if ( !(tmp->move_type & MOVE_FLY_LOW)) 876 if ( !(tmp->move_type & MOVE_FLY_LOW))
870 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", 877 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n",
871 spell->other_arch->name); 878 &spell->other_arch->name);
872 879
873 if (!tmp->move_on && tmp->stats.dam) { 880 if (!tmp->move_on && tmp->stats.dam) {
874 LOG (llevDebug, 881 LOG (llevDebug,
875 "cast_cone(): arch %s doesn't have move_on set\n", 882 "cast_cone(): arch %s doesn't have move_on set\n",
876 spell->other_arch->name); 883 &spell->other_arch->name);
877 } 884 }
878 insert_ob_in_map(tmp,m,op,0); 885 insert_ob_in_map(tmp,m,op,0);
879 886
880 /* This is used for tracking spells so that one effect doesn't hit 887 /* This is used for tracking spells so that one effect doesn't hit
881 * a single space too many times. 888 * a single space too many times.
882 */ 889 */
883 tmp->stats.maxhp = tmp->count; 890 tmp->stats.maxhp = tmp->count;
884 891
885 if(tmp->other_arch) cone_drop(tmp); 892 if(tmp->other_arch) cone_drop(tmp);
886 } 893 }
887 return success; 894 return success;
888} 895}
889 896
890/**************************************************************************** 897/****************************************************************************
… …
901 int i; 908 int i;
902 object *env, *tmp; 909 object *env, *tmp;
903 archetype *at; 910 archetype *at;
904 911
905 if(op->state!=NUM_ANIMATIONS(op)-1) 912 if(op->state!=NUM_ANIMATIONS(op)-1)
906 return; 913 return;
914
907 915
908 env = object_get_env_recursive(op); 916 env = object_get_env_recursive(op);
909 917
910 if (op->env) { 918 if (op->env) {
911 if (env->map == NULL) 919 if (env->map == NULL)
912 return; 920 return;
913 921
914 if (env->type == PLAYER) 922 if (env->type == PLAYER)
915 esrv_del_item(env->contr, op->count); 923 esrv_del_item(env->contr, op->count);
916 924
917 remove_ob(op); 925 remove_ob(op);
918 op->x = env->x; 926 op->x = env->x;
919 op->y = env->y; 927 op->y = env->y;
920 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL) 928 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL)
929 return;
930 }
931
932 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
933 // on a safe map. I don't like this special casing, but it seems to be neccessary
934 // as bombs can be carried.
935 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
936 {
937 remove_ob (op);
938 free_object (op);
921 return; 939 return;
922 } 940 }
923 941
924 /* This copies a lot of the code from the fire bullet, 942 /* This copies a lot of the code from the fire bullet,
925 * but using the cast_bullet isn't really feasible, 943 * but using the cast_bullet isn't really feasible,
926 * so just set up the appropriate values. 944 * so just set up the appropriate values.
927 */ 945 */
928 at = find_archetype(SPLINT); 946 at = find_archetype(SPLINT);
929 if (at) { 947 if (at) {
930 for(i=1;i<9;i++) { 948 for(i=1;i<9;i++) {
931 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 949 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
932 continue; 950 continue;
933 tmp = arch_to_object(at); 951 tmp = arch_to_object(at);
934 tmp->direction = i; 952 tmp->direction = i;
935 tmp->range = op->range; 953 tmp->range = op->range;
936 tmp->stats.dam = op->stats.dam; 954 tmp->stats.dam = op->stats.dam;
937 tmp->duration = op->duration; 955 tmp->duration = op->duration;
938 tmp->attacktype = op->attacktype; 956 tmp->attacktype = op->attacktype;
939 copy_owner (tmp, op); 957 copy_owner (tmp, op);
940 if(op->skill && op->skill != tmp->skill) { 958 if(op->skill && op->skill != tmp->skill) {
941 if (tmp->skill) free_string(tmp->skill); 959 tmp->skill = op->skill;
942 tmp->skill = add_refcount(op->skill); 960 }
943 }
944 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 961 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
945 SET_ANIMATION(tmp, i); 962 SET_ANIMATION(tmp, i);
946 tmp->x = op->x + freearr_x[i]; 963 tmp->x = op->x + freearr_x[i];
947 tmp->y = op->y + freearr_x[i]; 964 tmp->y = op->y + freearr_x[i];
948 insert_ob_in_map(tmp, op->map, op, 0); 965 insert_ob_in_map(tmp, op->map, op, 0);
949 move_bullet(tmp); 966 move_bullet(tmp);
950 } 967 }
951 } 968 }
952 969
953 explode_bullet(op); 970 explode_bullet(op);
954} 971}
955 972
… …
960 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir]; 977 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
961 mapstruct *m; 978 mapstruct *m;
962 979
963 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 980 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy);
964 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) { 981 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) {
965 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way."); 982 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");
966 return 0; 983 return 0;
967 } 984 }
968 tmp=arch_to_object(spell->other_arch); 985 tmp=arch_to_object(spell->other_arch);
969 986
970 /* level dependencies for bomb */ 987 /* level dependencies for bomb */
971 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 988 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
… …
1004 mapstruct *mp; 1021 mapstruct *mp;
1005 1022
1006 if (dir==0) return NULL; 1023 if (dir==0) return NULL;
1007 1024
1008 for (dist=1; dist<range; dist++) { 1025 for (dist=1; dist<range; dist++) {
1009 x = op->x + freearr_x[dir] * dist; 1026 x = op->x + freearr_x[dir] * dist;
1010 y = op->y + freearr_y[dir] * dist; 1027 y = op->y + freearr_y[dir] * dist;
1011 mp = op->map; 1028 mp = op->map;
1012 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1029 mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
1013 1030
1014 if (mflags & P_OUT_OF_MAP) return NULL; 1031 if (mflags & P_OUT_OF_MAP) return NULL;
1015 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1032 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
1016 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1033 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
1017 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL; 1034 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL;
1018 1035
1019 if (mflags & P_IS_ALIVE) { 1036 if (mflags & P_IS_ALIVE) {
1020 for(target=get_map_ob(mp,x,y); target; target=target->above) { 1037 for(target=get_map_ob(mp,x,y); target; target=target->above) {
1021 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1038 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
1022 return target; 1039 return target;
1023 } 1040 }
1024 } 1041 }
1025 } 1042 }
1026 } 1043 }
1027 return NULL; 1044 return NULL;
1028} 1045}
1029 1046
1030 1047
… …
1061 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1078 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded.");
1062 return 0; 1079 return 0;
1063 } 1080 }
1064 1081
1065 if (spell->other_arch) 1082 if (spell->other_arch)
1066 effect = arch_to_object(spell->other_arch); 1083 effect = arch_to_object(spell->other_arch);
1067 else 1084 else
1068 return 0; 1085 return 0;
1069 1086
1070 /* tailor the effect by priest level and worshipped God */ 1087 /* tailor the effect by priest level and worshipped God */
1071 effect->level = caster_level (caster, spell); 1088 effect->level = caster_level (caster, spell);
1072 effect->attacktype = spell->attacktype; 1089 effect->attacktype = spell->attacktype;
1073 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1090 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) {
… …
1075 new_draw_info_format(NDI_UNIQUE,0,op, 1092 new_draw_info_format(NDI_UNIQUE,0,op,
1076 "%s answers your call!",determine_god(op)); 1093 "%s answers your call!",determine_god(op));
1077 else { 1094 else {
1078 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1095 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored.");
1079 return 0; 1096 return 0;
1080 } 1097 }
1081 } 1098 }
1082 1099
1083 /* size of the area of destruction */ 1100 /* size of the area of destruction */
1084 effect->range=spell->range + 1101 effect->range=spell->range +
1085 SP_level_range_adjust(caster,spell); 1102 SP_level_range_adjust(caster,spell);
1086 effect->duration=spell->duration + 1103 effect->duration=spell->duration +
1087 SP_level_range_adjust(caster,spell); 1104 SP_level_range_adjust(caster,spell);
1088 1105
1089 if (effect->attacktype & AT_DEATH) { 1106 if (effect->attacktype & AT_DEATH) {
1090 effect->level=spell->stats.dam + 1107 effect->level=spell->stats.dam +
1091 SP_level_dam_adjust(caster,spell); 1108 SP_level_dam_adjust(caster,spell);
1092 1109
1093 /* casting death spells at undead isn't a good thing */ 1110 /* casting death spells at undead isn't a good thing */
1094 if QUERY_FLAG(target, FLAG_UNDEAD) { 1111 if QUERY_FLAG(target, FLAG_UNDEAD) {
1095 if(random_roll(0, 2, op, PREFER_LOW)) { 1112 if(random_roll(0, 2, op, PREFER_LOW)) {
1096 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1113 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
1097 effect->x=op->x; 1114 effect->x=op->x;
1098 effect->y=op->y; 1115 effect->y=op->y;
1099 } else { 1116 } else {
1100 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!", 1117 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!",
1101 query_name(target)); 1118 query_name(target));
1102 target->stats.hp = target->stats.maxhp*2; 1119 target->stats.hp = target->stats.maxhp*2;
1103 free_object(effect); 1120 free_object(effect);
1104 return 0; 1121 return 0;
1105 } 1122 }
1106 } 1123 }
1107 } else { 1124 } else {
1108 /* how much woe to inflict :) */ 1125 /* how much woe to inflict :) */
1109 effect->stats.dam=spell->stats.dam + 1126 effect->stats.dam=spell->stats.dam +
1110 SP_level_dam_adjust(caster,spell); 1127 SP_level_dam_adjust(caster,spell);
1111 } 1128 }
1112 1129
1113 set_owner(effect,op); 1130 set_owner(effect,op);
1114 set_spell_skill(op, caster, spell, effect); 1131 set_spell_skill(op, caster, spell, effect);
… …
1135 object *owner; 1152 object *owner;
1136 sint16 new_x, new_y; 1153 sint16 new_x, new_y;
1137 mapstruct *m; 1154 mapstruct *m;
1138 1155
1139 if (op->range-- <=0) { 1156 if (op->range-- <=0) {
1140 remove_ob(op); 1157 remove_ob(op);
1141 free_object(op); 1158 free_object(op);
1142 return; 1159 return;
1143 } 1160 }
1144 1161
1145 owner = get_owner(op); 1162 owner = get_owner(op);
1146#if 0 1163#if 0
1147 /* It'd make things nastier if this wasn't here - spells cast by 1164 /* It'd make things nastier if this wasn't here - spells cast by
1148 * monster that are then killed would continue to survive 1165 * monster that are then killed would continue to survive
1149 */ 1166 */
1150 if (owner == NULL) { 1167 if (owner == NULL) {
1151 remove_ob(op); 1168 remove_ob(op);
1152 free_object(op); 1169 free_object(op);
1153 return; 1170 return;
1154 } 1171 }
1155#endif 1172#endif
1156 1173
1157 new_x = op->x + DIRX(op); 1174 new_x = op->x + DIRX(op);
1158 new_y = op->y + DIRY(op); 1175 new_y = op->y + DIRY(op);
1159 1176
1160 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y); 1177 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y);
1161 1178
1162 if (!(mflags & P_OUT_OF_MAP) && 1179 if (!(mflags & P_OUT_OF_MAP) &&
1163 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) { 1180 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) {
1164 tag_t tag = op->count; 1181 tag_t tag = op->count;
1165 hit_map (op, op->direction, AT_MAGIC, 1); 1182 hit_map (op, op->direction, AT_MAGIC, 1);
1166 /* Basically, missile only hits one thing then goes away. 1183 /* Basically, missile only hits one thing then goes away.
1167 * we need to remove it if someone hasn't already done so. 1184 * we need to remove it if someone hasn't already done so.
1168 */ 1185 */
1169 if ( ! was_destroyed (op, tag)) { 1186 if ( ! was_destroyed (op, tag)) {
1170 remove_ob (op); 1187 remove_ob (op);
1171 free_object(op); 1188 free_object(op);
1172 } 1189 }
1173 return; 1190 return;
1174 } 1191 }
1175 1192
1176 remove_ob(op); 1193 remove_ob(op);
1177 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1194 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
1178 free_object(op); 1195 free_object(op);
1179 return; 1196 return;
1180 } 1197 }
1181 op->x = new_x; 1198 op->x = new_x;
1182 op->y = new_y; 1199 op->y = new_y;
1183 op->map = m; 1200 op->map = m;
1184 i=spell_find_dir(op->map, op->x, op->y, get_owner(op)); 1201 i=spell_find_dir(op->map, op->x, op->y, get_owner(op));
1185 if(i > 0 && i != op->direction){ 1202 if(i > 0 && i != op->direction){
1186 op->direction=i; 1203 op->direction=i;
1187 SET_ANIMATION(op, op->direction); 1204 SET_ANIMATION(op, op->direction);
1188 } 1205 }
1189 insert_ob_in_map(op,op->map,op,0); 1206 insert_ob_in_map(op,op->map,op,0);
1190} 1207}
1191 1208
1192/**************************************************************************** 1209/****************************************************************************
… …
1202int make_object_glow(object *op, int radius, int time) { 1219int make_object_glow(object *op, int radius, int time) {
1203 object *tmp; 1220 object *tmp;
1204 1221
1205 /* some things are unaffected... */ 1222 /* some things are unaffected... */
1206 if(op->path_denied&PATH_LIGHT) 1223 if(op->path_denied&PATH_LIGHT)
1207 return 0; 1224 return 0;
1208 1225
1209 tmp=get_archetype(FORCE_NAME); 1226 tmp=get_archetype(FORCE_NAME);
1210 tmp->speed = 0.01; 1227 tmp->speed = 0.01;
1211 tmp->stats.food = time; 1228 tmp->stats.food = time;
1212 SET_FLAG(tmp, FLAG_IS_USED_UP); 1229 SET_FLAG(tmp, FLAG_IS_USED_UP);
1213 tmp->glow_radius=radius; 1230 tmp->glow_radius=radius;
1214 if (tmp->glow_radius > MAX_LIGHT_RADII) 1231 if (tmp->glow_radius > MAX_LIGHT_RADII)
1215 tmp->glow_radius = MAX_LIGHT_RADII; 1232 tmp->glow_radius = MAX_LIGHT_RADII;
1216 1233
1217 tmp->x=op->x; 1234 tmp->x=op->x;
1218 tmp->y=op->y; 1235 tmp->y=op->y;
1219 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */ 1236 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1220 tmp=insert_ob_in_ob(tmp,op); 1237 tmp=insert_ob_in_ob(tmp,op);
1221 if (tmp->glow_radius > op->glow_radius) 1238 if (tmp->glow_radius > op->glow_radius)
1222 op->glow_radius = tmp->glow_radius; 1239 op->glow_radius = tmp->glow_radius;
1223 1240
1224 if(!tmp->env||op!=tmp->env) { 1241 if(!tmp->env||op!=tmp->env) {
1225 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n", 1242 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n",
1226 op->name); 1243 &op->name);
1227 return 0; 1244 return 0;
1228 } 1245 }
1229 return 1; 1246 return 1;
1230} 1247}
1231 1248
1232 1249
… …
1256 else op->skill = NULL; 1273 else op->skill = NULL;
1257 1274
1258 change_skill(op, find_skill_by_name(op, op->skill), 1); 1275 change_skill(op, find_skill_by_name(op, op->skill), 1);
1259 1276
1260 for(i= -range; i<range; i++) { 1277 for(i= -range; i<range; i++) {
1261 for(j=-range; j<range ; j++) { 1278 for(j=-range; j<range ; j++) {
1262 m = op->map; 1279 m = op->map;
1263 sx = op->x + i; 1280 sx = op->x + i;
1264 sy = op->y + j; 1281 sy = op->y + j;
1265 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1282 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy);
1266 if (mflags & P_OUT_OF_MAP) continue; 1283 if (mflags & P_OUT_OF_MAP) continue;
1267 if (mflags & P_IS_ALIVE) { 1284 if (mflags & P_IS_ALIVE) {
1268 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) { 1285 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) {
1269 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1286 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break;
1270 } 1287 }
1271 if (tmp) { 1288 if (tmp) {
1272 if (tmp->head) tmp=tmp->head; 1289 if (tmp->head) tmp=tmp->head;
1273 1290
1274 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1291 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) ||
1275 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1292 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) {
1276 if (spell_ob->subtype == SP_DESTRUCTION) { 1293 if (spell_ob->subtype == SP_DESTRUCTION) {
1277 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1294 hit_player(tmp,dam,op,spell_ob->attacktype,0);
1278 if (spell_ob->other_arch) { 1295 if (spell_ob->other_arch) {
1279 tmp = arch_to_object(spell_ob->other_arch); 1296 tmp = arch_to_object(spell_ob->other_arch);
1280 tmp->x = sx; 1297 tmp->x = sx;
1281 tmp->y = sy; 1298 tmp->y = sy;
1282 insert_ob_in_map(tmp, m, op, 0); 1299 insert_ob_in_map(tmp, m, op, 0);
1283 } 1300 }
1284 } 1301 }
1285 else if (spell_ob->subtype == SP_FAERY_FIRE && 1302 else if (spell_ob->subtype == SP_FAERY_FIRE &&
1286 tmp->resist[ATNR_MAGIC]!=100) { 1303 tmp->resist[ATNR_MAGIC]!=100) {
1287 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1304 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) {
1288 object *effect = arch_to_object(spell_ob->other_arch); 1305 object *effect = arch_to_object(spell_ob->other_arch);
1289 effect->x = sx; 1306 effect->x = sx;
1290 effect->y = sy; 1307 effect->y = sy;
1291 insert_ob_in_map(effect, m, op, 0); 1308 insert_ob_in_map(effect, m, op, 0);
1292 } 1309 }
1293 } 1310 }
1294 } 1311 }
1295 } 1312 }
1296 } 1313 }
1297 } 1314 }
1298 } 1315 }
1299 op->skill = skill; 1316 op->skill = skill;
1300 return 1; 1317 return 1;
1301} 1318}
1302 1319
… …
1309int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1326int cast_curse(object *op, object *caster, object *spell_ob, int dir) {
1310 object *god = find_god(determine_god(op)); 1327 object *god = find_god(determine_god(op));
1311 object *tmp, *force; 1328 object *tmp, *force;
1312 1329
1313 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1330 tmp = get_pointed_target(op, (dir==0)?op->direction:dir,
1314 spell_ob->range, SPELL_GRACE); 1331 spell_ob->range, SPELL_GRACE);
1315 if (!tmp) { 1332 if (!tmp) {
1316 new_draw_info(NDI_UNIQUE, 0, op, 1333 new_draw_info(NDI_UNIQUE, 0, op,
1317 "There is no one in that direction to curse."); 1334 "There is no one in that direction to curse.");
1318 return 0; 1335 return 0;
1319 } 1336 }
1320 1337
1321 /* If we've already got a force of this type, don't add a new one. */ 1338 /* If we've already got a force of this type, don't add a new one. */
1322 for(force=tmp->inv; force!=NULL; force=force->below) { 1339 for(force=tmp->inv; force!=NULL; force=force->below) {
1323 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1340 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) {
1324 if (force->name == spell_ob->name) { 1341 if (force->name == spell_ob->name) {
1325 break; 1342 break;
1326 } 1343 }
1327 else if (spell_ob->race && spell_ob->race == force->name) { 1344 else if (spell_ob->race && spell_ob->race == force->name) {
1328 new_draw_info_format(NDI_UNIQUE, 0, op, 1345 new_draw_info_format(NDI_UNIQUE, 0, op,
1329 "You can not cast %s while %s is in effect", 1346 "You can not cast %s while %s is in effect",
1330 spell_ob->name, force->name_pl); 1347 &spell_ob->name, &force->name_pl);
1331 return 0; 1348 return 0;
1332 } 1349 }
1333 } 1350 }
1334 } 1351 }
1335 1352
1336 if(force==NULL) { 1353 if(force==NULL) {
1337 force=get_archetype(FORCE_NAME); 1354 force=get_archetype(FORCE_NAME);
1338 force->subtype = FORCE_CHANGE_ABILITY; 1355 force->subtype = FORCE_CHANGE_ABILITY;
1339 free_string(force->name);
1340 if (spell_ob->race) 1356 if (spell_ob->race)
1341 force->name = add_refcount(spell_ob->race); 1357 force->name = spell_ob->race;
1342 else 1358 else
1359 force->name = spell_ob->name;
1360
1343 force->name = add_refcount(spell_ob->name); 1361 force->name_pl = spell_ob->name;
1344 free_string(force->name_pl);
1345 force->name_pl = add_refcount(spell_ob->name);
1346 1362
1347 } else { 1363 } else {
1348 int duration; 1364 int duration;
1349 1365
1350 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1366 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1351 if (duration > force->duration) { 1367 if (duration > force->duration) {
1352 force->duration = duration; 1368 force->duration = duration;
1353 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1369 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1354 } else { 1370 } else {
1355 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1371 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1356 } 1372 }
1357 return 1; 1373 return 1;
1358 } 1374 }
1359 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1375 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1360 force->speed = 1.0; 1376 force->speed = 1.0;
1361 force->speed_left = -1.0; 1377 force->speed_left = -1.0;
1362 SET_FLAG(force, FLAG_APPLIED); 1378 SET_FLAG(force, FLAG_APPLIED);
1363 1379
1364 if(god) { 1380 if(god) {
1365 if (spell_ob->last_grace) 1381 if (spell_ob->last_grace)
1366 force->path_repelled=god->path_repelled; 1382 force->path_repelled=god->path_repelled;
1367 if (spell_ob->last_grace) 1383 if (spell_ob->last_grace)
1368 force->path_denied=god->path_denied; 1384 force->path_denied=god->path_denied;
1369 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1385 new_draw_info_format(NDI_UNIQUE, 0,tmp,
1370 "You are a victim of %s's curse!",god->name); 1386 "You are a victim of %s's curse!", &god->name);
1371 } else 1387 } else
1372 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1388 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty.");
1373 1389
1374 1390
1375 if(tmp!=op && op->type==PLAYER) 1391 if(tmp!=op && op->type==PLAYER)
1376 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!",tmp->name); 1392 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!", &tmp->name);
1377 1393
1378 force->stats.ac = spell_ob->stats.ac; 1394 force->stats.ac = spell_ob->stats.ac;
1379 force->stats.wc = spell_ob->stats.wc; 1395 force->stats.wc = spell_ob->stats.wc;
1380 1396
1381 change_abil(tmp,force); /* Mostly to display any messages */ 1397 change_abil(tmp,force); /* Mostly to display any messages */
… …
1418 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1434 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race;
1419 else race = spell->race; 1435 else race = spell->race;
1420 1436
1421 1437
1422 for (x = op->x - range; x <= op->x + range; x++) 1438 for (x = op->x - range; x <= op->x + range; x++)
1423 for (y = op->y - range; y <= op->y + range; y++) { 1439 for (y = op->y - range; y <= op->y + range; y++) {
1424 1440
1425 done_one=0; 1441 done_one=0;
1426 m = op->map; 1442 m = op->map;
1427 nx = x; 1443 nx = x;
1428 ny = y; 1444 ny = y;
1429 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1445 mflags = get_map_flags(m, &m, x, y, &nx, &ny);
1430 if (mflags & P_OUT_OF_MAP) continue; 1446 if (mflags & P_OUT_OF_MAP) continue;
1431 1447
1432 /* If there is nothing living on this space, no need to go further */ 1448 /* If there is nothing living on this space, no need to go further */
1433 if (!(mflags & P_IS_ALIVE)) continue; 1449 if (!(mflags & P_IS_ALIVE)) continue;
1434 1450
1435 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above) 1451 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above)
1436 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1452 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break;
1437 1453
1438 /* There can be living objects that are not monsters */ 1454 /* There can be living objects that are not monsters */
1439 if (!tmp || tmp->type==PLAYER) continue; 1455 if (!tmp || tmp->type==PLAYER) continue;
1440 1456
1441 /* Only the head has meaningful data, so resolve to that */ 1457 /* Only the head has meaningful data, so resolve to that */
1442 if (tmp->head) head=tmp->head; 1458 if (tmp->head) head=tmp->head;
1443 else head=tmp; 1459 else head=tmp;
1444 1460
1445 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1461 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1446 if (race && head->race && !strstr(race, head->race)) continue; 1462 if (race && head->race && !strstr(race, head->race)) continue;
1447 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue; 1463 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue;
1448 1464
1449 /* Now do a bunch of stuff related to saving throws */ 1465 /* Now do a bunch of stuff related to saving throws */
1450 best_at = -1; 1466 best_at = -1;
1451 if (spell->attacktype) { 1467 if (spell->attacktype) {
1452 for (at=0; at < NROFATTACKS; at++) 1468 for (at=0; at < NROFATTACKS; at++)
1453 if (spell->attacktype & (1 << at)) 1469 if (spell->attacktype & (1 << at))
1454 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at; 1470 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at;
1455 1471
1456 if (best_at == -1) at=0; 1472 if (best_at == -1) at=0;
1457 else { 1473 else {
1458 if (head->resist[best_at] == 100) continue; 1474 if (head->resist[best_at] == 100) continue;
1459 else at = head->resist[best_at] / 5; 1475 else at = head->resist[best_at] / 5;
1460 } 1476 }
1461 at -= level / 5; 1477 at -= level / 5;
1462 if (did_make_save(head, head->level, at)) continue; 1478 if (did_make_save(head, head->level, at)) continue;
1463 } 1479 }
1464 else /* spell->attacktype */ 1480 else /* spell->attacktype */
1465 /* 1481 /*
1466 Spell has no attacktype (charm & such), so we'll have a specific saving: 1482 Spell has no attacktype (charm & such), so we'll have a specific saving:
1467 * if spell level < monster level, no go 1483 * if spell level < monster level, no go
1468 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1484 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
… …
1479 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) ) 1495 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) )
1480 /* Failed, no effect */ 1496 /* Failed, no effect */
1481 continue; 1497 continue;
1482 } 1498 }
1483 1499
1484 /* Done with saving throw. Now start effecting the monster */ 1500 /* Done with saving throw. Now start effecting the monster */
1485 1501
1486 /* aggravation */ 1502 /* aggravation */
1487 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1503 if (QUERY_FLAG(spell, FLAG_MONSTER)) {
1488 CLEAR_FLAG(head, FLAG_SLEEP); 1504 CLEAR_FLAG(head, FLAG_SLEEP);
1489 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1505 if (QUERY_FLAG(head, FLAG_FRIENDLY))
1490 remove_friendly_object(head); 1506 remove_friendly_object(head);
1491 1507
1492 done_one = 1; 1508 done_one = 1;
1493 head->enemy = op; 1509 head->enemy = op;
1494 } 1510 }
1495 1511
1496 /* calm monsters */ 1512 /* calm monsters */
1497 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1513 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) {
1498 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1514 SET_FLAG(head, FLAG_UNAGGRESSIVE);
1499 head->enemy = NULL; 1515 head->enemy = NULL;
1500 done_one = 1; 1516 done_one = 1;
1501 } 1517 }
1502 1518
1503 /* berserk monsters */ 1519 /* berserk monsters */
1504 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1520 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) {
1505 SET_FLAG(head, FLAG_BERSERK); 1521 SET_FLAG(head, FLAG_BERSERK);
1506 done_one = 1; 1522 done_one = 1;
1507 } 1523 }
1508 /* charm */ 1524 /* charm */
1509 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) { 1525 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) {
1510 SET_FLAG(head, FLAG_FRIENDLY); 1526 SET_FLAG(head, FLAG_FRIENDLY);
1511 /* Prevent uncontolled outbreaks of self replicating monsters. 1527 /* Prevent uncontolled outbreaks of self replicating monsters.
1512 Typical use case is charm, go somwhere, use aggravation to make hostile. 1528 Typical use case is charm, go somwhere, use aggravation to make hostile.
1513 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1529 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1514 CLEAR_FLAG(head, FLAG_GENERATOR); 1530 CLEAR_FLAG(head, FLAG_GENERATOR);
1515 set_owner(head, op); 1531 set_owner(head, op);
1516 set_spell_skill(op, caster, spell, head); 1532 set_spell_skill(op, caster, spell, head);
1517 add_friendly_object(head); 1533 add_friendly_object(head);
1518 head->attack_movement = PETMOVE; 1534 head->attack_movement = PETMOVE;
1519 done_one = 1; 1535 done_one = 1;
1520 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1536 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1521 head->stats.exp = 0; 1537 head->stats.exp = 0;
1522 } 1538 }
1523 1539
1524 /* If a monster was effected, put an effect in */ 1540 /* If a monster was effected, put an effect in */
1525 if (done_one && spell->other_arch) { 1541 if (done_one && spell->other_arch) {
1526 tmp = arch_to_object(spell->other_arch); 1542 tmp = arch_to_object(spell->other_arch);
1527 tmp->x = nx; 1543 tmp->x = nx;
1528 tmp->y = ny; 1544 tmp->y = ny;
1529 insert_ob_in_map(tmp, m, op, 0); 1545 insert_ob_in_map(tmp, m, op, 0);
1530 } 1546 }
1531 } /* for y */ 1547 } /* for y */
1532 1548
1533 return 1; 1549 return 1;
1534} 1550}
1535 1551
1536 1552
… …
1556 * deviations. 1572 * deviations.
1557 */ 1573 */
1558 1574
1559 dir = 0; 1575 dir = 0;
1560 if(!(rndm(0, 3))) 1576 if(!(rndm(0, 3)))
1561 j = rndm(0, 1); 1577 j = rndm(0, 1);
1562 else j=0; 1578 else j=0;
1563 1579
1564 for(i = 1; i < 9; i++) { 1580 for(i = 1; i < 9; i++) {
1565 /* i bit 0: alters sign of offset 1581 /* i bit 0: alters sign of offset
1566 * other bits (i / 2): absolute value of offset 1582 * other bits (i / 2): absolute value of offset
1567 */ 1583 */
1568 1584
1569 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1585 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2);
1570 int tmpdir = absdir (op->direction + offset); 1586 int tmpdir = absdir (op->direction + offset);
1571 1587
1572 nx = op->x + freearr_x[tmpdir]; 1588 nx = op->x + freearr_x[tmpdir];
1573 ny = op->y + freearr_y[tmpdir]; 1589 ny = op->y + freearr_y[tmpdir];
1574 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && 1590 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) &&
1575 !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, nx, ny)))) { 1591 !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, nx, ny)))) {
1576 dir = tmpdir; 1592 dir = tmpdir;
1577 break; 1593 break;
1578 } 1594 }
1579 } 1595 }
1580 if (dir == 0) { 1596 if (dir == 0) {
1581 nx = op->x; 1597 nx = op->x;
1582 ny = op->y; 1598 ny = op->y;
1583 m = op->map; 1599 m = op->map;
1584 } 1600 }
1585 1601
1586 remove_ob(op); 1602 remove_ob(op);
1587 op->y=ny; 1603 op->y=ny;
1588 op->x=nx; 1604 op->x=nx;
1589 insert_ob_in_map(op,m,op,0); 1605 insert_ob_in_map(op,m,op,0);
1590 1606
1591 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1607 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1592 surrounding squares */ 1608 surrounding squares */
1593 1609
1594 /* loop over current square and neighbors to hit. 1610 /* loop over current square and neighbors to hit.
1595 * if this has an other_arch field, we insert that in 1611 * if this has an other_arch field, we insert that in
1596 * the surround spaces. 1612 * the surround spaces.
1597 */ 1613 */
1598 for(j=0;j<9;j++) { 1614 for(j=0;j<9;j++) {
1599 object *new_ob; 1615 object *new_ob;
1600 1616
1601 hx = nx+freearr_x[j]; 1617 hx = nx+freearr_x[j];
1602 hy = ny+freearr_y[j]; 1618 hy = ny+freearr_y[j];
1603 1619
1604 m = op->map; 1620 m = op->map;
1605 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1621 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy);
1606 1622
1607 if (mflags & P_OUT_OF_MAP) continue; 1623 if (mflags & P_OUT_OF_MAP) continue;
1608 1624
1609 /* first, don't ever, ever hit the owner. Don't hit out 1625 /* first, don't ever, ever hit the owner. Don't hit out
1610 * of the map either. 1626 * of the map either.
1611 */ 1627 */
1612 1628
1613 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) { 1629 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) {
1614 if(j) op->stats.dam = dam_save/2; 1630 if(j) op->stats.dam = dam_save/2;
1615 hit_map(op,j,op->attacktype,1); 1631 hit_map(op,j,op->attacktype,1);
1616 1632
1617 } 1633 }
1618 1634
1619 /* insert the other arch */ 1635 /* insert the other arch */
1620 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) { 1636 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) {
1621 new_ob = arch_to_object(op->other_arch); 1637 new_ob = arch_to_object(op->other_arch);
1622 new_ob->x = hx; 1638 new_ob->x = hx;
1623 new_ob->y = hy; 1639 new_ob->y = hy;
1624 insert_ob_in_map(new_ob,m,op,0); 1640 insert_ob_in_map(new_ob,m,op,0);
1625 } 1641 }
1626 } 1642 }
1627 1643
1628 /* restore to the center location and damage*/ 1644 /* restore to the center location and damage*/
1629 op->stats.dam = dam_save; 1645 op->stats.dam = dam_save;
1630 1646
1631 i=spell_find_dir(op->map,op->x,op->y,get_owner(op)); 1647 i=spell_find_dir(op->map,op->x,op->y,get_owner(op));
1632 1648
1633 if(i>=0) { /* we have a preferred direction! */ 1649 if(i>=0) { /* we have a preferred direction! */
1634 /* pick another direction if the preferred dir is blocked. */ 1650 /* pick another direction if the preferred dir is blocked. */
1635 if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP || 1651 if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP ||
1636 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) { 1652 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) {
1637 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1653 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */
1638 } 1654 }
1639 op->direction=i; 1655 op->direction=i;
1640 } 1656 }
1641} 1657}
1642 1658
1643 1659
1644/* move_swarm_spell: peterm 1660/* move_swarm_spell: peterm
… …
1658 mapstruct *m; 1674 mapstruct *m;
1659 object *owner; 1675 object *owner;
1660 1676
1661 owner = get_owner(op); 1677 owner = get_owner(op);
1662 if(op->duration == 0 || owner == NULL) { 1678 if(op->duration == 0 || owner == NULL) {
1663 remove_ob(op); 1679 remove_ob(op);
1664 free_object(op); 1680 free_object(op);
1665 return; 1681 return;
1666 } 1682 }
1667 op->duration--; 1683 op->duration--;
1668 1684
1669 basedir = op->direction; 1685 basedir = op->direction;
1670 if(basedir == 0) { 1686 if(basedir == 0) {
… …
1708 * it is unlikely to disappear by the time we need it. However, 1724 * it is unlikely to disappear by the time we need it. However,
1709 * do some sanity checking anyways. 1725 * do some sanity checking anyways.
1710 */ 1726 */
1711 1727
1712 if (op->spell && op->spell->type == SPELL && 1728 if (op->spell && op->spell->type == SPELL &&
1713 !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) && 1729 !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) &&
1714 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) { 1730 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) {
1715 1731
1716 /* Bullet spells have a bunch more customization that needs to be done */ 1732 /* Bullet spells have a bunch more customization that needs to be done */
1717 if (op->spell->subtype == SP_BULLET) 1733 if (op->spell->subtype == SP_BULLET)
1718 fire_bullet(owner, op, basedir, op->spell); 1734 fire_bullet(owner, op, basedir, op->spell);
1719 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1735 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1720 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell); 1736 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell);
1721 } 1737 }
1722#endif 1738#endif
1723 1739
1724 /* spell pointer is set up for the spell this casts. Since this 1740 /* spell pointer is set up for the spell this casts. Since this
1725 * should just be a pointer to the spell in some inventory, 1741 * should just be a pointer to the spell in some inventory,
… …
1727 * do some sanity checking anyways. 1743 * do some sanity checking anyways.
1728 */ 1744 */
1729 1745
1730 if (op->spell && op->spell->type == SPELL) 1746 if (op->spell && op->spell->type == SPELL)
1731 { 1747 {
1732 /* Bullet spells have a bunch more customization that needs to be done */ 1748 /* Bullet spells have a bunch more customization that needs to be done */
1733 if (op->spell->subtype == SP_BULLET) 1749 if (op->spell->subtype == SP_BULLET)
1734 fire_bullet(owner, op, basedir, op->spell); 1750 fire_bullet(owner, op, basedir, op->spell);
1735 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1751 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1736 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1752 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1737 } 1753 }
1738} 1754}
1739 1755
1740 1756
1741 1757
… …
1769 tmp->spell = arch_to_object(spell->other_arch); 1785 tmp->spell = arch_to_object(spell->other_arch);
1770 1786
1771 tmp->attacktype = tmp->spell->attacktype; 1787 tmp->attacktype = tmp->spell->attacktype;
1772 1788
1773 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 1789 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) {
1774 if ( ! tailor_god_spell (tmp, op)) 1790 if ( ! tailor_god_spell (tmp, op))
1775 return 1; 1791 return 1;
1776 } 1792 }
1777 tmp->duration = SP_level_duration_adjust(caster, spell); 1793 tmp->duration = SP_level_duration_adjust(caster, spell);
1778 for (i=0; i< spell->duration; i++) 1794 for (i=0; i< spell->duration; i++)
1779 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 1795 tmp->duration += die_roll(1, 3, op, PREFER_HIGH);
1780 1796
1781 tmp->direction=dir; 1797 tmp->direction=dir;
1782 tmp->invisible=1; 1798 tmp->invisible=1;
1783 insert_ob_in_map(tmp,op->map,op,0); 1799 insert_ob_in_map(tmp,op->map,op,0);
1784 return 1; 1800 return 1;
… …
1795 mapstruct *m; 1811 mapstruct *m;
1796 1812
1797 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 1813 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell);
1798 1814
1799 if(!dir) { 1815 if(!dir) {
1800 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 1816 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?");
1801 return 0; 1817 return 0;
1802 } 1818 }
1803 1819
1804 x=op->x+freearr_x[dir]; 1820 x=op->x+freearr_x[dir];
1805 y=op->y+freearr_y[dir]; 1821 y=op->y+freearr_y[dir];
1806 m = op->map; 1822 m = op->map;
1807 1823
1808 mflags = get_map_flags(m, &m, x, y, &x, &y); 1824 mflags = get_map_flags(m, &m, x, y, &x, &y);
1809 1825
1810 if (mflags & P_OUT_OF_MAP) { 1826 if (mflags & P_OUT_OF_MAP) {
1811 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 1827 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there.");
1812 return 0; 1828 return 0;
1813 } 1829 }
1814 1830
1815 if (mflags & P_IS_ALIVE && spell->attacktype) { 1831 if (mflags & P_IS_ALIVE && spell->attacktype) {
1816 for(target=get_map_ob(m,x,y);target;target=target->above) 1832 for(target=get_map_ob(m,x,y);target;target=target->above)
1817 if(QUERY_FLAG(target,FLAG_MONSTER)) { 1833 if(QUERY_FLAG(target,FLAG_MONSTER)) {
1818 /* oky doky. got a target monster. Lets make a blinding attack */ 1834 /* oky doky. got a target monster. Lets make a blinding attack */
1819 if(target->head) target = target->head; 1835 if(target->head) target = target->head;
1820 (void) hit_player(target,dam,op,spell->attacktype,1); 1836 (void) hit_player(target,dam,op,spell->attacktype,1);
1821 return 1; /* one success only! */ 1837 return 1; /* one success only! */
1822 } 1838 }
1823 } 1839 }
1824 1840
1825 /* no live target, perhaps a wall is in the way? */ 1841 /* no live target, perhaps a wall is in the way? */
1826 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) { 1842 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) {
1827 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way."); 1843 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");
1828 return 0; 1844 return 0;
1829 } 1845 }
1830 1846
1831 /* ok, looks groovy to just insert a new light on the map */ 1847 /* ok, looks groovy to just insert a new light on the map */
1832 tmp=arch_to_object(spell->other_arch); 1848 tmp=arch_to_object(spell->other_arch);
1833 if(!tmp) { 1849 if(!tmp) {
1834 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 1850 LOG(llevError,"Error: spell arch for cast_light() missing.\n");
1835 return 0; 1851 return 0;
1836 } 1852 }
1837 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 1853 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell);
1838 if (tmp->glow_radius) { 1854 if (tmp->glow_radius) {
1839 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 1855 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell);
1840 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII; 1856 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII;
1841 } 1857 }
1842 tmp->x=x; 1858 tmp->x=x;
1843 tmp->y=y; 1859 tmp->y=y;
1844 insert_ob_in_map(tmp,m,op,0); 1860 insert_ob_in_map(tmp,m,op,0);
1845 return 1; 1861 return 1;
… …
1875 dam_mod = SP_level_dam_adjust(caster, spell); 1891 dam_mod = SP_level_dam_adjust(caster, spell);
1876 dur_mod = SP_level_duration_adjust(caster, spell); 1892 dur_mod = SP_level_duration_adjust(caster, spell);
1877 1893
1878 /* search in a line for a victim */ 1894 /* search in a line for a victim */
1879 for(i=1; i<range; i++) { 1895 for(i=1; i<range; i++) {
1880 x = op->x + i * freearr_x[dir]; 1896 x = op->x + i * freearr_x[dir];
1881 y = op->y + i * freearr_y[dir]; 1897 y = op->y + i * freearr_y[dir];
1882 m = op->map; 1898 m = op->map;
1883 1899
1884 mflags = get_map_flags(m, &m, x, y, &x, &y); 1900 mflags = get_map_flags(m, &m, x, y, &x, &y);
1885 1901
1886 if (mflags & P_OUT_OF_MAP) return 0; 1902 if (mflags & P_OUT_OF_MAP) return 0;
1887 1903
1888 /* don't go through walls - presume diseases are airborne */ 1904 /* don't go through walls - presume diseases are airborne */
1889 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0; 1905 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0;
1890 1906
1891 /* Only bother looking on this space if there is something living here */ 1907 /* Only bother looking on this space if there is something living here */
1892 if (mflags & P_IS_ALIVE) { 1908 if (mflags & P_IS_ALIVE) {
1893 /* search this square for a victim */ 1909 /* search this square for a victim */
1894 for(walk=get_map_ob(m,x,y);walk;walk=walk->above) 1910 for(walk=get_map_ob(m,x,y);walk;walk=walk->above)
1895 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */ 1911 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */
1896 object *disease = arch_to_object(spell->other_arch); 1912 object *disease = arch_to_object(spell->other_arch);
1897 1913
1898 set_owner(disease,op); 1914 set_owner(disease,op);
1899 set_spell_skill(op, caster, spell, disease); 1915 set_spell_skill(op, caster, spell, disease);
1900 disease->stats.exp = 0; 1916 disease->stats.exp = 0;
1901 disease->level = caster_level(caster, spell); 1917 disease->level = caster_level(caster, spell);
1902 1918
1903 /* do level adjustments */ 1919 /* do level adjustments */
1904 if(disease->stats.wc) 1920 if(disease->stats.wc)
1905 disease->stats.wc += dur_mod/2; 1921 disease->stats.wc += dur_mod/2;
1906 1922
1907 if(disease->magic> 0) 1923 if(disease->magic> 0)
1908 disease->magic += dur_mod/4; 1924 disease->magic += dur_mod/4;
1909 1925
1910 if(disease->stats.maxhp>0) 1926 if(disease->stats.maxhp>0)
1911 disease->stats.maxhp += dur_mod; 1927 disease->stats.maxhp += dur_mod;
1912 1928
1913 if(disease->stats.maxgrace>0) 1929 if(disease->stats.maxgrace>0)
1914 disease->stats.maxgrace += dur_mod; 1930 disease->stats.maxgrace += dur_mod;
1915 1931
1916 if(disease->stats.dam) { 1932 if(disease->stats.dam) {
1917 if(disease->stats.dam > 0) 1933 if(disease->stats.dam > 0)
1918 disease->stats.dam += dam_mod; 1934 disease->stats.dam += dam_mod;
1919 else disease->stats.dam -= dam_mod; 1935 else disease->stats.dam -= dam_mod;
1920 } 1936 }
1921 1937
1922 if(disease->last_sp) { 1938 if(disease->last_sp) {
1923 disease->last_sp -= 2*dam_mod; 1939 disease->last_sp -= 2*dam_mod;
1924 if(disease->last_sp <1) disease->last_sp = 1; 1940 if(disease->last_sp <1) disease->last_sp = 1;
1925 } 1941 }
1926 1942
1927 if(disease->stats.maxsp) { 1943 if(disease->stats.maxsp) {
1928 if(disease->stats.maxsp > 0) 1944 if(disease->stats.maxsp > 0)
1929 disease->stats.maxsp += dam_mod; 1945 disease->stats.maxsp += dam_mod;
1930 else disease->stats.maxsp -= dam_mod; 1946 else disease->stats.maxsp -= dam_mod;
1931 } 1947 }
1932 1948
1933 if(disease->stats.ac) 1949 if(disease->stats.ac)
1934 disease->stats.ac += dam_mod; 1950 disease->stats.ac += dam_mod;
1935 1951
1936 if(disease->last_eat) 1952 if(disease->last_eat)
1937 disease->last_eat -= dam_mod; 1953 disease->last_eat -= dam_mod;
1938 1954
1939 if(disease->stats.hp) 1955 if(disease->stats.hp)
1940 disease->stats.hp -= dam_mod; 1956 disease->stats.hp -= dam_mod;
1941 1957
1942 if(disease->stats.sp) 1958 if(disease->stats.sp)
1943 disease->stats.sp -= dam_mod; 1959 disease->stats.sp -= dam_mod;
1944 1960
1945 if(infect_object(walk,disease,1)) { 1961 if(infect_object(walk,disease,1)) {
1946 object *flash; /* visual effect for inflicting disease */ 1962 object *flash; /* visual effect for inflicting disease */
1947 1963
1948 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!",disease->name,walk->name); 1964 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
1949 1965
1950 free_object(disease); /* don't need this one anymore */ 1966 free_object(disease); /* don't need this one anymore */
1951 flash=get_archetype(ARCH_DETECT_MAGIC); 1967 flash=get_archetype(ARCH_DETECT_MAGIC);
1952 flash->x = x; 1968 flash->x = x;
1953 flash->y = y; 1969 flash->y = y;
1954 flash->map = walk->map; 1970 flash->map = walk->map;
1955 insert_ob_in_map(flash,walk->map,op,0); 1971 insert_ob_in_map(flash,walk->map,op,0);
1956 return 1; 1972 return 1;
1957 } 1973 }
1958 free_object(disease); 1974 free_object(disease);
1959 } 1975 }
1960 } /* if living creature */ 1976 } /* if living creature */
1961 } /* for range of spaces */ 1977 } /* for range of spaces */
1962 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 1978 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!");
1963 return 1; 1979 return 1;
1964} 1980}

Diff Legend

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