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.268 by root, Wed Apr 7 19:54:45 2010 UTC vs.
Revision 1.293 by root, Mon Nov 26 15:12:16 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,2010 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 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
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
27#include <algorithm>
28#include <functional>
26 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 ()
… …
126 126
127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
128 128
129 esrv_new_player (this); 129 esrv_new_player (this);
130 130
131 ob->update_stats ();
132
133 ns->floorbox_update ();
134 esrv_send_inventory (ob, ob);
135 esrv_add_spells (this, 0);
136
137 ob->flag [FLAG_READY_WEAPON] = false; 131 ob->flag [FLAG_READY_WEAPON] = false;
138 ob->flag [FLAG_READY_SKILL] = false; 132 ob->flag [FLAG_READY_SKILL] = false;
139 ob->flag [FLAG_READY_RANGE] = false; 133 ob->flag [FLAG_READY_RANGE] = false;
140 ob->flag [FLAG_READY_BOW] = false; 134 ob->flag [FLAG_READY_BOW] = false;
141 135
142 ob->update_stats (); // we unapplied stuff above 136 ob->update_stats ();
137
138 ns->floorbox_update ();
139 esrv_send_inventory (ob, ob);
140 esrv_add_spells (this, 0);
141
143 activate (); 142 activate ();
144 143
145 INVOKE_PLAYER (CONNECT, this); 144 INVOKE_PLAYER (CONNECT, this);
146 INVOKE_PLAYER (LOGIN, this); 145 INVOKE_PLAYER (LOGIN, this);
147} 146}
… …
182player::set_object (object *op) 181player::set_object (object *op)
183{ 182{
184 ob = observe = viewpoint = op; 183 ob = observe = viewpoint = op;
185 ob->contr = this; /* this aren't yet in archetype */ 184 ob->contr = this; /* this aren't yet in archetype */
186 185
187 ob->speed = 1.0f; 186 ob->speed = 1.0f; // object still inactive, keep it that way
188 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
189 188
190 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
191} 190}
192 191
… …
374 */ 373 */
375int 374int
376path_to_player (object *mon, object *pl, unsigned mindiff) 375path_to_player (object *mon, object *pl, unsigned mindiff)
377{ 376{
378 rv_vector rv; 377 rv_vector rv;
379 sint16 x, y;
380 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;
381 maptile *m, *lastmap;
382 379
383 get_rangevector (mon, pl, &rv, 0); 380 get_rangevector (mon, pl, &rv, 0);
384 381
385 if (rv.distance < mindiff) 382 if (rv.distance < mindiff)
386 return 0; 383 return 0;
387 384
388 x = mon->x; 385 mapxy pos (mon);
389 y = mon->y;
390 m = mon->map;
391 dir = rv.direction; 386 dir = rv.direction;
392 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 */
393 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 388 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
394 389
395 /* 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. */
396 if (diff > max) 391 if (diff > max)
397 return 0; 392 return 0;
398 393
399 while (diff > 1 && max > 0) 394 while (diff > 1 && max > 0)
400 { 395 {
401 lastx = x; 396 mapxy lastpos = pos;
402 lasty = y;
403 lastmap = m;
404 x = lastx + freearr_x[dir];
405 y = lasty + freearr_y[dir];
406 397
407 mflags = get_map_flags (m, &m, x, y, &x, &y); 398 pos.move (dir);
408 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
409 399
410 /* Space is blocked - try changing direction a little */ 400 /* Space is blocked - try changing direction a little */
411 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 401 if (!pos.normalise ()
412 && (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)))
413 { 404 {
414 /* recalculate direction from last good location. Possible 405 /* recalculate direction from last good location. Possible
415 * we were not traversing ideal location before. 406 * we were not traversing ideal location before.
416 */ 407 */
417 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 408 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
418 if (rv.direction != dir) 409 if (rv.direction != dir)
419 { 410 {
420 /* OK - says direction should be different - lets reset the 411 /* OK - says direction should be different - lets reset the
421 * the values so it will try again. 412 * the values so it will try again.
422 */ 413 */
423 x = lastx;
424 y = lasty;
425 m = lastmap; 414 pos = lastpos;
426 dir = firstdir = rv.direction; 415 dir = firstdir = rv.direction;
427 } 416 }
428 else 417 else
429 { 418 {
430 /* direct path is blocked - try taking a side step to 419 /* direct path is blocked - try taking a side step to
… …
437 */ 426 */
438 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 427 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
439 { 428 {
440 if (i == 0) 429 if (i == 0)
441 continue; /* already did this, so skip it */ 430 continue; /* already did this, so skip it */
431
442 /* Use lastdir here - otherwise, 432 /* Use lastdir here - otherwise,
443 * since the direction that the creature should move in 433 * since the direction that the creature should move in
444 * may change, you could get infinite loops. 434 * may change, you could get infinite loops.
445 * ie, player is northwest, but monster can only 435 * ie, player is northwest, but monster can only
446 * move west, so it does that. It goes some distance, 436 * move west, so it does that. It goes some distance,
… …
448 * 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
449 * gets back to its original point. lastdir contains 439 * gets back to its original point. lastdir contains
450 * the last direction the creature has successfully 440 * the last direction the creature has successfully
451 * moved. 441 * moved.
452 */ 442 */
453
454 x = lastx + freearr_x[absdir (lastdir + i)];
455 y = lasty + freearr_y[absdir (lastdir + i)];
456 m = lastmap; 443 pos = lastpos;
457 mflags = get_map_flags (m, &m, x, y, &x, &y); 444 pos.move (absdir (lastdir + i));
458 if (mflags & P_OUT_OF_MAP) 445
446 if (!pos.normalise ())
459 continue; 447 continue;
460 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 448
461 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 449 mapspace &ms = *pos;
450
451 if (ms.flags () & P_BLOCKSVIEW)
462 continue; 452 continue;
463 if (mflags & P_BLOCKSVIEW) 453
454 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
464 continue; 455 continue;
465 456
466 if (m == mon->map && blocked_link (mon, m, x, y)) 457 if (blocked_link (mon, pos.m, pos.x, pos.y))
467 break; 458 break;
468 } 459 }
460
469 /* go through entire loop without finding a valid 461 /* go through entire loop without finding a valid
470 * sidestep to take - thus, no valid path. 462 * sidestep to take - thus, no valid path.
471 */ 463 */
472 if (i == (DETOUR_AMOUNT + 1)) 464 if (i == DETOUR_AMOUNT + 1)
473 return 0; 465 return 0;
466
474 diff--; 467 diff--;
475 lastdir = dir; 468 lastdir = dir;
476 max--; 469 max--;
477 if (!firstdir) 470 if (!firstdir)
478 firstdir = dir + i; 471 firstdir = dir + i;
… …
482 { 475 {
483 /* we moved towards creature, so diff is less */ 476 /* we moved towards creature, so diff is less */
484 diff--; 477 diff--;
485 max--; 478 max--;
486 lastdir = dir; 479 lastdir = dir;
480
487 if (!firstdir) 481 if (!firstdir)
488 firstdir = dir; 482 firstdir = dir;
489 } 483 }
490 484
491 if (diff <= 1) 485 if (diff <= 1)
492 { 486 {
493 /* Recalculate diff (distance) because we may not have actually 487 /* Recalculate diff (distance) because we may not have actually
494 * headed toward player for entire distance. 488 * headed toward player for entire distance.
495 */ 489 */
496 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 490 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
497 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 491 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
498 } 492 }
499 493
500 if (diff > max) 494 if (diff > max)
501 return 0; 495 return 0;
… …
519 next = op->below; 513 next = op->below;
520 514
521 /* Forces get applied per default, unless they have the 515 /* Forces get applied per default, unless they have the
522 * 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
523 */ 517 */
524 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 518 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
525 SET_FLAG (op, FLAG_APPLIED); 519 op->set_flag (FLAG_APPLIED);
526 520
527 /* we never give weapons/armour if these cannot be used 521 /* we never give weapons/armour if these cannot be used
528 * by this player due to race restrictions 522 * by this player due to race restrictions
529 */ 523 */
530 if (pl->type == PLAYER) 524 if (pl->type == PLAYER)
531 { 525 {
532 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 526 if ((!pl->flag [FLAG_USE_ARMOUR]
533 && 527 &&
534 (op->type == ARMOUR || op->type == BOOTS 528 (op->type == ARMOUR || op->type == BOOTS
535 || op->type == CLOAK || op->type == HELMET 529 || op->type == CLOAK || op->type == HELMET
536 || op->type == SHIELD || op->type == GLOVES 530 || op->type == SHIELD || op->type == GLOVES
537 || op->type == BRACERS || op->type == GIRDLE)) 531 || op->type == BRACERS || op->type == GIRDLE))
538 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 532 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
539 { 533 {
540 op->destroy (); 534 op->destroy ();
541 continue; 535 continue;
542 } 536 }
543 } 537 }
544 538
545 /* Here we remove duplicated skills (as duplicated spell objects have 539 /* Here we remove duplicated skills (as duplicated spell objects have
546 * _very_ confusing effects for players), which could for instance be 540 * _very_ confusing effects for players), which could for instance be
547 * generated by bad treasurelists. - elmex 541 * generated by multiple treasurelists specifying the same skills.
548 */ 542 */
549 if (op->type == SKILL) 543 if (op->type == SKILL)
550 { 544 {
551 for (object *tmp = op->below; tmp; tmp = tmp->below) 545 for (object *tmp = op->below; tmp; tmp = tmp->below)
552 if (tmp->type == op->type && tmp->name == op->name) 546 if (tmp->type == op->type && tmp->name == op->name)
553 { 547 {
554 op->destroy (); 548 op->destroy ();
555 LOG (llevError,
556 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
557 break; 549 break;
558 } 550 }
559 551
560 if (op->nrof > 1) 552 if (op->nrof > 1)
561 op->nrof = 1; 553 op->nrof = 1;
562 } 554 }
563 555
564 if (op->type == SPELLBOOK && op->inv) 556 if (op->type == SPELLBOOK && op->inv)
565 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 557 op->inv->clr_flag (FLAG_STARTEQUIP);
566 558
567 /* Give starting characters identified, uncursed, and undamned 559 /* Give starting characters identified, uncursed, and undamned
568 * 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
569 * merged properly. 561 * merged properly.
570 */ 562 */
571 if (need_identify (op)) 563 if (op->need_identify ())
572 { 564 {
573 SET_FLAG (op, FLAG_IDENTIFIED); 565 op->set_flag (FLAG_IDENTIFIED);
574 CLEAR_FLAG (op, FLAG_CURSED); 566 op->clr_flag (FLAG_CURSED);
575 CLEAR_FLAG (op, FLAG_DAMNED); 567 op->clr_flag (FLAG_DAMNED);
576 } 568 }
577 569
578 if (op->type == SPELL) 570 if (op->type == SPELL)
579 { 571 {
580 op->destroy (); 572 op->destroy ();
581 continue; 573 continue;
582 } 574 }
583 else if (op->type == SKILL) 575 else if (op->type == SKILL)
584 { 576 {
585 SET_FLAG (op, FLAG_CAN_USE_SKILL); 577 op->set_flag (FLAG_CAN_USE_SKILL);
586 op->stats.exp = 0; 578 op->stats.exp = 0;
587 op->level = 1; 579 op->level = 1;
588 } 580 }
589 else /* lock all 'normal items by default */ 581 else /* lock all 'normal items by default */
590 SET_FLAG (op, FLAG_INV_LOCKED); 582 op->set_flag (FLAG_INV_LOCKED);
591 } /* for loop of objects in player inv */ 583 } /* for loop of objects in player inv */
592 584
593 /* Need to set up the skill pointers */ 585 /* Need to set up the skill pointers */
594 pl->contr->link_skills (); 586 pl->contr->link_skills ();
595} 587}
… …
614roll_stat () 606roll_stat ()
615{ 607{
616 int a[4], i, j, k; 608 int a[4], i, j, k;
617 609
618 for (i = 0; i < 4; i++) 610 for (i = 0; i < 4; i++)
619 a[i] = (int) rndm (6) + 1; 611 a[i] = rndm (1, 6);
620 612
621 for (i = 0, j = 0, k = 7; i < 4; i++) 613 for (i = 0, j = 0, k = 7; i < 4; i++)
622 if (a[i] < k) 614 if (a[i] < k)
623 k = a[i], j = i; 615 k = a[i], j = i;
624 616
… …
721 treasurelist *tl = treasurelist::find (shstr_starting_wealth); 713 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
722 if (tl) 714 if (tl)
723 create_treasure (tl, ob, 0, 0, 0); 715 create_treasure (tl, ob, 0, 0, 0);
724 716
725 INVOKE_PLAYER (BIRTH, ob->contr); 717 INVOKE_PLAYER (BIRTH, ob->contr);
726 INVOKE_PLAYER (LOGIN, ob->contr);
727 718
728 ob->contr->ns->state = ST_PLAYING; 719 ob->contr->ns->state = ST_PLAYING;
729 720
730 if (ob->msg) 721 if (ob->msg)
731 ob->msg = 0; 722 ob->msg = 0;
732 723
733 start_info (ob); 724 start_info (ob);
734 CLEAR_FLAG (ob, FLAG_WIZ); 725 ob->clr_flag (FLAG_WIZ);
735 give_initial_items (ob, ob->randomitems); 726 give_initial_items (ob, ob->randomitems);
736 esrv_send_inventory (ob, ob); 727 esrv_send_inventory (ob, ob);
737 ob->update_stats (); 728 ob->update_stats ();
738 729
739 /* This moves the player to a different start map, if there 730 /* This moves the player to a different start map, if there
… …
741 */ 732 */
742 if (*first_map_ext_path) 733 if (*first_map_ext_path)
743 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y); 734 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
744 else 735 else
745 LOG (llevDebug, "first_map_ext_path not set\n"); 736 LOG (llevDebug, "first_map_ext_path not set\n");
737}
738
739/*
740 * Returns true if the given player is a legal class.
741 * The function to add and remove class-bonuses to the stats doesn't
742 * check if the stat becomes negative, thus this function
743 * merely checks that all stats are 1 or more, and returns
744 * false otherwise.
745 */
746static int
747allowed_class (const object *op)
748{
749 return op->stats.Dex > 0
750 && op->stats.Str > 0
751 && op->stats.Con > 0
752 && op->stats.Int > 0
753 && op->stats.Wis > 0
754 && op->stats.Pow > 0
755 && op->stats.Cha > 0;
746} 756}
747 757
748void 758void
749player::chargen_race_next () 759player::chargen_race_next ()
750{ 760{
… …
788 rv_vector rv; 798 rv_vector rv;
789 799
790 if (op->stats.hp < 0) 800 if (op->stats.hp < 0)
791 { 801 {
792 LOG (llevDebug, "Fleeing player is dead.\n"); 802 LOG (llevDebug, "Fleeing player is dead.\n");
793 CLEAR_FLAG (op, FLAG_SCARED); 803 op->clr_flag (FLAG_SCARED);
794 return; 804 return;
795 } 805 }
796 806
797 if (!op->enemy) 807 if (!op->enemy)
798 { 808 {
799 LOG (llevDebug, "Fleeing player had no enemy.\n"); 809 LOG (llevDebug, "Fleeing player had no enemy.\n");
800 CLEAR_FLAG (op, FLAG_SCARED); 810 op->clr_flag (FLAG_SCARED);
801 return; 811 return;
802 } 812 }
803 813
804 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 814 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
805 { 815 {
806 op->enemy = NULL; 816 op->enemy = NULL;
807 CLEAR_FLAG (op, FLAG_SCARED); 817 op->clr_flag (FLAG_SCARED);
808 return; 818 return;
809 } 819 }
810 820
811 get_rangevector (op, op->enemy, &rv, 0); 821 get_rangevector (op, op->enemy, &rv, 0);
812 822
… …
818 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m)))) 828 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
819 return; 829 return;
820 } 830 }
821 831
822 /* Cornered, get rid of scared */ 832 /* Cornered, get rid of scared */
823 CLEAR_FLAG (op, FLAG_SCARED); 833 op->clr_flag (FLAG_SCARED);
824 op->enemy = NULL; 834 op->enemy = NULL;
825} 835}
826 836
827/* check_pick sees if there is stuff to be picked up/picks up stuff. 837/* check_pick sees if there is stuff to be picked up/picks up stuff.
828 * It returns 1 if the player should keep on moving, 0 if he should 838 * It returns 1 if the player should keep on moving, 0 if he should
… …
920 * fighting */ 930 * fighting */
921 if (op->contr->mode & PU_INHIBIT) 931 if (op->contr->mode & PU_INHIBIT)
922 return 1; 932 return 1;
923 933
924 /* prevent us from turning into auto-thieves :) */ 934 /* prevent us from turning into auto-thieves :) */
925 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 935 if (tmp->flag [FLAG_UNPAID])
926 continue; 936 continue;
927 937
928 /* ignore known cursed objects */ 938 /* ignore known cursed objects */
929 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 939 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
930 continue; 940 continue;
931 941
932 /* all food and drink if desired */ 942 /* all food and drink if desired */
933 /* question: don't pick up known-poisonous stuff? */ 943 /* question: don't pick up known-poisonous stuff? */
934 if (op->contr->mode & PU_FOOD) 944 if (op->contr->mode & PU_FOOD)
… …
937 CHK_PICK_PICKUP; 947 CHK_PICK_PICKUP;
938 continue; 948 continue;
939 } 949 }
940 950
941 if (op->contr->mode & PU_DRINK) 951 if (op->contr->mode & PU_DRINK)
942 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 952 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
943 { 953 {
944 CHK_PICK_PICKUP; 954 CHK_PICK_PICKUP;
945 continue; 955 continue;
946 } 956 }
947 957
… …
985 continue; 995 continue;
986 } 996 }
987 997
988 /* pick up all magical items */ 998 /* pick up all magical items */
989 if (op->contr->mode & PU_MAGICAL) 999 if (op->contr->mode & PU_MAGICAL)
990 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 1000 if (tmp->flag [FLAG_KNOWN_MAGICAL]
991 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1001 && !tmp->flag [FLAG_KNOWN_CURSED])
992 { 1002 {
993 CHK_PICK_PICKUP; 1003 CHK_PICK_PICKUP;
994 continue; 1004 continue;
995 } 1005 }
996 1006
… …
1080 continue; 1090 continue;
1081 } 1091 }
1082 1092
1083 /* hoping to catch throwing daggers here */ 1093 /* hoping to catch throwing daggers here */
1084 if (op->contr->mode & PU_MISSILEWEAPON) 1094 if (op->contr->mode & PU_MISSILEWEAPON)
1085 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1095 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1086 { 1096 {
1087 CHK_PICK_PICKUP; 1097 CHK_PICK_PICKUP;
1088 continue; 1098 continue;
1089 } 1099 }
1090 1100
… …
1145 * return 0. 1155 * return 0.
1146 */ 1156 */
1147static int 1157static int
1148action_makes_visible (object *op) 1158action_makes_visible (object *op)
1149{ 1159{
1150 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1160 if (op->invisible && op->flag [FLAG_ALIVE])
1151 { 1161 {
1152 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1162 if (op->flag [FLAG_MAKE_INVIS])
1153 { 1163 {
1154 // artefact invisibility is permanent, but we still make noise 1164 // artefact invisibility is permanent, but we still make noise
1155 // this is important for game-balance. 1165 // this is important for game-balance.
1156 if (op->contr) 1166 if (op->contr)
1157 op->make_noise (); 1167 op->make_noise ();
… …
1184 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1194 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1185 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1195 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1186 return splay (tmp); 1196 return splay (tmp);
1187 1197
1188 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1198 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1189 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1199 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1190 if (object *arrow = find_arrow (tmp, type)) 1200 if (object *arrow = find_arrow (tmp, type))
1191 { 1201 {
1192 splay (tmp); 1202 splay (tmp);
1193 return arrow; 1203 return arrow;
1194 } 1204 }
… …
1211 if (!type) 1221 if (!type)
1212 return NULL; 1222 return NULL;
1213 1223
1214 for (arrow = op->inv; arrow; arrow = arrow->below) 1224 for (arrow = op->inv; arrow; arrow = arrow->below)
1215 { 1225 {
1216 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1226 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1217 { 1227 {
1218 i = 0; 1228 i = 0;
1219 ntmp = find_better_arrow (arrow, target, type, &i); 1229 ntmp = find_better_arrow (arrow, target, type, &i);
1220 1230
1221 if (i > betterby) 1231 if (i > betterby)
… …
1322 break; 1332 break;
1323 } 1333 }
1324 1334
1325 if (mflags & P_IS_ALIVE) 1335 if (mflags & P_IS_ALIVE)
1326 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1336 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1327 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1337 if (tmp->flag [FLAG_ALIVE])
1328 break; 1338 break;
1329 } 1339 }
1330 1340
1331 if (!tmp) 1341 if (!tmp)
1332 return find_arrow (op, type); 1342 return find_arrow (op, type);
… …
1393 { 1403 {
1394 if (op->type == PLAYER) 1404 if (op->type == PLAYER)
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1405 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1396 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1406 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1397 else 1407 else
1398 CLEAR_FLAG (op, FLAG_READY_BOW); 1408 op->clr_flag (FLAG_READY_BOW);
1399 1409
1400 return 0; 1410 return 0;
1401 } 1411 }
1402 } 1412 }
1403 1413
… …
1452#endif 1462#endif
1453 1463
1454 SET_ANIMATION (arrow, arrow->direction); 1464 SET_ANIMATION (arrow, arrow->direction);
1455 1465
1456 /* update the speed */ 1466 /* update the speed */
1457 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1458 + bow->stats.dam / 7.f;
1459 1467
1460 arrow->set_speed (max (arrow->speed, 2.f));
1461 arrow->speed_left = 0; 1468 arrow->speed_left = 0;
1469 arrow->set_speed (max (2.f,
1470 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1471 + bow->stats.dam / 7.f
1472 ));
1462 1473
1463 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1474 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1464 1475
1465 if (op->type == PLAYER) 1476 if (op->type == PLAYER)
1466 { 1477 {
… …
1599 1610
1600 if (item->type == WAND) 1611 if (item->type == WAND)
1601 { 1612 {
1602 if (!(--item->stats.food)) 1613 if (!(--item->stats.food))
1603 { 1614 {
1604 object *tmp;
1605
1606 if (item->arch) 1615 if (item->arch)
1607 { 1616 {
1608 CLEAR_FLAG (item, FLAG_ANIMATE); 1617 item->clr_flag (FLAG_ANIMATE);
1609 item->face = item->arch->face; 1618 item->face = item->arch->face;
1610 item->set_speed (0); 1619 item->set_speed (0);
1611 } 1620 }
1612 1621
1613 if (object *pl = item->visible_to ()) 1622 if (object *pl = item->visible_to ())
… …
1741 * 1750 *
1742 * Change the color so that the message doesn't disappear with 1751 * Change the color so that the message doesn't disappear with
1743 * all the others. 1752 * all the others.
1744 */ 1753 */
1745 if (pl->contr->usekeys == key_inventory 1754 if (pl->contr->usekeys == key_inventory
1746 || !QUERY_FLAG (container, FLAG_APPLIED) 1755 || !container->flag [FLAG_APPLIED]
1747 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1756 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1748 { 1757 {
1749 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1758 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1750 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1759 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1751 return NULL; 1760 return NULL;
… …
1873 || mon->flag [FLAG_CAN_ROLL]) 1882 || mon->flag [FLAG_CAN_ROLL])
1874 && mon != op) 1883 && mon != op)
1875 break; 1884 break;
1876 } 1885 }
1877 1886
1878 if (!mon) /* This happens anytime the player tries to move */ 1887 /* no monster == player tries to move into a wall or so */
1879 return false; /* into a wall */ 1888 if (!mon)
1889 {
1890 for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
1891 if (op->move_type & ob->move_block)
1892 {
1893 if (ob->move_block == MOVE_ALL)
1894 move_into_wall (op, ob);
1895 else
1896 {
1897 if (op->contr->ns->bumpmsg)
1898 {
1899 op->play_sound (sound_find ("blocked_move"));
1900
1901 op->statusmsg (ob->invisible
1902 ? "Something blocks you."
1903 : format ("Something blocks you from entering the %s.", query_name (ob))
1904 );
1905 }
1906 }
1907
1908 break;
1909 }
1910
1911 return false;
1912 }
1880 1913
1881 mon = mon->head_ (); 1914 mon = mon->head_ ();
1882 1915
1883 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 1916 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1884 if (op->contr->weapon_sp_left > 0.f) 1917 if (op->contr->weapon_sp_left > 0.f)
… …
1902 */ 1935 */
1903 if (op->type == PLAYER 1936 if (op->type == PLAYER
1904 && ((mon->owner && mon->owner->contr 1937 && ((mon->owner && mon->owner->contr
1905 && same_party (mon->owner->contr->party, op->contr->party)) 1938 && same_party (mon->owner->contr->party, op->contr->party))
1906 || mon->owner == op) 1939 || mon->owner == op)
1907 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1940 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1908 { 1941 {
1909 /* If we're braced, we don't want to switch places with it */ 1942 /* If we're braced, we don't want to switch places with it */
1910 if (op->contr->braced) 1943 if (op->contr->braced)
1911 return false; 1944 return false;
1912 1945
… …
1932 * creatures. Note that if you are braced, you can't push 1965 * creatures. Note that if you are braced, you can't push
1933 * someone, but put it inside this loop so that you won't 1966 * someone, but put it inside this loop so that you won't
1934 * attack them either. 1967 * attack them either.
1935 */ 1968 */
1936 if ((mon->type == PLAYER || mon->enemy != op) 1969 if ((mon->type == PLAYER || mon->enemy != op)
1937 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1970 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1938 && ((op->contr->peaceful 1971 && ((op->contr->peaceful
1939 || (mon->type == PLAYER && mon->contr->peaceful)) 1972 || (mon->type == PLAYER && mon->contr->peaceful))
1940 && !on_battleground)) 1973 && !on_battleground))
1941 { 1974 {
1942 if (op->speed_left > 0.f) 1975 if (op->speed_left > 0.f)
… …
1958 } 1991 }
1959 } 1992 }
1960 /* If the object is a boulder or other rollable object, then 1993 /* If the object is a boulder or other rollable object, then
1961 * roll it if not braced. You can't roll it if you are braced. 1994 * roll it if not braced. You can't roll it if you are braced.
1962 */ 1995 */
1963 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1996 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1964 { 1997 {
1965 if (op->speed_left > 0.f) 1998 if (op->speed_left > 0.f)
1966 { 1999 {
1967 --op->speed_left; 2000 --op->speed_left;
1968 2001
… …
1977 * Way it works is like this: First, it must have some hit points 2010 * Way it works is like this: First, it must have some hit points
1978 * and be living. Then, it must be one of the following: 2011 * and be living. Then, it must be one of the following:
1979 * 1) Not a player, 2) A player, but of a different party. Note 2012 * 1) Not a player, 2) A player, but of a different party. Note
1980 * that party_number -1 is no party, so attacks can still happen. 2013 * that party_number -1 is no party, so attacks can still happen.
1981 */ 2014 */
1982 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2015 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1983 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2016 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
1984 { 2017 {
1985 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 2018 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
1986 { 2019 {
1987 --op->contr->weapon_sp_left; 2020 --op->contr->weapon_sp_left;
… …
1999} 2032}
2000 2033
2001bool 2034bool
2002move_player (object *op, int dir) 2035move_player (object *op, int dir)
2003{ 2036{
2004 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2037 if (!op->map || op->map->state != MAP_ACTIVE)
2005 return 0; 2038 return 0;
2006 2039
2007 /* Sanity check: make sure dir is valid */ 2040 /* Sanity check: make sure dir is valid */
2008 if (dir < 0 || dir >= 9) 2041 if (dir < 0 || dir > 8)
2009 { 2042 {
2010 LOG (llevError, "move_player: invalid direction %d\n", dir); 2043 LOG (llevError, "move_player: invalid direction %d\n", dir);
2011 return 0; 2044 return 0;
2012 } 2045 }
2013 2046
2014 /* peterm: added following line */ 2047 /* peterm: added following line */
2015 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2048 if (op->flag [FLAG_CONFUSED] && dir)
2016 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2049 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2017 2050
2018 op->facing = dir; 2051 op->facing = dir;
2019 2052
2020 if (op->flag [FLAG_HIDDEN]) 2053 if (op->flag [FLAG_HIDDEN])
… …
2060 * players. 2093 * players.
2061 */ 2094 */
2062bool 2095bool
2063handle_newcs_player (object *op) 2096handle_newcs_player (object *op)
2064{ 2097{
2065 if (QUERY_FLAG (op, FLAG_SCARED)) 2098 if (op->flag [FLAG_SCARED])
2066 { 2099 {
2067 if (op->speed_left > 0.f) 2100 if (op->speed_left > 0.f)
2068 { 2101 {
2069 --op->speed_left; 2102 --op->speed_left;
2070 flee_player (op); 2103 flee_player (op);
… …
2089} 2122}
2090 2123
2091static int 2124static int
2092save_life (object *op) 2125save_life (object *op)
2093{ 2126{
2094 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2127 if (!op->flag [FLAG_LIFESAVE])
2095 return 0; 2128 return 0;
2096 2129
2097 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2130 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2098 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2131 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2099 { 2132 {
2100 op->play_sound (sound_find ("ob_evaporate")); 2133 op->play_sound (sound_find ("ob_evaporate"));
2101 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2134 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2102 2135
2103 tmp->destroy (); 2136 tmp->destroy ();
2104 CLEAR_FLAG (op, FLAG_LIFESAVE); 2137 op->clr_flag (FLAG_LIFESAVE);
2105 2138
2106 if (op->stats.hp < 0) 2139 if (op->stats.hp < 0)
2107 op->stats.hp = op->stats.maxhp; 2140 op->stats.hp = op->stats.maxhp;
2108 2141
2109 if (op->stats.food < 0) 2142 if (op->stats.food < 0)
… …
2112 op->update_stats (); 2145 op->update_stats ();
2113 return 1; 2146 return 1;
2114 } 2147 }
2115 2148
2116 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2149 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2117 CLEAR_FLAG (op, FLAG_LIFESAVE); 2150 op->clr_flag (FLAG_LIFESAVE);
2118 enter_player_savebed (op); /* bring him home. */ 2151 enter_player_savebed (op); /* bring him home. */
2119 return 0; 2152 return 0;
2120} 2153}
2121 2154
2122/* This goes throws the inventory and removes unpaid objects, and puts them 2155/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2129{ 2162{
2130 while (op) 2163 while (op)
2131 { 2164 {
2132 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2165 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2133 2166
2134 if (QUERY_FLAG (op, FLAG_UNPAID)) 2167 if (op->flag [FLAG_UNPAID])
2135 op->insert_at (env); 2168 op->insert_at (env);
2136 else if (op->inv) 2169 else if (op->inv)
2137 drop_unpaid_items (op->inv, env); 2170 drop_unpaid_items (op->inv, env);
2138 2171
2139 op = next; 2172 op = next;
… …
2150void 2183void
2151do_some_living (object *op) 2184do_some_living (object *op)
2152{ 2185{
2153 int last_food = op->stats.food; 2186 int last_food = op->stats.food;
2154 int gen_hp, gen_sp, gen_grace; 2187 int gen_hp, gen_sp, gen_grace;
2155 int over_hp, over_sp, over_grace;
2156 int i;
2157 int rate_hp = 1200; 2188 int rate_hp = 1200;
2158 int rate_sp = 2500; 2189 int rate_sp = 2500;
2159 int rate_grace = 2000; 2190 int rate_grace = 2000;
2160 const int max_hp = 1; 2191 const int max_hp = 1;
2161 const int max_sp = 1; 2192 const int max_sp = 1;
2162 const int max_grace = 1; 2193 const int max_grace = 1;
2163 2194
2195#if 0
2164 if (op->contr->hidden) 2196 if (op->contr->hidden)
2165 { 2197 {
2166 op->invisible = 1000; 2198 op->invisible = 1000;
2167 /* the socket code flashes the player visible/invisible 2199 /* the socket code flashes the player visible/invisible
2168 * depending on the value of invisible, so we need to 2200 * depending on the value of invisible, so we need to
2169 * alternate it here for it to work correctly. 2201 * alternate it here for it to work correctly.
2170 */ 2202 */
2171 if (pticks & 2) 2203 if (server_tick & 2)
2172 op->invisible--; 2204 op->invisible--;
2173 } 2205 }
2206 else
2207#endif
2174 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2208 if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2175 { 2209 {
2176 if (!op->invisible--) 2210 if (!op->invisible--)
2177 { 2211 {
2178 make_visible (op); 2212 make_visible (op);
2179 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2213 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2213 if (--op->last_grace < 0) 2247 if (--op->last_grace < 0)
2214 { 2248 {
2215 if (op->stats.grace < op->stats.maxgrace / 2) 2249 if (op->stats.grace < op->stats.maxgrace / 2)
2216 op->stats.grace++; /* no penalty in food for regaining grace */ 2250 op->stats.grace++; /* no penalty in food for regaining grace */
2217 2251
2252 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2253
2218 if (max_grace > 1) 2254 if (max_grace > 1)
2219 { 2255 {
2220 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2256 int over_grace = temp / rate_grace;
2257
2221 if (over_grace > 0) 2258 if (over_grace > 0)
2222 { 2259 {
2223 op->stats.sp += over_grace 2260 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2224 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2225 op->last_grace = 0; 2261 op->last_grace = 0;
2226 } 2262 }
2227 else 2263 else
2228 { 2264 op->last_grace = rate_grace / temp;
2229 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2230 }
2231 } 2265 }
2232 else 2266 else
2233 { 2267 op->last_grace = rate_grace / temp;
2234 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2268
2235 }
2236 /* wearing stuff doesn't detract from grace generation. */ 2269 /* wearing stuff doesn't detract from grace generation. */
2237 } 2270 }
2238 2271
2239 if (op->stats.food > 0) 2272 if (op->stats.food > 0)
2240 { 2273 {
… …
2246 if (op->stats.sp < op->stats.maxsp) 2279 if (op->stats.sp < op->stats.maxsp)
2247 { 2280 {
2248 op->stats.sp++; 2281 op->stats.sp++;
2249 2282
2250 /* dms do not consume food */ 2283 /* dms do not consume food */
2251 if (!QUERY_FLAG (op, FLAG_WIZ)) 2284 if (!op->flag [FLAG_WIZ])
2252 { 2285 {
2253 op->stats.food--; 2286 op->stats.food--;
2254 2287
2255 if (op->contr->digestion < 0) 2288 if (op->contr->digestion < 0)
2256 op->stats.food += op->contr->digestion; 2289 op->stats.food += op->contr->digestion;
… …
2259 } 2292 }
2260 } 2293 }
2261 2294
2262 if (max_sp > 1) 2295 if (max_sp > 1)
2263 { 2296 {
2264 over_sp = (gen_sp + 10) / rate_sp; 2297 int over_sp = (gen_sp + 10) / rate_sp;
2265 if (over_sp > 0) 2298 if (over_sp > 0)
2266 { 2299 {
2267 if (op->stats.sp < op->stats.maxsp) 2300 if (op->stats.sp < op->stats.maxsp)
2268 { 2301 {
2269 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2302 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2290 if (op->stats.hp < op->stats.maxhp) 2323 if (op->stats.hp < op->stats.maxhp)
2291 { 2324 {
2292 op->stats.hp++; 2325 op->stats.hp++;
2293 2326
2294 /* dms do not consume food */ 2327 /* dms do not consume food */
2295 if (!QUERY_FLAG (op, FLAG_WIZ)) 2328 if (!op->flag [FLAG_WIZ])
2296 { 2329 {
2297 op->stats.food--; 2330 op->stats.food--;
2298 2331
2299 if (op->contr->digestion < 0) 2332 if (op->contr->digestion < 0)
2300 op->stats.food += op->contr->digestion; 2333 op->stats.food += op->contr->digestion;
2301 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2334 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2302 op->stats.food = last_food; 2335 op->stats.food = last_food;
2303 } 2336 }
2304 } 2337 }
2305 2338
2339 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2340
2306 if (max_hp > 1) 2341 if (max_hp > 1)
2307 { 2342 {
2308 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2343 int over_hp = temp / rate_hp;
2309 2344
2310 if (over_hp > 0) 2345 if (over_hp > 0)
2311 { 2346 {
2312 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2347 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2313 op->last_heal = 0; 2348 op->last_heal = 0;
2314 } 2349 }
2315 else 2350 else
2316 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2351 op->last_heal = rate_hp / temp;
2317 } 2352 }
2318 else 2353 else
2319 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2354 op->last_heal = rate_hp / temp;
2320 } 2355 }
2321 } 2356 }
2322 2357
2323 /* Digestion */ 2358 /* Digestion */
2324 if (--op->last_eat < 0) 2359 if (--op->last_eat < 0)
… …
2327 penalty = max (0, -op->contr->digestion); 2362 penalty = max (0, -op->contr->digestion);
2328 2363
2329 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2364 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2330 2365
2331 /* dms do not consume food */ 2366 /* dms do not consume food */
2332 if (!QUERY_FLAG (op, FLAG_WIZ)) 2367 if (!op->flag [FLAG_WIZ])
2333 op->stats.food--; 2368 op->stats.food--;
2334 } 2369 }
2335 2370
2336 if (op->stats.food < 0 && op->stats.hp >= 0) 2371 if (op->stats.food < 0 && op->stats.hp >= 0)
2337 { 2372 {
2338 object *flesh = 0; 2373 object *flesh = 0;
2339 2374
2340 for_inv_removable (op, tmp) 2375 for_inv_removable (op, tmp)
2341 { 2376 {
2342 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2377 if (tmp->flag [FLAG_UNPAID])
2343 continue; 2378 continue;
2344 2379
2345 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2380 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2346 { 2381 {
2347 op->statusmsg ("You blindly grab for a bite of food. " 2382 op->statusmsg ("You blindly grab for a bite of food. "
… …
2382 op->contr->killer->destroy (); 2417 op->contr->killer->destroy ();
2383 } 2418 }
2384 } 2419 }
2385 2420
2386 /* killer should be set here already */ 2421 /* killer should be set here already */
2387 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2422 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2388 kill_player (op); 2423 kill_player (op);
2389 } 2424 }
2390} 2425}
2391 2426
2392/* If the player should die (lack of hp, food, etc), we call this. 2427/* If the player should die (lack of hp, food, etc), we call this.
… …
2587 * difference. 2622 * difference.
2588 */ 2623 */
2589 if (this_stat >= -50) 2624 if (this_stat >= -50)
2590 { 2625 {
2591 change_attr_value (&(dep->stats), i, -1); 2626 change_attr_value (&(dep->stats), i, -1);
2592 SET_FLAG (dep, FLAG_APPLIED); 2627 dep->set_flag (FLAG_APPLIED);
2593 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2628 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2594 op->update_stats (); 2629 op->update_stats ();
2595 lost_a_stat = 1; 2630 lost_a_stat = 1;
2596 } 2631 }
2597 } 2632 }
… …
2664 if (will_kill_again) 2699 if (will_kill_again)
2665 { 2700 {
2666 object *force; 2701 object *force;
2667 int at; 2702 int at;
2668 2703
2669 force = get_archetype (FORCE_NAME); 2704 force = archetype::get (FORCE_NAME);
2670 /* 50 ticks should be enough time for the spell to abate */ 2705 /* 50 ticks should be enough time for the spell to abate */
2671 force->speed = 0.1f;
2672 force->speed_left = -5.f; 2706 force->speed_left = -5.f;
2673 SET_FLAG (force, FLAG_APPLIED); 2707 force->set_speed (0.1f);
2708 force->set_flag (FLAG_APPLIED);
2709
2674 for (at = 0; at < NROFATTACKS; at++) 2710 for (at = 0; at < NROFATTACKS; at++)
2675 if (will_kill_again & (1 << at)) 2711 if (will_kill_again & (1 << at))
2676 force->resist[at] = 100; 2712 force->resist[at] = 100;
2677 2713
2678 insert_ob_in_ob (force, op); 2714 insert_ob_in_ob (force, op);
… …
2683} 2719}
2684 2720
2685static void 2721static void
2686loot_object (object *op) 2722loot_object (object *op)
2687{ /* Grab and destroy some treasure */ 2723{ /* Grab and destroy some treasure */
2688 object *tmp, *tmp2, *next; 2724 object *tmp, *next;
2689 2725
2690 op->close_container (); /* close open sack first */ 2726 op->close_container (); /* close open sack first */
2691 2727
2692 for (tmp = op->inv; tmp; tmp = next) 2728 for (tmp = op->inv; tmp; tmp = next)
2693 { 2729 {
… …
2700 tmp->x = op->x, tmp->y = op->y; 2736 tmp->x = op->x, tmp->y = op->y;
2701 2737
2702 if (tmp->type == CONTAINER) 2738 if (tmp->type == CONTAINER)
2703 loot_object (tmp); /* empty container to ground */ 2739 loot_object (tmp); /* empty container to ground */
2704 2740
2705 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2741 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2706 { 2742 {
2707 if (tmp->nrof > 1) 2743 if (tmp->nrof > 1)
2708 { 2744 {
2709 tmp->decrease (rndm (1, tmp->nrof - 1)); 2745 tmp->decrease (rndm (1, tmp->nrof - 1));
2710 insert_ob_in_map (tmp, op->map, NULL, 0); 2746 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2725void 2761void
2726fix_weight () 2762fix_weight ()
2727{ 2763{
2728 for_all_players (pl) 2764 for_all_players (pl)
2729 { 2765 {
2730 sint32 old = pl->ob->carrying; 2766 weight_t old = pl->ob->carrying;
2731 2767
2732 pl->ob->update_weight (); 2768 pl->ob->update_weight ();
2733 2769
2734 if (old != pl->ob->carrying) 2770 if (old != pl->ob->carrying)
2735 { 2771 {
… …
2800} 2836}
2801 2837
2802int 2838int
2803is_true_undead (object *op) 2839is_true_undead (object *op)
2804{ 2840{
2805 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2841 if (op->arch->flag [FLAG_UNDEAD])
2806 return 1; 2842 return 1;
2807 2843
2808 return 0; 2844 return 0;
2809} 2845}
2810 2846
… …
2908 2944
2909 if (who->type == PLAYER) 2945 if (who->type == PLAYER)
2910 player = 1; 2946 player = 1;
2911 2947
2912 else 2948 else
2913 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2949 friendly = who->flag [FLAG_FRIENDLY];
2914 2950
2915 /* search adjacent squares */ 2951 /* search adjacent squares */
2916 for (i = 1; i < 9; i++) 2952 for (i = 1; i < 9; i++)
2917 { 2953 {
2918 x = who->x + freearr_x[i]; 2954 x = who->x + freearr_x[i];
… …
2927 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2963 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2928 continue; 2964 continue;
2929 2965
2930 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2966 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2931 { 2967 {
2932 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2968 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2933 return 1; 2969 return 1;
2934 else if (tmp->type == PLAYER) 2970 else if (tmp->type == PLAYER)
2935 {
2936 /*don't let a hidden DM prevent you from hiding */
2937 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
2938 return 1; 2971 return 1;
2939 }
2940 } 2972 }
2941 } 2973 }
2942 return 0; 2974 return 0;
2943} 2975}
2944 2976
2945/* check the player los field for viewability of the 2977/* check the player los field for viewability of the
2946 * object op. This function works fine for monsters, 2978 * object op. This function works fine for monsters,
2947 * but we dont worry if the object isnt the top one in 2979 * but we dont worry if the object isnt the top one in
2948 * a pile (say a coin under a table would return "viewable" 2980 * a pile (say a coin under a table would return "viewable"
2949 * by this routine). Another question, should we be 2981 * by this routine). Another question, should we be
2950 * concerned with the direction the player is looking 2982 * concerned with the direction the player is looking
2951 * in? Realistically, most of us can't see stuff behind 2983 * in? Realistically, most of us can't see stuff behind
2952 * our backs...on the other hand, does the "facing" direction 2984 * our backs...on the other hand, does the "facing" direction
2953 * imply the way your head, or body is facing? It's possible 2985 * imply the way your head, or body is facing? It's possible
2954 * for them to differ. Sigh, this fctn could get a bit more complex. 2986 * for them to differ. Sigh, this fctn could get a bit more complex.
2955 * -b.t. 2987 * -b.t.
2956 * This function is now map tiling safe. 2988 * This function is now map tiling safe.
2957 */ 2989 */
2958int 2990int
2959player_can_view (object *pl, object *op) 2991player_can_view (object *pl, object *op)
2960{ 2992{
… …
3011 * and the exit-coordinates sp/hp must both be > 0. 3043 * and the exit-coordinates sp/hp must both be > 0.
3012 * => The intention here is to prevent abuse of the battleground- 3044 * => The intention here is to prevent abuse of the battleground-
3013 * feature (like pickable or hidden battleground tiles). */ 3045 * feature (like pickable or hidden battleground tiles). */
3014 for (object *tmp = op->below; tmp; tmp = tmp->below) 3046 for (object *tmp = op->below; tmp; tmp = tmp->below)
3015 { 3047 {
3016 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3048 if (tmp->flag [FLAG_IS_FLOOR])
3017 { 3049 {
3018 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3050 if (tmp->flag [FLAG_NO_PICK]
3019 && tmp->type == BATTLEGROUND 3051 && tmp->type == BATTLEGROUND
3020 && tmp->name == shstr_battleground 3052 && tmp->name == shstr_battleground
3021 && EXIT_X (tmp) && EXIT_Y (tmp)) 3053 && EXIT_X (tmp) && EXIT_Y (tmp))
3022 { 3054 {
3023 /* before we assign the exit, check if this is a teambattle */ 3055 /* before we assign the exit, check if this is a teambattle */
… …
3181 strcat (buf, "."); 3213 strcat (buf, ".");
3182 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3214 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3183 } 3215 }
3184 3216
3185 /* evtl. adding flags: */ 3217 /* evtl. adding flags: */
3186 if (QUERY_FLAG (item, FLAG_XRAYS)) 3218 if (item->flag [FLAG_XRAYS])
3187 SET_FLAG (skin, FLAG_XRAYS); 3219 skin->set_flag (FLAG_XRAYS);
3188 if (QUERY_FLAG (item, FLAG_STEALTH)) 3220 if (item->flag [FLAG_STEALTH])
3189 SET_FLAG (skin, FLAG_STEALTH); 3221 skin->set_flag (FLAG_STEALTH);
3190 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3222 if (item->flag [FLAG_SEE_IN_DARK])
3191 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3223 skin->set_flag (FLAG_SEE_IN_DARK);
3192 3224
3193 /* print message if there is one */ 3225 /* print message if there is one */
3194 if (item->msg != NULL) 3226 if (item->msg != NULL)
3195 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3227 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3196 } 3228 }
… …
3238{ 3270{
3239 play_sound (sound_find ("generic_failure")); 3271 play_sound (sound_find ("generic_failure"));
3240 statusmsg (msg, color); 3272 statusmsg (msg, color);
3241} 3273}
3242 3274
3275void
3276object::failmsgf (const char *format, ...)
3277{
3278 if (!contr)
3279 return;
3280
3281 va_list ap;
3282 va_start (ap, format);
3283 contr->failmsg (vformat (format, ap));
3284 va_end (ap);
3285}
3286
3287void
3288player::failmsgf (const char *format, ...)
3289{
3290 va_list ap;
3291 va_start (ap, format);
3292 failmsg (vformat (format, ap));
3293 va_end (ap);
3294}
3295

Diff Legend

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