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