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.196 by root, Mon May 5 15:54:39 2008 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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