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.237 by root, Thu Nov 5 15:18:26 2009 UTC vs.
Revision 1.272 by root, Thu Apr 15 02:51:39 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
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
26
25#include <global.h> 27#include <global.h>
26#include <sproto.h> 28#include <sproto.h>
27#include <sounds.h> 29#include <sounds.h>
28#include <living.h> 30#include <living.h>
29#include <object.h> 31#include <object.h>
… …
52 54
53 players.insert (this); 55 players.insert (this);
54 ob->remove (); 56 ob->remove ();
55 ob->map = 0; 57 ob->map = 0;
56 ob->activate_recursive (); 58 ob->activate_recursive ();
57 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 ob->clr_flag (FLAG_FRIENDLY);
58 add_friendly_object (ob); 60 add_friendly_object (ob);
59} 61}
60 62
61void 63void
62player::deactivate () 64player::deactivate ()
… …
74 ob->remove (); 76 ob->remove ();
75 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
76 ob->map = 0; 78 ob->map = 0;
77 party = 0; 79 party = 0;
78 80
79 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
80
81 players.erase (this); 81 players.erase (this);
82} 82}
83 83
84// connect the player with a specific client 84// connect the player with a specific client
85// also changes, rationalises, and fixes some incorrect settings 85// also changes, rationalises, and fixes some incorrect settings
… …
105 ob->race = ob->arch->race; 105 ob->race = ob->arch->race;
106 106
107 ob->update_weight (); 107 ob->update_weight ();
108 link_skills (); 108 link_skills ();
109 109
110 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
111
112 assign (title, ob->arch->object::name); 110 assign (title, ob->arch->object::name);
113 111
114 /* if it's a dragon player, set the correct title here */ 112 /* if it's a dragon player, set the correct title here */
115 if (is_dragon_pl (ob)) 113 if (ob->is_dragon ())
116 { 114 {
117 object *tmp, *abil = 0, *skin = 0; 115 object *tmp, *abil = 0, *skin = 0;
118 116
119 for (tmp = ob->inv; tmp; tmp = tmp->below) 117 for (tmp = ob->inv; tmp; tmp = tmp->below)
120 if (tmp->type == FORCE) 118 if (tmp->type == FORCE)
… …
134 132
135 ns->floorbox_update (); 133 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob); 134 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0); 135 esrv_add_spells (this, 0);
138 136
137 ob->flag [FLAG_READY_WEAPON] = false;
138 ob->flag [FLAG_READY_SKILL] = false;
139 ob->flag [FLAG_READY_RANGE] = false;
140 ob->flag [FLAG_READY_BOW] = false;
141
142 ob->update_stats (); // we unapplied stuff above
139 activate (); 143 activate ();
140 144
141 INVOKE_PLAYER (CONNECT, this); 145 INVOKE_PLAYER (CONNECT, this);
142 INVOKE_PLAYER (LOGIN, this); 146 INVOKE_PLAYER (LOGIN, this);
143} 147}
… …
167 // when ns = 0 171 // when ns = 0
168 observe = viewpoint = ob; 172 observe = viewpoint = ob;
169 173
170 deactivate (); 174 deactivate ();
171} 175}
176
177//-GPL
172 178
173// the need for this function can be explained 179// the need for this function can be explained
174// by load_object not returning the object 180// by load_object not returning the object
175void 181void
176player::set_object (object *op) 182player::set_object (object *op)
… …
180 186
181 ob->speed = 1.0f; 187 ob->speed = 1.0f;
182 ob->speed_left = 0.5f; 188 ob->speed_left = 0.5f;
183 189
184 ob->direction = 5; /* So player faces south */ 190 ob->direction = 5; /* So player faces south */
185
186 ob->flag [FLAG_READY_WEAPON] = false;
187 ob->flag [FLAG_READY_SKILL] = false;
188 ob->flag [FLAG_READY_BOW] = false;
189
190 for (object *op = ob->inv; op; op = op->below)
191 if (op->flag [FLAG_APPLIED])
192 switch (op->type)
193 {
194 case SKILL:
195 ob->flag [FLAG_APPLIED] = false;
196 break;
197
198 case WAND:
199 case ROD:
200 case HORN:
201 case BOW:
202 ranged_ob = op;
203 break;
204
205 case WEAPON:
206 combat_ob = op;
207 break;
208 }
209
210 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
211 ob->deactivate (); // change_weapon activates, fix this better
212} 191}
213 192
214void 193void
215player::set_observe (object *op) 194player::set_observe (object *op)
216{ 195{
… …
222player::set_viewpoint (object *op) 201player::set_viewpoint (object *op)
223{ 202{
224 viewpoint = op ? op : (object *)observe; 203 viewpoint = op ? op : (object *)observe;
225 do_los = 1; 204 do_los = 1;
226} 205}
206
207//+GPL
227 208
228player::player () 209player::player ()
229{ 210{
230 /* There are some elements we want initialised to non zero value - 211 /* There are some elements we want initialised to non zero value -
231 * we deal with that below this point. 212 * we deal with that below this point.
… …
253 disconnect (); 234 disconnect ();
254 235
255 attachable::do_destroy (); 236 attachable::do_destroy ();
256 237
257 if (ob) 238 if (ob)
258 {
259 ob->destroy_inv (false);
260 ob->destroy (); 239 ob->destroy ();
261 }
262 240
263 ob = observe = viewpoint = 0; 241 ob = observe = viewpoint = 0;
264} 242}
265 243
266player::~player () 244player::~player ()
267{ 245{
268 /* Clear item stack */ 246 /* Clear item stack */
269 free (stack_items); 247 free (stack_items);
248}
249
250/*
251 * get_player_archetype() return next player archetype from archetype
252 * list. Not very efficient routine, but used only creating new players.
253 * Note: there MUST be at least one player archetype!
254 */
255static archetype *
256get_player_archetype (archetype *at)
257{
258 // archetypes could have been reloaded
259 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
260
261 if (!nat)
262 return at;
263
264 archvec::iterator i = archetypes.find (nat);
265
266 for (;;)
267 {
268 if (++i == archetypes.end ())
269 i = archetypes.begin ();
270 else if (*i == at)
271 cleanup ("not a single player archetype found");
272
273 if ((*i)->type == PLAYER)
274 return *i;
275 }
270} 276}
271 277
272/* Tries to add player on the connection passed in ns. 278/* Tries to add player on the connection passed in ns.
273 * All we can really get in this is some settings like host and display 279 * All we can really get in this is some settings like host and display
274 * mode. 280 * mode.
… …
276player * 282player *
277player::create () 283player::create ()
278{ 284{
279 player *pl = new player; 285 player *pl = new player;
280 286
281 pl->set_object (arch_to_object (get_player_archetype (0))); 287 pl->set_object (get_player_archetype (0)->instance ());
282 288
283 pl->ob->roll_stats (); 289 pl->ob->roll_stats ();
284 pl->ob->stats.wc = 2; 290 pl->ob->stats.wc = 2;
285 pl->ob->run_away = 25; /* Then we panick... */ 291 pl->ob->run_away = 25; /* Then we panick... */
286 292
287 set_first_map (pl->ob); 293 set_first_map (pl->ob);
288 294
289 return pl; 295 return pl;
290}
291
292/*
293 * get_player_archetype() return next player archetype from archetype
294 * list. Not very efficient routine, but used only creating new players.
295 * Note: there MUST be at least one player archetype!
296 */
297archetype *
298get_player_archetype (archetype *at)
299{
300 // archetypes could have been reloaded
301 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
302
303 if (!nat)
304 return at;
305
306 archvec::iterator i = archetypes.find (nat);
307
308 for (;;)
309 {
310 if (++i == archetypes.end ())
311 i = archetypes.begin ();
312 else if (*i == at)
313 cleanup ("not a single player archetype found");
314
315 if ((*i)->type == PLAYER)
316 return *i;
317 }
318} 296}
319 297
320object * 298object *
321get_nearest_player (object *mon) 299get_nearest_player (object *mon)
322{ 300{
… …
541 next = op->below; 519 next = op->below;
542 520
543 /* Forces get applied per default, unless they have the 521 /* Forces get applied per default, unless they have the
544 * flag "neutral" set. Sorry but I can't think of a better way 522 * flag "neutral" set. Sorry but I can't think of a better way
545 */ 523 */
546 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 524 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
547 SET_FLAG (op, FLAG_APPLIED); 525 op->set_flag (FLAG_APPLIED);
548 526
549 /* we never give weapons/armour if these cannot be used 527 /* we never give weapons/armour if these cannot be used
550 * by this player due to race restrictions 528 * by this player due to race restrictions
551 */ 529 */
552 if (pl->type == PLAYER) 530 if (pl->type == PLAYER)
553 { 531 {
554 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 532 if ((!pl->flag [FLAG_USE_ARMOUR]
555 && 533 &&
556 (op->type == ARMOUR || op->type == BOOTS 534 (op->type == ARMOUR || op->type == BOOTS
557 || op->type == CLOAK || op->type == HELMET 535 || op->type == CLOAK || op->type == HELMET
558 || op->type == SHIELD || op->type == GLOVES 536 || op->type == SHIELD || op->type == GLOVES
559 || op->type == BRACERS || op->type == GIRDLE)) 537 || op->type == BRACERS || op->type == GIRDLE))
560 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 538 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
561 { 539 {
562 op->destroy (); 540 op->destroy ();
563 continue; 541 continue;
564 } 542 }
565 } 543 }
… …
582 if (op->nrof > 1) 560 if (op->nrof > 1)
583 op->nrof = 1; 561 op->nrof = 1;
584 } 562 }
585 563
586 if (op->type == SPELLBOOK && op->inv) 564 if (op->type == SPELLBOOK && op->inv)
587 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 565 op->inv->clr_flag (FLAG_STARTEQUIP);
588 566
589 /* Give starting characters identified, uncursed, and undamned 567 /* Give starting characters identified, uncursed, and undamned
590 * items. Just don't identify gold or silver, or it won't be 568 * items. Just don't identify gold or silver, or it won't be
591 * merged properly. 569 * merged properly.
592 */ 570 */
593 if (need_identify (op)) 571 if (op->need_identify ())
594 { 572 {
595 SET_FLAG (op, FLAG_IDENTIFIED); 573 op->set_flag (FLAG_IDENTIFIED);
596 CLEAR_FLAG (op, FLAG_CURSED); 574 op->clr_flag (FLAG_CURSED);
597 CLEAR_FLAG (op, FLAG_DAMNED); 575 op->clr_flag (FLAG_DAMNED);
598 } 576 }
599 577
600 if (op->type == SPELL) 578 if (op->type == SPELL)
601 { 579 {
602 op->destroy (); 580 op->destroy ();
603 continue; 581 continue;
604 } 582 }
605 else if (op->type == SKILL) 583 else if (op->type == SKILL)
606 { 584 {
607 SET_FLAG (op, FLAG_CAN_USE_SKILL); 585 op->set_flag (FLAG_CAN_USE_SKILL);
608 op->stats.exp = 0; 586 op->stats.exp = 0;
609 op->level = 1; 587 op->level = 1;
610 } 588 }
611 else /* lock all 'normal items by default */ 589 else /* lock all 'normal items by default */
612 SET_FLAG (op, FLAG_INV_LOCKED); 590 op->set_flag (FLAG_INV_LOCKED);
613 } /* for loop of objects in player inv */ 591 } /* for loop of objects in player inv */
614 592
615 /* Need to set up the skill pointers */ 593 /* Need to set up the skill pointers */
616 pl->contr->link_skills (); 594 pl->contr->link_skills ();
617} 595}
… …
631 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 609 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
632} 610}
633 611
634/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 612/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
635static int 613static int
636roll_stat (void) 614roll_stat ()
637{ 615{
638 int a[4], i, j, k; 616 int a[4], i, j, k;
639 617
640 for (i = 0; i < 4; i++) 618 for (i = 0; i < 4; i++)
641 a[i] = (int) rndm (6) + 1; 619 a[i] = (int) rndm (6) + 1;
… …
738player::chargen_race_done () 716player::chargen_race_done ()
739{ 717{
740 /* this must before then initial items are given */ 718 /* this must before then initial items are given */
741 esrv_new_player (ob->contr); 719 esrv_new_player (ob->contr);
742 720
743 treasurelist *tl = treasurelist::find ("starting_wealth"); 721 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
744 if (tl) 722 if (tl)
745 create_treasure (tl, ob, 0, 0, 0); 723 create_treasure (tl, ob, 0, 0, 0);
746 724
747 INVOKE_PLAYER (BIRTH, ob->contr); 725 INVOKE_PLAYER (BIRTH, ob->contr);
748 INVOKE_PLAYER (LOGIN, ob->contr); 726 INVOKE_PLAYER (LOGIN, ob->contr);
… …
751 729
752 if (ob->msg) 730 if (ob->msg)
753 ob->msg = 0; 731 ob->msg = 0;
754 732
755 start_info (ob); 733 start_info (ob);
756 CLEAR_FLAG (ob, FLAG_WIZ); 734 ob->clr_flag (FLAG_WIZ);
757 give_initial_items (ob, ob->randomitems); 735 give_initial_items (ob, ob->randomitems);
758 esrv_send_inventory (ob, ob); 736 esrv_send_inventory (ob, ob);
759 ob->update_stats (); 737 ob->update_stats ();
760 738
761 /* This moves the player to a different start map, if there 739 /* This moves the player to a different start map, if there
… …
801 ob->stats.hp = ob->stats.maxhp; 779 ob->stats.hp = ob->stats.maxhp;
802 ob->stats.sp = ob->stats.maxsp; 780 ob->stats.sp = ob->stats.maxsp;
803 ob->stats.grace = 0; 781 ob->stats.grace = 0;
804} 782}
805 783
806void 784static void
807flee_player (object *op) 785flee_player (object *op)
808{ 786{
809 int dir, diff; 787 int dir, diff;
810 rv_vector rv; 788 rv_vector rv;
811 789
812 if (op->stats.hp < 0) 790 if (op->stats.hp < 0)
813 { 791 {
814 LOG (llevDebug, "Fleeing player is dead.\n"); 792 LOG (llevDebug, "Fleeing player is dead.\n");
815 CLEAR_FLAG (op, FLAG_SCARED); 793 op->clr_flag (FLAG_SCARED);
816 return; 794 return;
817 } 795 }
818 796
819 if (!op->enemy) 797 if (!op->enemy)
820 { 798 {
821 LOG (llevDebug, "Fleeing player had no enemy.\n"); 799 LOG (llevDebug, "Fleeing player had no enemy.\n");
822 CLEAR_FLAG (op, FLAG_SCARED); 800 op->clr_flag (FLAG_SCARED);
823 return; 801 return;
824 } 802 }
825 803
826 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 804 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
827 { 805 {
828 op->enemy = NULL; 806 op->enemy = NULL;
829 CLEAR_FLAG (op, FLAG_SCARED); 807 op->clr_flag (FLAG_SCARED);
830 return; 808 return;
831 } 809 }
832 810
833 get_rangevector (op, op->enemy, &rv, 0); 811 get_rangevector (op, op->enemy, &rv, 0);
834 812
835 dir = absdir (4 + rv.direction); 813 dir = absdir (4 + rv.direction);
836 for (diff = 0; diff < 3; diff++) 814 for (diff = 0; diff < 3; diff++)
837 { 815 {
838 int m = 1 - rndm (2) * 2; 816 int m = 1 - rndm (2) * 2;
839 817
840 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 818 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
841 return; 819 return;
842 } 820 }
843 821
844 /* Cornered, get rid of scared */ 822 /* Cornered, get rid of scared */
845 CLEAR_FLAG (op, FLAG_SCARED); 823 op->clr_flag (FLAG_SCARED);
846 op->enemy = NULL; 824 op->enemy = NULL;
847} 825}
848 826
849/* check_pick sees if there is stuff to be picked up/picks up stuff. 827/* check_pick sees if there is stuff to be picked up/picks up stuff.
850 * It returns 1 if the player should keep on moving, 0 if he should 828 * It returns 1 if the player should keep on moving, 0 if he should
… …
855{ 833{
856 object *tmp, *next; 834 object *tmp, *next;
857 int stop = 0; 835 int stop = 0;
858 int wvratio; 836 int wvratio;
859 837
860 /* if you're flying, you cna't pick up anything */ 838 /* if you're flying, you can't pick up anything */
861 if (op->move_type & MOVE_FLYING) 839 if (op->move_type & MOVE_FLYING)
862 return 1; 840 return 1;
863 841
864 next = op->below; 842 next = op->below;
865 843
866 int cnt = MAX_ITEM_PER_DROP; 844 int cnt = MAX_ITEM_PER_ACTION;
867#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 845#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868 846
869 /* loop while there are items on the floor that are not marked as 847 /* loop while there are items on the floor that are not marked as
870 * destroyed */ 848 * destroyed */
871 while (next && !next->destroyed ()) 849 while (next && !next->destroyed ())
… …
897 if (op->contr->mode & PU_DEBUG) 875 if (op->contr->mode & PU_DEBUG)
898 { 876 {
899 /* some debugging code to figure out item information */ 877 /* some debugging code to figure out item information */
900 const char *str = tmp->name 878 const char *str = tmp->name
901 ? format ("item name: %s item type: %d weight/value: %d", 879 ? format ("item name: %s item type: %d weight/value: %d",
902 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) 880 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
903 : format ("item name: %s item type: %d weight/value: %d", 881 : format ("item name: %s item type: %d weight/value: %d",
904 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 882 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
905 883
906 new_draw_info (NDI_UNIQUE, 0, op, str); 884 new_draw_info (NDI_UNIQUE, 0, op, str);
907 } 885 }
908 886
909 if (op->contr->mode & PU_INHIBIT) 887 if (op->contr->mode & PU_INHIBIT)
… …
942 * fighting */ 920 * fighting */
943 if (op->contr->mode & PU_INHIBIT) 921 if (op->contr->mode & PU_INHIBIT)
944 return 1; 922 return 1;
945 923
946 /* prevent us from turning into auto-thieves :) */ 924 /* prevent us from turning into auto-thieves :) */
947 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 925 if (tmp->flag [FLAG_UNPAID])
948 continue; 926 continue;
949 927
950 /* ignore known cursed objects */ 928 /* ignore known cursed objects */
951 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 929 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
952 continue; 930 continue;
953 931
954 /* all food and drink if desired */ 932 /* all food and drink if desired */
955 /* question: don't pick up known-poisonous stuff? */ 933 /* question: don't pick up known-poisonous stuff? */
956 if (op->contr->mode & PU_FOOD) 934 if (op->contr->mode & PU_FOOD)
… …
959 CHK_PICK_PICKUP; 937 CHK_PICK_PICKUP;
960 continue; 938 continue;
961 } 939 }
962 940
963 if (op->contr->mode & PU_DRINK) 941 if (op->contr->mode & PU_DRINK)
964 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 942 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
965 { 943 {
966 CHK_PICK_PICKUP; 944 CHK_PICK_PICKUP;
967 continue; 945 continue;
968 } 946 }
969 947
… …
996 continue; 974 continue;
997 } 975 }
998 976
999 /* wands/staves/rods/horns */ 977 /* wands/staves/rods/horns */
1000 if (op->contr->mode & PU_MAGIC_DEVICE) 978 if (op->contr->mode & PU_MAGIC_DEVICE)
1001 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 979 if (tmp->type == WAND
980 || tmp->type == ROD
981 || tmp->type == HORN
982 || tmp->type == POWER_CRYSTAL)
1002 { 983 {
1003 CHK_PICK_PICKUP; 984 CHK_PICK_PICKUP;
1004 continue; 985 continue;
1005 } 986 }
1006 987
1007 /* pick up all magical items */ 988 /* pick up all magical items */
1008 if (op->contr->mode & PU_MAGICAL) 989 if (op->contr->mode & PU_MAGICAL)
1009 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 990 if (tmp->flag [FLAG_KNOWN_MAGICAL]
991 && !tmp->flag [FLAG_KNOWN_CURSED])
1010 { 992 {
1011 CHK_PICK_PICKUP; 993 CHK_PICK_PICKUP;
1012 continue; 994 continue;
1013 } 995 }
1014 996
… …
1021 } 1003 }
1022 } 1004 }
1023 1005
1024 /* rings & amulets - talismans seems to be typed AMULET */ 1006 /* rings & amulets - talismans seems to be typed AMULET */
1025 if (op->contr->mode & PU_JEWELS) 1007 if (op->contr->mode & PU_JEWELS)
1026 if (tmp->type == RING || tmp->type == AMULET) 1008 if (tmp->type == RING
1009 || tmp->type == AMULET
1010 || tmp->type == GIRDLE
1011 || tmp->type == SKILL_TOOL)
1027 { 1012 {
1028 CHK_PICK_PICKUP; 1013 CHK_PICK_PICKUP;
1029 continue; 1014 continue;
1030 } 1015 }
1031 1016
… …
1080 CHK_PICK_PICKUP; 1065 CHK_PICK_PICKUP;
1081 continue; 1066 continue;
1082 } 1067 }
1083 1068
1084 if (op->contr->mode & PU_GLOVES) 1069 if (op->contr->mode & PU_GLOVES)
1085 if (tmp->type == GLOVES) 1070 if (tmp->type == GLOVES || tmp->type == BRACERS)
1086 { 1071 {
1087 CHK_PICK_PICKUP; 1072 CHK_PICK_PICKUP;
1088 continue; 1073 continue;
1089 } 1074 }
1090 1075
… …
1095 continue; 1080 continue;
1096 } 1081 }
1097 1082
1098 /* hoping to catch throwing daggers here */ 1083 /* hoping to catch throwing daggers here */
1099 if (op->contr->mode & PU_MISSILEWEAPON) 1084 if (op->contr->mode & PU_MISSILEWEAPON)
1100 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1085 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1101 { 1086 {
1102 CHK_PICK_PICKUP; 1087 CHK_PICK_PICKUP;
1103 continue; 1088 continue;
1104 } 1089 }
1105 1090
… …
1140 fprintf (stderr, "%s", tmp->name); 1125 fprintf (stderr, "%s", tmp->name);
1141 } 1126 }
1142 else 1127 else
1143 fprintf (stderr, "%s", tmp->arch->archname); 1128 fprintf (stderr, "%s", tmp->arch->archname);
1144 fprintf (stderr, ",%d] = ", tmp->type); 1129 fprintf (stderr, ",%d] = ", tmp->type);
1145 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1130 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1146#endif 1131#endif
1147 CHK_PICK_PICKUP; 1132 CHK_PICK_PICKUP;
1148 continue; 1133 continue;
1149 } 1134 }
1150 } /* the new pickup model */ 1135 } /* the new pickup model */
1151 } 1136 }
1152 1137
1153 return !stop; 1138 return !stop;
1154} 1139}
1155 1140
1141/* routine for both players and monsters. We call this when
1142 * there is a possibility for our action distrubing our hiding
1143 * place or invisiblity spell. Artefact invisiblity causes
1144 * "noise" instead. If we arent invisible to begin with, we
1145 * return 0.
1146 */
1147static int
1148action_makes_visible (object *op)
1149{
1150 if (op->invisible && op->flag [FLAG_ALIVE])
1151 {
1152 if (op->flag [FLAG_MAKE_INVIS])
1153 {
1154 // artefact invisibility is permanent, but we still make noise
1155 // this is important for game-balance.
1156 if (op->contr)
1157 op->make_noise ();
1158
1159 return 0;
1160 }
1161
1162 if (op->contr && op->contr->tmp_invis == 0)
1163 return 0;
1164
1165 /* If monsters, they should become visible */
1166 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1167 {
1168 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1169 return 1;
1170 }
1171 }
1172
1173 return 0;
1174}
1175
1156/* 1176/*
1157 * Find an arrow in the inventory and after that 1177 * Find an arrow in the inventory and after that
1158 * in the right type container (quiver). Pointer to the 1178 * in the right type container (quiver). Pointer to the
1159 * found object is returned. 1179 * found object is returned.
1160 */ 1180 */
1161object * 1181static object *
1162find_arrow (object *op, const char *type) 1182find_arrow (object *op, const char *type)
1163{ 1183{
1164 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1184 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1165 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1185 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1166 return splay (tmp); 1186 return splay (tmp);
1167 1187
1168 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1188 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1169 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1189 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1170 if (object *arrow = find_arrow (tmp, type)) 1190 if (object *arrow = find_arrow (tmp, type))
1171 { 1191 {
1172 splay (tmp); 1192 splay (tmp);
1173 return arrow; 1193 return arrow;
1174 } 1194 }
… …
1180 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1200 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1181 * against the target. A full test is not performed, simply a basic test 1201 * against the target. A full test is not performed, simply a basic test
1182 * of resistances. The archer is making a quick guess at what he sees down 1202 * of resistances. The archer is making a quick guess at what he sees down
1183 * the hall. Failing that it does it's best to pick the highest plus arrow. 1203 * the hall. Failing that it does it's best to pick the highest plus arrow.
1184 */ 1204 */
1185object * 1205static object *
1186find_better_arrow (object *op, object *target, shstr_cmp type, int *better) 1206find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1187{ 1207{
1188 object *tmp = NULL, *arrow, *ntmp; 1208 object *tmp = NULL, *arrow, *ntmp;
1189 int attacknum, attacktype, betterby = 0, i; 1209 int attacknum, attacktype, betterby = 0, i;
1190 1210
1191 if (!type) 1211 if (!type)
1192 return NULL; 1212 return NULL;
1193 1213
1194 for (arrow = op->inv; arrow; arrow = arrow->below) 1214 for (arrow = op->inv; arrow; arrow = arrow->below)
1195 { 1215 {
1196 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1216 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1197 { 1217 {
1198 i = 0; 1218 i = 0;
1199 ntmp = find_better_arrow (arrow, target, type, &i); 1219 ntmp = find_better_arrow (arrow, target, type, &i);
1200 1220
1201 if (i > betterby) 1221 if (i > betterby)
… …
1259 * find_better_arrow to find a decent arrow to use. 1279 * find_better_arrow to find a decent arrow to use.
1260 * op = the shooter 1280 * op = the shooter
1261 * type = bow->race 1281 * type = bow->race
1262 * dir = fire direction 1282 * dir = fire direction
1263 */ 1283 */
1264object * 1284static object *
1265pick_arrow_target (object *op, shstr_cmp type, int dir) 1285pick_arrow_target (object *op, shstr_cmp type, int dir)
1266{ 1286{
1267 object *tmp = NULL; 1287 object *tmp = NULL;
1268 maptile *m; 1288 maptile *m;
1269 int i, mflags, found, number; 1289 int i, mflags, found, number;
… …
1302 break; 1322 break;
1303 } 1323 }
1304 1324
1305 if (mflags & P_IS_ALIVE) 1325 if (mflags & P_IS_ALIVE)
1306 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1326 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1307 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1327 if (tmp->flag [FLAG_ALIVE])
1308 break; 1328 break;
1309 } 1329 }
1310 1330
1311 if (!tmp) 1331 if (!tmp)
1312 return find_arrow (op, type); 1332 return find_arrow (op, type);
… …
1373 { 1393 {
1374 if (op->type == PLAYER) 1394 if (op->type == PLAYER)
1375 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1395 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1376 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1396 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1377 else 1397 else
1378 CLEAR_FLAG (op, FLAG_READY_BOW); 1398 op->clr_flag (FLAG_READY_BOW);
1379 1399
1380 return 0; 1400 return 0;
1381 } 1401 }
1382 } 1402 }
1383 1403
… …
1484 * but monsters can't. Putting that code here 1504 * but monsters can't. Putting that code here
1485 * makes the fire_bow code much cleaner. 1505 * makes the fire_bow code much cleaner.
1486 * this function should only be called if 'op' is a player, 1506 * this function should only be called if 'op' is a player,
1487 * hence the function name. 1507 * hence the function name.
1488 */ 1508 */
1489int 1509static int
1490player_fire_bow (object *op, int dir) 1510player_fire_bow (object *op, int dir)
1491{ 1511{
1492 int ret; 1512 int ret;
1493 1513
1494 if (op->contr->bowtype == bow_bestarrow) 1514 if (op->contr->bowtype == bow_bestarrow)
… …
1522} 1542}
1523 1543
1524/* Fires a misc (wand/rod/horn) object in 'dir'. 1544/* Fires a misc (wand/rod/horn) object in 'dir'.
1525 * Broken apart from 'fire' to keep it more readable. 1545 * Broken apart from 'fire' to keep it more readable.
1526 */ 1546 */
1527void 1547static void
1528fire_misc_object (object *op, int dir) 1548fire_misc_object (object *op, int dir)
1529{ 1549{
1530 object *item = op->contr->ranged_ob; 1550 object *item = op->contr->ranged_ob;
1531 1551
1532 if (!item) 1552 if (!item)
… …
1539 { 1559 {
1540 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1560 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1541 return; 1561 return;
1542 } 1562 }
1543 1563
1544 if (!op->change_weapon (item)) 1564 if (!op->apply (item))
1545 return; 1565 return;
1546 1566
1547 if (item->type == WAND) 1567 if (item->type == WAND)
1548 { 1568 {
1549 if (item->stats.food <= 0) 1569 if (item->stats.food <= 0)
… …
1554 return; 1574 return;
1555 } 1575 }
1556 } 1576 }
1557 else if (item->type == ROD || item->type == HORN) 1577 else if (item->type == ROD || item->type == HORN)
1558 { 1578 {
1559 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1579 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1560 1580
1561 // using the maximum of the rods charge allows at least one spell cast 1581 // using the maximum of the rods charge allows at least one spell cast
1562 // for a rod or horn, this fixes some broken rods. 1582 // for a rod or horn, this fixes some broken rods.
1563 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1583 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1564 { 1584 {
1565 op->contr->play_sound (sound_find ("wand_poof")); 1585 op->contr->play_sound (sound_find ("wand_poof"));
1566 1586
1567 if (item->type == ROD) 1587 if (item->type == ROD)
1568 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1588 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1583 { 1603 {
1584 object *tmp; 1604 object *tmp;
1585 1605
1586 if (item->arch) 1606 if (item->arch)
1587 { 1607 {
1588 CLEAR_FLAG (item, FLAG_ANIMATE); 1608 item->clr_flag (FLAG_ANIMATE);
1589 item->face = item->arch->face; 1609 item->face = item->arch->face;
1590 item->set_speed (0); 1610 item->set_speed (0);
1591 } 1611 }
1592 1612
1593 if (object *pl = item->visible_to ()) 1613 if (object *pl = item->visible_to ())
… …
1600} 1620}
1601 1621
1602/* Received a fire command for the player - go and do it. 1622/* Received a fire command for the player - go and do it.
1603 */ 1623 */
1604bool 1624bool
1605fire (object *op, int dir) 1625fire (object *who, int dir)
1606{ 1626{
1607 int spellcost = 0; 1627 int spellcost = 0;
1608 1628
1609 player *pl = op->contr; 1629 player *pl = who->contr;
1610 1630
1611 if (pl->golem) 1631 if (pl->golem)
1612 { 1632 {
1613 control_golem (op->contr->golem, dir); 1633 control_golem (who->contr->golem, dir);
1614 return false; 1634 return false;
1615 } 1635 }
1616 1636
1617 object *ob = pl->ranged_ob; 1637 object *ob = pl->ranged_ob;
1618 1638
1619 if (!ob) 1639 if (!ob)
1620 return false; 1640 return false;
1621 1641
1622 if (op->speed_left > 0.f) 1642 if (who->speed_left > 0.f)
1623 --op->speed_left; 1643 --who->speed_left;
1624 else 1644 else
1625 return false; 1645 return false;
1626 1646
1627 if (!op->change_weapon (ob)) 1647 if (!who->apply (ob))
1628 return false; 1648 return false;
1629 1649
1630 /* check for loss of invisiblity/hide */ 1650 /* check for loss of invisiblity/hide */
1631 if (action_makes_visible (op)) 1651 if (action_makes_visible (who))
1632 make_visible (op); 1652 make_visible (who);
1633 1653
1634 switch (ob->type) 1654 switch (ob->type)
1635 { 1655 {
1636 case BOW: 1656 case BOW:
1637 player_fire_bow (op, dir); 1657 player_fire_bow (who, dir);
1638 break; 1658 break;
1639 1659
1640 case SPELL: 1660 case SPELL:
1641 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1661 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1642 break; 1662 break;
1643 1663
1644 case BUILDER: 1664 case BUILDER:
1645 apply_map_builder (op, dir); 1665 apply_map_builder (who, dir);
1646 break; 1666 break;
1647 1667
1648 case SKILL: 1668 case SKILL:
1649 do_skill (op, op, ob, dir, 0); 1669 do_skill (who, who, ob, dir, 0);
1650 break; 1670 break;
1651 1671
1672 case RANGED:
1673 do_skill (who, ob, who->chosen_skill, dir, 0);
1674 break;
1675
1652 default: 1676 default:
1653 fire_misc_object (op, dir); 1677 fire_misc_object (who, dir);
1654 break; 1678 break;
1655 } 1679 }
1656 1680
1657 return true; 1681 return true;
1658} 1682}
… …
1717 * 1741 *
1718 * Change the color so that the message doesn't disappear with 1742 * Change the color so that the message doesn't disappear with
1719 * all the others. 1743 * all the others.
1720 */ 1744 */
1721 if (pl->contr->usekeys == key_inventory 1745 if (pl->contr->usekeys == key_inventory
1722 || !QUERY_FLAG (container, FLAG_APPLIED) 1746 || !container->flag [FLAG_APPLIED]
1723 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1747 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1724 { 1748 {
1725 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1749 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1726 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1750 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1727 return NULL; 1751 return NULL;
… …
1811 * going to try and move (not fire weapons). 1835 * going to try and move (not fire weapons).
1812 */ 1836 */
1813bool 1837bool
1814move_player_attack (object *op, int dir) 1838move_player_attack (object *op, int dir)
1815{ 1839{
1816 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) 1840 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1817 { 1841 {
1818 --op->speed_left; 1842 --op->speed_left;
1819 return true; 1843 return true;
1820 } 1844 }
1821 1845
1822 int on_battleground;
1823
1824 sint16 nx = freearr_x[dir] + op->x; 1846 sint16 nx = freearr_x[dir] + op->x;
1825 sint16 ny = freearr_y[dir] + op->y; 1847 sint16 ny = freearr_y[dir] + op->y;
1826
1827 on_battleground = op_on_battleground (op, 0, 0);
1828 1848
1829 if (out_of_map (op->map, nx, ny)) 1849 if (out_of_map (op->map, nx, ny))
1830 return false; 1850 return false;
1831 1851
1832 /* If braced, or can't move to the square, and it is not out of the 1852 /* If braced, or can't move to the square, and it is not out of the
… …
1882 */ 1902 */
1883 if (op->type == PLAYER 1903 if (op->type == PLAYER
1884 && ((mon->owner && mon->owner->contr 1904 && ((mon->owner && mon->owner->contr
1885 && same_party (mon->owner->contr->party, op->contr->party)) 1905 && same_party (mon->owner->contr->party, op->contr->party))
1886 || mon->owner == op) 1906 || mon->owner == op)
1887 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1907 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1888 { 1908 {
1889 /* If we're braced, we don't want to switch places with it */ 1909 /* If we're braced, we don't want to switch places with it */
1890 if (op->contr->braced) 1910 if (op->contr->braced)
1891 return false; 1911 return false;
1892 1912
… …
1903 return true; 1923 return true;
1904 } 1924 }
1905 else 1925 else
1906 return false; 1926 return false;
1907 } 1927 }
1928
1929 bool on_battleground = op_on_battleground (op, 0, 0);
1908 1930
1909 /* in certain circumstances, you shouldn't attack friendly 1931 /* in certain circumstances, you shouldn't attack friendly
1910 * creatures. Note that if you are braced, you can't push 1932 * creatures. Note that if you are braced, you can't push
1911 * someone, but put it inside this loop so that you won't 1933 * someone, but put it inside this loop so that you won't
1912 * attack them either. 1934 * attack them either.
1913 */ 1935 */
1914 if ((mon->type == PLAYER || mon->enemy != op) 1936 if ((mon->type == PLAYER || mon->enemy != op)
1915 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1937 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1916 && ((op->contr->peaceful 1938 && ((op->contr->peaceful
1917 || (mon->type == PLAYER && mon->contr->peaceful)) 1939 || (mon->type == PLAYER && mon->contr->peaceful))
1918 && !on_battleground)) 1940 && !on_battleground))
1919 { 1941 {
1920 if (op->speed_left > 0.f) 1942 if (op->speed_left > 0.f)
… …
1936 } 1958 }
1937 } 1959 }
1938 /* If the object is a boulder or other rollable object, then 1960 /* If the object is a boulder or other rollable object, then
1939 * roll it if not braced. You can't roll it if you are braced. 1961 * roll it if not braced. You can't roll it if you are braced.
1940 */ 1962 */
1941 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1963 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1942 { 1964 {
1943 if (op->speed_left > 0.f) 1965 if (op->speed_left > 0.f)
1944 { 1966 {
1945 --op->speed_left; 1967 --op->speed_left;
1946 1968
… …
1955 * Way it works is like this: First, it must have some hit points 1977 * Way it works is like this: First, it must have some hit points
1956 * and be living. Then, it must be one of the following: 1978 * and be living. Then, it must be one of the following:
1957 * 1) Not a player, 2) A player, but of a different party. Note 1979 * 1) Not a player, 2) A player, but of a different party. Note
1958 * that party_number -1 is no party, so attacks can still happen. 1980 * that party_number -1 is no party, so attacks can still happen.
1959 */ 1981 */
1960 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1982 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1961 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1983 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
1962 { 1984 {
1963 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 1985 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
1964 { 1986 {
1965 --op->contr->weapon_sp_left; 1987 --op->contr->weapon_sp_left;
… …
1977} 1999}
1978 2000
1979bool 2001bool
1980move_player (object *op, int dir) 2002move_player (object *op, int dir)
1981{ 2003{
1982 int pick;
1983
1984 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2004 if (!op->map || op->map->in_memory != MAP_ACTIVE)
1985 return 0; 2005 return 0;
1986 2006
1987 /* Sanity check: make sure dir is valid */ 2007 /* Sanity check: make sure dir is valid */
1988 if ((dir < 0) || (dir >= 9)) 2008 if (dir < 0 || dir > 8)
1989 { 2009 {
1990 LOG (llevError, "move_player: invalid direction %d\n", dir); 2010 LOG (llevError, "move_player: invalid direction %d\n", dir);
1991 return 0; 2011 return 0;
1992 } 2012 }
1993 2013
1994 /* peterm: added following line */ 2014 /* peterm: added following line */
1995 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2015 if (op->flag [FLAG_CONFUSED] && dir)
1996 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2016 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1997 2017
1998 op->facing = dir; 2018 op->facing = dir;
1999 2019
2000 if (op->flag [FLAG_HIDDEN]) 2020 if (op->flag [FLAG_HIDDEN])
2001 do_hidden_move (op); 2021 do_hidden_move (op);
2002 2022
2003 bool retval; 2023 bool retval;
2024 int pick = 0;
2004 2025
2005 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2026 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2006 retval = RESULT_INT (0); 2027 retval = RESULT_INT (0);
2007 else if (op->contr->fire_on) 2028 else if (op->contr->fire_on)
2008 retval = fire (op, dir); 2029 retval = fire (op, dir);
… …
2039 * players. 2060 * players.
2040 */ 2061 */
2041bool 2062bool
2042handle_newcs_player (object *op) 2063handle_newcs_player (object *op)
2043{ 2064{
2044 if (QUERY_FLAG (op, FLAG_SCARED)) 2065 if (op->flag [FLAG_SCARED])
2045 { 2066 {
2046 if (op->speed_left > 0.f) 2067 if (op->speed_left > 0.f)
2047 { 2068 {
2048 --op->speed_left; 2069 --op->speed_left;
2049 flee_player (op); 2070 flee_player (op);
… …
2065 return move_player (op, op->direction); 2086 return move_player (op, op->direction);
2066 2087
2067 return false; 2088 return false;
2068} 2089}
2069 2090
2070int 2091static int
2071save_life (object *op) 2092save_life (object *op)
2072{ 2093{
2073 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2094 if (!op->flag [FLAG_LIFESAVE])
2074 return 0; 2095 return 0;
2075 2096
2076 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2097 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2077 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2098 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2078 { 2099 {
2079 op->play_sound (sound_find ("ob_evaporate")); 2100 op->play_sound (sound_find ("ob_evaporate"));
2080 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2101 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2081 2102
2082 tmp->destroy (); 2103 tmp->destroy ();
2083 CLEAR_FLAG (op, FLAG_LIFESAVE); 2104 op->clr_flag (FLAG_LIFESAVE);
2084 2105
2085 if (op->stats.hp < 0) 2106 if (op->stats.hp < 0)
2086 op->stats.hp = op->stats.maxhp; 2107 op->stats.hp = op->stats.maxhp;
2087 2108
2088 if (op->stats.food < 0) 2109 if (op->stats.food < 0)
2089 op->stats.food = 999; 2110 op->stats.food = MAX_FOOD;
2090 2111
2091 op->update_stats (); 2112 op->update_stats ();
2092 return 1; 2113 return 1;
2093 } 2114 }
2094 2115
2095 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2116 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2096 CLEAR_FLAG (op, FLAG_LIFESAVE); 2117 op->clr_flag (FLAG_LIFESAVE);
2097 enter_player_savebed (op); /* bring him home. */ 2118 enter_player_savebed (op); /* bring him home. */
2098 return 0; 2119 return 0;
2099} 2120}
2100 2121
2101/* This goes throws the inventory and removes unpaid objects, and puts them 2122/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2108{ 2129{
2109 while (op) 2130 while (op)
2110 { 2131 {
2111 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2132 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2112 2133
2113 if (QUERY_FLAG (op, FLAG_UNPAID)) 2134 if (op->flag [FLAG_UNPAID])
2114 op->insert_at (env); 2135 op->insert_at (env);
2115 else if (op->inv) 2136 else if (op->inv)
2116 drop_unpaid_items (op->inv, env); 2137 drop_unpaid_items (op->inv, env);
2117 2138
2118 op = next; 2139 op = next;
… …
2122void 2143void
2123object::drop_unpaid_items () 2144object::drop_unpaid_items ()
2124{ 2145{
2125 if (!flag [FLAG_REMOVED]) 2146 if (!flag [FLAG_REMOVED])
2126 ::drop_unpaid_items (inv, this); 2147 ::drop_unpaid_items (inv, this);
2127}
2128
2129/*
2130 * Returns pointer a static string containing gravestone text
2131 * Moved from apply.c to player.c - player.c is what
2132 * actually uses this function. player.c may not be quite the
2133 * best, a misc file for object actions is probably better,
2134 * but there isn't one in the server directory.
2135 */
2136const char *
2137gravestone_text (object *op)
2138{
2139 static dynbuf_text buf;
2140
2141 buf << "---- R.I.P. ----\n\n"
2142 << op->name;
2143
2144 if (op->type == PLAYER)
2145 buf << " the " << op->contr->title;
2146
2147 buf << "\n\n";
2148
2149 buf << "who was level ";
2150 buf << (sint32)op->level << "\n\n" // OO breakdown
2151 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2152
2153 if (op->type == PLAYER)
2154 buf << "by " << op->contr->killer_name () << ".\n\n";
2155
2156 {
2157 static char buf2[128];
2158 time_t now = time (NULL);
2159 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2160 buf << buf2;
2161 }
2162
2163 return buf;
2164} 2148}
2165 2149
2166void 2150void
2167do_some_living (object *op) 2151do_some_living (object *op)
2168{ 2152{
… …
2185 * alternate it here for it to work correctly. 2169 * alternate it here for it to work correctly.
2186 */ 2170 */
2187 if (pticks & 2) 2171 if (pticks & 2)
2188 op->invisible--; 2172 op->invisible--;
2189 } 2173 }
2190 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2174 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2191 { 2175 {
2192 if (!op->invisible--) 2176 if (!op->invisible--)
2193 { 2177 {
2194 make_visible (op); 2178 make_visible (op);
2195 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2179 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2262 if (op->stats.sp < op->stats.maxsp) 2246 if (op->stats.sp < op->stats.maxsp)
2263 { 2247 {
2264 op->stats.sp++; 2248 op->stats.sp++;
2265 2249
2266 /* dms do not consume food */ 2250 /* dms do not consume food */
2267 if (!QUERY_FLAG (op, FLAG_WIZ)) 2251 if (!op->flag [FLAG_WIZ])
2268 { 2252 {
2269 op->stats.food--; 2253 op->stats.food--;
2270 2254
2271 if (op->contr->digestion < 0) 2255 if (op->contr->digestion < 0)
2272 op->stats.food += op->contr->digestion; 2256 op->stats.food += op->contr->digestion;
… …
2306 if (op->stats.hp < op->stats.maxhp) 2290 if (op->stats.hp < op->stats.maxhp)
2307 { 2291 {
2308 op->stats.hp++; 2292 op->stats.hp++;
2309 2293
2310 /* dms do not consume food */ 2294 /* dms do not consume food */
2311 if (!QUERY_FLAG (op, FLAG_WIZ)) 2295 if (!op->flag [FLAG_WIZ])
2312 { 2296 {
2313 op->stats.food--; 2297 op->stats.food--;
2314 2298
2315 if (op->contr->digestion < 0) 2299 if (op->contr->digestion < 0)
2316 op->stats.food += op->contr->digestion; 2300 op->stats.food += op->contr->digestion;
… …
2343 penalty = max (0, -op->contr->digestion); 2327 penalty = max (0, -op->contr->digestion);
2344 2328
2345 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2329 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2346 2330
2347 /* dms do not consume food */ 2331 /* dms do not consume food */
2348 if (!QUERY_FLAG (op, FLAG_WIZ)) 2332 if (!op->flag [FLAG_WIZ])
2349 op->stats.food--; 2333 op->stats.food--;
2350 } 2334 }
2351 2335
2352 if (op->stats.food < 0 && op->stats.hp >= 0) 2336 if (op->stats.food < 0 && op->stats.hp >= 0)
2353 { 2337 {
2354 object *flesh = 0; 2338 object *flesh = 0;
2355 2339
2356 for_inv_removable (op, tmp) 2340 for_inv_removable (op, tmp)
2357 { 2341 {
2358 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2342 if (tmp->flag [FLAG_UNPAID])
2359 continue; 2343 continue;
2360 2344
2361 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2345 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2362 { 2346 {
2363 op->statusmsg ("You blindly grab for a bite of food. " 2347 op->statusmsg ("You blindly grab for a bite of food. "
2364 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2348 "H<To prevent you from starving, you ate some random item from your backpack.>");
2365 manual_apply (op, tmp, 0); 2349 op->apply (tmp);
2366 2350
2367 if (op->stats.food >= 0 || op->stats.hp < 0) 2351 if (op->stats.food >= 0 || op->stats.hp < 0)
2368 break; 2352 break;
2369 } 2353 }
2370 else if (tmp->type == FLESH) 2354 else if (tmp->type == FLESH)
… …
2376 */ 2360 */
2377 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2361 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2378 { 2362 {
2379 op->statusmsg ("You blindly grab for a bite of food. " 2363 op->statusmsg ("You blindly grab for a bite of food. "
2380 "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.>");
2381 manual_apply (op, flesh, 0); 2365 op->apply (flesh);
2382 } 2366 }
2383 2367
2384 // If player is still starving, alert him! 2368 // If player is still starving, alert him!
2385 if (op->stats.food < 0) 2369 if (op->stats.food < 0)
2386 op->failmsg ("You are starving! " 2370 op->failmsg ("You are starving! "
… …
2398 op->contr->killer->destroy (); 2382 op->contr->killer->destroy ();
2399 } 2383 }
2400 } 2384 }
2401 2385
2402 /* killer should be set here already */ 2386 /* killer should be set here already */
2403 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2387 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2404 kill_player (op); 2388 kill_player (op);
2405 } 2389 }
2406} 2390}
2407 2391
2408/* If the player should die (lack of hp, food, etc), we call this. 2392/* If the player should die (lack of hp, food, etc), we call this.
… …
2423 return; 2407 return;
2424 2408
2425 dynbuf_text deathtab; 2409 dynbuf_text deathtab;
2426 2410
2427 /* restore player */ 2411 /* restore player */
2428 at = archetype::find ("poisoning"); 2412 at = archetype::find (shstr_poisoning);
2429 if (object *tmp = present_arch_in_ob (at, op)) 2413 if (object *tmp = present_arch_in_ob (at, op))
2430 { 2414 {
2431 tmp->destroy (); 2415 tmp->destroy ();
2432 deathtab << "Your body feels cleansed...\r"; 2416 deathtab << "Your body feels cleansed...\r";
2433 } 2417 }
2434 2418
2435 at = archetype::find ("confusion"); 2419 at = archetype::find (shstr_confusion);
2436 if (object *tmp = present_arch_in_ob (at, op)) 2420 if (object *tmp = present_arch_in_ob (at, op))
2437 { 2421 {
2438 tmp->destroy (); 2422 tmp->destroy ();
2439 deathtab << "Your mind feels clearer...\r"; 2423 deathtab << "Your mind feels clearer...\r";
2440 } 2424 }
… …
2442 cure_disease (op, 0, 0); /* remove any disease */ 2426 cure_disease (op, 0, 0); /* remove any disease */
2443 2427
2444 max_it (op->stats.hp , op->stats.maxhp); 2428 max_it (op->stats.hp , op->stats.maxhp);
2445 max_it (op->stats.sp , op->stats.maxsp); 2429 max_it (op->stats.sp , op->stats.maxsp);
2446 max_it (op->stats.grace, op->stats.maxgrace); 2430 max_it (op->stats.grace, op->stats.maxgrace);
2447
2448 if (op->stats.food <= 0) 2431 max_it (op->stats.food , 200);
2449 op->stats.food = 999;
2450 2432
2451 // remove all spell effects that are active 2433 // remove all spell effects that are active
2452 // to avoid long-term effects such as word-of-recall 2434 // to avoid long-term effects such as word-of-recall
2453 for (object *item = op->inv; item; ) 2435 for (object *item = op->inv; item; )
2454 { 2436 {
… …
2467 if (op_on_battleground (op, &x, &y)) 2449 if (op_on_battleground (op, &x, &y))
2468 { 2450 {
2469 deathtab << "You almost died in combat, but local medics have saved your life...\r"; 2451 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2470 2452
2471 /* create a bodypart-trophy to make the winner happy */ 2453 /* create a bodypart-trophy to make the winner happy */
2472 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2454 object *tmp = archetype::find (shstr_finger)->instance ();
2473 { 2455
2474 tmp->name = format ("%s's finger" , &op->name); 2456 tmp->name = format ("%s's finger" , &op->name);
2475 tmp->name_pl = format ("%s's fingers", &op->name); 2457 tmp->name_pl = format ("%s's fingers", &op->name);
2476 tmp->msg = format ( 2458 tmp->msg = format (
2477 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2459 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2478 &op->name, op->contr->title, 2460 &op->name, op->contr->title,
2479 (int)op->level, 2461 (int)op->level,
2480 op->contr->killer_name () 2462 op->contr->killer_name ()
2481 ); 2463 );
2482 tmp->value = 0, tmp->type = 0; 2464 tmp->value = 0, tmp->type = 0;
2483 tmp->materialname = "organics"; 2465 tmp->material = name_to_material (shstr_organic);
2484 tmp->insert_at (op, tmp); 2466 tmp->insert_at (op, tmp);
2485 }
2486 2467
2487 /* teleport defeated player to new destination */ 2468 /* teleport defeated player to new destination */
2488 transfer_ob (op, x, y, 0, NULL); 2469 transfer_ob (op, x, y, 0, NULL);
2489 op->contr->braced = 0; 2470 op->contr->braced = 0;
2490 2471
… …
2552 lost_a_stat = 1; 2533 lost_a_stat = 1;
2553 } 2534 }
2554 else 2535 else
2555 { 2536 {
2556 /* deplete a stat */ 2537 /* deplete a stat */
2557 archetype *deparch = archetype::find ("depletion"); 2538 archetype *deparch = archetype::find (shstr_depletion);
2558 object *dep; 2539 object *dep;
2559 2540
2560 dep = present_arch_in_ob (deparch, op); 2541 dep = present_arch_in_ob (deparch, op);
2561 if (!dep) 2542 if (!dep)
2562 { 2543 {
2563 dep = arch_to_object (deparch); 2544 dep = deparch->instance ();
2564 insert_ob_in_ob (dep, op); 2545 insert_ob_in_ob (dep, op);
2565 } 2546 }
2566 lose_this_stat = 1; 2547 lose_this_stat = 1;
2567 if (settings.balanced_stat_loss) 2548 if (settings.balanced_stat_loss)
2568 { 2549 {
… …
2606 * difference. 2587 * difference.
2607 */ 2588 */
2608 if (this_stat >= -50) 2589 if (this_stat >= -50)
2609 { 2590 {
2610 change_attr_value (&(dep->stats), i, -1); 2591 change_attr_value (&(dep->stats), i, -1);
2611 SET_FLAG (dep, FLAG_APPLIED); 2592 dep->set_flag (FLAG_APPLIED);
2612 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2593 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2613 op->update_stats (); 2594 op->update_stats ();
2614 lost_a_stat = 1; 2595 lost_a_stat = 1;
2615 } 2596 }
2616 } 2597 }
… …
2634#endif 2615#endif
2635 2616
2636 /* Put a gravestone up where the character 'almost' died. List the 2617 /* Put a gravestone up where the character 'almost' died. List the
2637 * exp loss on the stone. 2618 * exp loss on the stone.
2638 */ 2619 */
2639 tmp = arch_to_object (archetype::find ("gravestone")); 2620 tmp = archetype::find (shstr_gravestone)->instance ();
2640 tmp->name = format ("%s's gravestone", &op->name); 2621 tmp->name = format ("%s's gravestone", &op->name);
2641 tmp->name_pl = format ("%s's gravestones", &op->name); 2622 tmp->name_pl = format ("%s's gravestones", &op->name);
2642 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", 2623 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2643 &op->name, op->contr->title, op->contr->killer_name ()); 2624 &op->name, op->contr->title, op->contr->killer_name ());
2644 tmp->x = op->x, tmp->y = op->y; 2625 tmp->x = op->x, tmp->y = op->y;
… …
2687 2668
2688 force = get_archetype (FORCE_NAME); 2669 force = get_archetype (FORCE_NAME);
2689 /* 50 ticks should be enough time for the spell to abate */ 2670 /* 50 ticks should be enough time for the spell to abate */
2690 force->speed = 0.1f; 2671 force->speed = 0.1f;
2691 force->speed_left = -5.f; 2672 force->speed_left = -5.f;
2692 SET_FLAG (force, FLAG_APPLIED); 2673 force->set_flag (FLAG_APPLIED);
2693 for (at = 0; at < NROFATTACKS; at++) 2674 for (at = 0; at < NROFATTACKS; at++)
2694 if (will_kill_again & (1 << at)) 2675 if (will_kill_again & (1 << at))
2695 force->resist[at] = 100; 2676 force->resist[at] = 100;
2696 2677
2697 insert_ob_in_ob (force, op); 2678 insert_ob_in_ob (force, op);
… …
2699 } 2680 }
2700 2681
2701 op->contr->infobox (MSG_CHANNEL ("death"), deathtab); 2682 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2702} 2683}
2703 2684
2704void 2685static void
2705loot_object (object *op) 2686loot_object (object *op)
2706{ /* Grab and destroy some treasure */ 2687{ /* Grab and destroy some treasure */
2707 object *tmp, *tmp2, *next; 2688 object *tmp, *tmp2, *next;
2708 2689
2709 op->close_container (); /* close open sack first */ 2690 op->close_container (); /* close open sack first */
… …
2719 tmp->x = op->x, tmp->y = op->y; 2700 tmp->x = op->x, tmp->y = op->y;
2720 2701
2721 if (tmp->type == CONTAINER) 2702 if (tmp->type == CONTAINER)
2722 loot_object (tmp); /* empty container to ground */ 2703 loot_object (tmp); /* empty container to ground */
2723 2704
2724 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2705 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2725 { 2706 {
2726 if (tmp->nrof > 1) 2707 if (tmp->nrof > 1)
2727 { 2708 {
2728 tmp->decrease (rndm (1, tmp->nrof - 1)); 2709 tmp->decrease (rndm (1, tmp->nrof - 1));
2729 insert_ob_in_map (tmp, op->map, NULL, 0); 2710 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2740 * fix_weight(): Check recursively the weight of all players, and fix 2721 * fix_weight(): Check recursively the weight of all players, and fix
2741 * what needs to be fixed. Refresh windows and fix speed if anything 2722 * what needs to be fixed. Refresh windows and fix speed if anything
2742 * was changed. 2723 * was changed.
2743 */ 2724 */
2744void 2725void
2745fix_weight (void) 2726fix_weight ()
2746{ 2727{
2747 for_all_players (pl) 2728 for_all_players (pl)
2748 { 2729 {
2749 sint32 old = pl->ob->carrying; 2730 sint32 old = pl->ob->carrying;
2750 2731
… …
2757 } 2738 }
2758 } 2739 }
2759} 2740}
2760 2741
2761void 2742void
2762fix_luck (void) 2743fix_luck ()
2763{ 2744{
2764 for_all_players (pl) 2745 for_all_players (pl)
2765 if (!pl->ob->contr->ns->state) 2746 if (!pl->ob->contr->ns->state)
2766 pl->ob->change_luck (0); 2747 pl->ob->change_luck (0);
2767} 2748}
… …
2819} 2800}
2820 2801
2821int 2802int
2822is_true_undead (object *op) 2803is_true_undead (object *op)
2823{ 2804{
2824 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2805 if (op->arch->flag [FLAG_UNDEAD])
2825 return 1; 2806 return 1;
2826 2807
2827 return 0; 2808 return 0;
2828} 2809}
2829 2810
… …
2927 2908
2928 if (who->type == PLAYER) 2909 if (who->type == PLAYER)
2929 player = 1; 2910 player = 1;
2930 2911
2931 else 2912 else
2932 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2913 friendly = who->flag [FLAG_FRIENDLY];
2933 2914
2934 /* search adjacent squares */ 2915 /* search adjacent squares */
2935 for (i = 1; i < 9; i++) 2916 for (i = 1; i < 9; i++)
2936 { 2917 {
2937 x = who->x + freearr_x[i]; 2918 x = who->x + freearr_x[i];
… …
2946 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2927 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2947 continue; 2928 continue;
2948 2929
2949 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2930 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2950 { 2931 {
2951 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2932 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2952 return 1; 2933 return 1;
2953 else if (tmp->type == PLAYER) 2934 else if (tmp->type == PLAYER)
2954 { 2935 {
2955 /*don't let a hidden DM prevent you from hiding */ 2936 /*don't let a hidden DM prevent you from hiding */
2956 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2937 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2957 return 1; 2938 return 1;
2958 } 2939 }
2959 } 2940 }
2960 } 2941 }
2961 return 0; 2942 return 0;
… …
3011 } 2992 }
3012 2993
3013 return 0; 2994 return 0;
3014} 2995}
3015 2996
3016/* routine for both players and monsters. We call this when
3017 * there is a possibility for our action distrubing our hiding
3018 * place or invisiblity spell. Artefact invisiblity causes
3019 * "noise" instead. If we arent invisible to begin with, we
3020 * return 0.
3021 */
3022int
3023action_makes_visible (object *op)
3024{
3025 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3026 {
3027 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3028 {
3029 // artefact invisibility is permanent, but we still make noise
3030 // this is important for game-balance.
3031 if (op->contr)
3032 op->make_noise ();
3033
3034 return 0;
3035 }
3036
3037 if (op->contr && op->contr->tmp_invis == 0)
3038 return 0;
3039
3040 /* If monsters, they should become visible */
3041 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3042 {
3043 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3044 return 1;
3045 }
3046 }
3047
3048 return 0;
3049}
3050
3051/* op_on_battleground - checks if the given object op (usually 2997/* op_on_battleground - checks if the given object op (usually
3052 * a player) is standing on a valid battleground-tile, 2998 * a player) is standing on a valid battleground-tile,
3053 * function returns TRUE/FALSE. If true x, y returns the battleground 2999 * function returns TRUE/FALSE. If true x, y returns the battleground
3054 * -exit-coord. (and if x, y not NULL) 3000 * -exit-coord. (and if x, y not NULL)
3055 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set 3001 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
… …
3065 * and the exit-coordinates sp/hp must both be > 0. 3011 * and the exit-coordinates sp/hp must both be > 0.
3066 * => The intention here is to prevent abuse of the battleground- 3012 * => The intention here is to prevent abuse of the battleground-
3067 * feature (like pickable or hidden battleground tiles). */ 3013 * feature (like pickable or hidden battleground tiles). */
3068 for (object *tmp = op->below; tmp; tmp = tmp->below) 3014 for (object *tmp = op->below; tmp; tmp = tmp->below)
3069 { 3015 {
3070 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3016 if (tmp->flag [FLAG_IS_FLOOR])
3071 { 3017 {
3072 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3018 if (tmp->flag [FLAG_NO_PICK]
3073 && tmp->type == BATTLEGROUND 3019 && tmp->type == BATTLEGROUND
3074 && tmp->name == shstr_battleground 3020 && tmp->name == shstr_battleground
3075 && EXIT_X (tmp) && EXIT_Y (tmp)) 3021 && EXIT_X (tmp) && EXIT_Y (tmp))
3076 { 3022 {
3077 /* before we assign the exit, check if this is a teambattle */ 3023 /* before we assign the exit, check if this is a teambattle */
3078 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3024 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3079 {
3080 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3025 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3026 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3081 { 3027 {
3082 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3083 {
3084 if (x && y) 3028 if (x && y)
3085 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3029 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3086 3030
3087 return 1; 3031 return 1;
3088 }
3089 } 3032 }
3090 }
3091 3033
3092 if (x && y) 3034 if (x && y)
3093 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3035 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3094 3036
3095 return 1; 3037 return 1;
… …
3233 else 3175 else
3234 j = 1; 3176 j = 1;
3235 strcat (buf, spellpathnames[i]); 3177 strcat (buf, spellpathnames[i]);
3236 } 3178 }
3237 } 3179 }
3180
3238 strcat (buf, "."); 3181 strcat (buf, ".");
3239 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3182 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3240 } 3183 }
3241 3184
3242 /* evtl. adding flags: */ 3185 /* evtl. adding flags: */
3243 if (QUERY_FLAG (item, FLAG_XRAYS)) 3186 if (item->flag [FLAG_XRAYS])
3244 SET_FLAG (skin, FLAG_XRAYS); 3187 skin->set_flag (FLAG_XRAYS);
3245 if (QUERY_FLAG (item, FLAG_STEALTH)) 3188 if (item->flag [FLAG_STEALTH])
3246 SET_FLAG (skin, FLAG_STEALTH); 3189 skin->set_flag (FLAG_STEALTH);
3247 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3190 if (item->flag [FLAG_SEE_IN_DARK])
3248 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3191 skin->set_flag (FLAG_SEE_IN_DARK);
3249 3192
3250 /* print message if there is one */ 3193 /* print message if there is one */
3251 if (item->msg != NULL) 3194 if (item->msg != NULL)
3252 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3195 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3253 } 3196 }
3254 else 3197 else
3255 { 3198 {
3256 /* generate misc. treasure */ 3199 /* generate misc. treasure */
3257 tmp = arch_to_object (tr->item); 3200 tmp = tr->item->instance ();
3258 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3201 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3259 who->insert (tmp); 3202 who->insert (tmp);
3260 } 3203 }
3261} 3204}
3262 3205
3263/** 3206//-GPL
3264 * Unready an object for a player. This function does nothing if the object was
3265 * not readied.
3266 */
3267void
3268player_unready_range_ob (player *pl, object *ob)
3269{
3270 if (pl->ob->current_weapon == ob)
3271 pl->ob->current_weapon = 0;
3272
3273 if (pl->combat_ob == ob)
3274 pl->combat_ob = 0;
3275
3276 if (pl->ranged_ob == ob)
3277 pl->ranged_ob = 0;
3278}
3279 3207
3280sint8 3208sint8
3281player::darkness_at (maptile *map, int x, int y) const 3209player::darkness_at (maptile *map, int x, int y) const
3282{ 3210{
3283 if (!ns) 3211 if (!ns)
… …
3310{ 3238{
3311 play_sound (sound_find ("generic_failure")); 3239 play_sound (sound_find ("generic_failure"));
3312 statusmsg (msg, color); 3240 statusmsg (msg, color);
3313} 3241}
3314 3242
3243void
3244object::failmsgf (const char *format, ...)
3245{
3246 if (!contr)
3247 return;
3248
3249 va_list ap;
3250 va_start (ap, format);
3251 contr->failmsg (vformat (format, ap));
3252 va_end (ap);
3253}
3254
3255void
3256player::failmsgf (const char *format, ...)
3257{
3258 va_list ap;
3259 va_start (ap, format);
3260 failmsg (vformat (format, ap));
3261 va_end (ap);
3262}
3263

Diff Legend

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