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

Diff Legend

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