ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

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

Diff Legend

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