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

Diff Legend

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