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.255 by root, Fri Mar 26 00:53:26 2010 UTC vs.
Revision 1.288 by root, Tue Jan 3 11:25:36 2012 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,2011,2012 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.
… …
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25//+GPL 25//+GPL
26 26
27#include <algorithm>
28#include <functional>
29
27#include <global.h> 30#include <global.h>
28#include <sproto.h> 31#include <sproto.h>
29#include <sounds.h> 32#include <sounds.h>
30#include <living.h> 33#include <living.h>
31#include <object.h> 34#include <object.h>
32#include <spells.h> 35#include <spells.h>
33#include <skills.h> 36#include <skills.h>
34 37
35#include <algorithm>
36#include <functional>
37
38playervec players; 38playervec players;
39 39
40/* This loads the first map an puts the player on it. */ 40/* This loads the first map an puts the player on it. */
41static void 41static void
42set_first_map (object *op) 42set_first_map (object *op)
… …
54 54
55 players.insert (this); 55 players.insert (this);
56 ob->remove (); 56 ob->remove ();
57 ob->map = 0; 57 ob->map = 0;
58 ob->activate_recursive (); 58 ob->activate_recursive ();
59 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 ob->clr_flag (FLAG_FRIENDLY);
60 add_friendly_object (ob); 60 add_friendly_object (ob);
61} 61}
62 62
63void 63void
64player::deactivate () 64player::deactivate ()
… …
75 75
76 ob->remove (); 76 ob->remove ();
77 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
78 ob->map = 0; 78 ob->map = 0;
79 party = 0; 79 party = 0;
80
81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82 80
83 players.erase (this); 81 players.erase (this);
84} 82}
85 83
86// connect the player with a specific client 84// connect the player with a specific client
… …
128 126
129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
130 128
131 esrv_new_player (this); 129 esrv_new_player (this);
132 130
131 ob->flag [FLAG_READY_WEAPON] = false;
132 ob->flag [FLAG_READY_SKILL] = false;
133 ob->flag [FLAG_READY_RANGE] = false;
134 ob->flag [FLAG_READY_BOW] = false;
135
133 ob->update_stats (); 136 ob->update_stats ();
134 137
135 ns->floorbox_update (); 138 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob); 139 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0); 140 esrv_add_spells (this, 0);
138 141
139 ob->flag [FLAG_READY_WEAPON] = false; 142 activate ();
140 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_BOW] = false;
142
143 for (object *op = ob->inv; op; op = op->below)
144 if (op->flag [FLAG_APPLIED])
145 switch (op->type)
146 {
147 case SKILL:
148 op->flag [FLAG_APPLIED] = false;
149 break;
150
151 case WAND:
152 case ROD:
153 case HORN:
154 case BOW:
155 ranged_ob = op;
156 break;
157
158 case WEAPON:
159 combat_ob = op;
160 break;
161 }
162
163 ob->current_weapon = 0;
164 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
165 activate (); // change_weapon also activates, but this doesn't hurt
166 143
167 INVOKE_PLAYER (CONNECT, this); 144 INVOKE_PLAYER (CONNECT, this);
168 INVOKE_PLAYER (LOGIN, this); 145 INVOKE_PLAYER (LOGIN, this);
169} 146}
170 147
… …
204player::set_object (object *op) 181player::set_object (object *op)
205{ 182{
206 ob = observe = viewpoint = op; 183 ob = observe = viewpoint = op;
207 ob->contr = this; /* this aren't yet in archetype */ 184 ob->contr = this; /* this aren't yet in archetype */
208 185
209 ob->speed = 1.0f; 186 ob->speed = 1.0f; // object still inactive, keep it that way
210 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
211 188
212 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
213} 190}
214 191
… …
256 disconnect (); 233 disconnect ();
257 234
258 attachable::do_destroy (); 235 attachable::do_destroy ();
259 236
260 if (ob) 237 if (ob)
261 {
262 ob->destroy_inv (false);
263 ob->destroy (); 238 ob->destroy ();
264 }
265 239
266 ob = observe = viewpoint = 0; 240 ob = observe = viewpoint = 0;
267} 241}
268 242
269player::~player () 243player::~player ()
… …
399 */ 373 */
400int 374int
401path_to_player (object *mon, object *pl, unsigned mindiff) 375path_to_player (object *mon, object *pl, unsigned mindiff)
402{ 376{
403 rv_vector rv; 377 rv_vector rv;
404 sint16 x, y;
405 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 378 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
406 maptile *m, *lastmap;
407 379
408 get_rangevector (mon, pl, &rv, 0); 380 get_rangevector (mon, pl, &rv, 0);
409 381
410 if (rv.distance < mindiff) 382 if (rv.distance < mindiff)
411 return 0; 383 return 0;
412 384
413 x = mon->x; 385 mapxy pos (mon);
414 y = mon->y;
415 m = mon->map;
416 dir = rv.direction; 386 dir = rv.direction;
417 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 387 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
418 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 388 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
419 389
420 /* If we can't solve it within the search distance, return now. */ 390 /* If we can't solve it within the search distance, return now. */
421 if (diff > max) 391 if (diff > max)
422 return 0; 392 return 0;
423 393
424 while (diff > 1 && max > 0) 394 while (diff > 1 && max > 0)
425 { 395 {
426 lastx = x; 396 mapxy lastpos = pos;
427 lasty = y;
428 lastmap = m;
429 x = lastx + freearr_x[dir];
430 y = lasty + freearr_y[dir];
431 397
432 mflags = get_map_flags (m, &m, x, y, &x, &y); 398 pos.move (dir);
433 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
434 399
435 /* Space is blocked - try changing direction a little */ 400 /* Space is blocked - try changing direction a little */
436 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 401 if (!pos.normalise ()
437 && (m == mon->map && blocked_link (mon, m, x, y)))) 402 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
403 && blocked_link (mon, pos.m, pos.x, pos.y)))
438 { 404 {
439 /* recalculate direction from last good location. Possible 405 /* recalculate direction from last good location. Possible
440 * we were not traversing ideal location before. 406 * we were not traversing ideal location before.
441 */ 407 */
442 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 408 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
443 if (rv.direction != dir) 409 if (rv.direction != dir)
444 { 410 {
445 /* OK - says direction should be different - lets reset the 411 /* OK - says direction should be different - lets reset the
446 * the values so it will try again. 412 * the values so it will try again.
447 */ 413 */
448 x = lastx;
449 y = lasty;
450 m = lastmap; 414 pos = lastpos;
451 dir = firstdir = rv.direction; 415 dir = firstdir = rv.direction;
452 } 416 }
453 else 417 else
454 { 418 {
455 /* direct path is blocked - try taking a side step to 419 /* direct path is blocked - try taking a side step to
… …
462 */ 426 */
463 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 427 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
464 { 428 {
465 if (i == 0) 429 if (i == 0)
466 continue; /* already did this, so skip it */ 430 continue; /* already did this, so skip it */
431
467 /* Use lastdir here - otherwise, 432 /* Use lastdir here - otherwise,
468 * since the direction that the creature should move in 433 * since the direction that the creature should move in
469 * may change, you could get infinite loops. 434 * may change, you could get infinite loops.
470 * ie, player is northwest, but monster can only 435 * ie, player is northwest, but monster can only
471 * move west, so it does that. It goes some distance, 436 * move west, so it does that. It goes some distance,
… …
473 * can't do that, but now finds it can move east, and 438 * can't do that, but now finds it can move east, and
474 * gets back to its original point. lastdir contains 439 * gets back to its original point. lastdir contains
475 * the last direction the creature has successfully 440 * the last direction the creature has successfully
476 * moved. 441 * moved.
477 */ 442 */
478
479 x = lastx + freearr_x[absdir (lastdir + i)];
480 y = lasty + freearr_y[absdir (lastdir + i)];
481 m = lastmap; 443 pos = lastpos;
482 mflags = get_map_flags (m, &m, x, y, &x, &y); 444 pos.move (absdir (lastdir + i));
483 if (mflags & P_OUT_OF_MAP) 445
446 if (!pos.normalise ())
484 continue; 447 continue;
485 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 448
486 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 449 mapspace &ms = *pos;
450
451 if (ms.flags () & P_BLOCKSVIEW)
487 continue; 452 continue;
488 if (mflags & P_BLOCKSVIEW) 453
454 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
489 continue; 455 continue;
490 456
491 if (m == mon->map && blocked_link (mon, m, x, y)) 457 if (blocked_link (mon, pos.m, pos.x, pos.y))
492 break; 458 break;
493 } 459 }
460
494 /* go through entire loop without finding a valid 461 /* go through entire loop without finding a valid
495 * sidestep to take - thus, no valid path. 462 * sidestep to take - thus, no valid path.
496 */ 463 */
497 if (i == (DETOUR_AMOUNT + 1)) 464 if (i == DETOUR_AMOUNT + 1)
498 return 0; 465 return 0;
466
499 diff--; 467 diff--;
500 lastdir = dir; 468 lastdir = dir;
501 max--; 469 max--;
502 if (!firstdir) 470 if (!firstdir)
503 firstdir = dir + i; 471 firstdir = dir + i;
… …
507 { 475 {
508 /* we moved towards creature, so diff is less */ 476 /* we moved towards creature, so diff is less */
509 diff--; 477 diff--;
510 max--; 478 max--;
511 lastdir = dir; 479 lastdir = dir;
480
512 if (!firstdir) 481 if (!firstdir)
513 firstdir = dir; 482 firstdir = dir;
514 } 483 }
515 484
516 if (diff <= 1) 485 if (diff <= 1)
517 { 486 {
518 /* Recalculate diff (distance) because we may not have actually 487 /* Recalculate diff (distance) because we may not have actually
519 * headed toward player for entire distance. 488 * headed toward player for entire distance.
520 */ 489 */
521 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 490 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
522 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 491 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
523 } 492 }
524 493
525 if (diff > max) 494 if (diff > max)
526 return 0; 495 return 0;
… …
544 next = op->below; 513 next = op->below;
545 514
546 /* Forces get applied per default, unless they have the 515 /* Forces get applied per default, unless they have the
547 * flag "neutral" set. Sorry but I can't think of a better way 516 * flag "neutral" set. Sorry but I can't think of a better way
548 */ 517 */
549 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 518 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
550 SET_FLAG (op, FLAG_APPLIED); 519 op->set_flag (FLAG_APPLIED);
551 520
552 /* we never give weapons/armour if these cannot be used 521 /* we never give weapons/armour if these cannot be used
553 * by this player due to race restrictions 522 * by this player due to race restrictions
554 */ 523 */
555 if (pl->type == PLAYER) 524 if (pl->type == PLAYER)
556 { 525 {
557 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 526 if ((!pl->flag [FLAG_USE_ARMOUR]
558 && 527 &&
559 (op->type == ARMOUR || op->type == BOOTS 528 (op->type == ARMOUR || op->type == BOOTS
560 || op->type == CLOAK || op->type == HELMET 529 || op->type == CLOAK || op->type == HELMET
561 || op->type == SHIELD || op->type == GLOVES 530 || op->type == SHIELD || op->type == GLOVES
562 || op->type == BRACERS || op->type == GIRDLE)) 531 || op->type == BRACERS || op->type == GIRDLE))
563 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 532 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
564 { 533 {
565 op->destroy (); 534 op->destroy ();
566 continue; 535 continue;
567 } 536 }
568 } 537 }
569 538
570 /* Here we remove duplicated skills (as duplicated spell objects have 539 /* Here we remove duplicated skills (as duplicated spell objects have
571 * _very_ confusing effects for players), which could for instance be 540 * _very_ confusing effects for players), which could for instance be
572 * generated by bad treasurelists. - elmex 541 * generated by multiple treasurelists specifying the same skills.
573 */ 542 */
574 if (op->type == SKILL) 543 if (op->type == SKILL)
575 { 544 {
576 for (object *tmp = op->below; tmp; tmp = tmp->below) 545 for (object *tmp = op->below; tmp; tmp = tmp->below)
577 if (tmp->type == op->type && tmp->name == op->name) 546 if (tmp->type == op->type && tmp->name == op->name)
578 { 547 {
579 op->destroy (); 548 op->destroy ();
580 LOG (llevError,
581 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
582 break; 549 break;
583 } 550 }
584 551
585 if (op->nrof > 1) 552 if (op->nrof > 1)
586 op->nrof = 1; 553 op->nrof = 1;
587 } 554 }
588 555
589 if (op->type == SPELLBOOK && op->inv) 556 if (op->type == SPELLBOOK && op->inv)
590 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 557 op->inv->clr_flag (FLAG_STARTEQUIP);
591 558
592 /* Give starting characters identified, uncursed, and undamned 559 /* Give starting characters identified, uncursed, and undamned
593 * items. Just don't identify gold or silver, or it won't be 560 * items. Just don't identify gold or silver, or it won't be
594 * merged properly. 561 * merged properly.
595 */ 562 */
596 if (need_identify (op)) 563 if (op->need_identify ())
597 { 564 {
598 SET_FLAG (op, FLAG_IDENTIFIED); 565 op->set_flag (FLAG_IDENTIFIED);
599 CLEAR_FLAG (op, FLAG_CURSED); 566 op->clr_flag (FLAG_CURSED);
600 CLEAR_FLAG (op, FLAG_DAMNED); 567 op->clr_flag (FLAG_DAMNED);
601 } 568 }
602 569
603 if (op->type == SPELL) 570 if (op->type == SPELL)
604 { 571 {
605 op->destroy (); 572 op->destroy ();
606 continue; 573 continue;
607 } 574 }
608 else if (op->type == SKILL) 575 else if (op->type == SKILL)
609 { 576 {
610 SET_FLAG (op, FLAG_CAN_USE_SKILL); 577 op->set_flag (FLAG_CAN_USE_SKILL);
611 op->stats.exp = 0; 578 op->stats.exp = 0;
612 op->level = 1; 579 op->level = 1;
613 } 580 }
614 else /* lock all 'normal items by default */ 581 else /* lock all 'normal items by default */
615 SET_FLAG (op, FLAG_INV_LOCKED); 582 op->set_flag (FLAG_INV_LOCKED);
616 } /* for loop of objects in player inv */ 583 } /* for loop of objects in player inv */
617 584
618 /* Need to set up the skill pointers */ 585 /* Need to set up the skill pointers */
619 pl->contr->link_skills (); 586 pl->contr->link_skills ();
620} 587}
… …
639roll_stat () 606roll_stat ()
640{ 607{
641 int a[4], i, j, k; 608 int a[4], i, j, k;
642 609
643 for (i = 0; i < 4; i++) 610 for (i = 0; i < 4; i++)
644 a[i] = (int) rndm (6) + 1; 611 a[i] = rndm (1, 6);
645 612
646 for (i = 0, j = 0, k = 7; i < 4; i++) 613 for (i = 0, j = 0, k = 7; i < 4; i++)
647 if (a[i] < k) 614 if (a[i] < k)
648 k = a[i], j = i; 615 k = a[i], j = i;
649 616
… …
746 treasurelist *tl = treasurelist::find (shstr_starting_wealth); 713 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
747 if (tl) 714 if (tl)
748 create_treasure (tl, ob, 0, 0, 0); 715 create_treasure (tl, ob, 0, 0, 0);
749 716
750 INVOKE_PLAYER (BIRTH, ob->contr); 717 INVOKE_PLAYER (BIRTH, ob->contr);
751 INVOKE_PLAYER (LOGIN, ob->contr);
752 718
753 ob->contr->ns->state = ST_PLAYING; 719 ob->contr->ns->state = ST_PLAYING;
754 720
755 if (ob->msg) 721 if (ob->msg)
756 ob->msg = 0; 722 ob->msg = 0;
757 723
758 start_info (ob); 724 start_info (ob);
759 CLEAR_FLAG (ob, FLAG_WIZ); 725 ob->clr_flag (FLAG_WIZ);
760 give_initial_items (ob, ob->randomitems); 726 give_initial_items (ob, ob->randomitems);
761 esrv_send_inventory (ob, ob); 727 esrv_send_inventory (ob, ob);
762 ob->update_stats (); 728 ob->update_stats ();
763 729
764 /* This moves the player to a different start map, if there 730 /* This moves the player to a different start map, if there
… …
813 rv_vector rv; 779 rv_vector rv;
814 780
815 if (op->stats.hp < 0) 781 if (op->stats.hp < 0)
816 { 782 {
817 LOG (llevDebug, "Fleeing player is dead.\n"); 783 LOG (llevDebug, "Fleeing player is dead.\n");
818 CLEAR_FLAG (op, FLAG_SCARED); 784 op->clr_flag (FLAG_SCARED);
819 return; 785 return;
820 } 786 }
821 787
822 if (!op->enemy) 788 if (!op->enemy)
823 { 789 {
824 LOG (llevDebug, "Fleeing player had no enemy.\n"); 790 LOG (llevDebug, "Fleeing player had no enemy.\n");
825 CLEAR_FLAG (op, FLAG_SCARED); 791 op->clr_flag (FLAG_SCARED);
826 return; 792 return;
827 } 793 }
828 794
829 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 795 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
830 { 796 {
831 op->enemy = NULL; 797 op->enemy = NULL;
832 CLEAR_FLAG (op, FLAG_SCARED); 798 op->clr_flag (FLAG_SCARED);
833 return; 799 return;
834 } 800 }
835 801
836 get_rangevector (op, op->enemy, &rv, 0); 802 get_rangevector (op, op->enemy, &rv, 0);
837 803
… …
843 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m)))) 809 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
844 return; 810 return;
845 } 811 }
846 812
847 /* Cornered, get rid of scared */ 813 /* Cornered, get rid of scared */
848 CLEAR_FLAG (op, FLAG_SCARED); 814 op->clr_flag (FLAG_SCARED);
849 op->enemy = NULL; 815 op->enemy = NULL;
850} 816}
851 817
852/* check_pick sees if there is stuff to be picked up/picks up stuff. 818/* check_pick sees if there is stuff to be picked up/picks up stuff.
853 * It returns 1 if the player should keep on moving, 0 if he should 819 * It returns 1 if the player should keep on moving, 0 if he should
… …
858{ 824{
859 object *tmp, *next; 825 object *tmp, *next;
860 int stop = 0; 826 int stop = 0;
861 int wvratio; 827 int wvratio;
862 828
863 /* if you're flying, you cna't pick up anything */ 829 /* if you're flying, you can't pick up anything */
864 if (op->move_type & MOVE_FLYING) 830 if (op->move_type & MOVE_FLYING)
865 return 1; 831 return 1;
866 832
867 next = op->below; 833 next = op->below;
868 834
… …
945 * fighting */ 911 * fighting */
946 if (op->contr->mode & PU_INHIBIT) 912 if (op->contr->mode & PU_INHIBIT)
947 return 1; 913 return 1;
948 914
949 /* prevent us from turning into auto-thieves :) */ 915 /* prevent us from turning into auto-thieves :) */
950 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 916 if (tmp->flag [FLAG_UNPAID])
951 continue; 917 continue;
952 918
953 /* ignore known cursed objects */ 919 /* ignore known cursed objects */
954 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 920 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
955 continue; 921 continue;
956 922
957 /* all food and drink if desired */ 923 /* all food and drink if desired */
958 /* question: don't pick up known-poisonous stuff? */ 924 /* question: don't pick up known-poisonous stuff? */
959 if (op->contr->mode & PU_FOOD) 925 if (op->contr->mode & PU_FOOD)
… …
962 CHK_PICK_PICKUP; 928 CHK_PICK_PICKUP;
963 continue; 929 continue;
964 } 930 }
965 931
966 if (op->contr->mode & PU_DRINK) 932 if (op->contr->mode & PU_DRINK)
967 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 933 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
968 { 934 {
969 CHK_PICK_PICKUP; 935 CHK_PICK_PICKUP;
970 continue; 936 continue;
971 } 937 }
972 938
… …
1010 continue; 976 continue;
1011 } 977 }
1012 978
1013 /* pick up all magical items */ 979 /* pick up all magical items */
1014 if (op->contr->mode & PU_MAGICAL) 980 if (op->contr->mode & PU_MAGICAL)
1015 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 981 if (tmp->flag [FLAG_KNOWN_MAGICAL]
1016 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 982 && !tmp->flag [FLAG_KNOWN_CURSED])
1017 { 983 {
1018 CHK_PICK_PICKUP; 984 CHK_PICK_PICKUP;
1019 continue; 985 continue;
1020 } 986 }
1021 987
… …
1105 continue; 1071 continue;
1106 } 1072 }
1107 1073
1108 /* hoping to catch throwing daggers here */ 1074 /* hoping to catch throwing daggers here */
1109 if (op->contr->mode & PU_MISSILEWEAPON) 1075 if (op->contr->mode & PU_MISSILEWEAPON)
1110 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1076 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1111 { 1077 {
1112 CHK_PICK_PICKUP; 1078 CHK_PICK_PICKUP;
1113 continue; 1079 continue;
1114 } 1080 }
1115 1081
… …
1170 * return 0. 1136 * return 0.
1171 */ 1137 */
1172static int 1138static int
1173action_makes_visible (object *op) 1139action_makes_visible (object *op)
1174{ 1140{
1175 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1141 if (op->invisible && op->flag [FLAG_ALIVE])
1176 { 1142 {
1177 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1143 if (op->flag [FLAG_MAKE_INVIS])
1178 { 1144 {
1179 // artefact invisibility is permanent, but we still make noise 1145 // artefact invisibility is permanent, but we still make noise
1180 // this is important for game-balance. 1146 // this is important for game-balance.
1181 if (op->contr) 1147 if (op->contr)
1182 op->make_noise (); 1148 op->make_noise ();
… …
1209 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1175 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1210 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1176 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1211 return splay (tmp); 1177 return splay (tmp);
1212 1178
1213 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1179 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1214 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1180 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1215 if (object *arrow = find_arrow (tmp, type)) 1181 if (object *arrow = find_arrow (tmp, type))
1216 { 1182 {
1217 splay (tmp); 1183 splay (tmp);
1218 return arrow; 1184 return arrow;
1219 } 1185 }
… …
1236 if (!type) 1202 if (!type)
1237 return NULL; 1203 return NULL;
1238 1204
1239 for (arrow = op->inv; arrow; arrow = arrow->below) 1205 for (arrow = op->inv; arrow; arrow = arrow->below)
1240 { 1206 {
1241 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1207 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1242 { 1208 {
1243 i = 0; 1209 i = 0;
1244 ntmp = find_better_arrow (arrow, target, type, &i); 1210 ntmp = find_better_arrow (arrow, target, type, &i);
1245 1211
1246 if (i > betterby) 1212 if (i > betterby)
… …
1347 break; 1313 break;
1348 } 1314 }
1349 1315
1350 if (mflags & P_IS_ALIVE) 1316 if (mflags & P_IS_ALIVE)
1351 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1317 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1352 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1318 if (tmp->flag [FLAG_ALIVE])
1353 break; 1319 break;
1354 } 1320 }
1355 1321
1356 if (!tmp) 1322 if (!tmp)
1357 return find_arrow (op, type); 1323 return find_arrow (op, type);
… …
1418 { 1384 {
1419 if (op->type == PLAYER) 1385 if (op->type == PLAYER)
1420 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1386 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1421 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1387 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1422 else 1388 else
1423 CLEAR_FLAG (op, FLAG_READY_BOW); 1389 op->clr_flag (FLAG_READY_BOW);
1424 1390
1425 return 0; 1391 return 0;
1426 } 1392 }
1427 } 1393 }
1428 1394
… …
1477#endif 1443#endif
1478 1444
1479 SET_ANIMATION (arrow, arrow->direction); 1445 SET_ANIMATION (arrow, arrow->direction);
1480 1446
1481 /* update the speed */ 1447 /* update the speed */
1482 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1483 + bow->stats.dam / 7.f;
1484 1448
1485 arrow->set_speed (max (arrow->speed, 2.f));
1486 arrow->speed_left = 0; 1449 arrow->speed_left = 0;
1450 arrow->set_speed (max (2.f,
1451 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1452 + bow->stats.dam / 7.f
1453 ));
1487 1454
1488 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1455 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1489 1456
1490 if (op->type == PLAYER) 1457 if (op->type == PLAYER)
1491 { 1458 {
… …
1584 { 1551 {
1585 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1552 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1586 return; 1553 return;
1587 } 1554 }
1588 1555
1589 if (!op->change_weapon (item)) 1556 if (!op->apply (item))
1590 return; 1557 return;
1591 1558
1592 if (item->type == WAND) 1559 if (item->type == WAND)
1593 { 1560 {
1594 if (item->stats.food <= 0) 1561 if (item->stats.food <= 0)
… …
1628 { 1595 {
1629 object *tmp; 1596 object *tmp;
1630 1597
1631 if (item->arch) 1598 if (item->arch)
1632 { 1599 {
1633 CLEAR_FLAG (item, FLAG_ANIMATE); 1600 item->clr_flag (FLAG_ANIMATE);
1634 item->face = item->arch->face; 1601 item->face = item->arch->face;
1635 item->set_speed (0); 1602 item->set_speed (0);
1636 } 1603 }
1637 1604
1638 if (object *pl = item->visible_to ()) 1605 if (object *pl = item->visible_to ())
… …
1645} 1612}
1646 1613
1647/* Received a fire command for the player - go and do it. 1614/* Received a fire command for the player - go and do it.
1648 */ 1615 */
1649bool 1616bool
1650fire (object *op, int dir) 1617fire (object *who, int dir)
1651{ 1618{
1652 int spellcost = 0; 1619 int spellcost = 0;
1653 1620
1654 player *pl = op->contr; 1621 player *pl = who->contr;
1655 1622
1656 if (pl->golem) 1623 if (pl->golem)
1657 { 1624 {
1658 control_golem (op->contr->golem, dir); 1625 control_golem (who->contr->golem, dir);
1659 return false; 1626 return false;
1660 } 1627 }
1661 1628
1662 object *ob = pl->ranged_ob; 1629 object *ob = pl->ranged_ob;
1663 1630
1664 if (!ob) 1631 if (!ob)
1665 return false; 1632 return false;
1666 1633
1667 if (op->speed_left > 0.f) 1634 if (who->speed_left > 0.f)
1668 --op->speed_left; 1635 --who->speed_left;
1669 else 1636 else
1670 return false; 1637 return false;
1671 1638
1672 if (!op->change_weapon (ob)) 1639 if (!who->apply (ob))
1673 return false; 1640 return false;
1674 1641
1675 /* check for loss of invisiblity/hide */ 1642 /* check for loss of invisiblity/hide */
1676 if (action_makes_visible (op)) 1643 if (action_makes_visible (who))
1677 make_visible (op); 1644 make_visible (who);
1678 1645
1679 switch (ob->type) 1646 switch (ob->type)
1680 { 1647 {
1681 case BOW: 1648 case BOW:
1682 player_fire_bow (op, dir); 1649 player_fire_bow (who, dir);
1683 break; 1650 break;
1684 1651
1685 case SPELL: 1652 case SPELL:
1686 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1653 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1687 break; 1654 break;
1688 1655
1689 case BUILDER: 1656 case BUILDER:
1690 apply_map_builder (op, dir); 1657 apply_map_builder (who, dir);
1691 break; 1658 break;
1692 1659
1693 case SKILL: 1660 case SKILL:
1694 do_skill (op, op, ob, dir, 0); 1661 do_skill (who, who, ob, dir, 0);
1695 break; 1662 break;
1696 1663
1664 case RANGED:
1665 do_skill (who, ob, who->chosen_skill, dir, 0);
1666 break;
1667
1697 default: 1668 default:
1698 fire_misc_object (op, dir); 1669 fire_misc_object (who, dir);
1699 break; 1670 break;
1700 } 1671 }
1701 1672
1702 return true; 1673 return true;
1703} 1674}
… …
1762 * 1733 *
1763 * Change the color so that the message doesn't disappear with 1734 * Change the color so that the message doesn't disappear with
1764 * all the others. 1735 * all the others.
1765 */ 1736 */
1766 if (pl->contr->usekeys == key_inventory 1737 if (pl->contr->usekeys == key_inventory
1767 || !QUERY_FLAG (container, FLAG_APPLIED) 1738 || !container->flag [FLAG_APPLIED]
1768 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1739 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1769 { 1740 {
1770 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1741 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1771 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1742 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1772 return NULL; 1743 return NULL;
… …
1894 || mon->flag [FLAG_CAN_ROLL]) 1865 || mon->flag [FLAG_CAN_ROLL])
1895 && mon != op) 1866 && mon != op)
1896 break; 1867 break;
1897 } 1868 }
1898 1869
1899 if (!mon) /* This happens anytime the player tries to move */ 1870 /* no monster == player tries to move into a wall or so */
1900 return false; /* into a wall */ 1871 if (!mon)
1872 {
1873 for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
1874 if (op->move_type & ob->move_block)
1875 {
1876 if (ob->move_block == MOVE_ALL)
1877 move_into_wall (op, ob);
1878 else
1879 {
1880 if (op->contr->ns->bumpmsg)
1881 {
1882 op->play_sound (sound_find ("blocked_move"));
1883
1884 op->statusmsg (ob->invisible
1885 ? "Something blocks you."
1886 : format ("Something blocks you from entering the %s.", query_name (ob))
1887 );
1888 }
1889 }
1890
1891 break;
1892 }
1893
1894 return false;
1895 }
1901 1896
1902 mon = mon->head_ (); 1897 mon = mon->head_ ();
1903 1898
1904 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 1899 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1905 if (op->contr->weapon_sp_left > 0.f) 1900 if (op->contr->weapon_sp_left > 0.f)
… …
1923 */ 1918 */
1924 if (op->type == PLAYER 1919 if (op->type == PLAYER
1925 && ((mon->owner && mon->owner->contr 1920 && ((mon->owner && mon->owner->contr
1926 && same_party (mon->owner->contr->party, op->contr->party)) 1921 && same_party (mon->owner->contr->party, op->contr->party))
1927 || mon->owner == op) 1922 || mon->owner == op)
1928 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1923 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1929 { 1924 {
1930 /* If we're braced, we don't want to switch places with it */ 1925 /* If we're braced, we don't want to switch places with it */
1931 if (op->contr->braced) 1926 if (op->contr->braced)
1932 return false; 1927 return false;
1933 1928
… …
1953 * creatures. Note that if you are braced, you can't push 1948 * creatures. Note that if you are braced, you can't push
1954 * someone, but put it inside this loop so that you won't 1949 * someone, but put it inside this loop so that you won't
1955 * attack them either. 1950 * attack them either.
1956 */ 1951 */
1957 if ((mon->type == PLAYER || mon->enemy != op) 1952 if ((mon->type == PLAYER || mon->enemy != op)
1958 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1953 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1959 && ((op->contr->peaceful 1954 && ((op->contr->peaceful
1960 || (mon->type == PLAYER && mon->contr->peaceful)) 1955 || (mon->type == PLAYER && mon->contr->peaceful))
1961 && !on_battleground)) 1956 && !on_battleground))
1962 { 1957 {
1963 if (op->speed_left > 0.f) 1958 if (op->speed_left > 0.f)
… …
1979 } 1974 }
1980 } 1975 }
1981 /* If the object is a boulder or other rollable object, then 1976 /* If the object is a boulder or other rollable object, then
1982 * roll it if not braced. You can't roll it if you are braced. 1977 * roll it if not braced. You can't roll it if you are braced.
1983 */ 1978 */
1984 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1979 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1985 { 1980 {
1986 if (op->speed_left > 0.f) 1981 if (op->speed_left > 0.f)
1987 { 1982 {
1988 --op->speed_left; 1983 --op->speed_left;
1989 1984
… …
1998 * Way it works is like this: First, it must have some hit points 1993 * Way it works is like this: First, it must have some hit points
1999 * and be living. Then, it must be one of the following: 1994 * and be living. Then, it must be one of the following:
2000 * 1) Not a player, 2) A player, but of a different party. Note 1995 * 1) Not a player, 2) A player, but of a different party. Note
2001 * that party_number -1 is no party, so attacks can still happen. 1996 * that party_number -1 is no party, so attacks can still happen.
2002 */ 1997 */
2003 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1998 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2004 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1999 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2005 { 2000 {
2006 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 2001 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2007 { 2002 {
2008 --op->contr->weapon_sp_left; 2003 --op->contr->weapon_sp_left;
… …
2020} 2015}
2021 2016
2022bool 2017bool
2023move_player (object *op, int dir) 2018move_player (object *op, int dir)
2024{ 2019{
2025 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2020 if (!op->map || op->map->state != MAP_ACTIVE)
2026 return 0; 2021 return 0;
2027 2022
2028 /* Sanity check: make sure dir is valid */ 2023 /* Sanity check: make sure dir is valid */
2029 if (dir < 0 || dir >= 9) 2024 if (dir < 0 || dir > 8)
2030 { 2025 {
2031 LOG (llevError, "move_player: invalid direction %d\n", dir); 2026 LOG (llevError, "move_player: invalid direction %d\n", dir);
2032 return 0; 2027 return 0;
2033 } 2028 }
2034 2029
2035 /* peterm: added following line */ 2030 /* peterm: added following line */
2036 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2031 if (op->flag [FLAG_CONFUSED] && dir)
2037 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2032 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2038 2033
2039 op->facing = dir; 2034 op->facing = dir;
2040 2035
2041 if (op->flag [FLAG_HIDDEN]) 2036 if (op->flag [FLAG_HIDDEN])
… …
2081 * players. 2076 * players.
2082 */ 2077 */
2083bool 2078bool
2084handle_newcs_player (object *op) 2079handle_newcs_player (object *op)
2085{ 2080{
2086 if (QUERY_FLAG (op, FLAG_SCARED)) 2081 if (op->flag [FLAG_SCARED])
2087 { 2082 {
2088 if (op->speed_left > 0.f) 2083 if (op->speed_left > 0.f)
2089 { 2084 {
2090 --op->speed_left; 2085 --op->speed_left;
2091 flee_player (op); 2086 flee_player (op);
… …
2110} 2105}
2111 2106
2112static int 2107static int
2113save_life (object *op) 2108save_life (object *op)
2114{ 2109{
2115 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2110 if (!op->flag [FLAG_LIFESAVE])
2116 return 0; 2111 return 0;
2117 2112
2118 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2113 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2119 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2114 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2120 { 2115 {
2121 op->play_sound (sound_find ("ob_evaporate")); 2116 op->play_sound (sound_find ("ob_evaporate"));
2122 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2117 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2123 2118
2124 tmp->destroy (); 2119 tmp->destroy ();
2125 CLEAR_FLAG (op, FLAG_LIFESAVE); 2120 op->clr_flag (FLAG_LIFESAVE);
2126 2121
2127 if (op->stats.hp < 0) 2122 if (op->stats.hp < 0)
2128 op->stats.hp = op->stats.maxhp; 2123 op->stats.hp = op->stats.maxhp;
2129 2124
2130 if (op->stats.food < 0) 2125 if (op->stats.food < 0)
2131 op->stats.food = 999; 2126 op->stats.food = MAX_FOOD;
2132 2127
2133 op->update_stats (); 2128 op->update_stats ();
2134 return 1; 2129 return 1;
2135 } 2130 }
2136 2131
2137 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2132 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2138 CLEAR_FLAG (op, FLAG_LIFESAVE); 2133 op->clr_flag (FLAG_LIFESAVE);
2139 enter_player_savebed (op); /* bring him home. */ 2134 enter_player_savebed (op); /* bring him home. */
2140 return 0; 2135 return 0;
2141} 2136}
2142 2137
2143/* This goes throws the inventory and removes unpaid objects, and puts them 2138/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2150{ 2145{
2151 while (op) 2146 while (op)
2152 { 2147 {
2153 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2148 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2154 2149
2155 if (QUERY_FLAG (op, FLAG_UNPAID)) 2150 if (op->flag [FLAG_UNPAID])
2156 op->insert_at (env); 2151 op->insert_at (env);
2157 else if (op->inv) 2152 else if (op->inv)
2158 drop_unpaid_items (op->inv, env); 2153 drop_unpaid_items (op->inv, env);
2159 2154
2160 op = next; 2155 op = next;
… …
2171void 2166void
2172do_some_living (object *op) 2167do_some_living (object *op)
2173{ 2168{
2174 int last_food = op->stats.food; 2169 int last_food = op->stats.food;
2175 int gen_hp, gen_sp, gen_grace; 2170 int gen_hp, gen_sp, gen_grace;
2176 int over_hp, over_sp, over_grace;
2177 int i; 2171 int i;
2178 int rate_hp = 1200; 2172 int rate_hp = 1200;
2179 int rate_sp = 2500; 2173 int rate_sp = 2500;
2180 int rate_grace = 2000; 2174 int rate_grace = 2000;
2181 const int max_hp = 1; 2175 const int max_hp = 1;
… …
2187 op->invisible = 1000; 2181 op->invisible = 1000;
2188 /* the socket code flashes the player visible/invisible 2182 /* the socket code flashes the player visible/invisible
2189 * depending on the value of invisible, so we need to 2183 * depending on the value of invisible, so we need to
2190 * alternate it here for it to work correctly. 2184 * alternate it here for it to work correctly.
2191 */ 2185 */
2192 if (pticks & 2) 2186 if (server_tick & 2)
2193 op->invisible--; 2187 op->invisible--;
2194 } 2188 }
2195 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2189 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2196 { 2190 {
2197 if (!op->invisible--) 2191 if (!op->invisible--)
2198 { 2192 {
2199 make_visible (op); 2193 make_visible (op);
2200 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2194 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2234 if (--op->last_grace < 0) 2228 if (--op->last_grace < 0)
2235 { 2229 {
2236 if (op->stats.grace < op->stats.maxgrace / 2) 2230 if (op->stats.grace < op->stats.maxgrace / 2)
2237 op->stats.grace++; /* no penalty in food for regaining grace */ 2231 op->stats.grace++; /* no penalty in food for regaining grace */
2238 2232
2233 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2234
2239 if (max_grace > 1) 2235 if (max_grace > 1)
2240 { 2236 {
2241 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2237 int over_grace = temp / rate_grace;
2238
2242 if (over_grace > 0) 2239 if (over_grace > 0)
2243 { 2240 {
2244 op->stats.sp += over_grace 2241 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2245 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2246 op->last_grace = 0; 2242 op->last_grace = 0;
2247 } 2243 }
2248 else 2244 else
2249 { 2245 op->last_grace = rate_grace / temp;
2250 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2251 }
2252 } 2246 }
2253 else 2247 else
2254 { 2248 op->last_grace = rate_grace / temp;
2255 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2249
2256 }
2257 /* wearing stuff doesn't detract from grace generation. */ 2250 /* wearing stuff doesn't detract from grace generation. */
2258 } 2251 }
2259 2252
2260 if (op->stats.food > 0) 2253 if (op->stats.food > 0)
2261 { 2254 {
… …
2267 if (op->stats.sp < op->stats.maxsp) 2260 if (op->stats.sp < op->stats.maxsp)
2268 { 2261 {
2269 op->stats.sp++; 2262 op->stats.sp++;
2270 2263
2271 /* dms do not consume food */ 2264 /* dms do not consume food */
2272 if (!QUERY_FLAG (op, FLAG_WIZ)) 2265 if (!op->flag [FLAG_WIZ])
2273 { 2266 {
2274 op->stats.food--; 2267 op->stats.food--;
2275 2268
2276 if (op->contr->digestion < 0) 2269 if (op->contr->digestion < 0)
2277 op->stats.food += op->contr->digestion; 2270 op->stats.food += op->contr->digestion;
… …
2280 } 2273 }
2281 } 2274 }
2282 2275
2283 if (max_sp > 1) 2276 if (max_sp > 1)
2284 { 2277 {
2285 over_sp = (gen_sp + 10) / rate_sp; 2278 int over_sp = (gen_sp + 10) / rate_sp;
2286 if (over_sp > 0) 2279 if (over_sp > 0)
2287 { 2280 {
2288 if (op->stats.sp < op->stats.maxsp) 2281 if (op->stats.sp < op->stats.maxsp)
2289 { 2282 {
2290 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2283 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2311 if (op->stats.hp < op->stats.maxhp) 2304 if (op->stats.hp < op->stats.maxhp)
2312 { 2305 {
2313 op->stats.hp++; 2306 op->stats.hp++;
2314 2307
2315 /* dms do not consume food */ 2308 /* dms do not consume food */
2316 if (!QUERY_FLAG (op, FLAG_WIZ)) 2309 if (!op->flag [FLAG_WIZ])
2317 { 2310 {
2318 op->stats.food--; 2311 op->stats.food--;
2319 2312
2320 if (op->contr->digestion < 0) 2313 if (op->contr->digestion < 0)
2321 op->stats.food += op->contr->digestion; 2314 op->stats.food += op->contr->digestion;
2322 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2315 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2323 op->stats.food = last_food; 2316 op->stats.food = last_food;
2324 } 2317 }
2325 } 2318 }
2326 2319
2320 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2321
2327 if (max_hp > 1) 2322 if (max_hp > 1)
2328 { 2323 {
2329 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2324 int over_hp = temp / rate_hp;
2330 2325
2331 if (over_hp > 0) 2326 if (over_hp > 0)
2332 { 2327 {
2333 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2328 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2334 op->last_heal = 0; 2329 op->last_heal = 0;
2335 } 2330 }
2336 else 2331 else
2337 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2332 op->last_heal = rate_hp / temp;
2338 } 2333 }
2339 else 2334 else
2340 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2335 op->last_heal = rate_hp / temp;
2341 } 2336 }
2342 } 2337 }
2343 2338
2344 /* Digestion */ 2339 /* Digestion */
2345 if (--op->last_eat < 0) 2340 if (--op->last_eat < 0)
… …
2348 penalty = max (0, -op->contr->digestion); 2343 penalty = max (0, -op->contr->digestion);
2349 2344
2350 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2345 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2351 2346
2352 /* dms do not consume food */ 2347 /* dms do not consume food */
2353 if (!QUERY_FLAG (op, FLAG_WIZ)) 2348 if (!op->flag [FLAG_WIZ])
2354 op->stats.food--; 2349 op->stats.food--;
2355 } 2350 }
2356 2351
2357 if (op->stats.food < 0 && op->stats.hp >= 0) 2352 if (op->stats.food < 0 && op->stats.hp >= 0)
2358 { 2353 {
2359 object *flesh = 0; 2354 object *flesh = 0;
2360 2355
2361 for_inv_removable (op, tmp) 2356 for_inv_removable (op, tmp)
2362 { 2357 {
2363 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2358 if (tmp->flag [FLAG_UNPAID])
2364 continue; 2359 continue;
2365 2360
2366 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2361 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2367 { 2362 {
2368 op->statusmsg ("You blindly grab for a bite of food. " 2363 op->statusmsg ("You blindly grab for a bite of food. "
2369 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2364 "H<To prevent you from starving, you ate some random item from your backpack.>");
2370 manual_apply (op, tmp, 0); 2365 op->apply (tmp);
2371 2366
2372 if (op->stats.food >= 0 || op->stats.hp < 0) 2367 if (op->stats.food >= 0 || op->stats.hp < 0)
2373 break; 2368 break;
2374 } 2369 }
2375 else if (tmp->type == FLESH) 2370 else if (tmp->type == FLESH)
… …
2381 */ 2376 */
2382 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2377 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2383 { 2378 {
2384 op->statusmsg ("You blindly grab for a bite of food. " 2379 op->statusmsg ("You blindly grab for a bite of food. "
2385 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2380 "H<To prevent you from starving, you ate some random item from your backpack.>");
2386 manual_apply (op, flesh, 0); 2381 op->apply (flesh);
2387 } 2382 }
2388 2383
2389 // If player is still starving, alert him! 2384 // If player is still starving, alert him!
2390 if (op->stats.food < 0) 2385 if (op->stats.food < 0)
2391 op->failmsg ("You are starving! " 2386 op->failmsg ("You are starving! "
… …
2403 op->contr->killer->destroy (); 2398 op->contr->killer->destroy ();
2404 } 2399 }
2405 } 2400 }
2406 2401
2407 /* killer should be set here already */ 2402 /* killer should be set here already */
2408 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2403 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2409 kill_player (op); 2404 kill_player (op);
2410 } 2405 }
2411} 2406}
2412 2407
2413/* If the player should die (lack of hp, food, etc), we call this. 2408/* If the player should die (lack of hp, food, etc), we call this.
… …
2447 cure_disease (op, 0, 0); /* remove any disease */ 2442 cure_disease (op, 0, 0); /* remove any disease */
2448 2443
2449 max_it (op->stats.hp , op->stats.maxhp); 2444 max_it (op->stats.hp , op->stats.maxhp);
2450 max_it (op->stats.sp , op->stats.maxsp); 2445 max_it (op->stats.sp , op->stats.maxsp);
2451 max_it (op->stats.grace, op->stats.maxgrace); 2446 max_it (op->stats.grace, op->stats.maxgrace);
2452
2453 if (op->stats.food <= 0) 2447 max_it (op->stats.food , 200);
2454 op->stats.food = 999;
2455 2448
2456 // remove all spell effects that are active 2449 // remove all spell effects that are active
2457 // to avoid long-term effects such as word-of-recall 2450 // to avoid long-term effects such as word-of-recall
2458 for (object *item = op->inv; item; ) 2451 for (object *item = op->inv; item; )
2459 { 2452 {
… …
2610 * difference. 2603 * difference.
2611 */ 2604 */
2612 if (this_stat >= -50) 2605 if (this_stat >= -50)
2613 { 2606 {
2614 change_attr_value (&(dep->stats), i, -1); 2607 change_attr_value (&(dep->stats), i, -1);
2615 SET_FLAG (dep, FLAG_APPLIED); 2608 dep->set_flag (FLAG_APPLIED);
2616 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2609 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2617 op->update_stats (); 2610 op->update_stats ();
2618 lost_a_stat = 1; 2611 lost_a_stat = 1;
2619 } 2612 }
2620 } 2613 }
… …
2687 if (will_kill_again) 2680 if (will_kill_again)
2688 { 2681 {
2689 object *force; 2682 object *force;
2690 int at; 2683 int at;
2691 2684
2692 force = get_archetype (FORCE_NAME); 2685 force = archetype::get (FORCE_NAME);
2693 /* 50 ticks should be enough time for the spell to abate */ 2686 /* 50 ticks should be enough time for the spell to abate */
2694 force->speed = 0.1f;
2695 force->speed_left = -5.f; 2687 force->speed_left = -5.f;
2696 SET_FLAG (force, FLAG_APPLIED); 2688 force->set_speed (0.1f);
2689 force->set_flag (FLAG_APPLIED);
2690
2697 for (at = 0; at < NROFATTACKS; at++) 2691 for (at = 0; at < NROFATTACKS; at++)
2698 if (will_kill_again & (1 << at)) 2692 if (will_kill_again & (1 << at))
2699 force->resist[at] = 100; 2693 force->resist[at] = 100;
2700 2694
2701 insert_ob_in_ob (force, op); 2695 insert_ob_in_ob (force, op);
… …
2723 tmp->x = op->x, tmp->y = op->y; 2717 tmp->x = op->x, tmp->y = op->y;
2724 2718
2725 if (tmp->type == CONTAINER) 2719 if (tmp->type == CONTAINER)
2726 loot_object (tmp); /* empty container to ground */ 2720 loot_object (tmp); /* empty container to ground */
2727 2721
2728 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2722 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2729 { 2723 {
2730 if (tmp->nrof > 1) 2724 if (tmp->nrof > 1)
2731 { 2725 {
2732 tmp->decrease (rndm (1, tmp->nrof - 1)); 2726 tmp->decrease (rndm (1, tmp->nrof - 1));
2733 insert_ob_in_map (tmp, op->map, NULL, 0); 2727 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2823} 2817}
2824 2818
2825int 2819int
2826is_true_undead (object *op) 2820is_true_undead (object *op)
2827{ 2821{
2828 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2822 if (op->arch->flag [FLAG_UNDEAD])
2829 return 1; 2823 return 1;
2830 2824
2831 return 0; 2825 return 0;
2832} 2826}
2833 2827
… …
2931 2925
2932 if (who->type == PLAYER) 2926 if (who->type == PLAYER)
2933 player = 1; 2927 player = 1;
2934 2928
2935 else 2929 else
2936 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2930 friendly = who->flag [FLAG_FRIENDLY];
2937 2931
2938 /* search adjacent squares */ 2932 /* search adjacent squares */
2939 for (i = 1; i < 9; i++) 2933 for (i = 1; i < 9; i++)
2940 { 2934 {
2941 x = who->x + freearr_x[i]; 2935 x = who->x + freearr_x[i];
… …
2950 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2944 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2951 continue; 2945 continue;
2952 2946
2953 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2947 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2954 { 2948 {
2955 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2949 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2956 return 1; 2950 return 1;
2957 else if (tmp->type == PLAYER) 2951 else if (tmp->type == PLAYER)
2958 { 2952 {
2959 /*don't let a hidden DM prevent you from hiding */ 2953 /*don't let a hidden DM prevent you from hiding */
2960 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2954 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2961 return 1; 2955 return 1;
2962 } 2956 }
2963 } 2957 }
2964 } 2958 }
2965 return 0; 2959 return 0;
… …
3034 * and the exit-coordinates sp/hp must both be > 0. 3028 * and the exit-coordinates sp/hp must both be > 0.
3035 * => The intention here is to prevent abuse of the battleground- 3029 * => The intention here is to prevent abuse of the battleground-
3036 * feature (like pickable or hidden battleground tiles). */ 3030 * feature (like pickable or hidden battleground tiles). */
3037 for (object *tmp = op->below; tmp; tmp = tmp->below) 3031 for (object *tmp = op->below; tmp; tmp = tmp->below)
3038 { 3032 {
3039 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3033 if (tmp->flag [FLAG_IS_FLOOR])
3040 { 3034 {
3041 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3035 if (tmp->flag [FLAG_NO_PICK]
3042 && tmp->type == BATTLEGROUND 3036 && tmp->type == BATTLEGROUND
3043 && tmp->name == shstr_battleground 3037 && tmp->name == shstr_battleground
3044 && EXIT_X (tmp) && EXIT_Y (tmp)) 3038 && EXIT_X (tmp) && EXIT_Y (tmp))
3045 { 3039 {
3046 /* before we assign the exit, check if this is a teambattle */ 3040 /* before we assign the exit, check if this is a teambattle */
… …
3198 else 3192 else
3199 j = 1; 3193 j = 1;
3200 strcat (buf, spellpathnames[i]); 3194 strcat (buf, spellpathnames[i]);
3201 } 3195 }
3202 } 3196 }
3197
3203 strcat (buf, "."); 3198 strcat (buf, ".");
3204 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3199 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3205 } 3200 }
3206 3201
3207 /* evtl. adding flags: */ 3202 /* evtl. adding flags: */
3208 if (QUERY_FLAG (item, FLAG_XRAYS)) 3203 if (item->flag [FLAG_XRAYS])
3209 SET_FLAG (skin, FLAG_XRAYS); 3204 skin->set_flag (FLAG_XRAYS);
3210 if (QUERY_FLAG (item, FLAG_STEALTH)) 3205 if (item->flag [FLAG_STEALTH])
3211 SET_FLAG (skin, FLAG_STEALTH); 3206 skin->set_flag (FLAG_STEALTH);
3212 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3207 if (item->flag [FLAG_SEE_IN_DARK])
3213 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3208 skin->set_flag (FLAG_SEE_IN_DARK);
3214 3209
3215 /* print message if there is one */ 3210 /* print message if there is one */
3216 if (item->msg != NULL) 3211 if (item->msg != NULL)
3217 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3212 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3218 } 3213 }
… …
3223 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3218 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3224 who->insert (tmp); 3219 who->insert (tmp);
3225 } 3220 }
3226} 3221}
3227 3222
3228/**
3229 * Unready an object for a player. This function does nothing if the object was
3230 * not readied.
3231 */
3232void
3233player_unready_range_ob (player *pl, object *ob)
3234{
3235 if (pl->ob->current_weapon == ob)
3236 pl->ob->current_weapon = 0;
3237
3238 if (pl->combat_ob == ob)
3239 pl->combat_ob = 0;
3240
3241 if (pl->ranged_ob == ob)
3242 pl->ranged_ob = 0;
3243}
3244
3245//-GPL 3223//-GPL
3246 3224
3247sint8 3225sint8
3248player::darkness_at (maptile *map, int x, int y) const 3226player::darkness_at (maptile *map, int x, int y) const
3249{ 3227{
… …
3277{ 3255{
3278 play_sound (sound_find ("generic_failure")); 3256 play_sound (sound_find ("generic_failure"));
3279 statusmsg (msg, color); 3257 statusmsg (msg, color);
3280} 3258}
3281 3259
3260void
3261object::failmsgf (const char *format, ...)
3262{
3263 if (!contr)
3264 return;
3265
3266 va_list ap;
3267 va_start (ap, format);
3268 contr->failmsg (vformat (format, ap));
3269 va_end (ap);
3270}
3271
3272void
3273player::failmsgf (const char *format, ...)
3274{
3275 va_list ap;
3276 va_start (ap, format);
3277 failmsg (vformat (format, ap));
3278 va_end (ap);
3279}
3280

Diff Legend

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