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

Diff Legend

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