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.69 by root, Sun Jul 1 05:00:19 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
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;
… …
84 materialtype_t *mt; 80 materialtype_t *mt;
85 81
86 if (op->materialname == NULL) 82 if (op->materialname == NULL)
87 { 83 {
88 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt != NULL && mt->next != NULL; 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
… …
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 op = decrease_ob_nr (op, 1);
173 169
174 if (op) 170 if (op)
175 fix_stopped_item (op, m, originator); 171 fix_stopped_item (op, m, originator);
… …
271 * op is going in direction 'dir' 267 * op is going in direction 'dir'
272 * type is the attacktype of the object. 268 * type is the attacktype of the object.
273 * full_hit is set if monster area does not matter. 269 * full_hit is set if monster area does not matter.
274 * returns 1 if it hits something, 0 otherwise. 270 * returns 1 if it hits something, 0 otherwise.
275 */ 271 */
276
277int 272int
278hit_map (object *op, int dir, int type, int full_hit) 273hit_map (object *op, int dir, int type, int full_hit)
279{ 274{
280 maptile *map; 275 maptile *map;
281 sint16 x, y; 276 sint16 x, y;
… …
287 return 0; 282 return 0;
288 } 283 }
289 284
290 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 285 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
291 { 286 {
292 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);
293 return 0; 288 return 0;
294 } 289 }
295 290
296 if (!op->map) 291 if (!op->map)
297 { 292 {
… …
314 mapspace &ms = map->at (x, y); 309 mapspace &ms = map->at (x, y);
315 310
316 if (ms.flags () & P_SAFE) 311 if (ms.flags () & P_SAFE)
317 return 0; 312 return 0;
318 313
319 /* peterm: a few special cases for special attacktypes --counterspell 314 /* peterm: a few special cases for special attacktypes --counterspell
320 * 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
321 */ 316 */
322 if (type & (AT_COUNTERSPELL | AT_CHAOS)) 317 if (type & (AT_COUNTERSPELL | AT_CHAOS))
323 { 318 {
324 if (type & AT_COUNTERSPELL) 319 if (type & AT_COUNTERSPELL)
… …
375 * that weak walls have is_alive set, which prevent objects from 370 * that weak walls have is_alive set, which prevent objects from
376 * 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
377 * 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
378 * destroyed right now. 373 * destroyed right now.
379 */ 374 */
380 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)
381 { 376 {
382 save_throw_object (tmp, type, op); 377 save_throw_object (tmp, type, op);
383 378
384 if (op->destroyed ()) 379 if (op->destroyed ())
385 break; 380 break;
… …
654 { 649 {
655 i = 4; 650 i = 4;
656 map = hitter->map; 651 map = hitter->map;
657 if (out_of_map (map, hitter->x, hitter->y)) 652 if (out_of_map (map, hitter->x, hitter->y))
658 return; 653 return;
654
659 next = GET_MAP_OB (map, hitter->x, hitter->y); 655 next = GET_MAP_OB (map, hitter->x, hitter->y);
660 if (next) 656 if (next)
661 while (next) 657 while (next)
662 { 658 {
663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 659 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
664 i *= 3; 660 i *= 3;
665 tmp = next; 661 tmp = next;
666 next = tmp->above; 662 next = tmp->above;
667 } 663 }
664
668 if (i < 0) 665 if (i < 0)
669 return; 666 return;
667
670 if (rndm (0, i) != 0) 668 if (rndm (0, i) != 0)
671 return; 669 return;
672 } 670 }
673 else if (rndm (0, 5) != 0) 671 else if (rndm (0, 5) != 0)
674 return; 672 return;
673
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 674 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 675 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 676 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 677 }
679} 678}
… …
697 return 0; 696 return 0;
698 } 697 }
699 if (QUERY_FLAG (*target, FLAG_REMOVED) 698 if (QUERY_FLAG (*target, FLAG_REMOVED)
700 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 699 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target)))
701 { 700 {
702 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 701 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->archname, &(*hitter)->name);
703 return 1; 702 return 1;
704 } 703 }
705 *simple_attack = 0; 704 *simple_attack = 0;
706 return 0; 705 return 0;
707} 706}
… …
745 744
746 /* 745 /*
747 * A little check to make it more difficult to dance forward and back 746 * A little check to make it more difficult to dance forward and back
748 * to avoid ever being hit by monsters. 747 * to avoid ever being hit by monsters.
749 */ 748 */
750 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 749 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
751 { 750 {
752 /* Decrease speed BEFORE calling process_object. Otherwise, an 751 /* Decrease speed BEFORE calling process_object. Otherwise, an
753 * infinite loop occurs, with process_object calling move_monster, 752 * infinite loop occurs, with process_object calling move_monster,
754 * which then gets here again. By decreasing the speed before 753 * which then gets here again. By decreasing the speed before
755 * we call process_object, the 'if' statement above will fail. 754 * we call process_object, the 'if' statement above will fail.
756 */ 755 */
757 op->speed_left--; 756 --op->speed_left;
758 process_object (op); 757 process_object (op);
759 758
760 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 759 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
761 goto error; 760 goto error;
762 } 761 }
… …
772 /* See if we hit the creature */ 771 /* See if we hit the creature */
773 if (roll == 20 || op->stats.ac >= base_wc - roll) 772 if (roll == 20 || op->stats.ac >= base_wc - roll)
774 { 773 {
775 int hitdam = base_dam; 774 int hitdam = base_dam;
776 775
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) 776 if (!simple_attack)
795 { 777 {
796 /* If you hit something, the victim should *always* wake up. 778 /* If you hit something, the victim should *always* wake up.
797 * Before, invisible hitters could avoid doing this. 779 * Before, invisible hitters could avoid doing this.
798 * -b.t. */ 780 * -b.t. */
… …
806 788
807 /* if you were hidden and hit by a creature, you are discovered */ 789 /* if you were hidden and hit by a creature, you are discovered */
808 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 790 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
809 { 791 {
810 make_visible (op); 792 make_visible (op);
793
811 if (op->type == PLAYER) 794 if (op->type == PLAYER)
812 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 795 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
813 } 796 }
814 797
815 /* thrown items (hitter) will have various effects 798 /* thrown items (hitter) will have various effects
… …
869} 852}
870 853
871int 854int
872attack_ob (object *op, object *hitter) 855attack_ob (object *op, object *hitter)
873{ 856{
874
875 if (hitter->head)
876 hitter = hitter->head; 857 hitter = hitter->head_ ();
858
877 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 859 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
878} 860}
879 861
880/* op is the arrow, tmp is what is stopping the arrow. 862/* op is the arrow, tmp is what is stopping the arrow.
881 * 863 *
… …
890 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 872 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
891 * stick around. 873 * stick around.
892 */ 874 */
893 if (op->weight <= 5000 && tmp->stats.hp >= 0) 875 if (op->weight <= 5000 && tmp->stats.hp >= 0)
894 { 876 {
895 if (tmp->head != NULL)
896 tmp = tmp->head; 877 tmp = tmp->head_ ();
897 878
898 op->remove (); 879 op->remove ();
899 op = insert_ob_in_ob (op, tmp); 880 op = insert_ob_in_ob (op, tmp);
900 881
901 if (tmp->type == PLAYER) 882 if (tmp->type == PLAYER)
… …
1008 insert_ob_in_ob (hitter, container); 989 insert_ob_in_ob (hitter, container);
1009 } 990 }
1010 991
1011 return op; 992 return op;
1012} 993}
1013
1014 994
1015void 995void
1016tear_down_wall (object *op) 996tear_down_wall (object *op)
1017{ 997{
1018 int perc = 0; 998 int perc = 0;
… …
1067 SET_FLAG (target, FLAG_SCARED); 1047 SET_FLAG (target, FLAG_SCARED);
1068 if (!target->enemy) 1048 if (!target->enemy)
1069 target->enemy = owner; 1049 target->enemy = owner;
1070} 1050}
1071 1051
1072
1073/* This returns the amount of damage hitter does to op with the 1052/* This returns the amount of damage hitter does to op with the
1074 * appropriate attacktype. Only 1 attacktype should be set at a time. 1053 * appropriate attacktype. Only 1 attacktype should be set at a time.
1075 * This doesn't damage the player, but returns how much it should 1054 * This doesn't damage the player, but returns how much it should
1076 * take. However, it will do other effects (paralyzation, slow, etc.) 1055 * take. However, it will do other effects (paralyzation, slow, etc.)
1077 * Note - changed for PR code - we now pass the attack number and not 1056 * Note - changed for PR code - we now pass the attack number and not
… …
1088 return 0; 1067 return 0;
1089 } 1068 }
1090 1069
1091 if (dam < 0) 1070 if (dam < 0)
1092 { 1071 {
1093 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n", dam, hitter->debug_desc (), op->debug_desc2 ()); 1072 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1073 dam, hitter->debug_desc (), op->debug_desc ());
1094 return 0; 1074 return 0;
1095 } 1075 }
1096 1076
1097 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1077 /* 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. */ 1078 * people can't mess with that or it otherwise get confused. */
1099 if (attacknum == ATNR_INTERNAL) 1079 if (attacknum == ATNR_INTERNAL)
1100 return dam; 1080 return dam;
1101 1081
1102 if (hitter->slaying) 1082 if (hitter->slaying)
1103 { 1083 {
1104 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1084 if ((op->race && strstr (hitter->slaying, op->race))
1105 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1085 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1106 { 1086 {
1107 doesnt_slay = 0; 1087 doesnt_slay = 0;
1108 dam *= 3; 1088 dam *= 3;
1109 } 1089 }
1110 } 1090 }
… …
1124 /* Special hack. By default, if immune to something, you 1104 /* Special hack. By default, if immune to something, you
1125 * shouldn't need to worry. However, acid is an exception, since 1105 * shouldn't need to worry. However, acid is an exception, since
1126 * it can still damage your items. Only include attacktypes if 1106 * it can still damage your items. Only include attacktypes if
1127 * special processing is needed */ 1107 * special processing is needed */
1128 1108
1129 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1109 if (op->resist[attacknum] >= 100
1110 && doesnt_slay
1111 && attacknum != ATNR_ACID)
1130 return 0; 1112 return 0;
1131 1113
1132 /* Keep this in order - makes things easier to find */ 1114 /* Keep this in order - makes things easier to find */
1133 1115
1134 switch (attacknum) 1116 switch (attacknum)
… …
1184 else if (attacknum == ATNR_DEPLETE) 1166 else if (attacknum == ATNR_DEPLETE)
1185 op->drain_stat (); 1167 op->drain_stat ();
1186 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1168 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1187 blind_player (op, hitter, dam); 1169 blind_player (op, hitter, dam);
1188 } 1170 }
1171
1189 dam = 0; /* These are all effects and don't do real damage */ 1172 dam = 0; /* These are all effects and don't do real damage */
1190 } 1173 }
1191 break; 1174 break;
1192 1175
1193 case ATNR_ACID: 1176 case ATNR_ACID:
… …
1203 if (tmp->invisible) 1186 if (tmp->invisible)
1204 continue; 1187 continue;
1205 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1188 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1206 /* >= 10% acid res. on items will protect these */ 1189 /* >= 10% acid res. on items will protect these */
1207 continue; 1190 continue;
1208 if (!(tmp->material & M_IRON)) 1191 if (!(tmp->materials & M_IRON))
1209 continue; 1192 continue;
1210 if (tmp->magic < -4) /* Let's stop at -5 */ 1193 if (tmp->magic < -4) /* Let's stop at -5 */
1211 continue; 1194 continue;
1212 if (tmp->type == RING 1195 if (tmp->type == RING
1213 /* removed boots and gloves from exclusion list in PR */ 1196 /* removed boots and gloves from exclusion list in PR */
… …
1271 * exp, but the wiz would still lose exp! If drainee is a wiz, 1254 * exp, but the wiz would still lose exp! If drainee is a wiz,
1272 * nothing happens. 1255 * nothing happens.
1273 * Try to credit the owner. We try to display player -> player drain 1256 * Try to credit the owner. We try to display player -> player drain
1274 * attacks, hence all the != PLAYER checks. 1257 * attacks, hence all the != PLAYER checks.
1275 */ 1258 */
1276 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1259 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1277 { 1260 {
1278 object *owner = hitter->owner; 1261 object *owner = hitter->owner;
1279 1262
1280 if (owner && owner != hitter) 1263 if (owner && owner != hitter)
1281 { 1264 {
1282 if (op->type != PLAYER || owner->type != PLAYER) 1265 if (op->type != PLAYER || owner->type != PLAYER)
1283 change_exp (owner, op->stats.exp / (rate * 2), 1266 change_exp (owner, op->stats.exp / (rate * 2),
1284 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1267 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1285 } 1268 }
1286 else if (op->type != PLAYER || hitter->type != PLAYER) 1269 else if (op->type != PLAYER || hitter->type != PLAYER)
1287 {
1288 change_exp (hitter, op->stats.exp / (rate * 2), 1270 change_exp (hitter, op->stats.exp / (rate * 2),
1289 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1271 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1290 } 1272
1291 change_exp (op, -op->stats.exp / rate, NULL, 0); 1273 change_exp (op, -op->stats.exp / rate, NULL, 0);
1292 } 1274 }
1293 1275
1294 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1276 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, 1277 * drain attack, you won't know that you are actually sucking out EXP,
… …
1309 1291
1310 /* if undead are not an enemy of your god, you turn them 1292 /* if undead are not an enemy of your god, you turn them
1311 * at half strength */ 1293 * at half strength */
1312 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1294 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)
1313 div = 2; 1295 div = 2;
1296
1314 /* Give a bonus if you resist turn undead */ 1297 /* 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))) 1298 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1316 scare_creature (op, owner); 1299 scare_creature (op, owner);
1317 } 1300 }
1318 else 1301 else
… …
1324 case ATNR_DEATH: 1307 case ATNR_DEATH:
1325 deathstrike_player (op, hitter, &dam); 1308 deathstrike_player (op, hitter, &dam);
1326 break; 1309 break;
1327 1310
1328 case ATNR_CHAOS: 1311 case ATNR_CHAOS:
1329 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc2 ()); 1312 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1330 dam = 0; 1313 dam = 0;
1331 break; 1314 break;
1332 1315
1333 case ATNR_COUNTERSPELL: 1316 case ATNR_COUNTERSPELL:
1334 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc2 ()); 1317 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1335 dam = 0; 1318 dam = 0;
1336 /* This should never happen. Counterspell is handled 1319 /* This should never happen. Counterspell is handled
1337 * seperately and filtered out. If this does happen, 1320 * seperately and filtered out. If this does happen,
1338 * Counterspell has no effect on anything but spells, so it 1321 * Counterspell has no effect on anything but spells, so it
1339 * does no damage. */ 1322 * does no damage. */
… …
1411 char buf[MAX_BUF]; 1394 char buf[MAX_BUF];
1412 const char *skill; 1395 const char *skill;
1413 int maxdam = 0; 1396 int maxdam = 0;
1414 int battleg = 0; /* true if op standing on battleground */ 1397 int battleg = 0; /* true if op standing on battleground */
1415 int pk = 0; /* true if op and what controls hitter are both players */ 1398 int pk = 0; /* true if op and what controls hitter are both players */
1416 object *owner = NULL; 1399 object *owner = 0;
1417 object *skop = NULL; 1400 object *skop = 0;
1418 1401
1419 if (op->stats.hp >= 0) 1402 if (op->stats.hp >= 0)
1420 return -1; 1403 return -1;
1421 1404
1422 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1405 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1431 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1414 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1432 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1415 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1433 1416
1434 if (op->type == DOOR) 1417 if (op->type == DOOR)
1435 { 1418 {
1436 op->set_speed (0.1); 1419 op->set_speed (0.1f);
1437 op->speed_left = -0.05; 1420 op->speed_left = -0.05f;
1438 return maxdam; 1421 return maxdam;
1439 } 1422 }
1440 1423
1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1424 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1442 { 1425 {
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 (); 1426 op->destroy ();
1449 return maxdam; 1427 return maxdam;
1450 } 1428 }
1451 1429
1452 /* Now lets start dealing with experience we get for killing something */ 1430 /* Now lets start dealing with experience we get for killing something */
… …
1511 */ 1489 */
1512 if (op->type == PLAYER && owner != op && !battleg) 1490 if (op->type == PLAYER && owner != op && !battleg)
1513 owner->change_luck (-settings.pk_luck_penalty); 1491 owner->change_luck (-settings.pk_luck_penalty);
1514 1492
1515 /* This code below deals with finding the appropriate skill 1493 /* This code below deals with finding the appropriate skill
1516 * to credit exp to. This is a bit problematic - we should 1494 * to credit exp to. This is a bit problematic - we should
1517 * probably never really have to look at current_weapon->skill 1495 * probably never really have to look at current_weapon->skill
1518 */ 1496 */
1519 skill = 0; 1497 skill = 0;
1520 1498
1521 if (hitter->skill && hitter->type != PLAYER) 1499 if (hitter->skill && hitter->type != PLAYER)
1522 skill = hitter->skill; 1500 skill = hitter->skill;
1523 else if (owner->chosen_skill) 1501 else if (owner->chosen_skill)
1524 { 1502 {
1525 skill = owner->chosen_skill->skill;
1526 skop = owner->chosen_skill; 1503 skop = owner->chosen_skill;
1504 skill = skop->skill;
1527 } 1505 }
1528 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1506 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1529 skill = owner->current_weapon->skill; 1507 skill = owner->current_weapon->skill;
1530 else 1508 else
1531 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1509 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1532 1510
1533 /* We have the skill we want to credit to - now find the object this goes 1511 /* 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! 1512 * to. Make sure skop is an actual skill, and not a skill tool!
1535 */ 1513 */
1536 if ((!skop || skop->type != SKILL) && skill) 1514 if ((!skop || skop->type != SKILL) && skill)
1537 { 1515 {
1538 int i; 1516 int i;
1539 1517
… …
1565 skill = skop->skill; 1543 skill = skop->skill;
1566 1544
1567 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1545 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1568 1546
1569 /* If you didn't kill yourself, and your not the wizard */ 1547 /* If you didn't kill yourself, and your not the wizard */
1570 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1548 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1571 { 1549 {
1572 int exp; 1550 int exp;
1573 1551
1574 /* Really don't give much experience for killing other players */ 1552 /* Really don't give much experience for killing other players */
1575 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1553 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
… …
1602 if (owner->type != PLAYER || owner->contr->party == NULL) 1580 if (owner->type != PLAYER || owner->contr->party == NULL)
1603 change_exp (owner, exp, skill, 0); 1581 change_exp (owner, exp, skill, 0);
1604 else 1582 else
1605 { 1583 {
1606 int shares = 0, count = 0; 1584 int shares = 0, count = 0;
1607 player *pl;
1608 partylist *party = owner->contr->party; 1585 partylist *party = owner->contr->party;
1609 1586
1610 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1587 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1611 1588
1612 for_all_players (pl) 1589 for_all_players (pl)
… …
1671} 1648}
1672 1649
1673/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1650/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1674 * Returns 0 this is not friendly fire 1651 * Returns 0 this is not friendly fire
1675 */ 1652 */
1676
1677int 1653int
1678friendly_fire (object *op, object *hitter) 1654friendly_fire (object *op, object *hitter)
1679{ 1655{
1680 object *owner; 1656 object *owner;
1681 int friendlyfire; 1657 int friendlyfire;
… …
1700 } 1676 }
1701 1677
1702 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1678 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1703 friendlyfire = 0; 1679 friendlyfire = 0;
1704 } 1680 }
1681
1705 return friendlyfire; 1682 return friendlyfire;
1706} 1683}
1707
1708 1684
1709/* This isn't used just for players, but in fact most objects. 1685/* 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 1686 * 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 1687 * is what is hitting the object, type is the attacktype, and
1712 * full_hit is set if monster area does not matter. 1688 * full_hit is set if monster area does not matter.
… …
1730 1706
1731 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1707 /* 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)) 1708 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1733 return 0; 1709 return 0;
1734 1710
1735#ifdef PROHIBIT_PLAYERKILL 1711 // only allow pk for hostile players
1736 if (op->type == PLAYER) 1712 if (op->type == PLAYER)
1737 { 1713 {
1738 object *owner = hitter->owner; 1714 object *owner = hitter->owner;
1739 1715
1740 if (!owner) 1716 if (!owner)
1741 owner = hitter; 1717 owner = hitter;
1742 1718
1743 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1719 if (owner->type == PLAYER
1720 && (!op_on_battleground (op, 0, 0)
1721 && (op->contr->peaceful || owner->contr->peaceful))
1722 && op != owner)
1744 return 0; 1723 return 0;
1745 } 1724 }
1746#endif
1747 1725
1748 if (body_attack) 1726 if (body_attack)
1749 { 1727 {
1750 /* slow and paralyze must hit the head. But we don't want to just 1728 /* 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 1729 * return - we still need to process other attacks the spell still
… …
1782 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1760 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1783 { 1761 {
1784 /* FIXME: If a player is killed by a rune in a door, the 1762 /* FIXME: If a player is killed by a rune in a door, the
1785 * destroyed() check above doesn't return, and might get here. 1763 * destroyed() check above doesn't return, and might get here.
1786 */ 1764 */
1765
1766 /* FIXME: This for example happens when a dead door is on a mover and
1767 gets it's speed_left raised on each mover-tick.
1768 Doors are removed in a kinda funny way by giving them speed and speed_left
1769 and waiting for that to run out.
1770 */
1787 LOG (llevDebug, "victim %s already dead in hit_player()\n", op->debug_desc ()); 1771 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1788 return 0; 1772 return 0;
1789 } 1773 }
1790 1774
1791#ifdef ATTACK_DEBUG 1775#ifdef ATTACK_DEBUG
1792 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1776 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1866 */ 1850 */
1867 friendlyfire = friendly_fire (op, hitter); 1851 friendlyfire = friendly_fire (op, hitter);
1868 if (friendlyfire && maxdam) 1852 if (friendlyfire && maxdam)
1869 { 1853 {
1870 maxdam = ((dam * settings.set_friendly_fire) / 100); 1854 maxdam = ((dam * settings.set_friendly_fire) / 100);
1871#ifndef COZY_SERVER
1872 maxdam++;
1873#endif
1874 1855
1875#ifdef ATTACK_DEBUG 1856#ifdef ATTACK_DEBUG
1876 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1857 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1877 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1858 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1878#endif 1859#endif
1879 } 1860 }
1880 1861
1881 if (!full_hit) 1862 if (!full_hit)
1882 { 1863 {
1883 archetype *at;
1884 int area; 1864 int area;
1885 int remainder; 1865 int remainder;
1886 1866
1887 area = 0; 1867 area = 0;
1888 for (at = op->arch; at != NULL; at = at->more) 1868
1869 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1889 area++; 1870 area++;
1871
1890 assert (area > 0); 1872 assert (area > 0);
1891 1873
1892 /* basically: maxdam /= area; we try to "simulate" a float 1874 /* basically: maxdam /= area; we try to "simulate" a float
1893 value-effect */ 1875 value-effect */
1894 remainder = 100 * (maxdam % area) / area; 1876 remainder = 100 * (maxdam % area) / area;
… …
1899 1881
1900#ifdef ATTACK_DEBUG 1882#ifdef ATTACK_DEBUG
1901 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1883 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1902#endif 1884#endif
1903 1885
1886 // for now, only do this for active objects, otherwise they
1887 // keep a refcount for a long time and I see no usefulness
1888 // for an non-active objetc to know its enemy.
1889 if (op->active)
1904 if (hitter->owner) 1890 if (hitter->owner)
1905 op->enemy = hitter->owner; 1891 op->enemy = hitter->owner;
1906 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1892 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1907 op->enemy = hitter; 1893 op->enemy = hitter;
1908 1894
1909 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1895 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1910 { 1896 {
1911 /* The unaggressives look after themselves 8) */ 1897 /* The unaggressives look after themselves 8) */
1912 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1898 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1949 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1935 /* 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 1936 * that before if the player was immune to ghosthit, the monster
1951 * remained - that is no longer the case. 1937 * remained - that is no longer the case.
1952 */ 1938 */
1953 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1939 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1954 {
1955 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1956 remove_friendly_object (hitter);
1957
1958 hitter->destroy (); 1940 hitter->destroy ();
1959 } 1941
1960 /* Lets handle creatures that are splitting now */ 1942 /* Lets handle creatures that are splitting now */
1961 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1943 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1962 { 1944 {
1963 int i; 1945 int i;
1964 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1946 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
2008 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1990 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2009 hitter->destroy (); 1991 hitter->destroy ();
2010 1992
2011 return maxdam; 1993 return maxdam;
2012} 1994}
2013
2014 1995
2015void 1996void
2016poison_player (object *op, object *hitter, int dam) 1997poison_player (object *op, object *hitter, int dam)
2017{ 1998{
2018 archetype *at = archetype::find ("poisoning"); 1999 archetype *at = archetype::find ("poisoning");
… …
2055 tmp->stats.Int = MAX (-dam / 7, -10); 2036 tmp->stats.Int = MAX (-dam / 7, -10);
2056 SET_FLAG (tmp, FLAG_APPLIED); 2037 SET_FLAG (tmp, FLAG_APPLIED);
2057 op->update_stats (); 2038 op->update_stats ();
2058 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2039 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2059 } 2040 }
2041
2060 if (hitter->type == PLAYER) 2042 if (hitter->type == PLAYER)
2061 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2043 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2062 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2044 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); 2045 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2064 } 2046 }
2047
2065 tmp->speed_left = 0; 2048 tmp->speed_left = 0;
2066 } 2049 }
2067 else 2050 else
2068 tmp->stats.food++; 2051 tmp->stats.food++;
2069} 2052}
… …
2073{ 2056{
2074 archetype *at = archetype::find ("slowness"); 2057 archetype *at = archetype::find ("slowness");
2075 object *tmp; 2058 object *tmp;
2076 2059
2077 if (at == NULL) 2060 if (at == NULL)
2078 {
2079 LOG (llevError, "Can't find slowness archetype.\n"); 2061 LOG (llevError, "Can't find slowness archetype.\n");
2080 } 2062
2081 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2063 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2082 { 2064 {
2083 tmp = arch_to_object (at); 2065 tmp = arch_to_object (at);
2084 tmp = insert_ob_in_ob (tmp, op); 2066 tmp = insert_ob_in_ob (tmp, op);
2085 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2067 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2086 } 2068 }
2087 else 2069 else
2088 tmp->stats.food++; 2070 tmp->stats.food++;
2071
2089 SET_FLAG (tmp, FLAG_APPLIED); 2072 SET_FLAG (tmp, FLAG_APPLIED);
2090 tmp->speed_left = 0; 2073 tmp->speed_left = 0;
2091 op->update_stats (); 2074 op->update_stats ();
2092} 2075}
2093 2076
… …
2110 tmp->speed = 0.05; 2093 tmp->speed = 0.05;
2111 tmp->subtype = FORCE_CONFUSION; 2094 tmp->subtype = FORCE_CONFUSION;
2112 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2095 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2113 tmp->name = "confusion"; 2096 tmp->name = "confusion";
2114 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2097 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2098
2115 if (tmp->duration > maxduration) 2099 if (tmp->duration > maxduration)
2116 tmp->duration = maxduration; 2100 tmp->duration = maxduration;
2117 2101
2118 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2102 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2119 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2103 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2104
2120 SET_FLAG (op, FLAG_CONFUSED); 2105 SET_FLAG (op, FLAG_CONFUSED);
2121} 2106}
2122 2107
2123void 2108void
2124blind_player (object *op, object *hitter, int dam) 2109blind_player (object *op, object *hitter, int dam)
… …
2190 op->speed_left = (float) -(FABS (op->speed) * max); 2175 op->speed_left = (float) -(FABS (op->speed) * max);
2191 2176
2192/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2177/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2193} 2178}
2194 2179
2195
2196/* Attempts to kill 'op'. hitter is the attack object, dam is 2180/* Attempts to kill 'op'. hitter is the attack object, dam is
2197 * the computed damaged. 2181 * the computed damaged.
2198 */ 2182 */
2199void 2183void
2200deathstrike_player (object *op, object *hitter, int *dam) 2184deathstrike_player (object *op, object *hitter, int *dam)
… …
2214 return; 2198 return;
2215 2199
2216 def_lev = op->level; 2200 def_lev = op->level;
2217 if (def_lev < 1) 2201 if (def_lev < 1)
2218 { 2202 {
2219 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2203 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2220 def_lev = 1; 2204 def_lev = 1;
2221 } 2205 }
2206
2222 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2207 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2223 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2208 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2224 atk_lev, def_lev); */ 2209 atk_lev, def_lev); */
2225 2210
2226 if (atk_lev >= def_lev) 2211 if (atk_lev >= def_lev)
… …
2241 */ 2226 */
2242 *dam *= kill_lev / def_lev; 2227 *dam *= kill_lev / def_lev;
2243 } 2228 }
2244 } 2229 }
2245 else 2230 else
2246 {
2247 *dam = 0; /* no harm done */ 2231 *dam = 0; /* no harm done */
2248 }
2249} 2232}
2250 2233
2251/* thrown_item_effect() - handles any special effects of thrown 2234/* thrown_item_effect() - handles any special effects of thrown
2252 * items (like attacking living creatures--a potion thrown at a 2235 * items (like attacking living creatures--a potion thrown at a
2253 * monster). 2236 * monster).
… …
2282 } 2265 }
2283 } 2266 }
2284} 2267}
2285 2268
2286/* adj_attackroll() - adjustments to attacks by various conditions */ 2269/* adj_attackroll() - adjustments to attacks by various conditions */
2287
2288int 2270int
2289adj_attackroll (object *hitter, object *target) 2271adj_attackroll (object *hitter, object *target)
2290{ 2272{
2291 object *attacker = hitter; 2273 object *attacker = hitter;
2292 int adjust = 0; 2274 int adjust = 0;
… …
2357#endif 2339#endif
2358 2340
2359 return adjust; 2341 return adjust;
2360} 2342}
2361 2343
2362
2363/* determine if the object is an 'aimed' missile */ 2344/* determine if the object is an 'aimed' missile */
2364int 2345int
2365is_aimed_missile (object *op) 2346is_aimed_missile (object *op)
2366{ 2347{
2367 2348
2368 /* I broke what used to be one big if into a few nested 2349 /* 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. 2350 * ones so that figuring out the logic is at least possible.
2370 */ 2351 */
2371 if (op && (op->move_type & MOVE_FLYING)) 2352 if (op && (op->move_type & MOVE_FLYING))
2372 {
2373 if (op->type == ARROW || op->type == THROWN_OBJ) 2353 if (op->type == ARROW || op->type == THROWN_OBJ)
2374 return 1; 2354 return 1;
2375 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2355 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2376 return 1; 2356 return 1;
2377 } 2357
2378 return 0; 2358 return 0;
2379} 2359}

Diff Legend

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