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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.17 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.75 by root, Mon Aug 27 05:10:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
23#include <assert.h> 24#include <assert.h>
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
26#include <material.h> 27#include <material.h>
27#include <skills.h> 28#include <skills.h>
28
29#ifndef __CEXTRACT__
30# include <sproto.h>
31#endif
32
33#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
34 31
35typedef struct att_msg_str 32typedef struct att_msg_str
36{ 33{
37 char *msg1; 34 char *msg1;
38 char *msg2; 35 char *msg2;
… …
44 * its magical benefits. 41 * its magical benefits.
45 */ 42 */
46void 43void
47cancellation (object *op) 44cancellation (object *op)
48{ 45{
49 object *tmp;
50
51 if (op->invisible) 46 if (op->invisible)
52 return; 47 return;
53 48
54 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ) 49 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
55 { 50 {
56 /* Recur through the inventory */ 51 /* Recurse through the inventory */
57 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 52 for (object *tmp = op->inv; tmp; tmp = tmp->below)
58 if (!did_make_save_item (tmp, AT_CANCELLATION, op)) 53 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
59 cancellation (tmp); 54 cancellation (tmp);
60 } 55 }
61 else if (FABS (op->magic) <= (rndm (0, 5))) 56 else if (FABS (op->magic) <= rndm (0, 5))
62 { 57 {
63 /* Nullify this object. This code could probably be more complete */ 58 /* Nullify this object. This code could probably be more complete */
64 /* in what abilities it should cancel */ 59 /* in what abilities it should cancel */
65 op->magic = 0; 60 op->magic = 0;
61
66 CLEAR_FLAG (op, FLAG_DAMNED); 62 CLEAR_FLAG (op, FLAG_DAMNED);
67 CLEAR_FLAG (op, FLAG_CURSED); 63 CLEAR_FLAG (op, FLAG_CURSED);
68 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
69 CLEAR_FLAG (op, FLAG_KNOWN_CURSED); 65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
66
70 if (op->env && op->env->type == PLAYER) 67 if (op->env && op->env->type == PLAYER)
71 {
72 esrv_send_item (op->env, op); 68 esrv_send_item (op->env, op);
73 }
74 } 69 }
75} 70}
76
77
78 71
79/* did_make_save_item just checks to make sure the item actually 72/* did_make_save_item just checks to make sure the item actually
80 * made its saving throw based on the tables. It does not take 73 * made its saving throw based on the tables. It does not take
81 * any further action (like destroying the item). 74 * any further action (like destroying the item).
82 */ 75 */
83
84int 76int
85did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
86{ 78{
87 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
88 materialtype_t *mt; 80 materialtype_t *mt;
89 81
90 if (op->materialname == NULL) 82 if (op->materialname == NULL)
91 { 83 {
92 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
93 {
94 if (op->material & mt->material) 85 if (op->materials & mt->material)
95 break; 86 break;
96 }
97 } 87 }
98 else 88 else
99 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
100 if (mt == NULL) 90
91 if (!mt)
101 return TRUE; 92 return TRUE;
93
102 roll = rndm (1, 20); 94 roll = rndm (1, 20);
103 95
104 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
105 * If the type is only magic, don't adjust type - basically, if 97 * If the type is only magic, don't adjust type - basically, if
106 * pure magic is hitting an object, it should save. However, if it 98 * pure magic is hitting an object, it should save. However, if it
… …
135 saves++; 127 saves++;
136 } 128 }
137 129
138 if (saves == attacks || attacks == 0) 130 if (saves == attacks || attacks == 0)
139 return TRUE; 131 return TRUE;
132
140 if ((saves == 0) || (rndm (1, attacks) > saves)) 133 if (saves == 0 || (rndm (1, attacks) > saves))
141 return FALSE; 134 return FALSE;
135
142 return TRUE; 136 return TRUE;
143} 137}
144 138
145/* This function calls did_make_save_item. It then performs the 139/* This function calls did_make_save_item. It then performs the
146 * appropriate actions to the item (such as burning the item up, 140 * appropriate actions to the item (such as burning the item up,
147 * calling cancellation, etc.) 141 * calling cancellation, etc.)
148 */ 142 */
149
150void 143void
151save_throw_object (object *op, int type, object *originator) 144save_throw_object (object *op, int type, object *originator)
152{ 145{
153 if (!did_make_save_item (op, type, originator)) 146 if (!did_make_save_item (op, type, originator))
154 { 147 {
155 object *env = op->env; 148 object *env = op->env;
156 int x = op->x, y = op->y; 149 int x = op->x, y = op->y;
157 mapstruct *m = op->map; 150 maptile *m = op->map;
158 151
159 op = stop_item (op); 152 op = stop_item (op);
160 if (op == NULL) 153 if (op == NULL)
161 return; 154 return;
162 155
… …
168 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
169 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
170 */ 163 */
171 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) 164 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))
172 { 165 {
173 const char *arch = op->other_arch->name; 166 const char *arch = op->other_arch->archname;
174 167
175 op = decrease_ob_nr (op, 1); 168 op = decrease_ob_nr (op, 1);
176 169
177 if (op) 170 if (op)
178 fix_stopped_item (op, m, originator); 171 fix_stopped_item (op, m, originator);
… …
212 } 205 }
213 else 206 else
214 { 207 {
215 if (op->env) 208 if (op->env)
216 { 209 {
217 object *tmp = is_player_inv (op->env); 210 object *tmp = op->in_player ();
218 211
219 if (tmp) 212 if (tmp)
220 esrv_del_item (tmp->contr, op->count); 213 esrv_del_item (tmp->contr, op->count);
221 } 214 }
222 215
223 if (!QUERY_FLAG (op, FLAG_REMOVED)) 216 op->destroy ();
224 remove_ob (op);
225
226 free_object (op);
227 } 217 }
228 218
229 if (type & (AT_FIRE | AT_ELECTRICITY)) 219 if (type & (AT_FIRE | AT_ELECTRICITY))
230 if (env) 220 if (env)
231 { 221 {
… …
264 tmp->move_slow = 0; 254 tmp->move_slow = 0;
265 insert_ob_in_map (tmp, op->map, originator, 0); 255 insert_ob_in_map (tmp, op->map, originator, 0);
266 } 256 }
267 257
268 if (!QUERY_FLAG (op, FLAG_REMOVED)) 258 if (!QUERY_FLAG (op, FLAG_REMOVED))
269 remove_ob (op); 259 op->remove ();
270 260
271 insert_ob_in_ob (op, tmp); 261 insert_ob_in_ob (op, tmp);
272 return; 262 return;
273 } 263 }
274} 264}
… …
277 * op is going in direction 'dir' 267 * op is going in direction 'dir'
278 * type is the attacktype of the object. 268 * type is the attacktype of the object.
279 * full_hit is set if monster area does not matter. 269 * full_hit is set if monster area does not matter.
280 * returns 1 if it hits something, 0 otherwise. 270 * returns 1 if it hits something, 0 otherwise.
281 */ 271 */
282
283int 272int
284hit_map (object *op, int dir, int type, int full_hit) 273hit_map (object *op, int dir, int type, int full_hit)
285{ 274{
286 object *tmp, *next;
287 mapstruct *map; 275 maptile *map;
288 sint16 x, y; 276 sint16 x, y;
289 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ 277 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
290 278
291 tag_t op_tag, next_tag = 0;
292
293 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (QUERY_FLAG (op, FLAG_FREED))
294 { 280 {
295 LOG (llevError, "BUG: hit_map(): free object\n"); 281 LOG (llevError, "BUG: hit_map(): free object\n");
296 return 0; 282 return 0;
297 } 283 }
298 284
299 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 285 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
300 { 286 {
301 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 287 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
302 return 0; 288 return 0;
303 } 289 }
304 290
305 if (!op->map) 291 if (!op->map)
306 { 292 {
… …
308 return 0; 294 return 0;
309 } 295 }
310 296
311 if (op->head) 297 if (op->head)
312 op = op->head; 298 op = op->head;
313
314 op_tag = op->count;
315 299
316 map = op->map; 300 map = op->map;
317 x = op->x + freearr_x[dir]; 301 x = op->x + freearr_x[dir];
318 y = op->y + freearr_y[dir]; 302 y = op->y + freearr_y[dir];
319 303
320 int mflags = get_map_flags (map, &map, x, y, &x, &y); 304 if (!xy_normalise (map, x, y))
305 return 0;
321 306
322 // elmex: a safe map tile can't be hit! 307 // elmex: a safe map tile can't be hit!
323 // this should prevent most harmful effects on items and players there. 308 // this should prevent most harmful effects on items and players there.
324 if (mflags & (P_OUT_OF_MAP | P_SAFE)) 309 mapspace &ms = map->at (x, y);
310
311 if (ms.flags () & P_SAFE)
325 return 0; 312 return 0;
326 313
327 /* peterm: a few special cases for special attacktypes --counterspell 314 /* peterm: a few special cases for special attacktypes --counterspell
328 * must be out here because it strikes things which are not alive 315 * must be out here because it strikes things which are not alive
329 */ 316 */
330 317 if (type & (AT_COUNTERSPELL | AT_CHAOS))
318 {
331 if (type & AT_COUNTERSPELL) 319 if (type & AT_COUNTERSPELL)
332 { 320 {
333 counterspell (op, dir); /* see spell_effect.c */ 321 counterspell (op, dir); /* see spell_effect.c */
334 322
335 /* If the only attacktype is counterspell or magic, don't need 323 /* If the only attacktype is counterspell or magic, don't need
336 * to do any further processing. 324 * to do any further processing.
337 */
338 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
339 return 0;
340
341 type &= ~AT_COUNTERSPELL;
342 }
343
344 if (type & AT_CHAOS)
345 {
346 shuffle_attack (op, 1); /*1 flag tells it to change the face */
347 update_object (op, UP_OBJ_FACE);
348 type &= ~AT_CHAOS;
349 }
350
351 next = get_map_ob (map, x, y);
352 if (next)
353 next_tag = next->count;
354
355 while (next)
356 {
357 if (was_destroyed (next, next_tag))
358 {
359 /* There may still be objects that were above 'next', but there is no
360 * simple way to find out short of copying all object references and
361 * tags into a temporary array before we start processing the first
362 * object. That's why we just abort.
363 *
364 * This happens whenever attack spells (like fire) hit a pile
365 * of objects. This is not a bug - nor an error. The errormessage
366 * below was spamming the logs for absolutely no reason.
367 */ 325 */
368 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */ 326 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
369 break; 327 return 0;
328
329 type &= ~AT_COUNTERSPELL;
330 }
331
332 if (type & AT_CHAOS)
370 } 333 {
334 shuffle_attack (op, 1); /* flag tells it to change the face */
335 update_object (op, UP_OBJ_FACE);
336 type &= ~AT_CHAOS;
337 }
338 }
371 339
340 /* There may still be objects that were above 'next', but there is no
341 * simple way to find out short of copying all object references and
342 * tags into a temporary array before we start processing the first
343 * object. That's why we just abort on destroy.
344 *
345 * This happens whenever attack spells (like fire) hit a pile
346 * of objects. This is not a bug - nor an error.
347 */
348 for (object *next = ms.bot; next && !next->destroyed (); )
349 {
372 tmp = next; 350 object *tmp = next;
373 next = tmp->above; 351 next = tmp->above;
374
375 if (next)
376 next_tag = next->count;
377
378 if (QUERY_FLAG (tmp, FLAG_FREED))
379 {
380 LOG (llevError, "BUG: hit_map(): found freed object\n");
381 break;
382 }
383 352
384 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 353 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
385 * For example, 'tmp' was put in an icecube. 354 * For example, 'tmp' was put in an icecube.
386 * This is one of the few cases where on_same_map should not be used. 355 * This is one of the few cases where on_same_map should not be used.
387 */ 356 */
… …
390 359
391 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 360 if (QUERY_FLAG (tmp, FLAG_ALIVE))
392 { 361 {
393 hit_player (tmp, op->stats.dam, op, type, full_hit); 362 hit_player (tmp, op->stats.dam, op, type, full_hit);
394 retflag |= 1; 363 retflag |= 1;
364
395 if (was_destroyed (op, op_tag)) 365 if (op->destroyed ())
396 break; 366 break;
397 } 367 }
398
399 /* Here we are potentially destroying an object. If the object has 368 /* Here we are potentially destroying an object. If the object has
400 * NO_PASS set, it is also immune - you can't destroy walls. Note 369 * NO_PASS set, it is also immune - you can't destroy walls. Note
401 * that weak walls have is_alive set, which prevent objects from 370 * that weak walls have is_alive set, which prevent objects from
402 * passing over/through them. We don't care what type of movement 371 * passing over/through them. We don't care what type of movement
403 * the wall blocks - if it blocks any type of movement, can't be 372 * the wall blocks - if it blocks any type of movement, can't be
404 * destroyed right now. 373 * destroyed right now.
405 */ 374 */
406 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 375 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
407 { 376 {
408 save_throw_object (tmp, type, op); 377 save_throw_object (tmp, type, op);
378
409 if (was_destroyed (op, op_tag)) 379 if (op->destroyed ())
410 break; 380 break;
411 } 381 }
412 } 382 }
413 383
414 return 0; 384 return 0;
… …
417void 387void
418attack_message (int dam, int type, object *op, object *hitter) 388attack_message (int dam, int type, object *op, object *hitter)
419{ 389{
420 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; 390 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
421 int i, found = 0; 391 int i, found = 0;
422 mapstruct *map; 392 maptile *map;
423 object *next, *tmp; 393 object *next, *tmp;
424 394
425 /* put in a few special messages for some of the common attacktypes 395 /* put in a few special messages for some of the common attacktypes
426 * a player might have. For example, fire, electric, cold, etc 396 * a player might have. For example, fire, electric, cold, etc
427 * [garbled 20010919] 397 * [garbled 20010919]
… …
444 sprintf (buf1, "missed %s", &op->name); 414 sprintf (buf1, "missed %s", &op->name);
445 sprintf (buf2, " misses"); 415 sprintf (buf2, " misses");
446 found++; 416 found++;
447 } 417 }
448 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM || 418 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
449 hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found) 419 hitter->type == POISONING || (type & AT_POISON && op->is_alive ())) && !found)
450 { 420 {
451 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++) 421 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
452 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1) 422 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
453 { 423 {
454 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2); 424 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
… …
466 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3); 436 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
467 found++; 437 found++;
468 break; 438 break;
469 } 439 }
470 } 440 }
471 else if (hitter->type == PLAYER && IS_LIVE (op)) 441 else if (hitter->type == PLAYER && op->is_alive ())
472 { 442 {
473 if (USING_SKILL (hitter, SK_KARATE)) 443 if (USING_SKILL (hitter, SK_KARATE))
474 { 444 {
475 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++) 445 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
476 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1) 446 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
… …
502 found++; 472 found++;
503 break; 473 break;
504 } 474 }
505 } 475 }
506 } 476 }
477
507 if (found) 478 if (found)
508 { 479 {
509 /* done */ 480 /* done */
510 } 481 }
511 else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC)) 482 else if (hitter->is_arrow () && (type == AT_PHYSICAL || type == AT_MAGIC))
512 { 483 {
513 sprintf (buf1, "hit"); /* just in case */ 484 sprintf (buf1, "hit"); /* just in case */
514 for (i = 0; i < MAXATTACKMESS; i++) 485 for (i = 0; i < MAXATTACKMESS; i++)
515 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1) 486 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
516 { 487 {
517 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3); 488 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
518 found++; 489 found++;
519 break; 490 break;
520 } 491 }
521 } 492 }
522 else if (type & AT_DRAIN && IS_LIVE (op)) 493 else if (type & AT_DRAIN && op->is_alive ())
523 { 494 {
524 /* drain is first, because some items have multiple attypes */ 495 /* drain is first, because some items have multiple attypes */
525 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++) 496 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
526 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1) 497 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
527 { 498 {
… …
529 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3); 500 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
530 found++; 501 found++;
531 break; 502 break;
532 } 503 }
533 } 504 }
534 else if (type & AT_ELECTRICITY && IS_LIVE (op)) 505 else if (type & AT_ELECTRICITY && op->is_alive ())
535 { 506 {
536 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++) 507 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
537 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1) 508 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
538 { 509 {
539 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2); 510 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
540 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3); 511 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
541 found++; 512 found++;
542 break; 513 break;
543 } 514 }
544 } 515 }
545 else if (type & AT_COLD && IS_LIVE (op)) 516 else if (type & AT_COLD && op->is_alive ())
546 { 517 {
547 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++) 518 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
548 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1) 519 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
549 { 520 {
550 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2); 521 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
… …
627 strcpy (buf1, "hit"); 598 strcpy (buf1, "hit");
628 strcpy (buf2, " hits"); 599 strcpy (buf2, " hits");
629 } 600 }
630 601
631 /* bail out if a monster is casting spells */ 602 /* bail out if a monster is casting spells */
632 if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER))) 603 if (!(hitter->type == PLAYER || (hitter->owner != NULL && hitter->owner->type == PLAYER)))
633 return; 604 return;
634 605
635 /* scale down magic considerably. */ 606 /* scale down magic considerably. */
636 if (type & AT_MAGIC && rndm (0, 5)) 607 if (type & AT_MAGIC && rndm (0, 5))
637 return; 608 return;
638 609
639 /* Did a player hurt another player? Inform both! */ 610 /* Did a player hurt another player? Inform both! */
640 if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER) 611 if (op->type == PLAYER && (hitter->owner == NULL ? hitter->type : hitter->owner->type) == PLAYER)
641 { 612 {
642 if (get_owner (hitter) != NULL) 613 if (hitter->owner != NULL)
643 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
644 else 615 else
645 { 616 {
646 sprintf (buf, "%s%s you.", &hitter->name, buf2); 617 sprintf (buf, "%s%s you.", &hitter->name, buf2);
618
647 if (dam != 0) 619 if (dam != 0)
648 { 620 {
649 if (dam < 10) 621 if (dam < 10)
650 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 622 op->contr->play_sound (sound_find ("player_is_hit1"));
651 else if (dam < 20) 623 else if (dam < 20)
652 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 624 op->contr->play_sound (sound_find ("player_is_hit2"));
653 else 625 else
654 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 626 op->contr->play_sound (sound_find ("player_is_hit3"));
655 } 627 }
656 } 628 }
629
657 new_draw_info (NDI_BLACK, 0, op, buf); 630 new_draw_info (NDI_BLACK, 0, op, buf);
658 } /* end of player hitting player */ 631 } /* end of player hitting player */
659 632
660 if (hitter->type == PLAYER) 633 if (hitter->type == PLAYER)
661 { 634 {
662 sprintf (buf, "You %s.", buf1); 635 sprintf (buf, "You %s.", buf1);
636
663 if (dam != 0) 637 if (dam != 0)
664 { 638 {
665 if (dam < 10) 639 if (dam < 10)
666 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 640 op->play_sound (sound_find ("player_hits1"));
667 else if (dam < 20) 641 else if (dam < 20)
668 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 642 op->play_sound (sound_find ("player_hits2"));
669 else 643 else
670 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 644 op->play_sound (sound_find ("player_hits3"));
671 } 645 }
646
672 new_draw_info (NDI_BLACK, 0, hitter, buf); 647 new_draw_info (NDI_BLACK, 0, hitter, buf);
673 } 648 }
674 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 649 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
675 { 650 {
676 /* look for stacked spells and start reducing the message chances */ 651 /* look for stacked spells and start reducing the message chances */
677 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE)) 652 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
678 { 653 {
679 i = 4; 654 i = 4;
680 map = hitter->map; 655 map = hitter->map;
681 if (out_of_map (map, hitter->x, hitter->y)) 656 if (out_of_map (map, hitter->x, hitter->y))
682 return; 657 return;
658
683 next = get_map_ob (map, hitter->x, hitter->y); 659 next = GET_MAP_OB (map, hitter->x, hitter->y);
684 if (next) 660 if (next)
685 while (next) 661 while (next)
686 { 662 {
687 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
688 i *= 3; 664 i *= 3;
665
689 tmp = next; 666 tmp = next;
690 next = tmp->above; 667 next = tmp->above;
691 } 668 }
669
692 if (i < 0) 670 if (i < 0)
693 return; 671 return;
672
694 if (rndm (0, i) != 0) 673 if (rndm (0, i) != 0)
695 return; 674 return;
696 } 675 }
697 else if (rndm (0, 5) != 0) 676 else if (rndm (0, 5) != 0)
698 return; 677 return;
678
699 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 679 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
700 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 680 op->play_sound (sound_find ("player_hits4"));
701 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 681 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
702 } 682 }
703} 683}
704 684
705 685
… …
721 return 0; 701 return 0;
722 } 702 }
723 if (QUERY_FLAG (*target, FLAG_REMOVED) 703 if (QUERY_FLAG (*target, FLAG_REMOVED)
724 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 704 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target)))
725 { 705 {
726 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 706 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->archname, &(*hitter)->name);
727 return 1; 707 return 1;
728 } 708 }
729 *simple_attack = 0; 709 *simple_attack = 0;
730 return 0; 710 return 0;
731} 711}
… …
754attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc) 734attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
755{ 735{
756 int simple_attack, roll, dam = 0; 736 int simple_attack, roll, dam = 0;
757 uint32 type; 737 uint32 type;
758 shstr op_name; 738 shstr op_name;
759 tag_t op_tag, hitter_tag;
760 739
761 if (get_attack_mode (&op, &hitter, &simple_attack)) 740 if (get_attack_mode (&op, &hitter, &simple_attack))
762 goto error; 741 goto error;
763 742
764 if (hitter->current_weapon) 743 if (hitter->current_weapon)
765 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op))) 744 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
766 return RESULT_INT (0); 745 return RESULT_INT (0);
767 746
768 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter))) 747 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
769 return RESULT_INT (0); 748 return RESULT_INT (0);
770
771 op_tag = op->count;
772 hitter_tag = hitter->count;
773 749
774 /* 750 /*
775 * A little check to make it more difficult to dance forward and back 751 * A little check to make it more difficult to dance forward and back
776 * to avoid ever being hit by monsters. 752 * to avoid ever being hit by monsters.
777 */ 753 */
778 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 754 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
779 { 755 {
780 /* Decrease speed BEFORE calling process_object. Otherwise, an 756 /* Decrease speed BEFORE calling process_object. Otherwise, an
781 * infinite loop occurs, with process_object calling move_monster, 757 * infinite loop occurs, with process_object calling move_monster,
782 * which then gets here again. By decreasing the speed before 758 * which then gets here again. By decreasing the speed before
783 * we call process_object, the 'if' statement above will fail. 759 * we call process_object, the 'if' statement above will fail.
784 */ 760 */
785 op->speed_left--; 761 --op->speed_left;
786 process_object (op); 762 process_object (op);
763
787 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 764 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
788 goto error; 765 goto error;
789 } 766 }
790 767
791 op_name = op->name; 768 op_name = op->name;
792 769
… …
799 /* See if we hit the creature */ 776 /* See if we hit the creature */
800 if (roll == 20 || op->stats.ac >= base_wc - roll) 777 if (roll == 20 || op->stats.ac >= base_wc - roll)
801 { 778 {
802 int hitdam = base_dam; 779 int hitdam = base_dam;
803 780
804 if (settings.casting_time == TRUE)
805 {
806 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
807 {
808 hitter->casting_time = -1;
809 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
810 }
811 if ((op->casting_time > -1) && (hitdam > 0))
812 {
813 op->casting_time = -1;
814 if (op->type == PLAYER)
815 {
816 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
817 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
818 }
819 }
820 }
821 if (!simple_attack) 781 if (!simple_attack)
822 { 782 {
823 /* If you hit something, the victim should *always* wake up. 783 /* If you hit something, the victim should *always* wake up.
824 * Before, invisible hitters could avoid doing this. 784 * Before, invisible hitters could avoid doing this.
825 * -b.t. */ 785 * -b.t. */
826 if (QUERY_FLAG (op, FLAG_SLEEP)) 786 if (QUERY_FLAG (op, FLAG_SLEEP))
827 CLEAR_FLAG (op, FLAG_SLEEP); 787 CLEAR_FLAG (op, FLAG_SLEEP);
828 788
829 /* If the victim can't see the attacker, it may alert others 789 /* If the victim can't see the attacker, it may alert others
830 * for help. */ 790 * for help. */
831 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int)) 791 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
832 npc_call_help (op); 792 npc_call_help (op);
833 793
834 /* if you were hidden and hit by a creature, you are discovered */ 794 /* if you were hidden and hit by a creature, you are discovered */
835 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 795 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
836 { 796 {
837 make_visible (op); 797 make_visible (op);
798
838 if (op->type == PLAYER) 799 if (op->type == PLAYER)
839 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 800 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
840 } 801 }
841 802
842 /* thrown items (hitter) will have various effects 803 /* thrown items (hitter) will have various effects
843 * when they hit the victim. For things like thrown daggers, 804 * when they hit the victim. For things like thrown daggers,
844 * this sets 'hitter' to the actual dagger, and not the 805 * this sets 'hitter' to the actual dagger, and not the
845 * wrapper object. 806 * wrapper object.
846 */ 807 */
847 thrown_item_effect (hitter, op); 808 thrown_item_effect (hitter, op);
809
848 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 810 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
849 goto leave; 811 goto leave;
850 } 812 }
851 813
852 /* Need to do at least 1 damage, otherwise there is no point 814 /* Need to do at least 1 damage, otherwise there is no point
853 * to go further and it will cause FPE's below. 815 * to go further and it will cause FPE's below.
854 */ 816 */
855 if (hitdam <= 0) 817 if (hitdam <= 0)
856 hitdam = 1; 818 hitdam = 1;
857 819
858 type = hitter->attacktype; 820 type = hitter->attacktype;
821
859 if (!type) 822 if (!type)
860 type = AT_PHYSICAL; 823 type = AT_PHYSICAL;
824
861 /* Handle monsters that hit back */ 825 /* Handle monsters that hit back */
862 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE)) 826 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
863 { 827 {
864 if (op->attacktype & AT_ACID && hitter->type == PLAYER) 828 if (op->attacktype & AT_ACID && hitter->type == PLAYER)
865 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n"); 829 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
830
866 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1); 831 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
832
867 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 833 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
868 goto leave; 834 goto leave;
869 } 835 }
870 836
871 /* In the new attack code, it should handle multiple attack 837 /* In the new attack code, it should handle multiple attack
872 * types in its area, so remove it from here. 838 * types in its area, so remove it from here.
873 */ 839 */
874 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1); 840 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
841
875 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 842 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
876 goto leave; 843 goto leave;
877 } /* end of if hitter hit op */ 844 } /* end of if hitter hit op */
878 /* if we missed, dam=0 */ 845 /* if we missed, dam=0 */
879 846
880 /*attack_message(dam, type, op, hitter); */ 847 /*attack_message(dam, type, op, hitter); */
… …
890} 857}
891 858
892int 859int
893attack_ob (object *op, object *hitter) 860attack_ob (object *op, object *hitter)
894{ 861{
895
896 if (hitter->head)
897 hitter = hitter->head; 862 hitter = hitter->head_ ();
863
898 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 864 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
899} 865}
900 866
901/* op is the arrow, tmp is what is stopping the arrow. 867/* op is the arrow, tmp is what is stopping the arrow.
902 * 868 *
… …
911 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 877 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
912 * stick around. 878 * stick around.
913 */ 879 */
914 if (op->weight <= 5000 && tmp->stats.hp >= 0) 880 if (op->weight <= 5000 && tmp->stats.hp >= 0)
915 { 881 {
916 if (tmp->head != NULL)
917 tmp = tmp->head; 882 tmp = tmp->head_ ();
918 883
919 remove_ob (op); 884 op->remove ();
920 op = insert_ob_in_ob (op, tmp); 885 op = insert_ob_in_ob (op, tmp);
921 886
922 if (tmp->type == PLAYER) 887 if (tmp->type == PLAYER)
923 esrv_send_item (tmp, op); 888 esrv_send_item (tmp, op);
924 889
… …
937object * 902object *
938hit_with_arrow (object *op, object *victim) 903hit_with_arrow (object *op, object *victim)
939{ 904{
940 object *container, *hitter; 905 object *container, *hitter;
941 int hit_something = 0; 906 int hit_something = 0;
942 tag_t victim_tag, hitter_tag;
943 sint16 victim_x, victim_y;
944 907
945 /* Disassemble missile */ 908 /* Disassemble missile */
946 if (op->inv) 909 if (op->inv)
947 { 910 {
948 container = op; 911 container = op;
949 hitter = op->inv; 912 hitter = op->inv;
950 remove_ob (hitter); 913 hitter->remove ();
951 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 914 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
952 /* Note that we now have an empty THROWN_OBJ on the map. Code that 915 /* Note that we now have an empty THROWN_OBJ on the map. Code that
953 * might be called until this THROWN_OBJ is either reassembled or 916 * might be called until this THROWN_OBJ is either reassembled or
954 * removed at the end of this function must be able to deal with empty 917 * removed at the end of this function must be able to deal with empty
955 * THROWN_OBJs. */ 918 * THROWN_OBJs. */
956 } 919 }
957 else 920 else
958 { 921 {
959 container = NULL; 922 container = 0;
960 hitter = op; 923 hitter = op;
961 } 924 }
962 925
963 /* Try to hit victim */ 926 /* Try to hit victim */
964 victim_x = victim->x;
965 victim_y = victim->y;
966 victim_tag = victim->count;
967 hitter_tag = hitter->count;
968
969 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc); 927 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
970 928
971 /* Arrow attacks door, rune of summoning is triggered, demon is put on 929 /* Arrow attacks door, rune of summoning is triggered, demon is put on
972 * arrow, move_apply() calls this function, arrow sticks in demon, 930 * arrow, move_apply() calls this function, arrow sticks in demon,
973 * attack_ob_simple() returns, and we've got an arrow that still exists 931 * attack_ob_simple() returns, and we've got an arrow that still exists
974 * but is no longer on the map. Ugh. (Beware: Such things can happen at 932 * but is no longer on the map. Ugh. (Beware: Such things can happen at
975 * other places as well!) 933 * other places as well!)
976 */ 934 */
977 if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL) 935 if (hitter->destroyed () || hitter->env != NULL)
978 { 936 {
979 if (container) 937 if (container)
980 { 938 {
981 remove_ob (container); 939 container->remove ();
982 free_object (container); 940 container->destroy ();
983 } 941 }
942
984 return NULL; 943 return 0;
985 } 944 }
986 945
987 /* Missile hit victim */ 946 /* Missile hit victim */
988 /* if the speed is > 10, then this is a fast moving arrow, we go straight 947 /* if the speed is > 10, then this is a fast moving arrow, we go straight
989 * through the target 948 * through the target
990 */ 949 */
991 if (hit_something && op->speed <= 10.0) 950 if (hit_something && op->speed <= 10.0)
992 { 951 {
993 /* Stop arrow */ 952 /* Stop arrow */
994 if (container == NULL) 953 if (!container)
995 { 954 {
996 hitter = fix_stopped_arrow (hitter); 955 hitter = fix_stopped_arrow (hitter);
997 if (hitter == NULL) 956 if (!hitter)
998 return NULL; 957 return 0;
999 } 958 }
1000 else 959 else
1001 { 960 container->destroy ();
1002 remove_ob (container);
1003 free_object (container);
1004 }
1005 961
1006 /* Try to stick arrow into victim */ 962 /* Try to stick arrow into victim */
1007 if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim)) 963 if (!victim->destroyed () && stick_arrow (hitter, victim))
1008 return NULL; 964 return 0;
1009 965
1010 /* Else try to put arrow on victim's map square 966 /* Else try to put arrow on victim's map square
1011 * remove check for P_WALL here. If the arrow got to this 967 * remove check for P_WALL here. If the arrow got to this
1012 * space, that is good enough - with the new movement code, 968 * space, that is good enough - with the new movement code,
1013 * there is now the potential for lots of spaces where something 969 * there is now the potential for lots of spaces where something
1014 * can fly over but not otherwise move over. What is the correct 970 * can fly over but not otherwise move over. What is the correct
1015 * way to handle those otherwise? 971 * way to handle those otherwise?
1016 */ 972 */
1017 if (victim_x != hitter->x || victim_y != hitter->y) 973 if (victim->x != hitter->x || victim->y != hitter->y)
1018 { 974 {
1019 remove_ob (hitter); 975 hitter->remove ();
1020 hitter->x = victim_x; 976 hitter->x = victim->x;
1021 hitter->y = victim_y; 977 hitter->y = victim->y;
1022 insert_ob_in_map (hitter, victim->map, hitter, 0); 978 insert_ob_in_map (hitter, victim->map, hitter, 0);
1023 } 979 }
1024 else 980 else
1025 {
1026 /* Else leave arrow where it is */ 981 /* Else leave arrow where it is */
1027 merge_ob (hitter, NULL); 982 merge_ob (hitter, NULL);
1028 } 983
1029 return NULL; 984 return 0;
1030 } 985 }
1031 986
1032 if (hit_something && op->speed >= 10.0) 987 if (hit_something && op->speed >= 10.0)
1033 op->speed -= 1.0; 988 op->speed -= 1.0;
1034 989
1035 /* Missile missed victim - reassemble missile */ 990 /* Missile missed victim - reassemble missile */
1036 if (container) 991 if (container)
1037 { 992 {
1038 remove_ob (hitter); 993 hitter->remove ();
1039 insert_ob_in_ob (hitter, container); 994 insert_ob_in_ob (hitter, container);
1040 } 995 }
996
1041 return op; 997 return op;
1042} 998}
1043
1044 999
1045void 1000void
1046tear_down_wall (object *op) 1001tear_down_wall (object *op)
1047{ 1002{
1048 int perc = 0; 1003 int perc = 0;
… …
1054 } 1009 }
1055 else if (!GET_ANIM_ID (op)) 1010 else if (!GET_ANIM_ID (op))
1056 { 1011 {
1057 /* Object has been called - no animations, so remove it */ 1012 /* Object has been called - no animations, so remove it */
1058 if (op->stats.hp < 0) 1013 if (op->stats.hp < 0)
1014 op->destroy ();
1059 { 1015
1060 remove_ob (op); /* Should update LOS */
1061 free_object (op);
1062 /* Don't know why this is here - remove_ob should do it for us */
1063 /*update_position(m, x, y); */
1064 }
1065 return; /* no animations, so nothing more to do */ 1016 return; /* no animations, so nothing more to do */
1066 } 1017 }
1018
1067 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp; 1019 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
1020
1068 if (perc >= (int) NUM_ANIMATIONS (op)) 1021 if (perc >= (int) NUM_ANIMATIONS (op))
1069 perc = NUM_ANIMATIONS (op) - 1; 1022 perc = NUM_ANIMATIONS (op) - 1;
1070 else if (perc < 1) 1023 else if (perc < 1)
1071 perc = 1; 1024 perc = 1;
1025
1072 SET_ANIMATION (op, perc); 1026 SET_ANIMATION (op, perc);
1073 update_object (op, UP_OBJ_FACE); 1027 update_object (op, UP_OBJ_FACE);
1028
1074 if (perc == NUM_ANIMATIONS (op) - 1) 1029 if (perc == NUM_ANIMATIONS (op) - 1)
1075 { /* Reached the last animation */ 1030 { /* Reached the last animation */
1076 if (op->face == blank_face) 1031 if (op->face == blank_face)
1077 {
1078 /* If the last face is blank, remove the ob */ 1032 /* If the last face is blank, remove the ob */
1079 remove_ob (op); /* Should update LOS */ 1033 op->destroy ();
1080 free_object (op);
1081
1082 /* remove_ob should call update_position for us */
1083 /*update_position(m, x, y); */
1084
1085 }
1086 else 1034 else
1087 { /* The last face was not blank, leave an image */ 1035 { /* The last face was not blank, leave an image */
1088 CLEAR_FLAG (op, FLAG_BLOCKSVIEW); 1036 CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
1089 update_all_los (op->map, op->x, op->y); 1037 update_all_los (op->map, op->x, op->y);
1090 op->move_block = 0; 1038 op->move_block = 0;
… …
1094} 1042}
1095 1043
1096void 1044void
1097scare_creature (object *target, object *hitter) 1045scare_creature (object *target, object *hitter)
1098{ 1046{
1099 object *owner = get_owner (hitter); 1047 object *owner = hitter->owner;
1100 1048
1101 if (!owner) 1049 if (!owner)
1102 owner = hitter; 1050 owner = hitter;
1103 1051
1104 SET_FLAG (target, FLAG_SCARED); 1052 SET_FLAG (target, FLAG_SCARED);
1105 if (!target->enemy) 1053 if (!target->enemy)
1106 target->enemy = owner; 1054 target->enemy = owner;
1107} 1055}
1108
1109 1056
1110/* This returns the amount of damage hitter does to op with the 1057/* This returns the amount of damage hitter does to op with the
1111 * appropriate attacktype. Only 1 attacktype should be set at a time. 1058 * appropriate attacktype. Only 1 attacktype should be set at a time.
1112 * This doesn't damage the player, but returns how much it should 1059 * This doesn't damage the player, but returns how much it should
1113 * take. However, it will do other effects (paralyzation, slow, etc.) 1060 * take. However, it will do other effects (paralyzation, slow, etc.)
1114 * Note - changed for PR code - we now pass the attack number and not 1061 * Note - changed for PR code - we now pass the attack number and not
1115 * the attacktype. Makes it easier for the PR code. */ 1062 * the attacktype. Makes it easier for the PR code. */
1116
1117int 1063int
1118hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic) 1064hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1119{ 1065{
1120
1121 int doesnt_slay = 1; 1066 int doesnt_slay = 1;
1122 1067
1123 /* Catch anyone that may be trying to send us a bitmask instead of the number */ 1068 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1124 if (attacknum >= NROFATTACKS) 1069 if (attacknum >= NROFATTACKS)
1125 { 1070 {
… …
1127 return 0; 1072 return 0;
1128 } 1073 }
1129 1074
1130 if (dam < 0) 1075 if (dam < 0)
1131 { 1076 {
1132 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam); 1077 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1078 dam, hitter->debug_desc (), op->debug_desc ());
1133 return 0; 1079 return 0;
1134 } 1080 }
1135 1081
1136 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1082 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1137 * people can't mess with that or it otherwise get confused. */ 1083 * people can't mess with that or it otherwise get confused. */
1138 if (attacknum == ATNR_INTERNAL) 1084 if (attacknum == ATNR_INTERNAL)
1139 return dam; 1085 return dam;
1140 1086
1141 if (hitter->slaying) 1087 if (hitter->slaying)
1142 { 1088 {
1143 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1089 if ((op->race && strstr (hitter->slaying, op->race))
1144 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1090 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1145 { 1091 {
1146 doesnt_slay = 0; 1092 doesnt_slay = 0;
1147 dam *= 3; 1093 dam *= 3;
1148 } 1094 }
1149 } 1095 }
… …
1163 /* Special hack. By default, if immune to something, you 1109 /* Special hack. By default, if immune to something, you
1164 * shouldn't need to worry. However, acid is an exception, since 1110 * shouldn't need to worry. However, acid is an exception, since
1165 * it can still damage your items. Only include attacktypes if 1111 * it can still damage your items. Only include attacktypes if
1166 * special processing is needed */ 1112 * special processing is needed */
1167 1113
1168 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1114 if (op->resist[attacknum] >= 100
1115 && doesnt_slay
1116 && attacknum != ATNR_ACID)
1169 return 0; 1117 return 0;
1170 1118
1171 /* Keep this in order - makes things easier to find */ 1119 /* Keep this in order - makes things easier to find */
1172 1120
1173 switch (attacknum) 1121 switch (attacknum)
1174 { 1122 {
1175 case ATNR_PHYSICAL: 1123 case ATNR_PHYSICAL:
1176 /* here also check for diseases */ 1124 /* here also check for diseases */
1177 check_physically_infect (op, hitter); 1125 check_physically_infect (op, hitter);
1178 break; 1126 break;
1179 1127
1180 /* Don't need to do anything for: 1128 /* Don't need to do anything for:
1181 magic, 1129 magic,
1182 fire, 1130 fire,
1183 electricity, 1131 electricity,
1184 cold */ 1132 cold */
1185 1133
1186 case ATNR_CONFUSION: 1134 case ATNR_CONFUSION:
1187 case ATNR_POISON: 1135 case ATNR_POISON:
1188 case ATNR_SLOW: 1136 case ATNR_SLOW:
1189 case ATNR_PARALYZE: 1137 case ATNR_PARALYZE:
1190 case ATNR_FEAR: 1138 case ATNR_FEAR:
1191 case ATNR_CANCELLATION: 1139 case ATNR_CANCELLATION:
1192 case ATNR_DEPLETE: 1140 case ATNR_DEPLETE:
1193 case ATNR_BLIND: 1141 case ATNR_BLIND:
1194 { 1142 {
1195 /* chance for inflicting a special attack depends on the 1143 /* chance for inflicting a special attack depends on the
1196 * difference between attacker's and defender's level 1144 * difference between attacker's and defender's level
1197 */ 1145 */
1198 int level_diff = MIN (110, MAX (0, op->level - hitter->level)); 1146 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1199 1147
1200 /* First, only creatures/players with speed can be affected. 1148 /* First, only creatures/players with speed can be affected.
1201 * Second, just getting hit doesn't mean it always affects 1149 * Second, just getting hit doesn't mean it always affects
1202 * you. Third, you still get a saving through against the 1150 * you. Third, you still get a saving through against the
1203 * effect. 1151 * effect.
1204 */ 1152 */
1205 if (op->speed && 1153 if (op->speed &&
1206 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) && 1154 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1207 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10)) 1155 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1208 { 1156 {
1209 1157
1210 /* Player has been hit by something */ 1158 /* Player has been hit by something */
1211 if (attacknum == ATNR_CONFUSION) 1159 if (attacknum == ATNR_CONFUSION)
1212 confuse_player (op, hitter, dam); 1160 confuse_player (op, hitter, dam);
1213 else if (attacknum == ATNR_POISON) 1161 else if (attacknum == ATNR_POISON)
1214 poison_player (op, hitter, dam); 1162 poison_player (op, hitter, dam);
1215 else if (attacknum == ATNR_SLOW) 1163 else if (attacknum == ATNR_SLOW)
1216 slow_player (op, hitter, dam); 1164 slow_player (op, hitter, dam);
1217 else if (attacknum == ATNR_PARALYZE) 1165 else if (attacknum == ATNR_PARALYZE)
1218 paralyze_player (op, hitter, dam); 1166 paralyze_player (op, hitter, dam);
1219 else if (attacknum == ATNR_FEAR) 1167 else if (attacknum == ATNR_FEAR)
1220 scare_creature (op, hitter); 1168 scare_creature (op, hitter);
1221 else if (attacknum == ATNR_CANCELLATION) 1169 else if (attacknum == ATNR_CANCELLATION)
1222 cancellation (op); 1170 cancellation (op);
1223 else if (attacknum == ATNR_DEPLETE) 1171 else if (attacknum == ATNR_DEPLETE)
1224 drain_stat (op); 1172 op->drain_stat ();
1225 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1173 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1226 blind_player (op, hitter, dam); 1174 blind_player (op, hitter, dam);
1227 } 1175 }
1176
1228 dam = 0; /* These are all effects and don't do real damage */ 1177 dam = 0; /* These are all effects and don't do real damage */
1229 } 1178 }
1230 break; 1179 break;
1180
1231 case ATNR_ACID: 1181 case ATNR_ACID:
1232 { 1182 {
1233 int flag = 0; 1183 int flag = 0;
1234 1184
1235 /* Items only get corroded if you're not on a battleground and 1185 /* Items only get corroded if you're not on a battleground and
1236 * if your acid resistance is below 50%. */ 1186 * if your acid resistance is below 50%. */
1237 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50)) 1187 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1238 { 1188 {
1239 object *tmp;
1240
1241 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1189 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1242 { 1190 {
1243 if (tmp->invisible) 1191 if (tmp->invisible)
1244 continue; 1192 continue;
1245 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1193 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1246 /* >= 10% acid res. on itmes will protect these */ 1194 /* >= 10% acid res. on items will protect these */
1247 continue; 1195 continue;
1248 if (!(tmp->material & M_IRON)) 1196 if (!(tmp->materials & M_IRON))
1249 continue; 1197 continue;
1250 if (tmp->magic < -4) /* Let's stop at -5 */ 1198 if (tmp->magic < -4) /* Let's stop at -5 */
1251 continue; 1199 continue;
1252 if (tmp->type == RING || 1200 if (tmp->type == RING
1253 /* removed boots and gloves from exclusion list in 1201 /* removed boots and gloves from exclusion list in PR */
1254 PR */ 1202 || tmp->type == GIRDLE
1255 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1203 || tmp->type == AMULET
1204 || tmp->type == WAND
1205 || tmp->type == ROD
1206 || tmp->type == HORN)
1256 continue; /* To avoid some strange effects */ 1207 continue; /* To avoid some strange effects */
1257 1208
1258 /* High damage acid has better chance of corroding 1209 /* High damage acid has better chance of corroding
1259 objects */ 1210 objects */
1260 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1211 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1261 { 1212 {
1262 if (op->type == PLAYER) 1213 if (op->type == PLAYER)
1263 /* Make this more visible */ 1214 /* Make this more visible */
1264 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, 1215 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1265 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp)); 1216 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1266 flag = 1; 1217 flag = 1;
1267 tmp->magic--; 1218 tmp->magic--;
1268 if (op->type == PLAYER) 1219 if (op->type == PLAYER)
1269 esrv_send_item (op, tmp); 1220 esrv_send_item (op, tmp);
1270 } 1221 }
1271 } 1222 }
1272 if (flag)
1273 fix_player (op); /* Something was corroded */
1274 } 1223
1224 if (flag)
1225 op->update_stats (); /* Something was corroded */
1275 } 1226 }
1227 }
1276 break; 1228 break;
1229
1277 case ATNR_DRAIN: 1230 case ATNR_DRAIN:
1278 { 1231 {
1279 /* rate is the proportion of exp drained. High rate means 1232 /* rate is the proportion of exp drained. High rate means
1280 * not much is drained, low rate means a lot is drained. 1233 * not much is drained, low rate means a lot is drained.
1281 */ 1234 */
1282 int rate; 1235 int rate;
1283 1236
1284 if (op->resist[ATNR_DRAIN] >= 0) 1237 if (op->resist[ATNR_DRAIN] >= 0)
1285 rate = 400 + op->resist[ATNR_DRAIN] * 3; 1238 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1286 else 1239 else
1287 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]); 1240 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1288 1241
1289 if (op->stats.exp <= rate) 1242 if (op->stats.exp <= rate)
1290 { 1243 {
1291 if (op->type == GOLEM) 1244 if (op->type == GOLEM)
1292 dam = 999; /* Its force is "sucked" away. 8) */ 1245 dam = 999; /* Its force is "sucked" away. 8) */
1293 else 1246 else
1294 /* If we can't drain, lets try to do physical damage */ 1247 /* If we can't drain, lets try to do physical damage */
1295 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic); 1248 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1296 } 1249 }
1297 else 1250 else
1298 { 1251 {
1299 /* Randomly give the hitter some hp */ 1252 /* Randomly give the hitter some hp */
1300 if (hitter->stats.hp < hitter->stats.maxhp && 1253 if (hitter->stats.hp < hitter->stats.maxhp &&
1301 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3) 1254 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1302 hitter->stats.hp++; 1255 hitter->stats.hp++;
1303 1256
1304 /* Can't do drains on battleground spaces. 1257 /* Can't do drains on battleground spaces.
1305 * Move the wiz check up here - before, the hitter wouldn't gain exp 1258 * Move the wiz check up here - before, the hitter wouldn't gain exp
1306 * exp, but the wiz would still lose exp! If drainee is a wiz, 1259 * exp, but the wiz would still lose exp! If drainee is a wiz,
1307 * nothing happens. 1260 * nothing happens.
1308 * Try to credit the owner. We try to display player -> player drain 1261 * Try to credit the owner. We try to display player -> player drain
1309 * attacks, hence all the != PLAYER checks. 1262 * attacks, hence all the != PLAYER checks.
1310 */ 1263 */
1311 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1264 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1312 { 1265 {
1313 object *owner = get_owner (hitter); 1266 object *owner = hitter->owner;
1314 1267
1315 if (owner && owner != hitter) 1268 if (owner && owner != hitter)
1316 { 1269 {
1317 if (op->type != PLAYER || owner->type != PLAYER) 1270 if (op->type != PLAYER || owner->type != PLAYER)
1318 change_exp (owner, op->stats.exp / (rate * 2), 1271 change_exp (owner, op->stats.exp / (rate * 2),
1319 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1272 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1320 } 1273 }
1321 else if (op->type != PLAYER || hitter->type != PLAYER) 1274 else if (op->type != PLAYER || hitter->type != PLAYER)
1322 {
1323 change_exp (hitter, op->stats.exp / (rate * 2), 1275 change_exp (hitter, op->stats.exp / (rate * 2),
1324 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1276 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1325 } 1277
1326 change_exp (op, -op->stats.exp / rate, NULL, 0); 1278 change_exp (op, -op->stats.exp / rate, NULL, 0);
1327 } 1279 }
1280
1328 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1281 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1329 * drain attack, you won't know that you are actually sucking out EXP, 1282 * drain attack, you won't know that you are actually sucking out EXP,
1330 * as the messages will say you missed 1283 * as the messages will say you missed
1331 */ 1284 */
1332 } 1285 }
1333 } 1286 }
1334 break; 1287 break;
1288
1335 case ATNR_TURN_UNDEAD: 1289 case ATNR_TURN_UNDEAD:
1336 { 1290 {
1337 if (QUERY_FLAG (op, FLAG_UNDEAD)) 1291 if (QUERY_FLAG (op, FLAG_UNDEAD))
1338 { 1292 {
1339 object *owner = hitter->owner ? (object *)hitter->owner : hitter; 1293 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1340 object *god = find_god (determine_god (owner)); 1294 object *god = find_god (determine_god (owner));
1341 int div = 1; 1295 int div = 1;
1342 1296
1343 /* if undead are not an enemy of your god, you turn them 1297 /* if undead are not an enemy of your god, you turn them
1344 * at half strength */ 1298 * at half strength */
1345 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1299 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1346 div = 2; 1300 div = 2;
1301
1347 /* Give a bonus if you resist turn undead */ 1302 /* Give a bonus if you resist turn undead */
1348 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1303 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1349 scare_creature (op, owner); 1304 scare_creature (op, owner);
1350 } 1305 }
1351 else 1306 else
1352 dam = 0; /* don't damage non undead - should we damage 1307 dam = 0; /* don't damage non undead - should we damage
1353 undead? */ 1308 undead? */
1354 } 1309 }
1355 break; 1310 break;
1311
1356 case ATNR_DEATH: 1312 case ATNR_DEATH:
1357 deathstrike_player (op, hitter, &dam); 1313 deathstrike_player (op, hitter, &dam);
1358 break; 1314 break;
1315
1359 case ATNR_CHAOS: 1316 case ATNR_CHAOS:
1360 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter)); 1317 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1361 dam = 0; 1318 dam = 0;
1362 break; 1319 break;
1320
1363 case ATNR_COUNTERSPELL: 1321 case ATNR_COUNTERSPELL:
1364 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter)); 1322 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1365 dam = 0; 1323 dam = 0;
1366 /* This should never happen. Counterspell is handled 1324 /* This should never happen. Counterspell is handled
1367 * seperately and filtered out. If this does happen, 1325 * seperately and filtered out. If this does happen,
1368 * Counterspell has no effect on anything but spells, so it 1326 * Counterspell has no effect on anything but spells, so it
1369 * does no damage. */ 1327 * does no damage. */
1370 break; 1328 break;
1329
1371 case ATNR_HOLYWORD: 1330 case ATNR_HOLYWORD:
1372 { 1331 {
1373 /* This has already been handled by hit_player, 1332 /* This has already been handled by hit_player,
1374 * no need to check twice -- DAMN */ 1333 * no need to check twice -- DAMN */
1375 object *owner = hitter->owner ? (object *)hitter->owner : hitter; 1334 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1376 1335
1377 /* As with turn undead above, give a bonus on the saving throw */ 1336 /* As with turn undead above, give a bonus on the saving throw */
1378 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis]) 1337 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1379 scare_creature (op, owner); 1338 scare_creature (op, owner);
1380 } 1339 }
1381 break; 1340 break;
1341
1382 case ATNR_LIFE_STEALING: 1342 case ATNR_LIFE_STEALING:
1383 { 1343 {
1384 int new_hp; 1344 int new_hp;
1385 1345
1386 /* this is replacement to drain for players, instead of taking 1346 /* this is replacement to drain for players, instead of taking
1387 * exp it takes hp. It is geared for players, probably not 1347 * exp it takes hp. It is geared for players, probably not
1388 * much use giving it to monsters 1348 * much use giving it to monsters
1389 * 1349 *
1390 * life stealing doesn't do a lot of damage, but it gives the 1350 * life stealing doesn't do a lot of damage, but it gives the
1391 * damage it does do to the player. Given that, 1351 * damage it does do to the player. Given that,
1392 * it only does 1/10'th normal damage (hence the divide by 1352 * it only does 1/10'th normal damage (hence the divide by
1393 * 1000). 1353 * 1000).
1394 */ 1354 */
1395 /* You can't steal life from something undead */ 1355 /* You can't steal life from something undead */
1396 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD))) 1356 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1397 return 0; 1357 return 0;
1358
1398 /* If drain protection is higher than life stealing, use that */ 1359 /* If drain protection is higher than life stealing, use that */
1399 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING]) 1360 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1400 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000; 1361 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1401 else 1362 else
1402 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000; 1363 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1364
1403 /* You die at -1 hp, not zero. */ 1365 /* You die at -1 hp, not zero. */
1404 if (dam > (op->stats.hp + 1)) 1366 if (dam > (op->stats.hp + 1))
1405 dam = op->stats.hp + 1; 1367 dam = op->stats.hp + 1;
1368
1406 new_hp = hitter->stats.hp + dam; 1369 new_hp = hitter->stats.hp + dam;
1407 if (new_hp > hitter->stats.maxhp) 1370 if (new_hp > hitter->stats.maxhp)
1408 new_hp = hitter->stats.maxhp; 1371 new_hp = hitter->stats.maxhp;
1372
1409 if (new_hp > hitter->stats.hp) 1373 if (new_hp > hitter->stats.hp)
1410 hitter->stats.hp = new_hp; 1374 hitter->stats.hp = new_hp;
1411 } 1375 }
1412 } 1376 }
1377
1413 return dam; 1378 return dam;
1414} 1379}
1415
1416 1380
1417/* GROS: This code comes from hit_player. It has been made external to 1381/* GROS: This code comes from hit_player. It has been made external to
1418 * allow script procedures to "kill" objects in a combat-like fashion. 1382 * allow script procedures to "kill" objects in a combat-like fashion.
1419 * It was initially used by (kill-object) developed for the Collector's 1383 * It was initially used by (kill-object) developed for the Collector's
1420 * Sword. Note that nothing has been changed from the original version 1384 * Sword. Note that nothing has been changed from the original version
… …
1435 char buf[MAX_BUF]; 1399 char buf[MAX_BUF];
1436 const char *skill; 1400 const char *skill;
1437 int maxdam = 0; 1401 int maxdam = 0;
1438 int battleg = 0; /* true if op standing on battleground */ 1402 int battleg = 0; /* true if op standing on battleground */
1439 int pk = 0; /* true if op and what controls hitter are both players */ 1403 int pk = 0; /* true if op and what controls hitter are both players */
1440 object *owner = NULL; 1404 object *owner = 0;
1441 object *skop = NULL; 1405 object *skop = 0;
1442 1406
1443 if (op->stats.hp >= 0) 1407 if (op->stats.hp >= 0)
1444 return -1; 1408 return -1;
1445 1409
1446 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1410 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1455 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1419 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1456 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1420 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1457 1421
1458 if (op->type == DOOR) 1422 if (op->type == DOOR)
1459 { 1423 {
1460 op->speed = 0.1; 1424 op->set_speed (0.1f);
1461 update_ob_speed (op);
1462 op->speed_left = -0.05; 1425 op->speed_left = -0.05f;
1463 return maxdam; 1426 return maxdam;
1464 } 1427 }
1428
1465 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1429 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1466 { 1430 {
1467 remove_friendly_object (op); 1431 op->destroy ();
1468 if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1469 {
1470 op->owner->contr->ranges[range_golem] = NULL;
1471 op->owner->contr->golem_count = 0;
1472 }
1473
1474 remove_ob (op);
1475 free_object (op);
1476 return maxdam; 1432 return maxdam;
1477 } 1433 }
1478 1434
1479 /* Now lets start dealing with experience we get for killing something */ 1435 /* Now lets start dealing with experience we get for killing something */
1480 1436
1481 owner = get_owner (hitter); 1437 owner = hitter->owner;
1482 if (owner == NULL) 1438 if (!owner)
1483 owner = hitter; 1439 owner = hitter;
1484 1440
1485 /* is the victim (op) standing on battleground? */ 1441 /* is the victim (op) standing on battleground? */
1486 if (op_on_battleground (op, NULL, NULL)) 1442 if (op_on_battleground (op, NULL, NULL))
1487 battleg = 1; 1443 battleg = 1;
… …
1507 char buf[256]; 1463 char buf[256];
1508 1464
1509 tmv = localtime (&t); 1465 tmv = localtime (&t);
1510 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv); 1466 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1511 1467
1512 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op)); 1468 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1513 } 1469 }
1514 1470
1515 /* try to filter some things out - basically, if you are 1471 /* try to filter some things out - basically, if you are
1516 * killing a level 1 creature and your level 20, you 1472 * killing a level 1 creature and your level 20, you
1517 * probably don't want to see that. 1473 * probably don't want to see that.
1518 */ 1474 */
1519 if (owner->level < op->level * 2 || op->stats.exp > 1000) 1475 if (owner->level < op->level * 2 || op->stats.exp > 1000)
1520 { 1476 {
1521 if (owner != hitter) 1477 if (owner != hitter)
1522 {
1523 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter)); 1478 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1524 }
1525 else 1479 else
1526 {
1527 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1480 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1528 } 1481
1529 /* Only play sounds for melee kills */ 1482 /* Only play sounds for melee kills */
1530 if (hitter->type == PLAYER) 1483 if (hitter->type == PLAYER)
1531 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1484 owner->play_sound (sound_find ("player_kills"));
1532 } 1485 }
1533 1486
1534 /* If a player kills another player, not on 1487 /* If a player kills another player, not on
1535 * battleground, the "killer" looses 1 luck. Since this is 1488 * battleground, the "killer" looses 1 luck. Since this is
1536 * not reversible, it's actually quite a pain IMHO. -AV 1489 * not reversible, it's actually quite a pain IMHO. -AV
… …
1538 * player that the object belonged to - so if you killed another player 1491 * player that the object belonged to - so if you killed another player
1539 * with spells, pets, whatever, there was no penalty. 1492 * with spells, pets, whatever, there was no penalty.
1540 * Changed to make luck penalty configurable in settings. 1493 * Changed to make luck penalty configurable in settings.
1541 */ 1494 */
1542 if (op->type == PLAYER && owner != op && !battleg) 1495 if (op->type == PLAYER && owner != op && !battleg)
1543 change_luck (owner, -settings.pk_luck_penalty); 1496 owner->change_luck (-settings.pk_luck_penalty);
1544 1497
1545 /* This code below deals with finding the appropriate skill 1498 /* This code below deals with finding the appropriate skill
1546 * to credit exp to. This is a bit problematic - we should 1499 * to credit exp to. This is a bit problematic - we should
1547 * probably never really have to look at current_weapon->skill 1500 * probably never really have to look at current_weapon->skill
1548 */ 1501 */
1549 skill = NULL; 1502 skill = 0;
1503
1550 if (hitter->skill && hitter->type != PLAYER) 1504 if (hitter->skill && hitter->type != PLAYER)
1551 skill = hitter->skill; 1505 skill = hitter->skill;
1552 else if (owner->chosen_skill) 1506 else if (owner->chosen_skill)
1553 { 1507 {
1554 skill = owner->chosen_skill->skill;
1555 skop = owner->chosen_skill; 1508 skop = owner->chosen_skill;
1509 skill = skop->skill;
1556 } 1510 }
1557 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1511 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1558 skill = owner->current_weapon->skill; 1512 skill = owner->current_weapon->skill;
1559 else 1513 else
1560 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1514 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1561 1515
1562 /* We have the skill we want to credit to - now find the object this goes 1516 /* We have the skill we want to credit to - now find the object this goes
1563 * to. Make sure skop is an actual skill, and not a skill tool! 1517 * to. Make sure skop is an actual skill, and not a skill tool!
1564 */ 1518 */
1565 if ((!skop || skop->type != SKILL) && skill) 1519 if ((!skop || skop->type != SKILL) && skill)
1566 { 1520 {
1567 int i; 1521 int i;
1568 1522
… …
1573 break; 1527 break;
1574 } 1528 }
1575 } 1529 }
1576 } /* Was it a player that hit somethign */ 1530 } /* Was it a player that hit somethign */
1577 else 1531 else
1578 {
1579 skill = NULL; 1532 skill = 0;
1580 }
1581 1533
1582 /* Pet (or spell) killed something. */ 1534 /* Pet (or spell) killed something. */
1583 if (owner != hitter) 1535 if (owner != hitter)
1584 {
1585 (void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name, 1536 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1586 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1537 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1587 }
1588 else 1538 else
1589 {
1590 (void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name, 1539 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1591 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? 1540 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1592 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1541 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1593 } 1542
1594 /* These may have been set in the player code section above */ 1543 /* These may have been set in the player code section above */
1595 if (!skop) 1544 if (!skop)
1596 skop = hitter->chosen_skill; 1545 skop = hitter->chosen_skill;
1546
1597 if (!skill && skop) 1547 if (!skill && skop)
1598 skill = skop->skill; 1548 skill = skop->skill;
1599 1549
1600 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1550 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1601 1551
1602
1603 /* If you didn't kill yourself, and your not the wizard */ 1552 /* If you didn't kill yourself, and your not the wizard */
1604 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1553 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1605 { 1554 {
1606 int exp; 1555 int exp;
1607 1556
1608 /* Really don't give much experience for killing other players */ 1557 /* Really don't give much experience for killing other players */
1609 // schmorp: temporary? reduce the amount of exp gained for pking enourmously 1558 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1610 if (op->type == PLAYER) 1559 if (op->type == PLAYER)
1611 { 1560 {
1612 if (battleg) 1561 if (battleg)
1613 { 1562 {
1614 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!"); 1563 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
… …
1632 1581
1633 if (!settings.simple_exp) 1582 if (!settings.simple_exp)
1634 exp = exp / 2; 1583 exp = exp / 2;
1635 1584
1636 if (owner->type != PLAYER || owner->contr->party == NULL) 1585 if (owner->type != PLAYER || owner->contr->party == NULL)
1637 {
1638 change_exp (owner, exp, skill, 0); 1586 change_exp (owner, exp, skill, 0);
1639 }
1640 else 1587 else
1641 { 1588 {
1642 int shares = 0, count = 0; 1589 int shares = 0, count = 0;
1643
1644 player *pl;
1645
1646 partylist *party = owner->contr->party; 1590 partylist *party = owner->contr->party;
1647 1591
1648#ifdef PARTY_KILL_LOG
1649 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1592 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1650#endif 1593
1651 for (pl = first_player; pl != NULL; pl = pl->next) 1594 for_all_players (pl)
1652 {
1653 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1595 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1654 { 1596 {
1655 count++; 1597 count++;
1656 shares += (pl->ob->level + 4); 1598 shares += (pl->ob->level + 4);
1657 } 1599 }
1658 } 1600
1659 if (count == 1 || shares > exp) 1601 if (count == 1 || shares > exp || !shares)
1660 change_exp (owner, exp, skill, SK_EXP_TOTAL); 1602 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1661 else 1603 else
1662 { 1604 {
1663 int share = exp / shares, given = 0, nexp; 1605 int share = exp / shares, given = 0, nexp;
1664 1606
1665 for (pl = first_player; pl != NULL; pl = pl->next) 1607 for_all_players (pl)
1666 {
1667 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1608 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1668 { 1609 {
1669 nexp = (pl->ob->level + 4) * share; 1610 nexp = (pl->ob->level + 4) * share;
1670 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL); 1611 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1671 given += nexp; 1612 given += nexp;
1672 } 1613 }
1673 } 1614
1674 exp -= given; 1615 exp -= given;
1675 /* give any remainder to the player */ 1616 /* give any remainder to the player */
1676 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL); 1617 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1677 } 1618 }
1678 } /* else part of a party */ 1619 } /* else part of a party */
1679
1680 } /* end if person didn't kill himself */ 1620 } /* end if person didn't kill himself */
1681 1621
1682 if (op->type != PLAYER) 1622 if (op->type != PLAYER)
1683 { 1623 {
1684 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 1624 if (QUERY_FLAG (op, FLAG_FRIENDLY))
1685 { 1625 {
1686 object *owner1 = get_owner (op); 1626 object *owner1 = op->owner;
1687 1627
1688 if (owner1 != NULL && owner1->type == PLAYER) 1628 if (owner1 && owner1->type == PLAYER)
1689 { 1629 {
1690 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1630 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1691 /* Maybe we should include the owner that killed this, maybe not */ 1631 /* Maybe we should include the owner that killed this, maybe not */
1692 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1632 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1693 } 1633 }
1694 1634
1695 remove_friendly_object (op); 1635 remove_friendly_object (op);
1696 } 1636 }
1697 1637
1698 remove_ob (op); 1638 op->destroy ();
1699 free_object (op);
1700 } 1639 }
1701 /* Player has been killed! */
1702 else 1640 else
1703 { 1641 {
1642 /* Player has been killed! */
1704 if (owner->type == PLAYER) 1643 if (owner->type == PLAYER)
1705 {
1706 snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); 1644 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1707 }
1708 else 1645 else
1709 assign (op->contr->killer, hitter->name); 1646 assign (op->contr->killer, hitter->name);
1710 } 1647 }
1711 1648
1712 /* This was return -1 - that doesn't seem correct - if we return -1, process 1649 /* This was return -1 - that doesn't seem correct - if we return -1, process
… …
1716} 1653}
1717 1654
1718/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1655/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1719 * Returns 0 this is not friendly fire 1656 * Returns 0 this is not friendly fire
1720 */ 1657 */
1721
1722int 1658int
1723friendly_fire (object *op, object *hitter) 1659friendly_fire (object *op, object *hitter)
1724{ 1660{
1725 object *owner; 1661 object *owner;
1726 int friendlyfire; 1662 int friendlyfire;
… …
1736 return 0; 1672 return 0;
1737 1673
1738 if (hitter->type == PLAYER && hitter->contr->peaceful == 1) 1674 if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1739 return 1; 1675 return 1;
1740 1676
1741 if ((owner = get_owner (hitter)) != NULL) 1677 if ((owner = hitter->owner) != NULL)
1742 { 1678 {
1743 if (owner->type == PLAYER && owner->contr->peaceful == 1) 1679 if (owner->type == PLAYER && owner->contr->peaceful == 1)
1744 friendlyfire = 2; 1680 friendlyfire = 2;
1745 } 1681 }
1746 1682
1747 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1683 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1748 friendlyfire = 0; 1684 friendlyfire = 0;
1749 } 1685 }
1686
1750 return friendlyfire; 1687 return friendlyfire;
1751} 1688}
1752
1753 1689
1754/* This isn't used just for players, but in fact most objects. 1690/* This isn't used just for players, but in fact most objects.
1755 * op is the object to be hit, dam is the amount of damage, hitter 1691 * op is the object to be hit, dam is the amount of damage, hitter
1756 * is what is hitting the object, type is the attacktype, and 1692 * is what is hitting the object, type is the attacktype, and
1757 * full_hit is set if monster area does not matter. 1693 * full_hit is set if monster area does not matter.
1758 * dam is base damage - protections/vulnerabilities/slaying matches can 1694 * dam is base damage - protections/vulnerabilities/slaying matches can
1759 * modify it. 1695 * modify it.
1760 */ 1696 */
1761
1762 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1697/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1763 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1698 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1764
1765int 1699int
1766hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1700hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1767{ 1701{
1768 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1702 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1769 int maxattacktype, attacknum; 1703 int maxattacktype, attacknum;
1770 int body_attack = op && op->head; /* Did we hit op's head? */ 1704 int body_attack = op && op->head; /* Did we hit op's head? */
1771 int simple_attack; 1705 int simple_attack;
1772 tag_t op_tag, hitter_tag;
1773 int rtn_kill = 0; 1706 int rtn_kill = 0;
1774 int friendlyfire; 1707 int friendlyfire;
1775 1708
1776 if (get_attack_mode (&op, &hitter, &simple_attack)) 1709 if (get_attack_mode (&op, &hitter, &simple_attack))
1777 return 0; 1710 return 0;
1778 1711
1779 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1712 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1780 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1713 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1781 return 0; 1714 return 0;
1782 1715
1783#ifdef PROHIBIT_PLAYERKILL 1716 // only allow pk for hostile players
1784 if (op->type == PLAYER) 1717 if (op->type == PLAYER)
1785 { 1718 {
1786 object *owner = get_owner (hitter); 1719 object *owner = hitter->owner;
1787 1720
1788 if (!owner) 1721 if (!owner)
1789 owner = hitter; 1722 owner = hitter;
1790 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1723
1791 { 1724 if (owner->type == PLAYER
1725 && (!op_on_battleground (op, 0, 0)
1726 && (op->contr->peaceful || owner->contr->peaceful))
1727 && op != owner)
1792 return 0; 1728 return 0;
1793 }
1794 } 1729 }
1795#endif
1796
1797 op_tag = op->count;
1798 hitter_tag = hitter->count;
1799 1730
1800 if (body_attack) 1731 if (body_attack)
1801 { 1732 {
1802 /* slow and paralyze must hit the head. But we don't want to just 1733 /* slow and paralyze must hit the head. But we don't want to just
1803 * return - we still need to process other attacks the spell still 1734 * return - we still need to process other attacks the spell still
… …
1809 * attack so we don't cancel out things like magic bullet. 1740 * attack so we don't cancel out things like magic bullet.
1810 */ 1741 */
1811 if (type & (AT_PARALYZE | AT_SLOW)) 1742 if (type & (AT_PARALYZE | AT_SLOW))
1812 { 1743 {
1813 type &= ~(AT_PARALYZE | AT_SLOW); 1744 type &= ~(AT_PARALYZE | AT_SLOW);
1745
1814 if (!type || type == AT_MAGIC) 1746 if (!type || type == AT_MAGIC)
1815 return 0; 1747 return 0;
1816 } 1748 }
1817 } 1749 }
1818 1750
1819 if (!simple_attack && op->type == DOOR) 1751 if (!simple_attack && op->type == DOOR)
1820 { 1752 {
1821 object *tmp;
1822
1823 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1753 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1824 if (tmp->type == RUNE || tmp->type == TRAP) 1754 if (tmp->type == RUNE || tmp->type == TRAP)
1825 { 1755 {
1826 spring_trap (tmp, hitter); 1756 spring_trap (tmp, hitter);
1757
1827 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 1758 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1828 return 0; 1759 return 0;
1760
1829 break; 1761 break;
1830 } 1762 }
1831 } 1763 }
1832 1764
1833 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1765 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1834 { 1766 {
1835 /* FIXME: If a player is killed by a rune in a door, the 1767 /* FIXME: If a player is killed by a rune in a door, the
1836 * was_destroyed() check above doesn't return, and might get here. 1768 * destroyed() check above doesn't return, and might get here.
1837 */ 1769 */
1770
1771 /* FIXME: This for example happens when a dead door is on a mover and
1772 gets it's speed_left raised on each mover-tick.
1773 Doors are removed in a kinda funny way by giving them speed and speed_left
1774 and waiting for that to run out.
1775 */
1838 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name); 1776 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1839 return 0; 1777 return 0;
1840 } 1778 }
1841 1779
1842#ifdef ATTACK_DEBUG 1780#ifdef ATTACK_DEBUG
1843 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1781 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1849 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1787 * in case 0>dam>1, we try to "simulate" a float value-effect */
1850 dam = dam * (100 - op->resist[ATNR_MAGIC]); 1788 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1851 if (dam >= 100) 1789 if (dam >= 100)
1852 dam /= 100; 1790 dam /= 100;
1853 else 1791 else
1854 dam = (dam > (rndm (0, 99))) ? 1 : 0; 1792 dam = (dam > rndm (0, 99)) ? 1 : 0;
1855 } 1793 }
1856 1794
1857 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1795 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1858 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1796 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1859 */ 1797 */
… …
1875 if ((!hitter->slaying || 1813 if ((!hitter->slaying ||
1876 (!(op->race && strstr (hitter->slaying, op->race)) && 1814 (!(op->race && strstr (hitter->slaying, op->race)) &&
1877 !(op->name && strstr (hitter->slaying, op->name)))) && 1815 !(op->name && strstr (hitter->slaying, op->name)))) &&
1878 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1816 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1879 (hitter->title != NULL 1817 (hitter->title != NULL
1880 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1818 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1881 return 0; 1819 return 0;
1882 } 1820 }
1883 1821
1884 maxattacktype = type; /* initialize this to something */ 1822 maxattacktype = type; /* initialise this to something */
1885 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1823 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1886 { 1824 {
1887 /* Magic isn't really a true attack type - it gets combined with other 1825 /* Magic isn't really a true attack type - it gets combined with other
1888 * attack types. As such, skip it over. However, if magic is 1826 * attack types. As such, skip it over. However, if magic is
1889 * the only attacktype in the group, then still attack with it 1827 * the only attacktype in the group, then still attack with it
… …
1917 */ 1855 */
1918 friendlyfire = friendly_fire (op, hitter); 1856 friendlyfire = friendly_fire (op, hitter);
1919 if (friendlyfire && maxdam) 1857 if (friendlyfire && maxdam)
1920 { 1858 {
1921 maxdam = ((dam * settings.set_friendly_fire) / 100); 1859 maxdam = ((dam * settings.set_friendly_fire) / 100);
1922#ifndef COZY_SERVER
1923 maxdam++;
1924#endif
1925 1860
1926#ifdef ATTACK_DEBUG 1861#ifdef ATTACK_DEBUG
1927 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1862 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1928 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1863 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1929#endif 1864#endif
1930 } 1865 }
1931 1866
1932 if (!full_hit) 1867 if (!full_hit)
1933 { 1868 {
1934 archetype *at;
1935 int area; 1869 int area;
1936 int remainder; 1870 int remainder;
1937 1871
1938 area = 0; 1872 area = 0;
1939 for (at = op->arch; at != NULL; at = at->more) 1873
1874 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1940 area++; 1875 area++;
1876
1941 assert (area > 0); 1877 assert (area > 0);
1942 1878
1943 /* basically: maxdam /= area; we try to "simulate" a float 1879 /* basically: maxdam /= area; we try to "simulate" a float
1944 value-effect */ 1880 value-effect */
1945 remainder = 100 * (maxdam % area) / area; 1881 remainder = 100 * (maxdam % area) / area;
1946 maxdam /= area; 1882 maxdam /= area;
1947 if (RANDOM () % 100 < remainder) 1883 if (rndm (100) < remainder)
1948 maxdam++; 1884 maxdam++;
1949 } 1885 }
1950 1886
1951#ifdef ATTACK_DEBUG 1887#ifdef ATTACK_DEBUG
1952 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1888 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1953#endif 1889#endif
1954 1890
1955 if (get_owner (hitter)) 1891 // for now, only do this for active objects, otherwise they
1892 // keep a refcount for a long time and I see no usefulness
1893 // for an non-active objetc to know its enemy.
1894 if (op->active)
1895 if (hitter->owner)
1956 op->enemy = hitter->owner; 1896 op->enemy = hitter->owner;
1957 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1897 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1958 op->enemy = hitter; 1898 op->enemy = hitter;
1959 1899
1960 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1900 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1961 { 1901 {
1962 /* The unaggressives look after themselves 8) */ 1902 /* The unaggressives look after themselves 8) */
1963 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1903 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1985 1925
1986 if (QUERY_FLAG (op, FLAG_TEAR_DOWN)) 1926 if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1987 { 1927 {
1988 if (maxdam) 1928 if (maxdam)
1989 tear_down_wall (op); 1929 tear_down_wall (op);
1930
1990 return maxdam; /* nothing more to do for wall */ 1931 return maxdam; /* nothing more to do for wall */
1991 } 1932 }
1992 1933
1993 /* See if the creature has been killed */ 1934 /* See if the creature has been killed */
1994 rtn_kill = kill_object (op, maxdam, hitter, type); 1935 rtn_kill = kill_object (op, maxdam, hitter, type);
… …
1999 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1940 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
2000 * that before if the player was immune to ghosthit, the monster 1941 * that before if the player was immune to ghosthit, the monster
2001 * remained - that is no longer the case. 1942 * remained - that is no longer the case.
2002 */ 1943 */
2003 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1944 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
2004 { 1945 hitter->destroy ();
2005 if (QUERY_FLAG (hitter, FLAG_FRIENDLY)) 1946
2006 remove_friendly_object (hitter);
2007 remove_ob (hitter);
2008 free_object (hitter);
2009 }
2010 /* Lets handle creatures that are splitting now */ 1947 /* Lets handle creatures that are splitting now */
2011 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1948 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2012 { 1949 {
2013 int i; 1950 int i;
2014 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1951 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
2015 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE); 1952 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
2016 object *owner = get_owner (op); 1953 object *owner = op->owner;
2017 1954
2018 if (!op->other_arch) 1955 if (!op->other_arch)
2019 { 1956 {
2020 LOG (llevError, "SPLITTING without other_arch error.\n"); 1957 LOG (llevError, "SPLITTING without other_arch error.\n");
2021 return maxdam; 1958 return maxdam;
2022 } 1959 }
1960
2023 remove_ob (op); 1961 op->remove ();
1962
2024 for (i = 0; i < NROFNEWOBJS (op); i++) 1963 for (i = 0; i < NROFNEWOBJS (op); i++)
2025 { /* This doesn't handle op->more yet */ 1964 { /* This doesn't handle op->more yet */
2026 object *tmp = arch_to_object (op->other_arch); 1965 object *tmp = arch_to_object (op->other_arch);
2027 int j; 1966 int j;
2028 1967
2029 tmp->stats.hp = op->stats.hp; 1968 tmp->stats.hp = op->stats.hp;
1969
2030 if (friendly) 1970 if (friendly)
2031 { 1971 {
2032 SET_FLAG (tmp, FLAG_FRIENDLY);
2033 add_friendly_object (tmp); 1972 add_friendly_object (tmp);
2034 tmp->attack_movement = PETMOVE; 1973 tmp->attack_movement = PETMOVE;
1974
2035 if (owner != NULL) 1975 if (owner)
2036 set_owner (tmp, owner); 1976 tmp->set_owner (owner);
2037 } 1977 }
1978
2038 if (unaggressive) 1979 if (unaggressive)
2039 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1980 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
1981
2040 j = find_first_free_spot (tmp, op->map, op->x, op->y); 1982 j = find_first_free_spot (tmp, op->map, op->x, op->y);
1983
2041 if (j == -1) /* No spot to put this monster */ 1984 if (j == -1) /* No spot to put this monster */
2042 free_object (tmp); 1985 tmp->destroy ();
2043 else 1986 else
2044 { 1987 {
2045 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 1988 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2046 insert_ob_in_map (tmp, op->map, NULL, 0); 1989 insert_ob_in_map (tmp, op->map, NULL, 0);
2047 } 1990 }
2048 } 1991 }
2049 if (friendly) 1992
2050 remove_friendly_object (op); 1993 op->destroy ();
2051 free_object (op);
2052 } 1994 }
2053 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1995 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2054 { 1996 hitter->destroy ();
2055 remove_ob (hitter); 1997
2056 free_object (hitter);
2057 }
2058 return maxdam; 1998 return maxdam;
2059} 1999}
2060
2061 2000
2062void 2001void
2063poison_player (object *op, object *hitter, int dam) 2002poison_player (object *op, object *hitter, int dam)
2064{ 2003{
2065 archetype *at = archetype::find ("poisoning"); 2004 archetype *at = archetype::find ("poisoning");
… …
2083 if (QUERY_FLAG (hitter, FLAG_ALIVE)) 2022 if (QUERY_FLAG (hitter, FLAG_ALIVE))
2084 tmp->stats.dam += hitter->level / 2; 2023 tmp->stats.dam += hitter->level / 2;
2085 else 2024 else
2086 tmp->stats.dam = dam; 2025 tmp->stats.dam = dam;
2087 2026
2088 copy_owner (tmp, hitter); /* so we get credit for poisoning kills */ 2027 tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2089 if (hitter->skill && hitter->skill != tmp->skill) 2028 if (hitter->skill && hitter->skill != tmp->skill)
2090 { 2029 {
2091 tmp->skill = hitter->skill; 2030 tmp->skill = hitter->skill;
2092 } 2031 }
2093 2032
… …
2099 tmp->stats.Con = MAX (-(dam / 4 + 1), -10); 2038 tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
2100 tmp->stats.Str = MAX (-(dam / 3 + 2), -10); 2039 tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
2101 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2040 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2102 tmp->stats.Int = MAX (-dam / 7, -10); 2041 tmp->stats.Int = MAX (-dam / 7, -10);
2103 SET_FLAG (tmp, FLAG_APPLIED); 2042 SET_FLAG (tmp, FLAG_APPLIED);
2104 fix_player (op); 2043 op->update_stats ();
2105 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2044 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2045 op->play_sound (tmp->sound);
2106 } 2046 }
2047
2107 if (hitter->type == PLAYER) 2048 if (hitter->type == PLAYER)
2108 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2049 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2109 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 2050 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2110 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2051 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2111 } 2052 }
2053
2112 tmp->speed_left = 0; 2054 tmp->speed_left = 0;
2113 } 2055 }
2114 else 2056 else
2115 tmp->stats.food++; 2057 tmp->stats.food++;
2116} 2058}
… …
2120{ 2062{
2121 archetype *at = archetype::find ("slowness"); 2063 archetype *at = archetype::find ("slowness");
2122 object *tmp; 2064 object *tmp;
2123 2065
2124 if (at == NULL) 2066 if (at == NULL)
2125 {
2126 LOG (llevError, "Can't find slowness archetype.\n"); 2067 LOG (llevError, "Can't find slowness archetype.\n");
2127 } 2068
2128 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2069 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2129 { 2070 {
2130 tmp = arch_to_object (at); 2071 tmp = arch_to_object (at);
2131 tmp = insert_ob_in_ob (tmp, op); 2072 tmp = insert_ob_in_ob (tmp, op);
2132 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2073 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2133 } 2074 }
2134 else 2075 else
2135 tmp->stats.food++; 2076 tmp->stats.food++;
2077
2136 SET_FLAG (tmp, FLAG_APPLIED); 2078 SET_FLAG (tmp, FLAG_APPLIED);
2137 tmp->speed_left = 0; 2079 tmp->speed_left = 0;
2138 fix_player (op); 2080 op->update_stats ();
2139} 2081}
2140 2082
2141void 2083void
2142confuse_player (object *op, object *hitter, int dam) 2084confuse_player (object *op, object *hitter, int dam)
2143{ 2085{
… …
2157 tmp->speed = 0.05; 2099 tmp->speed = 0.05;
2158 tmp->subtype = FORCE_CONFUSION; 2100 tmp->subtype = FORCE_CONFUSION;
2159 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2101 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2160 tmp->name = "confusion"; 2102 tmp->name = "confusion";
2161 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2103 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2104
2162 if (tmp->duration > maxduration) 2105 if (tmp->duration > maxduration)
2163 tmp->duration = maxduration; 2106 tmp->duration = maxduration;
2164 2107
2165 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2108 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2166 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2109 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2110
2167 SET_FLAG (op, FLAG_CONFUSED); 2111 SET_FLAG (op, FLAG_CONFUSED);
2168} 2112}
2169 2113
2170void 2114void
2171blind_player (object *op, object *hitter, int dam) 2115blind_player (object *op, object *hitter, int dam)
… …
2187 */ 2131 */
2188 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100; 2132 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2189 2133
2190 tmp = insert_ob_in_ob (tmp, op); 2134 tmp = insert_ob_in_ob (tmp, op);
2191 change_abil (op, tmp); /* Mostly to display any messages */ 2135 change_abil (op, tmp); /* Mostly to display any messages */
2192 fix_player (op); /* This takes care of some other stuff */ 2136 op->update_stats (); /* This takes care of some other stuff */
2193 2137
2194 if (hitter->owner) 2138 if (hitter->owner)
2195 owner = get_owner (hitter); 2139 owner = hitter->owner;
2196 else 2140 else
2197 owner = hitter; 2141 owner = hitter;
2198 2142
2199 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op)); 2143 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2200 } 2144 }
… …
2237 op->speed_left = (float) -(FABS (op->speed) * max); 2181 op->speed_left = (float) -(FABS (op->speed) * max);
2238 2182
2239/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2183/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2240} 2184}
2241 2185
2242
2243/* Attempts to kill 'op'. hitter is the attack object, dam is 2186/* Attempts to kill 'op'. hitter is the attack object, dam is
2244 * the computed damaged. 2187 * the computed damaged.
2245 */ 2188 */
2246void 2189void
2247deathstrike_player (object *op, object *hitter, int *dam) 2190deathstrike_player (object *op, object *hitter, int *dam)
… …
2255 ** field of the deathstriking object */ 2198 ** field of the deathstriking object */
2256 2199
2257 int atk_lev, def_lev, kill_lev; 2200 int atk_lev, def_lev, kill_lev;
2258 2201
2259 if (hitter->slaying) 2202 if (hitter->slaying)
2260 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2203 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2261 return; 2204 return;
2262 2205
2263 def_lev = op->level; 2206 def_lev = op->level;
2264 if (def_lev < 1) 2207 if (def_lev < 1)
2265 { 2208 {
2266 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2209 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2267 def_lev = 1; 2210 def_lev = 1;
2268 } 2211 }
2212
2269 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2213 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2270 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2214 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2271 atk_lev, def_lev); */ 2215 atk_lev, def_lev); */
2272 2216
2273 if (atk_lev >= def_lev) 2217 if (atk_lev >= def_lev)
… …
2288 */ 2232 */
2289 *dam *= kill_lev / def_lev; 2233 *dam *= kill_lev / def_lev;
2290 } 2234 }
2291 } 2235 }
2292 else 2236 else
2293 {
2294 *dam = 0; /* no harm done */ 2237 *dam = 0; /* no harm done */
2295 }
2296} 2238}
2297 2239
2298/* thrown_item_effect() - handles any special effects of thrown 2240/* thrown_item_effect() - handles any special effects of thrown
2299 * items (like attacking living creatures--a potion thrown at a 2241 * items (like attacking living creatures--a potion thrown at a
2300 * monster). 2242 * monster).
… …
2329 } 2271 }
2330 } 2272 }
2331} 2273}
2332 2274
2333/* adj_attackroll() - adjustments to attacks by various conditions */ 2275/* adj_attackroll() - adjustments to attacks by various conditions */
2334
2335int 2276int
2336adj_attackroll (object *hitter, object *target) 2277adj_attackroll (object *hitter, object *target)
2337{ 2278{
2338 object *attacker = hitter; 2279 object *attacker = hitter;
2339 int adjust = 0; 2280 int adjust = 0;
… …
2346 } 2287 }
2347 2288
2348 /* aimed missiles use the owning object's sight */ 2289 /* aimed missiles use the owning object's sight */
2349 if (is_aimed_missile (hitter)) 2290 if (is_aimed_missile (hitter))
2350 { 2291 {
2351 if ((attacker = get_owner (hitter)) == NULL) 2292 if ((attacker = hitter->owner) == NULL)
2352 attacker = hitter; 2293 attacker = hitter;
2353 /* A player who saves but hasn't quit still could have objects 2294 /* A player who saves but hasn't quit still could have objects
2354 * owned by him - need to handle that case to avoid crashes. 2295 * owned by him - need to handle that case to avoid crashes.
2355 */ 2296 */
2356 if (QUERY_FLAG (attacker, FLAG_REMOVED)) 2297 if (QUERY_FLAG (attacker, FLAG_REMOVED))
… …
2404#endif 2345#endif
2405 2346
2406 return adjust; 2347 return adjust;
2407} 2348}
2408 2349
2409
2410/* determine if the object is an 'aimed' missile */ 2350/* determine if the object is an 'aimed' missile */
2411int 2351int
2412is_aimed_missile (object *op) 2352is_aimed_missile (object *op)
2413{ 2353{
2414 2354
2415 /* I broke what used to be one big if into a few nested 2355 /* I broke what used to be one big if into a few nested
2416 * ones so that figuring out the logic is at least possible. 2356 * ones so that figuring out the logic is at least possible.
2417 */ 2357 */
2418 if (op && (op->move_type & MOVE_FLYING)) 2358 if (op && (op->move_type & MOVE_FLYING))
2419 {
2420 if (op->type == ARROW || op->type == THROWN_OBJ) 2359 if (op->type == ARROW || op->type == THROWN_OBJ)
2421 return 1; 2360 return 1;
2422 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2361 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2423 return 1; 2362 return 1;
2424 } 2363
2425 return 0; 2364 return 0;
2426} 2365}

Diff Legend

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