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

Diff Legend

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