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.169 by root, Sat Sep 1 08:03:45 2007 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 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 // this is important for the player scheduler to get the correct refcount
167 // when ns = 0
168 observe = viewpoint = ob;
169
170 deactivate ();
171}
172
173// the need for this function can be explained
174// by load_object not returning the object
175void
176player::set_object (object *op)
177{
178 ob = observe = viewpoint = op;
179 ob->contr = this; /* this aren't yet in archetype */
180
181 ob->speed = 1.0f;
182 ob->speed_left = 0.5f;
183
184 ob->direction = 5; /* So player faces south */
245 185
246 ob->flag [FLAG_READY_WEAPON] = false; 186 ob->flag [FLAG_READY_WEAPON] = false;
247 ob->flag [FLAG_READY_SKILL] = false; 187 ob->flag [FLAG_READY_SKILL] = false;
248 ob->flag [FLAG_READY_BOW] = false; 188 ob->flag [FLAG_READY_BOW] = false;
249 189
… …
266 combat_ob = op; 206 combat_ob = op;
267 break; 207 break;
268 } 208 }
269 209
270 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 210 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
271 ob->update_stats (); 211 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} 212}
326 213
327void 214void
328player::set_observe (object *op) 215player::set_observe (object *op)
329{ 216{
330 observe = op ? op : ob; 217 observe = viewpoint = op ? op : ob;
218 do_los = 1;
219}
220
221void
222player::set_viewpoint (object *op)
223{
224 viewpoint = op ? op : (object *)observe;
331 do_los = 1; 225 do_los = 1;
332} 226}
333 227
334player::player () 228player::player ()
335{ 229{
… …
343 savebed_map = first_map_path; /* Init. respawn position */ 237 savebed_map = first_map_path; /* Init. respawn position */
344 238
345 gen_sp_armour = 10; 239 gen_sp_armour = 10;
346 bowtype = bow_normal; 240 bowtype = bow_normal;
347 petmode = pet_normal; 241 petmode = pet_normal;
348 listening = 10;
349 usekeys = containers; 242 usekeys = containers;
350 peaceful = 1; /* default peaceful */ 243 peaceful = 1; /* default peaceful */
351 do_los = 1; 244 do_los = 1;
352 245
353 weapon_sp = 1.0f; 246 weapon_sp = 1.0f;
… …
365 { 258 {
366 ob->destroy_inv (false); 259 ob->destroy_inv (false);
367 ob->destroy (); 260 ob->destroy ();
368 } 261 }
369 262
370 ob = observe = 0; 263 ob = observe = viewpoint = 0;
371} 264}
372 265
373player::~player () 266player::~player ()
374{ 267{
375 /* Clear item stack */ 268 /* Clear item stack */
… …
402 * Note: there MUST be at least one player archetype! 295 * Note: there MUST be at least one player archetype!
403 */ 296 */
404archetype * 297archetype *
405get_player_archetype (archetype *at) 298get_player_archetype (archetype *at)
406{ 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
407 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 306 archvec::iterator i = archetypes.find (nat);
408 307
409 for (;;) 308 for (;;)
410 { 309 {
411 if (++i == archetypes.end ()) 310 if (++i == archetypes.end ())
412 i = archetypes.begin (); 311 i = archetypes.begin ();
… …
630 529
631 return firstdir; 530 return firstdir;
632} 531}
633 532
634void 533void
635give_initial_items (object *pl, treasurelist * items) 534give_initial_items (object *pl, treasurelist *items)
636{ 535{
637 object *op, *next = NULL;
638
639 if (pl->randomitems != NULL) 536 if (pl->randomitems)
640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 537 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641 538
642 for (op = pl->inv; op; op = next) 539 for (object *next, *op = pl->inv; op; op = next)
643 { 540 {
644 next = op->below; 541 next = op->below;
645 542
646 /* Forces get applied per default, unless they have the 543 /* Forces get applied per default, unless they have the
647 * flag "neutral" set. Sorry but I can't think of a better way 544 * flag "neutral" set. Sorry but I can't think of a better way
… …
652 /* we never give weapons/armour if these cannot be used 549 /* we never give weapons/armour if these cannot be used
653 * by this player due to race restrictions 550 * by this player due to race restrictions
654 */ 551 */
655 if (pl->type == PLAYER) 552 if (pl->type == PLAYER)
656 { 553 {
657 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 554 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
555 &&
658 (op->type == ARMOUR || op->type == BOOTS || 556 (op->type == ARMOUR || op->type == BOOTS
659 op->type == CLOAK || op->type == HELMET || 557 || op->type == CLOAK || op->type == HELMET
660 op->type == SHIELD || op->type == GLOVES || 558 || op->type == SHIELD || op->type == GLOVES
559 || op->type == BRACERS || op->type == GIRDLE))
661 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 560 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
662 { 561 {
663 op->destroy (); 562 op->destroy ();
664 continue; 563 continue;
665 } 564 }
666 } 565 }
667 566
668 /* This really needs to be better - we should really give 567 /* Here we remove duplicated skills (as duplicated spell objects have
669 * a substitute spellbook. The problem is that we don't really 568 * _very_ confusing effects for players), which could for instance be
670 * have a good idea what to replace it with (need something like 569 * generated by bad treasurelists. - elmex
671 * a first level treasurelist for each skill.)
672 * remove duplicate skills also
673 */ 570 */
674 if (op->type == SPELLBOOK || op->type == SKILL) 571 if (op->type == SKILL)
675 { 572 {
676 object *tmp;
677
678 for (tmp = op->below; tmp; tmp = tmp->below) 573 for (object *tmp = op->below; tmp; tmp = tmp->below)
679 if (tmp->type == op->type && tmp->name == op->name) 574 if (tmp->type == op->type && tmp->name == op->name)
680 break;
681
682 if (tmp)
683 { 575 {
684 op->destroy (); 576 op->destroy ();
577 LOG (llevError,
685 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 578 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
686 continue; 579 break;
687 } 580 }
688 581
689 if (op->nrof > 1) 582 if (op->nrof > 1)
690 op->nrof = 1; 583 op->nrof = 1;
691 } 584 }
692 585
693 if (op->type == SPELLBOOK && op->inv) 586 if (op->type == SPELLBOOK && op->inv)
694 {
695 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 587 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
696 }
697 588
698 /* Give starting characters identified, uncursed, and undamned 589 /* Give starting characters identified, uncursed, and undamned
699 * items. Just don't identify gold or silver, or it won't be 590 * items. Just don't identify gold or silver, or it won't be
700 * merged properly. 591 * merged properly.
701 */ 592 */
702 if (need_identify (op)) 593 if (need_identify (op))
703 { 594 {
704 SET_FLAG (op, FLAG_IDENTIFIED); 595 SET_FLAG (op, FLAG_IDENTIFIED);
705 CLEAR_FLAG (op, FLAG_CURSED); 596 CLEAR_FLAG (op, FLAG_CURSED);
706 CLEAR_FLAG (op, FLAG_DAMNED); 597 CLEAR_FLAG (op, FLAG_DAMNED);
707 } 598 }
599
708 if (op->type == SPELL) 600 if (op->type == SPELL)
709 { 601 {
710 op->destroy (); 602 op->destroy ();
711 continue; 603 continue;
712 } 604 }
… …
714 { 606 {
715 SET_FLAG (op, FLAG_CAN_USE_SKILL); 607 SET_FLAG (op, FLAG_CAN_USE_SKILL);
716 op->stats.exp = 0; 608 op->stats.exp = 0;
717 op->level = 1; 609 op->level = 1;
718 } 610 }
719 /* lock all 'normal items by default */ 611 else /* lock all 'normal items by default */
720 else
721 SET_FLAG (op, FLAG_INV_LOCKED); 612 SET_FLAG (op, FLAG_INV_LOCKED);
722 } /* for loop of objects in player inv */ 613 } /* for loop of objects in player inv */
723 614
724 /* Need to set up the skill pointers */ 615 /* Need to set up the skill pointers */
725 link_player_skills (pl); 616 pl->contr->link_skills ();
726} 617}
727 618
728void 619void
729get_party_password (object *op, partylist *party) 620get_party_password (object *op, partylist *party)
730{ 621{
… …
831static void 722static void
832start_info (object *op) 723start_info (object *op)
833{ 724{
834 char buf[MAX_BUF]; 725 char buf[MAX_BUF];
835 726
836 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 727 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
837 new_draw_info (NDI_UNIQUE, 0, op, buf); 728 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} 729}
841 730
842/* This function takes the key that is passed, and does the 731/* This function takes the key that is passed, and does the
843 * appropriate action with it (change race, or other things). 732 * appropriate action with it (change race, or other things).
844 * The function name is for historical reasons - now we have 733 * The function name is for historical reasons - now we have
… …
847 */ 736 */
848void 737void
849player::chargen_race_done () 738player::chargen_race_done ()
850{ 739{
851 /* this must before then initial items are given */ 740 /* this must before then initial items are given */
852 esrv_new_player (ob->contr, ob->weight + ob->carrying); 741 esrv_new_player (ob->contr);
853 742
854 treasurelist *tl = treasurelist::find ("starting_wealth"); 743 treasurelist *tl = treasurelist::find ("starting_wealth");
855 if (tl) 744 if (tl)
856 create_treasure (tl, ob, 0, 0, 0); 745 create_treasure (tl, ob, 0, 0, 0);
857 746
… …
861 ob->contr->ns->state = ST_PLAYING; 750 ob->contr->ns->state = ST_PLAYING;
862 751
863 if (ob->msg) 752 if (ob->msg)
864 ob->msg = 0; 753 ob->msg = 0;
865 754
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); 755 start_info (ob);
876 CLEAR_FLAG (ob, FLAG_WIZ); 756 CLEAR_FLAG (ob, FLAG_WIZ);
877 give_initial_items (ob, ob->randomitems); 757 give_initial_items (ob, ob->randomitems);
878 link_player_skills (ob);
879 esrv_send_inventory (ob, ob); 758 esrv_send_inventory (ob, ob);
880 ob->update_stats (); 759 ob->update_stats ();
881 760
882 /* This moves the player to a different start map, if there 761 /* This moves the player to a different start map, if there
883 * is one for this race 762 * is one for this race
884 */ 763 */
885 if (*first_map_ext_path) 764 if (*first_map_ext_path)
886 { 765 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 766 else
901 LOG (llevDebug, "first_map_ext_path not set\n"); 767 LOG (llevDebug, "first_map_ext_path not set\n");
902} 768}
903 769
904void 770void
… …
948 LOG (llevDebug, "Fleeing player is dead.\n"); 814 LOG (llevDebug, "Fleeing player is dead.\n");
949 CLEAR_FLAG (op, FLAG_SCARED); 815 CLEAR_FLAG (op, FLAG_SCARED);
950 return; 816 return;
951 } 817 }
952 818
953 if (op->enemy == NULL) 819 if (!op->enemy)
954 { 820 {
955 LOG (llevDebug, "Fleeing player had no enemy.\n"); 821 LOG (llevDebug, "Fleeing player had no enemy.\n");
956 CLEAR_FLAG (op, FLAG_SCARED); 822 CLEAR_FLAG (op, FLAG_SCARED);
957 return; 823 return;
958 } 824 }
959 825
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)) 826 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
972 { 827 {
973 op->enemy = NULL; 828 op->enemy = NULL;
974 CLEAR_FLAG (op, FLAG_SCARED); 829 CLEAR_FLAG (op, FLAG_SCARED);
975 return; 830 return;
… …
978 get_rangevector (op, op->enemy, &rv, 0); 833 get_rangevector (op, op->enemy, &rv, 0);
979 834
980 dir = absdir (4 + rv.direction); 835 dir = absdir (4 + rv.direction);
981 for (diff = 0; diff < 3; diff++) 836 for (diff = 0; diff < 3; diff++)
982 { 837 {
983 int m = 1 - (RANDOM () & 2); 838 int m = 1 - rndm (2) * 2;
984 839
985 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 840 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
986 return; 841 return;
987 } 842 }
988 843
… …
999check_pick (object *op) 854check_pick (object *op)
1000{ 855{
1001 object *tmp, *next; 856 object *tmp, *next;
1002 int stop = 0; 857 int stop = 0;
1003 int wvratio; 858 int wvratio;
1004 char putstring[128];
1005 859
1006 /* if you're flying, you cna't pick up anything */ 860 /* if you're flying, you cna't pick up anything */
1007 if (op->move_type & MOVE_FLYING) 861 if (op->move_type & MOVE_FLYING)
1008 return 1; 862 return 1;
1009 863
1010 next = op->below; 864 next = op->below;
1011 865
866 int cnt = MAX_ITEM_PER_DROP;
867#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868
1012 /* loop while there are items on the floor that are not marked as 869 /* loop while there are items on the floor that are not marked as
1013 * destroyed */ 870 * destroyed */
1014 while (next && !next->destroyed ()) 871 while (next && !next->destroyed ())
1015 { 872 {
1016 tmp = next; 873 tmp = next;
1017 next = tmp->below; 874 next = tmp->below;
1018 875
876 if (cnt <= 0)
877 {
878 op->failmsg ("Couldn't pickup all items at once.");
879 return 0;
880 }
881
1019 if (op->destroyed ()) 882 if (op->destroyed ())
1020 return 0; 883 return 0;
1021 884
1022 if (!can_pick (op, tmp)) 885 if (!can_pick (op, tmp))
1023 continue; 886 continue;
1024 887
1025 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 888 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1026 { 889 {
1027 if (item_matched_string (op, tmp, op->contr->search_str)) 890 if (item_matched_string (op, tmp, op->contr->search_str))
1028 pick_up (op, tmp); 891 CHK_PICK_PICKUP;
892
1029 continue; 893 continue;
1030 } 894 }
1031 895
1032 /* high not bit set? We're using the old autopickup model */ 896 /* pickup handling */
897 if (op->contr->mode & PU_DEBUG)
898 {
899 /* some debugging code to figure out item information */
900 const char *str = tmp->name
901 ? 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))))
903 : 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))));
905
906 new_draw_info (NDI_UNIQUE, 0, op, str);
907 }
908
909 if (op->contr->mode & PU_INHIBIT)
910 return 1;
911
912 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
913 return 1;
914
915 /* philosophy:
916 * It's easy to grab an item type from a pile, as long as it's
917 * generic. This takes no game-time. For more detailed pickups
918 * and selections, select-items should be used. This is a
919 * grab-as-you-run type mode that's really useful for arrows for
920 * example.
921 * The drawback: right now it has no frontend, so you need to
922 * stick the bits you want into a calculator in hex mode and then
923 * convert to decimal and then 'pickup <#>
924 */
925
926 /* the first two modes are exclusive: if NOTHING we return, if
927 * STOP then we stop. All the rest are applied sequentially,
928 * meaning if any test passes, the item gets picked up. */
929
930 /* if mode is set to pick nothing up, return */
931 if (op->contr->mode == PU_NOTHING)
932 return 1;
933
934 /* if mode is set to stop when encountering objects, return */
935 /* take STOP before INHIBIT since it doesn't actually pick
936 * anything up */
937 if (op->contr->mode & PU_STOP)
938 return 0;
939
940 /* useful for going into stores and not losing your settings... */
941 /* and for battles wher you don't want to get loaded down while
942 * fighting */
943 if (op->contr->mode & PU_INHIBIT)
944 return 1;
945
946 /* prevent us from turning into auto-thieves :) */
947 if (QUERY_FLAG (tmp, FLAG_UNPAID))
948 continue;
949
950 /* ignore known cursed objects */
951 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
952 continue;
953
954 /* all food and drink if desired */
955 /* question: don't pick up known-poisonous stuff? */
1033 if (!(op->contr->mode & PU_NEWMODE)) 956 if (op->contr->mode & PU_FOOD)
957 if (tmp->type == FOOD)
1034 { 958 {
1035 switch (op->contr->mode) 959 CHK_PICK_PICKUP;
960 continue;
961 }
962
963 if (op->contr->mode & PU_DRINK)
964 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
965 {
966 CHK_PICK_PICKUP;
967 continue;
968 }
969
970 if (op->contr->mode & PU_POTION)
971 if (tmp->type == POTION)
972 {
973 CHK_PICK_PICKUP;
974 continue;
975 }
976
977 /* spellbooks, skillscrolls and normal books/scrolls */
978 if (op->contr->mode & PU_SPELLBOOK)
979 if (tmp->type == SPELLBOOK)
980 {
981 CHK_PICK_PICKUP;
982 continue;
983 }
984
985 if (op->contr->mode & PU_SKILLSCROLL)
986 if (tmp->type == SKILLSCROLL)
987 {
988 CHK_PICK_PICKUP;
989 continue;
990 }
991
992 if (op->contr->mode & PU_READABLES)
993 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
994 {
995 CHK_PICK_PICKUP;
996 continue;
997 }
998
999 /* wands/staves/rods/horns */
1000 if (op->contr->mode & PU_MAGIC_DEVICE)
1001 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1002 {
1003 CHK_PICK_PICKUP;
1004 continue;
1005 }
1006
1007 /* pick up all magical items */
1008 if (op->contr->mode & PU_MAGICAL)
1009 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1010 {
1011 CHK_PICK_PICKUP;
1012 continue;
1013 }
1014
1015 if (op->contr->mode & PU_VALUABLES)
1016 {
1017 if (tmp->type == MONEY || tmp->type == GEM)
1036 { 1018 {
1037 case 0: 1019 CHK_PICK_PICKUP;
1038 return 1; /* don't pick up */ 1020 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 } 1021 }
1070 } 1022 }
1071 else 1023
1072 { /* old model */ 1024 /* rings & amulets - talismans seems to be typed AMULET */
1073 /* NEW pickup handling */
1074 if (op->contr->mode & PU_DEBUG) 1025 if (op->contr->mode & PU_JEWELS)
1026 if (tmp->type == RING || tmp->type == AMULET)
1075 { 1027 {
1076 /* some debugging code to figure out item information */ 1028 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; 1029 continue;
1030 }
1123 1031
1124 /* ignore known cursed objects */ 1032 /* we don't forget dragon food */
1125 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1033 if (op->contr->mode & PU_FLESH)
1034 if (tmp->type == FLESH)
1035 {
1036 CHK_PICK_PICKUP;
1126 continue; 1037 continue;
1038 }
1127 1039
1128 /* all food and drink if desired */ 1040 /* bows and arrows. Bows are good for selling! */
1129 /* question: don't pick up known-poisonous stuff? */ 1041 if (op->contr->mode & PU_BOW)
1042 if (tmp->type == BOW)
1043 {
1044 CHK_PICK_PICKUP;
1045 continue;
1046 }
1047
1048 if (op->contr->mode & PU_ARROW)
1049 if (tmp->type == ARROW)
1050 {
1051 CHK_PICK_PICKUP;
1052 continue;
1053 }
1054
1055 /* all kinds of armor etc. */
1056 if (op->contr->mode & PU_ARMOUR)
1057 if (tmp->type == ARMOUR)
1058 {
1059 CHK_PICK_PICKUP;
1060 continue;
1061 }
1062
1063 if (op->contr->mode & PU_HELMET)
1064 if (tmp->type == HELMET)
1065 {
1066 CHK_PICK_PICKUP;
1067 continue;
1068 }
1069
1070 if (op->contr->mode & PU_SHIELD)
1071 if (tmp->type == SHIELD)
1072 {
1073 CHK_PICK_PICKUP;
1074 continue;
1075 }
1076
1130 if (op->contr->mode & PU_FOOD) 1077 if (op->contr->mode & PU_BOOTS)
1131 if (tmp->type == FOOD) 1078 if (tmp->type == BOOTS)
1079 {
1080 CHK_PICK_PICKUP;
1081 continue;
1082 }
1083
1084 if (op->contr->mode & PU_GLOVES)
1085 if (tmp->type == GLOVES)
1086 {
1087 CHK_PICK_PICKUP;
1088 continue;
1089 }
1090
1091 if (op->contr->mode & PU_CLOAK)
1092 if (tmp->type == CLOAK)
1093 {
1094 CHK_PICK_PICKUP;
1095 continue;
1096 }
1097
1098 /* hoping to catch throwing daggers here */
1099 if (op->contr->mode & PU_MISSILEWEAPON)
1100 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1101 {
1102 CHK_PICK_PICKUP;
1103 continue;
1104 }
1105
1106 /* careful: chairs and tables are weapons! */
1107 if (op->contr->mode & PU_ALLWEAPON)
1108 {
1109 if (tmp->type == WEAPON)
1110 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1132 { 1111 {
1133 pick_up (op, tmp); 1112 CHK_PICK_PICKUP;
1134 continue; 1113 continue;
1135 } 1114 }
1115 }
1136 1116
1117 /* misc stuff that's useful */
1137 if (op->contr->mode & PU_DRINK) 1118 if (op->contr->mode & PU_KEY)
1138 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1119 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1139 { 1120 {
1140 pick_up (op, tmp); 1121 CHK_PICK_PICKUP;
1141 continue; 1122 continue;
1142 } 1123 }
1143 1124
1125 /* any of the last 4 bits set means we use the ratio for value
1126 * pickups */
1144 if (op->contr->mode & PU_POTION) 1127 if (op->contr->mode & PU_RATIO)
1145 if (tmp->type == POTION) 1128 {
1129 /* use value density to decide what else to grab */
1130 /* >=7 was >= op->contr->mode */
1131 /* >=7 is the old standard setting. Now we take the last 4 bits
1146 { 1132 */
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) 1133 wvratio = op->contr->mode & PU_RATIO;
1183 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1134 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 { 1135 {
1191 if (tmp->type == MONEY || tmp->type == GEM) 1136#if 0
1137 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1138 if (tmp->name != NULL)
1192 { 1139 {
1193 pick_up (op, tmp); 1140 fprintf (stderr, "%s", tmp->name);
1194 continue;
1195 } 1141 }
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 1142 else
1330 fprintf (stderr, "%s", tmp->arch->archname); 1143 fprintf (stderr, "%s", tmp->arch->archname);
1331 fprintf (stderr, ",%d] = ", tmp->type); 1144 fprintf (stderr, ",%d] = ", tmp->type);
1332 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1145 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1333#endif 1146#endif
1147 CHK_PICK_PICKUP;
1334 continue; 1148 continue;
1335 }
1336 } 1149 }
1337 } /* the new pickup model */ 1150 } /* the new pickup model */
1338 } 1151 }
1339 1152
1340 return !stop; 1153 return !stop;
… …
1346 * found object is returned. 1159 * found object is returned.
1347 */ 1160 */
1348object * 1161object *
1349find_arrow (object *op, const char *type) 1162find_arrow (object *op, const char *type)
1350{ 1163{
1351 object *tmp = 0;
1352
1353 for (op = op->inv; op; op = op->below) 1164 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) 1165 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1166 return splay (tmp);
1167
1168 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1169 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1170 if (object *arrow = find_arrow (tmp, type))
1171 {
1172 splay (tmp);
1357 return op; 1173 return arrow;
1174 }
1358 1175
1359 return tmp; 1176 return 0;
1360} 1177}
1361 1178
1362/* 1179/*
1363 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1180 * 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 1181 * 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 1182 * 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. 1183 * the hall. Failing that it does it's best to pick the highest plus arrow.
1367 */ 1184 */
1368object * 1185object *
1369find_better_arrow (object *op, object *target, const char *type, int *better) 1186find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1370{ 1187{
1371 object *tmp = NULL, *arrow, *ntmp; 1188 object *tmp = NULL, *arrow, *ntmp;
1372 int attacknum, attacktype, betterby = 0, i; 1189 int attacknum, attacktype, betterby = 0, i;
1373 1190
1374 if (!type) 1191 if (!type)
… …
1378 { 1195 {
1379 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1196 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1380 { 1197 {
1381 i = 0; 1198 i = 0;
1382 ntmp = find_better_arrow (arrow, target, type, &i); 1199 ntmp = find_better_arrow (arrow, target, type, &i);
1200
1383 if (i > betterby) 1201 if (i > betterby)
1384 { 1202 {
1385 tmp = ntmp; 1203 tmp = ntmp;
1386 betterby = i; 1204 betterby = i;
1387 } 1205 }
1388 } 1206 }
1389 else if (arrow->type == ARROW && arrow->race == type) 1207 else if (arrow->type == ARROW && arrow->race == type)
1390 { 1208 {
1391 /* allways prefer assasination/slaying */ 1209 /* allways prefer assasination/slaying */
1392 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1210 if (target->race && arrow->slaying.contains (target->race))
1393 { 1211 {
1394 if (arrow->attacktype & AT_DEATH) 1212 if (arrow->attacktype & AT_DEATH)
1395 { 1213 {
1396 *better = 100; 1214 *better = 100;
1397 return arrow; 1215 return arrow;
… …
1412 { 1230 {
1413 tmp = arrow; 1231 tmp = arrow;
1414 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1232 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1415 } 1233 }
1416 } 1234 }
1235
1417 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1236 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1418 { 1237 {
1419 tmp = arrow; 1238 tmp = arrow;
1420 betterby = 2 + arrow->magic + arrow->stats.dam; 1239 betterby = 2 + arrow->magic + arrow->stats.dam;
1421 } 1240 }
1241
1422 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1242 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1423 { 1243 {
1424 tmp = arrow; 1244 tmp = arrow;
1425 betterby = 1 + arrow->magic + arrow->stats.dam; 1245 betterby = 1 + arrow->magic + arrow->stats.dam;
1426 } 1246 }
1427 } 1247 }
1428 } 1248 }
1429 } 1249 }
1250
1430 if (tmp == NULL && arrow == NULL) 1251 if (tmp == NULL && arrow == NULL)
1431 return find_arrow (op, type); 1252 return find_arrow (op, type);
1432 1253
1433 *better = betterby; 1254 *better = betterby;
1434 return tmp; 1255 return tmp;
… …
1439 * op = the shooter 1260 * op = the shooter
1440 * type = bow->race 1261 * type = bow->race
1441 * dir = fire direction 1262 * dir = fire direction
1442 */ 1263 */
1443object * 1264object *
1444pick_arrow_target (object *op, const char *type, int dir) 1265pick_arrow_target (object *op, shstr_cmp type, int dir)
1445{ 1266{
1446 object *tmp = NULL; 1267 object *tmp = NULL;
1447 maptile *m; 1268 maptile *m;
1448 int i, mflags, found, number; 1269 int i, mflags, found, number;
1449 sint16 x, y; 1270 sint16 x, y;
… …
1464 for (i = 0, found = 0; i < 20; i++) 1285 for (i = 0, found = 0; i < 20; i++)
1465 { 1286 {
1466 x += freearr_x[dir]; 1287 x += freearr_x[dir];
1467 y += freearr_y[dir]; 1288 y += freearr_y[dir];
1468 mflags = get_map_flags (m, &m, x, y, &x, &y); 1289 mflags = get_map_flags (m, &m, x, y, &x, &y);
1290
1469 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1291 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1470 { 1292 {
1471 tmp = NULL; 1293 tmp = 0;
1472 break; 1294 break;
1473 } 1295 }
1474 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1296 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1475 { 1297 {
1476 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1298 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1477 * perhaps a bad assumption. 1299 * perhaps a bad assumption.
1478 */ 1300 */
1479 tmp = NULL; 1301 tmp = 0;
1480 break; 1302 break;
1481 } 1303 }
1304
1482 if (mflags & P_IS_ALIVE) 1305 if (mflags & P_IS_ALIVE)
1483 {
1484 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1306 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1485 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1307 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1486 {
1487 found++;
1488 break;
1489 }
1490 if (found)
1491 break; 1308 break;
1492 }
1493 } 1309 }
1494 if (tmp == NULL) 1310
1311 if (!tmp)
1495 return find_arrow (op, type); 1312 return find_arrow (op, type);
1496 1313
1497 if (tmp->head) 1314 if (tmp->head)
1498 tmp = tmp->head; 1315 tmp = tmp->head;
1499 1316
… …
1539 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1356 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1540 return 0; 1357 return 0;
1541 } 1358 }
1542 1359
1543 // optimisation: move object to top so we will find it quickly again 1360 // optimisation: move object to top so we will find it quickly again
1544 if (bow->below) 1361 splay (bow);
1545 {
1546 bow->remove ();
1547 op->insert (bow);
1548 }
1549
1550 } 1362 }
1551 1363
1552 if (!bow->race || !bow->skill) 1364 if (!bow->race || !bow->skill)
1553 { 1365 {
1554 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1366 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1580 } 1392 }
1581 1393
1582 /* this should not happen, but sometimes does */ 1394 /* this should not happen, but sometimes does */
1583 if (arrow->nrof == 0) 1395 if (arrow->nrof == 0)
1584 { 1396 {
1397 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1585 arrow->destroy (); 1398 arrow->destroy ();
1586 return 0; 1399 return 0;
1587 } 1400 }
1588 1401
1589 left = arrow; /* these are arrows left to the player */ 1402 left = arrow; /* these are arrows left to the player */
1590 arrow = get_split_ob (arrow, 1); 1403 arrow = arrow->split ();
1591 if (!arrow) 1404 if (!arrow)
1592 { 1405 {
1593 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1406 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1594 return 0; 1407 return 0;
1595 } 1408 }
… …
1599 arrow->direction = dir; 1412 arrow->direction = dir;
1600 1413
1601 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1414 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1602 arrow->stats.hp = arrow->stats.dam; 1415 arrow->stats.hp = arrow->stats.dam;
1603 arrow->stats.grace = arrow->attacktype; 1416 arrow->stats.grace = arrow->attacktype;
1604 1417 arrow->custom_name = arrow->slaying;
1605 if (arrow->slaying)
1606 arrow->spellarg = strdup (arrow->slaying);
1607 1418
1608#if 0 1419#if 0
1609 if (player *pl = op->contr) 1420 if (player *pl = op->contr)
1610 { 1421 {
1611 float speed = pl->weapon_sp; 1422 float speed = pl->weapon_sp;
… …
1662 op->play_sound (sound_find ("fire_arrow")); 1473 op->play_sound (sound_find ("fire_arrow"));
1663 m->insert (arrow, sx, sy, op); 1474 m->insert (arrow, sx, sy, op);
1664 1475
1665 if (!arrow->destroyed ()) 1476 if (!arrow->destroyed ())
1666 move_arrow (arrow); 1477 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 1478
1676 return 1; 1479 return 1;
1677} 1480}
1678 1481
1679/* Special fire code for players - this takes into 1482/* Special fire code for players - this takes into
… …
1684 * hence the function name. 1487 * hence the function name.
1685 */ 1488 */
1686int 1489int
1687player_fire_bow (object *op, int dir) 1490player_fire_bow (object *op, int dir)
1688{ 1491{
1689 int ret = 0, wcmod = 0; 1492 int ret;
1690 1493
1691 if (op->contr->bowtype == bow_bestarrow) 1494 if (op->contr->bowtype == bow_bestarrow)
1692 { 1495 {
1693 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1496 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1694 } 1497 }
1695 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1498 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1696 { 1499 {
1697 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1500 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); 1501 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1701 } 1502 }
1702 else if (op->contr->bowtype == bow_threewide) 1503 else if (op->contr->bowtype == bow_threewide)
1703 { 1504 {
1704 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1505 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)]); 1506 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)]); 1507 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1707 } 1508 }
1708 else if (op->contr->bowtype == bow_spreadshot) 1509 else if (op->contr->bowtype == bow_spreadshot)
1709 { 1510 {
1710 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1511 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); 1512 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); 1513 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1713 } 1514 }
1714 else 1515 else
1715 { 1516 {
… …
1753 return; 1554 return;
1754 } 1555 }
1755 } 1556 }
1756 else if (item->type == ROD || item->type == HORN) 1557 else if (item->type == ROD || item->type == HORN)
1757 { 1558 {
1758 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1559 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1560
1561 // using the maximum of the rods charge allows at least one spell cast
1562 // for a rod or horn, this fixes some broken rods.
1563 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1759 { 1564 {
1760 op->contr->play_sound (sound_find ("wand_poof")); 1565 op->contr->play_sound (sound_find ("wand_poof"));
1761 1566
1762 if (item->type == ROD) 1567 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)); 1568 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1768 } 1573 }
1769 } 1574 }
1770 1575
1771 if (cast_spell (op, item, dir, item->inv, NULL)) 1576 if (cast_spell (op, item, dir, item->inv, NULL))
1772 { 1577 {
1773 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1578 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1579
1774 if (item->type == WAND) 1580 if (item->type == WAND)
1775 { 1581 {
1776 if (!(--item->stats.food)) 1582 if (!(--item->stats.food))
1777 { 1583 {
1778 object *tmp; 1584 object *tmp;
… …
1782 CLEAR_FLAG (item, FLAG_ANIMATE); 1588 CLEAR_FLAG (item, FLAG_ANIMATE);
1783 item->face = item->arch->face; 1589 item->face = item->arch->face;
1784 item->set_speed (0); 1590 item->set_speed (0);
1785 } 1591 }
1786 1592
1787 if ((tmp = item->in_player ())) 1593 if (object *pl = item->visible_to ())
1788 esrv_update_item (UPD_ANIM, tmp, item); 1594 esrv_update_item (UPD_ANIM, pl, item);
1789 } 1595 }
1790 } 1596 }
1791 else if (item->type == ROD || item->type == HORN) 1597 else if (item->type == ROD || item->type == HORN)
1792 drain_rod_charge (item); 1598 drain_rod_charge (item);
1793 } 1599 }
… …
1798bool 1604bool
1799fire (object *op, int dir) 1605fire (object *op, int dir)
1800{ 1606{
1801 int spellcost = 0; 1607 int spellcost = 0;
1802 1608
1803 /* check for loss of invisiblity/hide */
1804 if (action_makes_visible (op))
1805 make_visible (op);
1806
1807 player *pl = op->contr; 1609 player *pl = op->contr;
1808 1610
1809 if (pl->golem) 1611 if (pl->golem)
1810 { 1612 {
1811 control_golem (op->contr->golem, dir); 1613 control_golem (op->contr->golem, dir);
… …
1813 } 1615 }
1814 1616
1815 object *ob = pl->ranged_ob; 1617 object *ob = pl->ranged_ob;
1816 1618
1817 if (!ob) 1619 if (!ob)
1818 return false;
1819
1820 if (!op->change_weapon (ob))
1821 return false; 1620 return false;
1822 1621
1823 if (op->speed_left > 0.f) 1622 if (op->speed_left > 0.f)
1824 --op->speed_left; 1623 --op->speed_left;
1825 else 1624 else
1826 return false; 1625 return false;
1827 1626
1627 if (!op->change_weapon (ob))
1628 return false;
1629
1630 /* check for loss of invisiblity/hide */
1631 if (action_makes_visible (op))
1632 make_visible (op);
1633
1828 switch (ob->type) 1634 switch (ob->type)
1829 { 1635 {
1830 case BOW: 1636 case BOW:
1831 player_fire_bow (op, dir); 1637 player_fire_bow (op, dir);
1832 break; 1638 break;
1833 1639
1834 case SPELL: 1640 case SPELL:
1835 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1641 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1836 break; 1642 break;
1837 1643
1838 case BUILDER: 1644 case BUILDER:
1839 apply_map_builder (op, dir); 1645 apply_map_builder (op, dir);
1840 break; 1646 break;
… …
1849 } 1655 }
1850 1656
1851 return true; 1657 return true;
1852} 1658}
1853 1659
1854/* find_key 1660static object *
1855 * We try to find a key for the door as passed. If we find a key
1856 * and successfully use it, we return the key, otherwise NULL
1857 * This function merges both normal and locked door, since the logic
1858 * for both is the same - just the specific key is different.
1859 * pl is the player,
1860 * inv is the objects inventory to searched
1861 * door is the door we are trying to match against.
1862 * This function can be called recursively to search containers.
1863 */
1864object *
1865find_key (object *pl, object *container, object *door) 1661find_key_ (object *pl, object *container, object *door)
1866{ 1662{
1867 object *tmp, *key; 1663 object *tmp, *key;
1868 1664
1869 /* Should not happen, but sanity checking is never bad */ 1665 /* Should not happen, but sanity checking is never bad */
1870 if (!container->inv) 1666 if (!container->inv)
… …
1873 /* First, lets try to find a key in the top level inventory */ 1669 /* First, lets try to find a key in the top level inventory */
1874 for (tmp = container->inv; tmp; tmp = tmp->below) 1670 for (tmp = container->inv; tmp; tmp = tmp->below)
1875 { 1671 {
1876 if (door->type == DOOR && tmp->type == KEY) 1672 if (door->type == DOOR && tmp->type == KEY)
1877 break; 1673 break;
1674
1878 /* For sanity, we should really check door type, but other stuff 1675 /* For sanity, we should really check door type, but other stuff
1879 * (like containers) can be locked with special keys 1676 * (like containers) can be locked with special keys
1880 */ 1677 */
1881 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1678 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1882 break; 1679 break;
… …
1888 * a key, return 1685 * a key, return
1889 */ 1686 */
1890 if (!tmp) 1687 if (!tmp)
1891 { 1688 {
1892 for (tmp = container->inv; tmp; tmp = tmp->below) 1689 for (tmp = container->inv; tmp; tmp = tmp->below)
1893 {
1894 /* No reason to search empty containers */ 1690 /* No reason to search empty containers */
1895 if (tmp->type == CONTAINER && tmp->inv) 1691 if (tmp->type == CONTAINER && tmp->inv)
1896 {
1897 if ((key = find_key (pl, tmp, door))) 1692 if ((key = find_key_ (pl, tmp, door)))
1898 return key; 1693 return key;
1899 }
1900 }
1901 1694
1902 if (!tmp) 1695 if (!tmp)
1903 return NULL; 1696 return 0;
1904 } 1697 }
1905 1698
1906 /* We get down here if we have found a key. Now if its in a container, 1699 /* 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 1700 * see if we actually want to use it
1908 */ 1701 */
1909 if (pl != container) 1702 if (pl != container)
1910 { 1703 {
1911 /* Only let players use keys in containers */ 1704 /* Only let players use keys in containers */
1912 if (!pl->contr) 1705 if (!pl->contr)
1913 return NULL; 1706 return 0;
1707
1914 /* cases where this fails: 1708 /* cases where this fails:
1915 * If we only search the player inventory, return now since we 1709 * If we only search the player inventory, return now since we
1916 * are not in the players inventory. 1710 * are not in the players inventory.
1917 * If the container is not active, return now since only active 1711 * If the container is not active, return now since only active
1918 * containers can be used. 1712 * containers can be used.
… …
1922 * inv must have been an container and must have been active. 1716 * inv must have been an container and must have been active.
1923 * 1717 *
1924 * Change the color so that the message doesn't disappear with 1718 * Change the color so that the message doesn't disappear with
1925 * all the others. 1719 * all the others.
1926 */ 1720 */
1927 if (pl->contr->usekeys == key_inventory || 1721 if (pl->contr->usekeys == key_inventory
1928 !QUERY_FLAG (container, FLAG_APPLIED) || 1722 || !QUERY_FLAG (container, FLAG_APPLIED)
1929 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1723 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1930 { 1724 {
1931 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1725 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)); 1726 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1933 return NULL; 1727 return NULL;
1934 } 1728 }
1935 } 1729 }
1936 1730
1937 return tmp; 1731 return tmp;
1732}
1733
1734/* find_key
1735 * We try to find a key for the door as passed. If we find a key
1736 * and successfully use it, we return the key, otherwise NULL
1737 * This function merges both normal and locked door, since the logic
1738 * for both is the same - just the specific key is different.
1739 * pl is the player,
1740 * inv is the objects inventory to searched
1741 * door is the door we are trying to match against.
1742 * This function can be called recursively to search containers.
1743 */
1744object *
1745find_key (object *pl, object *container, object *door)
1746{
1747 if (door->slaying && is_match_expr (door->slaying))
1748 {
1749 // for match expressions, we try to find the key by applying the match
1750 // to the op itself, which is supposed to find the "key", instead
1751 // of searching through containers ourselves.
1752
1753 return match_one (door->slaying, container, door, pl, pl);
1754 }
1755 else
1756 return find_key_ (pl, container, door);
1938} 1757}
1939 1758
1940/* moved door processing out of move_player_attack. 1759/* moved door processing out of move_player_attack.
1941 * returns 1 if player has opened the door with a key 1760 * returns 1 if player has opened the door with a key
1942 * such that the caller should not do anything more, 1761 * such that the caller should not do anything more,
… …
1964 1783
1965 if (door->type == DOOR) 1784 if (door->type == DOOR)
1966 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1785 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1967 else if (door->type == LOCKED_DOOR) 1786 else if (door->type == LOCKED_DOOR)
1968 { 1787 {
1969 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1788 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1970 remove_door2 (door); /* remove door without violence ;-) */ 1789 remove_door2 (door); /* remove door without violence ;-) */
1971 } 1790 }
1972 1791
1973 /* Do this after we print the message */ 1792 /* Do this after we print the message */
1974 decrease_ob (key); /* Use up one of the keys */ 1793 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 1794
1979 return 1; /* Nothing more to do below */ 1795 return 1; /* Nothing more to do below */
1980 } 1796 }
1981 else if (door->type == LOCKED_DOOR) 1797 else if (door->type == LOCKED_DOOR)
1982 { 1798 {
1983 /* Might as well return now - no other way to open this */ 1799 /* Might as well return now - no other way to open this */
1984 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1800 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
1985 return 1; 1801 return 1;
1986 } 1802 }
1987 1803
1988 return 0; 1804 return 0;
1989} 1805}
… …
1995 * going to try and move (not fire weapons). 1811 * going to try and move (not fire weapons).
1996 */ 1812 */
1997bool 1813bool
1998move_player_attack (object *op, int dir) 1814move_player_attack (object *op, int dir)
1999{ 1815{
1816 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1817 {
1818 --op->speed_left;
1819 return true;
1820 }
1821
2000 int on_battleground; 1822 int on_battleground;
2001 1823
2002 sint16 nx = freearr_x[dir] + op->x; 1824 sint16 nx = freearr_x[dir] + op->x;
2003 sint16 ny = freearr_y[dir] + op->y; 1825 sint16 ny = freearr_y[dir] + op->y;
2004 1826
2005 on_battleground = op_on_battleground (op, 0, 0); 1827 on_battleground = op_on_battleground (op, 0, 0);
2006 1828
2007 if (out_of_map (op->map, nx, ny)) 1829 if (out_of_map (op->map, nx, ny))
2008 return false; 1830 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 1831
2016 /* If braced, or can't move to the square, and it is not out of the 1832 /* 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 1833 * 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 1834 * 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 1835 * player. This is a pretty nasty hack, because if we could
… …
2079 --op->speed_left; 1895 --op->speed_left;
2080 1896
2081 op->play_sound (sound_find ("push_player")); 1897 op->play_sound (sound_find ("push_player"));
2082 push_ob (mon, dir, op); 1898 push_ob (mon, dir, op);
2083 1899
2084 if (op->contr->tmp_invis || op->hide) 1900 if (action_makes_visible (op))
2085 make_visible (op); 1901 make_visible (op);
2086 1902
2087 return true; 1903 return true;
2088 } 1904 }
2089 else 1905 else
… …
2109 { 1925 {
2110 op->play_sound (sound_find ("push_player")); 1926 op->play_sound (sound_find ("push_player"));
2111 push_ob (mon, dir, op); 1927 push_ob (mon, dir, op);
2112 } 1928 }
2113 else 1929 else
2114 new_draw_info (0, 0, op, "You withhold your attack"); 1930 op->statusmsg ("You withhold your attack");
2115 1931
2116 if (op->contr->tmp_invis || op->hide) 1932 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2117 make_visible (op); 1933 make_visible (op);
2118 1934
2119 return true; 1935 return true;
2120 } 1936 }
2121 } 1937 }
… …
2163bool 1979bool
2164move_player (object *op, int dir) 1980move_player (object *op, int dir)
2165{ 1981{
2166 int pick; 1982 int pick;
2167 1983
2168 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 1984 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2169 return 0; 1985 return 0;
2170 1986
2171 /* Sanity check: make sure dir is valid */ 1987 /* Sanity check: make sure dir is valid */
2172 if ((dir < 0) || (dir >= 9)) 1988 if ((dir < 0) || (dir >= 9))
2173 { 1989 {
… …
2179 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 1995 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2180 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1996 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2181 1997
2182 op->facing = dir; 1998 op->facing = dir;
2183 1999
2184 if (op->hide) 2000 if (op->flag [FLAG_HIDDEN])
2185 do_hidden_move (op); 2001 do_hidden_move (op);
2186 2002
2187 bool retval; 2003 bool retval;
2188 2004
2189 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2005 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2261 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2077 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2262 { 2078 {
2263 op->play_sound (sound_find ("ob_evaporate")); 2079 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)); 2080 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2265 2081
2266 if (op->contr)
2267 esrv_del_item (op->contr, tmp->count);
2268
2269 tmp->destroy (); 2082 tmp->destroy ();
2270 CLEAR_FLAG (op, FLAG_LIFESAVE); 2083 CLEAR_FLAG (op, FLAG_LIFESAVE);
2271 2084
2272 if (op->stats.hp < 0) 2085 if (op->stats.hp < 0)
2273 op->stats.hp = op->stats.maxhp; 2086 op->stats.hp = op->stats.maxhp;
… …
2285 return 0; 2098 return 0;
2286} 2099}
2287 2100
2288/* This goes throws the inventory and removes unpaid objects, and puts them 2101/* 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 2102 * 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 2103 * function will descend into containers. op is the object to start the search
2291 * from. 2104 * from.
2292 */ 2105 */
2293static void 2106static void
2294drop_unpaid_items (object *op, object *env) 2107drop_unpaid_items (object *op, object *env)
2295{ 2108{
2296 while (op) 2109 while (op)
2297 { 2110 {
2298 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2111 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2299 2112
2300 if (QUERY_FLAG (op, FLAG_UNPAID)) 2113 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); 2114 op->insert_at (env);
2306 }
2307 else if (op->inv) 2115 else if (op->inv)
2308 drop_unpaid_items (op->inv, env); 2116 drop_unpaid_items (op->inv, env);
2309 2117
2310 op = next; 2118 op = next;
2311 } 2119 }
… …
2323 * Moved from apply.c to player.c - player.c is what 2131 * Moved from apply.c to player.c - player.c is what
2324 * actually uses this function. player.c may not be quite the 2132 * actually uses this function. player.c may not be quite the
2325 * best, a misc file for object actions is probably better, 2133 * best, a misc file for object actions is probably better,
2326 * but there isn't one in the server directory. 2134 * but there isn't one in the server directory.
2327 */ 2135 */
2328char * 2136const char *
2329gravestone_text (object *op) 2137gravestone_text (object *op)
2330{ 2138{
2331 static char buf2[MAX_BUF]; 2139 static dynbuf_text buf;
2332 char buf[MAX_BUF];
2333 time_t now = time (NULL);
2334 2140
2335 strcpy (buf2, " R.I.P.\n\n"); 2141 buf << "---- R.I.P. ----\n\n"
2142 << op->name;
2143
2336 if (op->type == PLAYER) 2144 if (op->type == PLAYER)
2337 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2145 buf << " the " << op->contr->title;
2338 else
2339 sprintf (buf, "%s\n", &op->name);
2340 2146
2341 strncat (buf2, " ", 20 - strlen (buf) / 2); 2147 buf << "\n\n";
2342 strcat (buf2, buf); 2148
2149 buf << "who was level ";
2150 buf << (sint32)op->level << "\n\n" // OO breakdown
2151 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2152
2343 if (op->type == PLAYER) 2153 if (op->type == PLAYER)
2344 sprintf (buf, "who was in level %d when killed\n", op->level); 2154 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 2155
2348 strncat (buf2, " ", 20 - strlen (buf) / 2);
2349 strcat (buf2, buf);
2350 if (op->type == PLAYER)
2351 { 2156 {
2352 sprintf (buf, "by %s.\n\n", op->contr->killer); 2157 static char buf2[128];
2353 strncat (buf2, " ", 21 - strlen (buf) / 2); 2158 time_t now = time (NULL);
2354 strcat (buf2, buf);
2355 }
2356
2357 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2159 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2358 strncat (buf2, " ", 20 - strlen (buf) / 2); 2160 buf << buf2;
2359 strcat (buf2, buf); 2161 }
2360 2162
2361 return buf2; 2163 return buf;
2362} 2164}
2363 2165
2364void 2166void
2365do_some_living (object *op) 2167do_some_living (object *op)
2366{ 2168{
… …
2521 { 2323 {
2522 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2324 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2523 2325
2524 if (over_hp > 0) 2326 if (over_hp > 0)
2525 { 2327 {
2526 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2328 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2527 op->last_heal = 0; 2329 op->last_heal = 0;
2528 } 2330 }
2529 else 2331 else
2530 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2332 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2531 } 2333 }
… …
2547 op->stats.food--; 2349 op->stats.food--;
2548 } 2350 }
2549 2351
2550 if (op->stats.food < 0 && op->stats.hp >= 0) 2352 if (op->stats.food < 0 && op->stats.hp >= 0)
2551 { 2353 {
2552 object *tmp, *flesh = 0; 2354 object *flesh = 0;
2553 2355
2554 for (tmp = op->inv; tmp; tmp = tmp->below) 2356 for_inv_removable (op, tmp)
2555 { 2357 {
2556 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2358 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2359 continue;
2360
2361 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2557 { 2362 {
2558 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2363 op->statusmsg ("You blindly grab for a bite of food. "
2559 { 2364 "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); 2365 manual_apply (op, tmp, 0);
2366
2562 if (op->stats.food >= 0 || op->stats.hp < 0) 2367 if (op->stats.food >= 0 || op->stats.hp < 0)
2563 break; 2368 break;
2564 } 2369 }
2565 else if (tmp->type == FLESH) 2370 else if (tmp->type == FLESH)
2566 flesh = tmp; 2371 flesh = tmp;
2567 } /* End if paid for object */ 2372 }
2568 } /* end of for loop */
2569 2373
2570 /* If player is still starving, it means they don't have any food, so 2374 /* If player is still starving, it means they don't have any food, so
2571 * eat flesh instead. 2375 * eat flesh instead.
2572 */ 2376 */
2573 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2377 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2574 { 2378 {
2575 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2379 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.>");
2576 manual_apply (op, flesh, 0); 2381 manual_apply (op, flesh, 0);
2577 } 2382 }
2383
2384 // If player is still starving, alert him!
2385 if (op->stats.food < 0)
2386 op->failmsg ("You are starving! "
2387 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2578 } 2388 }
2579 2389
2580 if (op->stats.food < 0) 2390 if (op->stats.food < 0)
2581 { 2391 {
2582 op->stats.hp += op->stats.food; 2392 op->stats.hp += op->stats.food;
2583 op->stats.food = 0; 2393 op->stats.food = 0;
2394
2395 if (op->stats.hp < 0)
2396 {
2397 op->contr->killer = archetype::get ("killer_starvation");
2398 op->contr->killer->destroy ();
2584 } 2399 }
2400 }
2585 2401
2402 /* killer should be set here already */
2586 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2403 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2587 kill_player (op); 2404 kill_player (op);
2588 } 2405 }
2589} 2406}
2590 2407
… …
2595 */ 2412 */
2596void 2413void
2597kill_player (object *op) 2414kill_player (object *op)
2598{ 2415{
2599 int x, y; 2416 int x, y;
2600 char buf[MAX_BUF];
2601 maptile *map; /* this is for resurrection */ 2417 maptile *map; /* this is for resurrection */
2602 int will_kill_again; 2418 int will_kill_again;
2603 archetype *at; 2419 archetype *at;
2604 object *tmp; 2420 object *tmp;
2605 2421
2606 if (save_life (op)) 2422 if (save_life (op))
2607 return; 2423 return;
2424
2425 dynbuf_text deathtab;
2426
2427 /* restore player */
2428 at = archetype::find ("poisoning");
2429 if (object *tmp = present_arch_in_ob (at, op))
2430 {
2431 tmp->destroy ();
2432 deathtab << "Your body feels cleansed...\r";
2433 }
2434
2435 at = archetype::find ("confusion");
2436 if (object *tmp = present_arch_in_ob (at, op))
2437 {
2438 tmp->destroy ();
2439 deathtab << "Your mind feels clearer...\r";
2440 }
2441
2442 cure_disease (op, 0, 0); /* remove any disease */
2443
2444 max_it (op->stats.hp , op->stats.maxhp);
2445 max_it (op->stats.sp , op->stats.maxsp);
2446 max_it (op->stats.grace, op->stats.maxgrace);
2447
2448 if (op->stats.food <= 0)
2449 op->stats.food = 999;
2450
2451 // remove all spell effects that are active
2452 // to avoid long-term effects such as word-of-recall
2453 for (object *item = op->inv; item; )
2454 {
2455 object *next = item->below;
2456
2457 if (item->type == SPELL_EFFECT && item->active)
2458 item->destroy ();
2459
2460 item = next;
2461 }
2608 2462
2609 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2463 /* 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. 2464 * in cities ONLY!!! It is very important that this doesn't get abused.
2611 * Look at op_on_battleground() for more info --AndreasV 2465 * Look at op_on_battleground() for more info --AndreasV
2612 */ 2466 */
2613 if (op_on_battleground (op, &x, &y)) 2467 if (op_on_battleground (op, &x, &y))
2614 { 2468 {
2615 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2469 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 2470
2638 /* create a bodypart-trophy to make the winner happy */ 2471 /* create a bodypart-trophy to make the winner happy */
2639 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2472 if (object *tmp = arch_to_object (archetype::find ("finger")))
2640 { 2473 {
2641 tmp->name = format ("%s's finger" , &op->name); 2474 tmp->name = format ("%s's finger" , &op->name);
2642 tmp->name_pl = format ("%s's fingers", &op->name); 2475 tmp->name_pl = format ("%s's fingers", &op->name);
2643 tmp->msg = format ( 2476 tmp->msg = format (
2644 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2477 "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 2478 &op->name, op->contr->title,
2479 (int)op->level,
2480 op->contr->killer_name ()
2646 ); 2481 );
2647 tmp->value = 0, tmp->type = 0; 2482 tmp->value = 0, tmp->type = 0;
2648 tmp->materialname = "organics"; 2483 tmp->materialname = "organics";
2649 tmp->insert_at (op, tmp); 2484 tmp->insert_at (op, tmp);
2650 } 2485 }
2651 2486
2652 /* teleport defeated player to new destination */ 2487 /* teleport defeated player to new destination */
2653 transfer_ob (op, x, y, 0, NULL); 2488 transfer_ob (op, x, y, 0, NULL);
2654 op->contr->braced = 0; 2489 op->contr->braced = 0;
2490
2491 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2655 return; 2492 return;
2656 } 2493 }
2657 2494
2495 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2496 deathtab << "T<YOU HAVE DIED>\n\n";
2497
2658 INVOKE_PLAYER (DEATH, op->contr); 2498 INVOKE_PLAYER (DEATH, op->contr);
2659 2499
2660 command_kill_pets (op, 0); 2500 command_kill_pets (op, 0);
2661
2662 if (op->stats.food < 0)
2663 strcpy (op->contr->killer, "starvation");
2664 2501
2665 op->contr->play_sound (sound_find ("player_dies")); 2502 op->contr->play_sound (sound_find ("player_dies"));
2666 2503
2667 /* save the map location for corpse, gravestone */ 2504 /* save the map location for corpse, gravestone */
2668 x = op->x; 2505 x = op->x;
… …
2698 2535
2699 lost_a_stat = 0; 2536 lost_a_stat = 0;
2700 2537
2701 for (z = 0; z < num_stats_lose; z++) 2538 for (z = 0; z < num_stats_lose; z++)
2702 { 2539 {
2703 i = RANDOM () % NUM_STATS; 2540 i = rndm (NUM_STATS);
2704 2541
2705 if (settings.stat_loss_on_death) 2542 if (settings.stat_loss_on_death)
2706 { 2543 {
2707 /* Pick a random stat and take a point off it. Tell the player 2544 /* Pick a random stat and take a point off it. Tell the player
2708 * what he lost. 2545 * what he lost.
… …
2759 } 2596 }
2760 } 2597 }
2761 2598
2762 if (lose_this_stat) 2599 if (lose_this_stat)
2763 { 2600 {
2764 this_stat = get_attr_value (&(dep->stats), i); 2601 this_stat = get_attr_value (&dep->stats, i);
2765 /* We could try to do something clever like find another 2602 /* We could try to do something clever like find another
2766 * stat to reduce if this fails. But chances are, if 2603 * stat to reduce if this fails. But chances are, if
2767 * stats have been depleted to -50, all are pretty low 2604 * stats have been depleted to -50, all are pretty low
2768 * and should be roughly the same, so it shouldn't make a 2605 * and should be roughly the same, so it shouldn't make a
2769 * difference. 2606 * difference.
… …
2777 lost_a_stat = 1; 2614 lost_a_stat = 1;
2778 } 2615 }
2779 } 2616 }
2780 } 2617 }
2781 } 2618 }
2619
2782 /* If no stat lost, tell the player. */ 2620 /* If no stat lost, tell the player. */
2783 if (!lost_a_stat) 2621 if (!lost_a_stat)
2784 { 2622 {
2785 /* determine_god() seems to not work sometimes... why is this? 2623 /* determine_god() seems to not work sometimes... why is this?
2786 Should I be using something else? GD */ 2624 Should I be using something else? GD */
2787 const char *god = determine_god (op); 2625 shstr_tmp god = determine_god (op);
2788 2626
2789 if (god && (strcmp (god, "none"))) 2627 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); 2628 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2791 else 2629 else
2792 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2630 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2793 } 2631 }
2794#else 2632#else
2795 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2633 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2796#endif 2634#endif
2797 2635
2798 /* Put a gravestone up where the character 'almost' died. List the 2636 /* Put a gravestone up where the character 'almost' died. List the
2799 * exp loss on the stone. 2637 * exp loss on the stone.
2800 */ 2638 */
2801 tmp = arch_to_object (archetype::find ("gravestone")); 2639 tmp = arch_to_object (archetype::find ("gravestone"));
2802 sprintf (buf, "%s's gravestone", &op->name); 2640 tmp->name = format ("%s's gravestone", &op->name);
2803 tmp->name = buf; 2641 tmp->name_pl = format ("%s's gravestones", &op->name);
2804 sprintf (buf, "%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",
2805 tmp->name_pl = buf; 2643 &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; 2644 tmp->x = op->x, tmp->y = op->y;
2809 insert_ob_in_map (tmp, op->map, NULL, 0); 2645 insert_ob_in_map (tmp, op->map, NULL, 0);
2810 2646
2811 /**************************************/ 2647 /**************************************/
2812 /* */ 2648 /* */
2813 /* Subtract the experience points, */ 2649 /* Subtract the experience points, */
2814 /* if we died cause of food, give us */
2815 /* food, and reset HP's... */
2816 /* */ 2650 /* */
2817 /**************************************/ 2651 /**************************************/
2818 2652
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)); */ 2653 /*add_exp(op, (op->stats.exp * -0.20)); */
2841 apply_death_exp_penalty (op); 2654 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 2655
2848 /* 2656 /*
2849 * Check to see if the player has any unpaid items. If so, remove them 2657 * Check to see if the player has any unpaid items. If so, remove them
2850 * and put them back in the map. 2658 * and put them back in the map.
2851 */ 2659 */
… …
2886 if (will_kill_again & (1 << at)) 2694 if (will_kill_again & (1 << at))
2887 force->resist[at] = 100; 2695 force->resist[at] = 100;
2888 2696
2889 insert_ob_in_ob (force, op); 2697 insert_ob_in_ob (force, op);
2890 op->update_stats (); 2698 op->update_stats ();
2891
2892 } 2699 }
2893 2700
2894 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2701 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2895} 2702}
2896 2703
2897void 2704void
2898loot_object (object *op) 2705loot_object (object *op)
2899{ /* Grab and destroy some treasure */ 2706{ /* Grab and destroy some treasure */
… …
2916 2723
2917 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2724 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2918 { 2725 {
2919 if (tmp->nrof > 1) 2726 if (tmp->nrof > 1)
2920 { 2727 {
2921 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2728 tmp->decrease (rndm (1, tmp->nrof - 1));
2922 tmp2->destroy ();
2923 insert_ob_in_map (tmp, op->map, NULL, 0); 2729 insert_ob_in_map (tmp, op->map, NULL, 0);
2924 } 2730 }
2925 else 2731 else
2926 tmp->destroy (); 2732 tmp->destroy ();
2927 } 2733 }
… …
2938void 2744void
2939fix_weight (void) 2745fix_weight (void)
2940{ 2746{
2941 for_all_players (pl) 2747 for_all_players (pl)
2942 { 2748 {
2943 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2749 sint32 old = pl->ob->carrying;
2944 2750
2945 if (old == sum) 2751 pl->ob->update_weight ();
2946 continue; 2752
2753 if (old != pl->ob->carrying)
2754 {
2947 pl->ob->update_stats (); 2755 pl->ob->update_stats ();
2948 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2756 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2757 }
2949 } 2758 }
2950} 2759}
2951 2760
2952void 2761void
2953fix_luck (void) 2762fix_luck (void)
… …
2995} 2804}
2996 2805
2997void 2806void
2998make_visible (object *op) 2807make_visible (object *op)
2999{ 2808{
3000 op->hide = 0; 2809 op->flag [FLAG_HIDDEN] = 0;
3001 op->invisible = 0; 2810 op->invisible = 0;
3002 2811
3003 if (op->type == PLAYER) 2812 if (op->type == PLAYER)
3004 { 2813 {
3005 op->contr->tmp_invis = 0; 2814 op->contr->tmp_invis = 0;
… …
3030 2839
3031 if (!ob || !ob->map) 2840 if (!ob || !ob->map)
3032 return 0; 2841 return 0;
3033 2842
3034 /* so, on normal lighted maps, its hard to hide */ 2843 /* so, on normal lighted maps, its hard to hide */
3035 level = ob->map->darkness - 2; 2844 level = ob->map->darklevel () - 2;
3036 2845
3037 /* this also picks up whether the object is glowing. 2846 /* this also picks up whether the object is glowing.
3038 * If you carry a light on a non-dark map, its not 2847 * If you carry a light on a non-dark map, its not
3039 * as bad as carrying a light on a pitch dark map */ 2848 * as bad as carrying a light on a pitch dark map */
3040 if (has_carried_lights (ob)) 2849 if (ob->has_carried_lights ())
3041 level = -(10 + (2 * ob->map->darkness)); 2850 level = -(10 + (2 * ob->map->darklevel ()));
3042 2851
3043 /* scan through all nearby squares for terrain to hide in */ 2852 /* 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]) 2853 for (i = 0, x = ob->x, y = ob->y;
2854 i <= SIZEOFFREE1;
2855 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3045 { 2856 {
3046 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2857 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3047 if (mflag & P_OUT_OF_MAP) 2858 if (mflag & P_OUT_OF_MAP)
3048 {
3049 continue; 2859 continue;
3050 } 2860
3051 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2861 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3052 level += 2; 2862 level += 2;
3053 else /* open terrain! */ 2863 else /* open terrain! */
3054 level -= 1; 2864 level -= 1;
3055 } 2865 }
… …
3066 * spot (surrounded by clear terrain in broad daylight). -b.t. 2876 * spot (surrounded by clear terrain in broad daylight). -b.t.
3067 */ 2877 */
3068void 2878void
3069do_hidden_move (object *op) 2879do_hidden_move (object *op)
3070{ 2880{
3071 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2881 int hide = 0;
3072 object *skop;
3073 2882
3074 if (!op || !op->map) 2883 if (!op || !op->map)
3075 return; 2884 return;
3076 2885
3077 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2886 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2887 int num = random_roll (0, 19, op, PREFER_LOW);
3078 2888
3079 /* its *extremely* hard to run and sneak/hide at the same time! */ 2889 /* its *extremely* hard to run and sneak/hide at the same time! */
3080 if (op->type == PLAYER && op->contr->run_on) 2890 if (op->type == PLAYER && op->contr->run_on)
3081 if (!skop || num >= skop->level) 2891 if (!skop || num >= skop->level)
3082 { 2892 {
… …
3092 num -= hide; 2902 num -= hide;
3093 2903
3094 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2904 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3095 { 2905 {
3096 make_visible (op); 2906 make_visible (op);
2907
3097 if (op->type == PLAYER) 2908 if (op->type == PLAYER)
3098 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2909 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3099 } 2910 }
3100 else if (op->type == PLAYER && skop) 2911 else if (op->type == PLAYER && skop)
3101 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2912 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3191 while (op) 3002 while (op)
3192 { 3003 {
3193 dx = rv.distance_x + op->arch->x; 3004 dx = rv.distance_x + op->arch->x;
3194 dy = rv.distance_y + op->arch->y; 3005 dy = rv.distance_y + op->arch->y;
3195 3006
3196 /* only the viewable area the player sees is updated by LOS 3007 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; 3008 return 1;
3204 3009
3205 op = op->more; 3010 op = op->more;
3206 } 3011 }
3207 3012
3208 return 0; 3013 return 0;
3209} 3014}
3210 3015
3211/* routine for both players and monsters. We call this when 3016/* routine for both players and monsters. We call this when
3212 * there is a possibility for our action distrubing our hiding 3017 * there is a possibility for our action distrubing our hiding
3213 * place or invisiblity spell. Artefact invisiblity is not 3018 * place or invisiblity spell. Artefact invisiblity causes
3214 * effected by this. If we arent invisible to begin with, we 3019 * "noise" instead. If we arent invisible to begin with, we
3215 * return 0. 3020 * return 0.
3216 */ 3021 */
3217int 3022int
3218action_makes_visible (object *op) 3023action_makes_visible (object *op)
3219{ 3024{
3220 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3025 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3221 { 3026 {
3222 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 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
3223 return 0; 3034 return 0;
3035 }
3224 3036
3225 if (op->contr && op->contr->tmp_invis == 0) 3037 if (op->contr && op->contr->tmp_invis == 0)
3226 return 0; 3038 return 0;
3227 3039
3228 /* If monsters, they should become visible */ 3040 /* If monsters, they should become visible */
3229 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3041 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3230 { 3042 {
3231 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3043 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3232 return 1; 3044 return 1;
3233 } 3045 }
3234 } 3046 }
3235 3047
3236 return 0; 3048 return 0;
… …
3442 else 3254 else
3443 { 3255 {
3444 /* generate misc. treasure */ 3256 /* generate misc. treasure */
3445 tmp = arch_to_object (tr->item); 3257 tmp = arch_to_object (tr->item);
3446 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3258 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); 3259 who->insert (tmp);
3448 if (who->type == PLAYER)
3449 esrv_send_item (who, tmp);
3450 } 3260 }
3451} 3261}
3452 3262
3453/** 3263/**
3454 * Unready an object for a player. This function does nothing if the object was 3264 * Unready an object for a player. This function does nothing if the object was
… …
3466 if (pl->ranged_ob == ob) 3276 if (pl->ranged_ob == ob)
3467 pl->ranged_ob = 0; 3277 pl->ranged_ob = 0;
3468} 3278}
3469 3279
3470sint8 3280sint8
3471player::visibility_at (maptile *map, int x, int y) const 3281player::darkness_at (maptile *map, int x, int y) const
3472{ 3282{
3473 if (!ns) 3283 if (!ns)
3474 return 0; 3284 return LOS_BLOCKED;
3475 3285
3476 int dx, dy; 3286 int dx, dy;
3477 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3287 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3478 return 0; 3288 return LOS_BLOCKED;
3479 3289
3480 x += dx - ns->current_x + ns->mapx / 2; 3290 x += dx - ns->current_x;
3481 y += dy - ns->current_y + ns->mapy / 2; 3291 y += dy - ns->current_y;
3482 3292
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]; 3293 return blocked_los (x, y);
3487} 3294}
3488 3295
3489void 3296void
3490player::infobox (const char *title, const char *msg, int color) 3297player::infobox (const char *title, const char *msg, int color)
3491{ 3298{

Diff Legend

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