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.2 by elmex, Tue Aug 15 15:00:20 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.2 2006/08/15 15:00:20 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;
409 } 408 }
410 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.
411 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE_MAP) 413 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
412 { 414 {
413 remove_ob (op); 415 remove_ob (op);
414 free_object (op); 416 free_object (op);
415 return; 417 return;
416 } 418 }
417 419
418 if (op->attacktype) { 420 if (op->attacktype) {
419 hit_map (op, 0, op->attacktype, 1); 421 hit_map (op, 0, op->attacktype, 1);
420 if (was_destroyed (op, op_tag)) 422 if (was_destroyed (op, op_tag))
421 return; 423 return;
422 } 424 }
423 425
424 /* other_arch contains what this explodes into */ 426 /* other_arch contains what this explodes into */
425 tmp = arch_to_object (op->other_arch); 427 tmp = arch_to_object (op->other_arch);
426 428
427 copy_owner (tmp, op); 429 copy_owner (tmp, op);
428 if (tmp->skill) FREE_AND_CLEAR_STR(tmp->skill); 430 tmp->skill = op->skill;
429 if (op->skill) tmp->skill = add_refcount(op->skill);
430 431
431 owner = get_owner(op); 432 owner = get_owner(op);
432 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 433 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner &&
433 !tailor_god_spell(tmp, owner)) { 434 !tailor_god_spell(tmp, owner)) {
434 remove_ob (op); 435 remove_ob (op);
435 free_object (op); 436 free_object (op);
436 return; 437 return;
437 } 438 }
438 tmp->x = op->x; 439 tmp->x = op->x;
439 tmp->y = op->y; 440 tmp->y = op->y;
440 441
441 /* special for bombs - it actually has sane values for these */ 442 /* special for bombs - it actually has sane values for these */
442 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 443 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) {
443 tmp->attacktype = op->attacktype; 444 tmp->attacktype = op->attacktype;
444 tmp->range = op->range; 445 tmp->range = op->range;
445 tmp->stats.dam = op->stats.dam; 446 tmp->stats.dam = op->stats.dam;
446 tmp->duration = op->duration; 447 tmp->duration = op->duration;
447 } else { 448 } else {
448 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 449 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC;
449 /* Spell doc describes what is going on here */ 450 /* Spell doc describes what is going on here */
450 tmp->stats.dam = op->dam_modifier; 451 tmp->stats.dam = op->dam_modifier;
451 tmp->range = op->stats.maxhp; 452 tmp->range = op->stats.maxhp;
452 tmp->duration = op->stats.hp; 453 tmp->duration = op->stats.hp;
453 /* 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 -
454 * the count of the parent should work fine. 455 * the count of the parent should work fine.
455 */ 456 */
456 tmp->stats.maxhp = op->count; 457 tmp->stats.maxhp = op->count;
457 } 458 }
458 459
459 /* Set direction of cone explosion */ 460 /* Set direction of cone explosion */
460 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 461 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
461 tmp->stats.sp = op->direction; 462 tmp->stats.sp = op->direction;
462 463
463 /* Prevent recursion */ 464 /* Prevent recursion */
464 op->move_on = 0; 465 op->move_on = 0;
465 466
466 insert_ob_in_map(tmp, op->map, op, 0); 467 insert_ob_in_map(tmp, op->map, op, 0);
467 /* remove the firebullet */ 468 /* remove the firebullet */
468 if ( ! was_destroyed (op, op_tag)) { 469 if ( ! was_destroyed (op, op_tag)) {
469 remove_ob (op); 470 remove_ob (op);
470 free_object (op); 471 free_object (op);
471 } 472 }
472} 473}
473 474
474 475
475 476
… …
489 490
490 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)))
491 return; 492 return;
492 493
493 if (op->other_arch) { 494 if (op->other_arch) {
494 /* explode object will also remove op */ 495 /* explode object will also remove op */
495 explode_bullet (op); 496 explode_bullet (op);
496 return; 497 return;
497 } 498 }
498 499
499 /* 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 */
… …
505 tmp_tag = tmp->count; 506 tmp_tag = tmp->count;
506 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 507 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
507 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 508 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag)
508 || (op->stats.dam -= dam) < 0) 509 || (op->stats.dam -= dam) < 0)
509 { 510 {
510 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 511 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
511 remove_ob (op); 512 remove_ob (op);
512 free_object(op); 513 free_object(op);
513 return; 514 return;
514 } 515 }
515 } 516 }
516 } 517 }
517 } 518 }
518} 519}
519 520
… …
532 533
533#if 0 534#if 0
534 /* We need a better general purpose way to do this */ 535 /* We need a better general purpose way to do this */
535 536
536 /* peterm: added to make comet leave a trail of burnouts 537 /* peterm: added to make comet leave a trail of burnouts
537 it's an unadulterated hack, but the effect is cool. */ 538 it's an unadulterated hack, but the effect is cool. */
538 if(op->stats.sp == SP_METEOR) { 539 if(op->stats.sp == SP_METEOR) {
539 replace_insert_ob_in_map("fire_trail",op); 540 replace_insert_ob_in_map("fire_trail",op);
540 if (was_destroyed (op, op_tag)) 541 if (was_destroyed (op, op_tag))
541 return; 542 return;
542 } /* end addition. */ 543 } /* end addition. */
… …
544 545
545 /* Reached the end of its life - remove it */ 546 /* Reached the end of its life - remove it */
546 if (--op->range <=0) { 547 if (--op->range <=0) {
547 if (op->other_arch) { 548 if (op->other_arch) {
548 explode_bullet (op); 549 explode_bullet (op);
549 } else { 550 } else {
550 remove_ob (op); 551 remove_ob (op);
551 free_object (op); 552 free_object (op);
552 } 553 }
553 return; 554 return;
554 } 555 }
555 556
556 new_x = op->x + DIRX(op); 557 new_x = op->x + DIRX(op);
557 new_y = op->y + DIRY(op); 558 new_y = op->y + DIRY(op);
… …
603int fire_bullet(object *op,object *caster,int dir,object *spob) { 604int fire_bullet(object *op,object *caster,int dir,object *spob) {
604 object *tmp=NULL; 605 object *tmp=NULL;
605 int mflags; 606 int mflags;
606 607
607 if (!spob->other_arch) 608 if (!spob->other_arch)
608 return 0; 609 return 0;
609 610
610 tmp=arch_to_object(spob->other_arch); 611 tmp=arch_to_object(spob->other_arch);
611 if(tmp==NULL) 612 if(tmp==NULL)
612 return 0; 613 return 0;
613 614
614 /* peterm: level dependency for bolts */ 615 /* peterm: level dependency for bolts */
615 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);
616 tmp->attacktype = spob->attacktype; 617 tmp->attacktype = spob->attacktype;
617 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 618 if (spob->slaying) tmp->slaying = spob->slaying;
618 619
619 tmp->range = 50; 620 tmp->range = 50;
620 621
621 /* Need to store duration/range for the ball to use */ 622 /* Need to store duration/range for the ball to use */
622 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob); 623 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob);
623 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 624 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob);
624 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);
625 626
626 tmp->direction=dir; 627 tmp->direction=dir;
627 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 628 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
628 SET_ANIMATION(tmp, dir); 629 SET_ANIMATION(tmp, dir);
629 630
630 set_owner(tmp,op); 631 set_owner(tmp,op);
631 set_spell_skill(op, caster, spob, tmp); 632 set_spell_skill(op, caster, spob, tmp);
632 633
633 tmp->x=op->x + freearr_x[dir]; 634 tmp->x=op->x + freearr_x[dir];
634 tmp->y=op->y + freearr_y[dir]; 635 tmp->y=op->y + freearr_y[dir];
635 tmp->map = op->map; 636 tmp->map = op->map;
636 637
637 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);
638 if (mflags & P_OUT_OF_MAP) { 639 if (mflags & P_OUT_OF_MAP) {
639 free_object(tmp); 640 free_object(tmp);
640 return 0; 641 return 0;
641 } 642 }
642 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))) {
643 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 644 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
644 free_object(tmp); 645 free_object(tmp);
645 return 0; 646 return 0;
646 } 647 }
647 tmp->x=op->x; 648 tmp->x=op->x;
648 tmp->y=op->y; 649 tmp->y=op->y;
649 tmp->direction=absdir(tmp->direction+4); 650 tmp->direction=absdir(tmp->direction+4);
650 tmp->map = op->map; 651 tmp->map = op->map;
651 } 652 }
652 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) {
653 check_bullet (tmp); 654 check_bullet (tmp);
654 } 655 }
655 return 1; 656 return 1;
656} 657}
657 658
658 659
… …
674 new_ob->level = op->level; 675 new_ob->level = op->level;
675 set_owner(new_ob,op->owner); 676 set_owner(new_ob,op->owner);
676 677
677 /* preserve skill ownership */ 678 /* preserve skill ownership */
678 if(op->skill && op->skill != new_ob->skill) { 679 if(op->skill && op->skill != new_ob->skill) {
679 if (new_ob->skill) free_string(new_ob->skill); 680 new_ob->skill = op->skill;
680 new_ob->skill = add_refcount(op->skill);
681 } 681 }
682 insert_ob_in_map(new_ob,op->map,op,0); 682 insert_ob_in_map(new_ob,op->map,op,0);
683 683
684} 684}
685 685
… …
689 int i; 689 int i;
690 tag_t tag; 690 tag_t tag;
691 691
692 /* 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 */
693 if (! op->map) { 693 if (! op->map) {
694 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",
695 op->name ? op->name : "unknown"); 695 op->name ? &op->name : "unknown");
696 op->speed = 0; 696 op->speed = 0;
697 update_ob_speed (op); 697 update_ob_speed (op);
698 return; 698 return;
699 } 699 }
700 700
701 /* lava saves it's life, but not yours :) */ 701 /* lava saves it's life, but not yours :) */
702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) {
703 hit_map(op,0,op->attacktype,0); 703 hit_map(op,0,op->attacktype,0);
704 return; 704 return;
705 } 705 }
706 706
707#if 0 707#if 0
708 /* Disable this - enabling it makes monsters easier, as 708 /* Disable this - enabling it makes monsters easier, as
709 * when their cone dies when they die. 709 * when their cone dies when they die.
710 */ 710 */
711 /* If no owner left, the spell dies out. */ 711 /* If no owner left, the spell dies out. */
712 if(get_owner(op)==NULL) { 712 if(get_owner(op)==NULL) {
713 remove_ob(op); 713 remove_ob(op);
714 free_object(op); 714 free_object(op);
715 return; 715 return;
716 } 716 }
717#endif 717#endif
718 718
719 tag = op->count; 719 tag = op->count;
720 hit_map(op,0,op->attacktype,0); 720 hit_map(op,0,op->attacktype,0);
… …
727 727
728 if (was_destroyed (op, tag)) 728 if (was_destroyed (op, tag))
729 return; 729 return;
730 730
731 if((op->duration--)<0) { 731 if((op->duration--)<0) {
732 remove_ob(op); 732 remove_ob(op);
733 free_object(op); 733 free_object(op);
734 return; 734 return;
735 } 735 }
736 /* Object has hit maximum range, so don't have it move 736 /* Object has hit maximum range, so don't have it move
737 * any further. When the duration above expires, 737 * any further. When the duration above expires,
738 * then the object will get removed. 738 * then the object will get removed.
739 */ 739 */
740 if (--op->range < 0) { 740 if (--op->range < 0) {
741 op->range=0; /* just so it doesn't wrap */ 741 op->range=0; /* just so it doesn't wrap */
742 return; 742 return;
743 } 743 }
744 744
745 for(i= -1;i<2;i++) { 745 for(i= -1;i<2;i++) {
746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
747 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 747 y=op->y+freearr_y[absdir(op->stats.sp+i)];
748 748
749 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)) {
750 object *tmp=get_object(); 750 object *tmp=get_object();
751 copy_object(op, tmp); 751 copy_object(op, tmp);
752 tmp->x=x; 752 tmp->x=x;
753 tmp->y=y; 753 tmp->y=y;
754 754
755 tmp->duration = op->duration + 1; 755 tmp->duration = op->duration + 1;
756 756
757 /* Use for spell tracking - see ok_to_put_more() */ 757 /* Use for spell tracking - see ok_to_put_more() */
758 tmp->stats.maxhp = op->stats.maxhp; 758 tmp->stats.maxhp = op->stats.maxhp;
759 insert_ob_in_map(tmp,op->map,op,0); 759 insert_ob_in_map(tmp,op->map,op,0);
760 if (tmp->other_arch) cone_drop(tmp); 760 if (tmp->other_arch) cone_drop(tmp);
761 } 761 }
762 } 762 }
763} 763}
764 764
765/* cast_cone: casts a cone spell. 765/* cast_cone: casts a cone spell.
766 * op: person firing the object. 766 * op: person firing the object.
… …
780 780
781 if (!spell->other_arch) return 0; 781 if (!spell->other_arch) return 0;
782 782
783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) &&
784 op->attacktype & AT_TURN_UNDEAD) { 784 op->attacktype & AT_TURN_UNDEAD) {
785 new_draw_info(NDI_UNIQUE, 0,op, 785 new_draw_info(NDI_UNIQUE, 0,op,
786 "Your undead nature prevents you from turning undead!"); 786 "Your undead nature prevents you from turning undead!");
787 return 0; 787 return 0;
788 } 788 }
789 789
790 if(!dir) { 790 if(!dir) {
791 range_min= 0; 791 range_min= 0;
792 range_max=8; 792 range_max=8;
793 } 793 }
794 794
795 /* 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
796 * 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
797 * insert it into is blocked. 797 * insert it into is blocked.
798 */ 798 */
799 movetype = spell->other_arch->clone.move_type; 799 movetype = spell->other_arch->clone.move_type;
800 800
801 for(i=range_min;i<=range_max;i++) { 801 for(i=range_min;i<=range_max;i++) {
802 sint16 x,y, d; 802 sint16 x,y, d;
803 803
804 /* We can't use absdir here, because it never returns 804 /* We can't use absdir here, because it never returns
805 * 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
806 * 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
807 * to hit that person. 807 * to hit that person.
808 */ 808 */
809 d = dir + i; 809 d = dir + i;
810 while (d < 0) d+=8; 810 while (d < 0) d+=8;
811 while (d > 8) d-=8; 811 while (d > 8) d-=8;
812 812
813 /* 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.
814 * In that case, we have to see - if dir is specified, 814 * In that case, we have to see - if dir is specified,
815 * turn this into direction 8. If dir is not specified (all 815 * turn this into direction 8. If dir is not specified (all
816 * direction) skip - otherwise, one line would do more damage 816 * direction) skip - otherwise, one line would do more damage
817 * becase 0 direction will go through 9 directions - necessary 817 * becase 0 direction will go through 9 directions - necessary
818 * for the rune code. 818 * for the rune code.
819 */ 819 */
820 if (caster->type != RUNE && d==0) { 820 if (caster->type != RUNE && d==0) {
821 if (dir!=0) d=8; 821 if (dir!=0) d=8;
822 else continue; 822 else continue;
823 } 823 }
824 824
825 x = op->x+freearr_x[d]; 825 x = op->x+freearr_x[d];
826 y = op->y+freearr_y[d]; 826 y = op->y+freearr_y[d];
827 827
828 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)
829 continue; 829 continue;
830 830
831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
832 continue; 832 continue;
833 833
834 success=1; 834 success=1;
835 tmp=arch_to_object(spell->other_arch); 835 tmp=arch_to_object(spell->other_arch);
836 set_owner(tmp,op); 836 set_owner(tmp,op);
837 set_spell_skill(op, caster, spell, tmp); 837 set_spell_skill(op, caster, spell, tmp);
838 tmp->level = caster_level (caster, spell); 838 tmp->level = caster_level (caster, spell);
839 tmp->x = sx; 839 tmp->x = sx;
840 tmp->y = sy; 840 tmp->y = sy;
841 tmp->attacktype=spell->attacktype; 841 tmp->attacktype=spell->attacktype;
842 842
843 /* holy word stuff */ 843 /* holy word stuff */
844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) {
845 if(!tailor_god_spell(tmp,op)) return 0; 845 if(!tailor_god_spell(tmp,op)) return 0;
846 } 846 }
847 847
848 if(dir) 848 if(dir)
849 tmp->stats.sp=dir; 849 tmp->stats.sp=dir;
850 else 850 else
851 tmp->stats.sp=i; 851 tmp->stats.sp=i;
852 852
853 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 853 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
854 854
855 /* 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 */
856 if (dir == 0) { 856 if (dir == 0) {
857 tmp->range /= 4; 857 tmp->range /= 4;
858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2;
859 } 859 }
860 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);
861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell);
862 862
863 /* Special bonus for fear attacks */ 863 /* Special bonus for fear attacks */
864 if (tmp->attacktype & AT_FEAR) { 864 if (tmp->attacktype & AT_FEAR) {
865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha];
866 else 866 else
867 tmp->duration += caster->level/3; 867 tmp->duration += caster->level/3;
868 } 868 }
869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) {
870 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;
871 else 871 else
872 tmp->duration += caster->level/3; 872 tmp->duration += caster->level/3;
873 } 873 }
874 874
875 875
876 if ( !(tmp->move_type & MOVE_FLY_LOW)) 876 if ( !(tmp->move_type & MOVE_FLY_LOW))
877 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",
878 spell->other_arch->name); 878 &spell->other_arch->name);
879 879
880 if (!tmp->move_on && tmp->stats.dam) { 880 if (!tmp->move_on && tmp->stats.dam) {
881 LOG (llevDebug, 881 LOG (llevDebug,
882 "cast_cone(): arch %s doesn't have move_on set\n", 882 "cast_cone(): arch %s doesn't have move_on set\n",
883 spell->other_arch->name); 883 &spell->other_arch->name);
884 } 884 }
885 insert_ob_in_map(tmp,m,op,0); 885 insert_ob_in_map(tmp,m,op,0);
886 886
887 /* 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
888 * a single space too many times. 888 * a single space too many times.
889 */ 889 */
890 tmp->stats.maxhp = tmp->count; 890 tmp->stats.maxhp = tmp->count;
891 891
892 if(tmp->other_arch) cone_drop(tmp); 892 if(tmp->other_arch) cone_drop(tmp);
893 } 893 }
894 return success; 894 return success;
895} 895}
896 896
897/**************************************************************************** 897/****************************************************************************
… …
908 int i; 908 int i;
909 object *env, *tmp; 909 object *env, *tmp;
910 archetype *at; 910 archetype *at;
911 911
912 if(op->state!=NUM_ANIMATIONS(op)-1) 912 if(op->state!=NUM_ANIMATIONS(op)-1)
913 return; 913 return;
914
914 915
915 env = object_get_env_recursive(op); 916 env = object_get_env_recursive(op);
916 917
917 if (op->env) { 918 if (op->env) {
918 if (env->map == NULL) 919 if (env->map == NULL)
919 return; 920 return;
920 921
921 if (env->type == PLAYER) 922 if (env->type == PLAYER)
922 esrv_del_item(env->contr, op->count); 923 esrv_del_item(env->contr, op->count);
923 924
924 remove_ob(op); 925 remove_ob(op);
925 op->x = env->x; 926 op->x = env->x;
926 op->y = env->y; 927 op->y = env->y;
927 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);
928 return; 939 return;
929 } 940 }
930 941
931 /* This copies a lot of the code from the fire bullet, 942 /* This copies a lot of the code from the fire bullet,
932 * but using the cast_bullet isn't really feasible, 943 * but using the cast_bullet isn't really feasible,
933 * so just set up the appropriate values. 944 * so just set up the appropriate values.
934 */ 945 */
935 at = find_archetype(SPLINT); 946 at = find_archetype(SPLINT);
936 if (at) { 947 if (at) {
937 for(i=1;i<9;i++) { 948 for(i=1;i<9;i++) {
938 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]))
939 continue; 950 continue;
940 tmp = arch_to_object(at); 951 tmp = arch_to_object(at);
941 tmp->direction = i; 952 tmp->direction = i;
942 tmp->range = op->range; 953 tmp->range = op->range;
943 tmp->stats.dam = op->stats.dam; 954 tmp->stats.dam = op->stats.dam;
944 tmp->duration = op->duration; 955 tmp->duration = op->duration;
945 tmp->attacktype = op->attacktype; 956 tmp->attacktype = op->attacktype;
946 copy_owner (tmp, op); 957 copy_owner (tmp, op);
947 if(op->skill && op->skill != tmp->skill) { 958 if(op->skill && op->skill != tmp->skill) {
948 if (tmp->skill) free_string(tmp->skill); 959 tmp->skill = op->skill;
949 tmp->skill = add_refcount(op->skill); 960 }
950 }
951 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 961 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
952 SET_ANIMATION(tmp, i); 962 SET_ANIMATION(tmp, i);
953 tmp->x = op->x + freearr_x[i]; 963 tmp->x = op->x + freearr_x[i];
954 tmp->y = op->y + freearr_x[i]; 964 tmp->y = op->y + freearr_x[i];
955 insert_ob_in_map(tmp, op->map, op, 0); 965 insert_ob_in_map(tmp, op->map, op, 0);
956 move_bullet(tmp); 966 move_bullet(tmp);
957 } 967 }
958 } 968 }
959 969
960 explode_bullet(op); 970 explode_bullet(op);
961} 971}
962 972
… …
967 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];
968 mapstruct *m; 978 mapstruct *m;
969 979
970 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 980 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy);
971 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)) {
972 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.");
973 return 0; 983 return 0;
974 } 984 }
975 tmp=arch_to_object(spell->other_arch); 985 tmp=arch_to_object(spell->other_arch);
976 986
977 /* level dependencies for bomb */ 987 /* level dependencies for bomb */
978 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 988 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
… …
1011 mapstruct *mp; 1021 mapstruct *mp;
1012 1022
1013 if (dir==0) return NULL; 1023 if (dir==0) return NULL;
1014 1024
1015 for (dist=1; dist<range; dist++) { 1025 for (dist=1; dist<range; dist++) {
1016 x = op->x + freearr_x[dir] * dist; 1026 x = op->x + freearr_x[dir] * dist;
1017 y = op->y + freearr_y[dir] * dist; 1027 y = op->y + freearr_y[dir] * dist;
1018 mp = op->map; 1028 mp = op->map;
1019 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1029 mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
1020 1030
1021 if (mflags & P_OUT_OF_MAP) return NULL; 1031 if (mflags & P_OUT_OF_MAP) return NULL;
1022 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1032 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
1023 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1033 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
1024 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;
1025 1035
1026 if (mflags & P_IS_ALIVE) { 1036 if (mflags & P_IS_ALIVE) {
1027 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) {
1028 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1038 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
1029 return target; 1039 return target;
1030 } 1040 }
1031 } 1041 }
1032 } 1042 }
1033 } 1043 }
1034 return NULL; 1044 return NULL;
1035} 1045}
1036 1046
1037 1047
… …
1068 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1078 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded.");
1069 return 0; 1079 return 0;
1070 } 1080 }
1071 1081
1072 if (spell->other_arch) 1082 if (spell->other_arch)
1073 effect = arch_to_object(spell->other_arch); 1083 effect = arch_to_object(spell->other_arch);
1074 else 1084 else
1075 return 0; 1085 return 0;
1076 1086
1077 /* tailor the effect by priest level and worshipped God */ 1087 /* tailor the effect by priest level and worshipped God */
1078 effect->level = caster_level (caster, spell); 1088 effect->level = caster_level (caster, spell);
1079 effect->attacktype = spell->attacktype; 1089 effect->attacktype = spell->attacktype;
1080 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1090 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) {
… …
1082 new_draw_info_format(NDI_UNIQUE,0,op, 1092 new_draw_info_format(NDI_UNIQUE,0,op,
1083 "%s answers your call!",determine_god(op)); 1093 "%s answers your call!",determine_god(op));
1084 else { 1094 else {
1085 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1095 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored.");
1086 return 0; 1096 return 0;
1087 } 1097 }
1088 } 1098 }
1089 1099
1090 /* size of the area of destruction */ 1100 /* size of the area of destruction */
1091 effect->range=spell->range + 1101 effect->range=spell->range +
1092 SP_level_range_adjust(caster,spell); 1102 SP_level_range_adjust(caster,spell);
1093 effect->duration=spell->duration + 1103 effect->duration=spell->duration +
1094 SP_level_range_adjust(caster,spell); 1104 SP_level_range_adjust(caster,spell);
1095 1105
1096 if (effect->attacktype & AT_DEATH) { 1106 if (effect->attacktype & AT_DEATH) {
1097 effect->level=spell->stats.dam + 1107 effect->level=spell->stats.dam +
1098 SP_level_dam_adjust(caster,spell); 1108 SP_level_dam_adjust(caster,spell);
1099 1109
1100 /* casting death spells at undead isn't a good thing */ 1110 /* casting death spells at undead isn't a good thing */
1101 if QUERY_FLAG(target, FLAG_UNDEAD) { 1111 if QUERY_FLAG(target, FLAG_UNDEAD) {
1102 if(random_roll(0, 2, op, PREFER_LOW)) { 1112 if(random_roll(0, 2, op, PREFER_LOW)) {
1103 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1113 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
1104 effect->x=op->x; 1114 effect->x=op->x;
1105 effect->y=op->y; 1115 effect->y=op->y;
1106 } else { 1116 } else {
1107 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!",
1108 query_name(target)); 1118 query_name(target));
1109 target->stats.hp = target->stats.maxhp*2; 1119 target->stats.hp = target->stats.maxhp*2;
1110 free_object(effect); 1120 free_object(effect);
1111 return 0; 1121 return 0;
1112 } 1122 }
1113 } 1123 }
1114 } else { 1124 } else {
1115 /* how much woe to inflict :) */ 1125 /* how much woe to inflict :) */
1116 effect->stats.dam=spell->stats.dam + 1126 effect->stats.dam=spell->stats.dam +
1117 SP_level_dam_adjust(caster,spell); 1127 SP_level_dam_adjust(caster,spell);
1118 } 1128 }
1119 1129
1120 set_owner(effect,op); 1130 set_owner(effect,op);
1121 set_spell_skill(op, caster, spell, effect); 1131 set_spell_skill(op, caster, spell, effect);
… …
1142 object *owner; 1152 object *owner;
1143 sint16 new_x, new_y; 1153 sint16 new_x, new_y;
1144 mapstruct *m; 1154 mapstruct *m;
1145 1155
1146 if (op->range-- <=0) { 1156 if (op->range-- <=0) {
1147 remove_ob(op); 1157 remove_ob(op);
1148 free_object(op); 1158 free_object(op);
1149 return; 1159 return;
1150 } 1160 }
1151 1161
1152 owner = get_owner(op); 1162 owner = get_owner(op);
1153#if 0 1163#if 0
1154 /* 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
1155 * monster that are then killed would continue to survive 1165 * monster that are then killed would continue to survive
1156 */ 1166 */
1157 if (owner == NULL) { 1167 if (owner == NULL) {
1158 remove_ob(op); 1168 remove_ob(op);
1159 free_object(op); 1169 free_object(op);
1160 return; 1170 return;
1161 } 1171 }
1162#endif 1172#endif
1163 1173
1164 new_x = op->x + DIRX(op); 1174 new_x = op->x + DIRX(op);
1165 new_y = op->y + DIRY(op); 1175 new_y = op->y + DIRY(op);
1166 1176
1167 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);
1168 1178
1169 if (!(mflags & P_OUT_OF_MAP) && 1179 if (!(mflags & P_OUT_OF_MAP) &&
1170 ((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)))) {
1171 tag_t tag = op->count; 1181 tag_t tag = op->count;
1172 hit_map (op, op->direction, AT_MAGIC, 1); 1182 hit_map (op, op->direction, AT_MAGIC, 1);
1173 /* Basically, missile only hits one thing then goes away. 1183 /* Basically, missile only hits one thing then goes away.
1174 * 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.
1175 */ 1185 */
1176 if ( ! was_destroyed (op, tag)) { 1186 if ( ! was_destroyed (op, tag)) {
1177 remove_ob (op); 1187 remove_ob (op);
1178 free_object(op); 1188 free_object(op);
1179 } 1189 }
1180 return; 1190 return;
1181 } 1191 }
1182 1192
1183 remove_ob(op); 1193 remove_ob(op);
1184 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1194 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
1185 free_object(op); 1195 free_object(op);
1186 return; 1196 return;
1187 } 1197 }
1188 op->x = new_x; 1198 op->x = new_x;
1189 op->y = new_y; 1199 op->y = new_y;
1190 op->map = m; 1200 op->map = m;
1191 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));
1192 if(i > 0 && i != op->direction){ 1202 if(i > 0 && i != op->direction){
1193 op->direction=i; 1203 op->direction=i;
1194 SET_ANIMATION(op, op->direction); 1204 SET_ANIMATION(op, op->direction);
1195 } 1205 }
1196 insert_ob_in_map(op,op->map,op,0); 1206 insert_ob_in_map(op,op->map,op,0);
1197} 1207}
1198 1208
1199/**************************************************************************** 1209/****************************************************************************
… …
1209int make_object_glow(object *op, int radius, int time) { 1219int make_object_glow(object *op, int radius, int time) {
1210 object *tmp; 1220 object *tmp;
1211 1221
1212 /* some things are unaffected... */ 1222 /* some things are unaffected... */
1213 if(op->path_denied&PATH_LIGHT) 1223 if(op->path_denied&PATH_LIGHT)
1214 return 0; 1224 return 0;
1215 1225
1216 tmp=get_archetype(FORCE_NAME); 1226 tmp=get_archetype(FORCE_NAME);
1217 tmp->speed = 0.01; 1227 tmp->speed = 0.01;
1218 tmp->stats.food = time; 1228 tmp->stats.food = time;
1219 SET_FLAG(tmp, FLAG_IS_USED_UP); 1229 SET_FLAG(tmp, FLAG_IS_USED_UP);
1220 tmp->glow_radius=radius; 1230 tmp->glow_radius=radius;
1221 if (tmp->glow_radius > MAX_LIGHT_RADII) 1231 if (tmp->glow_radius > MAX_LIGHT_RADII)
1222 tmp->glow_radius = MAX_LIGHT_RADII; 1232 tmp->glow_radius = MAX_LIGHT_RADII;
1223 1233
1224 tmp->x=op->x; 1234 tmp->x=op->x;
1225 tmp->y=op->y; 1235 tmp->y=op->y;
1226 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 */
1227 tmp=insert_ob_in_ob(tmp,op); 1237 tmp=insert_ob_in_ob(tmp,op);
1228 if (tmp->glow_radius > op->glow_radius) 1238 if (tmp->glow_radius > op->glow_radius)
1229 op->glow_radius = tmp->glow_radius; 1239 op->glow_radius = tmp->glow_radius;
1230 1240
1231 if(!tmp->env||op!=tmp->env) { 1241 if(!tmp->env||op!=tmp->env) {
1232 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",
1233 op->name); 1243 &op->name);
1234 return 0; 1244 return 0;
1235 } 1245 }
1236 return 1; 1246 return 1;
1237} 1247}
1238 1248
1239 1249
… …
1263 else op->skill = NULL; 1273 else op->skill = NULL;
1264 1274
1265 change_skill(op, find_skill_by_name(op, op->skill), 1); 1275 change_skill(op, find_skill_by_name(op, op->skill), 1);
1266 1276
1267 for(i= -range; i<range; i++) { 1277 for(i= -range; i<range; i++) {
1268 for(j=-range; j<range ; j++) { 1278 for(j=-range; j<range ; j++) {
1269 m = op->map; 1279 m = op->map;
1270 sx = op->x + i; 1280 sx = op->x + i;
1271 sy = op->y + j; 1281 sy = op->y + j;
1272 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1282 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy);
1273 if (mflags & P_OUT_OF_MAP) continue; 1283 if (mflags & P_OUT_OF_MAP) continue;
1274 if (mflags & P_IS_ALIVE) { 1284 if (mflags & P_IS_ALIVE) {
1275 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) {
1276 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1286 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break;
1277 } 1287 }
1278 if (tmp) { 1288 if (tmp) {
1279 if (tmp->head) tmp=tmp->head; 1289 if (tmp->head) tmp=tmp->head;
1280 1290
1281 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1291 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) ||
1282 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1292 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) {
1283 if (spell_ob->subtype == SP_DESTRUCTION) { 1293 if (spell_ob->subtype == SP_DESTRUCTION) {
1284 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1294 hit_player(tmp,dam,op,spell_ob->attacktype,0);
1285 if (spell_ob->other_arch) { 1295 if (spell_ob->other_arch) {
1286 tmp = arch_to_object(spell_ob->other_arch); 1296 tmp = arch_to_object(spell_ob->other_arch);
1287 tmp->x = sx; 1297 tmp->x = sx;
1288 tmp->y = sy; 1298 tmp->y = sy;
1289 insert_ob_in_map(tmp, m, op, 0); 1299 insert_ob_in_map(tmp, m, op, 0);
1290 } 1300 }
1291 } 1301 }
1292 else if (spell_ob->subtype == SP_FAERY_FIRE && 1302 else if (spell_ob->subtype == SP_FAERY_FIRE &&
1293 tmp->resist[ATNR_MAGIC]!=100) { 1303 tmp->resist[ATNR_MAGIC]!=100) {
1294 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1304 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) {
1295 object *effect = arch_to_object(spell_ob->other_arch); 1305 object *effect = arch_to_object(spell_ob->other_arch);
1296 effect->x = sx; 1306 effect->x = sx;
1297 effect->y = sy; 1307 effect->y = sy;
1298 insert_ob_in_map(effect, m, op, 0); 1308 insert_ob_in_map(effect, m, op, 0);
1299 } 1309 }
1300 } 1310 }
1301 } 1311 }
1302 } 1312 }
1303 } 1313 }
1304 } 1314 }
1305 } 1315 }
1306 op->skill = skill; 1316 op->skill = skill;
1307 return 1; 1317 return 1;
1308} 1318}
1309 1319
… …
1316int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1326int cast_curse(object *op, object *caster, object *spell_ob, int dir) {
1317 object *god = find_god(determine_god(op)); 1327 object *god = find_god(determine_god(op));
1318 object *tmp, *force; 1328 object *tmp, *force;
1319 1329
1320 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1330 tmp = get_pointed_target(op, (dir==0)?op->direction:dir,
1321 spell_ob->range, SPELL_GRACE); 1331 spell_ob->range, SPELL_GRACE);
1322 if (!tmp) { 1332 if (!tmp) {
1323 new_draw_info(NDI_UNIQUE, 0, op, 1333 new_draw_info(NDI_UNIQUE, 0, op,
1324 "There is no one in that direction to curse."); 1334 "There is no one in that direction to curse.");
1325 return 0; 1335 return 0;
1326 } 1336 }
1327 1337
1328 /* 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. */
1329 for(force=tmp->inv; force!=NULL; force=force->below) { 1339 for(force=tmp->inv; force!=NULL; force=force->below) {
1330 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1340 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) {
1331 if (force->name == spell_ob->name) { 1341 if (force->name == spell_ob->name) {
1332 break; 1342 break;
1333 } 1343 }
1334 else if (spell_ob->race && spell_ob->race == force->name) { 1344 else if (spell_ob->race && spell_ob->race == force->name) {
1335 new_draw_info_format(NDI_UNIQUE, 0, op, 1345 new_draw_info_format(NDI_UNIQUE, 0, op,
1336 "You can not cast %s while %s is in effect", 1346 "You can not cast %s while %s is in effect",
1337 spell_ob->name, force->name_pl); 1347 &spell_ob->name, &force->name_pl);
1338 return 0; 1348 return 0;
1339 } 1349 }
1340 } 1350 }
1341 } 1351 }
1342 1352
1343 if(force==NULL) { 1353 if(force==NULL) {
1344 force=get_archetype(FORCE_NAME); 1354 force=get_archetype(FORCE_NAME);
1345 force->subtype = FORCE_CHANGE_ABILITY; 1355 force->subtype = FORCE_CHANGE_ABILITY;
1346 free_string(force->name);
1347 if (spell_ob->race) 1356 if (spell_ob->race)
1348 force->name = add_refcount(spell_ob->race); 1357 force->name = spell_ob->race;
1349 else 1358 else
1359 force->name = spell_ob->name;
1360
1350 force->name = add_refcount(spell_ob->name); 1361 force->name_pl = spell_ob->name;
1351 free_string(force->name_pl);
1352 force->name_pl = add_refcount(spell_ob->name);
1353 1362
1354 } else { 1363 } else {
1355 int duration; 1364 int duration;
1356 1365
1357 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;
1358 if (duration > force->duration) { 1367 if (duration > force->duration) {
1359 force->duration = duration; 1368 force->duration = duration;
1360 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.");
1361 } else { 1370 } else {
1362 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.");
1363 } 1372 }
1364 return 1; 1373 return 1;
1365 } 1374 }
1366 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;
1367 force->speed = 1.0; 1376 force->speed = 1.0;
1368 force->speed_left = -1.0; 1377 force->speed_left = -1.0;
1369 SET_FLAG(force, FLAG_APPLIED); 1378 SET_FLAG(force, FLAG_APPLIED);
1370 1379
1371 if(god) { 1380 if(god) {
1372 if (spell_ob->last_grace) 1381 if (spell_ob->last_grace)
1373 force->path_repelled=god->path_repelled; 1382 force->path_repelled=god->path_repelled;
1374 if (spell_ob->last_grace) 1383 if (spell_ob->last_grace)
1375 force->path_denied=god->path_denied; 1384 force->path_denied=god->path_denied;
1376 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1385 new_draw_info_format(NDI_UNIQUE, 0,tmp,
1377 "You are a victim of %s's curse!",god->name); 1386 "You are a victim of %s's curse!", &god->name);
1378 } else 1387 } else
1379 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1388 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty.");
1380 1389
1381 1390
1382 if(tmp!=op && op->type==PLAYER) 1391 if(tmp!=op && op->type==PLAYER)
1383 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);
1384 1393
1385 force->stats.ac = spell_ob->stats.ac; 1394 force->stats.ac = spell_ob->stats.ac;
1386 force->stats.wc = spell_ob->stats.wc; 1395 force->stats.wc = spell_ob->stats.wc;
1387 1396
1388 change_abil(tmp,force); /* Mostly to display any messages */ 1397 change_abil(tmp,force); /* Mostly to display any messages */
… …
1425 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1434 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race;
1426 else race = spell->race; 1435 else race = spell->race;
1427 1436
1428 1437
1429 for (x = op->x - range; x <= op->x + range; x++) 1438 for (x = op->x - range; x <= op->x + range; x++)
1430 for (y = op->y - range; y <= op->y + range; y++) { 1439 for (y = op->y - range; y <= op->y + range; y++) {
1431 1440
1432 done_one=0; 1441 done_one=0;
1433 m = op->map; 1442 m = op->map;
1434 nx = x; 1443 nx = x;
1435 ny = y; 1444 ny = y;
1436 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1445 mflags = get_map_flags(m, &m, x, y, &nx, &ny);
1437 if (mflags & P_OUT_OF_MAP) continue; 1446 if (mflags & P_OUT_OF_MAP) continue;
1438 1447
1439 /* 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 */
1440 if (!(mflags & P_IS_ALIVE)) continue; 1449 if (!(mflags & P_IS_ALIVE)) continue;
1441 1450
1442 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)
1443 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1452 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break;
1444 1453
1445 /* There can be living objects that are not monsters */ 1454 /* There can be living objects that are not monsters */
1446 if (!tmp || tmp->type==PLAYER) continue; 1455 if (!tmp || tmp->type==PLAYER) continue;
1447 1456
1448 /* Only the head has meaningful data, so resolve to that */ 1457 /* Only the head has meaningful data, so resolve to that */
1449 if (tmp->head) head=tmp->head; 1458 if (tmp->head) head=tmp->head;
1450 else head=tmp; 1459 else head=tmp;
1451 1460
1452 /* 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 */
1453 if (race && head->race && !strstr(race, head->race)) continue; 1462 if (race && head->race && !strstr(race, head->race)) continue;
1454 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;
1455 1464
1456 /* Now do a bunch of stuff related to saving throws */ 1465 /* Now do a bunch of stuff related to saving throws */
1457 best_at = -1; 1466 best_at = -1;
1458 if (spell->attacktype) { 1467 if (spell->attacktype) {
1459 for (at=0; at < NROFATTACKS; at++) 1468 for (at=0; at < NROFATTACKS; at++)
1460 if (spell->attacktype & (1 << at)) 1469 if (spell->attacktype & (1 << at))
1461 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;
1462 1471
1463 if (best_at == -1) at=0; 1472 if (best_at == -1) at=0;
1464 else { 1473 else {
1465 if (head->resist[best_at] == 100) continue; 1474 if (head->resist[best_at] == 100) continue;
1466 else at = head->resist[best_at] / 5; 1475 else at = head->resist[best_at] / 5;
1467 } 1476 }
1468 at -= level / 5; 1477 at -= level / 5;
1469 if (did_make_save(head, head->level, at)) continue; 1478 if (did_make_save(head, head->level, at)) continue;
1470 } 1479 }
1471 else /* spell->attacktype */ 1480 else /* spell->attacktype */
1472 /* 1481 /*
1473 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:
1474 * if spell level < monster level, no go 1483 * if spell level < monster level, no go
1475 * 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 ) )
… …
1486 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 ) ) ) )
1487 /* Failed, no effect */ 1496 /* Failed, no effect */
1488 continue; 1497 continue;
1489 } 1498 }
1490 1499
1491 /* Done with saving throw. Now start effecting the monster */ 1500 /* Done with saving throw. Now start effecting the monster */
1492 1501
1493 /* aggravation */ 1502 /* aggravation */
1494 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1503 if (QUERY_FLAG(spell, FLAG_MONSTER)) {
1495 CLEAR_FLAG(head, FLAG_SLEEP); 1504 CLEAR_FLAG(head, FLAG_SLEEP);
1496 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1505 if (QUERY_FLAG(head, FLAG_FRIENDLY))
1497 remove_friendly_object(head); 1506 remove_friendly_object(head);
1498 1507
1499 done_one = 1; 1508 done_one = 1;
1500 head->enemy = op; 1509 head->enemy = op;
1501 } 1510 }
1502 1511
1503 /* calm monsters */ 1512 /* calm monsters */
1504 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1513 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) {
1505 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1514 SET_FLAG(head, FLAG_UNAGGRESSIVE);
1506 head->enemy = NULL; 1515 head->enemy = NULL;
1507 done_one = 1; 1516 done_one = 1;
1508 } 1517 }
1509 1518
1510 /* berserk monsters */ 1519 /* berserk monsters */
1511 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1520 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) {
1512 SET_FLAG(head, FLAG_BERSERK); 1521 SET_FLAG(head, FLAG_BERSERK);
1513 done_one = 1; 1522 done_one = 1;
1514 } 1523 }
1515 /* charm */ 1524 /* charm */
1516 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)) {
1517 SET_FLAG(head, FLAG_FRIENDLY); 1526 SET_FLAG(head, FLAG_FRIENDLY);
1518 /* Prevent uncontolled outbreaks of self replicating monsters. 1527 /* Prevent uncontolled outbreaks of self replicating monsters.
1519 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.
1520 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. */
1521 CLEAR_FLAG(head, FLAG_GENERATOR); 1530 CLEAR_FLAG(head, FLAG_GENERATOR);
1522 set_owner(head, op); 1531 set_owner(head, op);
1523 set_spell_skill(op, caster, spell, head); 1532 set_spell_skill(op, caster, spell, head);
1524 add_friendly_object(head); 1533 add_friendly_object(head);
1525 head->attack_movement = PETMOVE; 1534 head->attack_movement = PETMOVE;
1526 done_one = 1; 1535 done_one = 1;
1527 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);
1528 head->stats.exp = 0; 1537 head->stats.exp = 0;
1529 } 1538 }
1530 1539
1531 /* If a monster was effected, put an effect in */ 1540 /* If a monster was effected, put an effect in */
1532 if (done_one && spell->other_arch) { 1541 if (done_one && spell->other_arch) {
1533 tmp = arch_to_object(spell->other_arch); 1542 tmp = arch_to_object(spell->other_arch);
1534 tmp->x = nx; 1543 tmp->x = nx;
1535 tmp->y = ny; 1544 tmp->y = ny;
1536 insert_ob_in_map(tmp, m, op, 0); 1545 insert_ob_in_map(tmp, m, op, 0);
1537 } 1546 }
1538 } /* for y */ 1547 } /* for y */
1539 1548
1540 return 1; 1549 return 1;
1541} 1550}
1542 1551
1543 1552
… …
1563 * deviations. 1572 * deviations.
1564 */ 1573 */
1565 1574
1566 dir = 0; 1575 dir = 0;
1567 if(!(rndm(0, 3))) 1576 if(!(rndm(0, 3)))
1568 j = rndm(0, 1); 1577 j = rndm(0, 1);
1569 else j=0; 1578 else j=0;
1570 1579
1571 for(i = 1; i < 9; i++) { 1580 for(i = 1; i < 9; i++) {
1572 /* i bit 0: alters sign of offset 1581 /* i bit 0: alters sign of offset
1573 * other bits (i / 2): absolute value of offset 1582 * other bits (i / 2): absolute value of offset
1574 */ 1583 */
1575 1584
1576 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1585 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2);
1577 int tmpdir = absdir (op->direction + offset); 1586 int tmpdir = absdir (op->direction + offset);
1578 1587
1579 nx = op->x + freearr_x[tmpdir]; 1588 nx = op->x + freearr_x[tmpdir];
1580 ny = op->y + freearr_y[tmpdir]; 1589 ny = op->y + freearr_y[tmpdir];
1581 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) &&
1582 !(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)))) {
1583 dir = tmpdir; 1592 dir = tmpdir;
1584 break; 1593 break;
1585 } 1594 }
1586 } 1595 }
1587 if (dir == 0) { 1596 if (dir == 0) {
1588 nx = op->x; 1597 nx = op->x;
1589 ny = op->y; 1598 ny = op->y;
1590 m = op->map; 1599 m = op->map;
1591 } 1600 }
1592 1601
1593 remove_ob(op); 1602 remove_ob(op);
1594 op->y=ny; 1603 op->y=ny;
1595 op->x=nx; 1604 op->x=nx;
1596 insert_ob_in_map(op,m,op,0); 1605 insert_ob_in_map(op,m,op,0);
1597 1606
1598 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
1599 surrounding squares */ 1608 surrounding squares */
1600 1609
1601 /* loop over current square and neighbors to hit. 1610 /* loop over current square and neighbors to hit.
1602 * if this has an other_arch field, we insert that in 1611 * if this has an other_arch field, we insert that in
1603 * the surround spaces. 1612 * the surround spaces.
1604 */ 1613 */
1605 for(j=0;j<9;j++) { 1614 for(j=0;j<9;j++) {
1606 object *new_ob; 1615 object *new_ob;
1607 1616
1608 hx = nx+freearr_x[j]; 1617 hx = nx+freearr_x[j];
1609 hy = ny+freearr_y[j]; 1618 hy = ny+freearr_y[j];
1610 1619
1611 m = op->map; 1620 m = op->map;
1612 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1621 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy);
1613 1622
1614 if (mflags & P_OUT_OF_MAP) continue; 1623 if (mflags & P_OUT_OF_MAP) continue;
1615 1624
1616 /* 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
1617 * of the map either. 1626 * of the map either.
1618 */ 1627 */
1619 1628
1620 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))) {
1621 if(j) op->stats.dam = dam_save/2; 1630 if(j) op->stats.dam = dam_save/2;
1622 hit_map(op,j,op->attacktype,1); 1631 hit_map(op,j,op->attacktype,1);
1623 1632
1624 } 1633 }
1625 1634
1626 /* insert the other arch */ 1635 /* insert the other arch */
1627 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)))) {
1628 new_ob = arch_to_object(op->other_arch); 1637 new_ob = arch_to_object(op->other_arch);
1629 new_ob->x = hx; 1638 new_ob->x = hx;
1630 new_ob->y = hy; 1639 new_ob->y = hy;
1631 insert_ob_in_map(new_ob,m,op,0); 1640 insert_ob_in_map(new_ob,m,op,0);
1632 } 1641 }
1633 } 1642 }
1634 1643
1635 /* restore to the center location and damage*/ 1644 /* restore to the center location and damage*/
1636 op->stats.dam = dam_save; 1645 op->stats.dam = dam_save;
1637 1646
1638 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));
1639 1648
1640 if(i>=0) { /* we have a preferred direction! */ 1649 if(i>=0) { /* we have a preferred direction! */
1641 /* pick another direction if the preferred dir is blocked. */ 1650 /* pick another direction if the preferred dir is blocked. */
1642 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 ||
1643 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))) {
1644 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1653 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */
1645 } 1654 }
1646 op->direction=i; 1655 op->direction=i;
1647 } 1656 }
1648} 1657}
1649 1658
1650 1659
1651/* move_swarm_spell: peterm 1660/* move_swarm_spell: peterm
… …
1665 mapstruct *m; 1674 mapstruct *m;
1666 object *owner; 1675 object *owner;
1667 1676
1668 owner = get_owner(op); 1677 owner = get_owner(op);
1669 if(op->duration == 0 || owner == NULL) { 1678 if(op->duration == 0 || owner == NULL) {
1670 remove_ob(op); 1679 remove_ob(op);
1671 free_object(op); 1680 free_object(op);
1672 return; 1681 return;
1673 } 1682 }
1674 op->duration--; 1683 op->duration--;
1675 1684
1676 basedir = op->direction; 1685 basedir = op->direction;
1677 if(basedir == 0) { 1686 if(basedir == 0) {
… …
1715 * 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,
1716 * do some sanity checking anyways. 1725 * do some sanity checking anyways.
1717 */ 1726 */
1718 1727
1719 if (op->spell && op->spell->type == SPELL && 1728 if (op->spell && op->spell->type == SPELL &&
1720 !(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) &&
1721 !(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)))) {
1722 1731
1723 /* 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 */
1724 if (op->spell->subtype == SP_BULLET) 1733 if (op->spell->subtype == SP_BULLET)
1725 fire_bullet(owner, op, basedir, op->spell); 1734 fire_bullet(owner, op, basedir, op->spell);
1726 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1735 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1727 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);
1728 } 1737 }
1729#endif 1738#endif
1730 1739
1731 /* 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
1732 * should just be a pointer to the spell in some inventory, 1741 * should just be a pointer to the spell in some inventory,
… …
1734 * do some sanity checking anyways. 1743 * do some sanity checking anyways.
1735 */ 1744 */
1736 1745
1737 if (op->spell && op->spell->type == SPELL) 1746 if (op->spell && op->spell->type == SPELL)
1738 { 1747 {
1739 /* 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 */
1740 if (op->spell->subtype == SP_BULLET) 1749 if (op->spell->subtype == SP_BULLET)
1741 fire_bullet(owner, op, basedir, op->spell); 1750 fire_bullet(owner, op, basedir, op->spell);
1742 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1751 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1743 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);
1744 } 1753 }
1745} 1754}
1746 1755
1747 1756
1748 1757
… …
1776 tmp->spell = arch_to_object(spell->other_arch); 1785 tmp->spell = arch_to_object(spell->other_arch);
1777 1786
1778 tmp->attacktype = tmp->spell->attacktype; 1787 tmp->attacktype = tmp->spell->attacktype;
1779 1788
1780 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 1789 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) {
1781 if ( ! tailor_god_spell (tmp, op)) 1790 if ( ! tailor_god_spell (tmp, op))
1782 return 1; 1791 return 1;
1783 } 1792 }
1784 tmp->duration = SP_level_duration_adjust(caster, spell); 1793 tmp->duration = SP_level_duration_adjust(caster, spell);
1785 for (i=0; i< spell->duration; i++) 1794 for (i=0; i< spell->duration; i++)
1786 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 1795 tmp->duration += die_roll(1, 3, op, PREFER_HIGH);
1787 1796
1788 tmp->direction=dir; 1797 tmp->direction=dir;
1789 tmp->invisible=1; 1798 tmp->invisible=1;
1790 insert_ob_in_map(tmp,op->map,op,0); 1799 insert_ob_in_map(tmp,op->map,op,0);
1791 return 1; 1800 return 1;
… …
1802 mapstruct *m; 1811 mapstruct *m;
1803 1812
1804 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 1813 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell);
1805 1814
1806 if(!dir) { 1815 if(!dir) {
1807 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 1816 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?");
1808 return 0; 1817 return 0;
1809 } 1818 }
1810 1819
1811 x=op->x+freearr_x[dir]; 1820 x=op->x+freearr_x[dir];
1812 y=op->y+freearr_y[dir]; 1821 y=op->y+freearr_y[dir];
1813 m = op->map; 1822 m = op->map;
1814 1823
1815 mflags = get_map_flags(m, &m, x, y, &x, &y); 1824 mflags = get_map_flags(m, &m, x, y, &x, &y);
1816 1825
1817 if (mflags & P_OUT_OF_MAP) { 1826 if (mflags & P_OUT_OF_MAP) {
1818 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 1827 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there.");
1819 return 0; 1828 return 0;
1820 } 1829 }
1821 1830
1822 if (mflags & P_IS_ALIVE && spell->attacktype) { 1831 if (mflags & P_IS_ALIVE && spell->attacktype) {
1823 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)
1824 if(QUERY_FLAG(target,FLAG_MONSTER)) { 1833 if(QUERY_FLAG(target,FLAG_MONSTER)) {
1825 /* oky doky. got a target monster. Lets make a blinding attack */ 1834 /* oky doky. got a target monster. Lets make a blinding attack */
1826 if(target->head) target = target->head; 1835 if(target->head) target = target->head;
1827 (void) hit_player(target,dam,op,spell->attacktype,1); 1836 (void) hit_player(target,dam,op,spell->attacktype,1);
1828 return 1; /* one success only! */ 1837 return 1; /* one success only! */
1829 } 1838 }
1830 } 1839 }
1831 1840
1832 /* no live target, perhaps a wall is in the way? */ 1841 /* no live target, perhaps a wall is in the way? */
1833 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))) {
1834 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.");
1835 return 0; 1844 return 0;
1836 } 1845 }
1837 1846
1838 /* 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 */
1839 tmp=arch_to_object(spell->other_arch); 1848 tmp=arch_to_object(spell->other_arch);
1840 if(!tmp) { 1849 if(!tmp) {
1841 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 1850 LOG(llevError,"Error: spell arch for cast_light() missing.\n");
1842 return 0; 1851 return 0;
1843 } 1852 }
1844 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 1853 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell);
1845 if (tmp->glow_radius) { 1854 if (tmp->glow_radius) {
1846 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 1855 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell);
1847 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;
1848 } 1857 }
1849 tmp->x=x; 1858 tmp->x=x;
1850 tmp->y=y; 1859 tmp->y=y;
1851 insert_ob_in_map(tmp,m,op,0); 1860 insert_ob_in_map(tmp,m,op,0);
1852 return 1; 1861 return 1;
… …
1882 dam_mod = SP_level_dam_adjust(caster, spell); 1891 dam_mod = SP_level_dam_adjust(caster, spell);
1883 dur_mod = SP_level_duration_adjust(caster, spell); 1892 dur_mod = SP_level_duration_adjust(caster, spell);
1884 1893
1885 /* search in a line for a victim */ 1894 /* search in a line for a victim */
1886 for(i=1; i<range; i++) { 1895 for(i=1; i<range; i++) {
1887 x = op->x + i * freearr_x[dir]; 1896 x = op->x + i * freearr_x[dir];
1888 y = op->y + i * freearr_y[dir]; 1897 y = op->y + i * freearr_y[dir];
1889 m = op->map; 1898 m = op->map;
1890 1899
1891 mflags = get_map_flags(m, &m, x, y, &x, &y); 1900 mflags = get_map_flags(m, &m, x, y, &x, &y);
1892 1901
1893 if (mflags & P_OUT_OF_MAP) return 0; 1902 if (mflags & P_OUT_OF_MAP) return 0;
1894 1903
1895 /* don't go through walls - presume diseases are airborne */ 1904 /* don't go through walls - presume diseases are airborne */
1896 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;
1897 1906
1898 /* 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 */
1899 if (mflags & P_IS_ALIVE) { 1908 if (mflags & P_IS_ALIVE) {
1900 /* search this square for a victim */ 1909 /* search this square for a victim */
1901 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)
1902 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 */
1903 object *disease = arch_to_object(spell->other_arch); 1912 object *disease = arch_to_object(spell->other_arch);
1904 1913
1905 set_owner(disease,op); 1914 set_owner(disease,op);
1906 set_spell_skill(op, caster, spell, disease); 1915 set_spell_skill(op, caster, spell, disease);
1907 disease->stats.exp = 0; 1916 disease->stats.exp = 0;
1908 disease->level = caster_level(caster, spell); 1917 disease->level = caster_level(caster, spell);
1909 1918
1910 /* do level adjustments */ 1919 /* do level adjustments */
1911 if(disease->stats.wc) 1920 if(disease->stats.wc)
1912 disease->stats.wc += dur_mod/2; 1921 disease->stats.wc += dur_mod/2;
1913 1922
1914 if(disease->magic> 0) 1923 if(disease->magic> 0)
1915 disease->magic += dur_mod/4; 1924 disease->magic += dur_mod/4;
1916 1925
1917 if(disease->stats.maxhp>0) 1926 if(disease->stats.maxhp>0)
1918 disease->stats.maxhp += dur_mod; 1927 disease->stats.maxhp += dur_mod;
1919 1928
1920 if(disease->stats.maxgrace>0) 1929 if(disease->stats.maxgrace>0)
1921 disease->stats.maxgrace += dur_mod; 1930 disease->stats.maxgrace += dur_mod;
1922 1931
1923 if(disease->stats.dam) { 1932 if(disease->stats.dam) {
1924 if(disease->stats.dam > 0) 1933 if(disease->stats.dam > 0)
1925 disease->stats.dam += dam_mod; 1934 disease->stats.dam += dam_mod;
1926 else disease->stats.dam -= dam_mod; 1935 else disease->stats.dam -= dam_mod;
1927 } 1936 }
1928 1937
1929 if(disease->last_sp) { 1938 if(disease->last_sp) {
1930 disease->last_sp -= 2*dam_mod; 1939 disease->last_sp -= 2*dam_mod;
1931 if(disease->last_sp <1) disease->last_sp = 1; 1940 if(disease->last_sp <1) disease->last_sp = 1;
1932 } 1941 }
1933 1942
1934 if(disease->stats.maxsp) { 1943 if(disease->stats.maxsp) {
1935 if(disease->stats.maxsp > 0) 1944 if(disease->stats.maxsp > 0)
1936 disease->stats.maxsp += dam_mod; 1945 disease->stats.maxsp += dam_mod;
1937 else disease->stats.maxsp -= dam_mod; 1946 else disease->stats.maxsp -= dam_mod;
1938 } 1947 }
1939 1948
1940 if(disease->stats.ac) 1949 if(disease->stats.ac)
1941 disease->stats.ac += dam_mod; 1950 disease->stats.ac += dam_mod;
1942 1951
1943 if(disease->last_eat) 1952 if(disease->last_eat)
1944 disease->last_eat -= dam_mod; 1953 disease->last_eat -= dam_mod;
1945 1954
1946 if(disease->stats.hp) 1955 if(disease->stats.hp)
1947 disease->stats.hp -= dam_mod; 1956 disease->stats.hp -= dam_mod;
1948 1957
1949 if(disease->stats.sp) 1958 if(disease->stats.sp)
1950 disease->stats.sp -= dam_mod; 1959 disease->stats.sp -= dam_mod;
1951 1960
1952 if(infect_object(walk,disease,1)) { 1961 if(infect_object(walk,disease,1)) {
1953 object *flash; /* visual effect for inflicting disease */ 1962 object *flash; /* visual effect for inflicting disease */
1954 1963
1955 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);
1956 1965
1957 free_object(disease); /* don't need this one anymore */ 1966 free_object(disease); /* don't need this one anymore */
1958 flash=get_archetype(ARCH_DETECT_MAGIC); 1967 flash=get_archetype(ARCH_DETECT_MAGIC);
1959 flash->x = x; 1968 flash->x = x;
1960 flash->y = y; 1969 flash->y = y;
1961 flash->map = walk->map; 1970 flash->map = walk->map;
1962 insert_ob_in_map(flash,walk->map,op,0); 1971 insert_ob_in_map(flash,walk->map,op,0);
1963 return 1; 1972 return 1;
1964 } 1973 }
1965 free_object(disease); 1974 free_object(disease);
1966 } 1975 }
1967 } /* if living creature */ 1976 } /* if living creature */
1968 } /* for range of spaces */ 1977 } /* for range of spaces */
1969 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 1978 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!");
1970 return 1; 1979 return 1;
1971} 1980}

Diff Legend

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