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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

… …
54 54
55 players.insert (this); 55 players.insert (this);
56 ob->remove (); 56 ob->remove ();
57 ob->map = 0; 57 ob->map = 0;
58 ob->activate_recursive (); 58 ob->activate_recursive ();
59 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 ob->clr_flag (FLAG_FRIENDLY);
60 add_friendly_object (ob); 60 add_friendly_object (ob);
61} 61}
62 62
63void 63void
64player::deactivate () 64player::deactivate ()
… …
75 75
76 ob->remove (); 76 ob->remove ();
77 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
78 ob->map = 0; 78 ob->map = 0;
79 party = 0; 79 party = 0;
80
81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82 80
83 players.erase (this); 81 players.erase (this);
84} 82}
85 83
86// connect the player with a specific client 84// connect the player with a specific client
… …
128 126
129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
130 128
131 esrv_new_player (this); 129 esrv_new_player (this);
132 130
133 ob->update_stats ();
134
135 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0);
138
139 ob->flag [FLAG_READY_WEAPON] = false; 131 ob->flag [FLAG_READY_WEAPON] = false;
140 ob->flag [FLAG_READY_SKILL] = false; 132 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_RANGE] = false; 133 ob->flag [FLAG_READY_RANGE] = false;
142 ob->flag [FLAG_READY_BOW] = false; 134 ob->flag [FLAG_READY_BOW] = false;
143 135
144 for (object *op = ob->inv; op; op = op->below) 136 ob->update_stats ();
145 if (op->flag [FLAG_APPLIED])
146 switch (op->type)
147 {
148 case SKILL:
149 op->flag [FLAG_APPLIED] = false;
150 break;
151 137
152 case WAND: 138 ns->floorbox_update ();
153 case ROD: 139 esrv_send_inventory (ob, ob);
154 case HORN: 140 esrv_add_spells (this, 0);
155 case BOW:
156 ranged_ob = op;
157 break;
158 141
159 case WEAPON: 142 activate ();
160 combat_ob = op;
161 break;
162 }
163
164 ob->current_weapon = 0;
165 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
166 activate (); // change_weapon also activates, but this doesn't hurt
167 143
168 INVOKE_PLAYER (CONNECT, this); 144 INVOKE_PLAYER (CONNECT, this);
169 INVOKE_PLAYER (LOGIN, this); 145 INVOKE_PLAYER (LOGIN, this);
170} 146}
171 147
… …
205player::set_object (object *op) 181player::set_object (object *op)
206{ 182{
207 ob = observe = viewpoint = op; 183 ob = observe = viewpoint = op;
208 ob->contr = this; /* this aren't yet in archetype */ 184 ob->contr = this; /* this aren't yet in archetype */
209 185
210 ob->speed = 1.0f; 186 ob->set_speed (1.0f);
211 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
212 188
213 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
214} 190}
215 191
… …
257 disconnect (); 233 disconnect ();
258 234
259 attachable::do_destroy (); 235 attachable::do_destroy ();
260 236
261 if (ob) 237 if (ob)
262 {
263 ob->destroy_inv (false);
264 ob->destroy (); 238 ob->destroy ();
265 }
266 239
267 ob = observe = viewpoint = 0; 240 ob = observe = viewpoint = 0;
268} 241}
269 242
270player::~player () 243player::~player ()
… …
400 */ 373 */
401int 374int
402path_to_player (object *mon, object *pl, unsigned mindiff) 375path_to_player (object *mon, object *pl, unsigned mindiff)
403{ 376{
404 rv_vector rv; 377 rv_vector rv;
405 sint16 x, y;
406 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 378 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
407 maptile *m, *lastmap;
408 379
409 get_rangevector (mon, pl, &rv, 0); 380 get_rangevector (mon, pl, &rv, 0);
410 381
411 if (rv.distance < mindiff) 382 if (rv.distance < mindiff)
412 return 0; 383 return 0;
413 384
414 x = mon->x; 385 mapxy pos (mon);
415 y = mon->y;
416 m = mon->map;
417 dir = rv.direction; 386 dir = rv.direction;
418 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 387 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
419 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 388 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
420 389
421 /* If we can't solve it within the search distance, return now. */ 390 /* If we can't solve it within the search distance, return now. */
422 if (diff > max) 391 if (diff > max)
423 return 0; 392 return 0;
424 393
425 while (diff > 1 && max > 0) 394 while (diff > 1 && max > 0)
426 { 395 {
427 lastx = x; 396 mapxy lastpos = pos;
428 lasty = y;
429 lastmap = m;
430 x = lastx + freearr_x[dir];
431 y = lasty + freearr_y[dir];
432 397
433 mflags = get_map_flags (m, &m, x, y, &x, &y); 398 pos.move (dir);
434 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
435 399
436 /* Space is blocked - try changing direction a little */ 400 /* Space is blocked - try changing direction a little */
437 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 401 if (!pos.normalise ()
438 && (m == mon->map && blocked_link (mon, m, x, y)))) 402 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
403 && blocked_link (mon, pos.m, pos.x, pos.y)))
439 { 404 {
440 /* recalculate direction from last good location. Possible 405 /* recalculate direction from last good location. Possible
441 * we were not traversing ideal location before. 406 * we were not traversing ideal location before.
442 */ 407 */
443 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 408 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
444 if (rv.direction != dir) 409 if (rv.direction != dir)
445 { 410 {
446 /* OK - says direction should be different - lets reset the 411 /* OK - says direction should be different - lets reset the
447 * the values so it will try again. 412 * the values so it will try again.
448 */ 413 */
449 x = lastx;
450 y = lasty;
451 m = lastmap; 414 pos = lastpos;
452 dir = firstdir = rv.direction; 415 dir = firstdir = rv.direction;
453 } 416 }
454 else 417 else
455 { 418 {
456 /* direct path is blocked - try taking a side step to 419 /* direct path is blocked - try taking a side step to
… …
463 */ 426 */
464 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 427 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
465 { 428 {
466 if (i == 0) 429 if (i == 0)
467 continue; /* already did this, so skip it */ 430 continue; /* already did this, so skip it */
431
468 /* Use lastdir here - otherwise, 432 /* Use lastdir here - otherwise,
469 * since the direction that the creature should move in 433 * since the direction that the creature should move in
470 * may change, you could get infinite loops. 434 * may change, you could get infinite loops.
471 * ie, player is northwest, but monster can only 435 * ie, player is northwest, but monster can only
472 * move west, so it does that. It goes some distance, 436 * move west, so it does that. It goes some distance,
… …
474 * can't do that, but now finds it can move east, and 438 * can't do that, but now finds it can move east, and
475 * gets back to its original point. lastdir contains 439 * gets back to its original point. lastdir contains
476 * the last direction the creature has successfully 440 * the last direction the creature has successfully
477 * moved. 441 * moved.
478 */ 442 */
479
480 x = lastx + freearr_x[absdir (lastdir + i)];
481 y = lasty + freearr_y[absdir (lastdir + i)];
482 m = lastmap; 443 pos = lastpos;
483 mflags = get_map_flags (m, &m, x, y, &x, &y); 444 pos.move (absdir (lastdir + i));
484 if (mflags & P_OUT_OF_MAP) 445
446 if (!pos.normalise ())
485 continue; 447 continue;
486 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 448
487 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 449 mapspace &ms = *pos;
450
451 if (ms.flags () & P_BLOCKSVIEW)
488 continue; 452 continue;
489 if (mflags & P_BLOCKSVIEW) 453
454 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
490 continue; 455 continue;
491 456
492 if (m == mon->map && blocked_link (mon, m, x, y)) 457 if (blocked_link (mon, pos.m, pos.x, pos.y))
493 break; 458 break;
494 } 459 }
460
495 /* go through entire loop without finding a valid 461 /* go through entire loop without finding a valid
496 * sidestep to take - thus, no valid path. 462 * sidestep to take - thus, no valid path.
497 */ 463 */
498 if (i == (DETOUR_AMOUNT + 1)) 464 if (i == DETOUR_AMOUNT + 1)
499 return 0; 465 return 0;
466
500 diff--; 467 diff--;
501 lastdir = dir; 468 lastdir = dir;
502 max--; 469 max--;
503 if (!firstdir) 470 if (!firstdir)
504 firstdir = dir + i; 471 firstdir = dir + i;
… …
508 { 475 {
509 /* we moved towards creature, so diff is less */ 476 /* we moved towards creature, so diff is less */
510 diff--; 477 diff--;
511 max--; 478 max--;
512 lastdir = dir; 479 lastdir = dir;
480
513 if (!firstdir) 481 if (!firstdir)
514 firstdir = dir; 482 firstdir = dir;
515 } 483 }
516 484
517 if (diff <= 1) 485 if (diff <= 1)
518 { 486 {
519 /* Recalculate diff (distance) because we may not have actually 487 /* Recalculate diff (distance) because we may not have actually
520 * headed toward player for entire distance. 488 * headed toward player for entire distance.
521 */ 489 */
522 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 490 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
523 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 491 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
524 } 492 }
525 493
526 if (diff > max) 494 if (diff > max)
527 return 0; 495 return 0;
… …
545 next = op->below; 513 next = op->below;
546 514
547 /* Forces get applied per default, unless they have the 515 /* Forces get applied per default, unless they have the
548 * flag "neutral" set. Sorry but I can't think of a better way 516 * flag "neutral" set. Sorry but I can't think of a better way
549 */ 517 */
550 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 518 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
551 SET_FLAG (op, FLAG_APPLIED); 519 op->set_flag (FLAG_APPLIED);
552 520
553 /* we never give weapons/armour if these cannot be used 521 /* we never give weapons/armour if these cannot be used
554 * by this player due to race restrictions 522 * by this player due to race restrictions
555 */ 523 */
556 if (pl->type == PLAYER) 524 if (pl->type == PLAYER)
557 { 525 {
558 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 526 if ((!pl->flag [FLAG_USE_ARMOUR]
559 && 527 &&
560 (op->type == ARMOUR || op->type == BOOTS 528 (op->type == ARMOUR || op->type == BOOTS
561 || op->type == CLOAK || op->type == HELMET 529 || op->type == CLOAK || op->type == HELMET
562 || op->type == SHIELD || op->type == GLOVES 530 || op->type == SHIELD || op->type == GLOVES
563 || op->type == BRACERS || op->type == GIRDLE)) 531 || op->type == BRACERS || op->type == GIRDLE))
564 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 532 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
565 { 533 {
566 op->destroy (); 534 op->destroy ();
567 continue; 535 continue;
568 } 536 }
569 } 537 }
… …
586 if (op->nrof > 1) 554 if (op->nrof > 1)
587 op->nrof = 1; 555 op->nrof = 1;
588 } 556 }
589 557
590 if (op->type == SPELLBOOK && op->inv) 558 if (op->type == SPELLBOOK && op->inv)
591 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 559 op->inv->clr_flag (FLAG_STARTEQUIP);
592 560
593 /* Give starting characters identified, uncursed, and undamned 561 /* Give starting characters identified, uncursed, and undamned
594 * items. Just don't identify gold or silver, or it won't be 562 * items. Just don't identify gold or silver, or it won't be
595 * merged properly. 563 * merged properly.
596 */ 564 */
597 if (need_identify (op)) 565 if (op->need_identify ())
598 { 566 {
599 SET_FLAG (op, FLAG_IDENTIFIED); 567 op->set_flag (FLAG_IDENTIFIED);
600 CLEAR_FLAG (op, FLAG_CURSED); 568 op->clr_flag (FLAG_CURSED);
601 CLEAR_FLAG (op, FLAG_DAMNED); 569 op->clr_flag (FLAG_DAMNED);
602 } 570 }
603 571
604 if (op->type == SPELL) 572 if (op->type == SPELL)
605 { 573 {
606 op->destroy (); 574 op->destroy ();
607 continue; 575 continue;
608 } 576 }
609 else if (op->type == SKILL) 577 else if (op->type == SKILL)
610 { 578 {
611 SET_FLAG (op, FLAG_CAN_USE_SKILL); 579 op->set_flag (FLAG_CAN_USE_SKILL);
612 op->stats.exp = 0; 580 op->stats.exp = 0;
613 op->level = 1; 581 op->level = 1;
614 } 582 }
615 else /* lock all 'normal items by default */ 583 else /* lock all 'normal items by default */
616 SET_FLAG (op, FLAG_INV_LOCKED); 584 op->set_flag (FLAG_INV_LOCKED);
617 } /* for loop of objects in player inv */ 585 } /* for loop of objects in player inv */
618 586
619 /* Need to set up the skill pointers */ 587 /* Need to set up the skill pointers */
620 pl->contr->link_skills (); 588 pl->contr->link_skills ();
621} 589}
… …
640roll_stat () 608roll_stat ()
641{ 609{
642 int a[4], i, j, k; 610 int a[4], i, j, k;
643 611
644 for (i = 0; i < 4; i++) 612 for (i = 0; i < 4; i++)
645 a[i] = (int) rndm (6) + 1; 613 a[i] = rndm (1, 6);
646 614
647 for (i = 0, j = 0, k = 7; i < 4; i++) 615 for (i = 0, j = 0, k = 7; i < 4; i++)
648 if (a[i] < k) 616 if (a[i] < k)
649 k = a[i], j = i; 617 k = a[i], j = i;
650 618
… …
747 treasurelist *tl = treasurelist::find (shstr_starting_wealth); 715 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
748 if (tl) 716 if (tl)
749 create_treasure (tl, ob, 0, 0, 0); 717 create_treasure (tl, ob, 0, 0, 0);
750 718
751 INVOKE_PLAYER (BIRTH, ob->contr); 719 INVOKE_PLAYER (BIRTH, ob->contr);
752 INVOKE_PLAYER (LOGIN, ob->contr);
753 720
754 ob->contr->ns->state = ST_PLAYING; 721 ob->contr->ns->state = ST_PLAYING;
755 722
756 if (ob->msg) 723 if (ob->msg)
757 ob->msg = 0; 724 ob->msg = 0;
758 725
759 start_info (ob); 726 start_info (ob);
760 CLEAR_FLAG (ob, FLAG_WIZ); 727 ob->clr_flag (FLAG_WIZ);
761 give_initial_items (ob, ob->randomitems); 728 give_initial_items (ob, ob->randomitems);
762 esrv_send_inventory (ob, ob); 729 esrv_send_inventory (ob, ob);
763 ob->update_stats (); 730 ob->update_stats ();
764 731
765 /* This moves the player to a different start map, if there 732 /* This moves the player to a different start map, if there
… …
814 rv_vector rv; 781 rv_vector rv;
815 782
816 if (op->stats.hp < 0) 783 if (op->stats.hp < 0)
817 { 784 {
818 LOG (llevDebug, "Fleeing player is dead.\n"); 785 LOG (llevDebug, "Fleeing player is dead.\n");
819 CLEAR_FLAG (op, FLAG_SCARED); 786 op->clr_flag (FLAG_SCARED);
820 return; 787 return;
821 } 788 }
822 789
823 if (!op->enemy) 790 if (!op->enemy)
824 { 791 {
825 LOG (llevDebug, "Fleeing player had no enemy.\n"); 792 LOG (llevDebug, "Fleeing player had no enemy.\n");
826 CLEAR_FLAG (op, FLAG_SCARED); 793 op->clr_flag (FLAG_SCARED);
827 return; 794 return;
828 } 795 }
829 796
830 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 797 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
831 { 798 {
832 op->enemy = NULL; 799 op->enemy = NULL;
833 CLEAR_FLAG (op, FLAG_SCARED); 800 op->clr_flag (FLAG_SCARED);
834 return; 801 return;
835 } 802 }
836 803
837 get_rangevector (op, op->enemy, &rv, 0); 804 get_rangevector (op, op->enemy, &rv, 0);
838 805
… …
844 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m)))) 811 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
845 return; 812 return;
846 } 813 }
847 814
848 /* Cornered, get rid of scared */ 815 /* Cornered, get rid of scared */
849 CLEAR_FLAG (op, FLAG_SCARED); 816 op->clr_flag (FLAG_SCARED);
850 op->enemy = NULL; 817 op->enemy = NULL;
851} 818}
852 819
853/* check_pick sees if there is stuff to be picked up/picks up stuff. 820/* check_pick sees if there is stuff to be picked up/picks up stuff.
854 * It returns 1 if the player should keep on moving, 0 if he should 821 * It returns 1 if the player should keep on moving, 0 if he should
… …
946 * fighting */ 913 * fighting */
947 if (op->contr->mode & PU_INHIBIT) 914 if (op->contr->mode & PU_INHIBIT)
948 return 1; 915 return 1;
949 916
950 /* prevent us from turning into auto-thieves :) */ 917 /* prevent us from turning into auto-thieves :) */
951 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 918 if (tmp->flag [FLAG_UNPAID])
952 continue; 919 continue;
953 920
954 /* ignore known cursed objects */ 921 /* ignore known cursed objects */
955 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 922 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
956 continue; 923 continue;
957 924
958 /* all food and drink if desired */ 925 /* all food and drink if desired */
959 /* question: don't pick up known-poisonous stuff? */ 926 /* question: don't pick up known-poisonous stuff? */
960 if (op->contr->mode & PU_FOOD) 927 if (op->contr->mode & PU_FOOD)
… …
963 CHK_PICK_PICKUP; 930 CHK_PICK_PICKUP;
964 continue; 931 continue;
965 } 932 }
966 933
967 if (op->contr->mode & PU_DRINK) 934 if (op->contr->mode & PU_DRINK)
968 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 935 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
969 { 936 {
970 CHK_PICK_PICKUP; 937 CHK_PICK_PICKUP;
971 continue; 938 continue;
972 } 939 }
973 940
… …
1011 continue; 978 continue;
1012 } 979 }
1013 980
1014 /* pick up all magical items */ 981 /* pick up all magical items */
1015 if (op->contr->mode & PU_MAGICAL) 982 if (op->contr->mode & PU_MAGICAL)
1016 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 983 if (tmp->flag [FLAG_KNOWN_MAGICAL]
1017 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 984 && !tmp->flag [FLAG_KNOWN_CURSED])
1018 { 985 {
1019 CHK_PICK_PICKUP; 986 CHK_PICK_PICKUP;
1020 continue; 987 continue;
1021 } 988 }
1022 989
… …
1106 continue; 1073 continue;
1107 } 1074 }
1108 1075
1109 /* hoping to catch throwing daggers here */ 1076 /* hoping to catch throwing daggers here */
1110 if (op->contr->mode & PU_MISSILEWEAPON) 1077 if (op->contr->mode & PU_MISSILEWEAPON)
1111 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1078 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1112 { 1079 {
1113 CHK_PICK_PICKUP; 1080 CHK_PICK_PICKUP;
1114 continue; 1081 continue;
1115 } 1082 }
1116 1083
… …
1171 * return 0. 1138 * return 0.
1172 */ 1139 */
1173static int 1140static int
1174action_makes_visible (object *op) 1141action_makes_visible (object *op)
1175{ 1142{
1176 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1143 if (op->invisible && op->flag [FLAG_ALIVE])
1177 { 1144 {
1178 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1145 if (op->flag [FLAG_MAKE_INVIS])
1179 { 1146 {
1180 // artefact invisibility is permanent, but we still make noise 1147 // artefact invisibility is permanent, but we still make noise
1181 // this is important for game-balance. 1148 // this is important for game-balance.
1182 if (op->contr) 1149 if (op->contr)
1183 op->make_noise (); 1150 op->make_noise ();
… …
1210 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1177 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1211 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1178 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1212 return splay (tmp); 1179 return splay (tmp);
1213 1180
1214 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1181 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1215 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1182 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1216 if (object *arrow = find_arrow (tmp, type)) 1183 if (object *arrow = find_arrow (tmp, type))
1217 { 1184 {
1218 splay (tmp); 1185 splay (tmp);
1219 return arrow; 1186 return arrow;
1220 } 1187 }
… …
1237 if (!type) 1204 if (!type)
1238 return NULL; 1205 return NULL;
1239 1206
1240 for (arrow = op->inv; arrow; arrow = arrow->below) 1207 for (arrow = op->inv; arrow; arrow = arrow->below)
1241 { 1208 {
1242 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1209 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1243 { 1210 {
1244 i = 0; 1211 i = 0;
1245 ntmp = find_better_arrow (arrow, target, type, &i); 1212 ntmp = find_better_arrow (arrow, target, type, &i);
1246 1213
1247 if (i > betterby) 1214 if (i > betterby)
… …
1348 break; 1315 break;
1349 } 1316 }
1350 1317
1351 if (mflags & P_IS_ALIVE) 1318 if (mflags & P_IS_ALIVE)
1352 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1319 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1353 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1320 if (tmp->flag [FLAG_ALIVE])
1354 break; 1321 break;
1355 } 1322 }
1356 1323
1357 if (!tmp) 1324 if (!tmp)
1358 return find_arrow (op, type); 1325 return find_arrow (op, type);
… …
1419 { 1386 {
1420 if (op->type == PLAYER) 1387 if (op->type == PLAYER)
1421 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1388 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1422 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1389 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1423 else 1390 else
1424 CLEAR_FLAG (op, FLAG_READY_BOW); 1391 op->clr_flag (FLAG_READY_BOW);
1425 1392
1426 return 0; 1393 return 0;
1427 } 1394 }
1428 } 1395 }
1429 1396
… …
1478#endif 1445#endif
1479 1446
1480 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1481 1448
1482 /* update the speed */ 1449 /* update the speed */
1483 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1484 + bow->stats.dam / 7.f;
1485 1450
1486 arrow->set_speed (max (arrow->speed, 2.f));
1487 arrow->speed_left = 0; 1451 arrow->speed_left = 0;
1452 arrow->set_speed (max (2.f,
1453 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1454 + bow->stats.dam / 7.f
1455 ));
1488 1456
1489 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1457 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1490 1458
1491 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1492 { 1460 {
… …
1585 { 1553 {
1586 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1554 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1587 return; 1555 return;
1588 } 1556 }
1589 1557
1590 if (!op->change_weapon (item)) 1558 if (!op->apply (item))
1591 return; 1559 return;
1592 1560
1593 if (item->type == WAND) 1561 if (item->type == WAND)
1594 { 1562 {
1595 if (item->stats.food <= 0) 1563 if (item->stats.food <= 0)
… …
1629 { 1597 {
1630 object *tmp; 1598 object *tmp;
1631 1599
1632 if (item->arch) 1600 if (item->arch)
1633 { 1601 {
1634 CLEAR_FLAG (item, FLAG_ANIMATE); 1602 item->clr_flag (FLAG_ANIMATE);
1635 item->face = item->arch->face; 1603 item->face = item->arch->face;
1636 item->set_speed (0); 1604 item->set_speed (0);
1637 } 1605 }
1638 1606
1639 if (object *pl = item->visible_to ()) 1607 if (object *pl = item->visible_to ())
… …
1646} 1614}
1647 1615
1648/* Received a fire command for the player - go and do it. 1616/* Received a fire command for the player - go and do it.
1649 */ 1617 */
1650bool 1618bool
1651fire (object *op, int dir) 1619fire (object *who, int dir)
1652{ 1620{
1653 int spellcost = 0; 1621 int spellcost = 0;
1654 1622
1655 player *pl = op->contr; 1623 player *pl = who->contr;
1656 1624
1657 if (pl->golem) 1625 if (pl->golem)
1658 { 1626 {
1659 control_golem (op->contr->golem, dir); 1627 control_golem (who->contr->golem, dir);
1660 return false; 1628 return false;
1661 } 1629 }
1662 1630
1663 object *ob = pl->ranged_ob; 1631 object *ob = pl->ranged_ob;
1664 1632
1665 if (!ob) 1633 if (!ob)
1666 return false; 1634 return false;
1667 1635
1668 if (op->speed_left > 0.f) 1636 if (who->speed_left > 0.f)
1669 --op->speed_left; 1637 --who->speed_left;
1670 else 1638 else
1671 return false; 1639 return false;
1672 1640
1673 if (!op->change_weapon (ob)) 1641 if (!who->apply (ob))
1674 return false; 1642 return false;
1675 1643
1676 /* check for loss of invisiblity/hide */ 1644 /* check for loss of invisiblity/hide */
1677 if (action_makes_visible (op)) 1645 if (action_makes_visible (who))
1678 make_visible (op); 1646 make_visible (who);
1679 1647
1680 switch (ob->type) 1648 switch (ob->type)
1681 { 1649 {
1682 case BOW: 1650 case BOW:
1683 player_fire_bow (op, dir); 1651 player_fire_bow (who, dir);
1684 break; 1652 break;
1685 1653
1686 case SPELL: 1654 case SPELL:
1687 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1655 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1688 break; 1656 break;
1689 1657
1690 case BUILDER: 1658 case BUILDER:
1691 apply_map_builder (op, dir); 1659 apply_map_builder (who, dir);
1692 break; 1660 break;
1693 1661
1694 case SKILL: 1662 case SKILL:
1695 do_skill (op, op, ob, dir, 0); 1663 do_skill (who, who, ob, dir, 0);
1696 break; 1664 break;
1697 1665
1698 case SKILL_TOOL: 1666 case RANGED:
1699 // change_weapon ensures that chosen_skill is uptodate
1700 do_skill (op, op, op->chosen_skill, dir, 0); 1667 do_skill (who, ob, who->chosen_skill, dir, 0);
1701 break; 1668 break;
1702 1669
1703 default: 1670 default:
1704 fire_misc_object (op, dir); 1671 fire_misc_object (who, dir);
1705 break; 1672 break;
1706 } 1673 }
1707 1674
1708 return true; 1675 return true;
1709} 1676}
… …
1768 * 1735 *
1769 * Change the color so that the message doesn't disappear with 1736 * Change the color so that the message doesn't disappear with
1770 * all the others. 1737 * all the others.
1771 */ 1738 */
1772 if (pl->contr->usekeys == key_inventory 1739 if (pl->contr->usekeys == key_inventory
1773 || !QUERY_FLAG (container, FLAG_APPLIED) 1740 || !container->flag [FLAG_APPLIED]
1774 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1741 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1775 { 1742 {
1776 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1743 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1777 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1744 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1778 return NULL; 1745 return NULL;
… …
1929 */ 1896 */
1930 if (op->type == PLAYER 1897 if (op->type == PLAYER
1931 && ((mon->owner && mon->owner->contr 1898 && ((mon->owner && mon->owner->contr
1932 && same_party (mon->owner->contr->party, op->contr->party)) 1899 && same_party (mon->owner->contr->party, op->contr->party))
1933 || mon->owner == op) 1900 || mon->owner == op)
1934 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1901 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1935 { 1902 {
1936 /* If we're braced, we don't want to switch places with it */ 1903 /* If we're braced, we don't want to switch places with it */
1937 if (op->contr->braced) 1904 if (op->contr->braced)
1938 return false; 1905 return false;
1939 1906
… …
1959 * creatures. Note that if you are braced, you can't push 1926 * creatures. Note that if you are braced, you can't push
1960 * someone, but put it inside this loop so that you won't 1927 * someone, but put it inside this loop so that you won't
1961 * attack them either. 1928 * attack them either.
1962 */ 1929 */
1963 if ((mon->type == PLAYER || mon->enemy != op) 1930 if ((mon->type == PLAYER || mon->enemy != op)
1964 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1931 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1965 && ((op->contr->peaceful 1932 && ((op->contr->peaceful
1966 || (mon->type == PLAYER && mon->contr->peaceful)) 1933 || (mon->type == PLAYER && mon->contr->peaceful))
1967 && !on_battleground)) 1934 && !on_battleground))
1968 { 1935 {
1969 if (op->speed_left > 0.f) 1936 if (op->speed_left > 0.f)
… …
1985 } 1952 }
1986 } 1953 }
1987 /* If the object is a boulder or other rollable object, then 1954 /* If the object is a boulder or other rollable object, then
1988 * roll it if not braced. You can't roll it if you are braced. 1955 * roll it if not braced. You can't roll it if you are braced.
1989 */ 1956 */
1990 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1957 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1991 { 1958 {
1992 if (op->speed_left > 0.f) 1959 if (op->speed_left > 0.f)
1993 { 1960 {
1994 --op->speed_left; 1961 --op->speed_left;
1995 1962
… …
2004 * Way it works is like this: First, it must have some hit points 1971 * Way it works is like this: First, it must have some hit points
2005 * and be living. Then, it must be one of the following: 1972 * and be living. Then, it must be one of the following:
2006 * 1) Not a player, 2) A player, but of a different party. Note 1973 * 1) Not a player, 2) A player, but of a different party. Note
2007 * that party_number -1 is no party, so attacks can still happen. 1974 * that party_number -1 is no party, so attacks can still happen.
2008 */ 1975 */
2009 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1976 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2010 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1977 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2011 { 1978 {
2012 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 1979 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2013 { 1980 {
2014 --op->contr->weapon_sp_left; 1981 --op->contr->weapon_sp_left;
… …
2030{ 1997{
2031 if (!op->map || op->map->in_memory != MAP_ACTIVE) 1998 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2032 return 0; 1999 return 0;
2033 2000
2034 /* Sanity check: make sure dir is valid */ 2001 /* Sanity check: make sure dir is valid */
2035 if (dir < 0 || dir >= 9) 2002 if (dir < 0 || dir > 8)
2036 { 2003 {
2037 LOG (llevError, "move_player: invalid direction %d\n", dir); 2004 LOG (llevError, "move_player: invalid direction %d\n", dir);
2038 return 0; 2005 return 0;
2039 } 2006 }
2040 2007
2041 /* peterm: added following line */ 2008 /* peterm: added following line */
2042 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2009 if (op->flag [FLAG_CONFUSED] && dir)
2043 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2010 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2044 2011
2045 op->facing = dir; 2012 op->facing = dir;
2046 2013
2047 if (op->flag [FLAG_HIDDEN]) 2014 if (op->flag [FLAG_HIDDEN])
… …
2087 * players. 2054 * players.
2088 */ 2055 */
2089bool 2056bool
2090handle_newcs_player (object *op) 2057handle_newcs_player (object *op)
2091{ 2058{
2092 if (QUERY_FLAG (op, FLAG_SCARED)) 2059 if (op->flag [FLAG_SCARED])
2093 { 2060 {
2094 if (op->speed_left > 0.f) 2061 if (op->speed_left > 0.f)
2095 { 2062 {
2096 --op->speed_left; 2063 --op->speed_left;
2097 flee_player (op); 2064 flee_player (op);
… …
2116} 2083}
2117 2084
2118static int 2085static int
2119save_life (object *op) 2086save_life (object *op)
2120{ 2087{
2121 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2088 if (!op->flag [FLAG_LIFESAVE])
2122 return 0; 2089 return 0;
2123 2090
2124 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2091 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2125 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2092 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2126 { 2093 {
2127 op->play_sound (sound_find ("ob_evaporate")); 2094 op->play_sound (sound_find ("ob_evaporate"));
2128 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2095 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2129 2096
2130 tmp->destroy (); 2097 tmp->destroy ();
2131 CLEAR_FLAG (op, FLAG_LIFESAVE); 2098 op->clr_flag (FLAG_LIFESAVE);
2132 2099
2133 if (op->stats.hp < 0) 2100 if (op->stats.hp < 0)
2134 op->stats.hp = op->stats.maxhp; 2101 op->stats.hp = op->stats.maxhp;
2135 2102
2136 if (op->stats.food < 0) 2103 if (op->stats.food < 0)
2137 op->stats.food = 999; 2104 op->stats.food = MAX_FOOD;
2138 2105
2139 op->update_stats (); 2106 op->update_stats ();
2140 return 1; 2107 return 1;
2141 } 2108 }
2142 2109
2143 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2110 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2144 CLEAR_FLAG (op, FLAG_LIFESAVE); 2111 op->clr_flag (FLAG_LIFESAVE);
2145 enter_player_savebed (op); /* bring him home. */ 2112 enter_player_savebed (op); /* bring him home. */
2146 return 0; 2113 return 0;
2147} 2114}
2148 2115
2149/* This goes throws the inventory and removes unpaid objects, and puts them 2116/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2156{ 2123{
2157 while (op) 2124 while (op)
2158 { 2125 {
2159 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2126 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2160 2127
2161 if (QUERY_FLAG (op, FLAG_UNPAID)) 2128 if (op->flag [FLAG_UNPAID])
2162 op->insert_at (env); 2129 op->insert_at (env);
2163 else if (op->inv) 2130 else if (op->inv)
2164 drop_unpaid_items (op->inv, env); 2131 drop_unpaid_items (op->inv, env);
2165 2132
2166 op = next; 2133 op = next;
… …
2177void 2144void
2178do_some_living (object *op) 2145do_some_living (object *op)
2179{ 2146{
2180 int last_food = op->stats.food; 2147 int last_food = op->stats.food;
2181 int gen_hp, gen_sp, gen_grace; 2148 int gen_hp, gen_sp, gen_grace;
2182 int over_hp, over_sp, over_grace;
2183 int i; 2149 int i;
2184 int rate_hp = 1200; 2150 int rate_hp = 1200;
2185 int rate_sp = 2500; 2151 int rate_sp = 2500;
2186 int rate_grace = 2000; 2152 int rate_grace = 2000;
2187 const int max_hp = 1; 2153 const int max_hp = 1;
… …
2196 * alternate it here for it to work correctly. 2162 * alternate it here for it to work correctly.
2197 */ 2163 */
2198 if (pticks & 2) 2164 if (pticks & 2)
2199 op->invisible--; 2165 op->invisible--;
2200 } 2166 }
2201 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2167 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2202 { 2168 {
2203 if (!op->invisible--) 2169 if (!op->invisible--)
2204 { 2170 {
2205 make_visible (op); 2171 make_visible (op);
2206 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2172 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2240 if (--op->last_grace < 0) 2206 if (--op->last_grace < 0)
2241 { 2207 {
2242 if (op->stats.grace < op->stats.maxgrace / 2) 2208 if (op->stats.grace < op->stats.maxgrace / 2)
2243 op->stats.grace++; /* no penalty in food for regaining grace */ 2209 op->stats.grace++; /* no penalty in food for regaining grace */
2244 2210
2211 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2212
2245 if (max_grace > 1) 2213 if (max_grace > 1)
2246 { 2214 {
2247 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2215 int over_grace = temp / rate_grace;
2216
2248 if (over_grace > 0) 2217 if (over_grace > 0)
2249 { 2218 {
2250 op->stats.sp += over_grace 2219 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2251 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2252 op->last_grace = 0; 2220 op->last_grace = 0;
2253 } 2221 }
2254 else 2222 else
2255 { 2223 op->last_grace = rate_grace / temp;
2256 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2257 }
2258 } 2224 }
2259 else 2225 else
2260 { 2226 op->last_grace = rate_grace / temp;
2261 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2227
2262 }
2263 /* wearing stuff doesn't detract from grace generation. */ 2228 /* wearing stuff doesn't detract from grace generation. */
2264 } 2229 }
2265 2230
2266 if (op->stats.food > 0) 2231 if (op->stats.food > 0)
2267 { 2232 {
… …
2273 if (op->stats.sp < op->stats.maxsp) 2238 if (op->stats.sp < op->stats.maxsp)
2274 { 2239 {
2275 op->stats.sp++; 2240 op->stats.sp++;
2276 2241
2277 /* dms do not consume food */ 2242 /* dms do not consume food */
2278 if (!QUERY_FLAG (op, FLAG_WIZ)) 2243 if (!op->flag [FLAG_WIZ])
2279 { 2244 {
2280 op->stats.food--; 2245 op->stats.food--;
2281 2246
2282 if (op->contr->digestion < 0) 2247 if (op->contr->digestion < 0)
2283 op->stats.food += op->contr->digestion; 2248 op->stats.food += op->contr->digestion;
… …
2286 } 2251 }
2287 } 2252 }
2288 2253
2289 if (max_sp > 1) 2254 if (max_sp > 1)
2290 { 2255 {
2291 over_sp = (gen_sp + 10) / rate_sp; 2256 int over_sp = (gen_sp + 10) / rate_sp;
2292 if (over_sp > 0) 2257 if (over_sp > 0)
2293 { 2258 {
2294 if (op->stats.sp < op->stats.maxsp) 2259 if (op->stats.sp < op->stats.maxsp)
2295 { 2260 {
2296 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2261 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2317 if (op->stats.hp < op->stats.maxhp) 2282 if (op->stats.hp < op->stats.maxhp)
2318 { 2283 {
2319 op->stats.hp++; 2284 op->stats.hp++;
2320 2285
2321 /* dms do not consume food */ 2286 /* dms do not consume food */
2322 if (!QUERY_FLAG (op, FLAG_WIZ)) 2287 if (!op->flag [FLAG_WIZ])
2323 { 2288 {
2324 op->stats.food--; 2289 op->stats.food--;
2325 2290
2326 if (op->contr->digestion < 0) 2291 if (op->contr->digestion < 0)
2327 op->stats.food += op->contr->digestion; 2292 op->stats.food += op->contr->digestion;
2328 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2293 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2329 op->stats.food = last_food; 2294 op->stats.food = last_food;
2330 } 2295 }
2331 } 2296 }
2332 2297
2298 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2299
2333 if (max_hp > 1) 2300 if (max_hp > 1)
2334 { 2301 {
2335 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2302 int over_hp = temp / rate_hp;
2336 2303
2337 if (over_hp > 0) 2304 if (over_hp > 0)
2338 { 2305 {
2339 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2306 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2340 op->last_heal = 0; 2307 op->last_heal = 0;
2341 } 2308 }
2342 else 2309 else
2343 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2310 op->last_heal = rate_hp / temp;
2344 } 2311 }
2345 else 2312 else
2346 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2313 op->last_heal = rate_hp / temp;
2347 } 2314 }
2348 } 2315 }
2349 2316
2350 /* Digestion */ 2317 /* Digestion */
2351 if (--op->last_eat < 0) 2318 if (--op->last_eat < 0)
… …
2354 penalty = max (0, -op->contr->digestion); 2321 penalty = max (0, -op->contr->digestion);
2355 2322
2356 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2323 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2357 2324
2358 /* dms do not consume food */ 2325 /* dms do not consume food */
2359 if (!QUERY_FLAG (op, FLAG_WIZ)) 2326 if (!op->flag [FLAG_WIZ])
2360 op->stats.food--; 2327 op->stats.food--;
2361 } 2328 }
2362 2329
2363 if (op->stats.food < 0 && op->stats.hp >= 0) 2330 if (op->stats.food < 0 && op->stats.hp >= 0)
2364 { 2331 {
2365 object *flesh = 0; 2332 object *flesh = 0;
2366 2333
2367 for_inv_removable (op, tmp) 2334 for_inv_removable (op, tmp)
2368 { 2335 {
2369 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2336 if (tmp->flag [FLAG_UNPAID])
2370 continue; 2337 continue;
2371 2338
2372 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2339 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2373 { 2340 {
2374 op->statusmsg ("You blindly grab for a bite of food. " 2341 op->statusmsg ("You blindly grab for a bite of food. "
2375 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2342 "H<To prevent you from starving, you ate some random item from your backpack.>");
2376 manual_apply (op, tmp, 0); 2343 op->apply (tmp);
2377 2344
2378 if (op->stats.food >= 0 || op->stats.hp < 0) 2345 if (op->stats.food >= 0 || op->stats.hp < 0)
2379 break; 2346 break;
2380 } 2347 }
2381 else if (tmp->type == FLESH) 2348 else if (tmp->type == FLESH)
… …
2387 */ 2354 */
2388 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2355 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2389 { 2356 {
2390 op->statusmsg ("You blindly grab for a bite of food. " 2357 op->statusmsg ("You blindly grab for a bite of food. "
2391 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2358 "H<To prevent you from starving, you ate some random item from your backpack.>");
2392 manual_apply (op, flesh, 0); 2359 op->apply (flesh);
2393 } 2360 }
2394 2361
2395 // If player is still starving, alert him! 2362 // If player is still starving, alert him!
2396 if (op->stats.food < 0) 2363 if (op->stats.food < 0)
2397 op->failmsg ("You are starving! " 2364 op->failmsg ("You are starving! "
… …
2409 op->contr->killer->destroy (); 2376 op->contr->killer->destroy ();
2410 } 2377 }
2411 } 2378 }
2412 2379
2413 /* killer should be set here already */ 2380 /* killer should be set here already */
2414 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2381 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2415 kill_player (op); 2382 kill_player (op);
2416 } 2383 }
2417} 2384}
2418 2385
2419/* If the player should die (lack of hp, food, etc), we call this. 2386/* If the player should die (lack of hp, food, etc), we call this.
… …
2453 cure_disease (op, 0, 0); /* remove any disease */ 2420 cure_disease (op, 0, 0); /* remove any disease */
2454 2421
2455 max_it (op->stats.hp , op->stats.maxhp); 2422 max_it (op->stats.hp , op->stats.maxhp);
2456 max_it (op->stats.sp , op->stats.maxsp); 2423 max_it (op->stats.sp , op->stats.maxsp);
2457 max_it (op->stats.grace, op->stats.maxgrace); 2424 max_it (op->stats.grace, op->stats.maxgrace);
2458
2459 if (op->stats.food <= 0) 2425 max_it (op->stats.food , 200);
2460 op->stats.food = 999;
2461 2426
2462 // remove all spell effects that are active 2427 // remove all spell effects that are active
2463 // to avoid long-term effects such as word-of-recall 2428 // to avoid long-term effects such as word-of-recall
2464 for (object *item = op->inv; item; ) 2429 for (object *item = op->inv; item; )
2465 { 2430 {
… …
2616 * difference. 2581 * difference.
2617 */ 2582 */
2618 if (this_stat >= -50) 2583 if (this_stat >= -50)
2619 { 2584 {
2620 change_attr_value (&(dep->stats), i, -1); 2585 change_attr_value (&(dep->stats), i, -1);
2621 SET_FLAG (dep, FLAG_APPLIED); 2586 dep->set_flag (FLAG_APPLIED);
2622 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2587 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2623 op->update_stats (); 2588 op->update_stats ();
2624 lost_a_stat = 1; 2589 lost_a_stat = 1;
2625 } 2590 }
2626 } 2591 }
… …
2695 object *force; 2660 object *force;
2696 int at; 2661 int at;
2697 2662
2698 force = get_archetype (FORCE_NAME); 2663 force = get_archetype (FORCE_NAME);
2699 /* 50 ticks should be enough time for the spell to abate */ 2664 /* 50 ticks should be enough time for the spell to abate */
2700 force->speed = 0.1f;
2701 force->speed_left = -5.f; 2665 force->speed_left = -5.f;
2702 SET_FLAG (force, FLAG_APPLIED); 2666 force->set_speed (0.1f);
2667 force->set_flag (FLAG_APPLIED);
2668
2703 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2704 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2705 force->resist[at] = 100; 2671 force->resist[at] = 100;
2706 2672
2707 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
… …
2729 tmp->x = op->x, tmp->y = op->y; 2695 tmp->x = op->x, tmp->y = op->y;
2730 2696
2731 if (tmp->type == CONTAINER) 2697 if (tmp->type == CONTAINER)
2732 loot_object (tmp); /* empty container to ground */ 2698 loot_object (tmp); /* empty container to ground */
2733 2699
2734 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2700 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2735 { 2701 {
2736 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2737 { 2703 {
2738 tmp->decrease (rndm (1, tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2739 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2829} 2795}
2830 2796
2831int 2797int
2832is_true_undead (object *op) 2798is_true_undead (object *op)
2833{ 2799{
2834 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2800 if (op->arch->flag [FLAG_UNDEAD])
2835 return 1; 2801 return 1;
2836 2802
2837 return 0; 2803 return 0;
2838} 2804}
2839 2805
… …
2937 2903
2938 if (who->type == PLAYER) 2904 if (who->type == PLAYER)
2939 player = 1; 2905 player = 1;
2940 2906
2941 else 2907 else
2942 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2908 friendly = who->flag [FLAG_FRIENDLY];
2943 2909
2944 /* search adjacent squares */ 2910 /* search adjacent squares */
2945 for (i = 1; i < 9; i++) 2911 for (i = 1; i < 9; i++)
2946 { 2912 {
2947 x = who->x + freearr_x[i]; 2913 x = who->x + freearr_x[i];
… …
2956 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2922 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2957 continue; 2923 continue;
2958 2924
2959 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2925 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2960 { 2926 {
2961 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2927 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2962 return 1; 2928 return 1;
2963 else if (tmp->type == PLAYER) 2929 else if (tmp->type == PLAYER)
2964 { 2930 {
2965 /*don't let a hidden DM prevent you from hiding */ 2931 /*don't let a hidden DM prevent you from hiding */
2966 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2932 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2967 return 1; 2933 return 1;
2968 } 2934 }
2969 } 2935 }
2970 } 2936 }
2971 return 0; 2937 return 0;
… …
3040 * and the exit-coordinates sp/hp must both be > 0. 3006 * and the exit-coordinates sp/hp must both be > 0.
3041 * => The intention here is to prevent abuse of the battleground- 3007 * => The intention here is to prevent abuse of the battleground-
3042 * feature (like pickable or hidden battleground tiles). */ 3008 * feature (like pickable or hidden battleground tiles). */
3043 for (object *tmp = op->below; tmp; tmp = tmp->below) 3009 for (object *tmp = op->below; tmp; tmp = tmp->below)
3044 { 3010 {
3045 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3011 if (tmp->flag [FLAG_IS_FLOOR])
3046 { 3012 {
3047 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3013 if (tmp->flag [FLAG_NO_PICK]
3048 && tmp->type == BATTLEGROUND 3014 && tmp->type == BATTLEGROUND
3049 && tmp->name == shstr_battleground 3015 && tmp->name == shstr_battleground
3050 && EXIT_X (tmp) && EXIT_Y (tmp)) 3016 && EXIT_X (tmp) && EXIT_Y (tmp))
3051 { 3017 {
3052 /* before we assign the exit, check if this is a teambattle */ 3018 /* before we assign the exit, check if this is a teambattle */
… …
3204 else 3170 else
3205 j = 1; 3171 j = 1;
3206 strcat (buf, spellpathnames[i]); 3172 strcat (buf, spellpathnames[i]);
3207 } 3173 }
3208 } 3174 }
3175
3209 strcat (buf, "."); 3176 strcat (buf, ".");
3210 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3177 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3211 } 3178 }
3212 3179
3213 /* evtl. adding flags: */ 3180 /* evtl. adding flags: */
3214 if (QUERY_FLAG (item, FLAG_XRAYS)) 3181 if (item->flag [FLAG_XRAYS])
3215 SET_FLAG (skin, FLAG_XRAYS); 3182 skin->set_flag (FLAG_XRAYS);
3216 if (QUERY_FLAG (item, FLAG_STEALTH)) 3183 if (item->flag [FLAG_STEALTH])
3217 SET_FLAG (skin, FLAG_STEALTH); 3184 skin->set_flag (FLAG_STEALTH);
3218 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3185 if (item->flag [FLAG_SEE_IN_DARK])
3219 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3186 skin->set_flag (FLAG_SEE_IN_DARK);
3220 3187
3221 /* print message if there is one */ 3188 /* print message if there is one */
3222 if (item->msg != NULL) 3189 if (item->msg != NULL)
3223 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3190 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3224 } 3191 }
… …
3229 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3196 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3230 who->insert (tmp); 3197 who->insert (tmp);
3231 } 3198 }
3232} 3199}
3233 3200
3234/**
3235 * Unready an object for a player. This function does nothing if the object was
3236 * not readied.
3237 */
3238void
3239player_unready_range_ob (player *pl, object *ob)
3240{
3241 if (pl->ob->current_weapon == ob)
3242 pl->ob->change_weapon (0);
3243
3244 if (pl->combat_ob == ob)
3245 pl->combat_ob = 0;
3246
3247 if (pl->ranged_ob == ob)
3248 pl->ranged_ob = 0;
3249}
3250
3251//-GPL 3201//-GPL
3252 3202
3253sint8 3203sint8
3254player::darkness_at (maptile *map, int x, int y) const 3204player::darkness_at (maptile *map, int x, int y) const
3255{ 3205{
… …
3283{ 3233{
3284 play_sound (sound_find ("generic_failure")); 3234 play_sound (sound_find ("generic_failure"));
3285 statusmsg (msg, color); 3235 statusmsg (msg, color);
3286} 3236}
3287 3237
3238void
3239object::failmsgf (const char *format, ...)
3240{
3241 if (!contr)
3242 return;
3243
3244 va_list ap;
3245 va_start (ap, format);
3246 contr->failmsg (vformat (format, ap));
3247 va_end (ap);
3248}
3249
3250void
3251player::failmsgf (const char *format, ...)
3252{
3253 va_list ap;
3254 va_start (ap, format);
3255 failmsg (vformat (format, ap));
3256 va_end (ap);
3257}
3258

Diff Legend

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