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.239 by root, Fri Nov 6 12:27:06 2009 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
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 ()
… …
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 80
81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82
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
87// also changes, rationalises, and fixes some incorrect settings 85// also changes, rationalises, and fixes some incorrect settings
… …
107 ob->race = ob->arch->race; 105 ob->race = ob->arch->race;
108 106
109 ob->update_weight (); 107 ob->update_weight ();
110 link_skills (); 108 link_skills ();
111 109
112 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
113
114 assign (title, ob->arch->object::name); 110 assign (title, ob->arch->object::name);
115 111
116 /* if it's a dragon player, set the correct title here */ 112 /* if it's a dragon player, set the correct title here */
117 if (is_dragon_pl (ob)) 113 if (ob->is_dragon ())
118 { 114 {
119 object *tmp, *abil = 0, *skin = 0; 115 object *tmp, *abil = 0, *skin = 0;
120 116
121 for (tmp = ob->inv; tmp; tmp = tmp->below) 117 for (tmp = ob->inv; tmp; tmp = tmp->below)
122 if (tmp->type == FORCE) 118 if (tmp->type == FORCE)
… …
136 132
137 ns->floorbox_update (); 133 ns->floorbox_update ();
138 esrv_send_inventory (ob, ob); 134 esrv_send_inventory (ob, ob);
139 esrv_add_spells (this, 0); 135 esrv_add_spells (this, 0);
140 136
137 ob->flag [FLAG_READY_WEAPON] = false;
138 ob->flag [FLAG_READY_SKILL] = false;
139 ob->flag [FLAG_READY_RANGE] = false;
140 ob->flag [FLAG_READY_BOW] = false;
141
142 ob->update_stats (); // we unapplied stuff above
141 activate (); 143 activate ();
142 144
143 INVOKE_PLAYER (CONNECT, this); 145 INVOKE_PLAYER (CONNECT, this);
144 INVOKE_PLAYER (LOGIN, this); 146 INVOKE_PLAYER (LOGIN, this);
145} 147}
… …
184 186
185 ob->speed = 1.0f; 187 ob->speed = 1.0f;
186 ob->speed_left = 0.5f; 188 ob->speed_left = 0.5f;
187 189
188 ob->direction = 5; /* So player faces south */ 190 ob->direction = 5; /* So player faces south */
189
190 ob->flag [FLAG_READY_WEAPON] = false;
191 ob->flag [FLAG_READY_SKILL] = false;
192 ob->flag [FLAG_READY_BOW] = false;
193
194 for (object *op = ob->inv; op; op = op->below)
195 if (op->flag [FLAG_APPLIED])
196 switch (op->type)
197 {
198 case SKILL:
199 ob->flag [FLAG_APPLIED] = false;
200 break;
201
202 case WAND:
203 case ROD:
204 case HORN:
205 case BOW:
206 ranged_ob = op;
207 break;
208
209 case WEAPON:
210 combat_ob = op;
211 break;
212 }
213
214 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
215 ob->deactivate (); // change_weapon activates, fix this better
216} 191}
217 192
218void 193void
219player::set_observe (object *op) 194player::set_observe (object *op)
220{ 195{
… …
259 disconnect (); 234 disconnect ();
260 235
261 attachable::do_destroy (); 236 attachable::do_destroy ();
262 237
263 if (ob) 238 if (ob)
264 {
265 ob->destroy_inv (false);
266 ob->destroy (); 239 ob->destroy ();
267 }
268 240
269 ob = observe = viewpoint = 0; 241 ob = observe = viewpoint = 0;
270} 242}
271 243
272player::~player () 244player::~player ()
… …
310player * 282player *
311player::create () 283player::create ()
312{ 284{
313 player *pl = new player; 285 player *pl = new player;
314 286
315 pl->set_object (arch_to_object (get_player_archetype (0))); 287 pl->set_object (get_player_archetype (0)->instance ());
316 288
317 pl->ob->roll_stats (); 289 pl->ob->roll_stats ();
318 pl->ob->stats.wc = 2; 290 pl->ob->stats.wc = 2;
319 pl->ob->run_away = 25; /* Then we panick... */ 291 pl->ob->run_away = 25; /* Then we panick... */
320 292
… …
402 */ 374 */
403int 375int
404path_to_player (object *mon, object *pl, unsigned mindiff) 376path_to_player (object *mon, object *pl, unsigned mindiff)
405{ 377{
406 rv_vector rv; 378 rv_vector rv;
407 sint16 x, y;
408 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 379 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
409 maptile *m, *lastmap;
410 380
411 get_rangevector (mon, pl, &rv, 0); 381 get_rangevector (mon, pl, &rv, 0);
412 382
413 if (rv.distance < mindiff) 383 if (rv.distance < mindiff)
414 return 0; 384 return 0;
415 385
416 x = mon->x; 386 mapxy pos (mon);
417 y = mon->y;
418 m = mon->map;
419 dir = rv.direction; 387 dir = rv.direction;
420 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 388 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
421 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 389 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
422 390
423 /* If we can't solve it within the search distance, return now. */ 391 /* If we can't solve it within the search distance, return now. */
424 if (diff > max) 392 if (diff > max)
425 return 0; 393 return 0;
426 394
427 while (diff > 1 && max > 0) 395 while (diff > 1 && max > 0)
428 { 396 {
429 lastx = x; 397 mapxy lastpos = pos;
430 lasty = y;
431 lastmap = m;
432 x = lastx + freearr_x[dir];
433 y = lasty + freearr_y[dir];
434 398
435 mflags = get_map_flags (m, &m, x, y, &x, &y); 399 pos.move (dir);
436 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
437 400
438 /* Space is blocked - try changing direction a little */ 401 /* Space is blocked - try changing direction a little */
439 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 402 if (!pos.normalise ()
440 && (m == mon->map && blocked_link (mon, m, x, y)))) 403 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
404 && blocked_link (mon, pos.m, pos.x, pos.y)))
441 { 405 {
442 /* recalculate direction from last good location. Possible 406 /* recalculate direction from last good location. Possible
443 * we were not traversing ideal location before. 407 * we were not traversing ideal location before.
444 */ 408 */
445 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 409 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
446 if (rv.direction != dir) 410 if (rv.direction != dir)
447 { 411 {
448 /* OK - says direction should be different - lets reset the 412 /* OK - says direction should be different - lets reset the
449 * the values so it will try again. 413 * the values so it will try again.
450 */ 414 */
451 x = lastx;
452 y = lasty;
453 m = lastmap; 415 pos = lastpos;
454 dir = firstdir = rv.direction; 416 dir = firstdir = rv.direction;
455 } 417 }
456 else 418 else
457 { 419 {
458 /* direct path is blocked - try taking a side step to 420 /* direct path is blocked - try taking a side step to
… …
465 */ 427 */
466 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 428 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
467 { 429 {
468 if (i == 0) 430 if (i == 0)
469 continue; /* already did this, so skip it */ 431 continue; /* already did this, so skip it */
432
470 /* Use lastdir here - otherwise, 433 /* Use lastdir here - otherwise,
471 * since the direction that the creature should move in 434 * since the direction that the creature should move in
472 * may change, you could get infinite loops. 435 * may change, you could get infinite loops.
473 * ie, player is northwest, but monster can only 436 * ie, player is northwest, but monster can only
474 * move west, so it does that. It goes some distance, 437 * move west, so it does that. It goes some distance,
… …
476 * can't do that, but now finds it can move east, and 439 * can't do that, but now finds it can move east, and
477 * gets back to its original point. lastdir contains 440 * gets back to its original point. lastdir contains
478 * the last direction the creature has successfully 441 * the last direction the creature has successfully
479 * moved. 442 * moved.
480 */ 443 */
481
482 x = lastx + freearr_x[absdir (lastdir + i)];
483 y = lasty + freearr_y[absdir (lastdir + i)];
484 m = lastmap; 444 pos = lastpos;
485 mflags = get_map_flags (m, &m, x, y, &x, &y); 445 pos.move (absdir (lastdir + i));
486 if (mflags & P_OUT_OF_MAP) 446
447 if (!pos.normalise ())
487 continue; 448 continue;
488 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 449
489 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 450 mapspace &ms = *pos;
451
452 if (ms.flags () & P_BLOCKSVIEW)
490 continue; 453 continue;
491 if (mflags & P_BLOCKSVIEW) 454
455 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
492 continue; 456 continue;
493 457
494 if (m == mon->map && blocked_link (mon, m, x, y)) 458 if (blocked_link (mon, pos.m, pos.x, pos.y))
495 break; 459 break;
496 } 460 }
461
497 /* go through entire loop without finding a valid 462 /* go through entire loop without finding a valid
498 * sidestep to take - thus, no valid path. 463 * sidestep to take - thus, no valid path.
499 */ 464 */
500 if (i == (DETOUR_AMOUNT + 1)) 465 if (i == DETOUR_AMOUNT + 1)
501 return 0; 466 return 0;
467
502 diff--; 468 diff--;
503 lastdir = dir; 469 lastdir = dir;
504 max--; 470 max--;
505 if (!firstdir) 471 if (!firstdir)
506 firstdir = dir + i; 472 firstdir = dir + i;
… …
510 { 476 {
511 /* we moved towards creature, so diff is less */ 477 /* we moved towards creature, so diff is less */
512 diff--; 478 diff--;
513 max--; 479 max--;
514 lastdir = dir; 480 lastdir = dir;
481
515 if (!firstdir) 482 if (!firstdir)
516 firstdir = dir; 483 firstdir = dir;
517 } 484 }
518 485
519 if (diff <= 1) 486 if (diff <= 1)
520 { 487 {
521 /* Recalculate diff (distance) because we may not have actually 488 /* Recalculate diff (distance) because we may not have actually
522 * headed toward player for entire distance. 489 * headed toward player for entire distance.
523 */ 490 */
524 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 491 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
525 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 492 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
526 } 493 }
527 494
528 if (diff > max) 495 if (diff > max)
529 return 0; 496 return 0;
… …
547 next = op->below; 514 next = op->below;
548 515
549 /* Forces get applied per default, unless they have the 516 /* Forces get applied per default, unless they have the
550 * flag "neutral" set. Sorry but I can't think of a better way 517 * flag "neutral" set. Sorry but I can't think of a better way
551 */ 518 */
552 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 519 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
553 SET_FLAG (op, FLAG_APPLIED); 520 op->set_flag (FLAG_APPLIED);
554 521
555 /* we never give weapons/armour if these cannot be used 522 /* we never give weapons/armour if these cannot be used
556 * by this player due to race restrictions 523 * by this player due to race restrictions
557 */ 524 */
558 if (pl->type == PLAYER) 525 if (pl->type == PLAYER)
559 { 526 {
560 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 527 if ((!pl->flag [FLAG_USE_ARMOUR]
561 && 528 &&
562 (op->type == ARMOUR || op->type == BOOTS 529 (op->type == ARMOUR || op->type == BOOTS
563 || op->type == CLOAK || op->type == HELMET 530 || op->type == CLOAK || op->type == HELMET
564 || op->type == SHIELD || op->type == GLOVES 531 || op->type == SHIELD || op->type == GLOVES
565 || op->type == BRACERS || op->type == GIRDLE)) 532 || op->type == BRACERS || op->type == GIRDLE))
566 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 533 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
567 { 534 {
568 op->destroy (); 535 op->destroy ();
569 continue; 536 continue;
570 } 537 }
571 } 538 }
… …
588 if (op->nrof > 1) 555 if (op->nrof > 1)
589 op->nrof = 1; 556 op->nrof = 1;
590 } 557 }
591 558
592 if (op->type == SPELLBOOK && op->inv) 559 if (op->type == SPELLBOOK && op->inv)
593 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 560 op->inv->clr_flag (FLAG_STARTEQUIP);
594 561
595 /* Give starting characters identified, uncursed, and undamned 562 /* Give starting characters identified, uncursed, and undamned
596 * items. Just don't identify gold or silver, or it won't be 563 * items. Just don't identify gold or silver, or it won't be
597 * merged properly. 564 * merged properly.
598 */ 565 */
599 if (need_identify (op)) 566 if (op->need_identify ())
600 { 567 {
601 SET_FLAG (op, FLAG_IDENTIFIED); 568 op->set_flag (FLAG_IDENTIFIED);
602 CLEAR_FLAG (op, FLAG_CURSED); 569 op->clr_flag (FLAG_CURSED);
603 CLEAR_FLAG (op, FLAG_DAMNED); 570 op->clr_flag (FLAG_DAMNED);
604 } 571 }
605 572
606 if (op->type == SPELL) 573 if (op->type == SPELL)
607 { 574 {
608 op->destroy (); 575 op->destroy ();
609 continue; 576 continue;
610 } 577 }
611 else if (op->type == SKILL) 578 else if (op->type == SKILL)
612 { 579 {
613 SET_FLAG (op, FLAG_CAN_USE_SKILL); 580 op->set_flag (FLAG_CAN_USE_SKILL);
614 op->stats.exp = 0; 581 op->stats.exp = 0;
615 op->level = 1; 582 op->level = 1;
616 } 583 }
617 else /* lock all 'normal items by default */ 584 else /* lock all 'normal items by default */
618 SET_FLAG (op, FLAG_INV_LOCKED); 585 op->set_flag (FLAG_INV_LOCKED);
619 } /* for loop of objects in player inv */ 586 } /* for loop of objects in player inv */
620 587
621 /* Need to set up the skill pointers */ 588 /* Need to set up the skill pointers */
622 pl->contr->link_skills (); 589 pl->contr->link_skills ();
623} 590}
… …
637 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 604 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
638} 605}
639 606
640/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 607/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
641static int 608static int
642roll_stat (void) 609roll_stat ()
643{ 610{
644 int a[4], i, j, k; 611 int a[4], i, j, k;
645 612
646 for (i = 0; i < 4; i++) 613 for (i = 0; i < 4; i++)
647 a[i] = (int) rndm (6) + 1; 614 a[i] = (int) rndm (6) + 1;
… …
744player::chargen_race_done () 711player::chargen_race_done ()
745{ 712{
746 /* this must before then initial items are given */ 713 /* this must before then initial items are given */
747 esrv_new_player (ob->contr); 714 esrv_new_player (ob->contr);
748 715
749 treasurelist *tl = treasurelist::find ("starting_wealth"); 716 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
750 if (tl) 717 if (tl)
751 create_treasure (tl, ob, 0, 0, 0); 718 create_treasure (tl, ob, 0, 0, 0);
752 719
753 INVOKE_PLAYER (BIRTH, ob->contr); 720 INVOKE_PLAYER (BIRTH, ob->contr);
754 INVOKE_PLAYER (LOGIN, ob->contr); 721 INVOKE_PLAYER (LOGIN, ob->contr);
… …
757 724
758 if (ob->msg) 725 if (ob->msg)
759 ob->msg = 0; 726 ob->msg = 0;
760 727
761 start_info (ob); 728 start_info (ob);
762 CLEAR_FLAG (ob, FLAG_WIZ); 729 ob->clr_flag (FLAG_WIZ);
763 give_initial_items (ob, ob->randomitems); 730 give_initial_items (ob, ob->randomitems);
764 esrv_send_inventory (ob, ob); 731 esrv_send_inventory (ob, ob);
765 ob->update_stats (); 732 ob->update_stats ();
766 733
767 /* This moves the player to a different start map, if there 734 /* This moves the player to a different start map, if there
… …
807 ob->stats.hp = ob->stats.maxhp; 774 ob->stats.hp = ob->stats.maxhp;
808 ob->stats.sp = ob->stats.maxsp; 775 ob->stats.sp = ob->stats.maxsp;
809 ob->stats.grace = 0; 776 ob->stats.grace = 0;
810} 777}
811 778
812void 779static void
813flee_player (object *op) 780flee_player (object *op)
814{ 781{
815 int dir, diff; 782 int dir, diff;
816 rv_vector rv; 783 rv_vector rv;
817 784
818 if (op->stats.hp < 0) 785 if (op->stats.hp < 0)
819 { 786 {
820 LOG (llevDebug, "Fleeing player is dead.\n"); 787 LOG (llevDebug, "Fleeing player is dead.\n");
821 CLEAR_FLAG (op, FLAG_SCARED); 788 op->clr_flag (FLAG_SCARED);
822 return; 789 return;
823 } 790 }
824 791
825 if (!op->enemy) 792 if (!op->enemy)
826 { 793 {
827 LOG (llevDebug, "Fleeing player had no enemy.\n"); 794 LOG (llevDebug, "Fleeing player had no enemy.\n");
828 CLEAR_FLAG (op, FLAG_SCARED); 795 op->clr_flag (FLAG_SCARED);
829 return; 796 return;
830 } 797 }
831 798
832 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 799 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
833 { 800 {
834 op->enemy = NULL; 801 op->enemy = NULL;
835 CLEAR_FLAG (op, FLAG_SCARED); 802 op->clr_flag (FLAG_SCARED);
836 return; 803 return;
837 } 804 }
838 805
839 get_rangevector (op, op->enemy, &rv, 0); 806 get_rangevector (op, op->enemy, &rv, 0);
840 807
841 dir = absdir (4 + rv.direction); 808 dir = absdir (4 + rv.direction);
842 for (diff = 0; diff < 3; diff++) 809 for (diff = 0; diff < 3; diff++)
843 { 810 {
844 int m = 1 - rndm (2) * 2; 811 int m = 1 - rndm (2) * 2;
845 812
846 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 813 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
847 return; 814 return;
848 } 815 }
849 816
850 /* Cornered, get rid of scared */ 817 /* Cornered, get rid of scared */
851 CLEAR_FLAG (op, FLAG_SCARED); 818 op->clr_flag (FLAG_SCARED);
852 op->enemy = NULL; 819 op->enemy = NULL;
853} 820}
854 821
855/* check_pick sees if there is stuff to be picked up/picks up stuff. 822/* check_pick sees if there is stuff to be picked up/picks up stuff.
856 * It returns 1 if the player should keep on moving, 0 if he should 823 * It returns 1 if the player should keep on moving, 0 if he should
… …
861{ 828{
862 object *tmp, *next; 829 object *tmp, *next;
863 int stop = 0; 830 int stop = 0;
864 int wvratio; 831 int wvratio;
865 832
866 /* if you're flying, you cna't pick up anything */ 833 /* if you're flying, you can't pick up anything */
867 if (op->move_type & MOVE_FLYING) 834 if (op->move_type & MOVE_FLYING)
868 return 1; 835 return 1;
869 836
870 next = op->below; 837 next = op->below;
871 838
872 int cnt = MAX_ITEM_PER_DROP; 839 int cnt = MAX_ITEM_PER_ACTION;
873#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 840#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
874 841
875 /* loop while there are items on the floor that are not marked as 842 /* loop while there are items on the floor that are not marked as
876 * destroyed */ 843 * destroyed */
877 while (next && !next->destroyed ()) 844 while (next && !next->destroyed ())
… …
903 if (op->contr->mode & PU_DEBUG) 870 if (op->contr->mode & PU_DEBUG)
904 { 871 {
905 /* some debugging code to figure out item information */ 872 /* some debugging code to figure out item information */
906 const char *str = tmp->name 873 const char *str = tmp->name
907 ? format ("item name: %s item type: %d weight/value: %d", 874 ? format ("item name: %s item type: %d weight/value: %d",
908 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) 875 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
909 : format ("item name: %s item type: %d weight/value: %d", 876 : format ("item name: %s item type: %d weight/value: %d",
910 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 877 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
911 878
912 new_draw_info (NDI_UNIQUE, 0, op, str); 879 new_draw_info (NDI_UNIQUE, 0, op, str);
913 } 880 }
914 881
915 if (op->contr->mode & PU_INHIBIT) 882 if (op->contr->mode & PU_INHIBIT)
… …
948 * fighting */ 915 * fighting */
949 if (op->contr->mode & PU_INHIBIT) 916 if (op->contr->mode & PU_INHIBIT)
950 return 1; 917 return 1;
951 918
952 /* prevent us from turning into auto-thieves :) */ 919 /* prevent us from turning into auto-thieves :) */
953 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 920 if (tmp->flag [FLAG_UNPAID])
954 continue; 921 continue;
955 922
956 /* ignore known cursed objects */ 923 /* ignore known cursed objects */
957 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 924 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
958 continue; 925 continue;
959 926
960 /* all food and drink if desired */ 927 /* all food and drink if desired */
961 /* question: don't pick up known-poisonous stuff? */ 928 /* question: don't pick up known-poisonous stuff? */
962 if (op->contr->mode & PU_FOOD) 929 if (op->contr->mode & PU_FOOD)
… …
965 CHK_PICK_PICKUP; 932 CHK_PICK_PICKUP;
966 continue; 933 continue;
967 } 934 }
968 935
969 if (op->contr->mode & PU_DRINK) 936 if (op->contr->mode & PU_DRINK)
970 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 937 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
971 { 938 {
972 CHK_PICK_PICKUP; 939 CHK_PICK_PICKUP;
973 continue; 940 continue;
974 } 941 }
975 942
… …
1002 continue; 969 continue;
1003 } 970 }
1004 971
1005 /* wands/staves/rods/horns */ 972 /* wands/staves/rods/horns */
1006 if (op->contr->mode & PU_MAGIC_DEVICE) 973 if (op->contr->mode & PU_MAGIC_DEVICE)
1007 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 974 if (tmp->type == WAND
975 || tmp->type == ROD
976 || tmp->type == HORN
977 || tmp->type == POWER_CRYSTAL)
1008 { 978 {
1009 CHK_PICK_PICKUP; 979 CHK_PICK_PICKUP;
1010 continue; 980 continue;
1011 } 981 }
1012 982
1013 /* pick up all magical items */ 983 /* pick up all magical items */
1014 if (op->contr->mode & PU_MAGICAL) 984 if (op->contr->mode & PU_MAGICAL)
1015 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 985 if (tmp->flag [FLAG_KNOWN_MAGICAL]
986 && !tmp->flag [FLAG_KNOWN_CURSED])
1016 { 987 {
1017 CHK_PICK_PICKUP; 988 CHK_PICK_PICKUP;
1018 continue; 989 continue;
1019 } 990 }
1020 991
… …
1027 } 998 }
1028 } 999 }
1029 1000
1030 /* rings & amulets - talismans seems to be typed AMULET */ 1001 /* rings & amulets - talismans seems to be typed AMULET */
1031 if (op->contr->mode & PU_JEWELS) 1002 if (op->contr->mode & PU_JEWELS)
1032 if (tmp->type == RING || tmp->type == AMULET) 1003 if (tmp->type == RING
1004 || tmp->type == AMULET
1005 || tmp->type == GIRDLE
1006 || tmp->type == SKILL_TOOL)
1033 { 1007 {
1034 CHK_PICK_PICKUP; 1008 CHK_PICK_PICKUP;
1035 continue; 1009 continue;
1036 } 1010 }
1037 1011
… …
1086 CHK_PICK_PICKUP; 1060 CHK_PICK_PICKUP;
1087 continue; 1061 continue;
1088 } 1062 }
1089 1063
1090 if (op->contr->mode & PU_GLOVES) 1064 if (op->contr->mode & PU_GLOVES)
1091 if (tmp->type == GLOVES) 1065 if (tmp->type == GLOVES || tmp->type == BRACERS)
1092 { 1066 {
1093 CHK_PICK_PICKUP; 1067 CHK_PICK_PICKUP;
1094 continue; 1068 continue;
1095 } 1069 }
1096 1070
… …
1101 continue; 1075 continue;
1102 } 1076 }
1103 1077
1104 /* hoping to catch throwing daggers here */ 1078 /* hoping to catch throwing daggers here */
1105 if (op->contr->mode & PU_MISSILEWEAPON) 1079 if (op->contr->mode & PU_MISSILEWEAPON)
1106 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1080 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1107 { 1081 {
1108 CHK_PICK_PICKUP; 1082 CHK_PICK_PICKUP;
1109 continue; 1083 continue;
1110 } 1084 }
1111 1085
… …
1146 fprintf (stderr, "%s", tmp->name); 1120 fprintf (stderr, "%s", tmp->name);
1147 } 1121 }
1148 else 1122 else
1149 fprintf (stderr, "%s", tmp->arch->archname); 1123 fprintf (stderr, "%s", tmp->arch->archname);
1150 fprintf (stderr, ",%d] = ", tmp->type); 1124 fprintf (stderr, ",%d] = ", tmp->type);
1151 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1125 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1152#endif 1126#endif
1153 CHK_PICK_PICKUP; 1127 CHK_PICK_PICKUP;
1154 continue; 1128 continue;
1155 } 1129 }
1156 } /* the new pickup model */ 1130 } /* the new pickup model */
… …
1163 * there is a possibility for our action distrubing our hiding 1137 * there is a possibility for our action distrubing our hiding
1164 * place or invisiblity spell. Artefact invisiblity causes 1138 * place or invisiblity spell. Artefact invisiblity causes
1165 * "noise" instead. If we arent invisible to begin with, we 1139 * "noise" instead. If we arent invisible to begin with, we
1166 * return 0. 1140 * return 0.
1167 */ 1141 */
1168int 1142static int
1169action_makes_visible (object *op) 1143action_makes_visible (object *op)
1170{ 1144{
1171 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1145 if (op->invisible && op->flag [FLAG_ALIVE])
1172 { 1146 {
1173 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1147 if (op->flag [FLAG_MAKE_INVIS])
1174 { 1148 {
1175 // artefact invisibility is permanent, but we still make noise 1149 // artefact invisibility is permanent, but we still make noise
1176 // this is important for game-balance. 1150 // this is important for game-balance.
1177 if (op->contr) 1151 if (op->contr)
1178 op->make_noise (); 1152 op->make_noise ();
… …
1197/* 1171/*
1198 * Find an arrow in the inventory and after that 1172 * Find an arrow in the inventory and after that
1199 * in the right type container (quiver). Pointer to the 1173 * in the right type container (quiver). Pointer to the
1200 * found object is returned. 1174 * found object is returned.
1201 */ 1175 */
1202object * 1176static object *
1203find_arrow (object *op, const char *type) 1177find_arrow (object *op, const char *type)
1204{ 1178{
1205 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1179 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1206 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1180 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1207 return splay (tmp); 1181 return splay (tmp);
1208 1182
1209 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1183 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1210 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1184 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1211 if (object *arrow = find_arrow (tmp, type)) 1185 if (object *arrow = find_arrow (tmp, type))
1212 { 1186 {
1213 splay (tmp); 1187 splay (tmp);
1214 return arrow; 1188 return arrow;
1215 } 1189 }
… …
1221 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1195 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1222 * against the target. A full test is not performed, simply a basic test 1196 * against the target. A full test is not performed, simply a basic test
1223 * of resistances. The archer is making a quick guess at what he sees down 1197 * of resistances. The archer is making a quick guess at what he sees down
1224 * the hall. Failing that it does it's best to pick the highest plus arrow. 1198 * the hall. Failing that it does it's best to pick the highest plus arrow.
1225 */ 1199 */
1226object * 1200static object *
1227find_better_arrow (object *op, object *target, shstr_cmp type, int *better) 1201find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1228{ 1202{
1229 object *tmp = NULL, *arrow, *ntmp; 1203 object *tmp = NULL, *arrow, *ntmp;
1230 int attacknum, attacktype, betterby = 0, i; 1204 int attacknum, attacktype, betterby = 0, i;
1231 1205
1232 if (!type) 1206 if (!type)
1233 return NULL; 1207 return NULL;
1234 1208
1235 for (arrow = op->inv; arrow; arrow = arrow->below) 1209 for (arrow = op->inv; arrow; arrow = arrow->below)
1236 { 1210 {
1237 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1211 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1238 { 1212 {
1239 i = 0; 1213 i = 0;
1240 ntmp = find_better_arrow (arrow, target, type, &i); 1214 ntmp = find_better_arrow (arrow, target, type, &i);
1241 1215
1242 if (i > betterby) 1216 if (i > betterby)
… …
1300 * find_better_arrow to find a decent arrow to use. 1274 * find_better_arrow to find a decent arrow to use.
1301 * op = the shooter 1275 * op = the shooter
1302 * type = bow->race 1276 * type = bow->race
1303 * dir = fire direction 1277 * dir = fire direction
1304 */ 1278 */
1305object * 1279static object *
1306pick_arrow_target (object *op, shstr_cmp type, int dir) 1280pick_arrow_target (object *op, shstr_cmp type, int dir)
1307{ 1281{
1308 object *tmp = NULL; 1282 object *tmp = NULL;
1309 maptile *m; 1283 maptile *m;
1310 int i, mflags, found, number; 1284 int i, mflags, found, number;
… …
1343 break; 1317 break;
1344 } 1318 }
1345 1319
1346 if (mflags & P_IS_ALIVE) 1320 if (mflags & P_IS_ALIVE)
1347 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1321 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1348 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1322 if (tmp->flag [FLAG_ALIVE])
1349 break; 1323 break;
1350 } 1324 }
1351 1325
1352 if (!tmp) 1326 if (!tmp)
1353 return find_arrow (op, type); 1327 return find_arrow (op, type);
… …
1414 { 1388 {
1415 if (op->type == PLAYER) 1389 if (op->type == PLAYER)
1416 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1390 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1417 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1391 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1418 else 1392 else
1419 CLEAR_FLAG (op, FLAG_READY_BOW); 1393 op->clr_flag (FLAG_READY_BOW);
1420 1394
1421 return 0; 1395 return 0;
1422 } 1396 }
1423 } 1397 }
1424 1398
… …
1525 * but monsters can't. Putting that code here 1499 * but monsters can't. Putting that code here
1526 * makes the fire_bow code much cleaner. 1500 * makes the fire_bow code much cleaner.
1527 * this function should only be called if 'op' is a player, 1501 * this function should only be called if 'op' is a player,
1528 * hence the function name. 1502 * hence the function name.
1529 */ 1503 */
1530int 1504static int
1531player_fire_bow (object *op, int dir) 1505player_fire_bow (object *op, int dir)
1532{ 1506{
1533 int ret; 1507 int ret;
1534 1508
1535 if (op->contr->bowtype == bow_bestarrow) 1509 if (op->contr->bowtype == bow_bestarrow)
… …
1563} 1537}
1564 1538
1565/* Fires a misc (wand/rod/horn) object in 'dir'. 1539/* Fires a misc (wand/rod/horn) object in 'dir'.
1566 * Broken apart from 'fire' to keep it more readable. 1540 * Broken apart from 'fire' to keep it more readable.
1567 */ 1541 */
1568void 1542static void
1569fire_misc_object (object *op, int dir) 1543fire_misc_object (object *op, int dir)
1570{ 1544{
1571 object *item = op->contr->ranged_ob; 1545 object *item = op->contr->ranged_ob;
1572 1546
1573 if (!item) 1547 if (!item)
… …
1580 { 1554 {
1581 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1555 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1582 return; 1556 return;
1583 } 1557 }
1584 1558
1585 if (!op->change_weapon (item)) 1559 if (!op->apply (item))
1586 return; 1560 return;
1587 1561
1588 if (item->type == WAND) 1562 if (item->type == WAND)
1589 { 1563 {
1590 if (item->stats.food <= 0) 1564 if (item->stats.food <= 0)
… …
1595 return; 1569 return;
1596 } 1570 }
1597 } 1571 }
1598 else if (item->type == ROD || item->type == HORN) 1572 else if (item->type == ROD || item->type == HORN)
1599 { 1573 {
1600 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1574 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1601 1575
1602 // using the maximum of the rods charge allows at least one spell cast 1576 // using the maximum of the rods charge allows at least one spell cast
1603 // for a rod or horn, this fixes some broken rods. 1577 // for a rod or horn, this fixes some broken rods.
1604 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1578 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1605 { 1579 {
1606 op->contr->play_sound (sound_find ("wand_poof")); 1580 op->contr->play_sound (sound_find ("wand_poof"));
1607 1581
1608 if (item->type == ROD) 1582 if (item->type == ROD)
1609 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1624 { 1598 {
1625 object *tmp; 1599 object *tmp;
1626 1600
1627 if (item->arch) 1601 if (item->arch)
1628 { 1602 {
1629 CLEAR_FLAG (item, FLAG_ANIMATE); 1603 item->clr_flag (FLAG_ANIMATE);
1630 item->face = item->arch->face; 1604 item->face = item->arch->face;
1631 item->set_speed (0); 1605 item->set_speed (0);
1632 } 1606 }
1633 1607
1634 if (object *pl = item->visible_to ()) 1608 if (object *pl = item->visible_to ())
… …
1641} 1615}
1642 1616
1643/* Received a fire command for the player - go and do it. 1617/* Received a fire command for the player - go and do it.
1644 */ 1618 */
1645bool 1619bool
1646fire (object *op, int dir) 1620fire (object *who, int dir)
1647{ 1621{
1648 int spellcost = 0; 1622 int spellcost = 0;
1649 1623
1650 player *pl = op->contr; 1624 player *pl = who->contr;
1651 1625
1652 if (pl->golem) 1626 if (pl->golem)
1653 { 1627 {
1654 control_golem (op->contr->golem, dir); 1628 control_golem (who->contr->golem, dir);
1655 return false; 1629 return false;
1656 } 1630 }
1657 1631
1658 object *ob = pl->ranged_ob; 1632 object *ob = pl->ranged_ob;
1659 1633
1660 if (!ob) 1634 if (!ob)
1661 return false; 1635 return false;
1662 1636
1663 if (op->speed_left > 0.f) 1637 if (who->speed_left > 0.f)
1664 --op->speed_left; 1638 --who->speed_left;
1665 else 1639 else
1666 return false; 1640 return false;
1667 1641
1668 if (!op->change_weapon (ob)) 1642 if (!who->apply (ob))
1669 return false; 1643 return false;
1670 1644
1671 /* check for loss of invisiblity/hide */ 1645 /* check for loss of invisiblity/hide */
1672 if (action_makes_visible (op)) 1646 if (action_makes_visible (who))
1673 make_visible (op); 1647 make_visible (who);
1674 1648
1675 switch (ob->type) 1649 switch (ob->type)
1676 { 1650 {
1677 case BOW: 1651 case BOW:
1678 player_fire_bow (op, dir); 1652 player_fire_bow (who, dir);
1679 break; 1653 break;
1680 1654
1681 case SPELL: 1655 case SPELL:
1682 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1656 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1683 break; 1657 break;
1684 1658
1685 case BUILDER: 1659 case BUILDER:
1686 apply_map_builder (op, dir); 1660 apply_map_builder (who, dir);
1687 break; 1661 break;
1688 1662
1689 case SKILL: 1663 case SKILL:
1690 do_skill (op, op, ob, dir, 0); 1664 do_skill (who, who, ob, dir, 0);
1691 break; 1665 break;
1692 1666
1667 case RANGED:
1668 do_skill (who, ob, who->chosen_skill, dir, 0);
1669 break;
1670
1693 default: 1671 default:
1694 fire_misc_object (op, dir); 1672 fire_misc_object (who, dir);
1695 break; 1673 break;
1696 } 1674 }
1697 1675
1698 return true; 1676 return true;
1699} 1677}
… …
1758 * 1736 *
1759 * Change the color so that the message doesn't disappear with 1737 * Change the color so that the message doesn't disappear with
1760 * all the others. 1738 * all the others.
1761 */ 1739 */
1762 if (pl->contr->usekeys == key_inventory 1740 if (pl->contr->usekeys == key_inventory
1763 || !QUERY_FLAG (container, FLAG_APPLIED) 1741 || !container->flag [FLAG_APPLIED]
1764 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1742 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1765 { 1743 {
1766 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1744 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1767 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1745 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1768 return NULL; 1746 return NULL;
… …
1852 * going to try and move (not fire weapons). 1830 * going to try and move (not fire weapons).
1853 */ 1831 */
1854bool 1832bool
1855move_player_attack (object *op, int dir) 1833move_player_attack (object *op, int dir)
1856{ 1834{
1857 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) 1835 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1858 { 1836 {
1859 --op->speed_left; 1837 --op->speed_left;
1860 return true; 1838 return true;
1861 } 1839 }
1862 1840
1863 int on_battleground;
1864
1865 sint16 nx = freearr_x[dir] + op->x; 1841 sint16 nx = freearr_x[dir] + op->x;
1866 sint16 ny = freearr_y[dir] + op->y; 1842 sint16 ny = freearr_y[dir] + op->y;
1867
1868 on_battleground = op_on_battleground (op, 0, 0);
1869 1843
1870 if (out_of_map (op->map, nx, ny)) 1844 if (out_of_map (op->map, nx, ny))
1871 return false; 1845 return false;
1872 1846
1873 /* If braced, or can't move to the square, and it is not out of the 1847 /* If braced, or can't move to the square, and it is not out of the
… …
1923 */ 1897 */
1924 if (op->type == PLAYER 1898 if (op->type == PLAYER
1925 && ((mon->owner && mon->owner->contr 1899 && ((mon->owner && mon->owner->contr
1926 && same_party (mon->owner->contr->party, op->contr->party)) 1900 && same_party (mon->owner->contr->party, op->contr->party))
1927 || mon->owner == op) 1901 || mon->owner == op)
1928 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1902 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1929 { 1903 {
1930 /* If we're braced, we don't want to switch places with it */ 1904 /* If we're braced, we don't want to switch places with it */
1931 if (op->contr->braced) 1905 if (op->contr->braced)
1932 return false; 1906 return false;
1933 1907
… …
1944 return true; 1918 return true;
1945 } 1919 }
1946 else 1920 else
1947 return false; 1921 return false;
1948 } 1922 }
1923
1924 bool on_battleground = op_on_battleground (op, 0, 0);
1949 1925
1950 /* in certain circumstances, you shouldn't attack friendly 1926 /* in certain circumstances, you shouldn't attack friendly
1951 * creatures. Note that if you are braced, you can't push 1927 * creatures. Note that if you are braced, you can't push
1952 * someone, but put it inside this loop so that you won't 1928 * someone, but put it inside this loop so that you won't
1953 * attack them either. 1929 * attack them either.
1954 */ 1930 */
1955 if ((mon->type == PLAYER || mon->enemy != op) 1931 if ((mon->type == PLAYER || mon->enemy != op)
1956 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1932 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1957 && ((op->contr->peaceful 1933 && ((op->contr->peaceful
1958 || (mon->type == PLAYER && mon->contr->peaceful)) 1934 || (mon->type == PLAYER && mon->contr->peaceful))
1959 && !on_battleground)) 1935 && !on_battleground))
1960 { 1936 {
1961 if (op->speed_left > 0.f) 1937 if (op->speed_left > 0.f)
… …
1977 } 1953 }
1978 } 1954 }
1979 /* If the object is a boulder or other rollable object, then 1955 /* If the object is a boulder or other rollable object, then
1980 * roll it if not braced. You can't roll it if you are braced. 1956 * roll it if not braced. You can't roll it if you are braced.
1981 */ 1957 */
1982 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1958 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1983 { 1959 {
1984 if (op->speed_left > 0.f) 1960 if (op->speed_left > 0.f)
1985 { 1961 {
1986 --op->speed_left; 1962 --op->speed_left;
1987 1963
… …
1996 * Way it works is like this: First, it must have some hit points 1972 * Way it works is like this: First, it must have some hit points
1997 * and be living. Then, it must be one of the following: 1973 * and be living. Then, it must be one of the following:
1998 * 1) Not a player, 2) A player, but of a different party. Note 1974 * 1) Not a player, 2) A player, but of a different party. Note
1999 * that party_number -1 is no party, so attacks can still happen. 1975 * that party_number -1 is no party, so attacks can still happen.
2000 */ 1976 */
2001 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1977 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2002 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1978 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2003 { 1979 {
2004 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 1980 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2005 { 1981 {
2006 --op->contr->weapon_sp_left; 1982 --op->contr->weapon_sp_left;
… …
2018} 1994}
2019 1995
2020bool 1996bool
2021move_player (object *op, int dir) 1997move_player (object *op, int dir)
2022{ 1998{
2023 int pick;
2024
2025 if (!op->map || op->map->in_memory != MAP_ACTIVE) 1999 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2026 return 0; 2000 return 0;
2027 2001
2028 /* Sanity check: make sure dir is valid */ 2002 /* Sanity check: make sure dir is valid */
2029 if ((dir < 0) || (dir >= 9)) 2003 if (dir < 0 || dir > 8)
2030 { 2004 {
2031 LOG (llevError, "move_player: invalid direction %d\n", dir); 2005 LOG (llevError, "move_player: invalid direction %d\n", dir);
2032 return 0; 2006 return 0;
2033 } 2007 }
2034 2008
2035 /* peterm: added following line */ 2009 /* peterm: added following line */
2036 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2010 if (op->flag [FLAG_CONFUSED] && dir)
2037 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2011 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2038 2012
2039 op->facing = dir; 2013 op->facing = dir;
2040 2014
2041 if (op->flag [FLAG_HIDDEN]) 2015 if (op->flag [FLAG_HIDDEN])
2042 do_hidden_move (op); 2016 do_hidden_move (op);
2043 2017
2044 bool retval; 2018 bool retval;
2019 int pick = 0;
2045 2020
2046 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2021 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2047 retval = RESULT_INT (0); 2022 retval = RESULT_INT (0);
2048 else if (op->contr->fire_on) 2023 else if (op->contr->fire_on)
2049 retval = fire (op, dir); 2024 retval = fire (op, dir);
… …
2080 * players. 2055 * players.
2081 */ 2056 */
2082bool 2057bool
2083handle_newcs_player (object *op) 2058handle_newcs_player (object *op)
2084{ 2059{
2085 if (QUERY_FLAG (op, FLAG_SCARED)) 2060 if (op->flag [FLAG_SCARED])
2086 { 2061 {
2087 if (op->speed_left > 0.f) 2062 if (op->speed_left > 0.f)
2088 { 2063 {
2089 --op->speed_left; 2064 --op->speed_left;
2090 flee_player (op); 2065 flee_player (op);
… …
2106 return move_player (op, op->direction); 2081 return move_player (op, op->direction);
2107 2082
2108 return false; 2083 return false;
2109} 2084}
2110 2085
2111int 2086static int
2112save_life (object *op) 2087save_life (object *op)
2113{ 2088{
2114 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2089 if (!op->flag [FLAG_LIFESAVE])
2115 return 0; 2090 return 0;
2116 2091
2117 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2092 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2118 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2093 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2119 { 2094 {
2120 op->play_sound (sound_find ("ob_evaporate")); 2095 op->play_sound (sound_find ("ob_evaporate"));
2121 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2096 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2122 2097
2123 tmp->destroy (); 2098 tmp->destroy ();
2124 CLEAR_FLAG (op, FLAG_LIFESAVE); 2099 op->clr_flag (FLAG_LIFESAVE);
2125 2100
2126 if (op->stats.hp < 0) 2101 if (op->stats.hp < 0)
2127 op->stats.hp = op->stats.maxhp; 2102 op->stats.hp = op->stats.maxhp;
2128 2103
2129 if (op->stats.food < 0) 2104 if (op->stats.food < 0)
2130 op->stats.food = 999; 2105 op->stats.food = MAX_FOOD;
2131 2106
2132 op->update_stats (); 2107 op->update_stats ();
2133 return 1; 2108 return 1;
2134 } 2109 }
2135 2110
2136 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2111 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2137 CLEAR_FLAG (op, FLAG_LIFESAVE); 2112 op->clr_flag (FLAG_LIFESAVE);
2138 enter_player_savebed (op); /* bring him home. */ 2113 enter_player_savebed (op); /* bring him home. */
2139 return 0; 2114 return 0;
2140} 2115}
2141 2116
2142/* This goes throws the inventory and removes unpaid objects, and puts them 2117/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2149{ 2124{
2150 while (op) 2125 while (op)
2151 { 2126 {
2152 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2127 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2153 2128
2154 if (QUERY_FLAG (op, FLAG_UNPAID)) 2129 if (op->flag [FLAG_UNPAID])
2155 op->insert_at (env); 2130 op->insert_at (env);
2156 else if (op->inv) 2131 else if (op->inv)
2157 drop_unpaid_items (op->inv, env); 2132 drop_unpaid_items (op->inv, env);
2158 2133
2159 op = next; 2134 op = next;
… …
2163void 2138void
2164object::drop_unpaid_items () 2139object::drop_unpaid_items ()
2165{ 2140{
2166 if (!flag [FLAG_REMOVED]) 2141 if (!flag [FLAG_REMOVED])
2167 ::drop_unpaid_items (inv, this); 2142 ::drop_unpaid_items (inv, this);
2168}
2169
2170/*
2171 * Returns pointer a static string containing gravestone text
2172 * Moved from apply.c to player.c - player.c is what
2173 * actually uses this function. player.c may not be quite the
2174 * best, a misc file for object actions is probably better,
2175 * but there isn't one in the server directory.
2176 */
2177const char *
2178gravestone_text (object *op)
2179{
2180 static dynbuf_text buf;
2181
2182 buf << "---- R.I.P. ----\n\n"
2183 << op->name;
2184
2185 if (op->type == PLAYER)
2186 buf << " the " << op->contr->title;
2187
2188 buf << "\n\n";
2189
2190 buf << "who was level ";
2191 buf << (sint32)op->level << "\n\n" // OO breakdown
2192 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2193
2194 if (op->type == PLAYER)
2195 buf << "by " << op->contr->killer_name () << ".\n\n";
2196
2197 {
2198 static char buf2[128];
2199 time_t now = time (NULL);
2200 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2201 buf << buf2;
2202 }
2203
2204 return buf;
2205} 2143}
2206 2144
2207void 2145void
2208do_some_living (object *op) 2146do_some_living (object *op)
2209{ 2147{
… …
2226 * alternate it here for it to work correctly. 2164 * alternate it here for it to work correctly.
2227 */ 2165 */
2228 if (pticks & 2) 2166 if (pticks & 2)
2229 op->invisible--; 2167 op->invisible--;
2230 } 2168 }
2231 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2169 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2232 { 2170 {
2233 if (!op->invisible--) 2171 if (!op->invisible--)
2234 { 2172 {
2235 make_visible (op); 2173 make_visible (op);
2236 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2174 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2303 if (op->stats.sp < op->stats.maxsp) 2241 if (op->stats.sp < op->stats.maxsp)
2304 { 2242 {
2305 op->stats.sp++; 2243 op->stats.sp++;
2306 2244
2307 /* dms do not consume food */ 2245 /* dms do not consume food */
2308 if (!QUERY_FLAG (op, FLAG_WIZ)) 2246 if (!op->flag [FLAG_WIZ])
2309 { 2247 {
2310 op->stats.food--; 2248 op->stats.food--;
2311 2249
2312 if (op->contr->digestion < 0) 2250 if (op->contr->digestion < 0)
2313 op->stats.food += op->contr->digestion; 2251 op->stats.food += op->contr->digestion;
… …
2347 if (op->stats.hp < op->stats.maxhp) 2285 if (op->stats.hp < op->stats.maxhp)
2348 { 2286 {
2349 op->stats.hp++; 2287 op->stats.hp++;
2350 2288
2351 /* dms do not consume food */ 2289 /* dms do not consume food */
2352 if (!QUERY_FLAG (op, FLAG_WIZ)) 2290 if (!op->flag [FLAG_WIZ])
2353 { 2291 {
2354 op->stats.food--; 2292 op->stats.food--;
2355 2293
2356 if (op->contr->digestion < 0) 2294 if (op->contr->digestion < 0)
2357 op->stats.food += op->contr->digestion; 2295 op->stats.food += op->contr->digestion;
… …
2384 penalty = max (0, -op->contr->digestion); 2322 penalty = max (0, -op->contr->digestion);
2385 2323
2386 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2324 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2387 2325
2388 /* dms do not consume food */ 2326 /* dms do not consume food */
2389 if (!QUERY_FLAG (op, FLAG_WIZ)) 2327 if (!op->flag [FLAG_WIZ])
2390 op->stats.food--; 2328 op->stats.food--;
2391 } 2329 }
2392 2330
2393 if (op->stats.food < 0 && op->stats.hp >= 0) 2331 if (op->stats.food < 0 && op->stats.hp >= 0)
2394 { 2332 {
2395 object *flesh = 0; 2333 object *flesh = 0;
2396 2334
2397 for_inv_removable (op, tmp) 2335 for_inv_removable (op, tmp)
2398 { 2336 {
2399 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2337 if (tmp->flag [FLAG_UNPAID])
2400 continue; 2338 continue;
2401 2339
2402 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2340 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2403 { 2341 {
2404 op->statusmsg ("You blindly grab for a bite of food. " 2342 op->statusmsg ("You blindly grab for a bite of food. "
2405 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2343 "H<To prevent you from starving, you ate some random item from your backpack.>");
2406 manual_apply (op, tmp, 0); 2344 op->apply (tmp);
2407 2345
2408 if (op->stats.food >= 0 || op->stats.hp < 0) 2346 if (op->stats.food >= 0 || op->stats.hp < 0)
2409 break; 2347 break;
2410 } 2348 }
2411 else if (tmp->type == FLESH) 2349 else if (tmp->type == FLESH)
… …
2417 */ 2355 */
2418 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2356 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2419 { 2357 {
2420 op->statusmsg ("You blindly grab for a bite of food. " 2358 op->statusmsg ("You blindly grab for a bite of food. "
2421 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2359 "H<To prevent you from starving, you ate some random item from your backpack.>");
2422 manual_apply (op, flesh, 0); 2360 op->apply (flesh);
2423 } 2361 }
2424 2362
2425 // If player is still starving, alert him! 2363 // If player is still starving, alert him!
2426 if (op->stats.food < 0) 2364 if (op->stats.food < 0)
2427 op->failmsg ("You are starving! " 2365 op->failmsg ("You are starving! "
… …
2439 op->contr->killer->destroy (); 2377 op->contr->killer->destroy ();
2440 } 2378 }
2441 } 2379 }
2442 2380
2443 /* killer should be set here already */ 2381 /* killer should be set here already */
2444 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2382 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2445 kill_player (op); 2383 kill_player (op);
2446 } 2384 }
2447} 2385}
2448 2386
2449/* If the player should die (lack of hp, food, etc), we call this. 2387/* If the player should die (lack of hp, food, etc), we call this.
… …
2464 return; 2402 return;
2465 2403
2466 dynbuf_text deathtab; 2404 dynbuf_text deathtab;
2467 2405
2468 /* restore player */ 2406 /* restore player */
2469 at = archetype::find ("poisoning"); 2407 at = archetype::find (shstr_poisoning);
2470 if (object *tmp = present_arch_in_ob (at, op)) 2408 if (object *tmp = present_arch_in_ob (at, op))
2471 { 2409 {
2472 tmp->destroy (); 2410 tmp->destroy ();
2473 deathtab << "Your body feels cleansed...\r"; 2411 deathtab << "Your body feels cleansed...\r";
2474 } 2412 }
2475 2413
2476 at = archetype::find ("confusion"); 2414 at = archetype::find (shstr_confusion);
2477 if (object *tmp = present_arch_in_ob (at, op)) 2415 if (object *tmp = present_arch_in_ob (at, op))
2478 { 2416 {
2479 tmp->destroy (); 2417 tmp->destroy ();
2480 deathtab << "Your mind feels clearer...\r"; 2418 deathtab << "Your mind feels clearer...\r";
2481 } 2419 }
… …
2483 cure_disease (op, 0, 0); /* remove any disease */ 2421 cure_disease (op, 0, 0); /* remove any disease */
2484 2422
2485 max_it (op->stats.hp , op->stats.maxhp); 2423 max_it (op->stats.hp , op->stats.maxhp);
2486 max_it (op->stats.sp , op->stats.maxsp); 2424 max_it (op->stats.sp , op->stats.maxsp);
2487 max_it (op->stats.grace, op->stats.maxgrace); 2425 max_it (op->stats.grace, op->stats.maxgrace);
2488
2489 if (op->stats.food <= 0) 2426 max_it (op->stats.food , 200);
2490 op->stats.food = 999;
2491 2427
2492 // remove all spell effects that are active 2428 // remove all spell effects that are active
2493 // to avoid long-term effects such as word-of-recall 2429 // to avoid long-term effects such as word-of-recall
2494 for (object *item = op->inv; item; ) 2430 for (object *item = op->inv; item; )
2495 { 2431 {
… …
2508 if (op_on_battleground (op, &x, &y)) 2444 if (op_on_battleground (op, &x, &y))
2509 { 2445 {
2510 deathtab << "You almost died in combat, but local medics have saved your life...\r"; 2446 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2511 2447
2512 /* create a bodypart-trophy to make the winner happy */ 2448 /* create a bodypart-trophy to make the winner happy */
2513 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2449 object *tmp = archetype::find (shstr_finger)->instance ();
2514 { 2450
2515 tmp->name = format ("%s's finger" , &op->name); 2451 tmp->name = format ("%s's finger" , &op->name);
2516 tmp->name_pl = format ("%s's fingers", &op->name); 2452 tmp->name_pl = format ("%s's fingers", &op->name);
2517 tmp->msg = format ( 2453 tmp->msg = format (
2518 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2454 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2519 &op->name, op->contr->title, 2455 &op->name, op->contr->title,
2520 (int)op->level, 2456 (int)op->level,
2521 op->contr->killer_name () 2457 op->contr->killer_name ()
2522 ); 2458 );
2523 tmp->value = 0, tmp->type = 0; 2459 tmp->value = 0, tmp->type = 0;
2524 tmp->materialname = "organics"; 2460 tmp->material = name_to_material (shstr_organic);
2525 tmp->insert_at (op, tmp); 2461 tmp->insert_at (op, tmp);
2526 }
2527 2462
2528 /* teleport defeated player to new destination */ 2463 /* teleport defeated player to new destination */
2529 transfer_ob (op, x, y, 0, NULL); 2464 transfer_ob (op, x, y, 0, NULL);
2530 op->contr->braced = 0; 2465 op->contr->braced = 0;
2531 2466
… …
2593 lost_a_stat = 1; 2528 lost_a_stat = 1;
2594 } 2529 }
2595 else 2530 else
2596 { 2531 {
2597 /* deplete a stat */ 2532 /* deplete a stat */
2598 archetype *deparch = archetype::find ("depletion"); 2533 archetype *deparch = archetype::find (shstr_depletion);
2599 object *dep; 2534 object *dep;
2600 2535
2601 dep = present_arch_in_ob (deparch, op); 2536 dep = present_arch_in_ob (deparch, op);
2602 if (!dep) 2537 if (!dep)
2603 { 2538 {
2604 dep = arch_to_object (deparch); 2539 dep = deparch->instance ();
2605 insert_ob_in_ob (dep, op); 2540 insert_ob_in_ob (dep, op);
2606 } 2541 }
2607 lose_this_stat = 1; 2542 lose_this_stat = 1;
2608 if (settings.balanced_stat_loss) 2543 if (settings.balanced_stat_loss)
2609 { 2544 {
… …
2647 * difference. 2582 * difference.
2648 */ 2583 */
2649 if (this_stat >= -50) 2584 if (this_stat >= -50)
2650 { 2585 {
2651 change_attr_value (&(dep->stats), i, -1); 2586 change_attr_value (&(dep->stats), i, -1);
2652 SET_FLAG (dep, FLAG_APPLIED); 2587 dep->set_flag (FLAG_APPLIED);
2653 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2588 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2654 op->update_stats (); 2589 op->update_stats ();
2655 lost_a_stat = 1; 2590 lost_a_stat = 1;
2656 } 2591 }
2657 } 2592 }
… …
2675#endif 2610#endif
2676 2611
2677 /* Put a gravestone up where the character 'almost' died. List the 2612 /* Put a gravestone up where the character 'almost' died. List the
2678 * exp loss on the stone. 2613 * exp loss on the stone.
2679 */ 2614 */
2680 tmp = arch_to_object (archetype::find ("gravestone")); 2615 tmp = archetype::find (shstr_gravestone)->instance ();
2681 tmp->name = format ("%s's gravestone", &op->name); 2616 tmp->name = format ("%s's gravestone", &op->name);
2682 tmp->name_pl = format ("%s's gravestones", &op->name); 2617 tmp->name_pl = format ("%s's gravestones", &op->name);
2683 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", 2618 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2684 &op->name, op->contr->title, op->contr->killer_name ()); 2619 &op->name, op->contr->title, op->contr->killer_name ());
2685 tmp->x = op->x, tmp->y = op->y; 2620 tmp->x = op->x, tmp->y = op->y;
… …
2728 2663
2729 force = get_archetype (FORCE_NAME); 2664 force = get_archetype (FORCE_NAME);
2730 /* 50 ticks should be enough time for the spell to abate */ 2665 /* 50 ticks should be enough time for the spell to abate */
2731 force->speed = 0.1f; 2666 force->speed = 0.1f;
2732 force->speed_left = -5.f; 2667 force->speed_left = -5.f;
2733 SET_FLAG (force, FLAG_APPLIED); 2668 force->set_flag (FLAG_APPLIED);
2734 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2735 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2736 force->resist[at] = 100; 2671 force->resist[at] = 100;
2737 2672
2738 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
… …
2740 } 2675 }
2741 2676
2742 op->contr->infobox (MSG_CHANNEL ("death"), deathtab); 2677 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2743} 2678}
2744 2679
2745void 2680static void
2746loot_object (object *op) 2681loot_object (object *op)
2747{ /* Grab and destroy some treasure */ 2682{ /* Grab and destroy some treasure */
2748 object *tmp, *tmp2, *next; 2683 object *tmp, *tmp2, *next;
2749 2684
2750 op->close_container (); /* close open sack first */ 2685 op->close_container (); /* close open sack first */
… …
2760 tmp->x = op->x, tmp->y = op->y; 2695 tmp->x = op->x, tmp->y = op->y;
2761 2696
2762 if (tmp->type == CONTAINER) 2697 if (tmp->type == CONTAINER)
2763 loot_object (tmp); /* empty container to ground */ 2698 loot_object (tmp); /* empty container to ground */
2764 2699
2765 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))))
2766 { 2701 {
2767 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2768 { 2703 {
2769 tmp->decrease (rndm (1, tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2770 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2781 * fix_weight(): Check recursively the weight of all players, and fix 2716 * fix_weight(): Check recursively the weight of all players, and fix
2782 * what needs to be fixed. Refresh windows and fix speed if anything 2717 * what needs to be fixed. Refresh windows and fix speed if anything
2783 * was changed. 2718 * was changed.
2784 */ 2719 */
2785void 2720void
2786fix_weight (void) 2721fix_weight ()
2787{ 2722{
2788 for_all_players (pl) 2723 for_all_players (pl)
2789 { 2724 {
2790 sint32 old = pl->ob->carrying; 2725 sint32 old = pl->ob->carrying;
2791 2726
… …
2798 } 2733 }
2799 } 2734 }
2800} 2735}
2801 2736
2802void 2737void
2803fix_luck (void) 2738fix_luck ()
2804{ 2739{
2805 for_all_players (pl) 2740 for_all_players (pl)
2806 if (!pl->ob->contr->ns->state) 2741 if (!pl->ob->contr->ns->state)
2807 pl->ob->change_luck (0); 2742 pl->ob->change_luck (0);
2808} 2743}
… …
2860} 2795}
2861 2796
2862int 2797int
2863is_true_undead (object *op) 2798is_true_undead (object *op)
2864{ 2799{
2865 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2800 if (op->arch->flag [FLAG_UNDEAD])
2866 return 1; 2801 return 1;
2867 2802
2868 return 0; 2803 return 0;
2869} 2804}
2870 2805
… …
2968 2903
2969 if (who->type == PLAYER) 2904 if (who->type == PLAYER)
2970 player = 1; 2905 player = 1;
2971 2906
2972 else 2907 else
2973 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2908 friendly = who->flag [FLAG_FRIENDLY];
2974 2909
2975 /* search adjacent squares */ 2910 /* search adjacent squares */
2976 for (i = 1; i < 9; i++) 2911 for (i = 1; i < 9; i++)
2977 { 2912 {
2978 x = who->x + freearr_x[i]; 2913 x = who->x + freearr_x[i];
… …
2987 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)))
2988 continue; 2923 continue;
2989 2924
2990 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)
2991 { 2926 {
2992 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])
2993 return 1; 2928 return 1;
2994 else if (tmp->type == PLAYER) 2929 else if (tmp->type == PLAYER)
2995 { 2930 {
2996 /*don't let a hidden DM prevent you from hiding */ 2931 /*don't let a hidden DM prevent you from hiding */
2997 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2932 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2998 return 1; 2933 return 1;
2999 } 2934 }
3000 } 2935 }
3001 } 2936 }
3002 return 0; 2937 return 0;
… …
3071 * and the exit-coordinates sp/hp must both be > 0. 3006 * and the exit-coordinates sp/hp must both be > 0.
3072 * => The intention here is to prevent abuse of the battleground- 3007 * => The intention here is to prevent abuse of the battleground-
3073 * feature (like pickable or hidden battleground tiles). */ 3008 * feature (like pickable or hidden battleground tiles). */
3074 for (object *tmp = op->below; tmp; tmp = tmp->below) 3009 for (object *tmp = op->below; tmp; tmp = tmp->below)
3075 { 3010 {
3076 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3011 if (tmp->flag [FLAG_IS_FLOOR])
3077 { 3012 {
3078 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3013 if (tmp->flag [FLAG_NO_PICK]
3079 && tmp->type == BATTLEGROUND 3014 && tmp->type == BATTLEGROUND
3080 && tmp->name == shstr_battleground 3015 && tmp->name == shstr_battleground
3081 && EXIT_X (tmp) && EXIT_Y (tmp)) 3016 && EXIT_X (tmp) && EXIT_Y (tmp))
3082 { 3017 {
3083 /* before we assign the exit, check if this is a teambattle */ 3018 /* before we assign the exit, check if this is a teambattle */
3084 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3019 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3085 {
3086 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3020 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3021 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3087 { 3022 {
3088 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3089 {
3090 if (x && y) 3023 if (x && y)
3091 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3024 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3092 3025
3093 return 1; 3026 return 1;
3094 }
3095 } 3027 }
3096 }
3097 3028
3098 if (x && y) 3029 if (x && y)
3099 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3030 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3100 3031
3101 return 1; 3032 return 1;
… …
3239 else 3170 else
3240 j = 1; 3171 j = 1;
3241 strcat (buf, spellpathnames[i]); 3172 strcat (buf, spellpathnames[i]);
3242 } 3173 }
3243 } 3174 }
3175
3244 strcat (buf, "."); 3176 strcat (buf, ".");
3245 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3177 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3246 } 3178 }
3247 3179
3248 /* evtl. adding flags: */ 3180 /* evtl. adding flags: */
3249 if (QUERY_FLAG (item, FLAG_XRAYS)) 3181 if (item->flag [FLAG_XRAYS])
3250 SET_FLAG (skin, FLAG_XRAYS); 3182 skin->set_flag (FLAG_XRAYS);
3251 if (QUERY_FLAG (item, FLAG_STEALTH)) 3183 if (item->flag [FLAG_STEALTH])
3252 SET_FLAG (skin, FLAG_STEALTH); 3184 skin->set_flag (FLAG_STEALTH);
3253 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3185 if (item->flag [FLAG_SEE_IN_DARK])
3254 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3186 skin->set_flag (FLAG_SEE_IN_DARK);
3255 3187
3256 /* print message if there is one */ 3188 /* print message if there is one */
3257 if (item->msg != NULL) 3189 if (item->msg != NULL)
3258 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3190 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3259 } 3191 }
3260 else 3192 else
3261 { 3193 {
3262 /* generate misc. treasure */ 3194 /* generate misc. treasure */
3263 tmp = arch_to_object (tr->item); 3195 tmp = tr->item->instance ();
3264 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));
3265 who->insert (tmp); 3197 who->insert (tmp);
3266 } 3198 }
3267}
3268
3269/**
3270 * Unready an object for a player. This function does nothing if the object was
3271 * not readied.
3272 */
3273void
3274player_unready_range_ob (player *pl, object *ob)
3275{
3276 if (pl->ob->current_weapon == ob)
3277 pl->ob->current_weapon = 0;
3278
3279 if (pl->combat_ob == ob)
3280 pl->combat_ob = 0;
3281
3282 if (pl->ranged_ob == ob)
3283 pl->ranged_ob = 0;
3284} 3199}
3285 3200
3286//-GPL 3201//-GPL
3287 3202
3288sint8 3203sint8
… …
3318{ 3233{
3319 play_sound (sound_find ("generic_failure")); 3234 play_sound (sound_find ("generic_failure"));
3320 statusmsg (msg, color); 3235 statusmsg (msg, color);
3321} 3236}
3322 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