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.247 by elmex, Fri Nov 13 16:01:30 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
… …
110 link_skills (); 108 link_skills ();
111 109
112 assign (title, ob->arch->object::name); 110 assign (title, ob->arch->object::name);
113 111
114 /* if it's a dragon player, set the correct title here */ 112 /* if it's a dragon player, set the correct title here */
115 if (is_dragon_pl (ob)) 113 if (ob->is_dragon ())
116 { 114 {
117 object *tmp, *abil = 0, *skin = 0; 115 object *tmp, *abil = 0, *skin = 0;
118 116
119 for (tmp = ob->inv; tmp; tmp = tmp->below) 117 for (tmp = ob->inv; tmp; tmp = tmp->below)
120 if (tmp->type == FORCE) 118 if (tmp->type == FORCE)
… …
134 132
135 ns->floorbox_update (); 133 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob); 134 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0); 135 esrv_add_spells (this, 0);
138 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
139 activate (); 143 activate ();
140 144
141 INVOKE_PLAYER (CONNECT, this); 145 INVOKE_PLAYER (CONNECT, this);
142 INVOKE_PLAYER (LOGIN, this); 146 INVOKE_PLAYER (LOGIN, this);
143} 147}
… …
182 186
183 ob->speed = 1.0f; 187 ob->speed = 1.0f;
184 ob->speed_left = 0.5f; 188 ob->speed_left = 0.5f;
185 189
186 ob->direction = 5; /* So player faces south */ 190 ob->direction = 5; /* So player faces south */
187
188 ob->flag [FLAG_READY_WEAPON] = false;
189 ob->flag [FLAG_READY_SKILL] = false;
190 ob->flag [FLAG_READY_BOW] = false;
191
192 for (object *op = ob->inv; op; op = op->below)
193 if (op->flag [FLAG_APPLIED])
194 switch (op->type)
195 {
196 case SKILL:
197 ob->flag [FLAG_APPLIED] = false;
198 break;
199
200 case WAND:
201 case ROD:
202 case HORN:
203 case BOW:
204 ranged_ob = op;
205 break;
206
207 case WEAPON:
208 combat_ob = op;
209 break;
210 }
211
212 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
213 ob->deactivate (); // change_weapon activates, fix this better
214} 191}
215 192
216void 193void
217player::set_observe (object *op) 194player::set_observe (object *op)
218{ 195{
… …
257 disconnect (); 234 disconnect ();
258 235
259 attachable::do_destroy (); 236 attachable::do_destroy ();
260 237
261 if (ob) 238 if (ob)
262 {
263 ob->destroy_inv (false);
264 ob->destroy (); 239 ob->destroy ();
265 }
266 240
267 ob = observe = viewpoint = 0; 241 ob = observe = viewpoint = 0;
268} 242}
269 243
270player::~player () 244player::~player ()
… …
308player * 282player *
309player::create () 283player::create ()
310{ 284{
311 player *pl = new player; 285 player *pl = new player;
312 286
313 pl->set_object (arch_to_object (get_player_archetype (0))); 287 pl->set_object (get_player_archetype (0)->instance ());
314 288
315 pl->ob->roll_stats (); 289 pl->ob->roll_stats ();
316 pl->ob->stats.wc = 2; 290 pl->ob->stats.wc = 2;
317 pl->ob->run_away = 25; /* Then we panick... */ 291 pl->ob->run_away = 25; /* Then we panick... */
318 292
… …
400 */ 374 */
401int 375int
402path_to_player (object *mon, object *pl, unsigned mindiff) 376path_to_player (object *mon, object *pl, unsigned mindiff)
403{ 377{
404 rv_vector rv; 378 rv_vector rv;
405 sint16 x, y;
406 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;
407 maptile *m, *lastmap;
408 380
409 get_rangevector (mon, pl, &rv, 0); 381 get_rangevector (mon, pl, &rv, 0);
410 382
411 if (rv.distance < mindiff) 383 if (rv.distance < mindiff)
412 return 0; 384 return 0;
413 385
414 x = mon->x; 386 mapxy pos (mon);
415 y = mon->y;
416 m = mon->map;
417 dir = rv.direction; 387 dir = rv.direction;
418 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 */
419 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 389 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
420 390
421 /* 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. */
422 if (diff > max) 392 if (diff > max)
423 return 0; 393 return 0;
424 394
425 while (diff > 1 && max > 0) 395 while (diff > 1 && max > 0)
426 { 396 {
427 lastx = x; 397 mapxy lastpos = pos;
428 lasty = y;
429 lastmap = m;
430 x = lastx + freearr_x[dir];
431 y = lasty + freearr_y[dir];
432 398
433 mflags = get_map_flags (m, &m, x, y, &x, &y); 399 pos.move (dir);
434 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
435 400
436 /* Space is blocked - try changing direction a little */ 401 /* Space is blocked - try changing direction a little */
437 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 402 if (!pos.normalise ()
438 && (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)))
439 { 405 {
440 /* recalculate direction from last good location. Possible 406 /* recalculate direction from last good location. Possible
441 * we were not traversing ideal location before. 407 * we were not traversing ideal location before.
442 */ 408 */
443 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 409 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
444 if (rv.direction != dir) 410 if (rv.direction != dir)
445 { 411 {
446 /* OK - says direction should be different - lets reset the 412 /* OK - says direction should be different - lets reset the
447 * the values so it will try again. 413 * the values so it will try again.
448 */ 414 */
449 x = lastx;
450 y = lasty;
451 m = lastmap; 415 pos = lastpos;
452 dir = firstdir = rv.direction; 416 dir = firstdir = rv.direction;
453 } 417 }
454 else 418 else
455 { 419 {
456 /* direct path is blocked - try taking a side step to 420 /* direct path is blocked - try taking a side step to
… …
463 */ 427 */
464 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 428 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
465 { 429 {
466 if (i == 0) 430 if (i == 0)
467 continue; /* already did this, so skip it */ 431 continue; /* already did this, so skip it */
432
468 /* Use lastdir here - otherwise, 433 /* Use lastdir here - otherwise,
469 * since the direction that the creature should move in 434 * since the direction that the creature should move in
470 * may change, you could get infinite loops. 435 * may change, you could get infinite loops.
471 * ie, player is northwest, but monster can only 436 * ie, player is northwest, but monster can only
472 * move west, so it does that. It goes some distance, 437 * move west, so it does that. It goes some distance,
… …
474 * 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
475 * gets back to its original point. lastdir contains 440 * gets back to its original point. lastdir contains
476 * the last direction the creature has successfully 441 * the last direction the creature has successfully
477 * moved. 442 * moved.
478 */ 443 */
479
480 x = lastx + freearr_x[absdir (lastdir + i)];
481 y = lasty + freearr_y[absdir (lastdir + i)];
482 m = lastmap; 444 pos = lastpos;
483 mflags = get_map_flags (m, &m, x, y, &x, &y); 445 pos.move (absdir (lastdir + i));
484 if (mflags & P_OUT_OF_MAP) 446
447 if (!pos.normalise ())
485 continue; 448 continue;
486 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 449
487 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 450 mapspace &ms = *pos;
451
452 if (ms.flags () & P_BLOCKSVIEW)
488 continue; 453 continue;
489 if (mflags & P_BLOCKSVIEW) 454
455 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
490 continue; 456 continue;
491 457
492 if (m == mon->map && blocked_link (mon, m, x, y)) 458 if (blocked_link (mon, pos.m, pos.x, pos.y))
493 break; 459 break;
494 } 460 }
461
495 /* go through entire loop without finding a valid 462 /* go through entire loop without finding a valid
496 * sidestep to take - thus, no valid path. 463 * sidestep to take - thus, no valid path.
497 */ 464 */
498 if (i == (DETOUR_AMOUNT + 1)) 465 if (i == DETOUR_AMOUNT + 1)
499 return 0; 466 return 0;
467
500 diff--; 468 diff--;
501 lastdir = dir; 469 lastdir = dir;
502 max--; 470 max--;
503 if (!firstdir) 471 if (!firstdir)
504 firstdir = dir + i; 472 firstdir = dir + i;
… …
508 { 476 {
509 /* we moved towards creature, so diff is less */ 477 /* we moved towards creature, so diff is less */
510 diff--; 478 diff--;
511 max--; 479 max--;
512 lastdir = dir; 480 lastdir = dir;
481
513 if (!firstdir) 482 if (!firstdir)
514 firstdir = dir; 483 firstdir = dir;
515 } 484 }
516 485
517 if (diff <= 1) 486 if (diff <= 1)
518 { 487 {
519 /* Recalculate diff (distance) because we may not have actually 488 /* Recalculate diff (distance) because we may not have actually
520 * headed toward player for entire distance. 489 * headed toward player for entire distance.
521 */ 490 */
522 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 491 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
523 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 492 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
524 } 493 }
525 494
526 if (diff > max) 495 if (diff > max)
527 return 0; 496 return 0;
… …
545 next = op->below; 514 next = op->below;
546 515
547 /* Forces get applied per default, unless they have the 516 /* Forces get applied per default, unless they have the
548 * 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
549 */ 518 */
550 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 519 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
551 SET_FLAG (op, FLAG_APPLIED); 520 op->set_flag (FLAG_APPLIED);
552 521
553 /* we never give weapons/armour if these cannot be used 522 /* we never give weapons/armour if these cannot be used
554 * by this player due to race restrictions 523 * by this player due to race restrictions
555 */ 524 */
556 if (pl->type == PLAYER) 525 if (pl->type == PLAYER)
557 { 526 {
558 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 527 if ((!pl->flag [FLAG_USE_ARMOUR]
559 && 528 &&
560 (op->type == ARMOUR || op->type == BOOTS 529 (op->type == ARMOUR || op->type == BOOTS
561 || op->type == CLOAK || op->type == HELMET 530 || op->type == CLOAK || op->type == HELMET
562 || op->type == SHIELD || op->type == GLOVES 531 || op->type == SHIELD || op->type == GLOVES
563 || op->type == BRACERS || op->type == GIRDLE)) 532 || op->type == BRACERS || op->type == GIRDLE))
564 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 533 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
565 { 534 {
566 op->destroy (); 535 op->destroy ();
567 continue; 536 continue;
568 } 537 }
569 } 538 }
… …
586 if (op->nrof > 1) 555 if (op->nrof > 1)
587 op->nrof = 1; 556 op->nrof = 1;
588 } 557 }
589 558
590 if (op->type == SPELLBOOK && op->inv) 559 if (op->type == SPELLBOOK && op->inv)
591 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 560 op->inv->clr_flag (FLAG_STARTEQUIP);
592 561
593 /* Give starting characters identified, uncursed, and undamned 562 /* Give starting characters identified, uncursed, and undamned
594 * 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
595 * merged properly. 564 * merged properly.
596 */ 565 */
597 if (need_identify (op)) 566 if (op->need_identify ())
598 { 567 {
599 SET_FLAG (op, FLAG_IDENTIFIED); 568 op->set_flag (FLAG_IDENTIFIED);
600 CLEAR_FLAG (op, FLAG_CURSED); 569 op->clr_flag (FLAG_CURSED);
601 CLEAR_FLAG (op, FLAG_DAMNED); 570 op->clr_flag (FLAG_DAMNED);
602 } 571 }
603 572
604 if (op->type == SPELL) 573 if (op->type == SPELL)
605 { 574 {
606 op->destroy (); 575 op->destroy ();
607 continue; 576 continue;
608 } 577 }
609 else if (op->type == SKILL) 578 else if (op->type == SKILL)
610 { 579 {
611 SET_FLAG (op, FLAG_CAN_USE_SKILL); 580 op->set_flag (FLAG_CAN_USE_SKILL);
612 op->stats.exp = 0; 581 op->stats.exp = 0;
613 op->level = 1; 582 op->level = 1;
614 } 583 }
615 else /* lock all 'normal items by default */ 584 else /* lock all 'normal items by default */
616 SET_FLAG (op, FLAG_INV_LOCKED); 585 op->set_flag (FLAG_INV_LOCKED);
617 } /* for loop of objects in player inv */ 586 } /* for loop of objects in player inv */
618 587
619 /* Need to set up the skill pointers */ 588 /* Need to set up the skill pointers */
620 pl->contr->link_skills (); 589 pl->contr->link_skills ();
621} 590}
… …
635 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:");
636} 605}
637 606
638/* 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. */
639static int 608static int
640roll_stat (void) 609roll_stat ()
641{ 610{
642 int a[4], i, j, k; 611 int a[4], i, j, k;
643 612
644 for (i = 0; i < 4; i++) 613 for (i = 0; i < 4; i++)
645 a[i] = (int) rndm (6) + 1; 614 a[i] = (int) rndm (6) + 1;
… …
755 724
756 if (ob->msg) 725 if (ob->msg)
757 ob->msg = 0; 726 ob->msg = 0;
758 727
759 start_info (ob); 728 start_info (ob);
760 CLEAR_FLAG (ob, FLAG_WIZ); 729 ob->clr_flag (FLAG_WIZ);
761 give_initial_items (ob, ob->randomitems); 730 give_initial_items (ob, ob->randomitems);
762 esrv_send_inventory (ob, ob); 731 esrv_send_inventory (ob, ob);
763 ob->update_stats (); 732 ob->update_stats ();
764 733
765 /* This moves the player to a different start map, if there 734 /* This moves the player to a different start map, if there
… …
814 rv_vector rv; 783 rv_vector rv;
815 784
816 if (op->stats.hp < 0) 785 if (op->stats.hp < 0)
817 { 786 {
818 LOG (llevDebug, "Fleeing player is dead.\n"); 787 LOG (llevDebug, "Fleeing player is dead.\n");
819 CLEAR_FLAG (op, FLAG_SCARED); 788 op->clr_flag (FLAG_SCARED);
820 return; 789 return;
821 } 790 }
822 791
823 if (!op->enemy) 792 if (!op->enemy)
824 { 793 {
825 LOG (llevDebug, "Fleeing player had no enemy.\n"); 794 LOG (llevDebug, "Fleeing player had no enemy.\n");
826 CLEAR_FLAG (op, FLAG_SCARED); 795 op->clr_flag (FLAG_SCARED);
827 return; 796 return;
828 } 797 }
829 798
830 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))
831 { 800 {
832 op->enemy = NULL; 801 op->enemy = NULL;
833 CLEAR_FLAG (op, FLAG_SCARED); 802 op->clr_flag (FLAG_SCARED);
834 return; 803 return;
835 } 804 }
836 805
837 get_rangevector (op, op->enemy, &rv, 0); 806 get_rangevector (op, op->enemy, &rv, 0);
838 807
839 dir = absdir (4 + rv.direction); 808 dir = absdir (4 + rv.direction);
840 for (diff = 0; diff < 3; diff++) 809 for (diff = 0; diff < 3; diff++)
841 { 810 {
842 int m = 1 - rndm (2) * 2; 811 int m = 1 - rndm (2) * 2;
843 812
844 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))))
845 return; 814 return;
846 } 815 }
847 816
848 /* Cornered, get rid of scared */ 817 /* Cornered, get rid of scared */
849 CLEAR_FLAG (op, FLAG_SCARED); 818 op->clr_flag (FLAG_SCARED);
850 op->enemy = NULL; 819 op->enemy = NULL;
851} 820}
852 821
853/* 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.
854 * 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
… …
859{ 828{
860 object *tmp, *next; 829 object *tmp, *next;
861 int stop = 0; 830 int stop = 0;
862 int wvratio; 831 int wvratio;
863 832
864 /* if you're flying, you cna't pick up anything */ 833 /* if you're flying, you can't pick up anything */
865 if (op->move_type & MOVE_FLYING) 834 if (op->move_type & MOVE_FLYING)
866 return 1; 835 return 1;
867 836
868 next = op->below; 837 next = op->below;
869 838
… …
946 * fighting */ 915 * fighting */
947 if (op->contr->mode & PU_INHIBIT) 916 if (op->contr->mode & PU_INHIBIT)
948 return 1; 917 return 1;
949 918
950 /* prevent us from turning into auto-thieves :) */ 919 /* prevent us from turning into auto-thieves :) */
951 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 920 if (tmp->flag [FLAG_UNPAID])
952 continue; 921 continue;
953 922
954 /* ignore known cursed objects */ 923 /* ignore known cursed objects */
955 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)
956 continue; 925 continue;
957 926
958 /* all food and drink if desired */ 927 /* all food and drink if desired */
959 /* question: don't pick up known-poisonous stuff? */ 928 /* question: don't pick up known-poisonous stuff? */
960 if (op->contr->mode & PU_FOOD) 929 if (op->contr->mode & PU_FOOD)
… …
963 CHK_PICK_PICKUP; 932 CHK_PICK_PICKUP;
964 continue; 933 continue;
965 } 934 }
966 935
967 if (op->contr->mode & PU_DRINK) 936 if (op->contr->mode & PU_DRINK)
968 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]))
969 { 938 {
970 CHK_PICK_PICKUP; 939 CHK_PICK_PICKUP;
971 continue; 940 continue;
972 } 941 }
973 942
… …
1011 continue; 980 continue;
1012 } 981 }
1013 982
1014 /* pick up all magical items */ 983 /* pick up all magical items */
1015 if (op->contr->mode & PU_MAGICAL) 984 if (op->contr->mode & PU_MAGICAL)
1016 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 985 if (tmp->flag [FLAG_KNOWN_MAGICAL]
1017 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 986 && !tmp->flag [FLAG_KNOWN_CURSED])
1018 { 987 {
1019 CHK_PICK_PICKUP; 988 CHK_PICK_PICKUP;
1020 continue; 989 continue;
1021 } 990 }
1022 991
… …
1106 continue; 1075 continue;
1107 } 1076 }
1108 1077
1109 /* hoping to catch throwing daggers here */ 1078 /* hoping to catch throwing daggers here */
1110 if (op->contr->mode & PU_MISSILEWEAPON) 1079 if (op->contr->mode & PU_MISSILEWEAPON)
1111 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1080 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1112 { 1081 {
1113 CHK_PICK_PICKUP; 1082 CHK_PICK_PICKUP;
1114 continue; 1083 continue;
1115 } 1084 }
1116 1085
… …
1171 * return 0. 1140 * return 0.
1172 */ 1141 */
1173static int 1142static int
1174action_makes_visible (object *op) 1143action_makes_visible (object *op)
1175{ 1144{
1176 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1145 if (op->invisible && op->flag [FLAG_ALIVE])
1177 { 1146 {
1178 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1147 if (op->flag [FLAG_MAKE_INVIS])
1179 { 1148 {
1180 // artefact invisibility is permanent, but we still make noise 1149 // artefact invisibility is permanent, but we still make noise
1181 // this is important for game-balance. 1150 // this is important for game-balance.
1182 if (op->contr) 1151 if (op->contr)
1183 op->make_noise (); 1152 op->make_noise ();
… …
1210 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1179 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1211 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1180 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1212 return splay (tmp); 1181 return splay (tmp);
1213 1182
1214 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1183 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1215 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))
1216 if (object *arrow = find_arrow (tmp, type)) 1185 if (object *arrow = find_arrow (tmp, type))
1217 { 1186 {
1218 splay (tmp); 1187 splay (tmp);
1219 return arrow; 1188 return arrow;
1220 } 1189 }
… …
1237 if (!type) 1206 if (!type)
1238 return NULL; 1207 return NULL;
1239 1208
1240 for (arrow = op->inv; arrow; arrow = arrow->below) 1209 for (arrow = op->inv; arrow; arrow = arrow->below)
1241 { 1210 {
1242 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1211 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1243 { 1212 {
1244 i = 0; 1213 i = 0;
1245 ntmp = find_better_arrow (arrow, target, type, &i); 1214 ntmp = find_better_arrow (arrow, target, type, &i);
1246 1215
1247 if (i > betterby) 1216 if (i > betterby)
… …
1348 break; 1317 break;
1349 } 1318 }
1350 1319
1351 if (mflags & P_IS_ALIVE) 1320 if (mflags & P_IS_ALIVE)
1352 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)
1353 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1322 if (tmp->flag [FLAG_ALIVE])
1354 break; 1323 break;
1355 } 1324 }
1356 1325
1357 if (!tmp) 1326 if (!tmp)
1358 return find_arrow (op, type); 1327 return find_arrow (op, type);
… …
1419 { 1388 {
1420 if (op->type == PLAYER) 1389 if (op->type == PLAYER)
1421 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);
1422 /* 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 */
1423 else 1392 else
1424 CLEAR_FLAG (op, FLAG_READY_BOW); 1393 op->clr_flag (FLAG_READY_BOW);
1425 1394
1426 return 0; 1395 return 0;
1427 } 1396 }
1428 } 1397 }
1429 1398
… …
1585 { 1554 {
1586 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1555 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1587 return; 1556 return;
1588 } 1557 }
1589 1558
1590 if (!op->change_weapon (item)) 1559 if (!op->apply (item))
1591 return; 1560 return;
1592 1561
1593 if (item->type == WAND) 1562 if (item->type == WAND)
1594 { 1563 {
1595 if (item->stats.food <= 0) 1564 if (item->stats.food <= 0)
… …
1629 { 1598 {
1630 object *tmp; 1599 object *tmp;
1631 1600
1632 if (item->arch) 1601 if (item->arch)
1633 { 1602 {
1634 CLEAR_FLAG (item, FLAG_ANIMATE); 1603 item->clr_flag (FLAG_ANIMATE);
1635 item->face = item->arch->face; 1604 item->face = item->arch->face;
1636 item->set_speed (0); 1605 item->set_speed (0);
1637 } 1606 }
1638 1607
1639 if (object *pl = item->visible_to ()) 1608 if (object *pl = item->visible_to ())
… …
1646} 1615}
1647 1616
1648/* Received a fire command for the player - go and do it. 1617/* Received a fire command for the player - go and do it.
1649 */ 1618 */
1650bool 1619bool
1651fire (object *op, int dir) 1620fire (object *who, int dir)
1652{ 1621{
1653 int spellcost = 0; 1622 int spellcost = 0;
1654 1623
1655 player *pl = op->contr; 1624 player *pl = who->contr;
1656 1625
1657 if (pl->golem) 1626 if (pl->golem)
1658 { 1627 {
1659 control_golem (op->contr->golem, dir); 1628 control_golem (who->contr->golem, dir);
1660 return false; 1629 return false;
1661 } 1630 }
1662 1631
1663 object *ob = pl->ranged_ob; 1632 object *ob = pl->ranged_ob;
1664 1633
1665 if (!ob) 1634 if (!ob)
1666 return false; 1635 return false;
1667 1636
1668 if (op->speed_left > 0.f) 1637 if (who->speed_left > 0.f)
1669 --op->speed_left; 1638 --who->speed_left;
1670 else 1639 else
1671 return false; 1640 return false;
1672 1641
1673 if (!op->change_weapon (ob)) 1642 if (!who->apply (ob))
1674 return false; 1643 return false;
1675 1644
1676 /* check for loss of invisiblity/hide */ 1645 /* check for loss of invisiblity/hide */
1677 if (action_makes_visible (op)) 1646 if (action_makes_visible (who))
1678 make_visible (op); 1647 make_visible (who);
1679 1648
1680 switch (ob->type) 1649 switch (ob->type)
1681 { 1650 {
1682 case BOW: 1651 case BOW:
1683 player_fire_bow (op, dir); 1652 player_fire_bow (who, dir);
1684 break; 1653 break;
1685 1654
1686 case SPELL: 1655 case SPELL:
1687 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);
1688 break; 1657 break;
1689 1658
1690 case BUILDER: 1659 case BUILDER:
1691 apply_map_builder (op, dir); 1660 apply_map_builder (who, dir);
1692 break; 1661 break;
1693 1662
1694 case SKILL: 1663 case SKILL:
1695 do_skill (op, op, ob, dir, 0); 1664 do_skill (who, who, ob, dir, 0);
1696 break; 1665 break;
1697 1666
1667 case RANGED:
1668 do_skill (who, ob, who->chosen_skill, dir, 0);
1669 break;
1670
1698 default: 1671 default:
1699 fire_misc_object (op, dir); 1672 fire_misc_object (who, dir);
1700 break; 1673 break;
1701 } 1674 }
1702 1675
1703 return true; 1676 return true;
1704} 1677}
… …
1763 * 1736 *
1764 * Change the color so that the message doesn't disappear with 1737 * Change the color so that the message doesn't disappear with
1765 * all the others. 1738 * all the others.
1766 */ 1739 */
1767 if (pl->contr->usekeys == key_inventory 1740 if (pl->contr->usekeys == key_inventory
1768 || !QUERY_FLAG (container, FLAG_APPLIED) 1741 || !container->flag [FLAG_APPLIED]
1769 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1742 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1770 { 1743 {
1771 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1744 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1772 "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));
1773 return NULL; 1746 return NULL;
… …
1857 * going to try and move (not fire weapons). 1830 * going to try and move (not fire weapons).
1858 */ 1831 */
1859bool 1832bool
1860move_player_attack (object *op, int dir) 1833move_player_attack (object *op, int dir)
1861{ 1834{
1862 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))
1863 { 1836 {
1864 --op->speed_left; 1837 --op->speed_left;
1865 return true; 1838 return true;
1866 } 1839 }
1867 1840
1868 int on_battleground;
1869
1870 sint16 nx = freearr_x[dir] + op->x; 1841 sint16 nx = freearr_x[dir] + op->x;
1871 sint16 ny = freearr_y[dir] + op->y; 1842 sint16 ny = freearr_y[dir] + op->y;
1872
1873 on_battleground = op_on_battleground (op, 0, 0);
1874 1843
1875 if (out_of_map (op->map, nx, ny)) 1844 if (out_of_map (op->map, nx, ny))
1876 return false; 1845 return false;
1877 1846
1878 /* 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
… …
1928 */ 1897 */
1929 if (op->type == PLAYER 1898 if (op->type == PLAYER
1930 && ((mon->owner && mon->owner->contr 1899 && ((mon->owner && mon->owner->contr
1931 && same_party (mon->owner->contr->party, op->contr->party)) 1900 && same_party (mon->owner->contr->party, op->contr->party))
1932 || mon->owner == op) 1901 || mon->owner == op)
1933 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1902 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1934 { 1903 {
1935 /* 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 */
1936 if (op->contr->braced) 1905 if (op->contr->braced)
1937 return false; 1906 return false;
1938 1907
… …
1949 return true; 1918 return true;
1950 } 1919 }
1951 else 1920 else
1952 return false; 1921 return false;
1953 } 1922 }
1923
1924 bool on_battleground = op_on_battleground (op, 0, 0);
1954 1925
1955 /* in certain circumstances, you shouldn't attack friendly 1926 /* in certain circumstances, you shouldn't attack friendly
1956 * creatures. Note that if you are braced, you can't push 1927 * creatures. Note that if you are braced, you can't push
1957 * 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
1958 * attack them either. 1929 * attack them either.
1959 */ 1930 */
1960 if ((mon->type == PLAYER || mon->enemy != op) 1931 if ((mon->type == PLAYER || mon->enemy != op)
1961 && (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])
1962 && ((op->contr->peaceful 1933 && ((op->contr->peaceful
1963 || (mon->type == PLAYER && mon->contr->peaceful)) 1934 || (mon->type == PLAYER && mon->contr->peaceful))
1964 && !on_battleground)) 1935 && !on_battleground))
1965 { 1936 {
1966 if (op->speed_left > 0.f) 1937 if (op->speed_left > 0.f)
… …
1982 } 1953 }
1983 } 1954 }
1984 /* If the object is a boulder or other rollable object, then 1955 /* If the object is a boulder or other rollable object, then
1985 * 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.
1986 */ 1957 */
1987 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1958 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1988 { 1959 {
1989 if (op->speed_left > 0.f) 1960 if (op->speed_left > 0.f)
1990 { 1961 {
1991 --op->speed_left; 1962 --op->speed_left;
1992 1963
… …
2001 * 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
2002 * and be living. Then, it must be one of the following: 1973 * and be living. Then, it must be one of the following:
2003 * 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
2004 * 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.
2005 */ 1976 */
2006 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1977 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2007 ((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)))
2008 { 1979 {
2009 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])
2010 { 1981 {
2011 --op->contr->weapon_sp_left; 1982 --op->contr->weapon_sp_left;
… …
2027{ 1998{
2028 if (!op->map || op->map->in_memory != MAP_ACTIVE) 1999 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2029 return 0; 2000 return 0;
2030 2001
2031 /* Sanity check: make sure dir is valid */ 2002 /* Sanity check: make sure dir is valid */
2032 if ((dir < 0) || (dir >= 9)) 2003 if (dir < 0 || dir > 8)
2033 { 2004 {
2034 LOG (llevError, "move_player: invalid direction %d\n", dir); 2005 LOG (llevError, "move_player: invalid direction %d\n", dir);
2035 return 0; 2006 return 0;
2036 } 2007 }
2037 2008
2038 /* peterm: added following line */ 2009 /* peterm: added following line */
2039 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2010 if (op->flag [FLAG_CONFUSED] && dir)
2040 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2011 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2041 2012
2042 op->facing = dir; 2013 op->facing = dir;
2043 2014
2044 if (op->flag [FLAG_HIDDEN]) 2015 if (op->flag [FLAG_HIDDEN])
… …
2084 * players. 2055 * players.
2085 */ 2056 */
2086bool 2057bool
2087handle_newcs_player (object *op) 2058handle_newcs_player (object *op)
2088{ 2059{
2089 if (QUERY_FLAG (op, FLAG_SCARED)) 2060 if (op->flag [FLAG_SCARED])
2090 { 2061 {
2091 if (op->speed_left > 0.f) 2062 if (op->speed_left > 0.f)
2092 { 2063 {
2093 --op->speed_left; 2064 --op->speed_left;
2094 flee_player (op); 2065 flee_player (op);
… …
2113} 2084}
2114 2085
2115static int 2086static int
2116save_life (object *op) 2087save_life (object *op)
2117{ 2088{
2118 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2089 if (!op->flag [FLAG_LIFESAVE])
2119 return 0; 2090 return 0;
2120 2091
2121 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2092 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2122 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2093 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2123 { 2094 {
2124 op->play_sound (sound_find ("ob_evaporate")); 2095 op->play_sound (sound_find ("ob_evaporate"));
2125 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));
2126 2097
2127 tmp->destroy (); 2098 tmp->destroy ();
2128 CLEAR_FLAG (op, FLAG_LIFESAVE); 2099 op->clr_flag (FLAG_LIFESAVE);
2129 2100
2130 if (op->stats.hp < 0) 2101 if (op->stats.hp < 0)
2131 op->stats.hp = op->stats.maxhp; 2102 op->stats.hp = op->stats.maxhp;
2132 2103
2133 if (op->stats.food < 0) 2104 if (op->stats.food < 0)
2134 op->stats.food = 999; 2105 op->stats.food = MAX_FOOD;
2135 2106
2136 op->update_stats (); 2107 op->update_stats ();
2137 return 1; 2108 return 1;
2138 } 2109 }
2139 2110
2140 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2111 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2141 CLEAR_FLAG (op, FLAG_LIFESAVE); 2112 op->clr_flag (FLAG_LIFESAVE);
2142 enter_player_savebed (op); /* bring him home. */ 2113 enter_player_savebed (op); /* bring him home. */
2143 return 0; 2114 return 0;
2144} 2115}
2145 2116
2146/* 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
… …
2153{ 2124{
2154 while (op) 2125 while (op)
2155 { 2126 {
2156 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' */
2157 2128
2158 if (QUERY_FLAG (op, FLAG_UNPAID)) 2129 if (op->flag [FLAG_UNPAID])
2159 op->insert_at (env); 2130 op->insert_at (env);
2160 else if (op->inv) 2131 else if (op->inv)
2161 drop_unpaid_items (op->inv, env); 2132 drop_unpaid_items (op->inv, env);
2162 2133
2163 op = next; 2134 op = next;
… …
2193 * alternate it here for it to work correctly. 2164 * alternate it here for it to work correctly.
2194 */ 2165 */
2195 if (pticks & 2) 2166 if (pticks & 2)
2196 op->invisible--; 2167 op->invisible--;
2197 } 2168 }
2198 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2169 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2199 { 2170 {
2200 if (!op->invisible--) 2171 if (!op->invisible--)
2201 { 2172 {
2202 make_visible (op); 2173 make_visible (op);
2203 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.");
… …
2270 if (op->stats.sp < op->stats.maxsp) 2241 if (op->stats.sp < op->stats.maxsp)
2271 { 2242 {
2272 op->stats.sp++; 2243 op->stats.sp++;
2273 2244
2274 /* dms do not consume food */ 2245 /* dms do not consume food */
2275 if (!QUERY_FLAG (op, FLAG_WIZ)) 2246 if (!op->flag [FLAG_WIZ])
2276 { 2247 {
2277 op->stats.food--; 2248 op->stats.food--;
2278 2249
2279 if (op->contr->digestion < 0) 2250 if (op->contr->digestion < 0)
2280 op->stats.food += op->contr->digestion; 2251 op->stats.food += op->contr->digestion;
… …
2314 if (op->stats.hp < op->stats.maxhp) 2285 if (op->stats.hp < op->stats.maxhp)
2315 { 2286 {
2316 op->stats.hp++; 2287 op->stats.hp++;
2317 2288
2318 /* dms do not consume food */ 2289 /* dms do not consume food */
2319 if (!QUERY_FLAG (op, FLAG_WIZ)) 2290 if (!op->flag [FLAG_WIZ])
2320 { 2291 {
2321 op->stats.food--; 2292 op->stats.food--;
2322 2293
2323 if (op->contr->digestion < 0) 2294 if (op->contr->digestion < 0)
2324 op->stats.food += op->contr->digestion; 2295 op->stats.food += op->contr->digestion;
… …
2351 penalty = max (0, -op->contr->digestion); 2322 penalty = max (0, -op->contr->digestion);
2352 2323
2353 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);
2354 2325
2355 /* dms do not consume food */ 2326 /* dms do not consume food */
2356 if (!QUERY_FLAG (op, FLAG_WIZ)) 2327 if (!op->flag [FLAG_WIZ])
2357 op->stats.food--; 2328 op->stats.food--;
2358 } 2329 }
2359 2330
2360 if (op->stats.food < 0 && op->stats.hp >= 0) 2331 if (op->stats.food < 0 && op->stats.hp >= 0)
2361 { 2332 {
2362 object *flesh = 0; 2333 object *flesh = 0;
2363 2334
2364 for_inv_removable (op, tmp) 2335 for_inv_removable (op, tmp)
2365 { 2336 {
2366 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2337 if (tmp->flag [FLAG_UNPAID])
2367 continue; 2338 continue;
2368 2339
2369 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2340 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2370 { 2341 {
2371 op->statusmsg ("You blindly grab for a bite of food. " 2342 op->statusmsg ("You blindly grab for a bite of food. "
2372 "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.>");
2373 manual_apply (op, tmp, 0); 2344 op->apply (tmp);
2374 2345
2375 if (op->stats.food >= 0 || op->stats.hp < 0) 2346 if (op->stats.food >= 0 || op->stats.hp < 0)
2376 break; 2347 break;
2377 } 2348 }
2378 else if (tmp->type == FLESH) 2349 else if (tmp->type == FLESH)
… …
2384 */ 2355 */
2385 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2356 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2386 { 2357 {
2387 op->statusmsg ("You blindly grab for a bite of food. " 2358 op->statusmsg ("You blindly grab for a bite of food. "
2388 "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.>");
2389 manual_apply (op, flesh, 0); 2360 op->apply (flesh);
2390 } 2361 }
2391 2362
2392 // If player is still starving, alert him! 2363 // If player is still starving, alert him!
2393 if (op->stats.food < 0) 2364 if (op->stats.food < 0)
2394 op->failmsg ("You are starving! " 2365 op->failmsg ("You are starving! "
… …
2406 op->contr->killer->destroy (); 2377 op->contr->killer->destroy ();
2407 } 2378 }
2408 } 2379 }
2409 2380
2410 /* killer should be set here already */ 2381 /* killer should be set here already */
2411 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2382 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2412 kill_player (op); 2383 kill_player (op);
2413 } 2384 }
2414} 2385}
2415 2386
2416/* 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.
… …
2450 cure_disease (op, 0, 0); /* remove any disease */ 2421 cure_disease (op, 0, 0); /* remove any disease */
2451 2422
2452 max_it (op->stats.hp , op->stats.maxhp); 2423 max_it (op->stats.hp , op->stats.maxhp);
2453 max_it (op->stats.sp , op->stats.maxsp); 2424 max_it (op->stats.sp , op->stats.maxsp);
2454 max_it (op->stats.grace, op->stats.maxgrace); 2425 max_it (op->stats.grace, op->stats.maxgrace);
2455
2456 if (op->stats.food <= 0) 2426 max_it (op->stats.food , 200);
2457 op->stats.food = 999;
2458 2427
2459 // remove all spell effects that are active 2428 // remove all spell effects that are active
2460 // to avoid long-term effects such as word-of-recall 2429 // to avoid long-term effects such as word-of-recall
2461 for (object *item = op->inv; item; ) 2430 for (object *item = op->inv; item; )
2462 { 2431 {
… …
2475 if (op_on_battleground (op, &x, &y)) 2444 if (op_on_battleground (op, &x, &y))
2476 { 2445 {
2477 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";
2478 2447
2479 /* create a bodypart-trophy to make the winner happy */ 2448 /* create a bodypart-trophy to make the winner happy */
2480 if (object *tmp = arch_to_object (archetype::find (shstr_finger))) 2449 object *tmp = archetype::find (shstr_finger)->instance ();
2481 { 2450
2482 tmp->name = format ("%s's finger" , &op->name); 2451 tmp->name = format ("%s's finger" , &op->name);
2483 tmp->name_pl = format ("%s's fingers", &op->name); 2452 tmp->name_pl = format ("%s's fingers", &op->name);
2484 tmp->msg = format ( 2453 tmp->msg = format (
2485 "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",
2486 &op->name, op->contr->title, 2455 &op->name, op->contr->title,
2487 (int)op->level, 2456 (int)op->level,
2488 op->contr->killer_name () 2457 op->contr->killer_name ()
2489 ); 2458 );
2490 tmp->value = 0, tmp->type = 0; 2459 tmp->value = 0, tmp->type = 0;
2491 tmp->material = name_to_material (shstr_organic); 2460 tmp->material = name_to_material (shstr_organic);
2492 tmp->insert_at (op, tmp); 2461 tmp->insert_at (op, tmp);
2493 }
2494 2462
2495 /* teleport defeated player to new destination */ 2463 /* teleport defeated player to new destination */
2496 transfer_ob (op, x, y, 0, NULL); 2464 transfer_ob (op, x, y, 0, NULL);
2497 op->contr->braced = 0; 2465 op->contr->braced = 0;
2498 2466
… …
2566 object *dep; 2534 object *dep;
2567 2535
2568 dep = present_arch_in_ob (deparch, op); 2536 dep = present_arch_in_ob (deparch, op);
2569 if (!dep) 2537 if (!dep)
2570 { 2538 {
2571 dep = arch_to_object (deparch); 2539 dep = deparch->instance ();
2572 insert_ob_in_ob (dep, op); 2540 insert_ob_in_ob (dep, op);
2573 } 2541 }
2574 lose_this_stat = 1; 2542 lose_this_stat = 1;
2575 if (settings.balanced_stat_loss) 2543 if (settings.balanced_stat_loss)
2576 { 2544 {
… …
2614 * difference. 2582 * difference.
2615 */ 2583 */
2616 if (this_stat >= -50) 2584 if (this_stat >= -50)
2617 { 2585 {
2618 change_attr_value (&(dep->stats), i, -1); 2586 change_attr_value (&(dep->stats), i, -1);
2619 SET_FLAG (dep, FLAG_APPLIED); 2587 dep->set_flag (FLAG_APPLIED);
2620 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2588 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2621 op->update_stats (); 2589 op->update_stats ();
2622 lost_a_stat = 1; 2590 lost_a_stat = 1;
2623 } 2591 }
2624 } 2592 }
… …
2642#endif 2610#endif
2643 2611
2644 /* Put a gravestone up where the character 'almost' died. List the 2612 /* Put a gravestone up where the character 'almost' died. List the
2645 * exp loss on the stone. 2613 * exp loss on the stone.
2646 */ 2614 */
2647 tmp = arch_to_object (archetype::find (shstr_gravestone)); 2615 tmp = archetype::find (shstr_gravestone)->instance ();
2648 tmp->name = format ("%s's gravestone", &op->name); 2616 tmp->name = format ("%s's gravestone", &op->name);
2649 tmp->name_pl = format ("%s's gravestones", &op->name); 2617 tmp->name_pl = format ("%s's gravestones", &op->name);
2650 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",
2651 &op->name, op->contr->title, op->contr->killer_name ()); 2619 &op->name, op->contr->title, op->contr->killer_name ());
2652 tmp->x = op->x, tmp->y = op->y; 2620 tmp->x = op->x, tmp->y = op->y;
… …
2695 2663
2696 force = get_archetype (FORCE_NAME); 2664 force = get_archetype (FORCE_NAME);
2697 /* 50 ticks should be enough time for the spell to abate */ 2665 /* 50 ticks should be enough time for the spell to abate */
2698 force->speed = 0.1f; 2666 force->speed = 0.1f;
2699 force->speed_left = -5.f; 2667 force->speed_left = -5.f;
2700 SET_FLAG (force, FLAG_APPLIED); 2668 force->set_flag (FLAG_APPLIED);
2701 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2702 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2703 force->resist[at] = 100; 2671 force->resist[at] = 100;
2704 2672
2705 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
… …
2727 tmp->x = op->x, tmp->y = op->y; 2695 tmp->x = op->x, tmp->y = op->y;
2728 2696
2729 if (tmp->type == CONTAINER) 2697 if (tmp->type == CONTAINER)
2730 loot_object (tmp); /* empty container to ground */ 2698 loot_object (tmp); /* empty container to ground */
2731 2699
2732 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))))
2733 { 2701 {
2734 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2735 { 2703 {
2736 tmp->decrease (rndm (1, tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2737 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2748 * fix_weight(): Check recursively the weight of all players, and fix 2716 * fix_weight(): Check recursively the weight of all players, and fix
2749 * 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
2750 * was changed. 2718 * was changed.
2751 */ 2719 */
2752void 2720void
2753fix_weight (void) 2721fix_weight ()
2754{ 2722{
2755 for_all_players (pl) 2723 for_all_players (pl)
2756 { 2724 {
2757 sint32 old = pl->ob->carrying; 2725 sint32 old = pl->ob->carrying;
2758 2726
… …
2765 } 2733 }
2766 } 2734 }
2767} 2735}
2768 2736
2769void 2737void
2770fix_luck (void) 2738fix_luck ()
2771{ 2739{
2772 for_all_players (pl) 2740 for_all_players (pl)
2773 if (!pl->ob->contr->ns->state) 2741 if (!pl->ob->contr->ns->state)
2774 pl->ob->change_luck (0); 2742 pl->ob->change_luck (0);
2775} 2743}
… …
2827} 2795}
2828 2796
2829int 2797int
2830is_true_undead (object *op) 2798is_true_undead (object *op)
2831{ 2799{
2832 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2800 if (op->arch->flag [FLAG_UNDEAD])
2833 return 1; 2801 return 1;
2834 2802
2835 return 0; 2803 return 0;
2836} 2804}
2837 2805
… …
2935 2903
2936 if (who->type == PLAYER) 2904 if (who->type == PLAYER)
2937 player = 1; 2905 player = 1;
2938 2906
2939 else 2907 else
2940 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2908 friendly = who->flag [FLAG_FRIENDLY];
2941 2909
2942 /* search adjacent squares */ 2910 /* search adjacent squares */
2943 for (i = 1; i < 9; i++) 2911 for (i = 1; i < 9; i++)
2944 { 2912 {
2945 x = who->x + freearr_x[i]; 2913 x = who->x + freearr_x[i];
… …
2954 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)))
2955 continue; 2923 continue;
2956 2924
2957 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)
2958 { 2926 {
2959 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])
2960 return 1; 2928 return 1;
2961 else if (tmp->type == PLAYER) 2929 else if (tmp->type == PLAYER)
2962 { 2930 {
2963 /*don't let a hidden DM prevent you from hiding */ 2931 /*don't let a hidden DM prevent you from hiding */
2964 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2932 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2965 return 1; 2933 return 1;
2966 } 2934 }
2967 } 2935 }
2968 } 2936 }
2969 return 0; 2937 return 0;
… …
3038 * and the exit-coordinates sp/hp must both be > 0. 3006 * and the exit-coordinates sp/hp must both be > 0.
3039 * => The intention here is to prevent abuse of the battleground- 3007 * => The intention here is to prevent abuse of the battleground-
3040 * feature (like pickable or hidden battleground tiles). */ 3008 * feature (like pickable or hidden battleground tiles). */
3041 for (object *tmp = op->below; tmp; tmp = tmp->below) 3009 for (object *tmp = op->below; tmp; tmp = tmp->below)
3042 { 3010 {
3043 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3011 if (tmp->flag [FLAG_IS_FLOOR])
3044 { 3012 {
3045 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3013 if (tmp->flag [FLAG_NO_PICK]
3046 && tmp->type == BATTLEGROUND 3014 && tmp->type == BATTLEGROUND
3047 && tmp->name == shstr_battleground 3015 && tmp->name == shstr_battleground
3048 && EXIT_X (tmp) && EXIT_Y (tmp)) 3016 && EXIT_X (tmp) && EXIT_Y (tmp))
3049 { 3017 {
3050 /* before we assign the exit, check if this is a teambattle */ 3018 /* before we assign the exit, check if this is a teambattle */
3051 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))
3052 {
3053 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)
3054 { 3022 {
3055 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3056 {
3057 if (x && y) 3023 if (x && y)
3058 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3024 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3059 3025
3060 return 1; 3026 return 1;
3061 }
3062 } 3027 }
3063 }
3064 3028
3065 if (x && y) 3029 if (x && y)
3066 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3030 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3067 3031
3068 return 1; 3032 return 1;
… …
3206 else 3170 else
3207 j = 1; 3171 j = 1;
3208 strcat (buf, spellpathnames[i]); 3172 strcat (buf, spellpathnames[i]);
3209 } 3173 }
3210 } 3174 }
3175
3211 strcat (buf, "."); 3176 strcat (buf, ".");
3212 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3177 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3213 } 3178 }
3214 3179
3215 /* evtl. adding flags: */ 3180 /* evtl. adding flags: */
3216 if (QUERY_FLAG (item, FLAG_XRAYS)) 3181 if (item->flag [FLAG_XRAYS])
3217 SET_FLAG (skin, FLAG_XRAYS); 3182 skin->set_flag (FLAG_XRAYS);
3218 if (QUERY_FLAG (item, FLAG_STEALTH)) 3183 if (item->flag [FLAG_STEALTH])
3219 SET_FLAG (skin, FLAG_STEALTH); 3184 skin->set_flag (FLAG_STEALTH);
3220 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3185 if (item->flag [FLAG_SEE_IN_DARK])
3221 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3186 skin->set_flag (FLAG_SEE_IN_DARK);
3222 3187
3223 /* print message if there is one */ 3188 /* print message if there is one */
3224 if (item->msg != NULL) 3189 if (item->msg != NULL)
3225 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3190 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3226 } 3191 }
3227 else 3192 else
3228 { 3193 {
3229 /* generate misc. treasure */ 3194 /* generate misc. treasure */
3230 tmp = arch_to_object (tr->item); 3195 tmp = tr->item->instance ();
3231 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));
3232 who->insert (tmp); 3197 who->insert (tmp);
3233 } 3198 }
3234}
3235
3236/**
3237 * Unready an object for a player. This function does nothing if the object was
3238 * not readied.
3239 */
3240void
3241player_unready_range_ob (player *pl, object *ob)
3242{
3243 if (pl->ob->current_weapon == ob)
3244 pl->ob->current_weapon = 0;
3245
3246 if (pl->combat_ob == ob)
3247 pl->combat_ob = 0;
3248
3249 if (pl->ranged_ob == ob)
3250 pl->ranged_ob = 0;
3251} 3199}
3252 3200
3253//-GPL 3201//-GPL
3254 3202
3255sint8 3203sint8
… …
3285{ 3233{
3286 play_sound (sound_find ("generic_failure")); 3234 play_sound (sound_find ("generic_failure"));
3287 statusmsg (msg, color); 3235 statusmsg (msg, color);
3288} 3236}
3289 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