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.152 by root, Sun Jul 1 05:00:20 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;
… …
183 70
184 if (ob->map) 71 if (ob->map)
185 maplevel = ob->map->path; 72 maplevel = ob->map->path;
186 73
187 ob->remove (); 74 ob->remove ();
75 ob->enemy = 0; // sometimes keeps an extra refcount on itself
188 ob->map = 0; 76 ob->map = 0;
189 party = 0; 77 party = 0;
190 78
191 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 79 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192 80
… …
206 ob->close_container (); //TODO: client-specific 94 ob->close_container (); //TODO: client-specific
207 95
208 ns->update_look = 0; 96 ns->update_look = 0;
209 ns->look_position = 0; 97 ns->look_position = 0;
210 98
211 clear_los (this); 99 clear_los ();
212 100
213 ns->reset_stats (); 101 ns->reset_stats ();
214 102
215 /* make sure he's a player -- needed because of class change. */ 103 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 104 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->race; 105 ob->race = ob->arch->race;
218 106
219 ob->carrying = sum_weight (ob); 107 ob->update_weight ();
220 link_player_skills (ob); 108 link_skills ();
221 109
222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 110 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223 111
224 assign (title, ob->arch->object::name); 112 assign (title, ob->arch->object::name);
225 113
226 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
227 if (is_dragon_pl (ob)) 115 if (is_dragon_pl (ob))
228 { 116 {
229 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
230 118
231 shstr_cmp dragon_ability_force ("dragon_ability_force");
232 shstr_cmp dragon_skin_force ("dragon_skin_force");
233
234 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
235 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
236 if (tmp->arch->archname == dragon_ability_force) 121 if (tmp->arch->archname == shstr_dragon_ability_force)
237 abil = tmp; 122 abil = tmp;
238 else if (tmp->arch->archname == dragon_skin_force) 123 else if (tmp->arch->archname == shstr_dragon_skin_force)
239 skin = tmp; 124 skin = tmp;
240 125
241 set_dragon_name (ob, abil, skin); 126 set_dragon_name (ob, abil, skin);
242 } 127 }
243 128
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 130
246 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 */
247 185
248 ob->flag [FLAG_READY_WEAPON] = false; 186 ob->flag [FLAG_READY_WEAPON] = false;
249 ob->flag [FLAG_READY_SKILL] = false; 187 ob->flag [FLAG_READY_SKILL] = false;
250 ob->flag [FLAG_READY_BOW] = false; 188 ob->flag [FLAG_READY_BOW] = false;
251 189
… …
268 combat_ob = op; 206 combat_ob = op;
269 break; 207 break;
270 } 208 }
271 209
272 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 210 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273 ob->update_stats (); 211 ob->deactivate (); // change_weapon activates, fix this better
274
275 ns->floorbox_update ();
276 esrv_send_inventory (ob, ob);
277 esrv_add_spells (this, 0);
278
279 activate ();
280
281 send_rules (ob);
282 send_news (ob);
283 display_motd (ob);
284
285 INVOKE_PLAYER (CONNECT, this);
286 INVOKE_PLAYER (LOGIN, this);
287}
288
289void
290player::disconnect ()
291{
292 if (ns)
293 {
294 if (active)
295 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296
297 INVOKE_PLAYER (DISCONNECT, this);
298
299 ns->reset_stats ();
300 ns->pl = 0;
301 ns = 0;
302 }
303
304 if (ob)
305 ob->close_container (); //TODO: client-specific
306
307 observe = ob;
308
309 deactivate ();
310}
311
312// the need for this function can be explained
313// by load_object not returning the object
314void
315player::set_object (object *op)
316{
317 ob = observe = op;
318 ob->contr = this; /* this aren't yet in archetype */
319
320 ob->speed = 1.0f;
321 ob->speed_left = 0.5f;
322
323 ob->direction = 5; /* So player faces south */
324} 212}
325 213
326void 214void
327player::set_observe (object *op) 215player::set_observe (object *op)
328{ 216{
329 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;
330 do_los = 1; 225 do_los = 1;
331} 226}
332 227
333player::player () 228player::player ()
334{ 229{
… …
342 savebed_map = first_map_path; /* Init. respawn position */ 237 savebed_map = first_map_path; /* Init. respawn position */
343 238
344 gen_sp_armour = 10; 239 gen_sp_armour = 10;
345 bowtype = bow_normal; 240 bowtype = bow_normal;
346 petmode = pet_normal; 241 petmode = pet_normal;
347 listening = 10;
348 usekeys = containers; 242 usekeys = containers;
349 peaceful = 1; /* default peaceful */ 243 peaceful = 1; /* default peaceful */
350 do_los = 1; 244 do_los = 1;
351 245
352 weapon_sp = 1.0f; 246 weapon_sp = 1.0f;
… …
364 { 258 {
365 ob->destroy_inv (false); 259 ob->destroy_inv (false);
366 ob->destroy (); 260 ob->destroy ();
367 } 261 }
368 262
369 ob = observe = 0; 263 ob = observe = viewpoint = 0;
370} 264}
371 265
372player::~player () 266player::~player ()
373{ 267{
374 /* Clear item stack */ 268 /* Clear item stack */
… …
401 * Note: there MUST be at least one player archetype! 295 * Note: there MUST be at least one player archetype!
402 */ 296 */
403archetype * 297archetype *
404get_player_archetype (archetype *at) 298get_player_archetype (archetype *at)
405{ 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
406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 306 archvec::iterator i = archetypes.find (nat);
407 307
408 for (;;) 308 for (;;)
409 { 309 {
410 if (++i == archetypes.end ()) 310 if (++i == archetypes.end ())
411 i = archetypes.begin (); 311 i = archetypes.begin ();
… …
425 unsigned lastdist; 325 unsigned lastdist;
426 rv_vector rv; 326 rv_vector rv;
427 327
428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 328 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429 { 329 {
430 /* We should not find free objects on this friendly list, but it
431 * does periodically happen. Given that, lets deal with it.
432 * While unlikely, it is possible the next object on the friendly
433 * list is also free, so encapsulate this in a while loop.
434 */
435 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436 {
437 object *tmp = ol->ob;
438
439 /* Can't do much more other than log the fact, because the object
440 * itself will have been cleared.
441 */
442 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443 tmp->debug_desc ());
444 ol = ol->next;
445 remove_friendly_object (tmp);
446 if (!ol)
447 return op;
448 }
449
450 /* Remove special check for player from this. First, it looks to cause
451 * some crashes (ol->ob->contr not set properly?), but secondly, a more
452 * complicated method of state checking would be needed in any case -
453 * as it was, a clever player could type quit, and the function would
454 * skip them over while waiting for confirmation. Remove
455 * on_same_map check, as can_detect_enemy also does this
456 */
457 if (!can_detect_enemy (mon, ol->ob, &rv)) 330 if (!can_detect_enemy (mon, ol->ob, &rv))
458 continue; 331 continue;
459 332
460 if (lastdist > rv.distance) 333 if (lastdist > rv.distance)
461 { 334 {
… …
656 529
657 return firstdir; 530 return firstdir;
658} 531}
659 532
660void 533void
661give_initial_items (object *pl, treasurelist * items) 534give_initial_items (object *pl, treasurelist *items)
662{ 535{
663 object *op, *next = NULL;
664
665 if (pl->randomitems != NULL) 536 if (pl->randomitems)
666 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 537 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667 538
668 for (op = pl->inv; op; op = next) 539 for (object *next, *op = pl->inv; op; op = next)
669 { 540 {
670 next = op->below; 541 next = op->below;
671 542
672 /* Forces get applied per default, unless they have the 543 /* Forces get applied per default, unless they have the
673 * 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
… …
678 /* we never give weapons/armour if these cannot be used 549 /* we never give weapons/armour if these cannot be used
679 * by this player due to race restrictions 550 * by this player due to race restrictions
680 */ 551 */
681 if (pl->type == PLAYER) 552 if (pl->type == PLAYER)
682 { 553 {
683 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 554 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
555 &&
684 (op->type == ARMOUR || op->type == BOOTS || 556 (op->type == ARMOUR || op->type == BOOTS
685 op->type == CLOAK || op->type == HELMET || 557 || op->type == CLOAK || op->type == HELMET
686 op->type == SHIELD || op->type == GLOVES || 558 || op->type == SHIELD || op->type == GLOVES
559 || op->type == BRACERS || op->type == GIRDLE))
687 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))
688 { 561 {
689 op->destroy (); 562 op->destroy ();
690 continue; 563 continue;
691 } 564 }
692 } 565 }
693 566
694 /* This really needs to be better - we should really give 567 /* Here we remove duplicated skills (as duplicated spell objects have
695 * a substitute spellbook. The problem is that we don't really 568 * _very_ confusing effects for players), which could for instance be
696 * have a good idea what to replace it with (need something like 569 * generated by bad treasurelists. - elmex
697 * a first level treasurelist for each skill.)
698 * remove duplicate skills also
699 */ 570 */
700 if (op->type == SPELLBOOK || op->type == SKILL) 571 if (op->type == SKILL)
701 { 572 {
702 object *tmp;
703
704 for (tmp = op->below; tmp; tmp = tmp->below) 573 for (object *tmp = op->below; tmp; tmp = tmp->below)
705 if (tmp->type == op->type && tmp->name == op->name) 574 if (tmp->type == op->type && tmp->name == op->name)
706 break;
707
708 if (tmp)
709 { 575 {
710 op->destroy (); 576 op->destroy ();
577 LOG (llevError,
711 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 578 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
712 continue; 579 break;
713 } 580 }
714 581
715 if (op->nrof > 1) 582 if (op->nrof > 1)
716 op->nrof = 1; 583 op->nrof = 1;
717 } 584 }
718 585
719 if (op->type == SPELLBOOK && op->inv) 586 if (op->type == SPELLBOOK && op->inv)
720 {
721 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 587 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722 }
723 588
724 /* Give starting characters identified, uncursed, and undamned 589 /* Give starting characters identified, uncursed, and undamned
725 * 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
726 * merged properly. 591 * merged properly.
727 */ 592 */
728 if (need_identify (op)) 593 if (need_identify (op))
729 { 594 {
730 SET_FLAG (op, FLAG_IDENTIFIED); 595 SET_FLAG (op, FLAG_IDENTIFIED);
731 CLEAR_FLAG (op, FLAG_CURSED); 596 CLEAR_FLAG (op, FLAG_CURSED);
732 CLEAR_FLAG (op, FLAG_DAMNED); 597 CLEAR_FLAG (op, FLAG_DAMNED);
733 } 598 }
599
734 if (op->type == SPELL) 600 if (op->type == SPELL)
735 { 601 {
736 op->destroy (); 602 op->destroy ();
737 continue; 603 continue;
738 } 604 }
… …
740 { 606 {
741 SET_FLAG (op, FLAG_CAN_USE_SKILL); 607 SET_FLAG (op, FLAG_CAN_USE_SKILL);
742 op->stats.exp = 0; 608 op->stats.exp = 0;
743 op->level = 1; 609 op->level = 1;
744 } 610 }
745 /* lock all 'normal items by default */ 611 else /* lock all 'normal items by default */
746 else
747 SET_FLAG (op, FLAG_INV_LOCKED); 612 SET_FLAG (op, FLAG_INV_LOCKED);
748 } /* for loop of objects in player inv */ 613 } /* for loop of objects in player inv */
749 614
750 /* Need to set up the skill pointers */ 615 /* Need to set up the skill pointers */
751 link_player_skills (pl); 616 pl->contr->link_skills ();
752} 617}
753 618
754void 619void
755get_party_password (object *op, partylist *party) 620get_party_password (object *op, partylist *party)
756{ 621{
… …
857static void 722static void
858start_info (object *op) 723start_info (object *op)
859{ 724{
860 char buf[MAX_BUF]; 725 char buf[MAX_BUF];
861 726
862 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 727 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863 new_draw_info (NDI_UNIQUE, 0, op, buf); 728 new_draw_info (NDI_UNIQUE, 0, op, buf);
864 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865 //new_draw_info (NDI_UNIQUE, 0, op, " ");
866} 729}
867 730
868/* This function takes the key that is passed, and does the 731/* This function takes the key that is passed, and does the
869 * appropriate action with it (change race, or other things). 732 * appropriate action with it (change race, or other things).
870 * The function name is for historical reasons - now we have 733 * The function name is for historical reasons - now we have
… …
873 */ 736 */
874void 737void
875player::chargen_race_done () 738player::chargen_race_done ()
876{ 739{
877 /* this must before then initial items are given */ 740 /* this must before then initial items are given */
878 esrv_new_player (ob->contr, ob->weight + ob->carrying); 741 esrv_new_player (ob->contr);
879 742
880 treasurelist *tl = treasurelist::find ("starting_wealth"); 743 treasurelist *tl = treasurelist::find ("starting_wealth");
881 if (tl) 744 if (tl)
882 create_treasure (tl, ob, 0, 0, 0); 745 create_treasure (tl, ob, 0, 0, 0);
883 746
… …
887 ob->contr->ns->state = ST_PLAYING; 750 ob->contr->ns->state = ST_PLAYING;
888 751
889 if (ob->msg) 752 if (ob->msg)
890 ob->msg = 0; 753 ob->msg = 0;
891 754
892 /* We create this now because some of the unique maps will need it
893 * to save here.
894 */
895 {
896 char buf[MAX_BUF];
897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898 make_path_to_file (buf);
899 }
900
901 start_info (ob); 755 start_info (ob);
902 CLEAR_FLAG (ob, FLAG_WIZ); 756 CLEAR_FLAG (ob, FLAG_WIZ);
903 give_initial_items (ob, ob->randomitems); 757 give_initial_items (ob, ob->randomitems);
904 link_player_skills (ob);
905 esrv_send_inventory (ob, ob); 758 esrv_send_inventory (ob, ob);
906 ob->update_stats (); 759 ob->update_stats ();
907 760
908 /* This moves the player to a different start map, if there 761 /* This moves the player to a different start map, if there
909 * is one for this race 762 * is one for this race
910 */ 763 */
911 if (*first_map_ext_path) 764 if (*first_map_ext_path)
912 { 765 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
913 object *tmp;
914 char mapname[MAX_BUF];
915
916 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917 tmp = object::create ();
918 EXIT_PATH (tmp) = mapname;
919 EXIT_X (tmp) = ob->x;
920 EXIT_Y (tmp) = ob->y;
921 ob->enter_exit (tmp); /* we don't really care if it succeeded;
922 * if the map isn't there, then stay on the
923 * default initial map */
924 tmp->destroy ();
925 }
926 else 766 else
927 LOG (llevDebug, "first_map_ext_path not set\n"); 767 LOG (llevDebug, "first_map_ext_path not set\n");
928} 768}
929 769
930void 770void
… …
974 LOG (llevDebug, "Fleeing player is dead.\n"); 814 LOG (llevDebug, "Fleeing player is dead.\n");
975 CLEAR_FLAG (op, FLAG_SCARED); 815 CLEAR_FLAG (op, FLAG_SCARED);
976 return; 816 return;
977 } 817 }
978 818
979 if (op->enemy == NULL) 819 if (!op->enemy)
980 { 820 {
981 LOG (llevDebug, "Fleeing player had no enemy.\n"); 821 LOG (llevDebug, "Fleeing player had no enemy.\n");
982 CLEAR_FLAG (op, FLAG_SCARED); 822 CLEAR_FLAG (op, FLAG_SCARED);
983 return; 823 return;
984 } 824 }
985 825
986 /* Seen some crashes here. Since we don't store an
987 * op->enemy_count, it is possible that something destroys the
988 * actual enemy, and the object is recycled.
989 */
990 if (op->enemy->map == NULL)
991 {
992 CLEAR_FLAG (op, FLAG_SCARED);
993 op->enemy = NULL;
994 return;
995 }
996
997 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))
998 { 827 {
999 op->enemy = NULL; 828 op->enemy = NULL;
1000 CLEAR_FLAG (op, FLAG_SCARED); 829 CLEAR_FLAG (op, FLAG_SCARED);
1001 return; 830 return;
… …
1004 get_rangevector (op, op->enemy, &rv, 0); 833 get_rangevector (op, op->enemy, &rv, 0);
1005 834
1006 dir = absdir (4 + rv.direction); 835 dir = absdir (4 + rv.direction);
1007 for (diff = 0; diff < 3; diff++) 836 for (diff = 0; diff < 3; diff++)
1008 { 837 {
1009 int m = 1 - (RANDOM () & 2); 838 int m = 1 - rndm (2) * 2;
1010 839
1011 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)))
1012 return; 841 return;
1013 } 842 }
1014 843
… …
1025check_pick (object *op) 854check_pick (object *op)
1026{ 855{
1027 object *tmp, *next; 856 object *tmp, *next;
1028 int stop = 0; 857 int stop = 0;
1029 int wvratio; 858 int wvratio;
1030 char putstring[128];
1031 859
1032 /* if you're flying, you cna't pick up anything */ 860 /* if you're flying, you cna't pick up anything */
1033 if (op->move_type & MOVE_FLYING) 861 if (op->move_type & MOVE_FLYING)
1034 return 1; 862 return 1;
1035 863
1036 next = op->below; 864 next = op->below;
1037 865
866 int cnt = MAX_ITEM_PER_DROP;
867#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868
1038 /* 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
1039 * destroyed */ 870 * destroyed */
1040 while (next && !next->destroyed ()) 871 while (next && !next->destroyed ())
1041 { 872 {
1042 tmp = next; 873 tmp = next;
1043 next = tmp->below; 874 next = tmp->below;
1044 875
876 if (cnt <= 0)
877 {
878 op->failmsg ("Couldn't pickup all items at once.");
879 return 0;
880 }
881
1045 if (op->destroyed ()) 882 if (op->destroyed ())
1046 return 0; 883 return 0;
1047 884
1048 if (!can_pick (op, tmp)) 885 if (!can_pick (op, tmp))
1049 continue; 886 continue;
1050 887
1051 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 888 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052 { 889 {
1053 if (item_matched_string (op, tmp, op->contr->search_str)) 890 if (item_matched_string (op, tmp, op->contr->search_str))
1054 pick_up (op, tmp); 891 CHK_PICK_PICKUP;
892
1055 continue; 893 continue;
1056 } 894 }
1057 895
1058 /* 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? */
1059 if (!(op->contr->mode & PU_NEWMODE)) 956 if (op->contr->mode & PU_FOOD)
957 if (tmp->type == FOOD)
1060 { 958 {
1061 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)
1062 { 1018 {
1063 case 0: 1019 CHK_PICK_PICKUP;
1064 return 1; /* don't pick up */ 1020 continue;
1065 case 1:
1066 pick_up (op, tmp);
1067 return 1;
1068 case 2:
1069 pick_up (op, tmp);
1070 return 0;
1071 case 3:
1072 return 0; /* stop before pickup */
1073 case 4:
1074 pick_up (op, tmp);
1075 break;
1076 case 5:
1077 pick_up (op, tmp);
1078 stop = 1;
1079 break;
1080 case 6:
1081 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1082 pick_up (op, tmp);
1083 break;
1084
1085 case 7:
1086 if (tmp->type == MONEY || tmp->type == GEM)
1087 pick_up (op, tmp);
1088 break;
1089
1090 default:
1091 /* use value density */
1092 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094 pick_up (op, tmp);
1095 } 1021 }
1096 } 1022 }
1097 else 1023
1098 { /* old model */ 1024 /* rings & amulets - talismans seems to be typed AMULET */
1099 /* NEW pickup handling */
1100 if (op->contr->mode & PU_DEBUG) 1025 if (op->contr->mode & PU_JEWELS)
1026 if (tmp->type == RING || tmp->type == AMULET)
1101 { 1027 {
1102 /* some debugging code to figure out item information */ 1028 CHK_PICK_PICKUP;
1103 if (tmp->name != NULL)
1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106 else
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111 }
1112
1113 /* philosophy:
1114 * It's easy to grab an item type from a pile, as long as it's
1115 * generic. This takes no game-time. For more detailed pickups
1116 * and selections, select-items should be used. This is a
1117 * grab-as-you-run type mode that's really useful for arrows for
1118 * example.
1119 * The drawback: right now it has no frontend, so you need to
1120 * stick the bits you want into a calculator in hex mode and then
1121 * convert to decimal and then 'pickup <#>
1122 */
1123
1124 /* the first two modes are exclusive: if NOTHING we return, if
1125 * STOP then we stop. All the rest are applied sequentially,
1126 * meaning if any test passes, the item gets picked up. */
1127
1128 /* if mode is set to pick nothing up, return */
1129
1130 if (op->contr->mode & PU_NOTHING)
1131 return 1;
1132
1133 /* if mode is set to stop when encountering objects, return */
1134 /* take STOP before INHIBIT since it doesn't actually pick
1135 * anything up */
1136
1137 if (op->contr->mode & PU_STOP)
1138 return 0;
1139
1140 /* useful for going into stores and not losing your settings... */
1141 /* and for battles wher you don't want to get loaded down while
1142 * fighting */
1143 if (op->contr->mode & PU_INHIBIT)
1144 return 1;
1145
1146 /* prevent us from turning into auto-thieves :) */
1147 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1148 continue; 1029 continue;
1030 }
1149 1031
1150 /* ignore known cursed objects */ 1032 /* we don't forget dragon food */
1151 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;
1152 continue; 1037 continue;
1038 }
1153 1039
1154 /* all food and drink if desired */ 1040 /* bows and arrows. Bows are good for selling! */
1155 /* 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
1156 if (op->contr->mode & PU_FOOD) 1077 if (op->contr->mode & PU_BOOTS)
1157 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"))
1158 { 1111 {
1159 pick_up (op, tmp); 1112 CHK_PICK_PICKUP;
1160 continue; 1113 continue;
1161 } 1114 }
1115 }
1162 1116
1117 /* misc stuff that's useful */
1163 if (op->contr->mode & PU_DRINK) 1118 if (op->contr->mode & PU_KEY)
1164 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1119 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1165 { 1120 {
1166 pick_up (op, tmp); 1121 CHK_PICK_PICKUP;
1167 continue; 1122 continue;
1168 } 1123 }
1169 1124
1125 /* any of the last 4 bits set means we use the ratio for value
1126 * pickups */
1170 if (op->contr->mode & PU_POTION) 1127 if (op->contr->mode & PU_RATIO)
1171 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
1172 { 1132 */
1173 pick_up (op, tmp);
1174 continue;
1175 }
1176
1177 /* spellbooks, skillscrolls and normal books/scrolls */
1178 if (op->contr->mode & PU_SPELLBOOK)
1179 if (tmp->type == SPELLBOOK)
1180 {
1181 pick_up (op, tmp);
1182 continue;
1183 }
1184
1185 if (op->contr->mode & PU_SKILLSCROLL)
1186 if (tmp->type == SKILLSCROLL)
1187 {
1188 pick_up (op, tmp);
1189 continue;
1190 }
1191
1192 if (op->contr->mode & PU_READABLES)
1193 if (tmp->type == BOOK || tmp->type == SCROLL)
1194 {
1195 pick_up (op, tmp);
1196 continue;
1197 }
1198
1199 /* wands/staves/rods/horns */
1200 if (op->contr->mode & PU_MAGIC_DEVICE)
1201 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202 {
1203 pick_up (op, tmp);
1204 continue;
1205 }
1206
1207 /* pick up all magical items */
1208 if (op->contr->mode & PU_MAGICAL) 1133 wvratio = op->contr->mode & PU_RATIO;
1209 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)
1210 {
1211 pick_up (op, tmp);
1212 continue;
1213 }
1214
1215 if (op->contr->mode & PU_VALUABLES)
1216 { 1135 {
1217 if (tmp->type == MONEY || tmp->type == GEM) 1136#if 0
1137 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1138 if (tmp->name != NULL)
1218 { 1139 {
1219 pick_up (op, tmp); 1140 fprintf (stderr, "%s", tmp->name);
1220 continue;
1221 } 1141 }
1222 }
1223
1224 /* rings & amulets - talismans seems to be typed AMULET */
1225 if (op->contr->mode & PU_JEWELS)
1226 if (tmp->type == RING || tmp->type == AMULET)
1227 {
1228 pick_up (op, tmp);
1229 continue;
1230 }
1231
1232 /* we don't forget dragon food */
1233 if (op->contr->mode & PU_FLESH)
1234 if (tmp->type == FLESH)
1235 {
1236 pick_up (op, tmp);
1237 continue;
1238 }
1239
1240 /* bows and arrows. Bows are good for selling! */
1241 if (op->contr->mode & PU_BOW)
1242 if (tmp->type == BOW)
1243 {
1244 pick_up (op, tmp);
1245 continue;
1246 }
1247
1248 if (op->contr->mode & PU_ARROW)
1249 if (tmp->type == ARROW)
1250 {
1251 pick_up (op, tmp);
1252 continue;
1253 }
1254
1255 /* all kinds of armor etc. */
1256 if (op->contr->mode & PU_ARMOUR)
1257 if (tmp->type == ARMOUR)
1258 {
1259 pick_up (op, tmp);
1260 continue;
1261 }
1262
1263 if (op->contr->mode & PU_HELMET)
1264 if (tmp->type == HELMET)
1265 {
1266 pick_up (op, tmp);
1267 continue;
1268 }
1269
1270 if (op->contr->mode & PU_SHIELD)
1271 if (tmp->type == SHIELD)
1272 {
1273 pick_up (op, tmp);
1274 continue;
1275 }
1276
1277 if (op->contr->mode & PU_BOOTS)
1278 if (tmp->type == BOOTS)
1279 {
1280 pick_up (op, tmp);
1281 continue;
1282 }
1283
1284 if (op->contr->mode & PU_GLOVES)
1285 if (tmp->type == GLOVES)
1286 {
1287 pick_up (op, tmp);
1288 continue;
1289 }
1290
1291 if (op->contr->mode & PU_CLOAK)
1292 if (tmp->type == CLOAK)
1293 {
1294 pick_up (op, tmp);
1295 continue;
1296 }
1297
1298 /* hoping to catch throwing daggers here */
1299 if (op->contr->mode & PU_MISSILEWEAPON)
1300 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301 {
1302 pick_up (op, tmp);
1303 continue;
1304 }
1305
1306 /* careful: chairs and tables are weapons! */
1307 if (op->contr->mode & PU_ALLWEAPON)
1308 {
1309 if (tmp->type == WEAPON && tmp->name != NULL)
1310 {
1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313 {
1314 pick_up (op, tmp);
1315 continue;
1316 }
1317 }
1318
1319 if (tmp->type == WEAPON && tmp->name == NULL)
1320 {
1321 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322 {
1323 pick_up (op, tmp);
1324 continue;
1325 }
1326 }
1327 }
1328
1329 /* misc stuff that's useful */
1330 if (op->contr->mode & PU_KEY)
1331 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332 {
1333 pick_up (op, tmp);
1334 continue;
1335 }
1336
1337 /* any of the last 4 bits set means we use the ratio for value
1338 * pickups */
1339 if (op->contr->mode & PU_RATIO)
1340 {
1341 /* use value density to decide what else to grab */
1342 /* >=7 was >= op->contr->mode */
1343 /* >=7 is the old standard setting. Now we take the last 4 bits
1344 * and multiply them by 5, giving 0..15*5== 5..75 */
1345 wvratio = (op->contr->mode & PU_RATIO) * 5;
1346 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347 {
1348 pick_up (op, tmp);
1349#if 0
1350 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351 if (tmp->name != NULL)
1352 {
1353 fprintf (stderr, "%s", tmp->name);
1354 }
1355 else 1142 else
1356 fprintf (stderr, "%s", tmp->arch->archname); 1143 fprintf (stderr, "%s", tmp->arch->archname);
1357 fprintf (stderr, ",%d] = ", tmp->type); 1144 fprintf (stderr, ",%d] = ", tmp->type);
1358 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))));
1359#endif 1146#endif
1147 CHK_PICK_PICKUP;
1360 continue; 1148 continue;
1361 }
1362 } 1149 }
1363 } /* the new pickup model */ 1150 } /* the new pickup model */
1364 } 1151 }
1365 1152
1366 return !stop; 1153 return !stop;
… …
1372 * found object is returned. 1159 * found object is returned.
1373 */ 1160 */
1374object * 1161object *
1375find_arrow (object *op, const char *type) 1162find_arrow (object *op, const char *type)
1376{ 1163{
1377 object *tmp = 0;
1378
1379 for (op = op->inv; op; op = op->below) 1164 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381 tmp = find_arrow (op, type);
1382 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);
1383 return op; 1173 return arrow;
1174 }
1384 1175
1385 return tmp; 1176 return 0;
1386} 1177}
1387 1178
1388/* 1179/*
1389 * 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
1390 * 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
1391 * 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
1392 * 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.
1393 */ 1184 */
1394object * 1185object *
1395find_better_arrow (object *op, object *target, const char *type, int *better) 1186find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1396{ 1187{
1397 object *tmp = NULL, *arrow, *ntmp; 1188 object *tmp = NULL, *arrow, *ntmp;
1398 int attacknum, attacktype, betterby = 0, i; 1189 int attacknum, attacktype, betterby = 0, i;
1399 1190
1400 if (!type) 1191 if (!type)
… …
1404 { 1195 {
1405 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))
1406 { 1197 {
1407 i = 0; 1198 i = 0;
1408 ntmp = find_better_arrow (arrow, target, type, &i); 1199 ntmp = find_better_arrow (arrow, target, type, &i);
1200
1409 if (i > betterby) 1201 if (i > betterby)
1410 { 1202 {
1411 tmp = ntmp; 1203 tmp = ntmp;
1412 betterby = i; 1204 betterby = i;
1413 } 1205 }
1414 } 1206 }
1415 else if (arrow->type == ARROW && arrow->race == type) 1207 else if (arrow->type == ARROW && arrow->race == type)
1416 { 1208 {
1417 /* allways prefer assasination/slaying */ 1209 /* allways prefer assasination/slaying */
1418 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1210 if (target->race && arrow->slaying.contains (target->race))
1419 { 1211 {
1420 if (arrow->attacktype & AT_DEATH) 1212 if (arrow->attacktype & AT_DEATH)
1421 { 1213 {
1422 *better = 100; 1214 *better = 100;
1423 return arrow; 1215 return arrow;
… …
1438 { 1230 {
1439 tmp = arrow; 1231 tmp = arrow;
1440 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;
1441 } 1233 }
1442 } 1234 }
1235
1443 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1236 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1444 { 1237 {
1445 tmp = arrow; 1238 tmp = arrow;
1446 betterby = 2 + arrow->magic + arrow->stats.dam; 1239 betterby = 2 + arrow->magic + arrow->stats.dam;
1447 } 1240 }
1241
1448 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1242 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1449 { 1243 {
1450 tmp = arrow; 1244 tmp = arrow;
1451 betterby = 1 + arrow->magic + arrow->stats.dam; 1245 betterby = 1 + arrow->magic + arrow->stats.dam;
1452 } 1246 }
1453 } 1247 }
1454 } 1248 }
1455 } 1249 }
1250
1456 if (tmp == NULL && arrow == NULL) 1251 if (tmp == NULL && arrow == NULL)
1457 return find_arrow (op, type); 1252 return find_arrow (op, type);
1458 1253
1459 *better = betterby; 1254 *better = betterby;
1460 return tmp; 1255 return tmp;
… …
1465 * op = the shooter 1260 * op = the shooter
1466 * type = bow->race 1261 * type = bow->race
1467 * dir = fire direction 1262 * dir = fire direction
1468 */ 1263 */
1469object * 1264object *
1470pick_arrow_target (object *op, const char *type, int dir) 1265pick_arrow_target (object *op, shstr_cmp type, int dir)
1471{ 1266{
1472 object *tmp = NULL; 1267 object *tmp = NULL;
1473 maptile *m; 1268 maptile *m;
1474 int i, mflags, found, number; 1269 int i, mflags, found, number;
1475 sint16 x, y; 1270 sint16 x, y;
… …
1490 for (i = 0, found = 0; i < 20; i++) 1285 for (i = 0, found = 0; i < 20; i++)
1491 { 1286 {
1492 x += freearr_x[dir]; 1287 x += freearr_x[dir];
1493 y += freearr_y[dir]; 1288 y += freearr_y[dir];
1494 mflags = get_map_flags (m, &m, x, y, &x, &y); 1289 mflags = get_map_flags (m, &m, x, y, &x, &y);
1290
1495 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1291 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1496 { 1292 {
1497 tmp = NULL; 1293 tmp = 0;
1498 break; 1294 break;
1499 } 1295 }
1500 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)
1501 { 1297 {
1502 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1298 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1503 * perhaps a bad assumption. 1299 * perhaps a bad assumption.
1504 */ 1300 */
1505 tmp = NULL; 1301 tmp = 0;
1506 break; 1302 break;
1507 } 1303 }
1304
1508 if (mflags & P_IS_ALIVE) 1305 if (mflags & P_IS_ALIVE)
1509 {
1510 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)
1511 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1307 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1512 {
1513 found++;
1514 break;
1515 }
1516 if (found)
1517 break; 1308 break;
1518 }
1519 } 1309 }
1520 if (tmp == NULL) 1310
1311 if (!tmp)
1521 return find_arrow (op, type); 1312 return find_arrow (op, type);
1522 1313
1523 if (tmp->head) 1314 if (tmp->head)
1524 tmp = tmp->head; 1315 tmp = tmp->head;
1525 1316
… …
1565 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1356 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1566 return 0; 1357 return 0;
1567 } 1358 }
1568 1359
1569 // 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
1570 if (bow->below) 1361 splay (bow);
1571 {
1572 bow->remove ();
1573 op->insert (bow);
1574 }
1575
1576 } 1362 }
1577 1363
1578 if (!bow->race || !bow->skill) 1364 if (!bow->race || !bow->skill)
1579 { 1365 {
1580 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);
… …
1606 } 1392 }
1607 1393
1608 /* this should not happen, but sometimes does */ 1394 /* this should not happen, but sometimes does */
1609 if (arrow->nrof == 0) 1395 if (arrow->nrof == 0)
1610 { 1396 {
1397 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1611 arrow->destroy (); 1398 arrow->destroy ();
1612 return 0; 1399 return 0;
1613 } 1400 }
1614 1401
1615 left = arrow; /* these are arrows left to the player */ 1402 left = arrow; /* these are arrows left to the player */
1616 arrow = get_split_ob (arrow, 1); 1403 arrow = arrow->split ();
1617 if (!arrow) 1404 if (!arrow)
1618 { 1405 {
1619 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);
1620 return 0; 1407 return 0;
1621 } 1408 }
… …
1625 arrow->direction = dir; 1412 arrow->direction = dir;
1626 1413
1627 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 */
1628 arrow->stats.hp = arrow->stats.dam; 1415 arrow->stats.hp = arrow->stats.dam;
1629 arrow->stats.grace = arrow->attacktype; 1416 arrow->stats.grace = arrow->attacktype;
1630 1417 arrow->custom_name = arrow->slaying;
1631 if (arrow->slaying)
1632 arrow->spellarg = strdup (arrow->slaying);
1633 1418
1634#if 0 1419#if 0
1635 if (player *pl = op->contr) 1420 if (player *pl = op->contr)
1636 { 1421 {
1637 float speed = pl->weapon_sp; 1422 float speed = pl->weapon_sp;
… …
1683 1468
1684 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1469 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1685 arrow->move_type = MOVE_FLY_LOW; 1470 arrow->move_type = MOVE_FLY_LOW;
1686 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1471 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1687 1472
1688 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1473 op->play_sound (sound_find ("fire_arrow"));
1689 m->insert (arrow, sx, sy, op); 1474 m->insert (arrow, sx, sy, op);
1690 1475
1691 if (!arrow->destroyed ()) 1476 if (!arrow->destroyed ())
1692 move_arrow (arrow); 1477 move_arrow (arrow);
1693
1694 if (op->type == PLAYER)
1695 {
1696 if (left->destroyed ())
1697 esrv_del_item (op->contr, left->count);
1698 else
1699 esrv_send_item (op, left);
1700 }
1701 1478
1702 return 1; 1479 return 1;
1703} 1480}
1704 1481
1705/* Special fire code for players - this takes into 1482/* Special fire code for players - this takes into
… …
1710 * hence the function name. 1487 * hence the function name.
1711 */ 1488 */
1712int 1489int
1713player_fire_bow (object *op, int dir) 1490player_fire_bow (object *op, int dir)
1714{ 1491{
1715 int ret = 0, wcmod = 0; 1492 int ret;
1716 1493
1717 if (op->contr->bowtype == bow_bestarrow) 1494 if (op->contr->bowtype == bow_bestarrow)
1718 { 1495 {
1719 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);
1720 } 1497 }
1721 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)
1722 { 1499 {
1723 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1500 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1724 wcmod = -1;
1725
1726 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);
1727 } 1502 }
1728 else if (op->contr->bowtype == bow_threewide) 1503 else if (op->contr->bowtype == bow_threewide)
1729 { 1504 {
1730 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);
1731 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)]);
1732 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)]);
1733 } 1508 }
1734 else if (op->contr->bowtype == bow_spreadshot) 1509 else if (op->contr->bowtype == bow_spreadshot)
1735 { 1510 {
1736 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);
1737 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);
1738 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);
1739 } 1514 }
1740 else 1515 else
1741 { 1516 {
… …
1771 1546
1772 if (item->type == WAND) 1547 if (item->type == WAND)
1773 { 1548 {
1774 if (item->stats.food <= 0) 1549 if (item->stats.food <= 0)
1775 { 1550 {
1776 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1551 op->contr->play_sound (sound_find ("wand_poof"));
1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1552 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1778 1553
1779 return; 1554 return;
1780 } 1555 }
1781 } 1556 }
1782 else if (item->type == ROD || item->type == HORN) 1557 else if (item->type == ROD || item->type == HORN)
1783 { 1558 {
1784 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))
1785 { 1564 {
1786 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1565 op->contr->play_sound (sound_find ("wand_poof"));
1787 1566
1788 if (item->type == ROD) 1567 if (item->type == ROD)
1789 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));
1790 else 1569 else
1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1570 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1794 } 1573 }
1795 } 1574 }
1796 1575
1797 if (cast_spell (op, item, dir, item->inv, NULL)) 1576 if (cast_spell (op, item, dir, item->inv, NULL))
1798 { 1577 {
1799 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
1800 if (item->type == WAND) 1580 if (item->type == WAND)
1801 { 1581 {
1802 if (!(--item->stats.food)) 1582 if (!(--item->stats.food))
1803 { 1583 {
1804 object *tmp; 1584 object *tmp;
… …
1808 CLEAR_FLAG (item, FLAG_ANIMATE); 1588 CLEAR_FLAG (item, FLAG_ANIMATE);
1809 item->face = item->arch->face; 1589 item->face = item->arch->face;
1810 item->set_speed (0); 1590 item->set_speed (0);
1811 } 1591 }
1812 1592
1813 if ((tmp = item->in_player ())) 1593 if (object *pl = item->visible_to ())
1814 esrv_update_item (UPD_ANIM, tmp, item); 1594 esrv_update_item (UPD_ANIM, pl, item);
1815 } 1595 }
1816 } 1596 }
1817 else if (item->type == ROD || item->type == HORN) 1597 else if (item->type == ROD || item->type == HORN)
1818 drain_rod_charge (item); 1598 drain_rod_charge (item);
1819 } 1599 }
… …
1824bool 1604bool
1825fire (object *op, int dir) 1605fire (object *op, int dir)
1826{ 1606{
1827 int spellcost = 0; 1607 int spellcost = 0;
1828 1608
1829 /* check for loss of invisiblity/hide */
1830 if (action_makes_visible (op))
1831 make_visible (op);
1832
1833 player *pl = op->contr; 1609 player *pl = op->contr;
1834 1610
1835 if (pl->golem) 1611 if (pl->golem)
1836 { 1612 {
1837 control_golem (op->contr->golem, dir); 1613 control_golem (op->contr->golem, dir);
… …
1839 } 1615 }
1840 1616
1841 object *ob = pl->ranged_ob; 1617 object *ob = pl->ranged_ob;
1842 1618
1843 if (!ob) 1619 if (!ob)
1844 return false;
1845
1846 if (!op->change_weapon (ob))
1847 return false; 1620 return false;
1848 1621
1849 if (op->speed_left > 0.f) 1622 if (op->speed_left > 0.f)
1850 --op->speed_left; 1623 --op->speed_left;
1851 else 1624 else
1852 return false; 1625 return false;
1853 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
1854 switch (ob->type) 1634 switch (ob->type)
1855 { 1635 {
1856 case BOW: 1636 case BOW:
1857 player_fire_bow (op, dir); 1637 player_fire_bow (op, dir);
1858 break; 1638 break;
1859 1639
1860 case SPELL: 1640 case SPELL:
1861 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);
1862 break; 1642 break;
1863 1643
1864 case BUILDER: 1644 case BUILDER:
1865 apply_map_builder (op, dir); 1645 apply_map_builder (op, dir);
1866 break; 1646 break;
… …
1875 } 1655 }
1876 1656
1877 return true; 1657 return true;
1878} 1658}
1879 1659
1880/* find_key 1660static object *
1881 * We try to find a key for the door as passed. If we find a key
1882 * and successfully use it, we return the key, otherwise NULL
1883 * This function merges both normal and locked door, since the logic
1884 * for both is the same - just the specific key is different.
1885 * pl is the player,
1886 * inv is the objects inventory to searched
1887 * door is the door we are trying to match against.
1888 * This function can be called recursively to search containers.
1889 */
1890object *
1891find_key (object *pl, object *container, object *door) 1661find_key_ (object *pl, object *container, object *door)
1892{ 1662{
1893 object *tmp, *key; 1663 object *tmp, *key;
1894 1664
1895 /* Should not happen, but sanity checking is never bad */ 1665 /* Should not happen, but sanity checking is never bad */
1896 if (!container->inv) 1666 if (!container->inv)
… …
1899 /* 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 */
1900 for (tmp = container->inv; tmp; tmp = tmp->below) 1670 for (tmp = container->inv; tmp; tmp = tmp->below)
1901 { 1671 {
1902 if (door->type == DOOR && tmp->type == KEY) 1672 if (door->type == DOOR && tmp->type == KEY)
1903 break; 1673 break;
1674
1904 /* For sanity, we should really check door type, but other stuff 1675 /* For sanity, we should really check door type, but other stuff
1905 * (like containers) can be locked with special keys 1676 * (like containers) can be locked with special keys
1906 */ 1677 */
1907 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1678 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908 break; 1679 break;
… …
1914 * a key, return 1685 * a key, return
1915 */ 1686 */
1916 if (!tmp) 1687 if (!tmp)
1917 { 1688 {
1918 for (tmp = container->inv; tmp; tmp = tmp->below) 1689 for (tmp = container->inv; tmp; tmp = tmp->below)
1919 {
1920 /* No reason to search empty containers */ 1690 /* No reason to search empty containers */
1921 if (tmp->type == CONTAINER && tmp->inv) 1691 if (tmp->type == CONTAINER && tmp->inv)
1922 {
1923 if ((key = find_key (pl, tmp, door))) 1692 if ((key = find_key_ (pl, tmp, door)))
1924 return key; 1693 return key;
1925 }
1926 }
1927 1694
1928 if (!tmp) 1695 if (!tmp)
1929 return NULL; 1696 return 0;
1930 } 1697 }
1931 1698
1932 /* 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,
1933 * see if we actually want to use it 1700 * see if we actually want to use it
1934 */ 1701 */
1935 if (pl != container) 1702 if (pl != container)
1936 { 1703 {
1937 /* Only let players use keys in containers */ 1704 /* Only let players use keys in containers */
1938 if (!pl->contr) 1705 if (!pl->contr)
1939 return NULL; 1706 return 0;
1707
1940 /* cases where this fails: 1708 /* cases where this fails:
1941 * If we only search the player inventory, return now since we 1709 * If we only search the player inventory, return now since we
1942 * are not in the players inventory. 1710 * are not in the players inventory.
1943 * If the container is not active, return now since only active 1711 * If the container is not active, return now since only active
1944 * containers can be used. 1712 * containers can be used.
… …
1948 * inv must have been an container and must have been active. 1716 * inv must have been an container and must have been active.
1949 * 1717 *
1950 * Change the color so that the message doesn't disappear with 1718 * Change the color so that the message doesn't disappear with
1951 * all the others. 1719 * all the others.
1952 */ 1720 */
1953 if (pl->contr->usekeys == key_inventory || 1721 if (pl->contr->usekeys == key_inventory
1954 !QUERY_FLAG (container, FLAG_APPLIED) || 1722 || !QUERY_FLAG (container, FLAG_APPLIED)
1955 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1723 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1956 { 1724 {
1957 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1725 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1958 "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));
1959 return NULL; 1727 return NULL;
1960 } 1728 }
1961 } 1729 }
1962 1730
1963 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);
1964} 1757}
1965 1758
1966/* moved door processing out of move_player_attack. 1759/* moved door processing out of move_player_attack.
1967 * returns 1 if player has opened the door with a key 1760 * returns 1 if player has opened the door with a key
1968 * such that the caller should not do anything more, 1761 * such that the caller should not do anything more,
… …
1980 /* If we found a key, do some extra work */ 1773 /* If we found a key, do some extra work */
1981 if (key) 1774 if (key)
1982 { 1775 {
1983 object *container = key->env; 1776 object *container = key->env;
1984 1777
1985 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1987 if (action_makes_visible (op)) 1778 if (action_makes_visible (op))
1988 make_visible (op); 1779 make_visible (op);
1989 1780
1990 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1781 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1991 spring_trap (door->inv, op); 1782 spring_trap (door->inv, op);
1992 1783
1993 if (door->type == DOOR) 1784 if (door->type == DOOR)
1994 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 */
1995 else if (door->type == LOCKED_DOOR) 1786 else if (door->type == LOCKED_DOOR)
1996 { 1787 {
1997 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);
1998 remove_door2 (door); /* remove door without violence ;-) */ 1789 remove_door2 (door); /* remove door without violence ;-) */
1999 } 1790 }
2000 1791
2001 /* Do this after we print the message */ 1792 /* Do this after we print the message */
2002 decrease_ob (key); /* Use up one of the keys */ 1793 key->decrease (); /* Use up one of the keys */
2003 /* Need to update the weight the container the key was in */
2004 if (container != op)
2005 esrv_update_item (UPD_WEIGHT, op, container);
2006 1794
2007 return 1; /* Nothing more to do below */ 1795 return 1; /* Nothing more to do below */
2008 } 1796 }
2009 else if (door->type == LOCKED_DOOR) 1797 else if (door->type == LOCKED_DOOR)
2010 { 1798 {
2011 /* Might as well return now - no other way to open this */ 1799 /* Might as well return now - no other way to open this */
2012 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...");
2013 return 1; 1801 return 1;
2014 } 1802 }
2015 1803
2016 return 0; 1804 return 0;
2017} 1805}
… …
2023 * going to try and move (not fire weapons). 1811 * going to try and move (not fire weapons).
2024 */ 1812 */
2025bool 1813bool
2026move_player_attack (object *op, int dir) 1814move_player_attack (object *op, int dir)
2027{ 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
2028 int on_battleground; 1822 int on_battleground;
2029 1823
2030 sint16 nx = freearr_x[dir] + op->x; 1824 sint16 nx = freearr_x[dir] + op->x;
2031 sint16 ny = freearr_y[dir] + op->y; 1825 sint16 ny = freearr_y[dir] + op->y;
2032 1826
2033 on_battleground = op_on_battleground (op, 0, 0); 1827 on_battleground = op_on_battleground (op, 0, 0);
2034 1828
2035 if (out_of_map (op->map, nx, ny)) 1829 if (out_of_map (op->map, nx, ny))
2036 return false; 1830 return false;
2037
2038 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2039 {
2040 --op->speed_left;
2041 return true;
2042 }
2043 1831
2044 /* 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
2045 * 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
2046 * 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
2047 * player. This is a pretty nasty hack, because if we could 1835 * player. This is a pretty nasty hack, because if we could
… …
2104 1892
2105 if (op->speed_left > 0.f) 1893 if (op->speed_left > 0.f)
2106 { 1894 {
2107 --op->speed_left; 1895 --op->speed_left;
2108 1896
2109 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1897 op->play_sound (sound_find ("push_player"));
2110 push_ob (mon, dir, op); 1898 push_ob (mon, dir, op);
2111 1899
2112 if (op->contr->tmp_invis || op->hide) 1900 if (action_makes_visible (op))
2113 make_visible (op); 1901 make_visible (op);
2114 1902
2115 return true; 1903 return true;
2116 } 1904 }
2117 else 1905 else
… …
2133 { 1921 {
2134 --op->speed_left; 1922 --op->speed_left;
2135 1923
2136 if (!op->contr->braced) 1924 if (!op->contr->braced)
2137 { 1925 {
2138 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1926 op->play_sound (sound_find ("push_player"));
2139 push_ob (mon, dir, op); 1927 push_ob (mon, dir, op);
2140 } 1928 }
2141 else 1929 else
2142 new_draw_info (0, 0, op, "You withhold your attack"); 1930 op->statusmsg ("You withhold your attack");
2143 1931
2144 if (op->contr->tmp_invis || op->hide) 1932 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2145 make_visible (op); 1933 make_visible (op);
2146 1934
2147 return true; 1935 return true;
2148 } 1936 }
2149 } 1937 }
… …
2191bool 1979bool
2192move_player (object *op, int dir) 1980move_player (object *op, int dir)
2193{ 1981{
2194 int pick; 1982 int pick;
2195 1983
2196 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 1984 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2197 return 0; 1985 return 0;
2198 1986
2199 /* Sanity check: make sure dir is valid */ 1987 /* Sanity check: make sure dir is valid */
2200 if ((dir < 0) || (dir >= 9)) 1988 if ((dir < 0) || (dir >= 9))
2201 { 1989 {
… …
2207 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 1995 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2208 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1996 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2209 1997
2210 op->facing = dir; 1998 op->facing = dir;
2211 1999
2212 if (op->hide) 2000 if (op->flag [FLAG_HIDDEN])
2213 do_hidden_move (op); 2001 do_hidden_move (op);
2214 2002
2215 bool retval; 2003 bool retval;
2216 2004
2217 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2005 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2286 return 0; 2074 return 0;
2287 2075
2288 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2076 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2289 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2077 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2290 { 2078 {
2291 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2079 op->play_sound (sound_find ("ob_evaporate"));
2292 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));
2293
2294 if (op->contr)
2295 esrv_del_item (op->contr, tmp->count);
2296 2081
2297 tmp->destroy (); 2082 tmp->destroy ();
2298 CLEAR_FLAG (op, FLAG_LIFESAVE); 2083 CLEAR_FLAG (op, FLAG_LIFESAVE);
2299 2084
2300 if (op->stats.hp < 0) 2085 if (op->stats.hp < 0)
… …
2313 return 0; 2098 return 0;
2314} 2099}
2315 2100
2316/* 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
2317 * 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
2318 * 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
2319 * from. 2104 * from.
2320 */ 2105 */
2106static void
2107drop_unpaid_items (object *op, object *env)
2108{
2109 while (op)
2110 {
2111 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2112
2113 if (QUERY_FLAG (op, FLAG_UNPAID))
2114 op->insert_at (env);
2115 else if (op->inv)
2116 drop_unpaid_items (op->inv, env);
2117
2118 op = next;
2119 }
2120}
2121
2321void 2122void
2322remove_unpaid_objects (object *op, object *env) 2123object::drop_unpaid_items ()
2323{ 2124{
2324 while (op) 2125 if (!flag [FLAG_REMOVED])
2325 { 2126 ::drop_unpaid_items (inv, this);
2326 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2327
2328 if (QUERY_FLAG (op, FLAG_UNPAID))
2329 {
2330 if (env->type == PLAYER)
2331 esrv_del_item (env->contr, op->count);
2332
2333 op->insert_at (env);
2334 }
2335 else if (op->inv)
2336 remove_unpaid_objects (op->inv, env);
2337
2338 op = next;
2339 }
2340} 2127}
2341 2128
2342/* 2129/*
2343 * Returns pointer a static string containing gravestone text 2130 * Returns pointer a static string containing gravestone text
2344 * Moved from apply.c to player.c - player.c is what 2131 * Moved from apply.c to player.c - player.c is what
2345 * actually uses this function. player.c may not be quite the 2132 * actually uses this function. player.c may not be quite the
2346 * best, a misc file for object actions is probably better, 2133 * best, a misc file for object actions is probably better,
2347 * but there isn't one in the server directory. 2134 * but there isn't one in the server directory.
2348 */ 2135 */
2349char * 2136const char *
2350gravestone_text (object *op) 2137gravestone_text (object *op)
2351{ 2138{
2352 static char buf2[MAX_BUF]; 2139 static dynbuf_text buf;
2353 char buf[MAX_BUF];
2354 time_t now = time (NULL);
2355 2140
2356 strcpy (buf2, " R.I.P.\n\n"); 2141 buf << "---- R.I.P. ----\n\n"
2142 << op->name;
2143
2357 if (op->type == PLAYER) 2144 if (op->type == PLAYER)
2358 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2145 buf << " the " << op->contr->title;
2359 else
2360 sprintf (buf, "%s\n", &op->name);
2361 2146
2362 strncat (buf2, " ", 20 - strlen (buf) / 2); 2147 buf << "\n\n";
2363 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
2364 if (op->type == PLAYER) 2153 if (op->type == PLAYER)
2365 sprintf (buf, "who was in level %d when killed\n", op->level); 2154 buf << "by " << op->contr->killer_name () << ".\n\n";
2366 else
2367 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2368 2155
2369 strncat (buf2, " ", 20 - strlen (buf) / 2);
2370 strcat (buf2, buf);
2371 if (op->type == PLAYER)
2372 { 2156 {
2373 sprintf (buf, "by %s.\n\n", op->contr->killer); 2157 static char buf2[128];
2374 strncat (buf2, " ", 21 - strlen (buf) / 2); 2158 time_t now = time (NULL);
2375 strcat (buf2, buf);
2376 }
2377
2378 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2159 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2379 strncat (buf2, " ", 20 - strlen (buf) / 2); 2160 buf << buf2;
2380 strcat (buf2, buf); 2161 }
2381 2162
2382 return buf2; 2163 return buf;
2383} 2164}
2384 2165
2385void 2166void
2386do_some_living (object *op) 2167do_some_living (object *op)
2387{ 2168{
… …
2439 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2220 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2440 else 2221 else
2441 { 2222 {
2442 gen_grace = op->stats.maxgrace; 2223 gen_grace = op->stats.maxgrace;
2443 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2224 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2444 }
2445
2446 /* Regenerate Spell Points */
2447 if (!op->contr->golem && --op->last_sp < 0)
2448 {
2449 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2450 if (op->stats.sp < op->stats.maxsp)
2451 {
2452 op->stats.sp++;
2453 /* dms do not consume food */
2454 if (!QUERY_FLAG (op, FLAG_WIZ))
2455 {
2456 op->stats.food--;
2457 if (op->contr->digestion < 0)
2458 op->stats.food += op->contr->digestion;
2459 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2460 op->stats.food = last_food;
2461 }
2462 }
2463
2464 if (max_sp > 1)
2465 {
2466 over_sp = (gen_sp + 10) / rate_sp;
2467 if (over_sp > 0)
2468 {
2469 if (op->stats.sp < op->stats.maxsp)
2470 {
2471 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2472
2473 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2474 op->stats.sp--;
2475
2476 if (op->stats.sp > op->stats.maxsp)
2477 op->stats.sp = op->stats.maxsp;
2478 }
2479 op->last_sp = 0;
2480 }
2481 else
2482 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483 }
2484 else
2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486 } 2225 }
2487 2226
2488 /* Regenerate Grace */ 2227 /* Regenerate Grace */
2489 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2228 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2490 if (--op->last_grace < 0) 2229 if (--op->last_grace < 0)
… …
2511 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2250 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2512 } 2251 }
2513 /* wearing stuff doesn't detract from grace generation. */ 2252 /* wearing stuff doesn't detract from grace generation. */
2514 } 2253 }
2515 2254
2255 if (op->stats.food > 0)
2256 {
2516 /* Regenerate Hit Points */ 2257 /* Regenerate Spell Points */
2517 if (--op->last_heal < 0) 2258 if (!op->contr->golem && --op->last_sp < 0)
2518 {
2519 if (op->stats.hp < op->stats.maxhp)
2520 { 2259 {
2521 op->stats.hp++; 2260 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2522 /* dms do not consume food */ 2261
2523 if (!QUERY_FLAG (op, FLAG_WIZ)) 2262 if (op->stats.sp < op->stats.maxsp)
2524 { 2263 {
2264 op->stats.sp++;
2265
2266 /* dms do not consume food */
2267 if (!QUERY_FLAG (op, FLAG_WIZ))
2268 {
2525 op->stats.food--; 2269 op->stats.food--;
2270
2526 if (op->contr->digestion < 0) 2271 if (op->contr->digestion < 0)
2527 op->stats.food += op->contr->digestion; 2272 op->stats.food += op->contr->digestion;
2528 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2273 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2529 op->stats.food = last_food; 2274 op->stats.food = last_food;
2275 }
2530 } 2276 }
2531 }
2532 2277
2533 if (max_hp > 1) 2278 if (max_sp > 1)
2534 {
2535 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2536 if (over_hp > 0)
2537 { 2279 {
2538 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2280 over_sp = (gen_sp + 10) / rate_sp;
2281 if (over_sp > 0)
2282 {
2283 if (op->stats.sp < op->stats.maxsp)
2284 {
2285 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2286
2287 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2288 op->stats.sp--;
2289
2290 if (op->stats.sp > op->stats.maxsp)
2291 op->stats.sp = op->stats.maxsp;
2292 }
2293
2539 op->last_heal = 0; 2294 op->last_sp = 0;
2295 }
2296 else
2297 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2540 } 2298 }
2541 else 2299 else
2300 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2301 }
2302
2303 /* Regenerate Hit Points */
2304 if (--op->last_heal < 0)
2305 {
2306 if (op->stats.hp < op->stats.maxhp)
2542 { 2307 {
2543 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2308 op->stats.hp++;
2309
2310 /* dms do not consume food */
2311 if (!QUERY_FLAG (op, FLAG_WIZ))
2312 {
2313 op->stats.food--;
2314
2315 if (op->contr->digestion < 0)
2316 op->stats.food += op->contr->digestion;
2317 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2318 op->stats.food = last_food;
2319 }
2544 } 2320 }
2321
2322 if (max_hp > 1)
2323 {
2324 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2325
2326 if (over_hp > 0)
2327 {
2328 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2329 op->last_heal = 0;
2330 }
2331 else
2332 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545 } 2333 }
2546 else 2334 else
2547 {
2548 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2335 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2549 } 2336 }
2550 } 2337 }
2551 2338
2552 /* Digestion */ 2339 /* Digestion */
2553 if (--op->last_eat < 0) 2340 if (--op->last_eat < 0)
2554 { 2341 {
2555 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2342 int bonus = max (0, op->contr->digestion),
2343 penalty = max (0, -op->contr->digestion);
2556 2344
2557 if (op->contr->gen_hp > 0)
2558 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2345 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2559 else
2560 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561 2346
2562 /* dms do not consume food */ 2347 /* dms do not consume food */
2563 if (!QUERY_FLAG (op, FLAG_WIZ)) 2348 if (!QUERY_FLAG (op, FLAG_WIZ))
2564 op->stats.food--; 2349 op->stats.food--;
2565 } 2350 }
2566 2351
2567 if (op->stats.food < 0 && op->stats.hp >= 0) 2352 if (op->stats.food < 0 && op->stats.hp >= 0)
2568 { 2353 {
2569 object *tmp, *flesh = 0; 2354 object *flesh = 0;
2570 2355
2571 for (tmp = op->inv; tmp; tmp = tmp->below) 2356 for_inv_removable (op, tmp)
2572 { 2357 {
2573 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)
2574 { 2362 {
2575 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2363 op->statusmsg ("You blindly grab for a bite of food. "
2576 { 2364 "H<To prevent you from starving, you ate some random item from your backpack.>");
2577 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2578 manual_apply (op, tmp, 0); 2365 manual_apply (op, tmp, 0);
2366
2579 if (op->stats.food >= 0 || op->stats.hp < 0) 2367 if (op->stats.food >= 0 || op->stats.hp < 0)
2580 break; 2368 break;
2581 } 2369 }
2582 else if (tmp->type == FLESH) 2370 else if (tmp->type == FLESH)
2583 flesh = tmp; 2371 flesh = tmp;
2584 } /* End if paid for object */ 2372 }
2585 } /* end of for loop */
2586 2373
2587 /* 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
2588 * eat flesh instead. 2375 * eat flesh instead.
2589 */ 2376 */
2590 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2377 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2591 { 2378 {
2592 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.>");
2593 manual_apply (op, flesh, 0); 2381 manual_apply (op, flesh, 0);
2594 } 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.>");
2388 }
2389
2390 if (op->stats.food < 0)
2595 } 2391 {
2392 op->stats.hp += op->stats.food;
2393 op->stats.food = 0;
2596 2394
2597 while (op->stats.food < 0 && op->stats.hp >= 0) 2395 if (op->stats.hp < 0)
2598 op->stats.food++, op->stats.hp--; 2396 {
2397 op->contr->killer = archetype::get ("killer_starvation");
2398 op->contr->killer->destroy ();
2399 }
2400 }
2599 2401
2402 /* killer should be set here already */
2600 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2403 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2601 kill_player (op); 2404 kill_player (op);
2602 } 2405 }
2603} 2406}
2604 2407
… …
2608 * file. 2411 * file.
2609 */ 2412 */
2610void 2413void
2611kill_player (object *op) 2414kill_player (object *op)
2612{ 2415{
2613 char buf[MAX_BUF];
2614 int x, y; 2416 int x, y;
2615
2616 //int i;
2617 maptile *map; /* this is for resurrection */ 2417 maptile *map; /* this is for resurrection */
2618
2619 /* int z;
2620 int num_stats_lose;
2621 int lost_a_stat;
2622 int lose_this_stat;
2623 int this_stat; */
2624 int will_kill_again; 2418 int will_kill_again;
2625 archetype *at; 2419 archetype *at;
2626 object *tmp; 2420 object *tmp;
2627 2421
2628 if (save_life (op)) 2422 if (save_life (op))
2629 return; 2423 return;
2630 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 }
2631 2462
2632 /* 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
2633 * 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.
2634 * Look at op_on_battleground() for more info --AndreasV 2465 * Look at op_on_battleground() for more info --AndreasV
2635 */ 2466 */
2636 if (op_on_battleground (op, &x, &y)) 2467 if (op_on_battleground (op, &x, &y))
2637 { 2468 {
2638 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";
2639 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2640
2641 /* restore player */
2642 at = archetype::find ("poisoning");
2643 if (object *tmp = present_arch_in_ob (at, op))
2644 {
2645 tmp->destroy ();
2646 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2647 }
2648
2649 at = archetype::find ("confusion");
2650 if (object *tmp = present_arch_in_ob (at, op))
2651 {
2652 tmp->destroy ();
2653 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2654 }
2655
2656 cure_disease (op, 0); /* remove any disease */
2657 op->stats.hp = op->stats.maxhp;
2658 if (op->stats.food <= 0)
2659 op->stats.food = 999;
2660 2470
2661 /* create a bodypart-trophy to make the winner happy */ 2471 /* create a bodypart-trophy to make the winner happy */
2662 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2472 if (object *tmp = arch_to_object (archetype::find ("finger")))
2663 { 2473 {
2664 sprintf (buf, "%s's finger", &op->name); 2474 tmp->name = format ("%s's finger" , &op->name);
2665 tmp->name = buf; 2475 tmp->name_pl = format ("%s's fingers", &op->name);
2666 sprintf (buf, " This finger has been cut off %s\n"
2667 " the %s, when he was defeated at\n level %d by %s.\n",
2668 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2669 tmp->msg = buf; 2476 tmp->msg = format (
2477 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2478 &op->name, op->contr->title,
2479 (int)op->level,
2480 op->contr->killer_name ()
2481 );
2670 tmp->value = 0, tmp->type = 0; 2482 tmp->value = 0, tmp->type = 0;
2671 tmp->materialname = "organics"; 2483 tmp->materialname = "organics";
2672 tmp->insert_at (op, tmp); 2484 tmp->insert_at (op, tmp);
2673 } 2485 }
2674 2486
2675 /* teleport defeated player to new destination */ 2487 /* teleport defeated player to new destination */
2676 transfer_ob (op, x, y, 0, NULL); 2488 transfer_ob (op, x, y, 0, NULL);
2677 op->contr->braced = 0; 2489 op->contr->braced = 0;
2490
2491 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2678 return; 2492 return;
2679 } 2493 }
2680 2494
2495 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2496 deathtab << "T<YOU HAVE DIED>\n\n";
2497
2681 INVOKE_PLAYER (DEATH, op->contr); 2498 INVOKE_PLAYER (DEATH, op->contr);
2682 2499
2683 command_kill_pets (op, 0); 2500 command_kill_pets (op, 0);
2684 2501
2685 if (op->stats.food < 0) 2502 op->contr->play_sound (sound_find ("player_dies"));
2686 {
2687 sprintf (buf, "%s starved to death.", &op->name);
2688 strcpy (op->contr->killer, "starvation");
2689 }
2690 else
2691 sprintf (buf, "%s died.", &op->name);
2692
2693 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2694 2503
2695 /* save the map location for corpse, gravestone */ 2504 /* save the map location for corpse, gravestone */
2696 x = op->x; 2505 x = op->x;
2697 y = op->y; 2506 y = op->y;
2698 map = op->map; 2507 map = op->map;
… …
2726 2535
2727 lost_a_stat = 0; 2536 lost_a_stat = 0;
2728 2537
2729 for (z = 0; z < num_stats_lose; z++) 2538 for (z = 0; z < num_stats_lose; z++)
2730 { 2539 {
2731 i = RANDOM () % NUM_STATS; 2540 i = rndm (NUM_STATS);
2732 2541
2733 if (settings.stat_loss_on_death) 2542 if (settings.stat_loss_on_death)
2734 { 2543 {
2735 /* 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
2736 * what he lost. 2545 * what he lost.
… …
2787 } 2596 }
2788 } 2597 }
2789 2598
2790 if (lose_this_stat) 2599 if (lose_this_stat)
2791 { 2600 {
2792 this_stat = get_attr_value (&(dep->stats), i); 2601 this_stat = get_attr_value (&dep->stats, i);
2793 /* We could try to do something clever like find another 2602 /* We could try to do something clever like find another
2794 * stat to reduce if this fails. But chances are, if 2603 * stat to reduce if this fails. But chances are, if
2795 * stats have been depleted to -50, all are pretty low 2604 * stats have been depleted to -50, all are pretty low
2796 * 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
2797 * difference. 2606 * difference.
… …
2805 lost_a_stat = 1; 2614 lost_a_stat = 1;
2806 } 2615 }
2807 } 2616 }
2808 } 2617 }
2809 } 2618 }
2619
2810 /* If no stat lost, tell the player. */ 2620 /* If no stat lost, tell the player. */
2811 if (!lost_a_stat) 2621 if (!lost_a_stat)
2812 { 2622 {
2813 /* determine_god() seems to not work sometimes... why is this? 2623 /* determine_god() seems to not work sometimes... why is this?
2814 Should I be using something else? GD */ 2624 Should I be using something else? GD */
2815 const char *god = determine_god (op); 2625 shstr_tmp god = determine_god (op);
2816 2626
2817 if (god && (strcmp (god, "none"))) 2627 if (god != shstr_none)
2818 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";
2819 else 2629 else
2820 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";
2821 } 2631 }
2822#else 2632#else
2823 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.";
2824#endif 2634#endif
2825 2635
2826 /* Put a gravestone up where the character 'almost' died. List the 2636 /* Put a gravestone up where the character 'almost' died. List the
2827 * exp loss on the stone. 2637 * exp loss on the stone.
2828 */ 2638 */
2829 tmp = arch_to_object (archetype::find ("gravestone")); 2639 tmp = arch_to_object (archetype::find ("gravestone"));
2830 sprintf (buf, "%s's gravestone", &op->name); 2640 tmp->name = format ("%s's gravestone", &op->name);
2831 tmp->name = buf; 2641 tmp->name_pl = format ("%s's gravestones", &op->name);
2832 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",
2833 tmp->name_pl = buf; 2643 &op->name, op->contr->title, op->contr->killer_name ());
2834 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);
2835 tmp->msg = buf;
2836 tmp->x = op->x, tmp->y = op->y; 2644 tmp->x = op->x, tmp->y = op->y;
2837 insert_ob_in_map (tmp, op->map, NULL, 0); 2645 insert_ob_in_map (tmp, op->map, NULL, 0);
2838 2646
2839 /**************************************/ 2647 /**************************************/
2840 /* */ 2648 /* */
2841 /* Subtract the experience points, */ 2649 /* Subtract the experience points, */
2842 /* if we died cause of food, give us */
2843 /* food, and reset HP's... */
2844 /* */ 2650 /* */
2845 /**************************************/ 2651 /**************************************/
2846 2652
2847 /* remove any poisoning and confusion the character may be suffering. */
2848 /* restore player */
2849 at = archetype::find ("poisoning");
2850 tmp = present_arch_in_ob (at, op);
2851
2852 if (tmp)
2853 {
2854 tmp->destroy ();
2855 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2856 }
2857
2858 at = archetype::find ("confusion");
2859 tmp = present_arch_in_ob (at, op);
2860 if (tmp)
2861 {
2862 tmp->destroy ();
2863 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2864 }
2865
2866 cure_disease (op, 0); /* remove any disease */
2867
2868 /*add_exp(op, (op->stats.exp * -0.20)); */ 2653 /*add_exp(op, (op->stats.exp * -0.20)); */
2869 apply_death_exp_penalty (op); 2654 apply_death_exp_penalty (op);
2870 if (op->stats.food < 100)
2871 op->stats.food = 900;
2872 op->stats.hp = op->stats.maxhp;
2873 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2874 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2875 2655
2876 /* 2656 /*
2877 * 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
2878 * and put them back in the map. 2658 * and put them back in the map.
2879 */ 2659 */
2880 remove_unpaid_objects (op->inv, op); 2660 op->drop_unpaid_items ();
2881 2661
2882 /****************************************/ 2662 /****************************************/
2883 /* */ 2663 /* */
2884 /* Move player to his current respawn- */ 2664 /* Move player to his current respawn- */
2885 /* position (usually last savebed) */ 2665 /* position (usually last savebed) */
… …
2914 if (will_kill_again & (1 << at)) 2694 if (will_kill_again & (1 << at))
2915 force->resist[at] = 100; 2695 force->resist[at] = 100;
2916 2696
2917 insert_ob_in_ob (force, op); 2697 insert_ob_in_ob (force, op);
2918 op->update_stats (); 2698 op->update_stats ();
2919
2920 } 2699 }
2921 2700
2922 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2701 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2923} 2702}
2924 2703
2925void 2704void
2926loot_object (object *op) 2705loot_object (object *op)
2927{ /* Grab and destroy some treasure */ 2706{ /* Grab and destroy some treasure */
… …
2944 2723
2945 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))))
2946 { 2725 {
2947 if (tmp->nrof > 1) 2726 if (tmp->nrof > 1)
2948 { 2727 {
2949 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2728 tmp->decrease (rndm (1, tmp->nrof - 1));
2950 tmp2->destroy ();
2951 insert_ob_in_map (tmp, op->map, NULL, 0); 2729 insert_ob_in_map (tmp, op->map, NULL, 0);
2952 } 2730 }
2953 else 2731 else
2954 tmp->destroy (); 2732 tmp->destroy ();
2955 } 2733 }
… …
2966void 2744void
2967fix_weight (void) 2745fix_weight (void)
2968{ 2746{
2969 for_all_players (pl) 2747 for_all_players (pl)
2970 { 2748 {
2971 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2749 sint32 old = pl->ob->carrying;
2972 2750
2973 if (old == sum) 2751 pl->ob->update_weight ();
2974 continue; 2752
2753 if (old != pl->ob->carrying)
2754 {
2975 pl->ob->update_stats (); 2755 pl->ob->update_stats ();
2976 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 }
2977 } 2758 }
2978} 2759}
2979 2760
2980void 2761void
2981fix_luck (void) 2762fix_luck (void)
… …
3023} 2804}
3024 2805
3025void 2806void
3026make_visible (object *op) 2807make_visible (object *op)
3027{ 2808{
3028 op->hide = 0; 2809 op->flag [FLAG_HIDDEN] = 0;
3029 op->invisible = 0; 2810 op->invisible = 0;
2811
3030 if (op->type == PLAYER) 2812 if (op->type == PLAYER)
3031 { 2813 {
3032 op->contr->tmp_invis = 0; 2814 op->contr->tmp_invis = 0;
3033 op->contr->invis_race = 0; 2815 op->contr->invis_race = 0;
3034 } 2816 }
… …
3047 2829
3048/* look at the surrounding terrain to determine 2830/* look at the surrounding terrain to determine
3049 * the hideability of this object. Positive levels 2831 * the hideability of this object. Positive levels
3050 * indicate greater hideability. 2832 * indicate greater hideability.
3051 */ 2833 */
3052
3053int 2834int
3054hideability (object *ob) 2835hideability (object *ob)
3055{ 2836{
3056 int i, level = 0, mflag; 2837 int i, level = 0, mflag;
3057 sint16 x, y; 2838 sint16 x, y;
3058 2839
3059 if (!ob || !ob->map) 2840 if (!ob || !ob->map)
3060 return 0; 2841 return 0;
3061 2842
3062 /* so, on normal lighted maps, its hard to hide */ 2843 /* so, on normal lighted maps, its hard to hide */
3063 level = ob->map->darkness - 2; 2844 level = ob->map->darklevel () - 2;
3064 2845
3065 /* this also picks up whether the object is glowing. 2846 /* this also picks up whether the object is glowing.
3066 * 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
3067 * as bad as carrying a light on a pitch dark map */ 2848 * as bad as carrying a light on a pitch dark map */
3068 if (has_carried_lights (ob)) 2849 if (ob->has_carried_lights ())
3069 level = -(10 + (2 * ob->map->darkness)); 2850 level = -(10 + (2 * ob->map->darklevel ()));
3070 2851
3071 /* scan through all nearby squares for terrain to hide in */ 2852 /* scan through all nearby squares for terrain to hide in */
3072 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])
3073 { 2856 {
3074 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2857 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3075 if (mflag & P_OUT_OF_MAP) 2858 if (mflag & P_OUT_OF_MAP)
3076 {
3077 continue; 2859 continue;
3078 } 2860
3079 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2861 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3080 level += 2; 2862 level += 2;
3081 else /* open terrain! */ 2863 else /* open terrain! */
3082 level -= 1; 2864 level -= 1;
3083 } 2865 }
… …
3094 * spot (surrounded by clear terrain in broad daylight). -b.t. 2876 * spot (surrounded by clear terrain in broad daylight). -b.t.
3095 */ 2877 */
3096void 2878void
3097do_hidden_move (object *op) 2879do_hidden_move (object *op)
3098{ 2880{
3099 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2881 int hide = 0;
3100 object *skop;
3101 2882
3102 if (!op || !op->map) 2883 if (!op || !op->map)
3103 return; 2884 return;
3104 2885
3105 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);
3106 2888
3107 /* 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! */
3108 if (op->type == PLAYER && op->contr->run_on) 2890 if (op->type == PLAYER && op->contr->run_on)
3109 if (!skop || num >= skop->level) 2891 if (!skop || num >= skop->level)
3110 { 2892 {
… …
3120 num -= hide; 2902 num -= hide;
3121 2903
3122 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2904 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3123 { 2905 {
3124 make_visible (op); 2906 make_visible (op);
2907
3125 if (op->type == PLAYER) 2908 if (op->type == PLAYER)
3126 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!");
3127 } 2910 }
3128 else if (op->type == PLAYER && skop) 2911 else if (op->type == PLAYER && skop)
3129 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);
… …
3182 * object op. This function works fine for monsters, 2965 * object op. This function works fine for monsters,
3183 * but we dont worry if the object isnt the top one in 2966 * but we dont worry if the object isnt the top one in
3184 * a pile (say a coin under a table would return "viewable" 2967 * a pile (say a coin under a table would return "viewable"
3185 * by this routine). Another question, should we be 2968 * by this routine). Another question, should we be
3186 * concerned with the direction the player is looking 2969 * concerned with the direction the player is looking
3187 * in? Realistically, most of use cant see stuff behind 2970 * in? Realistically, most of us can't see stuff behind
3188 * our backs...on the other hand, does the "facing" direction 2971 * our backs...on the other hand, does the "facing" direction
3189 * imply the way your head, or body is facing? Its possible 2972 * imply the way your head, or body is facing? It's possible
3190 * for them to differ. Sigh, this fctn could get a bit more complex. 2973 * for them to differ. Sigh, this fctn could get a bit more complex.
3191 * -b.t. 2974 * -b.t.
3192 * This function is now map tiling safe. 2975 * This function is now map tiling safe.
3193 */ 2976 */
3194
3195int 2977int
3196player_can_view (object *pl, object *op) 2978player_can_view (object *pl, object *op)
3197{ 2979{
3198 rv_vector rv; 2980 rv_vector rv;
3199 int dx, dy; 2981 int dx, dy;
… …
3211 2993
3212 get_rangevector (pl, op, &rv, 0x1); 2994 get_rangevector (pl, op, &rv, 0x1);
3213 2995
3214 /* starting with the 'head' part, lets loop 2996 /* starting with the 'head' part, lets loop
3215 * through the object and find if it has any 2997 * through the object and find if it has any
3216 * part that is in the los array but isnt on 2998 * part that is in the los array but isn't on
3217 * a blocked los square. 2999 * a blocked los square.
3218 * we use the archetype to figure out offsets. 3000 * we use the archetype to figure out offsets.
3219 */ 3001 */
3220 while (op) 3002 while (op)
3221 { 3003 {
3222 dx = rv.distance_x + op->arch->x; 3004 dx = rv.distance_x + op->arch->x;
3223 dy = rv.distance_y + op->arch->y; 3005 dy = rv.distance_y + op->arch->y;
3224 3006
3225 /* only the viewable area the player sees is updated by LOS 3007 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3226 * code, so we need to restrict ourselves to that range of values
3227 * for any meaningful values.
3228 */
3229 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3230 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3231 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3232 return 1; 3008 return 1;
3009
3233 op = op->more; 3010 op = op->more;
3234 } 3011 }
3012
3235 return 0; 3013 return 0;
3236} 3014}
3237 3015
3238/* routine for both players and monsters. We call this when 3016/* routine for both players and monsters. We call this when
3239 * there is a possibility for our action distrubing our hiding 3017 * there is a possibility for our action distrubing our hiding
3240 * place or invisiblity spell. Artefact invisiblity is not 3018 * place or invisiblity spell. Artefact invisiblity causes
3241 * effected by this. If we arent invisible to begin with, we 3019 * "noise" instead. If we arent invisible to begin with, we
3242 * return 0. 3020 * return 0.
3243 */ 3021 */
3244int 3022int
3245action_makes_visible (object *op) 3023action_makes_visible (object *op)
3246{ 3024{
3247
3248 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3025 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3249 { 3026 {
3250 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
3251 return 0; 3034 return 0;
3035 }
3252 3036
3253 if (op->contr && op->contr->tmp_invis == 0) 3037 if (op->contr && op->contr->tmp_invis == 0)
3254 return 0; 3038 return 0;
3255 3039
3256 /* If monsters, they should become visible */ 3040 /* If monsters, they should become visible */
3257 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))
3258 { 3042 {
3259 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");
3260 return 1; 3044 return 1;
3261 } 3045 }
3262 } 3046 }
3047
3263 return 0; 3048 return 0;
3264} 3049}
3265 3050
3266/* op_on_battleground - checks if the given object op (usually 3051/* op_on_battleground - checks if the given object op (usually
3267 * a player) is standing on a valid battleground-tile, 3052 * a player) is standing on a valid battleground-tile,
… …
3272 * Default is to do the same as before, so only people wanting to have different points need worry about this 3057 * Default is to do the same as before, so only people wanting to have different points need worry about this
3273 */ 3058 */
3274int 3059int
3275op_on_battleground (object *op, int *x, int *y) 3060op_on_battleground (object *op, int *x, int *y)
3276{ 3061{
3277 object *tmp;
3278
3279 /* A battleground-tile needs the following attributes to be valid: 3062 /* A battleground-tile needs the following attributes to be valid:
3280 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3063 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3281 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3064 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3282 * and the exit-coordinates sp/hp must both be > 0. 3065 * and the exit-coordinates sp/hp must both be > 0.
3283 * => The intention here is to prevent abuse of the battleground- 3066 * => The intention here is to prevent abuse of the battleground-
3284 * feature (like pickable or hidden battleground tiles). */ 3067 * feature (like pickable or hidden battleground tiles). */
3285 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3068 for (object *tmp = op->below; tmp; tmp = tmp->below)
3286 { 3069 {
3287 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3070 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3288 { 3071 {
3289 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3072 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3290 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3073 && tmp->type == BATTLEGROUND
3074 && tmp->name == shstr_battleground
3075 && EXIT_X (tmp) && EXIT_Y (tmp))
3291 { 3076 {
3292 /*before we assign the exit, check if this is a teambattle */ 3077 /* before we assign the exit, check if this is a teambattle */
3293 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3078 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3294 { 3079 {
3295 object *invtmp;
3296
3297 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3080 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3298 { 3081 {
3299 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3082 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3300 { 3083 {
3301 if (x != NULL && y != NULL) 3084 if (x && y)
3302 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3085 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3086
3303 return 1; 3087 return 1;
3304 } 3088 }
3305 } 3089 }
3306 } 3090 }
3091
3307 if (x != NULL && y != NULL) 3092 if (x && y)
3308 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3093 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3094
3309 return 1; 3095 return 1;
3310 } 3096 }
3311 } 3097 }
3312 } 3098 }
3099
3313 /* If we got here, did not find a battleground */ 3100 /* If we got here, did not find a battleground */
3314 return 0; 3101 return 0;
3315} 3102}
3316 3103
3317/* 3104/*
… …
3333 char buf[MAX_BUF]; /* tmp. string buffer */ 3120 char buf[MAX_BUF]; /* tmp. string buffer */
3334 int i = 0, j = 0; 3121 int i = 0, j = 0;
3335 3122
3336 /* get the appropriate treasurelist */ 3123 /* get the appropriate treasurelist */
3337 if (atnr == ATNR_FIRE) 3124 if (atnr == ATNR_FIRE)
3338 trlist = treasurelist::find ("dragon_ability_fire"); 3125 trlist = treasurelist::find (shstr_dragon_ability_fire);
3339 else if (atnr == ATNR_COLD) 3126 else if (atnr == ATNR_COLD)
3340 trlist = treasurelist::find ("dragon_ability_cold"); 3127 trlist = treasurelist::find (shstr_dragon_ability_cold);
3341 else if (atnr == ATNR_ELECTRICITY) 3128 else if (atnr == ATNR_ELECTRICITY)
3342 trlist = treasurelist::find ("dragon_ability_elec"); 3129 trlist = treasurelist::find (shstr_dragon_ability_elec);
3343 else if (atnr == ATNR_POISON) 3130 else if (atnr == ATNR_POISON)
3344 trlist = treasurelist::find ("dragon_ability_poison"); 3131 trlist = treasurelist::find (shstr_dragon_ability_poison);
3345 3132
3346 if (trlist == NULL || who->type != PLAYER) 3133 if (trlist == NULL || who->type != PLAYER)
3347 return; 3134 return;
3348 3135
3349 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3136 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3422 { 3209 {
3423 /* forces in the treasurelist can alter the player's stats */ 3210 /* forces in the treasurelist can alter the player's stats */
3424 object *skin; 3211 object *skin;
3425 3212
3426 /* first get the dragon skin force */ 3213 /* first get the dragon skin force */
3427 shstr_cmp dragon_skin_force ("dragon_skin_force");
3428 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3214 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3429 ; 3215 ;
3430 3216
3431 if (!skin) 3217 if (!skin)
3432 return; 3218 return;
3433 3219
… …
3468 else 3254 else
3469 { 3255 {
3470 /* generate misc. treasure */ 3256 /* generate misc. treasure */
3471 tmp = arch_to_object (tr->item); 3257 tmp = arch_to_object (tr->item);
3472 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));
3473 tmp = insert_ob_in_ob (tmp, who); 3259 who->insert (tmp);
3474 if (who->type == PLAYER)
3475 esrv_send_item (who, tmp);
3476 } 3260 }
3477} 3261}
3478 3262
3479/** 3263/**
3480 * 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
… …
3492 if (pl->ranged_ob == ob) 3276 if (pl->ranged_ob == ob)
3493 pl->ranged_ob = 0; 3277 pl->ranged_ob = 0;
3494} 3278}
3495 3279
3496sint8 3280sint8
3497player::visibility_at (maptile *map, int x, int y) const 3281player::darkness_at (maptile *map, int x, int y) const
3498{ 3282{
3499 if (!ns) 3283 if (!ns)
3500 return 0; 3284 return LOS_BLOCKED;
3501 3285
3502 int dx, dy; 3286 int dx, dy;
3503 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3287 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3504 return 0; 3288 return LOS_BLOCKED;
3505 3289
3506 x += dx - ns->current_x + ns->mapx / 2; 3290 x += dx - ns->current_x;
3507 y += dy - ns->current_y + ns->mapy / 2; 3291 y += dy - ns->current_y;
3508 3292
3509 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3510 return 0;
3511
3512 return 100 - blocked_los [x][y]; 3293 return blocked_los (x, y);
3513} 3294}
3295
3296void
3297player::infobox (const char *title, const char *msg, int color)
3298{
3299 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3300}
3301
3302void
3303player::statusmsg (const char *msg, int color)
3304{
3305 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3306}
3307
3308void
3309player::failmsg (const char *msg, int color)
3310{
3311 play_sound (sound_find ("generic_failure"));
3312 statusmsg (msg, color);
3313}
3314

Diff Legend

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