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.48 by root, Thu Jan 18 22:20:00 2007 UTC vs.
Revision 1.87 by root, Mon Jul 14 18:36:43 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
23
24#include <assert.h> 24#include <assert.h>
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
27#include <material.h> 27#include <material.h>
28#include <skills.h> 28#include <skills.h>
29
30#ifndef __CEXTRACT__
31# include <sproto.h>
32#endif
33
34#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
35 31
36typedef struct att_msg_str 32typedef struct att_msg_str
37{ 33{
38 char *msg1; 34 char *msg1;
39 char *msg2; 35 char *msg2;
… …
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);
70 66
71 if (op->env && op->env->type == PLAYER) 67 if (object *pl = op->visible_to ())
72 esrv_send_item (op->env, op); 68 esrv_update_item (UPD_FLAGS, pl, op);
73 } 69 }
74} 70}
75 71
76/* 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
77 * 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
… …
81did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
82{ 78{
83 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
84 materialtype_t *mt; 80 materialtype_t *mt;
85 81
86 if (op->materialname == NULL) 82 if (!op->materialname)
87 { 83 {
88 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt && mt->next; mt = mt->next)
89 if (op->material & mt->material) 85 if (op->materials & mt->material)
90 break; 86 break;
91 } 87 }
92 else 88 else
93 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
94 90
95 if (mt == NULL) 91 if (!mt)
96 return TRUE; 92 return TRUE;
97 93
98 roll = rndm (1, 20); 94 roll = rndm (1, 20);
99 95
100 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
… …
108 if (type != AT_MAGIC) 104 if (type != AT_MAGIC)
109 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 105 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
110 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 106 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
111 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 107 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
112 108
113 if (type == 0) 109 if (type == 0) return TRUE;
114 return TRUE; 110
115 if (roll == 20) 111 if (roll == 20) return TRUE;
116 return TRUE; 112 if (roll == 1) return FALSE;
117 if (roll == 1)
118 return FALSE;
119 113
120 for (number = 0; number < NROFATTACKS; number++) 114 for (number = 0; number < NROFATTACKS; number++)
121 { 115 {
122 i = 1 << number; 116 i = 1 << number;
117
123 if (!(i & type)) 118 if (!(i & type))
124 continue; 119 continue;
120
125 attacks++; 121 attacks++;
126 if (op->resist[number] == 100) 122 if (op->resist[number] == 100)
127 saves++; 123 saves++;
128 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100) 124 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
129 saves++; 125 saves++;
… …
156 op = stop_item (op); 152 op = stop_item (op);
157 if (op == NULL) 153 if (op == NULL)
158 return; 154 return;
159 155
160 /* Hacked the following so that type LIGHTER will work. 156 /* Hacked the following so that type LIGHTER will work.
161 * Also, objects which are potenital "lights" that are hit by 157 * Also, objects which are potential "lights" that are hit by
162 * flame/elect attacks will be set to glow. "lights" are any 158 * flame/elect attacks will be set to glow. "lights" are any
163 * object with +/- glow_radius and an "other_arch" to change to. 159 * object with +/- glow_radius and an "other_arch" to change to.
164 * (and please note that we cant fail our save and reach this 160 * (and please note that we cant fail our save and reach this
165 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
166 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
167 */ 163 */
168 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))
169 { 165 {
170 const char *arch = op->other_arch->name; 166 const char *arch = op->other_arch->archname;
171 167
172 op = decrease_ob_nr (op, 1); 168 if (op->decrease ())
173
174 if (op)
175 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
176 170
177 if ((op = get_archetype (arch)) != NULL) 171 if ((op = archetype::get (arch)))
178 { 172 {
179 if (env) 173 if (env)
180 { 174 env->insert (op);
181 op->x = env->x, op->y = env->y;
182 insert_ob_in_ob (op, env);
183 if (env->contr)
184 esrv_send_item (env, op);
185 }
186 else 175 else
187 {
188 op->x = x, op->y = y;
189 insert_ob_in_map (op, m, originator, 0); 176 m->insert (op, x, y, originator);
190 }
191 } 177 }
192 178
193 return; 179 return;
194 } 180 }
195 181
… …
200 return; 186 return;
201 } 187 }
202 188
203 if (op->nrof > 1) 189 if (op->nrof > 1)
204 { 190 {
205 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 191 if (op->decrease (rndm (0, op->nrof - 1)))
206
207 if (op)
208 fix_stopped_item (op, m, originator); 192 fix_stopped_item (op, m, originator);
209 } 193 }
210 else 194 else
211 { 195 {
196 // drop everything to the ground, if possible
212 if (op->env) 197 while (op->inv)
213 { 198 op->inv->insert_at (originator);
214 object *tmp = op->in_player ();
215
216 if (tmp)
217 esrv_del_item (tmp->contr, op->count);
218 }
219 199
220 op->destroy (); 200 op->destroy ();
221 } 201 }
222 202
223 if (type & (AT_FIRE | AT_ELECTRICITY)) 203 if (type & (AT_FIRE | AT_ELECTRICITY))
224 if (env) 204 if (env)
225 { 205 {
226 op = get_archetype ("burnout"); 206 op = archetype::get (shstr_burnout);
227 op->x = env->x, op->y = env->y; 207 op->x = env->x, op->y = env->y;
228 insert_ob_in_ob (op, env); 208 env->insert (op);
229 } 209 }
230 else 210 else
231 replace_insert_ob_in_map ("burnout", originator); 211 replace_insert_ob_in_map (shstr_burnout, originator);
232 212
233 return; 213 return;
234 } 214 }
235 215
236 /* The value of 50 is arbitrary. */ 216 /* The value of 50 is arbitrary. */
237 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 217 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
238 { 218 {
239 object *tmp;
240 archetype *at = archetype::find ("icecube"); 219 archetype *at = archetype::find (shstr_icecube);
241 220
242 if (at == NULL) 221 if (at == NULL)
243 return; 222 return;
244 223
245 op = stop_item (op); 224 op = stop_item (op);
246 if (op == NULL) 225 if (op == NULL)
247 return; 226 return;
248 227
249 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 228 object *tmp = present_arch (at, op->map, op->x, op->y);
229 if (!tmp)
250 { 230 {
251 tmp = arch_to_object (at); 231 tmp = arch_to_object (at);
252 tmp->x = op->x, tmp->y = op->y; 232 tmp->x = op->x, tmp->y = op->y;
253 /* This was in the old (pre new movement code) - 233 /* This was in the old (pre new movement code) -
254 * icecubes have slow_move set to 1 - don't want 234 * icecubes have slow_move set to 1 - don't want
… …
257 tmp->move_slow_penalty = 0; 237 tmp->move_slow_penalty = 0;
258 tmp->move_slow = 0; 238 tmp->move_slow = 0;
259 insert_ob_in_map (tmp, op->map, originator, 0); 239 insert_ob_in_map (tmp, op->map, originator, 0);
260 } 240 }
261 241
262 if (!QUERY_FLAG (op, FLAG_REMOVED)) 242 tmp->insert (op);
263 op->remove ();
264
265 insert_ob_in_ob (op, tmp);
266 return; 243 return;
267 } 244 }
268} 245}
269 246
270/* Object op is hitting the map. 247/* Object op is hitting the map.
271 * op is going in direction 'dir' 248 * op is going in direction 'dir'
272 * type is the attacktype of the object. 249 * type is the attacktype of the object.
273 * full_hit is set if monster area does not matter. 250 * full_hit is set if monster area does not matter.
274 * returns 1 if it hits something, 0 otherwise. 251 * returns 1 if it hits something, 0 otherwise.
275 */ 252 */
276
277int 253int
278hit_map (object *op, int dir, int type, int full_hit) 254hit_map (object *op, int dir, int type, int full_hit)
279{ 255{
280 maptile *map; 256 maptile *map;
281 sint16 x, y; 257 sint16 x, y;
… …
287 return 0; 263 return 0;
288 } 264 }
289 265
290 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 266 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
291 { 267 {
292 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 268 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
293 return 0; 269 return 0;
294 } 270 }
295 271
296 if (!op->map) 272 if (!op->map)
297 { 273 {
… …
300 } 276 }
301 277
302 if (op->head) 278 if (op->head)
303 op = op->head; 279 op = op->head;
304 280
305 map = op->map; 281 mapxy pos (op);
306 x = op->x + freearr_x[dir]; 282 pos.move (dir);
307 y = op->y + freearr_y[dir];
308 283
309 if (!xy_normalise (map, x, y)) 284 if (!pos.normalise ())
310 return 0; 285 return 0;
311 286
312 // elmex: a safe map tile can't be hit! 287 // elmex: a safe map tile can't be hit!
313 // this should prevent most harmful effects on items and players there. 288 // this should prevent most harmful effects on items and players there.
314 mapspace &ms = map->at (x, y); 289 mapspace &ms = pos.ms ();
315 290
316 if (ms.flags () & P_SAFE) 291 if (ms.flags () & P_SAFE)
317 return 0; 292 return 0;
318 293
319 /* peterm: a few special cases for special attacktypes --counterspell 294 /* peterm: a few special cases for special attacktypes --counterspell
320 * must be out here because it strikes things which are not alive 295 * must be out here because it strikes things which are not alive
321 */ 296 */
322 if (type & (AT_COUNTERSPELL | AT_CHAOS)) 297 if (type & (AT_COUNTERSPELL | AT_CHAOS))
323 { 298 {
324 if (type & AT_COUNTERSPELL) 299 if (type & AT_COUNTERSPELL)
… …
357 332
358 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 333 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
359 * For example, 'tmp' was put in an icecube. 334 * For example, 'tmp' was put in an icecube.
360 * This is one of the few cases where on_same_map should not be used. 335 * This is one of the few cases where on_same_map should not be used.
361 */ 336 */
362 if (tmp->map != map || tmp->x != x || tmp->y != y) 337 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
363 continue; 338 continue;
364 339
365 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 340 if (QUERY_FLAG (tmp, FLAG_ALIVE))
366 { 341 {
367 hit_player (tmp, op->stats.dam, op, type, full_hit); 342 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
375 * that weak walls have is_alive set, which prevent objects from 350 * that weak walls have is_alive set, which prevent objects from
376 * passing over/through them. We don't care what type of movement 351 * passing over/through them. We don't care what type of movement
377 * the wall blocks - if it blocks any type of movement, can't be 352 * the wall blocks - if it blocks any type of movement, can't be
378 * destroyed right now. 353 * destroyed right now.
379 */ 354 */
380 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 355 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
381 { 356 {
382 save_throw_object (tmp, type, op); 357 save_throw_object (tmp, type, op);
383 358
384 if (op->destroyed ()) 359 if (op->destroyed ())
385 break; 360 break;
… …
544 { 519 {
545 int mtype; 520 int mtype;
546 521
547 switch (hitter->current_weapon->weapontype) 522 switch (hitter->current_weapon->weapontype)
548 { 523 {
549 case WEAP_HIT: 524 case WEAP_HIT:
550 mtype = ATM_BASIC; 525 mtype = ATM_BASIC;
551 break; 526 break;
552 case WEAP_SLASH: 527 case WEAP_SLASH:
553 mtype = ATM_SLASH; 528 mtype = ATM_SLASH;
554 break; 529 break;
555 case WEAP_PIERCE: 530 case WEAP_PIERCE:
556 mtype = ATM_PIERCE; 531 mtype = ATM_PIERCE;
557 break; 532 break;
558 case WEAP_CLEAVE: 533 case WEAP_CLEAVE:
559 mtype = ATM_CLEAVE; 534 mtype = ATM_CLEAVE;
560 break; 535 break;
561 case WEAP_SLICE: 536 case WEAP_SLICE:
562 mtype = ATM_SLICE; 537 mtype = ATM_SLICE;
563 break; 538 break;
564 case WEAP_STAB: 539 case WEAP_STAB:
565 mtype = ATM_STAB; 540 mtype = ATM_STAB;
566 break; 541 break;
567 case WEAP_WHIP: 542 case WEAP_WHIP:
568 mtype = ATM_WHIP; 543 mtype = ATM_WHIP;
569 break; 544 break;
570 case WEAP_CRUSH: 545 case WEAP_CRUSH:
571 mtype = ATM_CRUSH; 546 mtype = ATM_CRUSH;
572 break; 547 break;
573 case WEAP_BLUD: 548 case WEAP_BLUD:
574 mtype = ATM_BLUD; 549 mtype = ATM_BLUD;
575 break; 550 break;
576 default: 551 default:
577 mtype = ATM_BASIC; 552 mtype = ATM_BASIC;
578 break; 553 break;
579 } 554 }
555
580 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 556 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
581 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 557 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
582 { 558 {
583 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 559 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
584 strcpy (buf2, attack_mess[mtype][i].buf3); 560 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
618 if (hitter->owner != NULL) 594 if (hitter->owner != NULL)
619 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 595 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
620 else 596 else
621 { 597 {
622 sprintf (buf, "%s%s you.", &hitter->name, buf2); 598 sprintf (buf, "%s%s you.", &hitter->name, buf2);
599
623 if (dam != 0) 600 if (dam != 0)
624 { 601 {
625 if (dam < 10) 602 if (dam < 10)
626 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 603 op->contr->play_sound (sound_find ("player_is_hit1"));
627 else if (dam < 20) 604 else if (dam < 20)
628 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 605 op->contr->play_sound (sound_find ("player_is_hit2"));
629 else 606 else
630 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 607 op->contr->play_sound (sound_find ("player_is_hit3"));
631 } 608 }
632 } 609 }
610
633 new_draw_info (NDI_BLACK, 0, op, buf); 611 new_draw_info (NDI_BLACK, 0, op, buf);
634 } /* end of player hitting player */ 612 } /* end of player hitting player */
635 613
636 if (hitter->type == PLAYER) 614 if (hitter->type == PLAYER)
637 { 615 {
638 sprintf (buf, "You %s.", buf1); 616 sprintf (buf, "You %s.", buf1);
617
639 if (dam != 0) 618 if (dam != 0)
640 { 619 {
641 if (dam < 10) 620 if (dam < 10)
642 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 621 op->play_sound (sound_find ("player_hits1"));
643 else if (dam < 20) 622 else if (dam < 20)
644 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 623 op->play_sound (sound_find ("player_hits2"));
645 else 624 else
646 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 625 op->play_sound (sound_find ("player_hits3"));
647 } 626 }
627
648 new_draw_info (NDI_BLACK, 0, hitter, buf); 628 new_draw_info (NDI_BLACK, 0, hitter, buf);
649 } 629 }
650 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 630 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
651 { 631 {
652 /* look for stacked spells and start reducing the message chances */ 632 /* look for stacked spells and start reducing the message chances */
… …
654 { 634 {
655 i = 4; 635 i = 4;
656 map = hitter->map; 636 map = hitter->map;
657 if (out_of_map (map, hitter->x, hitter->y)) 637 if (out_of_map (map, hitter->x, hitter->y))
658 return; 638 return;
639
659 next = GET_MAP_OB (map, hitter->x, hitter->y); 640 next = GET_MAP_OB (map, hitter->x, hitter->y);
660 if (next) 641 if (next)
661 while (next) 642 while (next)
662 { 643 {
663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 644 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
664 i *= 3; 645 i *= 3;
646
665 tmp = next; 647 tmp = next;
666 next = tmp->above; 648 next = tmp->above;
667 } 649 }
650
668 if (i < 0) 651 if (i < 0)
669 return; 652 return;
653
670 if (rndm (0, i) != 0) 654 if (rndm (0, i) != 0)
671 return; 655 return;
672 } 656 }
673 else if (rndm (0, 5) != 0) 657 else if (rndm (0, 5) != 0)
674 return; 658 return;
659
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 660 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 661 op->play_sound (sound_find ("player_hits4"));
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 662 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 663 }
679} 664}
680 665
681 666
… …
685 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 670 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
686 { 671 {
687 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 672 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
688 return 1; 673 return 1;
689 } 674 }
675
690 if ((*target)->head) 676 if ((*target)->head)
691 *target = (*target)->head; 677 *target = (*target)->head;
678
692 if ((*hitter)->head) 679 if ((*hitter)->head)
693 *hitter = (*hitter)->head; 680 *hitter = (*hitter)->head;
681
682 if ((*target)->type == LOCKED_DOOR)
683 return 1; // locked doors cannot be hit
684
694 if ((*hitter)->env != NULL || (*target)->env != NULL) 685 if ((*hitter)->env || (*target)->env)
695 { 686 {
696 *simple_attack = 1; 687 *simple_attack = 1;
697 return 0; 688 return 0;
698 } 689 }
690
699 if (QUERY_FLAG (*target, FLAG_REMOVED) 691 if (QUERY_FLAG (*target, FLAG_REMOVED)
700 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 692 || QUERY_FLAG (*hitter, FLAG_REMOVED)
693 || !(*hitter)->map
694 || !on_same_map (*hitter, *target))
701 { 695 {
702 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 696 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
697 (*hitter)->debug_desc (), (*target)->debug_desc ());
703 return 1; 698 return 1;
704 } 699 }
700
705 *simple_attack = 0; 701 *simple_attack = 0;
706 return 0; 702 return 0;
707} 703}
708 704
709static int 705static int
… …
745 741
746 /* 742 /*
747 * A little check to make it more difficult to dance forward and back 743 * A little check to make it more difficult to dance forward and back
748 * to avoid ever being hit by monsters. 744 * to avoid ever being hit by monsters.
749 */ 745 */
750 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 746 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
751 { 747 {
752 /* Decrease speed BEFORE calling process_object. Otherwise, an 748 /* Decrease speed BEFORE calling process_object. Otherwise, an
753 * infinite loop occurs, with process_object calling move_monster, 749 * infinite loop occurs, with process_object calling move_monster,
754 * which then gets here again. By decreasing the speed before 750 * which then gets here again. By decreasing the speed before
755 * we call process_object, the 'if' statement above will fail. 751 * we call process_object, the 'if' statement above will fail.
756 */ 752 */
757 op->speed_left--; 753 --op->speed_left;
758 process_object (op); 754 process_object (op);
759 755
760 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 756 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
761 goto error; 757 goto error;
762 } 758 }
… …
772 /* See if we hit the creature */ 768 /* See if we hit the creature */
773 if (roll == 20 || op->stats.ac >= base_wc - roll) 769 if (roll == 20 || op->stats.ac >= base_wc - roll)
774 { 770 {
775 int hitdam = base_dam; 771 int hitdam = base_dam;
776 772
777 if (settings.casting_time == TRUE)
778 {
779 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
780 {
781 hitter->casting_time = -1;
782 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost your spell!");
783 }
784 if ((op->casting_time > -1) && (hitdam > 0))
785 {
786 op->casting_time = -1;
787 if (op->type == PLAYER)
788 {
789 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost your spell!");
790 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
791 }
792 }
793 }
794 if (!simple_attack) 773 if (!simple_attack)
795 { 774 {
796 /* If you hit something, the victim should *always* wake up. 775 /* If you hit something, the victim should *always* wake up.
797 * Before, invisible hitters could avoid doing this. 776 * Before, invisible hitters could avoid doing this.
798 * -b.t. */ 777 * -b.t. */
… …
806 785
807 /* if you were hidden and hit by a creature, you are discovered */ 786 /* if you were hidden and hit by a creature, you are discovered */
808 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 787 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
809 { 788 {
810 make_visible (op); 789 make_visible (op);
790
811 if (op->type == PLAYER) 791 if (op->type == PLAYER)
812 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 792 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
813 } 793 }
814 794
815 /* thrown items (hitter) will have various effects 795 /* thrown items (hitter) will have various effects
… …
869} 849}
870 850
871int 851int
872attack_ob (object *op, object *hitter) 852attack_ob (object *op, object *hitter)
873{ 853{
874
875 if (hitter->head)
876 hitter = hitter->head; 854 hitter = hitter->head_ ();
855
877 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 856 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
878} 857}
879 858
880/* op is the arrow, tmp is what is stopping the arrow. 859/* op is the arrow, tmp is what is stopping the arrow.
881 * 860 *
… …
890 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 869 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
891 * stick around. 870 * stick around.
892 */ 871 */
893 if (op->weight <= 5000 && tmp->stats.hp >= 0) 872 if (op->weight <= 5000 && tmp->stats.hp >= 0)
894 { 873 {
895 if (tmp->head != NULL) 874 tmp->head_ ()->insert (op);
896 tmp = tmp->head;
897
898 op->remove ();
899 op = insert_ob_in_ob (op, tmp);
900
901 if (tmp->type == PLAYER)
902 esrv_send_item (tmp, op);
903
904 return 1; 875 return 1;
905 } 876 }
906 else 877 else
907 return 0; 878 return 0;
908} 879}
… …
1008 insert_ob_in_ob (hitter, container); 979 insert_ob_in_ob (hitter, container);
1009 } 980 }
1010 981
1011 return op; 982 return op;
1012} 983}
1013
1014 984
1015void 985void
1016tear_down_wall (object *op) 986tear_down_wall (object *op)
1017{ 987{
1018 int perc = 0; 988 int perc = 0;
… …
1067 SET_FLAG (target, FLAG_SCARED); 1037 SET_FLAG (target, FLAG_SCARED);
1068 if (!target->enemy) 1038 if (!target->enemy)
1069 target->enemy = owner; 1039 target->enemy = owner;
1070} 1040}
1071 1041
1072
1073/* This returns the amount of damage hitter does to op with the 1042/* This returns the amount of damage hitter does to op with the
1074 * appropriate attacktype. Only 1 attacktype should be set at a time. 1043 * appropriate attacktype. Only 1 attacktype should be set at a time.
1075 * This doesn't damage the player, but returns how much it should 1044 * This doesn't damage the player, but returns how much it should
1076 * take. However, it will do other effects (paralyzation, slow, etc.) 1045 * take. However, it will do other effects (paralyzation, slow, etc.)
1077 * Note - changed for PR code - we now pass the attack number and not 1046 * Note - changed for PR code - we now pass the attack number and not
… …
1088 return 0; 1057 return 0;
1089 } 1058 }
1090 1059
1091 if (dam < 0) 1060 if (dam < 0)
1092 { 1061 {
1093 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n", dam, hitter->debug_desc (), op->debug_desc2 ()); 1062 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1063 dam, hitter->debug_desc (), op->debug_desc ());
1094 return 0; 1064 return 0;
1095 } 1065 }
1096 1066
1097 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1067 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1098 * people can't mess with that or it otherwise get confused. */ 1068 * people can't mess with that or it otherwise get confused. */
1099 if (attacknum == ATNR_INTERNAL) 1069 if (attacknum == ATNR_INTERNAL)
1100 return dam; 1070 return dam;
1101 1071
1102 if (hitter->slaying) 1072 if (hitter->slaying)
1103 { 1073 {
1104 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1074 if ((op->race && strstr (hitter->slaying, op->race))
1105 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1075 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1106 { 1076 {
1107 doesnt_slay = 0; 1077 doesnt_slay = 0;
1108 dam *= 3; 1078 dam *= 3;
1109 } 1079 }
1110 } 1080 }
… …
1124 /* Special hack. By default, if immune to something, you 1094 /* Special hack. By default, if immune to something, you
1125 * shouldn't need to worry. However, acid is an exception, since 1095 * shouldn't need to worry. However, acid is an exception, since
1126 * it can still damage your items. Only include attacktypes if 1096 * it can still damage your items. Only include attacktypes if
1127 * special processing is needed */ 1097 * special processing is needed */
1128 1098
1129 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1099 if (op->resist[attacknum] >= 100
1100 && doesnt_slay
1101 && attacknum != ATNR_ACID)
1130 return 0; 1102 return 0;
1131 1103
1132 /* Keep this in order - makes things easier to find */ 1104 /* Keep this in order - makes things easier to find */
1133 1105
1134 switch (attacknum) 1106 switch (attacknum)
… …
1184 else if (attacknum == ATNR_DEPLETE) 1156 else if (attacknum == ATNR_DEPLETE)
1185 op->drain_stat (); 1157 op->drain_stat ();
1186 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1158 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1187 blind_player (op, hitter, dam); 1159 blind_player (op, hitter, dam);
1188 } 1160 }
1161
1189 dam = 0; /* These are all effects and don't do real damage */ 1162 dam = 0; /* These are all effects and don't do real damage */
1190 } 1163 }
1191 break; 1164 break;
1192 1165
1193 case ATNR_ACID: 1166 case ATNR_ACID:
… …
1203 if (tmp->invisible) 1176 if (tmp->invisible)
1204 continue; 1177 continue;
1205 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1178 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1206 /* >= 10% acid res. on items will protect these */ 1179 /* >= 10% acid res. on items will protect these */
1207 continue; 1180 continue;
1208 if (!(tmp->material & M_IRON)) 1181 if (!(tmp->materials & M_IRON))
1209 continue; 1182 continue;
1210 if (tmp->magic < -4) /* Let's stop at -5 */ 1183 if (tmp->magic < -4) /* Let's stop at -5 */
1211 continue; 1184 continue;
1212 if (tmp->type == RING 1185 if (tmp->type == RING
1213 /* removed boots and gloves from exclusion list in PR */ 1186 /* removed boots and gloves from exclusion list in PR */
… …
1220 1193
1221 /* High damage acid has better chance of corroding 1194 /* High damage acid has better chance of corroding
1222 objects */ 1195 objects */
1223 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1196 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1224 { 1197 {
1225 if (op->type == PLAYER)
1226 /* Make this more visible */
1227 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1228 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1229 flag = 1; 1198 flag = 1;
1230 tmp->magic--; 1199 tmp->magic--;
1231 if (op->type == PLAYER) 1200
1232 esrv_send_item (op, tmp); 1201 if (object *pl = tmp->visible_to ())
1202 {
1203 /* Make this more visible */
1204 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1205 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1206
1207 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1208 }
1233 } 1209 }
1234 } 1210 }
1235 1211
1236 if (flag) 1212 if (flag)
1237 op->update_stats (); /* Something was corroded */ 1213 op->update_stats (); /* Something was corroded */
… …
1271 * exp, but the wiz would still lose exp! If drainee is a wiz, 1247 * exp, but the wiz would still lose exp! If drainee is a wiz,
1272 * nothing happens. 1248 * nothing happens.
1273 * Try to credit the owner. We try to display player -> player drain 1249 * Try to credit the owner. We try to display player -> player drain
1274 * attacks, hence all the != PLAYER checks. 1250 * attacks, hence all the != PLAYER checks.
1275 */ 1251 */
1276 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1252 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1277 { 1253 {
1278 object *owner = hitter->owner; 1254 object *owner = hitter->owner;
1279 1255
1280 if (owner && owner != hitter) 1256 if (owner && owner != hitter)
1281 { 1257 {
1282 if (op->type != PLAYER || owner->type != PLAYER) 1258 if (op->type != PLAYER || owner->type != PLAYER)
1283 change_exp (owner, op->stats.exp / (rate * 2), 1259 change_exp (owner, op->stats.exp / (rate * 2),
1284 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1260 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1285 } 1261 }
1286 else if (op->type != PLAYER || hitter->type != PLAYER) 1262 else if (op->type != PLAYER || hitter->type != PLAYER)
1287 {
1288 change_exp (hitter, op->stats.exp / (rate * 2), 1263 change_exp (hitter, op->stats.exp / (rate * 2),
1289 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1264 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1290 } 1265
1291 change_exp (op, -op->stats.exp / rate, NULL, 0); 1266 change_exp (op, -op->stats.exp / rate, NULL, 0);
1292 } 1267 }
1293 1268
1294 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1269 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1295 * drain attack, you won't know that you are actually sucking out EXP, 1270 * drain attack, you won't know that you are actually sucking out EXP,
… …
1307 object *god = find_god (determine_god (owner)); 1282 object *god = find_god (determine_god (owner));
1308 int div = 1; 1283 int div = 1;
1309 1284
1310 /* if undead are not an enemy of your god, you turn them 1285 /* if undead are not an enemy of your god, you turn them
1311 * at half strength */ 1286 * at half strength */
1312 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1287 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1313 div = 2; 1288 div = 2;
1289
1314 /* Give a bonus if you resist turn undead */ 1290 /* Give a bonus if you resist turn undead */
1315 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1291 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1316 scare_creature (op, owner); 1292 scare_creature (op, owner);
1317 } 1293 }
1318 else 1294 else
… …
1324 case ATNR_DEATH: 1300 case ATNR_DEATH:
1325 deathstrike_player (op, hitter, &dam); 1301 deathstrike_player (op, hitter, &dam);
1326 break; 1302 break;
1327 1303
1328 case ATNR_CHAOS: 1304 case ATNR_CHAOS:
1329 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc2 ()); 1305 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1330 dam = 0; 1306 dam = 0;
1331 break; 1307 break;
1332 1308
1333 case ATNR_COUNTERSPELL: 1309 case ATNR_COUNTERSPELL:
1334 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc2 ()); 1310 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1335 dam = 0; 1311 dam = 0;
1336 /* This should never happen. Counterspell is handled 1312 /* This should never happen. Counterspell is handled
1337 * seperately and filtered out. If this does happen, 1313 * seperately and filtered out. If this does happen,
1338 * Counterspell has no effect on anything but spells, so it 1314 * Counterspell has no effect on anything but spells, so it
1339 * does no damage. */ 1315 * does no damage. */
… …
1411 char buf[MAX_BUF]; 1387 char buf[MAX_BUF];
1412 const char *skill; 1388 const char *skill;
1413 int maxdam = 0; 1389 int maxdam = 0;
1414 int battleg = 0; /* true if op standing on battleground */ 1390 int battleg = 0; /* true if op standing on battleground */
1415 int pk = 0; /* true if op and what controls hitter are both players */ 1391 int pk = 0; /* true if op and what controls hitter are both players */
1416 object *owner = NULL; 1392 object *owner = 0;
1417 object *skop = NULL; 1393 object *skop = 0;
1418 1394
1419 if (op->stats.hp >= 0) 1395 if (op->stats.hp >= 0)
1420 return -1; 1396 return -1;
1421 1397
1422 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1398 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1431 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1407 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1432 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1408 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1433 1409
1434 if (op->type == DOOR) 1410 if (op->type == DOOR)
1435 { 1411 {
1436 op->set_speed (0.1); 1412 op->set_speed (0.1f);
1437 op->speed_left = -0.05; 1413 op->speed_left = -0.05f;
1438 return maxdam; 1414 return maxdam;
1439 } 1415 }
1440 1416
1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1417 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1442 { 1418 {
1443 remove_friendly_object (op);
1444
1445 if (op->owner && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1446 op->owner->contr->ranges[range_golem] = 0;
1447
1448 op->destroy (); 1419 op->destroy ();
1449 return maxdam; 1420 return maxdam;
1450 } 1421 }
1451 1422
1452 /* Now lets start dealing with experience we get for killing something */ 1423 /* Now lets start dealing with experience we get for killing something */
… …
1464 pk = 1; 1435 pk = 1;
1465 1436
1466 /* Player killed something */ 1437 /* Player killed something */
1467 if (owner->type == PLAYER) 1438 if (owner->type == PLAYER)
1468 { 1439 {
1469 Log_Kill (owner->name,
1470 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1471
1472 /* Log players killing other players - makes it easier to detect 1440 /* Log players killing other players - makes it easier to detect
1473 * and filter out malicious player killers - that is why the 1441 * and filter out malicious player killers - that is why the
1474 * ip address is included. 1442 * ip address is included.
1475 */ 1443 */
1476 if (op->type == PLAYER && !battleg) 1444 if (op->type == PLAYER && !battleg)
… …
1496 else 1464 else
1497 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1465 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1498 1466
1499 /* Only play sounds for melee kills */ 1467 /* Only play sounds for melee kills */
1500 if (hitter->type == PLAYER) 1468 if (hitter->type == PLAYER)
1501 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1469 owner->play_sound (sound_find ("player_kills"));
1502 } 1470 }
1503 1471
1504 /* If a player kills another player, not on 1472 /* If a player kills another player, not on
1505 * battleground, the "killer" looses 1 luck. Since this is 1473 * battleground, the "killer" looses 1 luck. Since this is
1506 * not reversible, it's actually quite a pain IMHO. -AV 1474 * not reversible, it's actually quite a pain IMHO. -AV
… …
1511 */ 1479 */
1512 if (op->type == PLAYER && owner != op && !battleg) 1480 if (op->type == PLAYER && owner != op && !battleg)
1513 owner->change_luck (-settings.pk_luck_penalty); 1481 owner->change_luck (-settings.pk_luck_penalty);
1514 1482
1515 /* This code below deals with finding the appropriate skill 1483 /* This code below deals with finding the appropriate skill
1516 * to credit exp to. This is a bit problematic - we should 1484 * to credit exp to. This is a bit problematic - we should
1517 * probably never really have to look at current_weapon->skill 1485 * probably never really have to look at current_weapon->skill
1518 */ 1486 */
1519 skill = 0; 1487 skill = 0;
1520 1488
1521 if (hitter->skill && hitter->type != PLAYER) 1489 if (hitter->skill && hitter->type != PLAYER)
1522 skill = hitter->skill; 1490 skill = hitter->skill;
1523 else if (owner->chosen_skill) 1491 else if (owner->chosen_skill)
1524 { 1492 {
1525 skill = owner->chosen_skill->skill;
1526 skop = owner->chosen_skill; 1493 skop = owner->chosen_skill;
1494 skill = skop->skill;
1527 } 1495 }
1528 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1496 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1529 skill = owner->current_weapon->skill; 1497 skill = owner->current_weapon->skill;
1530 else 1498 else
1531 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1499 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1532 1500
1533 /* We have the skill we want to credit to - now find the object this goes 1501 /* We have the skill we want to credit to - now find the object this goes
1534 * to. Make sure skop is an actual skill, and not a skill tool! 1502 * to. Make sure skop is an actual skill, and not a skill tool!
1535 */ 1503 */
1536 if ((!skop || skop->type != SKILL) && skill) 1504 if ((!skop || skop->type != SKILL) && skill)
1537 { 1505 {
1538 int i; 1506 int i;
1539 1507
… …
1565 skill = skop->skill; 1533 skill = skop->skill;
1566 1534
1567 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1535 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1568 1536
1569 /* If you didn't kill yourself, and your not the wizard */ 1537 /* If you didn't kill yourself, and your not the wizard */
1570 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1538 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1571 { 1539 {
1572 int exp; 1540 int exp;
1573 1541
1574 /* Really don't give much experience for killing other players */ 1542 /* Really don't give much experience for killing other players */
1575 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1543 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
… …
1602 if (owner->type != PLAYER || owner->contr->party == NULL) 1570 if (owner->type != PLAYER || owner->contr->party == NULL)
1603 change_exp (owner, exp, skill, 0); 1571 change_exp (owner, exp, skill, 0);
1604 else 1572 else
1605 { 1573 {
1606 int shares = 0, count = 0; 1574 int shares = 0, count = 0;
1607 player *pl;
1608 partylist *party = owner->contr->party; 1575 partylist *party = owner->contr->party;
1609 1576
1610 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1577 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1611 1578
1612 for_all_players (pl) 1579 for_all_players (pl)
… …
1643 { 1610 {
1644 object *owner1 = op->owner; 1611 object *owner1 = op->owner;
1645 1612
1646 if (owner1 && owner1->type == PLAYER) 1613 if (owner1 && owner1->type == PLAYER)
1647 { 1614 {
1648 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1615 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1649 /* Maybe we should include the owner that killed this, maybe not */ 1616 /* Maybe we should include the owner that killed this, maybe not */
1650 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1617 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1651 } 1618 }
1652 1619
1653 remove_friendly_object (op); 1620 remove_friendly_object (op);
1654 } 1621 }
1655 1622
1656 op->destroy (); 1623 op->destroy ();
1657 } 1624 }
1658 else 1625 else
1659 {
1660 /* Player has been killed! */ 1626 /* Player has been killed! */
1661 if (owner->type == PLAYER) 1627 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1662 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1663 else
1664 assign (op->contr->killer, hitter->name);
1665 }
1666 1628
1667 /* This was return -1 - that doesn't seem correct - if we return -1, process 1629 /* This was return -1 - that doesn't seem correct - if we return -1, process
1668 * continues in the calling function. 1630 * continues in the calling function.
1669 */ 1631 */
1670 return maxdam; 1632 return maxdam;
1671} 1633}
1672 1634
1673/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1635/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1674 * Returns 0 this is not friendly fire 1636 * Returns 0 this is not friendly fire
1675 */ 1637 */
1676
1677int 1638int
1678friendly_fire (object *op, object *hitter) 1639friendly_fire (object *op, object *hitter)
1679{ 1640{
1680 object *owner; 1641 object *owner;
1681 int friendlyfire; 1642 int friendlyfire;
… …
1700 } 1661 }
1701 1662
1702 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1663 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1703 friendlyfire = 0; 1664 friendlyfire = 0;
1704 } 1665 }
1666
1705 return friendlyfire; 1667 return friendlyfire;
1706} 1668}
1707
1708 1669
1709/* This isn't used just for players, but in fact most objects. 1670/* This isn't used just for players, but in fact most objects.
1710 * op is the object to be hit, dam is the amount of damage, hitter 1671 * op is the object to be hit, dam is the amount of damage, hitter
1711 * is what is hitting the object, type is the attacktype, and 1672 * is what is hitting the object, type is the attacktype, and
1712 * full_hit is set if monster area does not matter. 1673 * full_hit is set if monster area does not matter.
… …
1730 1691
1731 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1692 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1732 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1693 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1733 return 0; 1694 return 0;
1734 1695
1735#ifdef PROHIBIT_PLAYERKILL 1696 // only allow pk for hostile players
1736 if (op->type == PLAYER) 1697 if (op->type == PLAYER)
1737 { 1698 {
1738 object *owner = hitter->owner; 1699 object *owner = hitter->owner;
1739 1700
1740 if (!owner) 1701 if (!owner)
1741 owner = hitter; 1702 owner = hitter;
1742 1703
1743 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1704 if (owner->type == PLAYER
1705 && (!op_on_battleground (op, 0, 0)
1706 && (op->contr->peaceful || owner->contr->peaceful))
1707 && op != owner)
1744 return 0; 1708 return 0;
1745 } 1709 }
1746#endif
1747 1710
1748 if (body_attack) 1711 if (body_attack)
1749 { 1712 {
1750 /* slow and paralyze must hit the head. But we don't want to just 1713 /* slow and paralyze must hit the head. But we don't want to just
1751 * return - we still need to process other attacks the spell still 1714 * return - we still need to process other attacks the spell still
… …
1782 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1745 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1783 { 1746 {
1784 /* FIXME: If a player is killed by a rune in a door, the 1747 /* FIXME: If a player is killed by a rune in a door, the
1785 * destroyed() check above doesn't return, and might get here. 1748 * destroyed() check above doesn't return, and might get here.
1786 */ 1749 */
1750
1751 /* FIXME: This for example happens when a dead door is on a mover and
1752 gets it's speed_left raised on each mover-tick.
1753 Doors are removed in a kinda funny way by giving them speed and speed_left
1754 and waiting for that to run out.
1755 */
1787 LOG (llevDebug, "victim %s already dead in hit_player()\n", op->debug_desc ()); 1756 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1788 return 0; 1757 return 0;
1789 } 1758 }
1790 1759
1791#ifdef ATTACK_DEBUG 1760#ifdef ATTACK_DEBUG
1792 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1761 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1824 if ((!hitter->slaying || 1793 if ((!hitter->slaying ||
1825 (!(op->race && strstr (hitter->slaying, op->race)) && 1794 (!(op->race && strstr (hitter->slaying, op->race)) &&
1826 !(op->name && strstr (hitter->slaying, op->name)))) && 1795 !(op->name && strstr (hitter->slaying, op->name)))) &&
1827 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1796 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1828 (hitter->title != NULL 1797 (hitter->title != NULL
1829 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1798 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1830 return 0; 1799 return 0;
1831 } 1800 }
1832 1801
1833 maxattacktype = type; /* initialise this to something */ 1802 maxattacktype = type; /* initialise this to something */
1834 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1803 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
1866 */ 1835 */
1867 friendlyfire = friendly_fire (op, hitter); 1836 friendlyfire = friendly_fire (op, hitter);
1868 if (friendlyfire && maxdam) 1837 if (friendlyfire && maxdam)
1869 { 1838 {
1870 maxdam = ((dam * settings.set_friendly_fire) / 100); 1839 maxdam = ((dam * settings.set_friendly_fire) / 100);
1871#ifndef COZY_SERVER
1872 maxdam++;
1873#endif
1874 1840
1875#ifdef ATTACK_DEBUG 1841#ifdef ATTACK_DEBUG
1876 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1842 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1877 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1843 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1878#endif 1844#endif
1879 } 1845 }
1880 1846
1881 if (!full_hit) 1847 if (!full_hit)
1882 { 1848 {
1883 archetype *at;
1884 int area; 1849 int area;
1885 int remainder; 1850 int remainder;
1886 1851
1887 area = 0; 1852 area = 0;
1888 for (at = op->arch; at != NULL; at = at->more) 1853
1854 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1889 area++; 1855 area++;
1856
1890 assert (area > 0); 1857 assert (area > 0);
1891 1858
1892 /* basically: maxdam /= area; we try to "simulate" a float 1859 /* basically: maxdam /= area; we try to "simulate" a float
1893 value-effect */ 1860 value-effect */
1894 remainder = 100 * (maxdam % area) / area; 1861 remainder = 100 * (maxdam % area) / area;
… …
1899 1866
1900#ifdef ATTACK_DEBUG 1867#ifdef ATTACK_DEBUG
1901 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1868 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1902#endif 1869#endif
1903 1870
1871 // for now, only do this for active objects, otherwise they
1872 // keep a refcount for a long time and I see no usefulness
1873 // for an non-active objetc to know its enemy.
1874 if (op->active)
1904 if (hitter->owner) 1875 if (hitter->owner)
1905 op->enemy = hitter->owner; 1876 op->enemy = hitter->owner;
1906 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1877 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1907 op->enemy = hitter; 1878 op->enemy = hitter;
1908 1879
1909 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1880 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1910 { 1881 {
1911 /* The unaggressives look after themselves 8) */ 1882 /* The unaggressives look after themselves 8) */
1912 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1883 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1949 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1920 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1950 * that before if the player was immune to ghosthit, the monster 1921 * that before if the player was immune to ghosthit, the monster
1951 * remained - that is no longer the case. 1922 * remained - that is no longer the case.
1952 */ 1923 */
1953 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1924 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1954 {
1955 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1956 remove_friendly_object (hitter);
1957
1958 hitter->destroy (); 1925 hitter->destroy ();
1959 } 1926
1960 /* Lets handle creatures that are splitting now */ 1927 /* Lets handle creatures that are splitting now */
1961 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1928 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1962 { 1929 {
1963 int i; 1930 int i;
1964 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1931 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
1971 return maxdam; 1938 return maxdam;
1972 } 1939 }
1973 1940
1974 op->remove (); 1941 op->remove ();
1975 1942
1976 for (i = 0; i < NROFNEWOBJS (op); i++) 1943 for (i = 0; i < op->stats.food; i++)
1977 { /* This doesn't handle op->more yet */ 1944 { /* This doesn't handle op->more yet */
1978 object *tmp = arch_to_object (op->other_arch); 1945 object *tmp = arch_to_object (op->other_arch);
1979 int j; 1946 int j;
1980 1947
1981 tmp->stats.hp = op->stats.hp; 1948 tmp->stats.hp = op->stats.hp;
… …
2008 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1975 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2009 hitter->destroy (); 1976 hitter->destroy ();
2010 1977
2011 return maxdam; 1978 return maxdam;
2012} 1979}
2013
2014 1980
2015void 1981void
2016poison_player (object *op, object *hitter, int dam) 1982poison_player (object *op, object *hitter, int dam)
2017{ 1983{
2018 archetype *at = archetype::find ("poisoning"); 1984 archetype *at = archetype::find ("poisoning");
… …
2054 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2020 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2055 tmp->stats.Int = MAX (-dam / 7, -10); 2021 tmp->stats.Int = MAX (-dam / 7, -10);
2056 SET_FLAG (tmp, FLAG_APPLIED); 2022 SET_FLAG (tmp, FLAG_APPLIED);
2057 op->update_stats (); 2023 op->update_stats ();
2058 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2024 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2025 op->play_sound (tmp->sound);
2059 } 2026 }
2027
2060 if (hitter->type == PLAYER) 2028 if (hitter->type == PLAYER)
2061 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2029 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2062 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2030 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2063 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2031 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2064 } 2032 }
2033
2065 tmp->speed_left = 0; 2034 tmp->speed_left = 0;
2066 } 2035 }
2067 else 2036 else
2068 tmp->stats.food++; 2037 tmp->stats.food++;
2069} 2038}
… …
2073{ 2042{
2074 archetype *at = archetype::find ("slowness"); 2043 archetype *at = archetype::find ("slowness");
2075 object *tmp; 2044 object *tmp;
2076 2045
2077 if (at == NULL) 2046 if (at == NULL)
2078 {
2079 LOG (llevError, "Can't find slowness archetype.\n"); 2047 LOG (llevError, "Can't find slowness archetype.\n");
2080 } 2048
2081 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2049 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2082 { 2050 {
2083 tmp = arch_to_object (at); 2051 tmp = arch_to_object (at);
2084 tmp = insert_ob_in_ob (tmp, op); 2052 tmp = insert_ob_in_ob (tmp, op);
2085 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2053 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2086 } 2054 }
2087 else 2055 else
2088 tmp->stats.food++; 2056 tmp->stats.food++;
2057
2089 SET_FLAG (tmp, FLAG_APPLIED); 2058 SET_FLAG (tmp, FLAG_APPLIED);
2090 tmp->speed_left = 0; 2059 tmp->speed_left = 0;
2091 op->update_stats (); 2060 op->update_stats ();
2092} 2061}
2093 2062
… …
2110 tmp->speed = 0.05; 2079 tmp->speed = 0.05;
2111 tmp->subtype = FORCE_CONFUSION; 2080 tmp->subtype = FORCE_CONFUSION;
2112 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2081 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2113 tmp->name = "confusion"; 2082 tmp->name = "confusion";
2114 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2083 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2084
2115 if (tmp->duration > maxduration) 2085 if (tmp->duration > maxduration)
2116 tmp->duration = maxduration; 2086 tmp->duration = maxduration;
2117 2087
2118 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2088 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2119 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2089 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2090
2120 SET_FLAG (op, FLAG_CONFUSED); 2091 SET_FLAG (op, FLAG_CONFUSED);
2121} 2092}
2122 2093
2123void 2094void
2124blind_player (object *op, object *hitter, int dam) 2095blind_player (object *op, object *hitter, int dam)
… …
2190 op->speed_left = (float) -(FABS (op->speed) * max); 2161 op->speed_left = (float) -(FABS (op->speed) * max);
2191 2162
2192/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2163/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2193} 2164}
2194 2165
2195
2196/* Attempts to kill 'op'. hitter is the attack object, dam is 2166/* Attempts to kill 'op'. hitter is the attack object, dam is
2197 * the computed damaged. 2167 * the computed damaged.
2198 */ 2168 */
2199void 2169void
2200deathstrike_player (object *op, object *hitter, int *dam) 2170deathstrike_player (object *op, object *hitter, int *dam)
… …
2208 ** field of the deathstriking object */ 2178 ** field of the deathstriking object */
2209 2179
2210 int atk_lev, def_lev, kill_lev; 2180 int atk_lev, def_lev, kill_lev;
2211 2181
2212 if (hitter->slaying) 2182 if (hitter->slaying)
2213 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2183 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2214 return; 2184 return;
2215 2185
2216 def_lev = op->level; 2186 def_lev = op->level;
2217 if (def_lev < 1) 2187 if (def_lev < 1)
2218 { 2188 {
2219 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2189 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2220 def_lev = 1; 2190 def_lev = 1;
2221 } 2191 }
2192
2222 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2193 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2223 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2194 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2224 atk_lev, def_lev); */ 2195 atk_lev, def_lev); */
2225 2196
2226 if (atk_lev >= def_lev) 2197 if (atk_lev >= def_lev)
… …
2241 */ 2212 */
2242 *dam *= kill_lev / def_lev; 2213 *dam *= kill_lev / def_lev;
2243 } 2214 }
2244 } 2215 }
2245 else 2216 else
2246 {
2247 *dam = 0; /* no harm done */ 2217 *dam = 0; /* no harm done */
2248 }
2249} 2218}
2250 2219
2251/* thrown_item_effect() - handles any special effects of thrown 2220/* thrown_item_effect() - handles any special effects of thrown
2252 * items (like attacking living creatures--a potion thrown at a 2221 * items (like attacking living creatures--a potion thrown at a
2253 * monster). 2222 * monster).
… …
2282 } 2251 }
2283 } 2252 }
2284} 2253}
2285 2254
2286/* adj_attackroll() - adjustments to attacks by various conditions */ 2255/* adj_attackroll() - adjustments to attacks by various conditions */
2287
2288int 2256int
2289adj_attackroll (object *hitter, object *target) 2257adj_attackroll (object *hitter, object *target)
2290{ 2258{
2291 object *attacker = hitter; 2259 object *attacker = hitter;
2292 int adjust = 0; 2260 int adjust = 0;
… …
2357#endif 2325#endif
2358 2326
2359 return adjust; 2327 return adjust;
2360} 2328}
2361 2329
2362
2363/* determine if the object is an 'aimed' missile */ 2330/* determine if the object is an 'aimed' missile */
2364int 2331int
2365is_aimed_missile (object *op) 2332is_aimed_missile (object *op)
2366{ 2333{
2367 2334
2368 /* I broke what used to be one big if into a few nested 2335 /* I broke what used to be one big if into a few nested
2369 * ones so that figuring out the logic is at least possible. 2336 * ones so that figuring out the logic is at least possible.
2370 */ 2337 */
2371 if (op && (op->move_type & MOVE_FLYING)) 2338 if (op && (op->move_type & MOVE_FLYING))
2372 {
2373 if (op->type == ARROW || op->type == THROWN_OBJ) 2339 if (op->type == ARROW || op->type == THROWN_OBJ)
2374 return 1; 2340 return 1;
2375 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2341 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2376 return 1; 2342 return 1;
2377 } 2343
2378 return 0; 2344 return 0;
2379} 2345}

Diff Legend

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