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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.83 by root, Sat Apr 3 02:46:19 2010 UTC vs.
Revision 1.90 by root, Sat May 15 23:41:06 2010 UTC

… …
65 if (npc->enemy) 65 if (npc->enemy)
66 { 66 {
67 /* I broke these if's apart to better be able to see what 67 /* I broke these if's apart to better be able to see what
68 * the grouping checks are. Code is the same. 68 * the grouping checks are. Code is the same.
69 */ 69 */
70 if (QUERY_FLAG (npc->enemy, FLAG_REMOVED) || 70 if (npc->enemy->flag [FLAG_REMOVED] ||
71 QUERY_FLAG (npc->enemy, FLAG_FREED) || 71 npc->enemy->flag [FLAG_FREED] ||
72 !on_same_map (npc, npc->enemy) || npc == npc->enemy || QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (npc->enemy, FLAG_NEUTRAL)) 72 !on_same_map (npc, npc->enemy) || npc == npc->enemy || npc->flag [FLAG_NEUTRAL] || npc->enemy->flag [FLAG_NEUTRAL])
73 npc->enemy = 0; 73 npc->enemy = 0;
74 74
75 else if (QUERY_FLAG (npc, FLAG_FRIENDLY) && ((QUERY_FLAG (npc->enemy, FLAG_FRIENDLY) 75 else if (npc->flag [FLAG_FRIENDLY] && ((npc->enemy->flag [FLAG_FRIENDLY]
76 && !(should_arena_attack (npc, npc->owner, npc->enemy))) 76 && !(should_arena_attack (npc, npc->owner, npc->enemy)))
77 || ((npc->enemy->type == PLAYER) && !(should_arena_attack (npc, npc->owner, npc->enemy))) 77 || ((npc->enemy->type == PLAYER) && !(should_arena_attack (npc, npc->owner, npc->enemy)))
78 || npc->enemy == npc->owner)) 78 || npc->enemy == npc->owner))
79 npc->enemy = 0; 79 npc->enemy = 0;
80 80
81 81
82 else if (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (npc->enemy, FLAG_FRIENDLY) && npc->enemy->type != PLAYER)) 82 else if (!npc->flag [FLAG_FRIENDLY] && (!npc->enemy->flag [FLAG_FRIENDLY] && npc->enemy->type != PLAYER))
83 npc->enemy = 0; 83 npc->enemy = 0;
84 84
85 /* I've noticed that pets could sometimes get an arrow as the 85 /* I've noticed that pets could sometimes get an arrow as the
86 * target enemy - this code below makes sure the enemy is something 86 * target enemy - this code below makes sure the enemy is something
87 * that should be attacked. My guess is that the arrow hits 87 * that should be attacked. My guess is that the arrow hits
88 * the creature/owner, and so the creature then takes that 88 * the creature/owner, and so the creature then takes that
89 * as the enemy to attack. 89 * as the enemy to attack.
90 */ 90 */
91 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER) 91 else if (!npc->enemy->flag [FLAG_MONSTER]
92 && !QUERY_FLAG (npc->enemy, FLAG_GENERATOR) 92 && !npc->enemy->flag [FLAG_GENERATOR]
93 && npc->enemy->type != PLAYER 93 && npc->enemy->type != PLAYER
94 && npc->enemy->type != GOLEM) 94 && npc->enemy->type != GOLEM)
95 npc->enemy = 0; 95 npc->enemy = 0;
96 } 96 }
97 97
… …
162 162
163 attacker = npc->attacked_by; /* save this for later use. This can be a attacker. */ 163 attacker = npc->attacked_by; /* save this for later use. This can be a attacker. */
164 npc->attacked_by = 0; /* always clear the attacker entry */ 164 npc->attacked_by = 0; /* always clear the attacker entry */
165 165
166 /* if we berserk, we don't care about others - we attack all we can find */ 166 /* if we berserk, we don't care about others - we attack all we can find */
167 if (QUERY_FLAG (npc, FLAG_BERSERK)) 167 if (npc->flag [FLAG_BERSERK])
168 { 168 {
169 tmp = find_nearest_living_creature (npc); 169 tmp = find_nearest_living_creature (npc);
170 170
171 if (tmp) 171 if (tmp)
172 get_rangevector (npc, tmp, rv, 0); 172 get_rangevector (npc, tmp, rv, 0);
… …
201 if (attacker) /* if we have an attacker, check him */ 201 if (attacker) /* if we have an attacker, check him */
202 { 202 {
203 /* TODO: that's not finished */ 203 /* TODO: that's not finished */
204 /* we don't want a fight evil vs evil or good against non evil */ 204 /* we don't want a fight evil vs evil or good against non evil */
205 205
206 if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */ 206 if (npc->flag [FLAG_NEUTRAL] || attacker->flag [FLAG_NEUTRAL] || /* neutral */
207 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) || 207 (npc->flag [FLAG_FRIENDLY] && attacker->flag [FLAG_FRIENDLY]) ||
208 (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER))) 208 (!npc->flag [FLAG_FRIENDLY] && (!attacker->flag [FLAG_FRIENDLY] && attacker->type != PLAYER)))
209 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */ 209 npc->clr_flag (FLAG_SLEEP); /* skip it, but lets wakeup */
210 else if (on_same_map (npc, attacker)) /* that's the only thing we must know... */ 210 else if (on_same_map (npc, attacker)) /* that's the only thing we must know... */
211 { 211 {
212 CLEAR_FLAG (npc, FLAG_SLEEP); /* well, NOW we really should wake up! */ 212 npc->clr_flag (FLAG_SLEEP); /* well, NOW we really should wake up! */
213 npc->enemy = attacker; 213 npc->enemy = attacker;
214 return attacker; /* yes, we face our attacker! */ 214 return attacker; /* yes, we face our attacker! */
215 } 215 }
216 } 216 }
217 217
218 /* we have no legal enemy or attacker, so we try to target a new one */ 218 /* we have no legal enemy or attacker, so we try to target a new one */
219 if (!QUERY_FLAG (npc, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (npc, FLAG_FRIENDLY) && !QUERY_FLAG (npc, FLAG_NEUTRAL)) 219 if (!npc->flag [FLAG_UNAGGRESSIVE] && !npc->flag [FLAG_FRIENDLY] && !npc->flag [FLAG_NEUTRAL])
220 { 220 {
221 npc->enemy = get_nearest_player (npc); 221 npc->enemy = get_nearest_player (npc);
222 if (npc->enemy) 222 if (npc->enemy)
223 tmp = check_enemy (npc, rv); 223 tmp = check_enemy (npc, rv);
224 } 224 }
… …
265 /* enemy should already be on this map, so don't really need to check 265 /* enemy should already be on this map, so don't really need to check
266 * for that. 266 * for that.
267 */ 267 */
268 if (rv->distance <= radius) 268 if (rv->distance <= radius)
269 { 269 {
270 CLEAR_FLAG (op, FLAG_SLEEP); 270 op->clr_flag (FLAG_SLEEP);
271 return 1; 271 return 1;
272 } 272 }
273 273
274 return 0; 274 return 0;
275} 275}
… …
298 int i; 298 int i;
299 299
300 if (!can_pick (monster, item)) 300 if (!can_pick (monster, item))
301 return 0; 301 return 0;
302 302
303 if (QUERY_FLAG (item, FLAG_UNPAID)) 303 if (item->flag [FLAG_UNPAID])
304 return 0; 304 return 0;
305 305
306 if (monster->pick_up & 64) /* All */ 306 if (monster->pick_up & 64) /* All */
307 flag = 1; 307 flag = 1;
308 308
… …
317 case FOOD: 317 case FOOD:
318 flag = monster->pick_up & 4; 318 flag = monster->pick_up & 4;
319 break; 319 break;
320 320
321 case WEAPON: 321 case WEAPON:
322 flag = (monster->pick_up & 8) || QUERY_FLAG (monster, FLAG_USE_WEAPON); 322 flag = (monster->pick_up & 8) || monster->flag [FLAG_USE_WEAPON];
323 break; 323 break;
324 324
325 case ARMOUR: 325 case ARMOUR:
326 case SHIELD: 326 case SHIELD:
327 case HELMET: 327 case HELMET:
328 case BOOTS: 328 case BOOTS:
329 case GLOVES: 329 case GLOVES:
330 case GIRDLE: 330 case GIRDLE:
331 flag = (monster->pick_up & 16) || QUERY_FLAG (monster, FLAG_USE_ARMOUR); 331 flag = (monster->pick_up & 16) || monster->flag [FLAG_USE_ARMOUR];
332 break; 332 break;
333 333
334 case SKILL: 334 case SKILL:
335 flag = QUERY_FLAG (monster, FLAG_CAN_USE_SKILL); 335 flag = monster->flag [FLAG_CAN_USE_SKILL];
336 break; 336 break;
337 337
338 case RING: 338 case RING:
339 flag = QUERY_FLAG (monster, FLAG_USE_RING); 339 flag = monster->flag [FLAG_USE_RING];
340 break; 340 break;
341 341
342 case RANGED:
342 case WAND: 343 case WAND:
343 case HORN: 344 case HORN:
344 case ROD: 345 case ROD:
345 flag = QUERY_FLAG (monster, FLAG_USE_RANGE); 346 flag = monster->flag [FLAG_USE_RANGE];
346 break; 347 break;
347 348
348 case SPELLBOOK: 349 case SPELLBOOK:
349 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL); 350 flag = monster->arch && monster->arch->flag [FLAG_CAST_SPELL];
350 break; 351 break;
351 352
352 case SCROLL: 353 case SCROLL:
353 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL); 354 flag = monster->flag [FLAG_USE_SCROLL];
354 break; 355 break;
355 356
356 case BOW: 357 case BOW:
357 case ARROW: 358 case ARROW:
358 flag = QUERY_FLAG (monster, FLAG_USE_BOW); 359 flag = monster->flag [FLAG_USE_BOW];
359 break; 360 break;
360 } 361 }
361 362
362 /* Simplistic check - if the monster has a location to equip it, he will 363 /* Simplistic check - if the monster has a location to equip it, he will
363 * pick it up. Note that this doesn't handle cases where an item may 364 * pick it up. Note that this doesn't handle cases where an item may
… …
442 if (monster->will_apply & 2) 443 if (monster->will_apply & 2)
443 monster->apply (tmp); 444 monster->apply (tmp);
444 break; 445 break;
445 446
446 } 447 }
447 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 448 if (tmp->flag [FLAG_IS_FLOOR])
448 break; 449 break;
449 } 450 }
450} 451}
451 452
452/* Returns 1 is monster should cast spell sp at an enemy 453/* Returns 1 is monster should cast spell sp at an enemy
… …
489{ 490{
490 object *other_weap; 491 object *other_weap;
491 int val = 0, i; 492 int val = 0, i;
492 493
493 for (other_weap = who->inv; other_weap; other_weap = other_weap->below) 494 for (other_weap = who->inv; other_weap; other_weap = other_weap->below)
494 if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED)) 495 if (other_weap->type == item->type && other_weap->flag [FLAG_APPLIED])
495 break; 496 break;
496 497
497 if (!other_weap) /* No other weapons */ 498 if (!other_weap) /* No other weapons */
498 return 1; 499 return 1;
499 500
… …
522{ 523{
523 object *other_armour; 524 object *other_armour;
524 int val = 0, i; 525 int val = 0, i;
525 526
526 for (other_armour = who->inv; other_armour; other_armour = other_armour->below) 527 for (other_armour = who->inv; other_armour; other_armour = other_armour->below)
527 if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED)) 528 if (other_armour->type == item->type && other_armour->flag [FLAG_APPLIED])
528 break; 529 break;
529 530
530 if (other_armour == NULL) /* No other armour, use the new */ 531 if (other_armour == NULL) /* No other armour, use the new */
531 return 1; 532 return 1;
532 533
… …
570void 571void
571monster_check_apply (object *mon, object *item) 572monster_check_apply (object *mon, object *item)
572{ 573{
573 int flag = 0; 574 int flag = 0;
574 575
575 if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG (mon->arch, FLAG_CAST_SPELL))) 576 if (item->type == SPELLBOOK && mon->arch && (mon->arch->flag [FLAG_CAST_SPELL]))
576 { 577 {
577 SET_FLAG (mon, FLAG_CAST_SPELL); 578 mon->set_flag (FLAG_CAST_SPELL);
578 return; 579 return;
579 } 580 }
580 581
581 /* If for some reason, this item is already applied, no more work to do */ 582 /* If for some reason, this item is already applied, no more work to do */
582 if (QUERY_FLAG (item, FLAG_APPLIED)) 583 if (item->flag [FLAG_APPLIED])
583 return; 584 return;
584 585
585 /* Might be better not to do this - if the monster can fire a bow, 586 /* Might be better not to do this - if the monster can fire a bow,
586 * it is possible in his wanderings, he will find one to use. In 587 * it is possible in his wanderings, he will find one to use. In
587 * which case, it would be nice to have ammo for it. 588 * which case, it would be nice to have ammo for it.
588 */ 589 */
589 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW) 590 if (mon->flag [FLAG_USE_BOW] && item->type == ARROW)
590 { 591 {
591 /* Check for the right kind of bow */ 592 /* Check for the right kind of bow */
592 object *bow; 593 object *bow;
593 594
594 for (bow = mon->inv; bow; bow = bow->below) 595 for (bow = mon->inv; bow; bow = bow->below)
595 if (bow->type == BOW && bow->race == item->race) 596 if (bow->type == BOW && bow->race == item->race)
596 { 597 {
597 SET_FLAG (mon, FLAG_READY_BOW); 598 mon->set_flag (FLAG_READY_BOW);
598 LOG (llevMonster, "Found correct bow for arrows.\n");
599 return; /* nothing more to do for arrows */ 599 return; /* nothing more to do for arrows */
600 } 600 }
601 } 601 }
602 602
603 if (item->type == TREASURE && mon->will_apply & WILL_APPLY_TREASURE) 603 if (item->type == TREASURE && mon->will_apply & WILL_APPLY_TREASURE)
604 flag = 1; 604 flag = 1;
605 /* Eating food gets hp back */ 605 /* Eating food gets hp back */
606 else if (item->type == FOOD && mon->will_apply & WILL_APPLY_FOOD) 606 else if (item->type == FOOD && mon->will_apply & WILL_APPLY_FOOD)
607 flag = 1; 607 flag = 1;
608 else if (item->type == SCROLL && QUERY_FLAG (mon, FLAG_USE_SCROLL)) 608 else if (item->type == SCROLL && mon->flag [FLAG_USE_SCROLL])
609 { 609 {
610 if (!item->inv) 610 if (!item->inv)
611 LOG (llevDebug, "Monster %d having scroll %d with empty inventory!", mon->count, item->count); 611 LOG (llevDebug, "Monster %d having scroll %d with empty inventory!", mon->count, item->count);
612 else if (monster_should_cast_spell (mon, item->inv)) 612 else if (monster_should_cast_spell (mon, item->inv))
613 SET_FLAG (mon, FLAG_READY_SCROLL); 613 mon->set_flag (FLAG_READY_SCROLL);
614 /* Don't use it right now */ 614 /* Don't use it right now */
615 return; 615 return;
616 } 616 }
617 else if (item->type == WEAPON) 617 else if (item->type == WEAPON)
618 flag = check_good_weapon (mon, item); 618 flag = check_good_weapon (mon, item);
… …
626 /* We never really 'ready' the wand/rod/horn, because that would mean the 626 /* We never really 'ready' the wand/rod/horn, because that would mean the
627 * weapon would get undone. 627 * weapon would get undone.
628 */ 628 */
629 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK)) 629 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK))
630 { 630 {
631 SET_FLAG (mon, FLAG_READY_RANGE); 631 mon->set_flag (FLAG_READY_RANGE);
632 SET_FLAG (item, FLAG_APPLIED); 632 item->set_flag (FLAG_APPLIED);
633 } 633 }
634 return; 634 return;
635 } 635 }
636 else if (item->type == BOW) 636 else if (item->type == BOW)
637 { 637 {
638 /* We never really 'ready' the bow, because that would mean the 638 /* We never really 'ready' the bow, because that would mean the
639 * weapon would get undone. 639 * weapon would get undone.
640 */ 640 */
641 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK)) 641 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK))
642 SET_FLAG (mon, FLAG_READY_BOW); 642 mon->set_flag (FLAG_READY_BOW);
643 return; 643 return;
644 } 644 }
645 else if (item->type == SKILL) 645 else if (item->type == SKILL)
646 { 646 {
647 /* 647 /*
648 * skills are specials: monsters must have the 'FLAG_READY_SKILL' flag set, 648 * skills are specials: monsters must have the 'FLAG_READY_SKILL' flag set,
649 * else they can't use the skill... 649 * else they can't use the skill...
650 * Skills also don't need to get applied, so return now. 650 * Skills also don't need to get applied, so return now.
651 */ 651 */
652 SET_FLAG (mon, FLAG_READY_SKILL); 652 mon->set_flag (FLAG_READY_SKILL);
653 return; 653 return;
654 } 654 }
655 655
656 /* if we don't match one of the above types, return now. 656 /* if we don't match one of the above types, return now.
657 * can_apply_object will say that we can apply things like flesh, 657 * can_apply_object will say that we can apply things like flesh,
… …
679can_hit (object *ob1, object *ob2, rv_vector * rv) 679can_hit (object *ob1, object *ob2, rv_vector * rv)
680{ 680{
681 object *more; 681 object *more;
682 rv_vector rv1; 682 rv_vector rv1;
683 683
684 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3))) 684 if (ob1->flag [FLAG_CONFUSED] && !(rndm (3)))
685 return 0; 685 return 0;
686 686
687 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2) 687 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
688 return 1; 688 return 1;
689 689
… …
923 * other monsters) 923 * other monsters)
924 */ 924 */
925 if (!(dir = path_to_player (part, pl, 0))) 925 if (!(dir = path_to_player (part, pl, 0)))
926 return 0; 926 return 0;
927 927
928 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 928 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
929 { 929 {
930 get_rangevector (head, owner, &rv1, 0x1); 930 get_rangevector (head, owner, &rv1, 0x1);
931 if (dirdiff (dir, rv1.direction) < 2) 931 if (dirdiff (dir, rv1.direction) < 2)
932 return 0; /* Might hit owner with spell */ 932 return 0; /* Might hit owner with spell */
933 } 933 }
934 934
935 if (QUERY_FLAG (head, FLAG_CONFUSED)) 935 if (head->flag [FLAG_CONFUSED])
936 dir = absdir (dir + rndm (3) + rndm (3) - 2); 936 dir = absdir (dir + rndm (3) + rndm (3) - 2);
937 937
938 /* If the monster hasn't already chosen a spell, choose one 938 /* If the monster hasn't already chosen a spell, choose one
939 * I'm not sure if it really make sense to pre-select spells (events 939 * I'm not sure if it really make sense to pre-select spells (events
940 * could be different by the time the monster goes again). 940 * could be different by the time the monster goes again).
941 */ 941 */
942 if (head->spellitem == NULL) 942 if (head->spellitem == NULL)
943 { 943 {
944 if ((spell_item = monster_choose_random_spell (head)) == NULL) 944 if ((spell_item = monster_choose_random_spell (head)) == NULL)
945 { 945 {
946 LOG (llevMonster, "Turned off spells in %s\n", &head->name);
947 CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */ 946 head->clr_flag (FLAG_CAST_SPELL); /* Will be turned on when picking up book */
948 return 0; 947 return 0;
949 } 948 }
950 949
951 if (spell_item->type == SPELLBOOK) 950 if (spell_item->type == SPELLBOOK)
952 { 951 {
… …
999 * other monsters) 998 * other monsters)
1000 */ 999 */
1001 if (!(dir = path_to_player (part, pl, 0))) 1000 if (!(dir = path_to_player (part, pl, 0)))
1002 return 0; 1001 return 0;
1003 1002
1004 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1003 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1005 { 1004 {
1006 get_rangevector (head, owner, &rv1, 0x1); 1005 get_rangevector (head, owner, &rv1, 0x1);
1007 if (dirdiff (dir, rv1.direction) < 2) 1006 if (dirdiff (dir, rv1.direction) < 2)
1008 { 1007 {
1009 return 0; /* Might hit owner with spell */ 1008 return 0; /* Might hit owner with spell */
1010 } 1009 }
1011 } 1010 }
1012 1011
1013 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1012 if (head->flag [FLAG_CONFUSED])
1014 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1013 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1015 1014
1016 for (scroll = head->inv; scroll; scroll = scroll->below) 1015 for (scroll = head->inv; scroll; scroll = scroll->below)
1017 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv)) 1016 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
1018 break; 1017 break;
1019 1018
1020 /* Used up all his scrolls, so nothing do to */ 1019 /* Used up all his scrolls, so nothing do to */
1021 if (!scroll) 1020 if (!scroll)
1022 { 1021 {
1023 CLEAR_FLAG (head, FLAG_READY_SCROLL); 1022 head->clr_flag (FLAG_READY_SCROLL);
1024 return 0; 1023 return 0;
1025 } 1024 }
1026 1025
1027 /* Spell should be cast on caster (ie, heal, strength) */ 1026 /* Spell should be cast on caster (ie, heal, strength) */
1028 if (scroll->inv->range == 0) 1027 if (scroll->inv->range == 0)
… …
1049 object *skill, *owner; 1048 object *skill, *owner;
1050 1049
1051 if (!(dir = path_to_player (part, pl, 0))) 1050 if (!(dir = path_to_player (part, pl, 0)))
1052 return 0; 1051 return 0;
1053 1052
1054 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1053 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1055 { 1054 {
1056 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1055 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1057 1056
1058 if (dirdiff (dir, dir2) < 1) 1057 if (dirdiff (dir, dir2) < 1)
1059 return 0; /* Might hit owner with skill -thrown rocks for example ? */ 1058 return 0; /* Might hit owner with skill -thrown rocks for example ? */
1060 } 1059 }
1061 1060
1062 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1061 if (head->flag [FLAG_CONFUSED])
1063 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1062 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1064 1063
1065 object *new_skill = 0; 1064 object *new_skill = 0;
1066 1065
1067 // skill selection - monster will use the last unused skill 1066 // skill selection - monster will use the last unused skill
… …
1073 if (new_skill) 1072 if (new_skill)
1074 splay (head->chosen_skill = new_skill); 1073 splay (head->chosen_skill = new_skill);
1075 else if (!head->chosen_skill) 1074 else if (!head->chosen_skill)
1076 { 1075 {
1077 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count); 1076 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);
1078 CLEAR_FLAG (head, FLAG_READY_SKILL); 1077 head->clr_flag (FLAG_READY_SKILL);
1079 return 0; 1078 return 0;
1080 } 1079 }
1081 1080
1082 /* use skill */ 1081 /* use skill */
1083 return do_skill (head, part, head->chosen_skill, dir, NULL); 1082 return do_skill (head, part, head->chosen_skill, dir, NULL);
… …
1091 int at_least_one = 0; 1090 int at_least_one = 0;
1092 1091
1093 if (!(dir = path_to_player (part, pl, 0))) 1092 if (!(dir = path_to_player (part, pl, 0)))
1094 return 0; 1093 return 0;
1095 1094
1096 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1095 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1097 { 1096 {
1098 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1097 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1099 1098
1100 if (dirdiff (dir, dir2) < 2) 1099 if (dirdiff (dir, dir2) < 2)
1101 return 0; /* Might hit owner with spell */ 1100 return 0; /* Might hit owner with spell */
1102 } 1101 }
1103 1102
1104 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1103 if (head->flag [FLAG_CONFUSED])
1105 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1104 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1106 1105
1107 for (wand = head->inv; wand; wand = wand->below) 1106 for (wand = head->inv; wand; wand = wand->below)
1108 { 1107 {
1109 if (wand->type == WAND) 1108 if (wand->type == WAND)
… …
1117 1116
1118 if (!(--wand->stats.food)) 1117 if (!(--wand->stats.food))
1119 { 1118 {
1120 if (wand->arch) 1119 if (wand->arch)
1121 { 1120 {
1122 CLEAR_FLAG (wand, FLAG_ANIMATE); 1121 wand->clr_flag (FLAG_ANIMATE);
1123 wand->face = wand->arch->face; 1122 wand->face = wand->arch->face;
1124 wand->set_speed (0); 1123 wand->set_speed (0);
1125 } 1124 }
1126 } 1125 }
1127 /* Success */ 1126 /* Success */
… …
1148 1147
1149 if (at_least_one) 1148 if (at_least_one)
1150 return 0; 1149 return 0;
1151 1150
1152 LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANGE() without wand/horn/rod.\n", &head->name, head->count); 1151 LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANGE() without wand/horn/rod.\n", &head->name, head->count);
1153 CLEAR_FLAG (head, FLAG_READY_RANGE); 1152 head->clr_flag (FLAG_READY_RANGE);
1154 return 0; 1153 return 0;
1155} 1154}
1156 1155
1157static int 1156static int
1158monster_use_bow (object *head, object *part, object *pl, int dir) 1157monster_use_bow (object *head, object *part, object *pl, int dir)
… …
1160 object *owner; 1159 object *owner;
1161 1160
1162 if (!(dir = path_to_player (part, pl, 0))) 1161 if (!(dir = path_to_player (part, pl, 0)))
1163 return 0; 1162 return 0;
1164 1163
1165 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1164 if (head->flag [FLAG_CONFUSED])
1166 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1165 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1167 1166
1168 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1167 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1169 { 1168 {
1170 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1169 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1171 1170
1172 if (dirdiff (dir, dir2) < 1) 1171 if (dirdiff (dir, dir2) < 1)
1173 return 0; /* Might hit owner with arrow */ 1172 return 0; /* Might hit owner with arrow */
1174 } 1173 }
1175 1174
… …
1188 /* If nothing alive on this space, no need to search the space. */ 1187 /* If nothing alive on this space, no need to search the space. */
1189 if (!(ms.flags () & P_IS_ALIVE)) 1188 if (!(ms.flags () & P_IS_ALIVE))
1190 continue; 1189 continue;
1191 1190
1192 for (object *npc = ms.bot; npc; npc = npc->above) 1191 for (object *npc = ms.bot; npc; npc = npc->above)
1193 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE)) 1192 if (npc->flag [FLAG_ALIVE] && npc->flag [FLAG_UNAGGRESSIVE])
1194 npc->enemy = op->enemy; 1193 npc->enemy = op->enemy;
1195 } 1194 }
1196} 1195}
1197 1196
1198void 1197void
… …
1238 * marked item and throw it to the enemy. 1237 * marked item and throw it to the enemy.
1239 */ 1238 */
1240 for (tmp = op->inv; tmp; tmp = tmp->below) 1239 for (tmp = op->inv; tmp; tmp = tmp->below)
1241 { 1240 {
1242 /* Can't throw invisible objects or items that are applied */ 1241 /* Can't throw invisible objects or items that are applied */
1243 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED)) 1242 if (tmp->invisible || tmp->flag [FLAG_APPLIED])
1244 continue; 1243 continue;
1245 1244
1246 if (QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1245 if (tmp->flag [FLAG_IS_THROWN])
1247 break; 1246 break;
1248 1247
1249 } 1248 }
1250 1249
1251#ifdef DEBUG_THROW 1250#ifdef DEBUG_THROW
… …
1273 1272
1274 /* for target facing, we copy this value here for fast access */ 1273 /* for target facing, we copy this value here for fast access */
1275 if (oph->head) /* force update the head - one arch one pic */ 1274 if (oph->head) /* force update the head - one arch one pic */
1276 oph = oph->head; 1275 oph = oph->head;
1277 1276
1278 if (QUERY_FLAG (op, FLAG_NO_ATTACK)) /* we never ever attack */ 1277 if (op->flag [FLAG_NO_ATTACK]) /* we never ever attack */
1279 enemy = op->enemy = NULL; 1278 enemy = op->enemy = NULL;
1280 else if ((enemy = find_enemy (op, &rv))) 1279 else if ((enemy = find_enemy (op, &rv)))
1281 /* we have an enemy, just tell him we want him dead */ 1280 /* we have an enemy, just tell him we want him dead */
1282 enemy->attacked_by = op; /* our ptr */ 1281 enemy->attacked_by = op; /* our ptr */
1283 1282
… …
1286 { 1285 {
1287 /* last heal is in funny units. Dividing by speed puts 1286 /* last heal is in funny units. Dividing by speed puts
1288 * the regeneration rate on a basis of time instead of 1287 * the regeneration rate on a basis of time instead of
1289 * #moves the monster makes. The scaling by 8 is 1288 * #moves the monster makes. The scaling by 8 is
1290 * to capture 8th's of a hp fraction regens 1289 * to capture 8th's of a hp fraction regens
1291 *
1292 * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
1293 * overflow might produce monsters with negative hp.
1294 */ 1290 */
1295 1291 uint32_t last_heal = op->last_heal + op->stats.Con * 8 / op->speed;
1296 op->last_heal += (int) ((float) (8 * op->stats.Con) / op->speed);
1297 op->stats.hp = min ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */ 1292 op->stats.hp = min (op->stats.hp + last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */
1298 op->last_heal %= 32; 1293 op->last_heal = last_heal % 32;
1299 1294
1300 /* So if the monster has gained enough HP that they are no longer afraid */ 1295 /* So if the monster has gained enough HP that they are no longer afraid */
1301 if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short)(((float)op->run_away / 100.f) * (float)op->stats.maxhp)) 1296 if (op->flag [FLAG_RUN_AWAY] && op->stats.hp * 100 >= op->stats.maxhp * op->run_away)
1302 CLEAR_FLAG (op, FLAG_RUN_AWAY); 1297 op->flag [FLAG_RUN_AWAY] = false;
1303
1304 if (op->stats.hp > op->stats.maxhp)
1305 op->stats.hp = op->stats.maxhp;
1306 } 1298 }
1307 1299
1308 /* generate sp, if applicable */ 1300 /* generate sp, if applicable */
1309 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp) 1301 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
1310 { 1302 {
1311 /* last_sp is in funny units. Dividing by speed puts 1303 /* last_sp is in funny units. Dividing by speed puts
1312 * the regeneration rate on a basis of time instead of 1304 * the regeneration rate on a basis of time instead of
1313 * #moves the monster makes. The scaling by 8 is 1305 * #moves the monster makes. The scaling by 8 is
1314 * to capture 8th's of a sp fraction regens 1306 * to capture 8th's of a sp fraction regens
1315 *
1316 * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
1317 * overflow might produce monsters with negative sp.
1318 */ 1307 */
1319 1308
1320 op->last_sp += (int) ((float) (8 * op->stats.Pow) / op->speed); 1309 uint32_t last_sp = op->last_sp + op->stats.Pow * 8 / op->speed;
1321 op->stats.sp = min (op->stats.sp + op->last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */ 1310 op->stats.sp = min (op->stats.sp + last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */
1322 op->last_sp %= 128; 1311 op->last_sp = last_sp % 128;
1323 } 1312 }
1324 1313
1325 /* this should probably get modified by many more values. 1314 /* this should probably get modified by many more values.
1326 * (eg, creatures resistance to fear, level, etc. ) 1315 * (eg, creatures resistance to fear, level, etc. )
1327 */ 1316 */
1328 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20))) 1317 if (op->flag [FLAG_SCARED] && !(rndm (20)))
1329 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */ 1318 op->clr_flag (FLAG_SCARED); /* Time to regain some "guts"... */
1330 1319
1331 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy))) 1320 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
1332 return QUERY_FLAG (op, FLAG_FREED); 1321 return op->flag [FLAG_FREED];
1333 1322
1334 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) || 1323 if (op->flag [FLAG_SLEEP] || op->flag [FLAG_BLIND] ||
1335 ((op->map->darklevel () > 0) && !QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !QUERY_FLAG (op, FLAG_SEE_INVISIBLE))) 1324 ((op->map->darklevel () > 0) && !op->flag [FLAG_SEE_IN_DARK] && !op->flag [FLAG_SEE_INVISIBLE]))
1336 if (!check_wakeup (op, enemy, &rv)) 1325 if (!check_wakeup (op, enemy, &rv))
1337 return 0; 1326 return 0;
1338 1327
1339 /* check if monster pops out of hidden spot */ 1328 /* check if monster pops out of hidden spot */
1340 if (op->flag [FLAG_HIDDEN]) 1329 if (op->flag [FLAG_HIDDEN])
… …
1347 monster_apply_below (op); /* Check for items to apply below */ 1336 monster_apply_below (op); /* Check for items to apply below */
1348 1337
1349 /* If we don't have an enemy, do special movement or the like */ 1338 /* If we don't have an enemy, do special movement or the like */
1350 if (!enemy) 1339 if (!enemy)
1351 { 1340 {
1352 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 1341 if (op->flag [FLAG_ONLY_ATTACK])
1353 { 1342 {
1354 op->drop_and_destroy (); 1343 op->drop_and_destroy ();
1355 return 1; 1344 return 1;
1356 } 1345 }
1357 1346
1358 /* Probably really a bug for a creature to have both 1347 /* Probably really a bug for a creature to have both
1359 * stand still and a movement type set. 1348 * stand still and a movement type set.
1360 */ 1349 */
1361 if (!QUERY_FLAG (op, FLAG_STAND_STILL)) 1350 if (!op->flag [FLAG_STAND_STILL])
1362 { 1351 {
1363 if (op->attack_movement & HI4) 1352 if (op->attack_movement & HI4)
1364 { 1353 {
1365 switch (op->attack_movement & HI4) 1354 switch (op->attack_movement & HI4)
1366 { 1355 {
… …
1401 break; 1390 break;
1402 } 1391 }
1403 1392
1404 return 0; 1393 return 0;
1405 } 1394 }
1406 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE)) 1395 else if (op->flag [FLAG_RANDOM_MOVE])
1407 move_randomly (op); 1396 move_randomly (op);
1408 } /* stand still */ 1397 } /* stand still */
1409 1398
1410 return 0; 1399 return 0;
1411 } /* no enemy */ 1400 } /* no enemy */
… …
1436 1425
1437 /* Move the check for scared up here - if the monster was scared, 1426 /* Move the check for scared up here - if the monster was scared,
1438 * we were not doing any of the logic below, so might as well save 1427 * we were not doing any of the logic below, so might as well save
1439 * a few cpu cycles. 1428 * a few cpu cycles.
1440 */ 1429 */
1441 if (!QUERY_FLAG (op, FLAG_SCARED)) 1430 if (!op->flag [FLAG_SCARED])
1442 { 1431 {
1443 rv_vector rv1; 1432 rv_vector rv1;
1444 1433
1445 /* now we test every part of an object .... this is a real ugly piece of code */ 1434 /* now we test every part of an object .... this is a real ugly piece of code */
1446 for (part = op; part; part = part->more) 1435 for (part = op; part; part = part->more)
… …
1449 dir = rv1.direction; 1438 dir = rv1.direction;
1450 1439
1451 /* hm, not sure about this part - in original was a scared flag here too 1440 /* hm, not sure about this part - in original was a scared flag here too
1452 * but that we test above... so can be old code here 1441 * but that we test above... so can be old code here
1453 */ 1442 */
1454 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 1443 if (op->flag [FLAG_RUN_AWAY])
1455 dir = absdir (dir + 4); 1444 dir = absdir (dir + 4);
1456 1445
1457 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1446 if (op->flag [FLAG_CONFUSED])
1458 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1447 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1459 1448
1460 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3))) 1449 if (op->flag [FLAG_CAST_SPELL] && !(rndm (3)))
1461 if (monster_cast_spell (op, part, enemy, dir, &rv1)) 1450 if (monster_cast_spell (op, part, enemy, dir, &rv1))
1462 return 0; 1451 return 0;
1463 1452
1464 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3))) 1453 if (op->flag [FLAG_READY_SCROLL] && !(rndm (3)))
1465 if (monster_use_scroll (op, part, enemy, dir, &rv1)) 1454 if (monster_use_scroll (op, part, enemy, dir, &rv1))
1466 return 0; 1455 return 0;
1467 1456
1468 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3))) 1457 if (op->flag [FLAG_READY_RANGE] && !(rndm (3)))
1469 if (monster_use_range (op, part, enemy, dir)) 1458 if (monster_use_range (op, part, enemy, dir))
1470 return 0; 1459 return 0;
1471 1460
1472 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3))) 1461 if (op->flag [FLAG_READY_SKILL] && !(rndm (3)))
1473 if (monster_use_skill (op, rv.part, enemy, rv.direction)) 1462 if (monster_use_skill (op, rv.part, enemy, rv.direction))
1474 return 0; 1463 return 0;
1475 1464
1476 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2))) 1465 if (op->flag [FLAG_READY_BOW] && !(rndm (2)))
1477 if (monster_use_bow (op, part, enemy, dir)) 1466 if (monster_use_bow (op, part, enemy, dir))
1478 return 0; 1467 return 0;
1479 } /* for processing of all parts */ 1468 } /* for processing of all parts */
1480 } /* If not scared */ 1469 } /* If not scared */
1481 1470
… …
1528 } 1517 }
1529 } 1518 }
1530 1519
1531//+GPL 1520//+GPL
1532 1521
1533 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY)) 1522 if (op->flag [FLAG_SCARED] || op->flag [FLAG_RUN_AWAY])
1534 dir = absdir (dir + 4); 1523 dir = absdir (dir + 4);
1535 1524
1536 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1525 if (op->flag [FLAG_CONFUSED])
1537 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1526 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1538 1527
1539 pre_att_dir = dir; /* remember the original direction */ 1528 pre_att_dir = dir; /* remember the original direction */
1540 1529
1541 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED)) 1530 if ((op->attack_movement & LO4) && !op->flag [FLAG_SCARED])
1542 { 1531 {
1543 switch (op->attack_movement & LO4) 1532 switch (op->attack_movement & LO4)
1544 { 1533 {
1545 case DISTATT: 1534 case DISTATT:
1546 dir = dist_att (dir, op, enemy, part, &rv); 1535 dir = dist_att (dir, op, enemy, part, &rv);
… …
1576 } 1565 }
1577 1566
1578 if (!dir) 1567 if (!dir)
1579 return 0; 1568 return 0;
1580 1569
1581 if (!QUERY_FLAG (op, FLAG_STAND_STILL)) 1570 if (!op->flag [FLAG_STAND_STILL])
1582 { 1571 {
1583 if (op->move (dir)) /* Can the monster move directly toward player? */ 1572 if (op->move (dir)) /* Can the monster move directly toward player? */
1584 { 1573 {
1585 /* elmex: Turn our monster after it moved if it has DISTATT attack */ 1574 /* elmex: Turn our monster after it moved if it has DISTATT attack */
1586 if ((op->attack_movement & LO4) == DISTATT) 1575 if ((op->attack_movement & LO4) == DISTATT)
1587 op->direction = pre_att_dir; 1576 op->direction = pre_att_dir;
1588 1577
1589 return 0; 1578 return 0;
1590 } 1579 }
1591 1580
1592 if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY)) 1581 if (op->flag [FLAG_SCARED] || !can_hit (part, enemy, &rv) || op->flag [FLAG_RUN_AWAY])
1593 { 1582 {
1594 /* Try move around corners if !close */ 1583 /* Try move around corners if !close */
1595 int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || rndm (2)) ? 1 : 2; 1584 int maxdiff = (op->flag [FLAG_ONLY_ATTACK] || rndm (2)) ? 1 : 2;
1596 1585
1597 for (diff = 1; diff <= maxdiff; diff++) 1586 for (diff = 1; diff <= maxdiff; diff++)
1598 { 1587 {
1599 /* try different detours */ 1588 /* try different detours */
1600 int m = 1 - rndm (2) * 2; /* Try left or right first? */ 1589 int m = 1 - rndm (2) * 2; /* Try left or right first? */
… …
1611 1600
1612 /* 1601 /*
1613 * Eneq(@csd.uu.se): Patch to make RUN_AWAY or SCARED monsters move a random 1602 * Eneq(@csd.uu.se): Patch to make RUN_AWAY or SCARED monsters move a random
1614 * direction if they can't move away. 1603 * direction if they can't move away.
1615 */ 1604 */
1616 if (!QUERY_FLAG (op, FLAG_ONLY_ATTACK) && (QUERY_FLAG (op, FLAG_RUN_AWAY) || QUERY_FLAG (op, FLAG_SCARED))) 1605 if (!op->flag [FLAG_ONLY_ATTACK] && (op->flag [FLAG_RUN_AWAY] || op->flag [FLAG_SCARED]))
1617 if (move_randomly (op)) 1606 if (move_randomly (op))
1618 return 0; 1607 return 0;
1619 1608
1620 /* 1609 /*
1621 * Try giving the monster a new enemy - the player that is closest 1610 * Try giving the monster a new enemy - the player that is closest
… …
1626 * are two players flanking the monster at close distance, but which 1615 * are two players flanking the monster at close distance, but which
1627 * the monster can't get to, and a third one at a far distance that 1616 * the monster can't get to, and a third one at a far distance that
1628 * the monster could get to - as it is, the monster won't look at that 1617 * the monster could get to - as it is, the monster won't look at that
1629 * third one. 1618 * third one.
1630 */ 1619 */
1631 if (!QUERY_FLAG (op, FLAG_FRIENDLY) && enemy == op->enemy) 1620 if (!op->flag [FLAG_FRIENDLY] && enemy == op->enemy)
1632 { 1621 {
1633 object *nearest_player = get_nearest_player (op); 1622 object *nearest_player = get_nearest_player (op);
1634 1623
1635 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv)) 1624 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
1636 { 1625 {
1637 op->enemy = 0; 1626 op->enemy = 0;
1638 enemy = nearest_player; 1627 enemy = nearest_player;
1639 } 1628 }
1640 } 1629 }
1641 1630
1642 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv)) 1631 if (!op->flag [FLAG_SCARED] && can_hit (part, enemy, &rv))
1643 { 1632 {
1644 /* The adjustement to wc that was here before looked totally bogus - 1633 /* The adjustement to wc that was here before looked totally bogus -
1645 * since wc can in fact get negative, that would mean by adding 1634 * since wc can in fact get negative, that would mean by adding
1646 * the current wc, the creature gets better? Instead, just 1635 * the current wc, the creature gets better? Instead, just
1647 * add a fixed amount - nasty creatures that are runny away should 1636 * add a fixed amount - nasty creatures that are runny away should
1648 * still be pretty nasty. 1637 * still be pretty nasty.
1649 */ 1638 */
1650 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 1639 if (op->flag [FLAG_RUN_AWAY])
1651 { 1640 {
1652 part->stats.wc += 10; 1641 part->stats.wc += 10;
1653 skill_attack (enemy, part, 0, NULL, NULL); 1642 skill_attack (enemy, part, 0, NULL, NULL);
1654 part->stats.wc -= 10; 1643 part->stats.wc -= 10;
1655 } 1644 }
1656 else 1645 else
1657 skill_attack (enemy, part, 0, NULL, NULL); 1646 skill_attack (enemy, part, 0, NULL, NULL);
1658 } /* if monster is in attack range */ 1647 } /* if monster is in attack range */
1659 1648
1660 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ 1649 if (part->flag [FLAG_FREED]) /* Might be freed by ghost-attack or hit-back */
1661 return 1; 1650 return 1;
1662 1651
1663 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 1652 if (op->flag [FLAG_ONLY_ATTACK])
1664 { 1653 {
1665 op->drop_and_destroy (); 1654 op->drop_and_destroy ();
1666 return 1; 1655 return 1;
1667 } 1656 }
1668 1657
… …
1690 return 0; 1679 return 0;
1691 1680
1692 get_rangevector (op, enemy, rv, 0); 1681 get_rangevector (op, enemy, rv, 0);
1693 1682
1694 /* Monsters always ignore the DM */ 1683 /* Monsters always ignore the DM */
1695 if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ)) 1684 if (!op->is_player () && enemy->flag [FLAG_WIZ])
1696 return 0; 1685 return 0;
1697 1686
1698 /* simple check. Should probably put some range checks in here. */ 1687 /* simple check. Should probably put some range checks in here. */
1699 if (can_see_enemy (op, enemy)) 1688 if (can_see_enemy (op, enemy))
1700 return 1; 1689 return 1;
… …
1741 hide_discovery += bonus * 5; 1730 hide_discovery += bonus * 5;
1742 } /* else creature has modifiers for hiding */ 1731 } /* else creature has modifiers for hiding */
1743 1732
1744 /* Radii stealth adjustment. Only if you are stealthy 1733 /* Radii stealth adjustment. Only if you are stealthy
1745 * will you be able to sneak up closer to creatures */ 1734 * will you be able to sneak up closer to creatures */
1746 if (QUERY_FLAG (enemy, FLAG_STEALTH)) 1735 if (enemy->flag [FLAG_STEALTH])
1747 { 1736 {
1748 radius /= 2; 1737 radius /= 2;
1749 hide_discovery /= 3; 1738 hide_discovery /= 3;
1750 } 1739 }
1751 1740
… …
1753 if (!stand_in_light (enemy)) 1742 if (!stand_in_light (enemy))
1754 { 1743 {
1755 /* on dark maps body heat can help indicate location with infravision 1744 /* on dark maps body heat can help indicate location with infravision
1756 * undead don't have body heat, so no benefit detecting them. 1745 * undead don't have body heat, so no benefit detecting them.
1757 */ 1746 */
1758 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy)) 1747 if (op->flag [FLAG_SEE_IN_DARK] && !is_true_undead (enemy))
1759 radius += op->map->darklevel () / 2; 1748 radius += op->map->darklevel () / 2;
1760 else 1749 else
1761 radius -= op->map->darklevel () / 2; 1750 radius -= op->map->darklevel () / 2;
1762 1751
1763 /* op next to a monster (and not in complete darkness) 1752 /* op next to a monster (and not in complete darkness)
… …
1840 return 1; 1829 return 1;
1841 1830
1842 if (op->map) 1831 if (op->map)
1843 unordered_mapwalk (mapwalk_buf, op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS) 1832 unordered_mapwalk (mapwalk_buf, op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
1844 { 1833 {
1834 mapspace &ms = m->at (nx, ny);
1835
1836 ms.update ();
1837
1845 /* Check the spaces with the max light radius to see if any of them 1838 /* Check the spaces with the max light radius to see if any of them
1846 * have lights, and if any of them light the player enough, then return 1. 1839 * have lights, and if any of them light the player enough, then return 1.
1847 */ 1840 */
1848 int light = m->at (nx, ny).light; 1841 int light = ms.light;
1849 1842
1850 if (expect_false (light > 0) && idistance (dx, dy) <= light) 1843 if (expect_false (light > 0) && idistance (dx, dy) <= light)
1851 return 1; 1844 return 1;
1852 } 1845 }
1853 } 1846 }
… …
1864can_see_enemy (object *op, object *enemy) 1857can_see_enemy (object *op, object *enemy)
1865{ 1858{
1866 object *looker = op->head ? op->head : op; 1859 object *looker = op->head ? op->head : op;
1867 1860
1868 /* safety */ 1861 /* safety */
1869 if (!looker || !enemy || !QUERY_FLAG (looker, FLAG_ALIVE)) 1862 if (!looker || !enemy || !looker->flag [FLAG_ALIVE])
1870 return 0; 1863 return 0;
1871 1864
1872 /* we dont give a full treatment of xrays here (shorter range than normal, 1865 /* we dont give a full treatment of xrays here (shorter range than normal,
1873 * see through walls). Should we change the code elsewhere to make you 1866 * see through walls). Should we change the code elsewhere to make you
1874 * blind even if you can xray? 1867 * blind even if you can xray?
1875 */ 1868 */
1876 if (QUERY_FLAG (looker, FLAG_BLIND) && !QUERY_FLAG (looker, FLAG_XRAYS)) 1869 if (looker->flag [FLAG_BLIND] && !looker->flag [FLAG_XRAYS])
1877 return 0; 1870 return 0;
1878 1871
1879 /* checking for invisible things */ 1872 /* checking for invisible things */
1880 if (enemy->invisible) 1873 if (enemy->invisible)
1881 { 1874 {
… …
1898 1891
1899 /* Invisible enemy. Break apart the check for invis undead/invis looker 1892 /* Invisible enemy. Break apart the check for invis undead/invis looker
1900 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values, 1893 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
1901 * and making it a conditional makes the code pretty ugly. 1894 * and making it a conditional makes the code pretty ugly.
1902 */ 1895 */
1903 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE)) 1896 if (!looker->flag [FLAG_SEE_INVISIBLE])
1904 if (makes_invisible_to (enemy, looker)) 1897 if (makes_invisible_to (enemy, looker))
1905 return 0; 1898 return 0;
1906 } 1899 }
1907 else if (looker->is_player ()) /* for players, a (possible) shortcut */ 1900 else if (looker->is_player ()) /* for players, a (possible) shortcut */
1908 if (player_can_view (looker, enemy)) 1901 if (player_can_view (looker, enemy))
… …
1916 * only relevant for tiled maps, but it is possible that the 1909 * only relevant for tiled maps, but it is possible that the
1917 * enemy is on a bright map and the looker on a dark - in that 1910 * enemy is on a bright map and the looker on a dark - in that
1918 * case, the looker can still see the enemy 1911 * case, the looker can still see the enemy
1919 */ 1912 */
1920 if (!stand_in_light (enemy) 1913 if (!stand_in_light (enemy)
1921 && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS))) 1914 && (!looker->flag [FLAG_SEE_IN_DARK] || !is_true_undead (looker) || !looker->flag [FLAG_XRAYS]))
1922 return 0; 1915 return 0;
1923 1916
1924 return 1; 1917 return 1;
1925} 1918}
1926 1919

Diff Legend

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