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.171 by root, Sat Sep 8 07:06:51 2007 UTC vs.
Revision 1.234 by root, Thu Oct 15 21:40:42 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <sproto.h> 26#include <sproto.h>
26#include <sounds.h> 27#include <sounds.h>
… …
32#include <algorithm> 33#include <algorithm>
33#include <functional> 34#include <functional>
34 35
35playervec players; 36playervec players;
36 37
37void
38display_motd (const object *op)
39{
40 char buf[MAX_BUF];
41 char motd[HUGE_BUF];
42 FILE *fp;
43 int comp;
44 int size;
45
46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48 return;
49
50 motd[0] = '\0';
51 size = 0;
52
53 while (fgets (buf, MAX_BUF, fp))
54 {
55 if (*buf == '#')
56 continue;
57
58 strncat (motd + size, buf, HUGE_BUF - size);
59 size += strlen (buf);
60 }
61
62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63 close_and_delete (fp, comp);
64}
65
66void
67send_rules (const object *op)
68{
69 char buf[MAX_BUF];
70 char rules[HUGE_BUF];
71 FILE *fp;
72 int comp;
73 int size;
74
75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77 return;
78
79 rules[0] = '\0';
80 size = 0;
81
82 while (fgets (buf, MAX_BUF, fp))
83 {
84 if (*buf == '#')
85 continue;
86
87 if (size + strlen (buf) >= HUGE_BUF)
88 {
89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90 break;
91 }
92
93 strncat (rules + size, buf, HUGE_BUF - size);
94 size += strlen (buf);
95 }
96
97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98 close_and_delete (fp, comp);
99}
100
101void
102send_news (const object *op)
103{
104 char buf[MAX_BUF];
105 char news[HUGE_BUF];
106 char subject[MAX_BUF];
107 FILE *fp;
108 int comp;
109 int size;
110
111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113 return;
114
115 news[0] = '\0';
116 subject[0] = '\0';
117 size = 0;
118
119 while (fgets (buf, MAX_BUF, fp))
120 {
121 if (*buf == '#')
122 continue;
123
124 if (*buf == '%')
125 { /* send one news */
126 if (size > 0)
127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
129 strcpy (subject, buf + 1);
130 strip_endline (subject);
131 size = 0;
132 news[0] = '\0';
133 }
134 else
135 {
136 if (size + strlen (buf) >= HUGE_BUF)
137 {
138 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
139 break;
140 }
141 strncat (news + size, buf, HUGE_BUF - size);
142 size += strlen (buf);
143 }
144 }
145
146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
148 close_and_delete (fp, comp);
149}
150
151/* This loads the first map an puts the player on it. */ 38/* This loads the first map an puts the player on it. */
152static void 39static void
153set_first_map (object *op) 40set_first_map (object *op)
154{ 41{
155 op->contr->maplevel = first_map_path; 42 op->contr->maplevel = first_map_path;
… …
207 ob->close_container (); //TODO: client-specific 94 ob->close_container (); //TODO: client-specific
208 95
209 ns->update_look = 0; 96 ns->update_look = 0;
210 ns->look_position = 0; 97 ns->look_position = 0;
211 98
212 clear_los (this); 99 clear_los ();
213 100
214 ns->reset_stats (); 101 ns->reset_stats ();
215 102
216 /* make sure he's a player -- needed because of class change. */ 103 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 104 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race; 105 ob->race = ob->arch->race;
219 106
220 ob->carrying = sum_weight (ob); 107 ob->update_weight ();
221 link_player_skills (ob); 108 link_skills ();
222 109
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 110 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 111
225 assign (title, ob->arch->object::name); 112 assign (title, ob->arch->object::name);
226 113
… …
239 set_dragon_name (ob, abil, skin); 126 set_dragon_name (ob, abil, skin);
240 } 127 }
241 128
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243 130
244 esrv_new_player (this, ob->weight + ob->carrying); 131 esrv_new_player (this);
132
133 ob->update_stats ();
134
135 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0);
138
139 activate ();
140
141 INVOKE_PLAYER (CONNECT, this);
142 INVOKE_PLAYER (LOGIN, this);
143}
144
145void
146player::disconnect ()
147{
148 if (ob)
149 {
150 ob->close_container (); //TODO: client-specific
151 ob->drop_unpaid_items ();
152 }
153
154 if (ns)
155 {
156 if (active)
157 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
158
159 INVOKE_PLAYER (DISCONNECT, this);
160
161 ns->reset_stats ();
162 ns->pl = 0;
163 ns = 0;
164 }
165
166 observe = ob;
167
168 deactivate ();
169}
170
171// the need for this function can be explained
172// by load_object not returning the object
173void
174player::set_object (object *op)
175{
176 ob = observe = op;
177 ob->contr = this; /* this aren't yet in archetype */
178
179 ob->speed = 1.0f;
180 ob->speed_left = 0.5f;
181
182 ob->direction = 5; /* So player faces south */
245 183
246 ob->flag [FLAG_READY_WEAPON] = false; 184 ob->flag [FLAG_READY_WEAPON] = false;
247 ob->flag [FLAG_READY_SKILL] = false; 185 ob->flag [FLAG_READY_SKILL] = false;
248 ob->flag [FLAG_READY_BOW] = false; 186 ob->flag [FLAG_READY_BOW] = false;
249 187
… …
266 combat_ob = op; 204 combat_ob = op;
267 break; 205 break;
268 } 206 }
269 207
270 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 208 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
271 ob->update_stats (); 209 ob->deactivate (); // change_weapon activates, fix this better
272
273 ns->floorbox_update ();
274 esrv_send_inventory (ob, ob);
275 esrv_add_spells (this, 0);
276
277 activate ();
278
279 send_rules (ob);
280 send_news (ob);
281 display_motd (ob);
282
283 INVOKE_PLAYER (CONNECT, this);
284 INVOKE_PLAYER (LOGIN, this);
285}
286
287void
288player::disconnect ()
289{
290 if (ob)
291 {
292 ob->close_container (); //TODO: client-specific
293 ob->drop_unpaid_items ();
294 }
295
296 if (ns)
297 {
298 if (active)
299 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
300
301 INVOKE_PLAYER (DISCONNECT, this);
302
303 ns->reset_stats ();
304 ns->pl = 0;
305 ns = 0;
306 }
307
308 observe = ob;
309
310 deactivate ();
311}
312
313// the need for this function can be explained
314// by load_object not returning the object
315void
316player::set_object (object *op)
317{
318 ob = observe = op;
319 ob->contr = this; /* this aren't yet in archetype */
320
321 ob->speed = 1.0f;
322 ob->speed_left = 0.5f;
323
324 ob->direction = 5; /* So player faces south */
325} 210}
326 211
327void 212void
328player::set_observe (object *op) 213player::set_observe (object *op)
329{ 214{
… …
343 savebed_map = first_map_path; /* Init. respawn position */ 228 savebed_map = first_map_path; /* Init. respawn position */
344 229
345 gen_sp_armour = 10; 230 gen_sp_armour = 10;
346 bowtype = bow_normal; 231 bowtype = bow_normal;
347 petmode = pet_normal; 232 petmode = pet_normal;
348 listening = 10;
349 usekeys = containers; 233 usekeys = containers;
350 peaceful = 1; /* default peaceful */ 234 peaceful = 1; /* default peaceful */
351 do_los = 1; 235 do_los = 1;
352 236
353 weapon_sp = 1.0f; 237 weapon_sp = 1.0f;
… …
402 * Note: there MUST be at least one player archetype! 286 * Note: there MUST be at least one player archetype!
403 */ 287 */
404archetype * 288archetype *
405get_player_archetype (archetype *at) 289get_player_archetype (archetype *at)
406{ 290{
291 // archetypes could have been reloaded
292 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
293
294 if (!nat)
295 return at;
296
407 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 297 archvec::iterator i = archetypes.find (nat);
408 298
409 for (;;) 299 for (;;)
410 { 300 {
411 if (++i == archetypes.end ()) 301 if (++i == archetypes.end ())
412 i = archetypes.begin (); 302 i = archetypes.begin ();
… …
630 520
631 return firstdir; 521 return firstdir;
632} 522}
633 523
634void 524void
635give_initial_items (object *pl, treasurelist * items) 525give_initial_items (object *pl, treasurelist *items)
636{ 526{
637 object *op, *next = NULL;
638
639 if (pl->randomitems != NULL) 527 if (pl->randomitems)
640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 528 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641 529
642 for (op = pl->inv; op; op = next) 530 for (object *next, *op = pl->inv; op; op = next)
643 { 531 {
644 next = op->below; 532 next = op->below;
645 533
646 /* Forces get applied per default, unless they have the 534 /* Forces get applied per default, unless they have the
647 * flag "neutral" set. Sorry but I can't think of a better way 535 * flag "neutral" set. Sorry but I can't think of a better way
… …
652 /* we never give weapons/armour if these cannot be used 540 /* we never give weapons/armour if these cannot be used
653 * by this player due to race restrictions 541 * by this player due to race restrictions
654 */ 542 */
655 if (pl->type == PLAYER) 543 if (pl->type == PLAYER)
656 { 544 {
657 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 545 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
546 &&
658 (op->type == ARMOUR || op->type == BOOTS || 547 (op->type == ARMOUR || op->type == BOOTS
659 op->type == CLOAK || op->type == HELMET || 548 || op->type == CLOAK || op->type == HELMET
660 op->type == SHIELD || op->type == GLOVES || 549 || op->type == SHIELD || op->type == GLOVES
550 || op->type == BRACERS || op->type == GIRDLE))
661 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 551 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
662 { 552 {
663 op->destroy (); 553 op->destroy ();
664 continue; 554 continue;
665 } 555 }
666 } 556 }
667 557
668 /* This really needs to be better - we should really give 558 /* Here we remove duplicated skills (as duplicated spell objects have
669 * a substitute spellbook. The problem is that we don't really 559 * _very_ confusing effects for players), which could for instance be
670 * have a good idea what to replace it with (need something like 560 * generated by bad treasurelists. - elmex
671 * a first level treasurelist for each skill.)
672 * remove duplicate skills also
673 */ 561 */
674 if (op->type == SPELLBOOK || op->type == SKILL) 562 if (op->type == SKILL)
675 { 563 {
676 object *tmp;
677
678 for (tmp = op->below; tmp; tmp = tmp->below) 564 for (object *tmp = op->below; tmp; tmp = tmp->below)
679 if (tmp->type == op->type && tmp->name == op->name) 565 if (tmp->type == op->type && tmp->name == op->name)
680 break;
681
682 if (tmp)
683 { 566 {
684 op->destroy (); 567 op->destroy ();
568 LOG (llevError,
685 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 569 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
686 continue; 570 break;
687 } 571 }
688 572
689 if (op->nrof > 1) 573 if (op->nrof > 1)
690 op->nrof = 1; 574 op->nrof = 1;
691 } 575 }
692 576
693 if (op->type == SPELLBOOK && op->inv) 577 if (op->type == SPELLBOOK && op->inv)
694 {
695 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 578 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
696 }
697 579
698 /* Give starting characters identified, uncursed, and undamned 580 /* Give starting characters identified, uncursed, and undamned
699 * items. Just don't identify gold or silver, or it won't be 581 * items. Just don't identify gold or silver, or it won't be
700 * merged properly. 582 * merged properly.
701 */ 583 */
702 if (need_identify (op)) 584 if (need_identify (op))
703 { 585 {
704 SET_FLAG (op, FLAG_IDENTIFIED); 586 SET_FLAG (op, FLAG_IDENTIFIED);
705 CLEAR_FLAG (op, FLAG_CURSED); 587 CLEAR_FLAG (op, FLAG_CURSED);
706 CLEAR_FLAG (op, FLAG_DAMNED); 588 CLEAR_FLAG (op, FLAG_DAMNED);
707 } 589 }
590
708 if (op->type == SPELL) 591 if (op->type == SPELL)
709 { 592 {
710 op->destroy (); 593 op->destroy ();
711 continue; 594 continue;
712 } 595 }
… …
714 { 597 {
715 SET_FLAG (op, FLAG_CAN_USE_SKILL); 598 SET_FLAG (op, FLAG_CAN_USE_SKILL);
716 op->stats.exp = 0; 599 op->stats.exp = 0;
717 op->level = 1; 600 op->level = 1;
718 } 601 }
719 /* lock all 'normal items by default */ 602 else /* lock all 'normal items by default */
720 else
721 SET_FLAG (op, FLAG_INV_LOCKED); 603 SET_FLAG (op, FLAG_INV_LOCKED);
722 } /* for loop of objects in player inv */ 604 } /* for loop of objects in player inv */
723 605
724 /* Need to set up the skill pointers */ 606 /* Need to set up the skill pointers */
725 link_player_skills (pl); 607 pl->contr->link_skills ();
726} 608}
727 609
728void 610void
729get_party_password (object *op, partylist *party) 611get_party_password (object *op, partylist *party)
730{ 612{
… …
831static void 713static void
832start_info (object *op) 714start_info (object *op)
833{ 715{
834 char buf[MAX_BUF]; 716 char buf[MAX_BUF];
835 717
836 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 718 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
837 new_draw_info (NDI_UNIQUE, 0, op, buf); 719 new_draw_info (NDI_UNIQUE, 0, op, buf);
838 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
839 //new_draw_info (NDI_UNIQUE, 0, op, " ");
840} 720}
841 721
842/* This function takes the key that is passed, and does the 722/* This function takes the key that is passed, and does the
843 * appropriate action with it (change race, or other things). 723 * appropriate action with it (change race, or other things).
844 * The function name is for historical reasons - now we have 724 * The function name is for historical reasons - now we have
… …
847 */ 727 */
848void 728void
849player::chargen_race_done () 729player::chargen_race_done ()
850{ 730{
851 /* this must before then initial items are given */ 731 /* this must before then initial items are given */
852 esrv_new_player (ob->contr, ob->weight + ob->carrying); 732 esrv_new_player (ob->contr);
853 733
854 treasurelist *tl = treasurelist::find ("starting_wealth"); 734 treasurelist *tl = treasurelist::find ("starting_wealth");
855 if (tl) 735 if (tl)
856 create_treasure (tl, ob, 0, 0, 0); 736 create_treasure (tl, ob, 0, 0, 0);
857 737
… …
861 ob->contr->ns->state = ST_PLAYING; 741 ob->contr->ns->state = ST_PLAYING;
862 742
863 if (ob->msg) 743 if (ob->msg)
864 ob->msg = 0; 744 ob->msg = 0;
865 745
866 /* We create this now because some of the unique maps will need it
867 * to save here.
868 */
869 {
870 char buf[MAX_BUF];
871 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
872 make_path_to_file (buf);
873 }
874
875 start_info (ob); 746 start_info (ob);
876 CLEAR_FLAG (ob, FLAG_WIZ); 747 CLEAR_FLAG (ob, FLAG_WIZ);
877 give_initial_items (ob, ob->randomitems); 748 give_initial_items (ob, ob->randomitems);
878 link_player_skills (ob);
879 esrv_send_inventory (ob, ob); 749 esrv_send_inventory (ob, ob);
880 ob->update_stats (); 750 ob->update_stats ();
881 751
882 /* This moves the player to a different start map, if there 752 /* This moves the player to a different start map, if there
883 * is one for this race 753 * is one for this race
884 */ 754 */
885 if (*first_map_ext_path) 755 if (*first_map_ext_path)
886 { 756 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
887 object *tmp;
888 char mapname[MAX_BUF];
889
890 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
891 tmp = object::create ();
892 EXIT_PATH (tmp) = mapname;
893 EXIT_X (tmp) = ob->x;
894 EXIT_Y (tmp) = ob->y;
895 ob->enter_exit (tmp); /* we don't really care if it succeeded;
896 * if the map isn't there, then stay on the
897 * default initial map */
898 tmp->destroy ();
899 }
900 else 757 else
901 LOG (llevDebug, "first_map_ext_path not set\n"); 758 LOG (llevDebug, "first_map_ext_path not set\n");
902} 759}
903 760
904void 761void
… …
948 LOG (llevDebug, "Fleeing player is dead.\n"); 805 LOG (llevDebug, "Fleeing player is dead.\n");
949 CLEAR_FLAG (op, FLAG_SCARED); 806 CLEAR_FLAG (op, FLAG_SCARED);
950 return; 807 return;
951 } 808 }
952 809
953 if (op->enemy == NULL) 810 if (!op->enemy)
954 { 811 {
955 LOG (llevDebug, "Fleeing player had no enemy.\n"); 812 LOG (llevDebug, "Fleeing player had no enemy.\n");
956 CLEAR_FLAG (op, FLAG_SCARED); 813 CLEAR_FLAG (op, FLAG_SCARED);
957 return; 814 return;
958 } 815 }
959 816
960 /* Seen some crashes here. Since we don't store an
961 * op->enemy_count, it is possible that something destroys the
962 * actual enemy, and the object is recycled.
963 */
964 if (op->enemy->map == NULL)
965 {
966 CLEAR_FLAG (op, FLAG_SCARED);
967 op->enemy = NULL;
968 return;
969 }
970
971 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 817 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
972 { 818 {
973 op->enemy = NULL; 819 op->enemy = NULL;
974 CLEAR_FLAG (op, FLAG_SCARED); 820 CLEAR_FLAG (op, FLAG_SCARED);
975 return; 821 return;
… …
978 get_rangevector (op, op->enemy, &rv, 0); 824 get_rangevector (op, op->enemy, &rv, 0);
979 825
980 dir = absdir (4 + rv.direction); 826 dir = absdir (4 + rv.direction);
981 for (diff = 0; diff < 3; diff++) 827 for (diff = 0; diff < 3; diff++)
982 { 828 {
983 int m = 1 - (RANDOM () & 2); 829 int m = 1 - rndm (2) * 2;
984 830
985 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 831 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
986 return; 832 return;
987 } 833 }
988 834
… …
999check_pick (object *op) 845check_pick (object *op)
1000{ 846{
1001 object *tmp, *next; 847 object *tmp, *next;
1002 int stop = 0; 848 int stop = 0;
1003 int wvratio; 849 int wvratio;
1004 char putstring[128];
1005 850
1006 /* if you're flying, you cna't pick up anything */ 851 /* if you're flying, you cna't pick up anything */
1007 if (op->move_type & MOVE_FLYING) 852 if (op->move_type & MOVE_FLYING)
1008 return 1; 853 return 1;
1009 854
1010 next = op->below; 855 next = op->below;
1011 856
857 int cnt = MAX_ITEM_PER_DROP;
858#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
859
1012 /* loop while there are items on the floor that are not marked as 860 /* loop while there are items on the floor that are not marked as
1013 * destroyed */ 861 * destroyed */
1014 while (next && !next->destroyed ()) 862 while (next && !next->destroyed ())
1015 { 863 {
1016 tmp = next; 864 tmp = next;
1017 next = tmp->below; 865 next = tmp->below;
1018 866
867 if (cnt <= 0)
868 {
869 op->failmsg ("Couldn't pickup all items at once.");
870 return 0;
871 }
872
1019 if (op->destroyed ()) 873 if (op->destroyed ())
1020 return 0; 874 return 0;
1021 875
1022 if (!can_pick (op, tmp)) 876 if (!can_pick (op, tmp))
1023 continue; 877 continue;
1024 878
1025 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 879 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1026 { 880 {
1027 if (item_matched_string (op, tmp, op->contr->search_str)) 881 if (item_matched_string (op, tmp, op->contr->search_str))
1028 pick_up (op, tmp); 882 CHK_PICK_PICKUP;
883
1029 continue; 884 continue;
1030 } 885 }
1031 886
1032 /* high not bit set? We're using the old autopickup model */ 887 /* pickup handling */
888 if (op->contr->mode & PU_DEBUG)
889 {
890 /* some debugging code to figure out item information */
891 const char *str = tmp->name
892 ? format ("item name: %s item type: %d weight/value: %d",
893 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
894 : format ("item name: %s item type: %d weight/value: %d",
895 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
896
897 new_draw_info (NDI_UNIQUE, 0, op, str);
898 }
899
900 if (op->contr->mode & PU_INHIBIT)
901 return 1;
902
903 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
904 return 1;
905
906 /* philosophy:
907 * It's easy to grab an item type from a pile, as long as it's
908 * generic. This takes no game-time. For more detailed pickups
909 * and selections, select-items should be used. This is a
910 * grab-as-you-run type mode that's really useful for arrows for
911 * example.
912 * The drawback: right now it has no frontend, so you need to
913 * stick the bits you want into a calculator in hex mode and then
914 * convert to decimal and then 'pickup <#>
915 */
916
917 /* the first two modes are exclusive: if NOTHING we return, if
918 * STOP then we stop. All the rest are applied sequentially,
919 * meaning if any test passes, the item gets picked up. */
920
921 /* if mode is set to pick nothing up, return */
922 if (op->contr->mode == PU_NOTHING)
923 return 1;
924
925 /* if mode is set to stop when encountering objects, return */
926 /* take STOP before INHIBIT since it doesn't actually pick
927 * anything up */
928 if (op->contr->mode & PU_STOP)
929 return 0;
930
931 /* useful for going into stores and not losing your settings... */
932 /* and for battles wher you don't want to get loaded down while
933 * fighting */
934 if (op->contr->mode & PU_INHIBIT)
935 return 1;
936
937 /* prevent us from turning into auto-thieves :) */
938 if (QUERY_FLAG (tmp, FLAG_UNPAID))
939 continue;
940
941 /* ignore known cursed objects */
942 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
943 continue;
944
945 /* all food and drink if desired */
946 /* question: don't pick up known-poisonous stuff? */
1033 if (!(op->contr->mode & PU_NEWMODE)) 947 if (op->contr->mode & PU_FOOD)
948 if (tmp->type == FOOD)
1034 { 949 {
1035 switch (op->contr->mode) 950 CHK_PICK_PICKUP;
951 continue;
952 }
953
954 if (op->contr->mode & PU_DRINK)
955 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
956 {
957 CHK_PICK_PICKUP;
958 continue;
959 }
960
961 if (op->contr->mode & PU_POTION)
962 if (tmp->type == POTION)
963 {
964 CHK_PICK_PICKUP;
965 continue;
966 }
967
968 /* spellbooks, skillscrolls and normal books/scrolls */
969 if (op->contr->mode & PU_SPELLBOOK)
970 if (tmp->type == SPELLBOOK)
971 {
972 CHK_PICK_PICKUP;
973 continue;
974 }
975
976 if (op->contr->mode & PU_SKILLSCROLL)
977 if (tmp->type == SKILLSCROLL)
978 {
979 CHK_PICK_PICKUP;
980 continue;
981 }
982
983 if (op->contr->mode & PU_READABLES)
984 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
985 {
986 CHK_PICK_PICKUP;
987 continue;
988 }
989
990 /* wands/staves/rods/horns */
991 if (op->contr->mode & PU_MAGIC_DEVICE)
992 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
993 {
994 CHK_PICK_PICKUP;
995 continue;
996 }
997
998 /* pick up all magical items */
999 if (op->contr->mode & PU_MAGICAL)
1000 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1001 {
1002 CHK_PICK_PICKUP;
1003 continue;
1004 }
1005
1006 if (op->contr->mode & PU_VALUABLES)
1007 {
1008 if (tmp->type == MONEY || tmp->type == GEM)
1036 { 1009 {
1037 case 0: 1010 CHK_PICK_PICKUP;
1038 return 1; /* don't pick up */ 1011 continue;
1039 case 1:
1040 pick_up (op, tmp);
1041 return 1;
1042 case 2:
1043 pick_up (op, tmp);
1044 return 0;
1045 case 3:
1046 return 0; /* stop before pickup */
1047 case 4:
1048 pick_up (op, tmp);
1049 break;
1050 case 5:
1051 pick_up (op, tmp);
1052 stop = 1;
1053 break;
1054 case 6:
1055 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1056 pick_up (op, tmp);
1057 break;
1058
1059 case 7:
1060 if (tmp->type == MONEY || tmp->type == GEM)
1061 pick_up (op, tmp);
1062 break;
1063
1064 default:
1065 /* use value density */
1066 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1067 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1068 pick_up (op, tmp);
1069 } 1012 }
1070 } 1013 }
1071 else 1014
1072 { /* old model */ 1015 /* rings & amulets - talismans seems to be typed AMULET */
1073 /* NEW pickup handling */
1074 if (op->contr->mode & PU_DEBUG) 1016 if (op->contr->mode & PU_JEWELS)
1017 if (tmp->type == RING || tmp->type == AMULET)
1075 { 1018 {
1076 /* some debugging code to figure out item information */ 1019 CHK_PICK_PICKUP;
1077 if (tmp->name != NULL)
1078 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1079 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1080 else
1081 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1082 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1083
1084 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1085 }
1086
1087 /* philosophy:
1088 * It's easy to grab an item type from a pile, as long as it's
1089 * generic. This takes no game-time. For more detailed pickups
1090 * and selections, select-items should be used. This is a
1091 * grab-as-you-run type mode that's really useful for arrows for
1092 * example.
1093 * The drawback: right now it has no frontend, so you need to
1094 * stick the bits you want into a calculator in hex mode and then
1095 * convert to decimal and then 'pickup <#>
1096 */
1097
1098 /* the first two modes are exclusive: if NOTHING we return, if
1099 * STOP then we stop. All the rest are applied sequentially,
1100 * meaning if any test passes, the item gets picked up. */
1101
1102 /* if mode is set to pick nothing up, return */
1103
1104 if (op->contr->mode & PU_NOTHING)
1105 return 1;
1106
1107 /* if mode is set to stop when encountering objects, return */
1108 /* take STOP before INHIBIT since it doesn't actually pick
1109 * anything up */
1110
1111 if (op->contr->mode & PU_STOP)
1112 return 0;
1113
1114 /* useful for going into stores and not losing your settings... */
1115 /* and for battles wher you don't want to get loaded down while
1116 * fighting */
1117 if (op->contr->mode & PU_INHIBIT)
1118 return 1;
1119
1120 /* prevent us from turning into auto-thieves :) */
1121 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1122 continue; 1020 continue;
1021 }
1123 1022
1124 /* ignore known cursed objects */ 1023 /* we don't forget dragon food */
1125 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1024 if (op->contr->mode & PU_FLESH)
1025 if (tmp->type == FLESH)
1026 {
1027 CHK_PICK_PICKUP;
1126 continue; 1028 continue;
1029 }
1127 1030
1128 /* all food and drink if desired */ 1031 /* bows and arrows. Bows are good for selling! */
1129 /* question: don't pick up known-poisonous stuff? */ 1032 if (op->contr->mode & PU_BOW)
1033 if (tmp->type == BOW)
1034 {
1035 CHK_PICK_PICKUP;
1036 continue;
1037 }
1038
1039 if (op->contr->mode & PU_ARROW)
1040 if (tmp->type == ARROW)
1041 {
1042 CHK_PICK_PICKUP;
1043 continue;
1044 }
1045
1046 /* all kinds of armor etc. */
1047 if (op->contr->mode & PU_ARMOUR)
1048 if (tmp->type == ARMOUR)
1049 {
1050 CHK_PICK_PICKUP;
1051 continue;
1052 }
1053
1054 if (op->contr->mode & PU_HELMET)
1055 if (tmp->type == HELMET)
1056 {
1057 CHK_PICK_PICKUP;
1058 continue;
1059 }
1060
1061 if (op->contr->mode & PU_SHIELD)
1062 if (tmp->type == SHIELD)
1063 {
1064 CHK_PICK_PICKUP;
1065 continue;
1066 }
1067
1130 if (op->contr->mode & PU_FOOD) 1068 if (op->contr->mode & PU_BOOTS)
1131 if (tmp->type == FOOD) 1069 if (tmp->type == BOOTS)
1070 {
1071 CHK_PICK_PICKUP;
1072 continue;
1073 }
1074
1075 if (op->contr->mode & PU_GLOVES)
1076 if (tmp->type == GLOVES)
1077 {
1078 CHK_PICK_PICKUP;
1079 continue;
1080 }
1081
1082 if (op->contr->mode & PU_CLOAK)
1083 if (tmp->type == CLOAK)
1084 {
1085 CHK_PICK_PICKUP;
1086 continue;
1087 }
1088
1089 /* hoping to catch throwing daggers here */
1090 if (op->contr->mode & PU_MISSILEWEAPON)
1091 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1092 {
1093 CHK_PICK_PICKUP;
1094 continue;
1095 }
1096
1097 /* careful: chairs and tables are weapons! */
1098 if (op->contr->mode & PU_ALLWEAPON)
1099 {
1100 if (tmp->type == WEAPON)
1101 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1132 { 1102 {
1133 pick_up (op, tmp); 1103 CHK_PICK_PICKUP;
1134 continue; 1104 continue;
1135 } 1105 }
1106 }
1136 1107
1108 /* misc stuff that's useful */
1137 if (op->contr->mode & PU_DRINK) 1109 if (op->contr->mode & PU_KEY)
1138 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1110 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1139 { 1111 {
1140 pick_up (op, tmp); 1112 CHK_PICK_PICKUP;
1141 continue; 1113 continue;
1142 } 1114 }
1143 1115
1116 /* any of the last 4 bits set means we use the ratio for value
1117 * pickups */
1144 if (op->contr->mode & PU_POTION) 1118 if (op->contr->mode & PU_RATIO)
1145 if (tmp->type == POTION) 1119 {
1120 /* use value density to decide what else to grab */
1121 /* >=7 was >= op->contr->mode */
1122 /* >=7 is the old standard setting. Now we take the last 4 bits
1146 { 1123 */
1147 pick_up (op, tmp);
1148 continue;
1149 }
1150
1151 /* spellbooks, skillscrolls and normal books/scrolls */
1152 if (op->contr->mode & PU_SPELLBOOK)
1153 if (tmp->type == SPELLBOOK)
1154 {
1155 pick_up (op, tmp);
1156 continue;
1157 }
1158
1159 if (op->contr->mode & PU_SKILLSCROLL)
1160 if (tmp->type == SKILLSCROLL)
1161 {
1162 pick_up (op, tmp);
1163 continue;
1164 }
1165
1166 if (op->contr->mode & PU_READABLES)
1167 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1168 {
1169 pick_up (op, tmp);
1170 continue;
1171 }
1172
1173 /* wands/staves/rods/horns */
1174 if (op->contr->mode & PU_MAGIC_DEVICE)
1175 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1176 {
1177 pick_up (op, tmp);
1178 continue;
1179 }
1180
1181 /* pick up all magical items */
1182 if (op->contr->mode & PU_MAGICAL) 1124 wvratio = op->contr->mode & PU_RATIO;
1183 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1125 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1184 {
1185 pick_up (op, tmp);
1186 continue;
1187 }
1188
1189 if (op->contr->mode & PU_VALUABLES)
1190 { 1126 {
1191 if (tmp->type == MONEY || tmp->type == GEM) 1127#if 0
1128 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1129 if (tmp->name != NULL)
1192 { 1130 {
1193 pick_up (op, tmp); 1131 fprintf (stderr, "%s", tmp->name);
1194 continue;
1195 } 1132 }
1196 }
1197
1198 /* rings & amulets - talismans seems to be typed AMULET */
1199 if (op->contr->mode & PU_JEWELS)
1200 if (tmp->type == RING || tmp->type == AMULET)
1201 {
1202 pick_up (op, tmp);
1203 continue;
1204 }
1205
1206 /* we don't forget dragon food */
1207 if (op->contr->mode & PU_FLESH)
1208 if (tmp->type == FLESH)
1209 {
1210 pick_up (op, tmp);
1211 continue;
1212 }
1213
1214 /* bows and arrows. Bows are good for selling! */
1215 if (op->contr->mode & PU_BOW)
1216 if (tmp->type == BOW)
1217 {
1218 pick_up (op, tmp);
1219 continue;
1220 }
1221
1222 if (op->contr->mode & PU_ARROW)
1223 if (tmp->type == ARROW)
1224 {
1225 pick_up (op, tmp);
1226 continue;
1227 }
1228
1229 /* all kinds of armor etc. */
1230 if (op->contr->mode & PU_ARMOUR)
1231 if (tmp->type == ARMOUR)
1232 {
1233 pick_up (op, tmp);
1234 continue;
1235 }
1236
1237 if (op->contr->mode & PU_HELMET)
1238 if (tmp->type == HELMET)
1239 {
1240 pick_up (op, tmp);
1241 continue;
1242 }
1243
1244 if (op->contr->mode & PU_SHIELD)
1245 if (tmp->type == SHIELD)
1246 {
1247 pick_up (op, tmp);
1248 continue;
1249 }
1250
1251 if (op->contr->mode & PU_BOOTS)
1252 if (tmp->type == BOOTS)
1253 {
1254 pick_up (op, tmp);
1255 continue;
1256 }
1257
1258 if (op->contr->mode & PU_GLOVES)
1259 if (tmp->type == GLOVES)
1260 {
1261 pick_up (op, tmp);
1262 continue;
1263 }
1264
1265 if (op->contr->mode & PU_CLOAK)
1266 if (tmp->type == CLOAK)
1267 {
1268 pick_up (op, tmp);
1269 continue;
1270 }
1271
1272 /* hoping to catch throwing daggers here */
1273 if (op->contr->mode & PU_MISSILEWEAPON)
1274 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1275 {
1276 pick_up (op, tmp);
1277 continue;
1278 }
1279
1280 /* careful: chairs and tables are weapons! */
1281 if (op->contr->mode & PU_ALLWEAPON)
1282 {
1283 if (tmp->type == WEAPON && tmp->name != NULL)
1284 {
1285 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1286 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1287 {
1288 pick_up (op, tmp);
1289 continue;
1290 }
1291 }
1292
1293 if (tmp->type == WEAPON && tmp->name == NULL)
1294 {
1295 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1296 {
1297 pick_up (op, tmp);
1298 continue;
1299 }
1300 }
1301 }
1302
1303 /* misc stuff that's useful */
1304 if (op->contr->mode & PU_KEY)
1305 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1306 {
1307 pick_up (op, tmp);
1308 continue;
1309 }
1310
1311 /* any of the last 4 bits set means we use the ratio for value
1312 * pickups */
1313 if (op->contr->mode & PU_RATIO)
1314 {
1315 /* use value density to decide what else to grab */
1316 /* >=7 was >= op->contr->mode */
1317 /* >=7 is the old standard setting. Now we take the last 4 bits
1318 * and multiply them by 5, giving 0..15*5== 5..75 */
1319 wvratio = (op->contr->mode & PU_RATIO) * 5;
1320 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1321 {
1322 pick_up (op, tmp);
1323#if 0
1324 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1325 if (tmp->name != NULL)
1326 {
1327 fprintf (stderr, "%s", tmp->name);
1328 }
1329 else 1133 else
1330 fprintf (stderr, "%s", tmp->arch->archname); 1134 fprintf (stderr, "%s", tmp->arch->archname);
1331 fprintf (stderr, ",%d] = ", tmp->type); 1135 fprintf (stderr, ",%d] = ", tmp->type);
1332 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1136 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1333#endif 1137#endif
1138 CHK_PICK_PICKUP;
1334 continue; 1139 continue;
1335 }
1336 } 1140 }
1337 } /* the new pickup model */ 1141 } /* the new pickup model */
1338 } 1142 }
1339 1143
1340 return !stop; 1144 return !stop;
… …
1346 * found object is returned. 1150 * found object is returned.
1347 */ 1151 */
1348object * 1152object *
1349find_arrow (object *op, const char *type) 1153find_arrow (object *op, const char *type)
1350{ 1154{
1351 object *tmp = 0;
1352
1353 for (op = op->inv; op; op = op->below) 1155 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1354 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1355 tmp = find_arrow (op, type);
1356 else if (op->type == ARROW && op->race == type) 1156 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1157 return splay (tmp);
1158
1159 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1160 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1161 if (object *arrow = find_arrow (tmp, type))
1162 {
1163 splay (tmp);
1357 return op; 1164 return arrow;
1165 }
1358 1166
1359 return tmp; 1167 return 0;
1360} 1168}
1361 1169
1362/* 1170/*
1363 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1171 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1364 * against the target. A full test is not performed, simply a basic test 1172 * against the target. A full test is not performed, simply a basic test
1365 * of resistances. The archer is making a quick guess at what he sees down 1173 * of resistances. The archer is making a quick guess at what he sees down
1366 * the hall. Failing that it does it's best to pick the highest plus arrow. 1174 * the hall. Failing that it does it's best to pick the highest plus arrow.
1367 */ 1175 */
1368object * 1176object *
1369find_better_arrow (object *op, object *target, const char *type, int *better) 1177find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1370{ 1178{
1371 object *tmp = NULL, *arrow, *ntmp; 1179 object *tmp = NULL, *arrow, *ntmp;
1372 int attacknum, attacktype, betterby = 0, i; 1180 int attacknum, attacktype, betterby = 0, i;
1373 1181
1374 if (!type) 1182 if (!type)
… …
1378 { 1186 {
1379 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1187 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1380 { 1188 {
1381 i = 0; 1189 i = 0;
1382 ntmp = find_better_arrow (arrow, target, type, &i); 1190 ntmp = find_better_arrow (arrow, target, type, &i);
1191
1383 if (i > betterby) 1192 if (i > betterby)
1384 { 1193 {
1385 tmp = ntmp; 1194 tmp = ntmp;
1386 betterby = i; 1195 betterby = i;
1387 } 1196 }
1388 } 1197 }
1389 else if (arrow->type == ARROW && arrow->race == type) 1198 else if (arrow->type == ARROW && arrow->race == type)
1390 { 1199 {
1391 /* allways prefer assasination/slaying */ 1200 /* allways prefer assasination/slaying */
1392 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1201 if (target->race && arrow->slaying.contains (target->race))
1393 { 1202 {
1394 if (arrow->attacktype & AT_DEATH) 1203 if (arrow->attacktype & AT_DEATH)
1395 { 1204 {
1396 *better = 100; 1205 *better = 100;
1397 return arrow; 1206 return arrow;
… …
1412 { 1221 {
1413 tmp = arrow; 1222 tmp = arrow;
1414 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1223 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1415 } 1224 }
1416 } 1225 }
1226
1417 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1227 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1418 { 1228 {
1419 tmp = arrow; 1229 tmp = arrow;
1420 betterby = 2 + arrow->magic + arrow->stats.dam; 1230 betterby = 2 + arrow->magic + arrow->stats.dam;
1421 } 1231 }
1232
1422 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1233 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1423 { 1234 {
1424 tmp = arrow; 1235 tmp = arrow;
1425 betterby = 1 + arrow->magic + arrow->stats.dam; 1236 betterby = 1 + arrow->magic + arrow->stats.dam;
1426 } 1237 }
1427 } 1238 }
1428 } 1239 }
1429 } 1240 }
1241
1430 if (tmp == NULL && arrow == NULL) 1242 if (tmp == NULL && arrow == NULL)
1431 return find_arrow (op, type); 1243 return find_arrow (op, type);
1432 1244
1433 *better = betterby; 1245 *better = betterby;
1434 return tmp; 1246 return tmp;
… …
1439 * op = the shooter 1251 * op = the shooter
1440 * type = bow->race 1252 * type = bow->race
1441 * dir = fire direction 1253 * dir = fire direction
1442 */ 1254 */
1443object * 1255object *
1444pick_arrow_target (object *op, const char *type, int dir) 1256pick_arrow_target (object *op, shstr_cmp type, int dir)
1445{ 1257{
1446 object *tmp = NULL; 1258 object *tmp = NULL;
1447 maptile *m; 1259 maptile *m;
1448 int i, mflags, found, number; 1260 int i, mflags, found, number;
1449 sint16 x, y; 1261 sint16 x, y;
… …
1464 for (i = 0, found = 0; i < 20; i++) 1276 for (i = 0, found = 0; i < 20; i++)
1465 { 1277 {
1466 x += freearr_x[dir]; 1278 x += freearr_x[dir];
1467 y += freearr_y[dir]; 1279 y += freearr_y[dir];
1468 mflags = get_map_flags (m, &m, x, y, &x, &y); 1280 mflags = get_map_flags (m, &m, x, y, &x, &y);
1281
1469 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1282 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1470 { 1283 {
1471 tmp = NULL; 1284 tmp = 0;
1472 break; 1285 break;
1473 } 1286 }
1474 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1287 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1475 { 1288 {
1476 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1289 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1477 * perhaps a bad assumption. 1290 * perhaps a bad assumption.
1478 */ 1291 */
1479 tmp = NULL; 1292 tmp = 0;
1480 break; 1293 break;
1481 } 1294 }
1295
1482 if (mflags & P_IS_ALIVE) 1296 if (mflags & P_IS_ALIVE)
1483 {
1484 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1297 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1485 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1298 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1486 {
1487 found++;
1488 break;
1489 }
1490 if (found)
1491 break; 1299 break;
1492 }
1493 } 1300 }
1494 if (tmp == NULL) 1301
1302 if (!tmp)
1495 return find_arrow (op, type); 1303 return find_arrow (op, type);
1496 1304
1497 if (tmp->head) 1305 if (tmp->head)
1498 tmp = tmp->head; 1306 tmp = tmp->head;
1499 1307
… …
1539 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1347 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1540 return 0; 1348 return 0;
1541 } 1349 }
1542 1350
1543 // optimisation: move object to top so we will find it quickly again 1351 // optimisation: move object to top so we will find it quickly again
1544 if (bow->below) 1352 splay (bow);
1545 {
1546 bow->remove ();
1547 op->insert (bow);
1548 }
1549
1550 } 1353 }
1551 1354
1552 if (!bow->race || !bow->skill) 1355 if (!bow->race || !bow->skill)
1553 { 1356 {
1554 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1357 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1580 } 1383 }
1581 1384
1582 /* this should not happen, but sometimes does */ 1385 /* this should not happen, but sometimes does */
1583 if (arrow->nrof == 0) 1386 if (arrow->nrof == 0)
1584 { 1387 {
1388 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1585 arrow->destroy (); 1389 arrow->destroy ();
1586 return 0; 1390 return 0;
1587 } 1391 }
1588 1392
1589 left = arrow; /* these are arrows left to the player */ 1393 left = arrow; /* these are arrows left to the player */
1590 arrow = get_split_ob (arrow, 1); 1394 arrow = arrow->split ();
1591 if (!arrow) 1395 if (!arrow)
1592 { 1396 {
1593 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1397 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1594 return 0; 1398 return 0;
1595 } 1399 }
… …
1599 arrow->direction = dir; 1403 arrow->direction = dir;
1600 1404
1601 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1405 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1602 arrow->stats.hp = arrow->stats.dam; 1406 arrow->stats.hp = arrow->stats.dam;
1603 arrow->stats.grace = arrow->attacktype; 1407 arrow->stats.grace = arrow->attacktype;
1604 1408 arrow->custom_name = arrow->slaying;
1605 if (arrow->slaying)
1606 arrow->spellarg = strdup (arrow->slaying);
1607 1409
1608#if 0 1410#if 0
1609 if (player *pl = op->contr) 1411 if (player *pl = op->contr)
1610 { 1412 {
1611 float speed = pl->weapon_sp; 1413 float speed = pl->weapon_sp;
… …
1662 op->play_sound (sound_find ("fire_arrow")); 1464 op->play_sound (sound_find ("fire_arrow"));
1663 m->insert (arrow, sx, sy, op); 1465 m->insert (arrow, sx, sy, op);
1664 1466
1665 if (!arrow->destroyed ()) 1467 if (!arrow->destroyed ())
1666 move_arrow (arrow); 1468 move_arrow (arrow);
1667
1668 if (op->type == PLAYER)
1669 {
1670 if (left->destroyed ())
1671 esrv_del_item (op->contr, left->count);
1672 else
1673 esrv_send_item (op, left);
1674 }
1675 1469
1676 return 1; 1470 return 1;
1677} 1471}
1678 1472
1679/* Special fire code for players - this takes into 1473/* Special fire code for players - this takes into
… …
1684 * hence the function name. 1478 * hence the function name.
1685 */ 1479 */
1686int 1480int
1687player_fire_bow (object *op, int dir) 1481player_fire_bow (object *op, int dir)
1688{ 1482{
1689 int ret = 0, wcmod = 0; 1483 int ret;
1690 1484
1691 if (op->contr->bowtype == bow_bestarrow) 1485 if (op->contr->bowtype == bow_bestarrow)
1692 { 1486 {
1693 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1487 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1694 } 1488 }
1695 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1489 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1696 { 1490 {
1697 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1491 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1698 wcmod = -1;
1699
1700 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1492 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1701 } 1493 }
1702 else if (op->contr->bowtype == bow_threewide) 1494 else if (op->contr->bowtype == bow_threewide)
1703 { 1495 {
1704 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1496 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1705 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1497 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1706 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1498 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1707 } 1499 }
1708 else if (op->contr->bowtype == bow_spreadshot) 1500 else if (op->contr->bowtype == bow_spreadshot)
1709 { 1501 {
1710 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1502 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1711 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1503 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1712 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1504 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1713 } 1505 }
1714 else 1506 else
1715 { 1507 {
… …
1753 return; 1545 return;
1754 } 1546 }
1755 } 1547 }
1756 else if (item->type == ROD || item->type == HORN) 1548 else if (item->type == ROD || item->type == HORN)
1757 { 1549 {
1758 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1550 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1551
1552 // using the maximum of the rods charge allows at least one spell cast
1553 // for a rod or horn, this fixes some broken rods.
1554 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1759 { 1555 {
1760 op->contr->play_sound (sound_find ("wand_poof")); 1556 op->contr->play_sound (sound_find ("wand_poof"));
1761 1557
1762 if (item->type == ROD) 1558 if (item->type == ROD)
1763 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1559 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1768 } 1564 }
1769 } 1565 }
1770 1566
1771 if (cast_spell (op, item, dir, item->inv, NULL)) 1567 if (cast_spell (op, item, dir, item->inv, NULL))
1772 { 1568 {
1773 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1569 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1570
1774 if (item->type == WAND) 1571 if (item->type == WAND)
1775 { 1572 {
1776 if (!(--item->stats.food)) 1573 if (!(--item->stats.food))
1777 { 1574 {
1778 object *tmp; 1575 object *tmp;
… …
1782 CLEAR_FLAG (item, FLAG_ANIMATE); 1579 CLEAR_FLAG (item, FLAG_ANIMATE);
1783 item->face = item->arch->face; 1580 item->face = item->arch->face;
1784 item->set_speed (0); 1581 item->set_speed (0);
1785 } 1582 }
1786 1583
1787 if ((tmp = item->in_player ())) 1584 if (object *pl = item->visible_to ())
1788 esrv_update_item (UPD_ANIM, tmp, item); 1585 esrv_update_item (UPD_ANIM, pl, item);
1789 } 1586 }
1790 } 1587 }
1791 else if (item->type == ROD || item->type == HORN) 1588 else if (item->type == ROD || item->type == HORN)
1792 drain_rod_charge (item); 1589 drain_rod_charge (item);
1793 } 1590 }
… …
1798bool 1595bool
1799fire (object *op, int dir) 1596fire (object *op, int dir)
1800{ 1597{
1801 int spellcost = 0; 1598 int spellcost = 0;
1802 1599
1803 /* check for loss of invisiblity/hide */
1804 if (action_makes_visible (op))
1805 make_visible (op);
1806
1807 player *pl = op->contr; 1600 player *pl = op->contr;
1808 1601
1809 if (pl->golem) 1602 if (pl->golem)
1810 { 1603 {
1811 control_golem (op->contr->golem, dir); 1604 control_golem (op->contr->golem, dir);
… …
1813 } 1606 }
1814 1607
1815 object *ob = pl->ranged_ob; 1608 object *ob = pl->ranged_ob;
1816 1609
1817 if (!ob) 1610 if (!ob)
1818 return false;
1819
1820 if (!op->change_weapon (ob))
1821 return false; 1611 return false;
1822 1612
1823 if (op->speed_left > 0.f) 1613 if (op->speed_left > 0.f)
1824 --op->speed_left; 1614 --op->speed_left;
1825 else 1615 else
1826 return false; 1616 return false;
1827 1617
1618 if (!op->change_weapon (ob))
1619 return false;
1620
1621 /* check for loss of invisiblity/hide */
1622 if (action_makes_visible (op))
1623 make_visible (op);
1624
1828 switch (ob->type) 1625 switch (ob->type)
1829 { 1626 {
1830 case BOW: 1627 case BOW:
1831 player_fire_bow (op, dir); 1628 player_fire_bow (op, dir);
1832 break; 1629 break;
1833 1630
1834 case SPELL: 1631 case SPELL:
1835 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1632 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1836 break; 1633 break;
1837 1634
1838 case BUILDER: 1635 case BUILDER:
1839 apply_map_builder (op, dir); 1636 apply_map_builder (op, dir);
1840 break; 1637 break;
… …
1873 /* First, lets try to find a key in the top level inventory */ 1670 /* First, lets try to find a key in the top level inventory */
1874 for (tmp = container->inv; tmp; tmp = tmp->below) 1671 for (tmp = container->inv; tmp; tmp = tmp->below)
1875 { 1672 {
1876 if (door->type == DOOR && tmp->type == KEY) 1673 if (door->type == DOOR && tmp->type == KEY)
1877 break; 1674 break;
1675
1878 /* For sanity, we should really check door type, but other stuff 1676 /* For sanity, we should really check door type, but other stuff
1879 * (like containers) can be locked with special keys 1677 * (like containers) can be locked with special keys
1880 */ 1678 */
1881 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1679 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1882 break; 1680 break;
… …
1888 * a key, return 1686 * a key, return
1889 */ 1687 */
1890 if (!tmp) 1688 if (!tmp)
1891 { 1689 {
1892 for (tmp = container->inv; tmp; tmp = tmp->below) 1690 for (tmp = container->inv; tmp; tmp = tmp->below)
1893 {
1894 /* No reason to search empty containers */ 1691 /* No reason to search empty containers */
1895 if (tmp->type == CONTAINER && tmp->inv) 1692 if (tmp->type == CONTAINER && tmp->inv)
1896 {
1897 if ((key = find_key (pl, tmp, door))) 1693 if ((key = find_key (pl, tmp, door)))
1898 return key; 1694 return key;
1899 }
1900 }
1901 1695
1902 if (!tmp) 1696 if (!tmp)
1903 return NULL; 1697 return 0;
1904 } 1698 }
1905 1699
1906 /* We get down here if we have found a key. Now if its in a container, 1700 /* We get down here if we have found a key. Now if its in a container,
1907 * see if we actually want to use it 1701 * see if we actually want to use it
1908 */ 1702 */
1909 if (pl != container) 1703 if (pl != container)
1910 { 1704 {
1911 /* Only let players use keys in containers */ 1705 /* Only let players use keys in containers */
1912 if (!pl->contr) 1706 if (!pl->contr)
1913 return NULL; 1707 return 0;
1708
1914 /* cases where this fails: 1709 /* cases where this fails:
1915 * If we only search the player inventory, return now since we 1710 * If we only search the player inventory, return now since we
1916 * are not in the players inventory. 1711 * are not in the players inventory.
1917 * If the container is not active, return now since only active 1712 * If the container is not active, return now since only active
1918 * containers can be used. 1713 * containers can be used.
… …
1924 * Change the color so that the message doesn't disappear with 1719 * Change the color so that the message doesn't disappear with
1925 * all the others. 1720 * all the others.
1926 */ 1721 */
1927 if (pl->contr->usekeys == key_inventory || 1722 if (pl->contr->usekeys == key_inventory ||
1928 !QUERY_FLAG (container, FLAG_APPLIED) || 1723 !QUERY_FLAG (container, FLAG_APPLIED) ||
1929 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1724 (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1930 { 1725 {
1931 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1726 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1932 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1727 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1933 return NULL; 1728 return NULL;
1934 } 1729 }
… …
1969 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN); 1764 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1970 remove_door2 (door); /* remove door without violence ;-) */ 1765 remove_door2 (door); /* remove door without violence ;-) */
1971 } 1766 }
1972 1767
1973 /* Do this after we print the message */ 1768 /* Do this after we print the message */
1974 decrease_ob (key); /* Use up one of the keys */ 1769 key->decrease (); /* Use up one of the keys */
1975 /* Need to update the weight the container the key was in */
1976 if (container != op)
1977 esrv_update_item (UPD_WEIGHT, op, container);
1978 1770
1979 return 1; /* Nothing more to do below */ 1771 return 1; /* Nothing more to do below */
1980 } 1772 }
1981 else if (door->type == LOCKED_DOOR) 1773 else if (door->type == LOCKED_DOOR)
1982 { 1774 {
… …
1995 * going to try and move (not fire weapons). 1787 * going to try and move (not fire weapons).
1996 */ 1788 */
1997bool 1789bool
1998move_player_attack (object *op, int dir) 1790move_player_attack (object *op, int dir)
1999{ 1791{
1792 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1793 {
1794 --op->speed_left;
1795 return true;
1796 }
1797
2000 int on_battleground; 1798 int on_battleground;
2001 1799
2002 sint16 nx = freearr_x[dir] + op->x; 1800 sint16 nx = freearr_x[dir] + op->x;
2003 sint16 ny = freearr_y[dir] + op->y; 1801 sint16 ny = freearr_y[dir] + op->y;
2004 1802
2005 on_battleground = op_on_battleground (op, 0, 0); 1803 on_battleground = op_on_battleground (op, 0, 0);
2006 1804
2007 if (out_of_map (op->map, nx, ny)) 1805 if (out_of_map (op->map, nx, ny))
2008 return false; 1806 return false;
2009
2010 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2011 {
2012 --op->speed_left;
2013 return true;
2014 }
2015 1807
2016 /* If braced, or can't move to the square, and it is not out of the 1808 /* If braced, or can't move to the square, and it is not out of the
2017 * map, attack it. Note order of if statement is important - don't 1809 * map, attack it. Note order of if statement is important - don't
2018 * want to be calling move_ob if braced, because move_ob will move the 1810 * want to be calling move_ob if braced, because move_ob will move the
2019 * player. This is a pretty nasty hack, because if we could 1811 * player. This is a pretty nasty hack, because if we could
… …
2079 --op->speed_left; 1871 --op->speed_left;
2080 1872
2081 op->play_sound (sound_find ("push_player")); 1873 op->play_sound (sound_find ("push_player"));
2082 push_ob (mon, dir, op); 1874 push_ob (mon, dir, op);
2083 1875
2084 if (op->contr->tmp_invis || op->hide) 1876 if (action_makes_visible (op))
2085 make_visible (op); 1877 make_visible (op);
2086 1878
2087 return true; 1879 return true;
2088 } 1880 }
2089 else 1881 else
… …
2111 push_ob (mon, dir, op); 1903 push_ob (mon, dir, op);
2112 } 1904 }
2113 else 1905 else
2114 op->statusmsg ("You withhold your attack"); 1906 op->statusmsg ("You withhold your attack");
2115 1907
2116 if (op->contr->tmp_invis || op->hide) 1908 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2117 make_visible (op); 1909 make_visible (op);
2118 1910
2119 return true; 1911 return true;
2120 } 1912 }
2121 } 1913 }
… …
2163bool 1955bool
2164move_player (object *op, int dir) 1956move_player (object *op, int dir)
2165{ 1957{
2166 int pick; 1958 int pick;
2167 1959
2168 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 1960 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2169 return 0; 1961 return 0;
2170 1962
2171 /* Sanity check: make sure dir is valid */ 1963 /* Sanity check: make sure dir is valid */
2172 if ((dir < 0) || (dir >= 9)) 1964 if ((dir < 0) || (dir >= 9))
2173 { 1965 {
… …
2179 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 1971 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2180 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1972 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2181 1973
2182 op->facing = dir; 1974 op->facing = dir;
2183 1975
2184 if (op->hide) 1976 if (op->flag [FLAG_HIDDEN])
2185 do_hidden_move (op); 1977 do_hidden_move (op);
2186 1978
2187 bool retval; 1979 bool retval;
2188 1980
2189 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 1981 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2261 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2053 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2262 { 2054 {
2263 op->play_sound (sound_find ("ob_evaporate")); 2055 op->play_sound (sound_find ("ob_evaporate"));
2264 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2056 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2265 2057
2266 if (op->contr)
2267 esrv_del_item (op->contr, tmp->count);
2268
2269 tmp->destroy (); 2058 tmp->destroy ();
2270 CLEAR_FLAG (op, FLAG_LIFESAVE); 2059 CLEAR_FLAG (op, FLAG_LIFESAVE);
2271 2060
2272 if (op->stats.hp < 0) 2061 if (op->stats.hp < 0)
2273 op->stats.hp = op->stats.maxhp; 2062 op->stats.hp = op->stats.maxhp;
… …
2285 return 0; 2074 return 0;
2286} 2075}
2287 2076
2288/* This goes throws the inventory and removes unpaid objects, and puts them 2077/* This goes throws the inventory and removes unpaid objects, and puts them
2289 * back in the map (location and map determined by values of env). This 2078 * back in the map (location and map determined by values of env). This
2290 * function will descend into containers. op is the object to start the search 2079 * function will descend into containers. op is the object to start the search
2291 * from. 2080 * from.
2292 */ 2081 */
2293static void 2082static void
2294drop_unpaid_items (object *op, object *env) 2083drop_unpaid_items (object *op, object *env)
2295{ 2084{
2296 while (op) 2085 while (op)
2297 { 2086 {
2298 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2087 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2299 2088
2300 if (QUERY_FLAG (op, FLAG_UNPAID)) 2089 if (QUERY_FLAG (op, FLAG_UNPAID))
2301 {
2302 if (env->type == PLAYER)
2303 esrv_del_item (env->contr, op->count);
2304
2305 op->insert_at (env); 2090 op->insert_at (env);
2306 }
2307 else if (op->inv) 2091 else if (op->inv)
2308 drop_unpaid_items (op->inv, env); 2092 drop_unpaid_items (op->inv, env);
2309 2093
2310 op = next; 2094 op = next;
2311 } 2095 }
… …
2323 * Moved from apply.c to player.c - player.c is what 2107 * Moved from apply.c to player.c - player.c is what
2324 * actually uses this function. player.c may not be quite the 2108 * actually uses this function. player.c may not be quite the
2325 * best, a misc file for object actions is probably better, 2109 * best, a misc file for object actions is probably better,
2326 * but there isn't one in the server directory. 2110 * but there isn't one in the server directory.
2327 */ 2111 */
2328char * 2112const char *
2329gravestone_text (object *op) 2113gravestone_text (object *op)
2330{ 2114{
2331 static char buf2[MAX_BUF]; 2115 static dynbuf_text buf;
2332 char buf[MAX_BUF];
2333 time_t now = time (NULL);
2334 2116
2335 strcpy (buf2, " R.I.P.\n\n"); 2117 buf << "---- R.I.P. ----\n\n"
2118 << op->name;
2119
2336 if (op->type == PLAYER) 2120 if (op->type == PLAYER)
2337 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2121 buf << " the " << op->contr->title;
2338 else
2339 sprintf (buf, "%s\n", &op->name);
2340 2122
2341 strncat (buf2, " ", 20 - strlen (buf) / 2); 2123 buf << "\n\n";
2342 strcat (buf2, buf); 2124
2125 buf << "who was level ";
2126 buf << (sint32)op->level << "\n\n" // OO breakdown
2127 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2128
2343 if (op->type == PLAYER) 2129 if (op->type == PLAYER)
2344 sprintf (buf, "who was in level %d when killed\n", op->level); 2130 buf << "by " << op->contr->killer_name () << ".\n\n";
2345 else
2346 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2347 2131
2348 strncat (buf2, " ", 20 - strlen (buf) / 2);
2349 strcat (buf2, buf);
2350 if (op->type == PLAYER)
2351 { 2132 {
2352 sprintf (buf, "by %s.\n\n", op->contr->killer); 2133 static char buf2[128];
2353 strncat (buf2, " ", 21 - strlen (buf) / 2); 2134 time_t now = time (NULL);
2354 strcat (buf2, buf);
2355 }
2356
2357 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2135 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2358 strncat (buf2, " ", 20 - strlen (buf) / 2); 2136 buf << buf2;
2359 strcat (buf2, buf); 2137 }
2360 2138
2361 return buf2; 2139 return buf;
2362} 2140}
2363 2141
2364void 2142void
2365do_some_living (object *op) 2143do_some_living (object *op)
2366{ 2144{
… …
2521 { 2299 {
2522 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2300 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2523 2301
2524 if (over_hp > 0) 2302 if (over_hp > 0)
2525 { 2303 {
2526 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2304 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2527 op->last_heal = 0; 2305 op->last_heal = 0;
2528 } 2306 }
2529 else 2307 else
2530 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2308 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2531 } 2309 }
… …
2547 op->stats.food--; 2325 op->stats.food--;
2548 } 2326 }
2549 2327
2550 if (op->stats.food < 0 && op->stats.hp >= 0) 2328 if (op->stats.food < 0 && op->stats.hp >= 0)
2551 { 2329 {
2552 object *tmp, *flesh = 0; 2330 object *flesh = 0;
2553 2331
2554 for (tmp = op->inv; tmp; tmp = tmp->below) 2332 for_inv_removable (op, tmp)
2555 { 2333 {
2556 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2334 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2335 continue;
2336
2337 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2557 { 2338 {
2558 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2339 op->statusmsg ("You blindly grab for a bite of food. "
2559 { 2340 "H<To prevent you from starving, you ate some random item from your backpack.>");
2560 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2561 manual_apply (op, tmp, 0); 2341 manual_apply (op, tmp, 0);
2342
2562 if (op->stats.food >= 0 || op->stats.hp < 0) 2343 if (op->stats.food >= 0 || op->stats.hp < 0)
2563 break; 2344 break;
2564 } 2345 }
2565 else if (tmp->type == FLESH) 2346 else if (tmp->type == FLESH)
2566 flesh = tmp; 2347 flesh = tmp;
2567 } /* End if paid for object */ 2348 }
2568 } /* end of for loop */
2569 2349
2570 /* If player is still starving, it means they don't have any food, so 2350 /* If player is still starving, it means they don't have any food, so
2571 * eat flesh instead. 2351 * eat flesh instead.
2572 */ 2352 */
2573 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2353 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2574 { 2354 {
2575 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2355 op->statusmsg ("You blindly grab for a bite of food. "
2356 "H<To prevent you from starving, you ate some random item from your backpack.>");
2576 manual_apply (op, flesh, 0); 2357 manual_apply (op, flesh, 0);
2577 } 2358 }
2359
2360 // If player is still starving, alert him!
2361 if (op->stats.food < 0)
2362 op->failmsg ("You are starving! "
2363 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2578 } 2364 }
2579 2365
2580 if (op->stats.food < 0) 2366 if (op->stats.food < 0)
2581 { 2367 {
2582 op->stats.hp += op->stats.food; 2368 op->stats.hp += op->stats.food;
2583 op->stats.food = 0; 2369 op->stats.food = 0;
2370
2371 if (op->stats.hp < 0)
2372 {
2373 op->contr->killer = archetype::get ("killer_starvation");
2374 op->contr->killer->destroy ();
2584 } 2375 }
2376 }
2585 2377
2378 /* killer should be set here already */
2586 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2379 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2587 kill_player (op); 2380 kill_player (op);
2588 } 2381 }
2589} 2382}
2590 2383
… …
2595 */ 2388 */
2596void 2389void
2597kill_player (object *op) 2390kill_player (object *op)
2598{ 2391{
2599 int x, y; 2392 int x, y;
2600 char buf[MAX_BUF];
2601 maptile *map; /* this is for resurrection */ 2393 maptile *map; /* this is for resurrection */
2602 int will_kill_again; 2394 int will_kill_again;
2603 archetype *at; 2395 archetype *at;
2604 object *tmp; 2396 object *tmp;
2605 2397
2606 if (save_life (op)) 2398 if (save_life (op))
2607 return; 2399 return;
2400
2401 dynbuf_text deathtab;
2402
2403 /* restore player */
2404 at = archetype::find ("poisoning");
2405 if (object *tmp = present_arch_in_ob (at, op))
2406 {
2407 tmp->destroy ();
2408 deathtab << "Your body feels cleansed...\r";
2409 }
2410
2411 at = archetype::find ("confusion");
2412 if (object *tmp = present_arch_in_ob (at, op))
2413 {
2414 tmp->destroy ();
2415 deathtab << "Your mind feels clearer...\r";
2416 }
2417
2418 cure_disease (op, 0, 0); /* remove any disease */
2419
2420 max_it (op->stats.hp , op->stats.maxhp);
2421 max_it (op->stats.sp , op->stats.maxsp);
2422 max_it (op->stats.grace, op->stats.maxgrace);
2423
2424 if (op->stats.food <= 0)
2425 op->stats.food = 999;
2426
2427 // remove all spell effects that are active
2428 // to avoid long-term effects such as word-of-recall
2429 for (object *item = op->inv; item; )
2430 {
2431 object *next = item->below;
2432
2433 if (item->type == SPELL_EFFECT && item->active)
2434 item->destroy ();
2435
2436 item = next;
2437 }
2608 2438
2609 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2439 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2610 * in cities ONLY!!! It is very important that this doesn't get abused. 2440 * in cities ONLY!!! It is very important that this doesn't get abused.
2611 * Look at op_on_battleground() for more info --AndreasV 2441 * Look at op_on_battleground() for more info --AndreasV
2612 */ 2442 */
2613 if (op_on_battleground (op, &x, &y)) 2443 if (op_on_battleground (op, &x, &y))
2614 { 2444 {
2615 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2445 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2616 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2617
2618 /* restore player */
2619 at = archetype::find ("poisoning");
2620 if (object *tmp = present_arch_in_ob (at, op))
2621 {
2622 tmp->destroy ();
2623 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2624 }
2625
2626 at = archetype::find ("confusion");
2627 if (object *tmp = present_arch_in_ob (at, op))
2628 {
2629 tmp->destroy ();
2630 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2631 }
2632
2633 cure_disease (op, 0, 0); /* remove any disease */
2634 op->stats.hp = op->stats.maxhp;
2635 if (op->stats.food <= 0)
2636 op->stats.food = 999;
2637 2446
2638 /* create a bodypart-trophy to make the winner happy */ 2447 /* create a bodypart-trophy to make the winner happy */
2639 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2448 if (object *tmp = arch_to_object (archetype::find ("finger")))
2640 { 2449 {
2641 tmp->name = format ("%s's finger" , &op->name); 2450 tmp->name = format ("%s's finger" , &op->name);
2642 tmp->name_pl = format ("%s's fingers", &op->name); 2451 tmp->name_pl = format ("%s's fingers", &op->name);
2643 tmp->msg = format ( 2452 tmp->msg = format (
2644 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2453 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2645 &op->name, op->contr->title, (int) (op->level), op->contr->killer 2454 &op->name, op->contr->title,
2455 (int)op->level,
2456 op->contr->killer_name ()
2646 ); 2457 );
2647 tmp->value = 0, tmp->type = 0; 2458 tmp->value = 0, tmp->type = 0;
2648 tmp->materialname = "organics"; 2459 tmp->materialname = "organics";
2649 tmp->insert_at (op, tmp); 2460 tmp->insert_at (op, tmp);
2650 } 2461 }
2651 2462
2652 /* teleport defeated player to new destination */ 2463 /* teleport defeated player to new destination */
2653 transfer_ob (op, x, y, 0, NULL); 2464 transfer_ob (op, x, y, 0, NULL);
2654 op->contr->braced = 0; 2465 op->contr->braced = 0;
2466
2467 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2655 return; 2468 return;
2656 } 2469 }
2657 2470
2471 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2472 deathtab << "T<YOU HAVE DIED>\n\n";
2473
2658 INVOKE_PLAYER (DEATH, op->contr); 2474 INVOKE_PLAYER (DEATH, op->contr);
2659 2475
2660 command_kill_pets (op, 0); 2476 command_kill_pets (op, 0);
2661
2662 if (op->stats.food < 0)
2663 strcpy (op->contr->killer, "starvation");
2664 2477
2665 op->contr->play_sound (sound_find ("player_dies")); 2478 op->contr->play_sound (sound_find ("player_dies"));
2666 2479
2667 /* save the map location for corpse, gravestone */ 2480 /* save the map location for corpse, gravestone */
2668 x = op->x; 2481 x = op->x;
… …
2698 2511
2699 lost_a_stat = 0; 2512 lost_a_stat = 0;
2700 2513
2701 for (z = 0; z < num_stats_lose; z++) 2514 for (z = 0; z < num_stats_lose; z++)
2702 { 2515 {
2703 i = RANDOM () % NUM_STATS; 2516 i = rndm (NUM_STATS);
2704 2517
2705 if (settings.stat_loss_on_death) 2518 if (settings.stat_loss_on_death)
2706 { 2519 {
2707 /* Pick a random stat and take a point off it. Tell the player 2520 /* Pick a random stat and take a point off it. Tell the player
2708 * what he lost. 2521 * what he lost.
… …
2759 } 2572 }
2760 } 2573 }
2761 2574
2762 if (lose_this_stat) 2575 if (lose_this_stat)
2763 { 2576 {
2764 this_stat = get_attr_value (&(dep->stats), i); 2577 this_stat = get_attr_value (&dep->stats, i);
2765 /* We could try to do something clever like find another 2578 /* We could try to do something clever like find another
2766 * stat to reduce if this fails. But chances are, if 2579 * stat to reduce if this fails. But chances are, if
2767 * stats have been depleted to -50, all are pretty low 2580 * stats have been depleted to -50, all are pretty low
2768 * and should be roughly the same, so it shouldn't make a 2581 * and should be roughly the same, so it shouldn't make a
2769 * difference. 2582 * difference.
… …
2777 lost_a_stat = 1; 2590 lost_a_stat = 1;
2778 } 2591 }
2779 } 2592 }
2780 } 2593 }
2781 } 2594 }
2595
2782 /* If no stat lost, tell the player. */ 2596 /* If no stat lost, tell the player. */
2783 if (!lost_a_stat) 2597 if (!lost_a_stat)
2784 { 2598 {
2785 /* determine_god() seems to not work sometimes... why is this? 2599 /* determine_god() seems to not work sometimes... why is this?
2786 Should I be using something else? GD */ 2600 Should I be using something else? GD */
2787 const char *god = determine_god (op); 2601 shstr_tmp god = determine_god (op);
2788 2602
2789 if (god && (strcmp (god, "none"))) 2603 if (god != shstr_none)
2790 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2604 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2791 else 2605 else
2792 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2606 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2793 } 2607 }
2794#else 2608#else
2795 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2609 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2796#endif 2610#endif
2797 2611
2798 /* Put a gravestone up where the character 'almost' died. List the 2612 /* Put a gravestone up where the character 'almost' died. List the
2799 * exp loss on the stone. 2613 * exp loss on the stone.
2800 */ 2614 */
2801 tmp = arch_to_object (archetype::find ("gravestone")); 2615 tmp = arch_to_object (archetype::find ("gravestone"));
2802 sprintf (buf, "%s's gravestone", &op->name); 2616 tmp->name = format ("%s's gravestone", &op->name);
2803 tmp->name = buf; 2617 tmp->name_pl = format ("%s's gravestones", &op->name);
2804 sprintf (buf, "%s's gravestones", &op->name); 2618 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2805 tmp->name_pl = buf; 2619 &op->name, op->contr->title, op->contr->killer_name ());
2806 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2807 tmp->msg = buf;
2808 tmp->x = op->x, tmp->y = op->y; 2620 tmp->x = op->x, tmp->y = op->y;
2809 insert_ob_in_map (tmp, op->map, NULL, 0); 2621 insert_ob_in_map (tmp, op->map, NULL, 0);
2810 2622
2811 /**************************************/ 2623 /**************************************/
2812 /* */ 2624 /* */
2813 /* Subtract the experience points, */ 2625 /* Subtract the experience points, */
2814 /* if we died cause of food, give us */
2815 /* food, and reset HP's... */
2816 /* */ 2626 /* */
2817 /**************************************/ 2627 /**************************************/
2818 2628
2819 /* remove any poisoning and confusion the character may be suffering. */
2820 /* restore player */
2821 at = archetype::find ("poisoning");
2822 tmp = present_arch_in_ob (at, op);
2823
2824 if (tmp)
2825 {
2826 tmp->destroy ();
2827 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2828 }
2829
2830 at = archetype::find ("confusion");
2831 tmp = present_arch_in_ob (at, op);
2832 if (tmp)
2833 {
2834 tmp->destroy ();
2835 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2836 }
2837
2838 cure_disease (op, 0, 0); /* remove any disease */
2839
2840 /*add_exp(op, (op->stats.exp * -0.20)); */ 2629 /*add_exp(op, (op->stats.exp * -0.20)); */
2841 apply_death_exp_penalty (op); 2630 apply_death_exp_penalty (op);
2842 if (op->stats.food < 100)
2843 op->stats.food = 900;
2844 op->stats.hp = op->stats.maxhp;
2845 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2846 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2847 2631
2848 /* 2632 /*
2849 * Check to see if the player has any unpaid items. If so, remove them 2633 * Check to see if the player has any unpaid items. If so, remove them
2850 * and put them back in the map. 2634 * and put them back in the map.
2851 */ 2635 */
… …
2886 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2887 force->resist[at] = 100; 2671 force->resist[at] = 100;
2888 2672
2889 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
2890 op->update_stats (); 2674 op->update_stats ();
2891
2892 } 2675 }
2893 2676
2894 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2677 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2895} 2678}
2896 2679
2897void 2680void
2898loot_object (object *op) 2681loot_object (object *op)
2899{ /* Grab and destroy some treasure */ 2682{ /* Grab and destroy some treasure */
… …
2916 2699
2917 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2700 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2918 { 2701 {
2919 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2920 { 2703 {
2921 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2922 tmp2->destroy ();
2923 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
2924 } 2706 }
2925 else 2707 else
2926 tmp->destroy (); 2708 tmp->destroy ();
2927 } 2709 }
… …
2938void 2720void
2939fix_weight (void) 2721fix_weight (void)
2940{ 2722{
2941 for_all_players (pl) 2723 for_all_players (pl)
2942 { 2724 {
2943 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2725 sint32 old = pl->ob->carrying;
2944 2726
2945 if (old == sum) 2727 pl->ob->update_weight ();
2946 continue; 2728
2729 if (old != pl->ob->carrying)
2730 {
2947 pl->ob->update_stats (); 2731 pl->ob->update_stats ();
2948 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2732 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2733 }
2949 } 2734 }
2950} 2735}
2951 2736
2952void 2737void
2953fix_luck (void) 2738fix_luck (void)
… …
2995} 2780}
2996 2781
2997void 2782void
2998make_visible (object *op) 2783make_visible (object *op)
2999{ 2784{
3000 op->hide = 0; 2785 op->flag [FLAG_HIDDEN] = 0;
3001 op->invisible = 0; 2786 op->invisible = 0;
3002 2787
3003 if (op->type == PLAYER) 2788 if (op->type == PLAYER)
3004 { 2789 {
3005 op->contr->tmp_invis = 0; 2790 op->contr->tmp_invis = 0;
… …
3030 2815
3031 if (!ob || !ob->map) 2816 if (!ob || !ob->map)
3032 return 0; 2817 return 0;
3033 2818
3034 /* so, on normal lighted maps, its hard to hide */ 2819 /* so, on normal lighted maps, its hard to hide */
3035 level = ob->map->darkness - 2; 2820 level = ob->map->darklevel () - 2;
3036 2821
3037 /* this also picks up whether the object is glowing. 2822 /* this also picks up whether the object is glowing.
3038 * If you carry a light on a non-dark map, its not 2823 * If you carry a light on a non-dark map, its not
3039 * as bad as carrying a light on a pitch dark map */ 2824 * as bad as carrying a light on a pitch dark map */
3040 if (has_carried_lights (ob)) 2825 if (ob->has_carried_lights ())
3041 level = -(10 + (2 * ob->map->darkness)); 2826 level = -(10 + (2 * ob->map->darklevel ()));
3042 2827
3043 /* scan through all nearby squares for terrain to hide in */ 2828 /* scan through all nearby squares for terrain to hide in */
3044 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2829 for (i = 0, x = ob->x, y = ob->y;
2830 i <= SIZEOFFREE1;
2831 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3045 { 2832 {
3046 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2833 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3047 if (mflag & P_OUT_OF_MAP) 2834 if (mflag & P_OUT_OF_MAP)
3048 {
3049 continue; 2835 continue;
3050 } 2836
3051 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2837 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3052 level += 2; 2838 level += 2;
3053 else /* open terrain! */ 2839 else /* open terrain! */
3054 level -= 1; 2840 level -= 1;
3055 } 2841 }
… …
3066 * spot (surrounded by clear terrain in broad daylight). -b.t. 2852 * spot (surrounded by clear terrain in broad daylight). -b.t.
3067 */ 2853 */
3068void 2854void
3069do_hidden_move (object *op) 2855do_hidden_move (object *op)
3070{ 2856{
3071 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2857 int hide = 0;
3072 object *skop;
3073 2858
3074 if (!op || !op->map) 2859 if (!op || !op->map)
3075 return; 2860 return;
3076 2861
3077 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2862 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2863 int num = random_roll (0, 19, op, PREFER_LOW);
3078 2864
3079 /* its *extremely* hard to run and sneak/hide at the same time! */ 2865 /* its *extremely* hard to run and sneak/hide at the same time! */
3080 if (op->type == PLAYER && op->contr->run_on) 2866 if (op->type == PLAYER && op->contr->run_on)
3081 if (!skop || num >= skop->level) 2867 if (!skop || num >= skop->level)
3082 { 2868 {
… …
3092 num -= hide; 2878 num -= hide;
3093 2879
3094 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2880 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3095 { 2881 {
3096 make_visible (op); 2882 make_visible (op);
2883
3097 if (op->type == PLAYER) 2884 if (op->type == PLAYER)
3098 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2885 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3099 } 2886 }
3100 else if (op->type == PLAYER && skop) 2887 else if (op->type == PLAYER && skop)
3101 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2888 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3191 while (op) 2978 while (op)
3192 { 2979 {
3193 dx = rv.distance_x + op->arch->x; 2980 dx = rv.distance_x + op->arch->x;
3194 dy = rv.distance_y + op->arch->y; 2981 dy = rv.distance_y + op->arch->y;
3195 2982
3196 /* only the viewable area the player sees is updated by LOS 2983 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3197 * code, so we need to restrict ourselves to that range of values
3198 * for any meaningful values.
3199 */
3200 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3201 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3202 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3203 return 1; 2984 return 1;
3204 2985
3205 op = op->more; 2986 op = op->more;
3206 } 2987 }
3207 2988
3208 return 0; 2989 return 0;
3209} 2990}
3210 2991
3211/* routine for both players and monsters. We call this when 2992/* routine for both players and monsters. We call this when
3212 * there is a possibility for our action distrubing our hiding 2993 * there is a possibility for our action distrubing our hiding
3213 * place or invisiblity spell. Artefact invisiblity is not 2994 * place or invisiblity spell. Artefact invisiblity causes
3214 * effected by this. If we arent invisible to begin with, we 2995 * "noise" instead. If we arent invisible to begin with, we
3215 * return 0. 2996 * return 0.
3216 */ 2997 */
3217int 2998int
3218action_makes_visible (object *op) 2999action_makes_visible (object *op)
3219{ 3000{
3220 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3001 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3221 { 3002 {
3222 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3003 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3004 {
3005 // artefact invisibility is permanent, but we still make noise
3006 // this is important for game-balance.
3007 if (op->contr)
3008 op->make_noise ();
3009
3223 return 0; 3010 return 0;
3011 }
3224 3012
3225 if (op->contr && op->contr->tmp_invis == 0) 3013 if (op->contr && op->contr->tmp_invis == 0)
3226 return 0; 3014 return 0;
3227 3015
3228 /* If monsters, they should become visible */ 3016 /* If monsters, they should become visible */
3229 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3017 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3230 { 3018 {
3231 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3019 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3232 return 1; 3020 return 1;
3233 } 3021 }
3234 } 3022 }
3235 3023
3236 return 0; 3024 return 0;
… …
3442 else 3230 else
3443 { 3231 {
3444 /* generate misc. treasure */ 3232 /* generate misc. treasure */
3445 tmp = arch_to_object (tr->item); 3233 tmp = arch_to_object (tr->item);
3446 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3234 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3447 tmp = insert_ob_in_ob (tmp, who); 3235 who->insert (tmp);
3448 if (who->type == PLAYER)
3449 esrv_send_item (who, tmp);
3450 } 3236 }
3451} 3237}
3452 3238
3453/** 3239/**
3454 * Unready an object for a player. This function does nothing if the object was 3240 * Unready an object for a player. This function does nothing if the object was
… …
3466 if (pl->ranged_ob == ob) 3252 if (pl->ranged_ob == ob)
3467 pl->ranged_ob = 0; 3253 pl->ranged_ob = 0;
3468} 3254}
3469 3255
3470sint8 3256sint8
3471player::visibility_at (maptile *map, int x, int y) const 3257player::darkness_at (maptile *map, int x, int y) const
3472{ 3258{
3473 if (!ns) 3259 if (!ns)
3474 return 0; 3260 return LOS_BLOCKED;
3475 3261
3476 int dx, dy; 3262 int dx, dy;
3477 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3263 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3478 return 0; 3264 return LOS_BLOCKED;
3479 3265
3480 x += dx - ns->current_x + ns->mapx / 2; 3266 x += dx - ns->current_x;
3481 y += dy - ns->current_y + ns->mapy / 2; 3267 y += dy - ns->current_y;
3482 3268
3483 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3484 return 0;
3485
3486 return 100 - blocked_los [x][y]; 3269 return blocked_los (x, y);
3487} 3270}
3488 3271
3489void 3272void
3490player::infobox (const char *title, const char *msg, int color) 3273player::infobox (const char *title, const char *msg, int color)
3491{ 3274{

Diff Legend

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