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.148 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.261 by root, Sat Apr 3 02:46:19 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 it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25//+GPL
24 26
25#include <global.h> 27#include <global.h>
26#include <sproto.h> 28#include <sproto.h>
27#include <sounds.h> 29#include <sounds.h>
28#include <living.h> 30#include <living.h>
… …
33#include <algorithm> 35#include <algorithm>
34#include <functional> 36#include <functional>
35 37
36playervec players; 38playervec players;
37 39
38void
39display_motd (const object *op)
40{
41 char buf[MAX_BUF];
42 char motd[HUGE_BUF];
43 FILE *fp;
44 int comp;
45 int size;
46
47 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49 return;
50
51 motd[0] = '\0';
52 size = 0;
53
54 while (fgets (buf, MAX_BUF, fp))
55 {
56 if (*buf == '#')
57 continue;
58
59 strncat (motd + size, buf, HUGE_BUF - size);
60 size += strlen (buf);
61 }
62
63 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64 close_and_delete (fp, comp);
65}
66
67void
68send_rules (const object *op)
69{
70 char buf[MAX_BUF];
71 char rules[HUGE_BUF];
72 FILE *fp;
73 int comp;
74 int size;
75
76 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78 return;
79
80 rules[0] = '\0';
81 size = 0;
82
83 while (fgets (buf, MAX_BUF, fp))
84 {
85 if (*buf == '#')
86 continue;
87
88 if (size + strlen (buf) >= HUGE_BUF)
89 {
90 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91 break;
92 }
93
94 strncat (rules + size, buf, HUGE_BUF - size);
95 size += strlen (buf);
96 }
97
98 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99 close_and_delete (fp, comp);
100}
101
102void
103send_news (const object *op)
104{
105 char buf[MAX_BUF];
106 char news[HUGE_BUF];
107 char subject[MAX_BUF];
108 FILE *fp;
109 int comp;
110 int size;
111
112 sprintf (buf, "%s/%s", settings.confdir, settings.news);
113 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114 return;
115
116 news[0] = '\0';
117 subject[0] = '\0';
118 size = 0;
119
120 while (fgets (buf, MAX_BUF, fp))
121 {
122 if (*buf == '#')
123 continue;
124
125 if (*buf == '%')
126 { /* send one news */
127 if (size > 0)
128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
130 strcpy (subject, buf + 1);
131 strip_endline (subject);
132 size = 0;
133 news[0] = '\0';
134 }
135 else
136 {
137 if (size + strlen (buf) >= HUGE_BUF)
138 {
139 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
140 break;
141 }
142 strncat (news + size, buf, HUGE_BUF - size);
143 size += strlen (buf);
144 }
145 }
146
147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149 close_and_delete (fp, comp);
150}
151
152/* This loads the first map an puts the player on it. */ 40/* This loads the first map an puts the player on it. */
153static void 41static void
154set_first_map (object *op) 42set_first_map (object *op)
155{ 43{
156 op->contr->maplevel = first_map_path; 44 op->contr->maplevel = first_map_path;
… …
184 72
185 if (ob->map) 73 if (ob->map)
186 maplevel = ob->map->path; 74 maplevel = ob->map->path;
187 75
188 ob->remove (); 76 ob->remove ();
77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 78 ob->map = 0;
190 party = 0; 79 party = 0;
191 80
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 82
… …
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->clone.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 111
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224
225 assign (title, ob->arch->clone.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
232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234 118
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
237 if (tmp->arch->archname == dragon_ability_force) 121 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 122 abil = tmp;
239 else if (tmp->arch->archname == dragon_skin_force) 123 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 124 skin = tmp;
241 125
242 set_dragon_name (ob, abil, skin); 126 set_dragon_name (ob, abil, skin);
243 } 127 }
244 128
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246 130
247 esrv_new_player (this, ob->weight + ob->carrying); 131 esrv_new_player (this);
132
133 ob->update_stats ();
134
135 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0);
248 138
249 ob->flag [FLAG_READY_WEAPON] = false; 139 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false; 140 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_RANGE] = false;
251 ob->flag [FLAG_READY_BOW] = false; 142 ob->flag [FLAG_READY_BOW] = false;
252 143
253 for (object *op = ob->inv; op; op = op->below) 144 for (object *op = ob->inv; op; op = op->below)
254 if (op->flag [FLAG_APPLIED]) 145 if (op->flag [FLAG_APPLIED])
255 switch (op->type) 146 switch (op->type)
256 { 147 {
257 case SKILL: 148 case SKILL:
258 ob->flag [FLAG_APPLIED] = false; 149 op->flag [FLAG_APPLIED] = false;
259 break; 150 break;
260 151
152 case SPELL:
261 case WAND: 153 case WAND:
262 case ROD: 154 case ROD:
263 case HORN: 155 case HORN:
264 case BOW: 156 case BOW:
157 case RANGED:
265 ranged_ob = op; 158 ranged_ob = op;
159 op->flag [FLAG_APPLIED] = false;
266 break; 160 break;
267 161
268 case WEAPON: 162 case WEAPON:
269 combat_ob = op; 163 combat_ob = op;
164 op->flag [FLAG_APPLIED] = false;
270 break; 165 break;
271 } 166 }
272 167
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 168 ob->update_stats (); // we unapplied stuff above
274 ob->update_stats ();
275 169
276 ns->floorbox_update (); 170 ob->current_weapon = 0;
277 esrv_send_inventory (ob, ob); 171 if (object *item = combat_ob ? combat_ob : ranged_ob)
278 esrv_add_spells (this, 0); 172 ob->apply (item);
279 173
280 activate (); 174 activate ();
281
282 send_rules (ob);
283 send_news (ob);
284 display_motd (ob);
285 175
286 INVOKE_PLAYER (CONNECT, this); 176 INVOKE_PLAYER (CONNECT, this);
287 INVOKE_PLAYER (LOGIN, this); 177 INVOKE_PLAYER (LOGIN, this);
288} 178}
289 179
290void 180void
291player::disconnect () 181player::disconnect ()
292{ 182{
183 if (ob)
184 {
185 ob->close_container (); //TODO: client-specific
186 ob->drop_unpaid_items ();
187 }
188
293 if (ns) 189 if (ns)
294 { 190 {
295 if (active) 191 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 192 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297 193
… …
300 ns->reset_stats (); 196 ns->reset_stats ();
301 ns->pl = 0; 197 ns->pl = 0;
302 ns = 0; 198 ns = 0;
303 } 199 }
304 200
305 if (ob) 201 // this is important for the player scheduler to get the correct refcount
306 ob->close_container (); //TODO: client-specific 202 // when ns = 0
203 observe = viewpoint = ob;
307 204
308 deactivate (); 205 deactivate ();
309} 206}
207
208//-GPL
310 209
311// the need for this function can be explained 210// the need for this function can be explained
312// by load_object not returning the object 211// by load_object not returning the object
313void 212void
314player::set_object (object *op) 213player::set_object (object *op)
315{ 214{
316 ob = observe = op; 215 ob = observe = viewpoint = op;
317 ob->contr = this; /* this aren't yet in archetype */ 216 ob->contr = this; /* this aren't yet in archetype */
318 217
319 ob->speed = 1.0f; 218 ob->speed = 1.0f;
320 ob->speed_left = 0.5f; 219 ob->speed_left = 0.5f;
321 220
322 ob->direction = 5; /* So player faces south */ 221 ob->direction = 5; /* So player faces south */
323} 222}
324 223
325void 224void
326player::set_observe (object *op) 225player::set_observe (object *op)
327{ 226{
328 observe = op ? op : ob; 227 observe = viewpoint = op ? op : ob;
329 do_los = 1; 228 do_los = 1;
330} 229}
230
231void
232player::set_viewpoint (object *op)
233{
234 viewpoint = op ? op : (object *)observe;
235 do_los = 1;
236}
237
238//+GPL
331 239
332player::player () 240player::player ()
333{ 241{
334 /* There are some elements we want initialised to non zero value - 242 /* There are some elements we want initialised to non zero value -
335 * we deal with that below this point. 243 * we deal with that below this point.
… …
341 savebed_map = first_map_path; /* Init. respawn position */ 249 savebed_map = first_map_path; /* Init. respawn position */
342 250
343 gen_sp_armour = 10; 251 gen_sp_armour = 10;
344 bowtype = bow_normal; 252 bowtype = bow_normal;
345 petmode = pet_normal; 253 petmode = pet_normal;
346 listening = 10;
347 usekeys = containers; 254 usekeys = containers;
348 peaceful = 1; /* default peaceful */ 255 peaceful = 1; /* default peaceful */
349 do_los = 1; 256 do_los = 1;
350 257
351 weapon_sp = 1.0f; 258 weapon_sp = 1.0f;
… …
362 if (ob) 269 if (ob)
363 { 270 {
364 ob->destroy_inv (false); 271 ob->destroy_inv (false);
365 ob->destroy (); 272 ob->destroy ();
366 } 273 }
274
275 ob = observe = viewpoint = 0;
367} 276}
368 277
369player::~player () 278player::~player ()
370{ 279{
371 /* Clear item stack */ 280 /* Clear item stack */
372 free (stack_items); 281 free (stack_items);
282}
283
284/*
285 * get_player_archetype() return next player archetype from archetype
286 * list. Not very efficient routine, but used only creating new players.
287 * Note: there MUST be at least one player archetype!
288 */
289static archetype *
290get_player_archetype (archetype *at)
291{
292 // archetypes could have been reloaded
293 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
294
295 if (!nat)
296 return at;
297
298 archvec::iterator i = archetypes.find (nat);
299
300 for (;;)
301 {
302 if (++i == archetypes.end ())
303 i = archetypes.begin ();
304 else if (*i == at)
305 cleanup ("not a single player archetype found");
306
307 if ((*i)->type == PLAYER)
308 return *i;
309 }
373} 310}
374 311
375/* Tries to add player on the connection passed in ns. 312/* Tries to add player on the connection passed in ns.
376 * All we can really get in this is some settings like host and display 313 * All we can really get in this is some settings like host and display
377 * mode. 314 * mode.
… …
379player * 316player *
380player::create () 317player::create ()
381{ 318{
382 player *pl = new player; 319 player *pl = new player;
383 320
384 pl->set_object (arch_to_object (get_player_archetype (0))); 321 pl->set_object (get_player_archetype (0)->instance ());
385 322
386 pl->ob->roll_stats (); 323 pl->ob->roll_stats ();
387 pl->ob->stats.wc = 2; 324 pl->ob->stats.wc = 2;
388 pl->ob->run_away = 25; /* Then we panick... */ 325 pl->ob->run_away = 25; /* Then we panick... */
389 326
390 set_first_map (pl->ob); 327 set_first_map (pl->ob);
391 328
392 return pl; 329 return pl;
393}
394
395/*
396 * get_player_archetype() return next player archetype from archetype
397 * list. Not very efficient routine, but used only creating new players.
398 * Note: there MUST be at least one player archetype!
399 */
400archetype *
401get_player_archetype (archetype *at)
402{
403 archetype *start = at;
404
405 for (;;)
406 {
407 if (at == NULL || at->next == NULL)
408 at = first_archetype;
409 else
410 at = at->next;
411
412 if (at->clone.type == PLAYER)
413 return at;
414
415 if (at == start)
416 {
417 LOG (llevError, "No Player archetypes\n");
418 exit (-1);
419 }
420 }
421} 330}
422 331
423object * 332object *
424get_nearest_player (object *mon) 333get_nearest_player (object *mon)
425{ 334{
… …
428 unsigned lastdist; 337 unsigned lastdist;
429 rv_vector rv; 338 rv_vector rv;
430 339
431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 340 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
432 { 341 {
433 /* We should not find free objects on this friendly list, but it
434 * does periodically happen. Given that, lets deal with it.
435 * While unlikely, it is possible the next object on the friendly
436 * list is also free, so encapsulate this in a while loop.
437 */
438 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
439 {
440 object *tmp = ol->ob;
441
442 /* Can't do much more other than log the fact, because the object
443 * itself will have been cleared.
444 */
445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
447 ol = ol->next;
448 remove_friendly_object (tmp);
449 if (!ol)
450 return op;
451 }
452
453 /* Remove special check for player from this. First, it looks to cause
454 * some crashes (ol->ob->contr not set properly?), but secondly, a more
455 * complicated method of state checking would be needed in any case -
456 * as it was, a clever player could type quit, and the function would
457 * skip them over while waiting for confirmation. Remove
458 * on_same_map check, as can_detect_enemy also does this
459 */
460 if (!can_detect_enemy (mon, ol->ob, &rv)) 342 if (!can_detect_enemy (mon, ol->ob, &rv))
461 continue; 343 continue;
462 344
463 if (lastdist > rv.distance) 345 if (lastdist > rv.distance)
464 { 346 {
… …
659 541
660 return firstdir; 542 return firstdir;
661} 543}
662 544
663void 545void
664give_initial_items (object *pl, treasurelist * items) 546give_initial_items (object *pl, treasurelist *items)
665{ 547{
666 object *op, *next = NULL;
667
668 if (pl->randomitems != NULL) 548 if (pl->randomitems)
669 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 549 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
670 550
671 for (op = pl->inv; op; op = next) 551 for (object *next, *op = pl->inv; op; op = next)
672 { 552 {
673 next = op->below; 553 next = op->below;
674 554
675 /* Forces get applied per default, unless they have the 555 /* Forces get applied per default, unless they have the
676 * flag "neutral" set. Sorry but I can't think of a better way 556 * flag "neutral" set. Sorry but I can't think of a better way
… …
681 /* we never give weapons/armour if these cannot be used 561 /* we never give weapons/armour if these cannot be used
682 * by this player due to race restrictions 562 * by this player due to race restrictions
683 */ 563 */
684 if (pl->type == PLAYER) 564 if (pl->type == PLAYER)
685 { 565 {
686 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 566 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
567 &&
687 (op->type == ARMOUR || op->type == BOOTS || 568 (op->type == ARMOUR || op->type == BOOTS
688 op->type == CLOAK || op->type == HELMET || 569 || op->type == CLOAK || op->type == HELMET
689 op->type == SHIELD || op->type == GLOVES || 570 || op->type == SHIELD || op->type == GLOVES
571 || op->type == BRACERS || op->type == GIRDLE))
690 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 572 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
691 { 573 {
692 op->destroy (); 574 op->destroy ();
693 continue; 575 continue;
694 } 576 }
695 } 577 }
696 578
697 /* This really needs to be better - we should really give 579 /* Here we remove duplicated skills (as duplicated spell objects have
698 * a substitute spellbook. The problem is that we don't really 580 * _very_ confusing effects for players), which could for instance be
699 * have a good idea what to replace it with (need something like 581 * generated by bad treasurelists. - elmex
700 * a first level treasurelist for each skill.)
701 * remove duplicate skills also
702 */ 582 */
703 if (op->type == SPELLBOOK || op->type == SKILL) 583 if (op->type == SKILL)
704 { 584 {
705 object *tmp;
706
707 for (tmp = op->below; tmp; tmp = tmp->below) 585 for (object *tmp = op->below; tmp; tmp = tmp->below)
708 if (tmp->type == op->type && tmp->name == op->name) 586 if (tmp->type == op->type && tmp->name == op->name)
709 break;
710
711 if (tmp)
712 { 587 {
713 op->destroy (); 588 op->destroy ();
589 LOG (llevError,
714 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 590 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
715 continue; 591 break;
716 } 592 }
717 593
718 if (op->nrof > 1) 594 if (op->nrof > 1)
719 op->nrof = 1; 595 op->nrof = 1;
720 } 596 }
721 597
722 if (op->type == SPELLBOOK && op->inv) 598 if (op->type == SPELLBOOK && op->inv)
723 {
724 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 599 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
725 }
726 600
727 /* Give starting characters identified, uncursed, and undamned 601 /* Give starting characters identified, uncursed, and undamned
728 * items. Just don't identify gold or silver, or it won't be 602 * items. Just don't identify gold or silver, or it won't be
729 * merged properly. 603 * merged properly.
730 */ 604 */
731 if (need_identify (op)) 605 if (need_identify (op))
732 { 606 {
733 SET_FLAG (op, FLAG_IDENTIFIED); 607 SET_FLAG (op, FLAG_IDENTIFIED);
734 CLEAR_FLAG (op, FLAG_CURSED); 608 CLEAR_FLAG (op, FLAG_CURSED);
735 CLEAR_FLAG (op, FLAG_DAMNED); 609 CLEAR_FLAG (op, FLAG_DAMNED);
736 } 610 }
611
737 if (op->type == SPELL) 612 if (op->type == SPELL)
738 { 613 {
739 op->destroy (); 614 op->destroy ();
740 continue; 615 continue;
741 } 616 }
… …
743 { 618 {
744 SET_FLAG (op, FLAG_CAN_USE_SKILL); 619 SET_FLAG (op, FLAG_CAN_USE_SKILL);
745 op->stats.exp = 0; 620 op->stats.exp = 0;
746 op->level = 1; 621 op->level = 1;
747 } 622 }
748 /* lock all 'normal items by default */ 623 else /* lock all 'normal items by default */
749 else
750 SET_FLAG (op, FLAG_INV_LOCKED); 624 SET_FLAG (op, FLAG_INV_LOCKED);
751 } /* for loop of objects in player inv */ 625 } /* for loop of objects in player inv */
752 626
753 /* Need to set up the skill pointers */ 627 /* Need to set up the skill pointers */
754 link_player_skills (pl); 628 pl->contr->link_skills ();
755} 629}
756 630
757void 631void
758get_party_password (object *op, partylist *party) 632get_party_password (object *op, partylist *party)
759{ 633{
… …
769 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 643 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
770} 644}
771 645
772/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 646/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
773static int 647static int
774roll_stat (void) 648roll_stat ()
775{ 649{
776 int a[4], i, j, k; 650 int a[4], i, j, k;
777 651
778 for (i = 0; i < 4; i++) 652 for (i = 0; i < 4; i++)
779 a[i] = (int) rndm (6) + 1; 653 a[i] = (int) rndm (6) + 1;
… …
860static void 734static void
861start_info (object *op) 735start_info (object *op)
862{ 736{
863 char buf[MAX_BUF]; 737 char buf[MAX_BUF];
864 738
865 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 739 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
866 new_draw_info (NDI_UNIQUE, 0, op, buf); 740 new_draw_info (NDI_UNIQUE, 0, op, buf);
867 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
868 //new_draw_info (NDI_UNIQUE, 0, op, " ");
869} 741}
870 742
871/* This function takes the key that is passed, and does the 743/* This function takes the key that is passed, and does the
872 * appropriate action with it (change race, or other things). 744 * appropriate action with it (change race, or other things).
873 * The function name is for historical reasons - now we have 745 * The function name is for historical reasons - now we have
… …
876 */ 748 */
877void 749void
878player::chargen_race_done () 750player::chargen_race_done ()
879{ 751{
880 /* this must before then initial items are given */ 752 /* this must before then initial items are given */
881 esrv_new_player (ob->contr, ob->weight + ob->carrying); 753 esrv_new_player (ob->contr);
882 754
883 treasurelist *tl = treasurelist::find ("starting_wealth"); 755 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
884 if (tl) 756 if (tl)
885 create_treasure (tl, ob, 0, 0, 0); 757 create_treasure (tl, ob, 0, 0, 0);
886 758
887 INVOKE_PLAYER (BIRTH, ob->contr); 759 INVOKE_PLAYER (BIRTH, ob->contr);
888 INVOKE_PLAYER (LOGIN, ob->contr); 760 INVOKE_PLAYER (LOGIN, ob->contr);
889 761
890 ob->contr->ns->state = ST_PLAYING; 762 ob->contr->ns->state = ST_PLAYING;
891 763
892 if (ob->msg) 764 if (ob->msg)
893 ob->msg = 0; 765 ob->msg = 0;
894
895 /* We create this now because some of the unique maps will need it
896 * to save here.
897 */
898 {
899 char buf[MAX_BUF];
900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
901 make_path_to_file (buf);
902 }
903 766
904 start_info (ob); 767 start_info (ob);
905 CLEAR_FLAG (ob, FLAG_WIZ); 768 CLEAR_FLAG (ob, FLAG_WIZ);
906 give_initial_items (ob, ob->randomitems); 769 give_initial_items (ob, ob->randomitems);
907 link_player_skills (ob);
908 esrv_send_inventory (ob, ob); 770 esrv_send_inventory (ob, ob);
909 ob->update_stats (); 771 ob->update_stats ();
910 772
911 /* This moves the player to a different start map, if there 773 /* This moves the player to a different start map, if there
912 * is one for this race 774 * is one for this race
913 */ 775 */
914 if (*first_map_ext_path) 776 if (*first_map_ext_path)
915 { 777 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
916 object *tmp;
917 char mapname[MAX_BUF];
918
919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920 tmp = object::create ();
921 EXIT_PATH (tmp) = mapname;
922 EXIT_X (tmp) = ob->x;
923 EXIT_Y (tmp) = ob->y;
924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
925 * if the map isn't there, then stay on the
926 * default initial map */
927 tmp->destroy ();
928 }
929 else 778 else
930 LOG (llevDebug, "first_map_ext_path not set\n"); 779 LOG (llevDebug, "first_map_ext_path not set\n");
931} 780}
932 781
933void 782void
… …
943 int x = ob->x, y = ob->y; 792 int x = ob->x, y = ob->y;
944 793
945 ob->remove_statbonus (); 794 ob->remove_statbonus ();
946 ob->remove (); 795 ob->remove ();
947 ob->arch = get_player_archetype (ob->arch); 796 ob->arch = get_player_archetype (ob->arch);
948 ob->arch->clone.copy_to (ob); 797 ob->arch->copy_to (ob);
949 ob->instantiate (); 798 ob->instantiate ();
950 ob->stats = ob->contr->orig_stats; 799 ob->stats = ob->contr->orig_stats;
951 ob->name = ob->name_pl = name; 800 ob->name = ob->name_pl = name;
952 ob->x = x; 801 ob->x = x;
953 ob->y = y; 802 ob->y = y;
954 SET_ANIMATION (ob, 2); /* So player faces south */ 803 SET_ANIMATION (ob, 2); /* So player faces south */
955 insert_ob_in_map (ob, ob->map, ob, 0); 804 insert_ob_in_map (ob, ob->map, ob, 0);
956 assign (ob->contr->title, ob->arch->clone.name); 805 assign (ob->contr->title, ob->arch->object::name);
957 ob->add_statbonus (); 806 ob->add_statbonus ();
958 } 807 }
959 while (!allowed_class (ob)); 808 while (!allowed_class (ob));
960 809
961 update_object (ob, UP_OBJ_FACE); 810 update_object (ob, UP_OBJ_FACE);
… …
964 ob->stats.hp = ob->stats.maxhp; 813 ob->stats.hp = ob->stats.maxhp;
965 ob->stats.sp = ob->stats.maxsp; 814 ob->stats.sp = ob->stats.maxsp;
966 ob->stats.grace = 0; 815 ob->stats.grace = 0;
967} 816}
968 817
969void 818static void
970flee_player (object *op) 819flee_player (object *op)
971{ 820{
972 int dir, diff; 821 int dir, diff;
973 rv_vector rv; 822 rv_vector rv;
974 823
… …
977 LOG (llevDebug, "Fleeing player is dead.\n"); 826 LOG (llevDebug, "Fleeing player is dead.\n");
978 CLEAR_FLAG (op, FLAG_SCARED); 827 CLEAR_FLAG (op, FLAG_SCARED);
979 return; 828 return;
980 } 829 }
981 830
982 if (op->enemy == NULL) 831 if (!op->enemy)
983 { 832 {
984 LOG (llevDebug, "Fleeing player had no enemy.\n"); 833 LOG (llevDebug, "Fleeing player had no enemy.\n");
985 CLEAR_FLAG (op, FLAG_SCARED); 834 CLEAR_FLAG (op, FLAG_SCARED);
986 return; 835 return;
987 } 836 }
988 837
989 /* Seen some crashes here. Since we don't store an
990 * op->enemy_count, it is possible that something destroys the
991 * actual enemy, and the object is recycled.
992 */
993 if (op->enemy->map == NULL)
994 {
995 CLEAR_FLAG (op, FLAG_SCARED);
996 op->enemy = NULL;
997 return;
998 }
999
1000 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 838 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1001 { 839 {
1002 op->enemy = NULL; 840 op->enemy = NULL;
1003 CLEAR_FLAG (op, FLAG_SCARED); 841 CLEAR_FLAG (op, FLAG_SCARED);
1004 return; 842 return;
… …
1007 get_rangevector (op, op->enemy, &rv, 0); 845 get_rangevector (op, op->enemy, &rv, 0);
1008 846
1009 dir = absdir (4 + rv.direction); 847 dir = absdir (4 + rv.direction);
1010 for (diff = 0; diff < 3; diff++) 848 for (diff = 0; diff < 3; diff++)
1011 { 849 {
1012 int m = 1 - (RANDOM () & 2); 850 int m = 1 - rndm (2) * 2;
1013 851
1014 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 852 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1015 return; 853 return;
1016 } 854 }
1017 855
1018 /* Cornered, get rid of scared */ 856 /* Cornered, get rid of scared */
1019 CLEAR_FLAG (op, FLAG_SCARED); 857 CLEAR_FLAG (op, FLAG_SCARED);
… …
1028check_pick (object *op) 866check_pick (object *op)
1029{ 867{
1030 object *tmp, *next; 868 object *tmp, *next;
1031 int stop = 0; 869 int stop = 0;
1032 int wvratio; 870 int wvratio;
1033 char putstring[128];
1034 871
1035 /* if you're flying, you cna't pick up anything */ 872 /* if you're flying, you can't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 873 if (op->move_type & MOVE_FLYING)
1037 return 1; 874 return 1;
1038 875
1039 next = op->below; 876 next = op->below;
877
878 int cnt = MAX_ITEM_PER_ACTION;
879#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1040 880
1041 /* loop while there are items on the floor that are not marked as 881 /* loop while there are items on the floor that are not marked as
1042 * destroyed */ 882 * destroyed */
1043 while (next && !next->destroyed ()) 883 while (next && !next->destroyed ())
1044 { 884 {
1045 tmp = next; 885 tmp = next;
1046 next = tmp->below; 886 next = tmp->below;
1047 887
888 if (cnt <= 0)
889 {
890 op->failmsg ("Couldn't pickup all items at once.");
891 return 0;
892 }
893
1048 if (op->destroyed ()) 894 if (op->destroyed ())
1049 return 0; 895 return 0;
1050 896
1051 if (!can_pick (op, tmp)) 897 if (!can_pick (op, tmp))
1052 continue; 898 continue;
1053 899
1054 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 900 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1055 { 901 {
1056 if (item_matched_string (op, tmp, op->contr->search_str)) 902 if (item_matched_string (op, tmp, op->contr->search_str))
1057 pick_up (op, tmp); 903 CHK_PICK_PICKUP;
904
1058 continue; 905 continue;
1059 } 906 }
1060 907
1061 /* high not bit set? We're using the old autopickup model */ 908 /* pickup handling */
909 if (op->contr->mode & PU_DEBUG)
910 {
911 /* some debugging code to figure out item information */
912 const char *str = tmp->name
913 ? format ("item name: %s item type: %d weight/value: %d",
914 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
915 : format ("item name: %s item type: %d weight/value: %d",
916 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
917
918 new_draw_info (NDI_UNIQUE, 0, op, str);
919 }
920
921 if (op->contr->mode & PU_INHIBIT)
922 return 1;
923
924 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
925 return 1;
926
927 /* philosophy:
928 * It's easy to grab an item type from a pile, as long as it's
929 * generic. This takes no game-time. For more detailed pickups
930 * and selections, select-items should be used. This is a
931 * grab-as-you-run type mode that's really useful for arrows for
932 * example.
933 * The drawback: right now it has no frontend, so you need to
934 * stick the bits you want into a calculator in hex mode and then
935 * convert to decimal and then 'pickup <#>
936 */
937
938 /* the first two modes are exclusive: if NOTHING we return, if
939 * STOP then we stop. All the rest are applied sequentially,
940 * meaning if any test passes, the item gets picked up. */
941
942 /* if mode is set to pick nothing up, return */
943 if (op->contr->mode == PU_NOTHING)
944 return 1;
945
946 /* if mode is set to stop when encountering objects, return */
947 /* take STOP before INHIBIT since it doesn't actually pick
948 * anything up */
949 if (op->contr->mode & PU_STOP)
950 return 0;
951
952 /* useful for going into stores and not losing your settings... */
953 /* and for battles wher you don't want to get loaded down while
954 * fighting */
955 if (op->contr->mode & PU_INHIBIT)
956 return 1;
957
958 /* prevent us from turning into auto-thieves :) */
959 if (QUERY_FLAG (tmp, FLAG_UNPAID))
960 continue;
961
962 /* ignore known cursed objects */
963 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
964 continue;
965
966 /* all food and drink if desired */
967 /* question: don't pick up known-poisonous stuff? */
1062 if (!(op->contr->mode & PU_NEWMODE)) 968 if (op->contr->mode & PU_FOOD)
969 if (tmp->type == FOOD)
1063 { 970 {
1064 switch (op->contr->mode) 971 CHK_PICK_PICKUP;
972 continue;
973 }
974
975 if (op->contr->mode & PU_DRINK)
976 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
977 {
978 CHK_PICK_PICKUP;
979 continue;
980 }
981
982 if (op->contr->mode & PU_POTION)
983 if (tmp->type == POTION)
984 {
985 CHK_PICK_PICKUP;
986 continue;
987 }
988
989 /* spellbooks, skillscrolls and normal books/scrolls */
990 if (op->contr->mode & PU_SPELLBOOK)
991 if (tmp->type == SPELLBOOK)
992 {
993 CHK_PICK_PICKUP;
994 continue;
995 }
996
997 if (op->contr->mode & PU_SKILLSCROLL)
998 if (tmp->type == SKILLSCROLL)
999 {
1000 CHK_PICK_PICKUP;
1001 continue;
1002 }
1003
1004 if (op->contr->mode & PU_READABLES)
1005 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1006 {
1007 CHK_PICK_PICKUP;
1008 continue;
1009 }
1010
1011 /* wands/staves/rods/horns */
1012 if (op->contr->mode & PU_MAGIC_DEVICE)
1013 if (tmp->type == WAND
1014 || tmp->type == ROD
1015 || tmp->type == HORN
1016 || tmp->type == POWER_CRYSTAL)
1017 {
1018 CHK_PICK_PICKUP;
1019 continue;
1020 }
1021
1022 /* pick up all magical items */
1023 if (op->contr->mode & PU_MAGICAL)
1024 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1025 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1026 {
1027 CHK_PICK_PICKUP;
1028 continue;
1029 }
1030
1031 if (op->contr->mode & PU_VALUABLES)
1032 {
1033 if (tmp->type == MONEY || tmp->type == GEM)
1065 { 1034 {
1066 case 0: 1035 CHK_PICK_PICKUP;
1067 return 1; /* don't pick up */ 1036 continue;
1068 case 1:
1069 pick_up (op, tmp);
1070 return 1;
1071 case 2:
1072 pick_up (op, tmp);
1073 return 0;
1074 case 3:
1075 return 0; /* stop before pickup */
1076 case 4:
1077 pick_up (op, tmp);
1078 break;
1079 case 5:
1080 pick_up (op, tmp);
1081 stop = 1;
1082 break;
1083 case 6:
1084 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1085 pick_up (op, tmp);
1086 break;
1087
1088 case 7:
1089 if (tmp->type == MONEY || tmp->type == GEM)
1090 pick_up (op, tmp);
1091 break;
1092
1093 default:
1094 /* use value density */
1095 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1096 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1097 pick_up (op, tmp);
1098 } 1037 }
1099 } 1038 }
1100 else 1039
1101 { /* old model */ 1040 /* rings & amulets - talismans seems to be typed AMULET */
1102 /* NEW pickup handling */
1103 if (op->contr->mode & PU_DEBUG) 1041 if (op->contr->mode & PU_JEWELS)
1042 if (tmp->type == RING
1043 || tmp->type == AMULET
1044 || tmp->type == GIRDLE
1045 || tmp->type == SKILL_TOOL)
1104 { 1046 {
1105 /* some debugging code to figure out item information */ 1047 CHK_PICK_PICKUP;
1106 if (tmp->name != NULL)
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 else
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112
1113 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114 }
1115
1116 /* philosophy:
1117 * It's easy to grab an item type from a pile, as long as it's
1118 * generic. This takes no game-time. For more detailed pickups
1119 * and selections, select-items should be used. This is a
1120 * grab-as-you-run type mode that's really useful for arrows for
1121 * example.
1122 * The drawback: right now it has no frontend, so you need to
1123 * stick the bits you want into a calculator in hex mode and then
1124 * convert to decimal and then 'pickup <#>
1125 */
1126
1127 /* the first two modes are exclusive: if NOTHING we return, if
1128 * STOP then we stop. All the rest are applied sequentially,
1129 * meaning if any test passes, the item gets picked up. */
1130
1131 /* if mode is set to pick nothing up, return */
1132
1133 if (op->contr->mode & PU_NOTHING)
1134 return 1;
1135
1136 /* if mode is set to stop when encountering objects, return */
1137 /* take STOP before INHIBIT since it doesn't actually pick
1138 * anything up */
1139
1140 if (op->contr->mode & PU_STOP)
1141 return 0;
1142
1143 /* useful for going into stores and not losing your settings... */
1144 /* and for battles wher you don't want to get loaded down while
1145 * fighting */
1146 if (op->contr->mode & PU_INHIBIT)
1147 return 1;
1148
1149 /* prevent us from turning into auto-thieves :) */
1150 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1151 continue; 1048 continue;
1049 }
1152 1050
1153 /* ignore known cursed objects */ 1051 /* we don't forget dragon food */
1154 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1052 if (op->contr->mode & PU_FLESH)
1053 if (tmp->type == FLESH)
1054 {
1055 CHK_PICK_PICKUP;
1155 continue; 1056 continue;
1057 }
1156 1058
1157 /* all food and drink if desired */ 1059 /* bows and arrows. Bows are good for selling! */
1158 /* question: don't pick up known-poisonous stuff? */ 1060 if (op->contr->mode & PU_BOW)
1061 if (tmp->type == BOW)
1062 {
1063 CHK_PICK_PICKUP;
1064 continue;
1065 }
1066
1067 if (op->contr->mode & PU_ARROW)
1068 if (tmp->type == ARROW)
1069 {
1070 CHK_PICK_PICKUP;
1071 continue;
1072 }
1073
1074 /* all kinds of armor etc. */
1075 if (op->contr->mode & PU_ARMOUR)
1076 if (tmp->type == ARMOUR)
1077 {
1078 CHK_PICK_PICKUP;
1079 continue;
1080 }
1081
1082 if (op->contr->mode & PU_HELMET)
1083 if (tmp->type == HELMET)
1084 {
1085 CHK_PICK_PICKUP;
1086 continue;
1087 }
1088
1089 if (op->contr->mode & PU_SHIELD)
1090 if (tmp->type == SHIELD)
1091 {
1092 CHK_PICK_PICKUP;
1093 continue;
1094 }
1095
1159 if (op->contr->mode & PU_FOOD) 1096 if (op->contr->mode & PU_BOOTS)
1160 if (tmp->type == FOOD) 1097 if (tmp->type == BOOTS)
1098 {
1099 CHK_PICK_PICKUP;
1100 continue;
1101 }
1102
1103 if (op->contr->mode & PU_GLOVES)
1104 if (tmp->type == GLOVES || tmp->type == BRACERS)
1105 {
1106 CHK_PICK_PICKUP;
1107 continue;
1108 }
1109
1110 if (op->contr->mode & PU_CLOAK)
1111 if (tmp->type == CLOAK)
1112 {
1113 CHK_PICK_PICKUP;
1114 continue;
1115 }
1116
1117 /* hoping to catch throwing daggers here */
1118 if (op->contr->mode & PU_MISSILEWEAPON)
1119 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1120 {
1121 CHK_PICK_PICKUP;
1122 continue;
1123 }
1124
1125 /* careful: chairs and tables are weapons! */
1126 if (op->contr->mode & PU_ALLWEAPON)
1127 {
1128 if (tmp->type == WEAPON)
1129 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1161 { 1130 {
1162 pick_up (op, tmp); 1131 CHK_PICK_PICKUP;
1163 continue; 1132 continue;
1164 } 1133 }
1134 }
1165 1135
1136 /* misc stuff that's useful */
1166 if (op->contr->mode & PU_DRINK) 1137 if (op->contr->mode & PU_KEY)
1167 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1138 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1168 { 1139 {
1169 pick_up (op, tmp); 1140 CHK_PICK_PICKUP;
1170 continue; 1141 continue;
1171 } 1142 }
1172 1143
1144 /* any of the last 4 bits set means we use the ratio for value
1145 * pickups */
1173 if (op->contr->mode & PU_POTION) 1146 if (op->contr->mode & PU_RATIO)
1174 if (tmp->type == POTION) 1147 {
1148 /* use value density to decide what else to grab */
1149 /* >=7 was >= op->contr->mode */
1150 /* >=7 is the old standard setting. Now we take the last 4 bits
1175 { 1151 */
1176 pick_up (op, tmp);
1177 continue;
1178 }
1179
1180 /* spellbooks, skillscrolls and normal books/scrolls */
1181 if (op->contr->mode & PU_SPELLBOOK)
1182 if (tmp->type == SPELLBOOK)
1183 {
1184 pick_up (op, tmp);
1185 continue;
1186 }
1187
1188 if (op->contr->mode & PU_SKILLSCROLL)
1189 if (tmp->type == SKILLSCROLL)
1190 {
1191 pick_up (op, tmp);
1192 continue;
1193 }
1194
1195 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL)
1197 {
1198 pick_up (op, tmp);
1199 continue;
1200 }
1201
1202 /* wands/staves/rods/horns */
1203 if (op->contr->mode & PU_MAGIC_DEVICE)
1204 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1205 {
1206 pick_up (op, tmp);
1207 continue;
1208 }
1209
1210 /* pick up all magical items */
1211 if (op->contr->mode & PU_MAGICAL) 1152 wvratio = op->contr->mode & PU_RATIO;
1212 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1153 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1213 {
1214 pick_up (op, tmp);
1215 continue;
1216 }
1217
1218 if (op->contr->mode & PU_VALUABLES)
1219 { 1154 {
1220 if (tmp->type == MONEY || tmp->type == GEM) 1155#if 0
1156 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1157 if (tmp->name != NULL)
1221 { 1158 {
1222 pick_up (op, tmp); 1159 fprintf (stderr, "%s", tmp->name);
1223 continue;
1224 } 1160 }
1225 }
1226
1227 /* rings & amulets - talismans seems to be typed AMULET */
1228 if (op->contr->mode & PU_JEWELS)
1229 if (tmp->type == RING || tmp->type == AMULET)
1230 {
1231 pick_up (op, tmp);
1232 continue;
1233 }
1234
1235 /* we don't forget dragon food */
1236 if (op->contr->mode & PU_FLESH)
1237 if (tmp->type == FLESH)
1238 {
1239 pick_up (op, tmp);
1240 continue;
1241 }
1242
1243 /* bows and arrows. Bows are good for selling! */
1244 if (op->contr->mode & PU_BOW)
1245 if (tmp->type == BOW)
1246 {
1247 pick_up (op, tmp);
1248 continue;
1249 }
1250
1251 if (op->contr->mode & PU_ARROW)
1252 if (tmp->type == ARROW)
1253 {
1254 pick_up (op, tmp);
1255 continue;
1256 }
1257
1258 /* all kinds of armor etc. */
1259 if (op->contr->mode & PU_ARMOUR)
1260 if (tmp->type == ARMOUR)
1261 {
1262 pick_up (op, tmp);
1263 continue;
1264 }
1265
1266 if (op->contr->mode & PU_HELMET)
1267 if (tmp->type == HELMET)
1268 {
1269 pick_up (op, tmp);
1270 continue;
1271 }
1272
1273 if (op->contr->mode & PU_SHIELD)
1274 if (tmp->type == SHIELD)
1275 {
1276 pick_up (op, tmp);
1277 continue;
1278 }
1279
1280 if (op->contr->mode & PU_BOOTS)
1281 if (tmp->type == BOOTS)
1282 {
1283 pick_up (op, tmp);
1284 continue;
1285 }
1286
1287 if (op->contr->mode & PU_GLOVES)
1288 if (tmp->type == GLOVES)
1289 {
1290 pick_up (op, tmp);
1291 continue;
1292 }
1293
1294 if (op->contr->mode & PU_CLOAK)
1295 if (tmp->type == CLOAK)
1296 {
1297 pick_up (op, tmp);
1298 continue;
1299 }
1300
1301 /* hoping to catch throwing daggers here */
1302 if (op->contr->mode & PU_MISSILEWEAPON)
1303 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1304 {
1305 pick_up (op, tmp);
1306 continue;
1307 }
1308
1309 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON)
1311 {
1312 if (tmp->type == WEAPON && tmp->name != NULL)
1313 {
1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 {
1317 pick_up (op, tmp);
1318 continue;
1319 }
1320 }
1321
1322 if (tmp->type == WEAPON && tmp->name == NULL)
1323 {
1324 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325 {
1326 pick_up (op, tmp);
1327 continue;
1328 }
1329 }
1330 }
1331
1332 /* misc stuff that's useful */
1333 if (op->contr->mode & PU_KEY)
1334 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1335 {
1336 pick_up (op, tmp);
1337 continue;
1338 }
1339
1340 /* any of the last 4 bits set means we use the ratio for value
1341 * pickups */
1342 if (op->contr->mode & PU_RATIO)
1343 {
1344 /* use value density to decide what else to grab */
1345 /* >=7 was >= op->contr->mode */
1346 /* >=7 is the old standard setting. Now we take the last 4 bits
1347 * and multiply them by 5, giving 0..15*5== 5..75 */
1348 wvratio = (op->contr->mode & PU_RATIO) * 5;
1349 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1350 {
1351 pick_up (op, tmp);
1352#if 0
1353 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1354 if (tmp->name != NULL)
1355 {
1356 fprintf (stderr, "%s", tmp->name);
1357 }
1358 else 1161 else
1359 fprintf (stderr, "%s", tmp->arch->archname); 1162 fprintf (stderr, "%s", tmp->arch->archname);
1360 fprintf (stderr, ",%d] = ", tmp->type); 1163 fprintf (stderr, ",%d] = ", tmp->type);
1361 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1164 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1362#endif 1165#endif
1166 CHK_PICK_PICKUP;
1363 continue; 1167 continue;
1364 }
1365 } 1168 }
1366 } /* the new pickup model */ 1169 } /* the new pickup model */
1367 } 1170 }
1368 1171
1369 return !stop; 1172 return !stop;
1173}
1174
1175/* routine for both players and monsters. We call this when
1176 * there is a possibility for our action distrubing our hiding
1177 * place or invisiblity spell. Artefact invisiblity causes
1178 * "noise" instead. If we arent invisible to begin with, we
1179 * return 0.
1180 */
1181static int
1182action_makes_visible (object *op)
1183{
1184 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
1185 {
1186 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
1187 {
1188 // artefact invisibility is permanent, but we still make noise
1189 // this is important for game-balance.
1190 if (op->contr)
1191 op->make_noise ();
1192
1193 return 0;
1194 }
1195
1196 if (op->contr && op->contr->tmp_invis == 0)
1197 return 0;
1198
1199 /* If monsters, they should become visible */
1200 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1201 {
1202 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1203 return 1;
1204 }
1205 }
1206
1207 return 0;
1370} 1208}
1371 1209
1372/* 1210/*
1373 * Find an arrow in the inventory and after that 1211 * Find an arrow in the inventory and after that
1374 * in the right type container (quiver). Pointer to the 1212 * in the right type container (quiver). Pointer to the
1375 * found object is returned. 1213 * found object is returned.
1376 */ 1214 */
1377object * 1215static object *
1378find_arrow (object *op, const char *type) 1216find_arrow (object *op, const char *type)
1379{ 1217{
1380 object *tmp = 0;
1381
1382 for (op = op->inv; op; op = op->below) 1218 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1219 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1220 return splay (tmp);
1221
1222 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1223 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1224 if (object *arrow = find_arrow (tmp, type))
1225 {
1226 splay (tmp);
1386 return op; 1227 return arrow;
1228 }
1387 1229
1388 return tmp; 1230 return 0;
1389} 1231}
1390 1232
1391/* 1233/*
1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1234 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1393 * against the target. A full test is not performed, simply a basic test 1235 * against the target. A full test is not performed, simply a basic test
1394 * of resistances. The archer is making a quick guess at what he sees down 1236 * of resistances. The archer is making a quick guess at what he sees down
1395 * the hall. Failing that it does it's best to pick the highest plus arrow. 1237 * the hall. Failing that it does it's best to pick the highest plus arrow.
1396 */ 1238 */
1397object * 1239static object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1240find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1399{ 1241{
1400 object *tmp = NULL, *arrow, *ntmp; 1242 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1243 int attacknum, attacktype, betterby = 0, i;
1402 1244
1403 if (!type) 1245 if (!type)
… …
1407 { 1249 {
1408 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1250 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1409 { 1251 {
1410 i = 0; 1252 i = 0;
1411 ntmp = find_better_arrow (arrow, target, type, &i); 1253 ntmp = find_better_arrow (arrow, target, type, &i);
1254
1412 if (i > betterby) 1255 if (i > betterby)
1413 { 1256 {
1414 tmp = ntmp; 1257 tmp = ntmp;
1415 betterby = i; 1258 betterby = i;
1416 } 1259 }
1417 } 1260 }
1418 else if (arrow->type == ARROW && arrow->race == type) 1261 else if (arrow->type == ARROW && arrow->race == type)
1419 { 1262 {
1420 /* allways prefer assasination/slaying */ 1263 /* allways prefer assasination/slaying */
1421 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1264 if (target->race && arrow->slaying.contains (target->race))
1422 { 1265 {
1423 if (arrow->attacktype & AT_DEATH) 1266 if (arrow->attacktype & AT_DEATH)
1424 { 1267 {
1425 *better = 100; 1268 *better = 100;
1426 return arrow; 1269 return arrow;
… …
1434 else 1277 else
1435 { 1278 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1279 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1280 {
1438 attacktype = 1 << attacknum; 1281 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1282 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1283 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441 { 1284 {
1442 tmp = arrow; 1285 tmp = arrow;
1443 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1286 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444 } 1287 }
1445 } 1288 }
1289
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1290 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1291 {
1448 tmp = arrow; 1292 tmp = arrow;
1449 betterby = 2 + arrow->magic + arrow->stats.dam; 1293 betterby = 2 + arrow->magic + arrow->stats.dam;
1450 } 1294 }
1295
1451 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1296 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1452 { 1297 {
1453 tmp = arrow; 1298 tmp = arrow;
1454 betterby = 1 + arrow->magic + arrow->stats.dam; 1299 betterby = 1 + arrow->magic + arrow->stats.dam;
1455 } 1300 }
1456 } 1301 }
1457 } 1302 }
1458 } 1303 }
1304
1459 if (tmp == NULL && arrow == NULL) 1305 if (tmp == NULL && arrow == NULL)
1460 return find_arrow (op, type); 1306 return find_arrow (op, type);
1461 1307
1462 *better = betterby; 1308 *better = betterby;
1463 return tmp; 1309 return tmp;
… …
1467 * find_better_arrow to find a decent arrow to use. 1313 * find_better_arrow to find a decent arrow to use.
1468 * op = the shooter 1314 * op = the shooter
1469 * type = bow->race 1315 * type = bow->race
1470 * dir = fire direction 1316 * dir = fire direction
1471 */ 1317 */
1472object * 1318static object *
1473pick_arrow_target (object *op, const char *type, int dir) 1319pick_arrow_target (object *op, shstr_cmp type, int dir)
1474{ 1320{
1475 object *tmp = NULL; 1321 object *tmp = NULL;
1476 maptile *m; 1322 maptile *m;
1477 int i, mflags, found, number; 1323 int i, mflags, found, number;
1478 sint16 x, y; 1324 sint16 x, y;
… …
1493 for (i = 0, found = 0; i < 20; i++) 1339 for (i = 0, found = 0; i < 20; i++)
1494 { 1340 {
1495 x += freearr_x[dir]; 1341 x += freearr_x[dir];
1496 y += freearr_y[dir]; 1342 y += freearr_y[dir];
1497 mflags = get_map_flags (m, &m, x, y, &x, &y); 1343 mflags = get_map_flags (m, &m, x, y, &x, &y);
1344
1498 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1345 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1499 { 1346 {
1500 tmp = NULL; 1347 tmp = 0;
1501 break; 1348 break;
1502 } 1349 }
1503 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1350 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1504 { 1351 {
1505 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1352 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1506 * perhaps a bad assumption. 1353 * perhaps a bad assumption.
1507 */ 1354 */
1508 tmp = NULL; 1355 tmp = 0;
1509 break; 1356 break;
1510 } 1357 }
1358
1511 if (mflags & P_IS_ALIVE) 1359 if (mflags & P_IS_ALIVE)
1512 {
1513 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1360 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1514 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1515 {
1516 found++;
1517 break;
1518 }
1519 if (found)
1520 break; 1362 break;
1521 }
1522 } 1363 }
1523 if (tmp == NULL) 1364
1365 if (!tmp)
1524 return find_arrow (op, type); 1366 return find_arrow (op, type);
1525 1367
1526 if (tmp->head) 1368 if (tmp->head)
1527 tmp = tmp->head; 1369 tmp = tmp->head;
1528 1370
… …
1568 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1410 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1569 return 0; 1411 return 0;
1570 } 1412 }
1571 1413
1572 // optimisation: move object to top so we will find it quickly again 1414 // optimisation: move object to top so we will find it quickly again
1573 if (bow->below) 1415 splay (bow);
1574 {
1575 bow->remove ();
1576 op->insert (bow);
1577 }
1578
1579 } 1416 }
1580 1417
1581 if (!bow->race || !bow->skill) 1418 if (!bow->race || !bow->skill)
1582 { 1419 {
1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1420 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1609 } 1446 }
1610 1447
1611 /* this should not happen, but sometimes does */ 1448 /* this should not happen, but sometimes does */
1612 if (arrow->nrof == 0) 1449 if (arrow->nrof == 0)
1613 { 1450 {
1451 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1614 arrow->destroy (); 1452 arrow->destroy ();
1615 return 0; 1453 return 0;
1616 } 1454 }
1617 1455
1618 left = arrow; /* these are arrows left to the player */ 1456 left = arrow; /* these are arrows left to the player */
1619 arrow = get_split_ob (arrow, 1); 1457 arrow = arrow->split ();
1620 if (!arrow) 1458 if (!arrow)
1621 { 1459 {
1622 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1460 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1623 return 0; 1461 return 0;
1624 } 1462 }
… …
1628 arrow->direction = dir; 1466 arrow->direction = dir;
1629 1467
1630 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1468 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1631 arrow->stats.hp = arrow->stats.dam; 1469 arrow->stats.hp = arrow->stats.dam;
1632 arrow->stats.grace = arrow->attacktype; 1470 arrow->stats.grace = arrow->attacktype;
1633 1471 arrow->custom_name = arrow->slaying;
1634 if (arrow->slaying)
1635 arrow->spellarg = strdup (arrow->slaying);
1636 1472
1637#if 0 1473#if 0
1638 if (player *pl = op->contr) 1474 if (player *pl = op->contr)
1639 { 1475 {
1640 float speed = pl->weapon_sp; 1476 float speed = pl->weapon_sp;
… …
1686 1522
1687 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1523 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1688 arrow->move_type = MOVE_FLY_LOW; 1524 arrow->move_type = MOVE_FLY_LOW;
1689 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1525 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1690 1526
1691 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1527 op->play_sound (sound_find ("fire_arrow"));
1692 m->insert (arrow, sx, sy, op); 1528 m->insert (arrow, sx, sy, op);
1693 1529
1694 if (!arrow->destroyed ()) 1530 if (!arrow->destroyed ())
1695 move_arrow (arrow); 1531 move_arrow (arrow);
1696
1697 if (op->type == PLAYER)
1698 {
1699 if (left->destroyed ())
1700 esrv_del_item (op->contr, left->count);
1701 else
1702 esrv_send_item (op, left);
1703 }
1704 1532
1705 return 1; 1533 return 1;
1706} 1534}
1707 1535
1708/* Special fire code for players - this takes into 1536/* Special fire code for players - this takes into
… …
1710 * but monsters can't. Putting that code here 1538 * but monsters can't. Putting that code here
1711 * makes the fire_bow code much cleaner. 1539 * makes the fire_bow code much cleaner.
1712 * this function should only be called if 'op' is a player, 1540 * this function should only be called if 'op' is a player,
1713 * hence the function name. 1541 * hence the function name.
1714 */ 1542 */
1715int 1543static int
1716player_fire_bow (object *op, int dir) 1544player_fire_bow (object *op, int dir)
1717{ 1545{
1718 int ret = 0, wcmod = 0; 1546 int ret;
1719 1547
1720 if (op->contr->bowtype == bow_bestarrow) 1548 if (op->contr->bowtype == bow_bestarrow)
1721 { 1549 {
1722 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1550 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1723 } 1551 }
1724 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1552 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1725 { 1553 {
1726 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1554 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1727 wcmod = -1;
1728
1729 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1555 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1730 } 1556 }
1731 else if (op->contr->bowtype == bow_threewide) 1557 else if (op->contr->bowtype == bow_threewide)
1732 { 1558 {
1733 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1559 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1560 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1735 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1561 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1736 } 1562 }
1737 else if (op->contr->bowtype == bow_spreadshot) 1563 else if (op->contr->bowtype == bow_spreadshot)
1738 { 1564 {
1739 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1565 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1566 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1741 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1567 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1742 } 1568 }
1743 else 1569 else
1744 { 1570 {
… …
1750} 1576}
1751 1577
1752/* Fires a misc (wand/rod/horn) object in 'dir'. 1578/* Fires a misc (wand/rod/horn) object in 'dir'.
1753 * Broken apart from 'fire' to keep it more readable. 1579 * Broken apart from 'fire' to keep it more readable.
1754 */ 1580 */
1755void 1581static void
1756fire_misc_object (object *op, int dir) 1582fire_misc_object (object *op, int dir)
1757{ 1583{
1758 object *item = op->contr->ranged_ob; 1584 object *item = op->contr->ranged_ob;
1759 1585
1760 if (!item) 1586 if (!item)
… …
1767 { 1593 {
1768 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1594 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769 return; 1595 return;
1770 } 1596 }
1771 1597
1772 if (!op->change_weapon (item)) 1598 if (!op->apply (item))
1773 return; 1599 return;
1774 1600
1775 if (item->type == WAND) 1601 if (item->type == WAND)
1776 { 1602 {
1777 if (item->stats.food <= 0) 1603 if (item->stats.food <= 0)
1778 { 1604 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1605 op->contr->play_sound (sound_find ("wand_poof"));
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1606 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781 1607
1782 return; 1608 return;
1783 } 1609 }
1784 } 1610 }
1785 else if (item->type == ROD || item->type == HORN) 1611 else if (item->type == ROD || item->type == HORN)
1786 { 1612 {
1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1613 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1614
1615 // using the maximum of the rods charge allows at least one spell cast
1616 // for a rod or horn, this fixes some broken rods.
1617 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1788 { 1618 {
1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1619 op->contr->play_sound (sound_find ("wand_poof"));
1790 1620
1791 if (item->type == ROD) 1621 if (item->type == ROD)
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1622 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793 else 1623 else
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1624 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1797 } 1627 }
1798 } 1628 }
1799 1629
1800 if (cast_spell (op, item, dir, item->inv, NULL)) 1630 if (cast_spell (op, item, dir, item->inv, NULL))
1801 { 1631 {
1802 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1632 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1633
1803 if (item->type == WAND) 1634 if (item->type == WAND)
1804 { 1635 {
1805 if (!(--item->stats.food)) 1636 if (!(--item->stats.food))
1806 { 1637 {
1807 object *tmp; 1638 object *tmp;
1808 1639
1809 if (item->arch) 1640 if (item->arch)
1810 { 1641 {
1811 CLEAR_FLAG (item, FLAG_ANIMATE); 1642 CLEAR_FLAG (item, FLAG_ANIMATE);
1812 item->face = item->arch->clone.face; 1643 item->face = item->arch->face;
1813 item->set_speed (0); 1644 item->set_speed (0);
1814 } 1645 }
1815 1646
1816 if ((tmp = item->in_player ())) 1647 if (object *pl = item->visible_to ())
1817 esrv_update_item (UPD_ANIM, tmp, item); 1648 esrv_update_item (UPD_ANIM, pl, item);
1818 } 1649 }
1819 } 1650 }
1820 else if (item->type == ROD || item->type == HORN) 1651 else if (item->type == ROD || item->type == HORN)
1821 drain_rod_charge (item); 1652 drain_rod_charge (item);
1822 } 1653 }
… …
1827bool 1658bool
1828fire (object *op, int dir) 1659fire (object *op, int dir)
1829{ 1660{
1830 int spellcost = 0; 1661 int spellcost = 0;
1831 1662
1832 /* check for loss of invisiblity/hide */
1833 if (action_makes_visible (op))
1834 make_visible (op);
1835
1836 player *pl = op->contr; 1663 player *pl = op->contr;
1837 1664
1838 if (pl->golem) 1665 if (pl->golem)
1839 { 1666 {
1840 control_golem (op->contr->golem, dir); 1667 control_golem (op->contr->golem, dir);
… …
1842 } 1669 }
1843 1670
1844 object *ob = pl->ranged_ob; 1671 object *ob = pl->ranged_ob;
1845 1672
1846 if (!ob) 1673 if (!ob)
1847 return false;
1848
1849 if (!op->change_weapon (ob))
1850 return false; 1674 return false;
1851 1675
1852 if (op->speed_left > 0.f) 1676 if (op->speed_left > 0.f)
1853 --op->speed_left; 1677 --op->speed_left;
1854 else 1678 else
1855 return false; 1679 return false;
1856 1680
1681 if (!op->apply (ob))
1682 return false;
1683
1684 /* check for loss of invisiblity/hide */
1685 if (action_makes_visible (op))
1686 make_visible (op);
1687
1857 switch (ob->type) 1688 switch (ob->type)
1858 { 1689 {
1859 case BOW: 1690 case BOW:
1860 player_fire_bow (op, dir); 1691 player_fire_bow (op, dir);
1861 break; 1692 break;
1862 1693
1863 case SPELL: 1694 case SPELL:
1864 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1695 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1865 break; 1696 break;
1866 1697
1867 case BUILDER: 1698 case BUILDER:
1868 apply_map_builder (op, dir); 1699 apply_map_builder (op, dir);
1869 break; 1700 break;
… …
1878 } 1709 }
1879 1710
1880 return true; 1711 return true;
1881} 1712}
1882 1713
1883/* find_key 1714static object *
1884 * We try to find a key for the door as passed. If we find a key
1885 * and successfully use it, we return the key, otherwise NULL
1886 * This function merges both normal and locked door, since the logic
1887 * for both is the same - just the specific key is different.
1888 * pl is the player,
1889 * inv is the objects inventory to searched
1890 * door is the door we are trying to match against.
1891 * This function can be called recursively to search containers.
1892 */
1893object *
1894find_key (object *pl, object *container, object *door) 1715find_key_ (object *pl, object *container, object *door)
1895{ 1716{
1896 object *tmp, *key; 1717 object *tmp, *key;
1897 1718
1898 /* Should not happen, but sanity checking is never bad */ 1719 /* Should not happen, but sanity checking is never bad */
1899 if (!container->inv) 1720 if (!container->inv)
… …
1902 /* First, lets try to find a key in the top level inventory */ 1723 /* First, lets try to find a key in the top level inventory */
1903 for (tmp = container->inv; tmp; tmp = tmp->below) 1724 for (tmp = container->inv; tmp; tmp = tmp->below)
1904 { 1725 {
1905 if (door->type == DOOR && tmp->type == KEY) 1726 if (door->type == DOOR && tmp->type == KEY)
1906 break; 1727 break;
1728
1907 /* For sanity, we should really check door type, but other stuff 1729 /* For sanity, we should really check door type, but other stuff
1908 * (like containers) can be locked with special keys 1730 * (like containers) can be locked with special keys
1909 */ 1731 */
1910 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1732 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1911 break; 1733 break;
… …
1917 * a key, return 1739 * a key, return
1918 */ 1740 */
1919 if (!tmp) 1741 if (!tmp)
1920 { 1742 {
1921 for (tmp = container->inv; tmp; tmp = tmp->below) 1743 for (tmp = container->inv; tmp; tmp = tmp->below)
1922 {
1923 /* No reason to search empty containers */ 1744 /* No reason to search empty containers */
1924 if (tmp->type == CONTAINER && tmp->inv) 1745 if (tmp->type == CONTAINER && tmp->inv)
1925 {
1926 if ((key = find_key (pl, tmp, door))) 1746 if ((key = find_key_ (pl, tmp, door)))
1927 return key; 1747 return key;
1928 }
1929 }
1930 1748
1931 if (!tmp) 1749 if (!tmp)
1932 return NULL; 1750 return 0;
1933 } 1751 }
1934 1752
1935 /* We get down here if we have found a key. Now if its in a container, 1753 /* We get down here if we have found a key. Now if its in a container,
1936 * see if we actually want to use it 1754 * see if we actually want to use it
1937 */ 1755 */
1938 if (pl != container) 1756 if (pl != container)
1939 { 1757 {
1940 /* Only let players use keys in containers */ 1758 /* Only let players use keys in containers */
1941 if (!pl->contr) 1759 if (!pl->contr)
1942 return NULL; 1760 return 0;
1761
1943 /* cases where this fails: 1762 /* cases where this fails:
1944 * If we only search the player inventory, return now since we 1763 * If we only search the player inventory, return now since we
1945 * are not in the players inventory. 1764 * are not in the players inventory.
1946 * If the container is not active, return now since only active 1765 * If the container is not active, return now since only active
1947 * containers can be used. 1766 * containers can be used.
… …
1951 * inv must have been an container and must have been active. 1770 * inv must have been an container and must have been active.
1952 * 1771 *
1953 * Change the color so that the message doesn't disappear with 1772 * Change the color so that the message doesn't disappear with
1954 * all the others. 1773 * all the others.
1955 */ 1774 */
1956 if (pl->contr->usekeys == key_inventory || 1775 if (pl->contr->usekeys == key_inventory
1957 !QUERY_FLAG (container, FLAG_APPLIED) || 1776 || !QUERY_FLAG (container, FLAG_APPLIED)
1958 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1777 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1959 { 1778 {
1960 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1779 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1961 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1780 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1962 return NULL; 1781 return NULL;
1963 } 1782 }
1964 } 1783 }
1965 1784
1966 return tmp; 1785 return tmp;
1786}
1787
1788/* find_key
1789 * We try to find a key for the door as passed. If we find a key
1790 * and successfully use it, we return the key, otherwise NULL
1791 * This function merges both normal and locked door, since the logic
1792 * for both is the same - just the specific key is different.
1793 * pl is the player,
1794 * inv is the objects inventory to searched
1795 * door is the door we are trying to match against.
1796 * This function can be called recursively to search containers.
1797 */
1798object *
1799find_key (object *pl, object *container, object *door)
1800{
1801 if (door->slaying && is_match_expr (door->slaying))
1802 {
1803 // for match expressions, we try to find the key by applying the match
1804 // to the op itself, which is supposed to find the "key", instead
1805 // of searching through containers ourselves.
1806
1807 return match_one (door->slaying, container, door, pl, pl);
1808 }
1809 else
1810 return find_key_ (pl, container, door);
1967} 1811}
1968 1812
1969/* moved door processing out of move_player_attack. 1813/* moved door processing out of move_player_attack.
1970 * returns 1 if player has opened the door with a key 1814 * returns 1 if player has opened the door with a key
1971 * such that the caller should not do anything more, 1815 * such that the caller should not do anything more,
… …
1983 /* If we found a key, do some extra work */ 1827 /* If we found a key, do some extra work */
1984 if (key) 1828 if (key)
1985 { 1829 {
1986 object *container = key->env; 1830 object *container = key->env;
1987 1831
1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989
1990 if (action_makes_visible (op)) 1832 if (action_makes_visible (op))
1991 make_visible (op); 1833 make_visible (op);
1992 1834
1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1835 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1994 spring_trap (door->inv, op); 1836 spring_trap (door->inv, op);
1995 1837
1996 if (door->type == DOOR) 1838 if (door->type == DOOR)
1997 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1839 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1998 else if (door->type == LOCKED_DOOR) 1840 else if (door->type == LOCKED_DOOR)
1999 { 1841 {
2000 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1842 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2001 remove_door2 (door); /* remove door without violence ;-) */ 1843 remove_door2 (door); /* remove door without violence ;-) */
2002 } 1844 }
2003 1845
2004 /* Do this after we print the message */ 1846 /* Do this after we print the message */
2005 decrease_ob (key); /* Use up one of the keys */ 1847 key->decrease (); /* Use up one of the keys */
2006 /* Need to update the weight the container the key was in */
2007 if (container != op)
2008 esrv_update_item (UPD_WEIGHT, op, container);
2009 1848
2010 return 1; /* Nothing more to do below */ 1849 return 1; /* Nothing more to do below */
2011 } 1850 }
2012 else if (door->type == LOCKED_DOOR) 1851 else if (door->type == LOCKED_DOOR)
2013 { 1852 {
2014 /* Might as well return now - no other way to open this */ 1853 /* Might as well return now - no other way to open this */
2015 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1854 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2016 return 1; 1855 return 1;
2017 } 1856 }
2018 1857
2019 return 0; 1858 return 0;
2020} 1859}
… …
2026 * going to try and move (not fire weapons). 1865 * going to try and move (not fire weapons).
2027 */ 1866 */
2028bool 1867bool
2029move_player_attack (object *op, int dir) 1868move_player_attack (object *op, int dir)
2030{ 1869{
2031 int on_battleground; 1870 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1871 {
1872 --op->speed_left;
1873 return true;
1874 }
2032 1875
2033 sint16 nx = freearr_x[dir] + op->x; 1876 sint16 nx = freearr_x[dir] + op->x;
2034 sint16 ny = freearr_y[dir] + op->y; 1877 sint16 ny = freearr_y[dir] + op->y;
2035 1878
2036 on_battleground = op_on_battleground (op, 0, 0);
2037
2038 if (out_of_map (op->map, nx, ny)) 1879 if (out_of_map (op->map, nx, ny))
2039 return false; 1880 return false;
2040
2041 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2042 {
2043 --op->speed_left;
2044 return true;
2045 }
2046 1881
2047 /* If braced, or can't move to the square, and it is not out of the 1882 /* If braced, or can't move to the square, and it is not out of the
2048 * map, attack it. Note order of if statement is important - don't 1883 * map, attack it. Note order of if statement is important - don't
2049 * want to be calling move_ob if braced, because move_ob will move the 1884 * want to be calling move_ob if braced, because move_ob will move the
2050 * player. This is a pretty nasty hack, because if we could 1885 * player. This is a pretty nasty hack, because if we could
… …
2107 1942
2108 if (op->speed_left > 0.f) 1943 if (op->speed_left > 0.f)
2109 { 1944 {
2110 --op->speed_left; 1945 --op->speed_left;
2111 1946
2112 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1947 op->play_sound (sound_find ("push_player"));
2113 push_ob (mon, dir, op); 1948 push_ob (mon, dir, op);
2114 1949
2115 if (op->contr->tmp_invis || op->hide) 1950 if (action_makes_visible (op))
2116 make_visible (op); 1951 make_visible (op);
2117 1952
2118 return true; 1953 return true;
2119 } 1954 }
2120 else 1955 else
2121 return false; 1956 return false;
2122 } 1957 }
1958
1959 bool on_battleground = op_on_battleground (op, 0, 0);
2123 1960
2124 /* in certain circumstances, you shouldn't attack friendly 1961 /* in certain circumstances, you shouldn't attack friendly
2125 * creatures. Note that if you are braced, you can't push 1962 * creatures. Note that if you are braced, you can't push
2126 * someone, but put it inside this loop so that you won't 1963 * someone, but put it inside this loop so that you won't
2127 * attack them either. 1964 * attack them either.
… …
2136 { 1973 {
2137 --op->speed_left; 1974 --op->speed_left;
2138 1975
2139 if (!op->contr->braced) 1976 if (!op->contr->braced)
2140 { 1977 {
2141 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1978 op->play_sound (sound_find ("push_player"));
2142 push_ob (mon, dir, op); 1979 push_ob (mon, dir, op);
2143 } 1980 }
2144 else 1981 else
2145 new_draw_info (0, 0, op, "You withhold your attack"); 1982 op->statusmsg ("You withhold your attack");
2146 1983
2147 if (op->contr->tmp_invis || op->hide) 1984 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2148 make_visible (op); 1985 make_visible (op);
2149 1986
2150 return true; 1987 return true;
2151 } 1988 }
2152 } 1989 }
… …
2192} 2029}
2193 2030
2194bool 2031bool
2195move_player (object *op, int dir) 2032move_player (object *op, int dir)
2196{ 2033{
2197 int pick;
2198
2199 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2034 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2200 return 0; 2035 return 0;
2201 2036
2202 /* Sanity check: make sure dir is valid */ 2037 /* Sanity check: make sure dir is valid */
2203 if ((dir < 0) || (dir >= 9)) 2038 if (dir < 0 || dir >= 9)
2204 { 2039 {
2205 LOG (llevError, "move_player: invalid direction %d\n", dir); 2040 LOG (llevError, "move_player: invalid direction %d\n", dir);
2206 return 0; 2041 return 0;
2207 } 2042 }
2208 2043
… …
2210 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2045 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2211 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2046 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2212 2047
2213 op->facing = dir; 2048 op->facing = dir;
2214 2049
2215 if (op->hide) 2050 if (op->flag [FLAG_HIDDEN])
2216 do_hidden_move (op); 2051 do_hidden_move (op);
2217 2052
2218 bool retval; 2053 bool retval;
2054 int pick = 0;
2219 2055
2220 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2056 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2221 retval = RESULT_INT (0); 2057 retval = RESULT_INT (0);
2222 else if (op->contr->fire_on) 2058 else if (op->contr->fire_on)
2223 retval = fire (op, dir); 2059 retval = fire (op, dir);
… …
2280 return move_player (op, op->direction); 2116 return move_player (op, op->direction);
2281 2117
2282 return false; 2118 return false;
2283} 2119}
2284 2120
2285int 2121static int
2286save_life (object *op) 2122save_life (object *op)
2287{ 2123{
2288 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2124 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2289 return 0; 2125 return 0;
2290 2126
2291 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2127 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2292 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2128 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2293 { 2129 {
2294 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2130 op->play_sound (sound_find ("ob_evaporate"));
2295 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2131 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2296
2297 if (op->contr)
2298 esrv_del_item (op->contr, tmp->count);
2299 2132
2300 tmp->destroy (); 2133 tmp->destroy ();
2301 CLEAR_FLAG (op, FLAG_LIFESAVE); 2134 CLEAR_FLAG (op, FLAG_LIFESAVE);
2302 2135
2303 if (op->stats.hp < 0) 2136 if (op->stats.hp < 0)
2304 op->stats.hp = op->stats.maxhp; 2137 op->stats.hp = op->stats.maxhp;
2305 2138
2306 if (op->stats.food < 0) 2139 if (op->stats.food < 0)
2307 op->stats.food = 999; 2140 op->stats.food = MAX_FOOD;
2308 2141
2309 op->update_stats (); 2142 op->update_stats ();
2310 return 1; 2143 return 1;
2311 } 2144 }
2312 2145
… …
2316 return 0; 2149 return 0;
2317} 2150}
2318 2151
2319/* This goes throws the inventory and removes unpaid objects, and puts them 2152/* This goes throws the inventory and removes unpaid objects, and puts them
2320 * back in the map (location and map determined by values of env). This 2153 * back in the map (location and map determined by values of env). This
2321 * function will descend into containers. op is the object to start the search 2154 * function will descend into containers. op is the object to start the search
2322 * from. 2155 * from.
2323 */ 2156 */
2157static void
2158drop_unpaid_items (object *op, object *env)
2159{
2160 while (op)
2161 {
2162 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2163
2164 if (QUERY_FLAG (op, FLAG_UNPAID))
2165 op->insert_at (env);
2166 else if (op->inv)
2167 drop_unpaid_items (op->inv, env);
2168
2169 op = next;
2170 }
2171}
2172
2324void 2173void
2325remove_unpaid_objects (object *op, object *env) 2174object::drop_unpaid_items ()
2326{ 2175{
2327 while (op) 2176 if (!flag [FLAG_REMOVED])
2328 { 2177 ::drop_unpaid_items (inv, this);
2329 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2330
2331 if (QUERY_FLAG (op, FLAG_UNPAID))
2332 {
2333 if (env->type == PLAYER)
2334 esrv_del_item (env->contr, op->count);
2335
2336 op->insert_at (env);
2337 }
2338 else if (op->inv)
2339 remove_unpaid_objects (op->inv, env);
2340
2341 op = next;
2342 }
2343}
2344
2345/*
2346 * Returns pointer a static string containing gravestone text
2347 * Moved from apply.c to player.c - player.c is what
2348 * actually uses this function. player.c may not be quite the
2349 * best, a misc file for object actions is probably better,
2350 * but there isn't one in the server directory.
2351 */
2352char *
2353gravestone_text (object *op)
2354{
2355 static char buf2[MAX_BUF];
2356 char buf[MAX_BUF];
2357 time_t now = time (NULL);
2358
2359 strcpy (buf2, " R.I.P.\n\n");
2360 if (op->type == PLAYER)
2361 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2362 else
2363 sprintf (buf, "%s\n", &op->name);
2364
2365 strncat (buf2, " ", 20 - strlen (buf) / 2);
2366 strcat (buf2, buf);
2367 if (op->type == PLAYER)
2368 sprintf (buf, "who was in level %d when killed\n", op->level);
2369 else
2370 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2371
2372 strncat (buf2, " ", 20 - strlen (buf) / 2);
2373 strcat (buf2, buf);
2374 if (op->type == PLAYER)
2375 {
2376 sprintf (buf, "by %s.\n\n", op->contr->killer);
2377 strncat (buf2, " ", 21 - strlen (buf) / 2);
2378 strcat (buf2, buf);
2379 }
2380
2381 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2382 strncat (buf2, " ", 20 - strlen (buf) / 2);
2383 strcat (buf2, buf);
2384
2385 return buf2;
2386} 2178}
2387 2179
2388void 2180void
2389do_some_living (object *op) 2181do_some_living (object *op)
2390{ 2182{
… …
2442 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2234 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2443 else 2235 else
2444 { 2236 {
2445 gen_grace = op->stats.maxgrace; 2237 gen_grace = op->stats.maxgrace;
2446 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2238 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2447 }
2448
2449 /* Regenerate Spell Points */
2450 if (!op->contr->golem && --op->last_sp < 0)
2451 {
2452 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2453 if (op->stats.sp < op->stats.maxsp)
2454 {
2455 op->stats.sp++;
2456 /* dms do not consume food */
2457 if (!QUERY_FLAG (op, FLAG_WIZ))
2458 {
2459 op->stats.food--;
2460 if (op->contr->digestion < 0)
2461 op->stats.food += op->contr->digestion;
2462 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2463 op->stats.food = last_food;
2464 }
2465 }
2466
2467 if (max_sp > 1)
2468 {
2469 over_sp = (gen_sp + 10) / rate_sp;
2470 if (over_sp > 0)
2471 {
2472 if (op->stats.sp < op->stats.maxsp)
2473 {
2474 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2475
2476 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2477 op->stats.sp--;
2478
2479 if (op->stats.sp > op->stats.maxsp)
2480 op->stats.sp = op->stats.maxsp;
2481 }
2482 op->last_sp = 0;
2483 }
2484 else
2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486 }
2487 else
2488 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2489 } 2239 }
2490 2240
2491 /* Regenerate Grace */ 2241 /* Regenerate Grace */
2492 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2242 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2493 if (--op->last_grace < 0) 2243 if (--op->last_grace < 0)
… …
2514 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2264 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2515 } 2265 }
2516 /* wearing stuff doesn't detract from grace generation. */ 2266 /* wearing stuff doesn't detract from grace generation. */
2517 } 2267 }
2518 2268
2269 if (op->stats.food > 0)
2270 {
2519 /* Regenerate Hit Points */ 2271 /* Regenerate Spell Points */
2520 if (--op->last_heal < 0) 2272 if (!op->contr->golem && --op->last_sp < 0)
2521 {
2522 if (op->stats.hp < op->stats.maxhp)
2523 { 2273 {
2524 op->stats.hp++; 2274 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2525 /* dms do not consume food */ 2275
2526 if (!QUERY_FLAG (op, FLAG_WIZ)) 2276 if (op->stats.sp < op->stats.maxsp)
2527 { 2277 {
2278 op->stats.sp++;
2279
2280 /* dms do not consume food */
2281 if (!QUERY_FLAG (op, FLAG_WIZ))
2282 {
2528 op->stats.food--; 2283 op->stats.food--;
2284
2529 if (op->contr->digestion < 0) 2285 if (op->contr->digestion < 0)
2530 op->stats.food += op->contr->digestion; 2286 op->stats.food += op->contr->digestion;
2531 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2287 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2532 op->stats.food = last_food; 2288 op->stats.food = last_food;
2289 }
2533 } 2290 }
2534 }
2535 2291
2536 if (max_hp > 1) 2292 if (max_sp > 1)
2537 {
2538 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2539 if (over_hp > 0)
2540 { 2293 {
2541 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2294 over_sp = (gen_sp + 10) / rate_sp;
2295 if (over_sp > 0)
2296 {
2297 if (op->stats.sp < op->stats.maxsp)
2298 {
2299 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2300
2301 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2302 op->stats.sp--;
2303
2304 if (op->stats.sp > op->stats.maxsp)
2305 op->stats.sp = op->stats.maxsp;
2306 }
2307
2542 op->last_heal = 0; 2308 op->last_sp = 0;
2309 }
2310 else
2311 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2543 } 2312 }
2544 else 2313 else
2314 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2315 }
2316
2317 /* Regenerate Hit Points */
2318 if (--op->last_heal < 0)
2319 {
2320 if (op->stats.hp < op->stats.maxhp)
2545 { 2321 {
2546 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2322 op->stats.hp++;
2323
2324 /* dms do not consume food */
2325 if (!QUERY_FLAG (op, FLAG_WIZ))
2326 {
2327 op->stats.food--;
2328
2329 if (op->contr->digestion < 0)
2330 op->stats.food += op->contr->digestion;
2331 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2332 op->stats.food = last_food;
2333 }
2547 } 2334 }
2335
2336 if (max_hp > 1)
2337 {
2338 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2339
2340 if (over_hp > 0)
2341 {
2342 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2343 op->last_heal = 0;
2344 }
2345 else
2346 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2548 } 2347 }
2549 else 2348 else
2550 {
2551 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2349 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2552 } 2350 }
2553 } 2351 }
2554 2352
2555 /* Digestion */ 2353 /* Digestion */
2556 if (--op->last_eat < 0) 2354 if (--op->last_eat < 0)
2557 { 2355 {
2558 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2356 int bonus = max (0, op->contr->digestion),
2357 penalty = max (0, -op->contr->digestion);
2559 2358
2560 if (op->contr->gen_hp > 0)
2561 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2359 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2562 else
2563 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2564 2360
2565 /* dms do not consume food */ 2361 /* dms do not consume food */
2566 if (!QUERY_FLAG (op, FLAG_WIZ)) 2362 if (!QUERY_FLAG (op, FLAG_WIZ))
2567 op->stats.food--; 2363 op->stats.food--;
2568 } 2364 }
2569 2365
2570 if (op->stats.food < 0 && op->stats.hp >= 0) 2366 if (op->stats.food < 0 && op->stats.hp >= 0)
2571 { 2367 {
2572 object *tmp, *flesh = 0; 2368 object *flesh = 0;
2573 2369
2574 for (tmp = op->inv; tmp; tmp = tmp->below) 2370 for_inv_removable (op, tmp)
2575 { 2371 {
2576 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2372 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2373 continue;
2374
2375 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2577 { 2376 {
2578 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2377 op->statusmsg ("You blindly grab for a bite of food. "
2579 { 2378 "H<To prevent you from starving, you ate some random item from your backpack.>");
2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2379 op->apply (tmp);
2581 manual_apply (op, tmp, 0); 2380
2582 if (op->stats.food >= 0 || op->stats.hp < 0) 2381 if (op->stats.food >= 0 || op->stats.hp < 0)
2583 break; 2382 break;
2584 } 2383 }
2585 else if (tmp->type == FLESH) 2384 else if (tmp->type == FLESH)
2586 flesh = tmp; 2385 flesh = tmp;
2587 } /* End if paid for object */ 2386 }
2588 } /* end of for loop */
2589 2387
2590 /* If player is still starving, it means they don't have any food, so 2388 /* If player is still starving, it means they don't have any food, so
2591 * eat flesh instead. 2389 * eat flesh instead.
2592 */ 2390 */
2593 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2391 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2594 { 2392 {
2595 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2393 op->statusmsg ("You blindly grab for a bite of food. "
2394 "H<To prevent you from starving, you ate some random item from your backpack.>");
2596 manual_apply (op, flesh, 0); 2395 op->apply (flesh);
2597 } 2396 }
2397
2398 // If player is still starving, alert him!
2399 if (op->stats.food < 0)
2400 op->failmsg ("You are starving! "
2401 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2402 }
2403
2404 if (op->stats.food < 0)
2598 } 2405 {
2406 op->stats.hp += op->stats.food;
2407 op->stats.food = 0;
2599 2408
2600 while (op->stats.food < 0 && op->stats.hp >= 0) 2409 if (op->stats.hp < 0)
2601 op->stats.food++, op->stats.hp--; 2410 {
2411 op->contr->killer = archetype::get ("killer_starvation");
2412 op->contr->killer->destroy ();
2413 }
2414 }
2602 2415
2416 /* killer should be set here already */
2603 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2417 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604 kill_player (op); 2418 kill_player (op);
2605 } 2419 }
2606} 2420}
2607 2421
… …
2611 * file. 2425 * file.
2612 */ 2426 */
2613void 2427void
2614kill_player (object *op) 2428kill_player (object *op)
2615{ 2429{
2616 char buf[MAX_BUF];
2617 int x, y; 2430 int x, y;
2618
2619 //int i;
2620 maptile *map; /* this is for resurrection */ 2431 maptile *map; /* this is for resurrection */
2621
2622 /* int z;
2623 int num_stats_lose;
2624 int lost_a_stat;
2625 int lose_this_stat;
2626 int this_stat; */
2627 int will_kill_again; 2432 int will_kill_again;
2628 archetype *at; 2433 archetype *at;
2629 object *tmp; 2434 object *tmp;
2630 2435
2631 if (save_life (op)) 2436 if (save_life (op))
2632 return; 2437 return;
2633 2438
2439 dynbuf_text deathtab;
2440
2441 /* restore player */
2442 at = archetype::find (shstr_poisoning);
2443 if (object *tmp = present_arch_in_ob (at, op))
2444 {
2445 tmp->destroy ();
2446 deathtab << "Your body feels cleansed...\r";
2447 }
2448
2449 at = archetype::find (shstr_confusion);
2450 if (object *tmp = present_arch_in_ob (at, op))
2451 {
2452 tmp->destroy ();
2453 deathtab << "Your mind feels clearer...\r";
2454 }
2455
2456 cure_disease (op, 0, 0); /* remove any disease */
2457
2458 max_it (op->stats.hp , op->stats.maxhp);
2459 max_it (op->stats.sp , op->stats.maxsp);
2460 max_it (op->stats.grace, op->stats.maxgrace);
2461 max_it (op->stats.food , 200);
2462
2463 // remove all spell effects that are active
2464 // to avoid long-term effects such as word-of-recall
2465 for (object *item = op->inv; item; )
2466 {
2467 object *next = item->below;
2468
2469 if (item->type == SPELL_EFFECT && item->active)
2470 item->destroy ();
2471
2472 item = next;
2473 }
2634 2474
2635 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2475 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2636 * in cities ONLY!!! It is very important that this doesn't get abused. 2476 * in cities ONLY!!! It is very important that this doesn't get abused.
2637 * Look at op_on_battleground() for more info --AndreasV 2477 * Look at op_on_battleground() for more info --AndreasV
2638 */ 2478 */
2639 if (op_on_battleground (op, &x, &y)) 2479 if (op_on_battleground (op, &x, &y))
2640 { 2480 {
2641 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2481 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2642 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2643
2644 /* restore player */
2645 at = archetype::find ("poisoning");
2646 if (object *tmp = present_arch_in_ob (at, op))
2647 {
2648 tmp->destroy ();
2649 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2650 }
2651
2652 at = archetype::find ("confusion");
2653 if (object *tmp = present_arch_in_ob (at, op))
2654 {
2655 tmp->destroy ();
2656 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2657 }
2658
2659 cure_disease (op, 0); /* remove any disease */
2660 op->stats.hp = op->stats.maxhp;
2661 if (op->stats.food <= 0)
2662 op->stats.food = 999;
2663 2482
2664 /* create a bodypart-trophy to make the winner happy */ 2483 /* create a bodypart-trophy to make the winner happy */
2665 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2484 object *tmp = archetype::find (shstr_finger)->instance ();
2666 { 2485
2667 sprintf (buf, "%s's finger", &op->name); 2486 tmp->name = format ("%s's finger" , &op->name);
2668 tmp->name = buf; 2487 tmp->name_pl = format ("%s's fingers", &op->name);
2669 sprintf (buf, " This finger has been cut off %s\n" 2488 tmp->msg = format (
2670 " the %s, when he was defeated at\n level %d by %s.\n", 2489 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2671 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2490 &op->name, op->contr->title,
2672 tmp->msg = buf; 2491 (int)op->level,
2492 op->contr->killer_name ()
2493 );
2673 tmp->value = 0, tmp->type = 0; 2494 tmp->value = 0, tmp->type = 0;
2674 tmp->materialname = "organics"; 2495 tmp->material = name_to_material (shstr_organic);
2675 tmp->insert_at (op, tmp); 2496 tmp->insert_at (op, tmp);
2676 }
2677 2497
2678 /* teleport defeated player to new destination */ 2498 /* teleport defeated player to new destination */
2679 transfer_ob (op, x, y, 0, NULL); 2499 transfer_ob (op, x, y, 0, NULL);
2680 op->contr->braced = 0; 2500 op->contr->braced = 0;
2501
2502 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2681 return; 2503 return;
2682 } 2504 }
2683 2505
2506 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2507 deathtab << "T<YOU HAVE DIED>\n\n";
2508
2684 INVOKE_PLAYER (DEATH, op->contr); 2509 INVOKE_PLAYER (DEATH, op->contr);
2685 2510
2686 command_kill_pets (op, 0); 2511 command_kill_pets (op, 0);
2687 2512
2688 if (op->stats.food < 0) 2513 op->contr->play_sound (sound_find ("player_dies"));
2689 {
2690 sprintf (buf, "%s starved to death.", &op->name);
2691 strcpy (op->contr->killer, "starvation");
2692 }
2693 else
2694 sprintf (buf, "%s died.", &op->name);
2695
2696 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2697 2514
2698 /* save the map location for corpse, gravestone */ 2515 /* save the map location for corpse, gravestone */
2699 x = op->x; 2516 x = op->x;
2700 y = op->y; 2517 y = op->y;
2701 map = op->map; 2518 map = op->map;
… …
2729 2546
2730 lost_a_stat = 0; 2547 lost_a_stat = 0;
2731 2548
2732 for (z = 0; z < num_stats_lose; z++) 2549 for (z = 0; z < num_stats_lose; z++)
2733 { 2550 {
2734 i = RANDOM () % NUM_STATS; 2551 i = rndm (NUM_STATS);
2735 2552
2736 if (settings.stat_loss_on_death) 2553 if (settings.stat_loss_on_death)
2737 { 2554 {
2738 /* Pick a random stat and take a point off it. Tell the player 2555 /* Pick a random stat and take a point off it. Tell the player
2739 * what he lost. 2556 * what he lost.
… …
2746 lost_a_stat = 1; 2563 lost_a_stat = 1;
2747 } 2564 }
2748 else 2565 else
2749 { 2566 {
2750 /* deplete a stat */ 2567 /* deplete a stat */
2751 archetype *deparch = archetype::find ("depletion"); 2568 archetype *deparch = archetype::find (shstr_depletion);
2752 object *dep; 2569 object *dep;
2753 2570
2754 dep = present_arch_in_ob (deparch, op); 2571 dep = present_arch_in_ob (deparch, op);
2755 if (!dep) 2572 if (!dep)
2756 { 2573 {
2757 dep = arch_to_object (deparch); 2574 dep = deparch->instance ();
2758 insert_ob_in_ob (dep, op); 2575 insert_ob_in_ob (dep, op);
2759 } 2576 }
2760 lose_this_stat = 1; 2577 lose_this_stat = 1;
2761 if (settings.balanced_stat_loss) 2578 if (settings.balanced_stat_loss)
2762 { 2579 {
… …
2790 } 2607 }
2791 } 2608 }
2792 2609
2793 if (lose_this_stat) 2610 if (lose_this_stat)
2794 { 2611 {
2795 this_stat = get_attr_value (&(dep->stats), i); 2612 this_stat = get_attr_value (&dep->stats, i);
2796 /* We could try to do something clever like find another 2613 /* We could try to do something clever like find another
2797 * stat to reduce if this fails. But chances are, if 2614 * stat to reduce if this fails. But chances are, if
2798 * stats have been depleted to -50, all are pretty low 2615 * stats have been depleted to -50, all are pretty low
2799 * and should be roughly the same, so it shouldn't make a 2616 * and should be roughly the same, so it shouldn't make a
2800 * difference. 2617 * difference.
… …
2808 lost_a_stat = 1; 2625 lost_a_stat = 1;
2809 } 2626 }
2810 } 2627 }
2811 } 2628 }
2812 } 2629 }
2630
2813 /* If no stat lost, tell the player. */ 2631 /* If no stat lost, tell the player. */
2814 if (!lost_a_stat) 2632 if (!lost_a_stat)
2815 { 2633 {
2816 /* determine_god() seems to not work sometimes... why is this? 2634 /* determine_god() seems to not work sometimes... why is this?
2817 Should I be using something else? GD */ 2635 Should I be using something else? GD */
2818 const char *god = determine_god (op); 2636 shstr_tmp god = determine_god (op);
2819 2637
2820 if (god && (strcmp (god, "none"))) 2638 if (god != shstr_none)
2821 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2639 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2822 else 2640 else
2823 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2641 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2824 } 2642 }
2825#else 2643#else
2826 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2644 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2827#endif 2645#endif
2828 2646
2829 /* Put a gravestone up where the character 'almost' died. List the 2647 /* Put a gravestone up where the character 'almost' died. List the
2830 * exp loss on the stone. 2648 * exp loss on the stone.
2831 */ 2649 */
2832 tmp = arch_to_object (archetype::find ("gravestone")); 2650 tmp = archetype::find (shstr_gravestone)->instance ();
2833 sprintf (buf, "%s's gravestone", &op->name); 2651 tmp->name = format ("%s's gravestone", &op->name);
2834 tmp->name = buf; 2652 tmp->name_pl = format ("%s's gravestones", &op->name);
2835 sprintf (buf, "%s's gravestones", &op->name); 2653 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2836 tmp->name_pl = buf; 2654 &op->name, op->contr->title, op->contr->killer_name ());
2837 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);
2838 tmp->msg = buf;
2839 tmp->x = op->x, tmp->y = op->y; 2655 tmp->x = op->x, tmp->y = op->y;
2840 insert_ob_in_map (tmp, op->map, NULL, 0); 2656 insert_ob_in_map (tmp, op->map, NULL, 0);
2841 2657
2842 /**************************************/ 2658 /**************************************/
2843 /* */ 2659 /* */
2844 /* Subtract the experience points, */ 2660 /* Subtract the experience points, */
2845 /* if we died cause of food, give us */
2846 /* food, and reset HP's... */
2847 /* */ 2661 /* */
2848 /**************************************/ 2662 /**************************************/
2849 2663
2850 /* remove any poisoning and confusion the character may be suffering. */
2851 /* restore player */
2852 at = archetype::find ("poisoning");
2853 tmp = present_arch_in_ob (at, op);
2854
2855 if (tmp)
2856 {
2857 tmp->destroy ();
2858 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2859 }
2860
2861 at = archetype::find ("confusion");
2862 tmp = present_arch_in_ob (at, op);
2863 if (tmp)
2864 {
2865 tmp->destroy ();
2866 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2867 }
2868
2869 cure_disease (op, 0); /* remove any disease */
2870
2871 /*add_exp(op, (op->stats.exp * -0.20)); */ 2664 /*add_exp(op, (op->stats.exp * -0.20)); */
2872 apply_death_exp_penalty (op); 2665 apply_death_exp_penalty (op);
2873 if (op->stats.food < 100)
2874 op->stats.food = 900;
2875 op->stats.hp = op->stats.maxhp;
2876 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2877 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2878 2666
2879 /* 2667 /*
2880 * Check to see if the player has any unpaid items. If so, remove them 2668 * Check to see if the player has any unpaid items. If so, remove them
2881 * and put them back in the map. 2669 * and put them back in the map.
2882 */ 2670 */
2883 remove_unpaid_objects (op->inv, op); 2671 op->drop_unpaid_items ();
2884 2672
2885 /****************************************/ 2673 /****************************************/
2886 /* */ 2674 /* */
2887 /* Move player to his current respawn- */ 2675 /* Move player to his current respawn- */
2888 /* position (usually last savebed) */ 2676 /* position (usually last savebed) */
… …
2917 if (will_kill_again & (1 << at)) 2705 if (will_kill_again & (1 << at))
2918 force->resist[at] = 100; 2706 force->resist[at] = 100;
2919 2707
2920 insert_ob_in_ob (force, op); 2708 insert_ob_in_ob (force, op);
2921 op->update_stats (); 2709 op->update_stats ();
2922
2923 } 2710 }
2924 2711
2925 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2712 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2926} 2713}
2927 2714
2928void 2715static void
2929loot_object (object *op) 2716loot_object (object *op)
2930{ /* Grab and destroy some treasure */ 2717{ /* Grab and destroy some treasure */
2931 object *tmp, *tmp2, *next; 2718 object *tmp, *tmp2, *next;
2932 2719
2933 op->close_container (); /* close open sack first */ 2720 op->close_container (); /* close open sack first */
… …
2947 2734
2948 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2735 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2949 { 2736 {
2950 if (tmp->nrof > 1) 2737 if (tmp->nrof > 1)
2951 { 2738 {
2952 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2739 tmp->decrease (rndm (1, tmp->nrof - 1));
2953 tmp2->destroy ();
2954 insert_ob_in_map (tmp, op->map, NULL, 0); 2740 insert_ob_in_map (tmp, op->map, NULL, 0);
2955 } 2741 }
2956 else 2742 else
2957 tmp->destroy (); 2743 tmp->destroy ();
2958 } 2744 }
… …
2965 * fix_weight(): Check recursively the weight of all players, and fix 2751 * fix_weight(): Check recursively the weight of all players, and fix
2966 * what needs to be fixed. Refresh windows and fix speed if anything 2752 * what needs to be fixed. Refresh windows and fix speed if anything
2967 * was changed. 2753 * was changed.
2968 */ 2754 */
2969void 2755void
2970fix_weight (void) 2756fix_weight ()
2971{ 2757{
2972 for_all_players (pl) 2758 for_all_players (pl)
2973 { 2759 {
2974 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2760 sint32 old = pl->ob->carrying;
2975 2761
2976 if (old == sum) 2762 pl->ob->update_weight ();
2977 continue; 2763
2764 if (old != pl->ob->carrying)
2765 {
2978 pl->ob->update_stats (); 2766 pl->ob->update_stats ();
2979 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2767 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2768 }
2980 } 2769 }
2981} 2770}
2982 2771
2983void 2772void
2984fix_luck (void) 2773fix_luck ()
2985{ 2774{
2986 for_all_players (pl) 2775 for_all_players (pl)
2987 if (!pl->ob->contr->ns->state) 2776 if (!pl->ob->contr->ns->state)
2988 pl->ob->change_luck (0); 2777 pl->ob->change_luck (0);
2989} 2778}
… …
3026} 2815}
3027 2816
3028void 2817void
3029make_visible (object *op) 2818make_visible (object *op)
3030{ 2819{
3031 op->hide = 0; 2820 op->flag [FLAG_HIDDEN] = 0;
3032 op->invisible = 0; 2821 op->invisible = 0;
2822
3033 if (op->type == PLAYER) 2823 if (op->type == PLAYER)
3034 { 2824 {
3035 op->contr->tmp_invis = 0; 2825 op->contr->tmp_invis = 0;
3036 op->contr->invis_race = 0; 2826 op->contr->invis_race = 0;
3037 } 2827 }
… …
3040} 2830}
3041 2831
3042int 2832int
3043is_true_undead (object *op) 2833is_true_undead (object *op)
3044{ 2834{
3045 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 2835 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3046 return 1; 2836 return 1;
3047 2837
3048 return 0; 2838 return 0;
3049} 2839}
3050 2840
3051/* look at the surrounding terrain to determine 2841/* look at the surrounding terrain to determine
3052 * the hideability of this object. Positive levels 2842 * the hideability of this object. Positive levels
3053 * indicate greater hideability. 2843 * indicate greater hideability.
3054 */ 2844 */
3055
3056int 2845int
3057hideability (object *ob) 2846hideability (object *ob)
3058{ 2847{
3059 int i, level = 0, mflag; 2848 int i, level = 0, mflag;
3060 sint16 x, y; 2849 sint16 x, y;
3061 2850
3062 if (!ob || !ob->map) 2851 if (!ob || !ob->map)
3063 return 0; 2852 return 0;
3064 2853
3065 /* so, on normal lighted maps, its hard to hide */ 2854 /* so, on normal lighted maps, its hard to hide */
3066 level = ob->map->darkness - 2; 2855 level = ob->map->darklevel () - 2;
3067 2856
3068 /* this also picks up whether the object is glowing. 2857 /* this also picks up whether the object is glowing.
3069 * If you carry a light on a non-dark map, its not 2858 * If you carry a light on a non-dark map, its not
3070 * as bad as carrying a light on a pitch dark map */ 2859 * as bad as carrying a light on a pitch dark map */
3071 if (has_carried_lights (ob)) 2860 if (ob->has_carried_lights ())
3072 level = -(10 + (2 * ob->map->darkness)); 2861 level = -(10 + (2 * ob->map->darklevel ()));
3073 2862
3074 /* scan through all nearby squares for terrain to hide in */ 2863 /* scan through all nearby squares for terrain to hide in */
3075 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2864 for (i = 0, x = ob->x, y = ob->y;
2865 i <= SIZEOFFREE1;
2866 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3076 { 2867 {
3077 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2868 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3078 if (mflag & P_OUT_OF_MAP) 2869 if (mflag & P_OUT_OF_MAP)
3079 {
3080 continue; 2870 continue;
3081 } 2871
3082 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2872 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3083 level += 2; 2873 level += 2;
3084 else /* open terrain! */ 2874 else /* open terrain! */
3085 level -= 1; 2875 level -= 1;
3086 } 2876 }
… …
3097 * spot (surrounded by clear terrain in broad daylight). -b.t. 2887 * spot (surrounded by clear terrain in broad daylight). -b.t.
3098 */ 2888 */
3099void 2889void
3100do_hidden_move (object *op) 2890do_hidden_move (object *op)
3101{ 2891{
3102 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2892 int hide = 0;
3103 object *skop;
3104 2893
3105 if (!op || !op->map) 2894 if (!op || !op->map)
3106 return; 2895 return;
3107 2896
3108 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2897 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2898 int num = random_roll (0, 19, op, PREFER_LOW);
3109 2899
3110 /* its *extremely* hard to run and sneak/hide at the same time! */ 2900 /* its *extremely* hard to run and sneak/hide at the same time! */
3111 if (op->type == PLAYER && op->contr->run_on) 2901 if (op->type == PLAYER && op->contr->run_on)
3112 if (!skop || num >= skop->level) 2902 if (!skop || num >= skop->level)
3113 { 2903 {
… …
3123 num -= hide; 2913 num -= hide;
3124 2914
3125 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2915 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3126 { 2916 {
3127 make_visible (op); 2917 make_visible (op);
2918
3128 if (op->type == PLAYER) 2919 if (op->type == PLAYER)
3129 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2920 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3130 } 2921 }
3131 else if (op->type == PLAYER && skop) 2922 else if (op->type == PLAYER && skop)
3132 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2923 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3185 * object op. This function works fine for monsters, 2976 * object op. This function works fine for monsters,
3186 * but we dont worry if the object isnt the top one in 2977 * but we dont worry if the object isnt the top one in
3187 * a pile (say a coin under a table would return "viewable" 2978 * a pile (say a coin under a table would return "viewable"
3188 * by this routine). Another question, should we be 2979 * by this routine). Another question, should we be
3189 * concerned with the direction the player is looking 2980 * concerned with the direction the player is looking
3190 * in? Realistically, most of use cant see stuff behind 2981 * in? Realistically, most of us can't see stuff behind
3191 * our backs...on the other hand, does the "facing" direction 2982 * our backs...on the other hand, does the "facing" direction
3192 * imply the way your head, or body is facing? Its possible 2983 * imply the way your head, or body is facing? It's possible
3193 * for them to differ. Sigh, this fctn could get a bit more complex. 2984 * for them to differ. Sigh, this fctn could get a bit more complex.
3194 * -b.t. 2985 * -b.t.
3195 * This function is now map tiling safe. 2986 * This function is now map tiling safe.
3196 */ 2987 */
3197
3198int 2988int
3199player_can_view (object *pl, object *op) 2989player_can_view (object *pl, object *op)
3200{ 2990{
3201 rv_vector rv; 2991 rv_vector rv;
3202 int dx, dy; 2992 int dx, dy;
… …
3214 3004
3215 get_rangevector (pl, op, &rv, 0x1); 3005 get_rangevector (pl, op, &rv, 0x1);
3216 3006
3217 /* starting with the 'head' part, lets loop 3007 /* starting with the 'head' part, lets loop
3218 * through the object and find if it has any 3008 * through the object and find if it has any
3219 * part that is in the los array but isnt on 3009 * part that is in the los array but isn't on
3220 * a blocked los square. 3010 * a blocked los square.
3221 * we use the archetype to figure out offsets. 3011 * we use the archetype to figure out offsets.
3222 */ 3012 */
3223 while (op) 3013 while (op)
3224 { 3014 {
3225 dx = rv.distance_x + op->arch->clone.x; 3015 dx = rv.distance_x + op->arch->x;
3226 dy = rv.distance_y + op->arch->clone.y; 3016 dy = rv.distance_y + op->arch->y;
3227 3017
3228 /* only the viewable area the player sees is updated by LOS 3018 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3229 * code, so we need to restrict ourselves to that range of values
3230 * for any meaningful values.
3231 */
3232 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3233 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3234 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3235 return 1; 3019 return 1;
3020
3236 op = op->more; 3021 op = op->more;
3237 } 3022 }
3238 return 0;
3239}
3240 3023
3241/* routine for both players and monsters. We call this when
3242 * there is a possibility for our action distrubing our hiding
3243 * place or invisiblity spell. Artefact invisiblity is not
3244 * effected by this. If we arent invisible to begin with, we
3245 * return 0.
3246 */
3247int
3248action_makes_visible (object *op)
3249{
3250
3251 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3252 {
3253 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3254 return 0;
3255
3256 if (op->contr && op->contr->tmp_invis == 0)
3257 return 0;
3258
3259 /* If monsters, they should become visible */
3260 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3261 {
3262 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3263 return 1;
3264 }
3265 }
3266 return 0; 3024 return 0;
3267} 3025}
3268 3026
3269/* op_on_battleground - checks if the given object op (usually 3027/* op_on_battleground - checks if the given object op (usually
3270 * a player) is standing on a valid battleground-tile, 3028 * a player) is standing on a valid battleground-tile,
… …
3275 * Default is to do the same as before, so only people wanting to have different points need worry about this 3033 * Default is to do the same as before, so only people wanting to have different points need worry about this
3276 */ 3034 */
3277int 3035int
3278op_on_battleground (object *op, int *x, int *y) 3036op_on_battleground (object *op, int *x, int *y)
3279{ 3037{
3280 object *tmp;
3281
3282 /* A battleground-tile needs the following attributes to be valid: 3038 /* A battleground-tile needs the following attributes to be valid:
3283 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3039 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3284 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3040 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3285 * and the exit-coordinates sp/hp must both be > 0. 3041 * and the exit-coordinates sp/hp must both be > 0.
3286 * => The intention here is to prevent abuse of the battleground- 3042 * => The intention here is to prevent abuse of the battleground-
3287 * feature (like pickable or hidden battleground tiles). */ 3043 * feature (like pickable or hidden battleground tiles). */
3288 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3044 for (object *tmp = op->below; tmp; tmp = tmp->below)
3289 { 3045 {
3290 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3046 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3291 { 3047 {
3292 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3048 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3293 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3049 && tmp->type == BATTLEGROUND
3050 && tmp->name == shstr_battleground
3051 && EXIT_X (tmp) && EXIT_Y (tmp))
3294 { 3052 {
3295 /*before we assign the exit, check if this is a teambattle */ 3053 /* before we assign the exit, check if this is a teambattle */
3296 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3054 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3297 {
3298 object *invtmp;
3299
3300 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3055 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3056 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3301 { 3057 {
3302 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3303 {
3304 if (x != NULL && y != NULL) 3058 if (x && y)
3305 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3059 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3060
3306 return 1; 3061 return 1;
3307 }
3308 } 3062 }
3309 } 3063
3310 if (x != NULL && y != NULL) 3064 if (x && y)
3311 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3065 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3066
3312 return 1; 3067 return 1;
3313 } 3068 }
3314 } 3069 }
3315 } 3070 }
3071
3316 /* If we got here, did not find a battleground */ 3072 /* If we got here, did not find a battleground */
3317 return 0; 3073 return 0;
3318} 3074}
3319 3075
3320/* 3076/*
… …
3336 char buf[MAX_BUF]; /* tmp. string buffer */ 3092 char buf[MAX_BUF]; /* tmp. string buffer */
3337 int i = 0, j = 0; 3093 int i = 0, j = 0;
3338 3094
3339 /* get the appropriate treasurelist */ 3095 /* get the appropriate treasurelist */
3340 if (atnr == ATNR_FIRE) 3096 if (atnr == ATNR_FIRE)
3341 trlist = treasurelist::find ("dragon_ability_fire"); 3097 trlist = treasurelist::find (shstr_dragon_ability_fire);
3342 else if (atnr == ATNR_COLD) 3098 else if (atnr == ATNR_COLD)
3343 trlist = treasurelist::find ("dragon_ability_cold"); 3099 trlist = treasurelist::find (shstr_dragon_ability_cold);
3344 else if (atnr == ATNR_ELECTRICITY) 3100 else if (atnr == ATNR_ELECTRICITY)
3345 trlist = treasurelist::find ("dragon_ability_elec"); 3101 trlist = treasurelist::find (shstr_dragon_ability_elec);
3346 else if (atnr == ATNR_POISON) 3102 else if (atnr == ATNR_POISON)
3347 trlist = treasurelist::find ("dragon_ability_poison"); 3103 trlist = treasurelist::find (shstr_dragon_ability_poison);
3348 3104
3349 if (trlist == NULL || who->type != PLAYER) 3105 if (trlist == NULL || who->type != PLAYER)
3350 return; 3106 return;
3351 3107
3352 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3108 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3356 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3112 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3357 return; 3113 return;
3358 } 3114 }
3359 3115
3360 /* everything seems okay - now bring on the gift: */ 3116 /* everything seems okay - now bring on the gift: */
3361 item = &(tr->item->clone); 3117 item = tr->item;
3362 3118
3363 if (item->type == SPELL) 3119 if (item->type == SPELL)
3364 { 3120 {
3365 if (check_spell_known (who, item->name)) 3121 if (check_spell_known (who, item->name))
3366 return; 3122 return;
… …
3425 { 3181 {
3426 /* forces in the treasurelist can alter the player's stats */ 3182 /* forces in the treasurelist can alter the player's stats */
3427 object *skin; 3183 object *skin;
3428 3184
3429 /* first get the dragon skin force */ 3185 /* first get the dragon skin force */
3430 shstr_cmp dragon_skin_force ("dragon_skin_force");
3431 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3186 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3432 ; 3187 ;
3433 3188
3434 if (!skin) 3189 if (!skin)
3435 return; 3190 return;
3436 3191
… …
3469 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3224 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3470 } 3225 }
3471 else 3226 else
3472 { 3227 {
3473 /* generate misc. treasure */ 3228 /* generate misc. treasure */
3474 tmp = arch_to_object (tr->item); 3229 tmp = tr->item->instance ();
3475 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3230 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3476 tmp = insert_ob_in_ob (tmp, who); 3231 who->insert (tmp);
3477 if (who->type == PLAYER)
3478 esrv_send_item (who, tmp);
3479 } 3232 }
3480} 3233}
3481 3234
3482/** 3235//-GPL
3483 * Unready an object for a player. This function does nothing if the object was
3484 * not readied.
3485 */
3486void
3487player_unready_range_ob (player *pl, object *ob)
3488{
3489 if (pl->ob->current_weapon == ob)
3490 pl->ob->current_weapon = 0;
3491
3492 if (pl->combat_ob == ob)
3493 pl->combat_ob = 0;
3494
3495 if (pl->ranged_ob == ob)
3496 pl->ranged_ob = 0;
3497}
3498 3236
3499sint8 3237sint8
3500player::visibility_at (maptile *map, int x, int y) const 3238player::darkness_at (maptile *map, int x, int y) const
3501{ 3239{
3502 if (!ns) 3240 if (!ns)
3503 return 0; 3241 return LOS_BLOCKED;
3504 3242
3505 int dx, dy; 3243 int dx, dy;
3506 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3244 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3507 return 0; 3245 return LOS_BLOCKED;
3508 3246
3509 x += dx - ns->current_x + ns->mapx / 2; 3247 x += dx - ns->current_x;
3510 y += dy - ns->current_y + ns->mapy / 2; 3248 y += dy - ns->current_y;
3511 3249
3512 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3513 return 0;
3514
3515 return 100 - blocked_los [x][y]; 3250 return blocked_los (x, y);
3516} 3251}
3252
3253void
3254player::infobox (const char *title, const char *msg, int color)
3255{
3256 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3257}
3258
3259void
3260player::statusmsg (const char *msg, int color)
3261{
3262 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3263}
3264
3265void
3266player::failmsg (const char *msg, int color)
3267{
3268 play_sound (sound_find ("generic_failure"));
3269 statusmsg (msg, color);
3270}
3271

Diff Legend

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