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.209 by root, Thu Dec 18 05:13:38 2008 UTC vs.
Revision 1.289 by root, Fri Jan 27 22:00:40 2012 UTC

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

Diff Legend

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