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.150 by root, Sun Jun 10 03:11:17 2007 UTC vs.
Revision 1.234 by root, Thu Oct 15 21:40:42 2009 UTC

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

Diff Legend

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