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.182 by root, Thu Apr 17 14:06:03 2008 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 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 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, mflags, blocked;
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;
… …
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]
658 && 527 &&
659 (op->type == ARMOUR || op->type == BOOTS 528 (op->type == ARMOUR || op->type == BOOTS
660 || op->type == CLOAK || op->type == HELMET 529 || op->type == CLOAK || op->type == HELMET
661 || op->type == SHIELD || op->type == GLOVES 530 || op->type == SHIELD || op->type == GLOVES
662 || op->type == BRACERS || op->type == GIRDLE)) 531 || op->type == BRACERS || op->type == GIRDLE))
663 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 532 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
664 { 533 {
665 op->destroy (); 534 op->destroy ();
666 continue; 535 continue;
667 } 536 }
668 } 537 }
669 538
670 /* This really needs to be better - we should really give 539 /* Here we remove duplicated skills (as duplicated spell objects have
671 * a substitute spellbook. The problem is that we don't really 540 * _very_ confusing effects for players), which could for instance be
672 * have a good idea what to replace it with (need something like 541 * generated by bad treasurelists. - elmex
673 * a first level treasurelist for each skill.)
674 * remove duplicate skills also
675 */ 542 */
676 if (op->type == SPELLBOOK || op->type == SKILL) 543 if (op->type == SKILL)
677 { 544 {
678 object *tmp;
679
680 for (tmp = op->below; tmp; tmp = tmp->below) 545 for (object *tmp = op->below; tmp; tmp = tmp->below)
681 if (tmp->type == op->type && tmp->name == op->name) 546 if (tmp->type == op->type && tmp->name == op->name)
682 break;
683
684 if (tmp)
685 { 547 {
686 op->destroy (); 548 op->destroy ();
549 LOG (llevError,
687 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 550 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
688 continue; 551 break;
689 } 552 }
690 553
691 if (op->nrof > 1) 554 if (op->nrof > 1)
692 op->nrof = 1; 555 op->nrof = 1;
693 } 556 }
694 557
695 if (op->type == SPELLBOOK && op->inv) 558 if (op->type == SPELLBOOK && op->inv)
696 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 559 op->inv->clr_flag (FLAG_STARTEQUIP);
697 560
698 /* Give starting characters identified, uncursed, and undamned 561 /* Give starting characters identified, uncursed, and undamned
699 * items. Just don't identify gold or silver, or it won't be 562 * items. Just don't identify gold or silver, or it won't be
700 * merged properly. 563 * merged properly.
701 */ 564 */
702 if (need_identify (op)) 565 if (op->need_identify ())
703 { 566 {
704 SET_FLAG (op, FLAG_IDENTIFIED); 567 op->set_flag (FLAG_IDENTIFIED);
705 CLEAR_FLAG (op, FLAG_CURSED); 568 op->clr_flag (FLAG_CURSED);
706 CLEAR_FLAG (op, FLAG_DAMNED); 569 op->clr_flag (FLAG_DAMNED);
707 } 570 }
708 571
709 if (op->type == SPELL) 572 if (op->type == SPELL)
710 { 573 {
711 op->destroy (); 574 op->destroy ();
712 continue; 575 continue;
713 } 576 }
714 else if (op->type == SKILL) 577 else if (op->type == SKILL)
715 { 578 {
716 SET_FLAG (op, FLAG_CAN_USE_SKILL); 579 op->set_flag (FLAG_CAN_USE_SKILL);
717 op->stats.exp = 0; 580 op->stats.exp = 0;
718 op->level = 1; 581 op->level = 1;
719 } 582 }
720 else /* lock all 'normal items by default */ 583 else /* lock all 'normal items by default */
721 SET_FLAG (op, FLAG_INV_LOCKED); 584 op->set_flag (FLAG_INV_LOCKED);
722 } /* for loop of objects in player inv */ 585 } /* for loop of objects in player inv */
723 586
724 /* Need to set up the skill pointers */ 587 /* Need to set up the skill pointers */
725 link_player_skills (pl); 588 pl->contr->link_skills ();
726} 589}
727 590
728void 591void
729get_party_password (object *op, partylist *party) 592get_party_password (object *op, partylist *party)
730{ 593{
… …
740 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 603 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
741} 604}
742 605
743/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 606/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
744static int 607static int
745roll_stat (void) 608roll_stat ()
746{ 609{
747 int a[4], i, j, k; 610 int a[4], i, j, k;
748 611
749 for (i = 0; i < 4; i++) 612 for (i = 0; i < 4; i++)
750 a[i] = (int) rndm (6) + 1; 613 a[i] = rndm (1, 6);
751 614
752 for (i = 0, j = 0, k = 7; i < 4; i++) 615 for (i = 0, j = 0, k = 7; i < 4; i++)
753 if (a[i] < k) 616 if (a[i] < k)
754 k = a[i], j = i; 617 k = a[i], j = i;
755 618
… …
845 */ 708 */
846void 709void
847player::chargen_race_done () 710player::chargen_race_done ()
848{ 711{
849 /* this must before then initial items are given */ 712 /* this must before then initial items are given */
850 esrv_new_player (ob->contr, ob->weight + ob->carrying); 713 esrv_new_player (ob->contr);
851 714
852 treasurelist *tl = treasurelist::find ("starting_wealth"); 715 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
853 if (tl) 716 if (tl)
854 create_treasure (tl, ob, 0, 0, 0); 717 create_treasure (tl, ob, 0, 0, 0);
855 718
856 INVOKE_PLAYER (BIRTH, ob->contr); 719 INVOKE_PLAYER (BIRTH, ob->contr);
857 INVOKE_PLAYER (LOGIN, ob->contr);
858 720
859 ob->contr->ns->state = ST_PLAYING; 721 ob->contr->ns->state = ST_PLAYING;
860 722
861 if (ob->msg) 723 if (ob->msg)
862 ob->msg = 0; 724 ob->msg = 0;
863 725
864 /* We create this now because some of the unique maps will need it
865 * to save here.
866 */
867 {
868 char buf[MAX_BUF];
869 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
870 make_path_to_file (buf);
871 }
872
873 start_info (ob); 726 start_info (ob);
874 CLEAR_FLAG (ob, FLAG_WIZ); 727 ob->clr_flag (FLAG_WIZ);
875 give_initial_items (ob, ob->randomitems); 728 give_initial_items (ob, ob->randomitems);
876 link_player_skills (ob);
877 esrv_send_inventory (ob, ob); 729 esrv_send_inventory (ob, ob);
878 ob->update_stats (); 730 ob->update_stats ();
879 731
880 /* This moves the player to a different start map, if there 732 /* This moves the player to a different start map, if there
881 * is one for this race 733 * is one for this race
882 */ 734 */
883 if (*first_map_ext_path) 735 if (*first_map_ext_path)
884 { 736 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
885 object *tmp;
886 char mapname[MAX_BUF];
887
888 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
889 tmp = object::create ();
890 EXIT_PATH (tmp) = mapname;
891 EXIT_X (tmp) = ob->x;
892 EXIT_Y (tmp) = ob->y;
893 ob->enter_exit (tmp); /* we don't really care if it succeeded;
894 * if the map isn't there, then stay on the
895 * default initial map */
896 tmp->destroy ();
897 }
898 else 737 else
899 LOG (llevDebug, "first_map_ext_path not set\n"); 738 LOG (llevDebug, "first_map_ext_path not set\n");
900} 739}
901 740
902void 741void
… …
933 ob->stats.hp = ob->stats.maxhp; 772 ob->stats.hp = ob->stats.maxhp;
934 ob->stats.sp = ob->stats.maxsp; 773 ob->stats.sp = ob->stats.maxsp;
935 ob->stats.grace = 0; 774 ob->stats.grace = 0;
936} 775}
937 776
938void 777static void
939flee_player (object *op) 778flee_player (object *op)
940{ 779{
941 int dir, diff; 780 int dir, diff;
942 rv_vector rv; 781 rv_vector rv;
943 782
944 if (op->stats.hp < 0) 783 if (op->stats.hp < 0)
945 { 784 {
946 LOG (llevDebug, "Fleeing player is dead.\n"); 785 LOG (llevDebug, "Fleeing player is dead.\n");
947 CLEAR_FLAG (op, FLAG_SCARED); 786 op->clr_flag (FLAG_SCARED);
948 return; 787 return;
949 } 788 }
950 789
951 if (op->enemy == NULL) 790 if (!op->enemy)
952 { 791 {
953 LOG (llevDebug, "Fleeing player had no enemy.\n"); 792 LOG (llevDebug, "Fleeing player had no enemy.\n");
954 CLEAR_FLAG (op, FLAG_SCARED); 793 op->clr_flag (FLAG_SCARED);
955 return; 794 return;
956 } 795 }
957 796
958 /* Seen some crashes here. Since we don't store an 797 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
959 * op->enemy_count, it is possible that something destroys the
960 * actual enemy, and the object is recycled.
961 */
962 if (op->enemy->map == NULL)
963 { 798 {
964 CLEAR_FLAG (op, FLAG_SCARED);
965 op->enemy = NULL; 799 op->enemy = NULL;
966 return; 800 op->clr_flag (FLAG_SCARED);
967 }
968
969 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
970 {
971 op->enemy = NULL;
972 CLEAR_FLAG (op, FLAG_SCARED);
973 return; 801 return;
974 } 802 }
975 803
976 get_rangevector (op, op->enemy, &rv, 0); 804 get_rangevector (op, op->enemy, &rv, 0);
977 805
978 dir = absdir (4 + rv.direction); 806 dir = absdir (4 + rv.direction);
979 for (diff = 0; diff < 3; diff++) 807 for (diff = 0; diff < 3; diff++)
980 { 808 {
981 int m = 1 - (RANDOM () & 2); 809 int m = 1 - rndm (2) * 2;
982 810
983 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 811 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
984 return; 812 return;
985 } 813 }
986 814
987 /* Cornered, get rid of scared */ 815 /* Cornered, get rid of scared */
988 CLEAR_FLAG (op, FLAG_SCARED); 816 op->clr_flag (FLAG_SCARED);
989 op->enemy = NULL; 817 op->enemy = NULL;
990} 818}
991 819
992/* check_pick sees if there is stuff to be picked up/picks up stuff. 820/* check_pick sees if there is stuff to be picked up/picks up stuff.
993 * It returns 1 if the player should keep on moving, 0 if he should 821 * It returns 1 if the player should keep on moving, 0 if he should
… …
997check_pick (object *op) 825check_pick (object *op)
998{ 826{
999 object *tmp, *next; 827 object *tmp, *next;
1000 int stop = 0; 828 int stop = 0;
1001 int wvratio; 829 int wvratio;
1002 char putstring[128];
1003 830
1004 /* if you're flying, you cna't pick up anything */ 831 /* if you're flying, you can't pick up anything */
1005 if (op->move_type & MOVE_FLYING) 832 if (op->move_type & MOVE_FLYING)
1006 return 1; 833 return 1;
1007 834
1008 next = op->below; 835 next = op->below;
1009 836
1010 int cnt = MAX_ITEM_PER_DROP; 837 int cnt = MAX_ITEM_PER_ACTION;
1011#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 838#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1012 839
1013 /* loop while there are items on the floor that are not marked as 840 /* loop while there are items on the floor that are not marked as
1014 * destroyed */ 841 * destroyed */
1015 while (next && !next->destroyed ()) 842 while (next && !next->destroyed ())
… …
1031 858
1032 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 859 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1033 { 860 {
1034 if (item_matched_string (op, tmp, op->contr->search_str)) 861 if (item_matched_string (op, tmp, op->contr->search_str))
1035 CHK_PICK_PICKUP; 862 CHK_PICK_PICKUP;
863
1036 continue; 864 continue;
1037 } 865 }
1038 866
1039 /* high not bit set? We're using the old autopickup model */ 867 /* pickup handling */
868 if (op->contr->mode & PU_DEBUG)
869 {
870 /* some debugging code to figure out item information */
871 const char *str = tmp->name
872 ? format ("item name: %s item type: %d weight/value: %d",
873 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
874 : format ("item name: %s item type: %d weight/value: %d",
875 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
876
877 new_draw_info (NDI_UNIQUE, 0, op, str);
878 }
879
880 if (op->contr->mode & PU_INHIBIT)
881 return 1;
882
883 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
884 return 1;
885
886 /* philosophy:
887 * It's easy to grab an item type from a pile, as long as it's
888 * generic. This takes no game-time. For more detailed pickups
889 * and selections, select-items should be used. This is a
890 * grab-as-you-run type mode that's really useful for arrows for
891 * example.
892 * The drawback: right now it has no frontend, so you need to
893 * stick the bits you want into a calculator in hex mode and then
894 * convert to decimal and then 'pickup <#>
895 */
896
897 /* the first two modes are exclusive: if NOTHING we return, if
898 * STOP then we stop. All the rest are applied sequentially,
899 * meaning if any test passes, the item gets picked up. */
900
901 /* if mode is set to pick nothing up, return */
902 if (op->contr->mode == PU_NOTHING)
903 return 1;
904
905 /* if mode is set to stop when encountering objects, return */
906 /* take STOP before INHIBIT since it doesn't actually pick
907 * anything up */
908 if (op->contr->mode & PU_STOP)
909 return 0;
910
911 /* useful for going into stores and not losing your settings... */
912 /* and for battles wher you don't want to get loaded down while
913 * fighting */
914 if (op->contr->mode & PU_INHIBIT)
915 return 1;
916
917 /* prevent us from turning into auto-thieves :) */
918 if (tmp->flag [FLAG_UNPAID])
919 continue;
920
921 /* ignore known cursed objects */
922 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
923 continue;
924
925 /* all food and drink if desired */
926 /* question: don't pick up known-poisonous stuff? */
1040 if (!(op->contr->mode & PU_NEWMODE)) 927 if (op->contr->mode & PU_FOOD)
928 if (tmp->type == FOOD)
1041 { 929 {
1042 switch (op->contr->mode) 930 CHK_PICK_PICKUP;
931 continue;
932 }
933
934 if (op->contr->mode & PU_DRINK)
935 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
936 {
937 CHK_PICK_PICKUP;
938 continue;
939 }
940
941 if (op->contr->mode & PU_POTION)
942 if (tmp->type == POTION)
943 {
944 CHK_PICK_PICKUP;
945 continue;
946 }
947
948 /* spellbooks, skillscrolls and normal books/scrolls */
949 if (op->contr->mode & PU_SPELLBOOK)
950 if (tmp->type == SPELLBOOK)
951 {
952 CHK_PICK_PICKUP;
953 continue;
954 }
955
956 if (op->contr->mode & PU_SKILLSCROLL)
957 if (tmp->type == SKILLSCROLL)
958 {
959 CHK_PICK_PICKUP;
960 continue;
961 }
962
963 if (op->contr->mode & PU_READABLES)
964 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
965 {
966 CHK_PICK_PICKUP;
967 continue;
968 }
969
970 /* wands/staves/rods/horns */
971 if (op->contr->mode & PU_MAGIC_DEVICE)
972 if (tmp->type == WAND
973 || tmp->type == ROD
974 || tmp->type == HORN
975 || tmp->type == POWER_CRYSTAL)
976 {
977 CHK_PICK_PICKUP;
978 continue;
979 }
980
981 /* pick up all magical items */
982 if (op->contr->mode & PU_MAGICAL)
983 if (tmp->flag [FLAG_KNOWN_MAGICAL]
984 && !tmp->flag [FLAG_KNOWN_CURSED])
985 {
986 CHK_PICK_PICKUP;
987 continue;
988 }
989
990 if (op->contr->mode & PU_VALUABLES)
991 {
992 if (tmp->type == MONEY || tmp->type == GEM)
1043 { 993 {
1044 case 0:
1045 return 1; /* don't pick up */
1046 case 1:
1047 CHK_PICK_PICKUP; 994 CHK_PICK_PICKUP;
1048 return 1; 995 continue;
1049 case 2:
1050 CHK_PICK_PICKUP;
1051 return 0;
1052 case 3:
1053 return 0; /* stop before pickup */
1054 case 4:
1055 CHK_PICK_PICKUP;
1056 break;
1057 case 5:
1058 CHK_PICK_PICKUP;
1059 stop = 1;
1060 break;
1061 case 6:
1062 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1063 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1064 CHK_PICK_PICKUP;
1065 break;
1066
1067 case 7:
1068 if (tmp->type == MONEY || tmp->type == GEM)
1069 CHK_PICK_PICKUP;
1070 break;
1071
1072 default:
1073 /* use value density */
1074 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1075 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1076 CHK_PICK_PICKUP;
1077 } 996 }
1078 } 997 }
1079 else 998
1080 { /* old model */ 999 /* rings & amulets - talismans seems to be typed AMULET */
1081 /* NEW pickup handling */
1082 if (op->contr->mode & PU_DEBUG) 1000 if (op->contr->mode & PU_JEWELS)
1001 if (tmp->type == RING
1002 || tmp->type == AMULET
1003 || tmp->type == GIRDLE
1004 || tmp->type == SKILL_TOOL)
1083 { 1005 {
1084 /* some debugging code to figure out item information */ 1006 CHK_PICK_PICKUP;
1085 if (tmp->name != NULL)
1086 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1087 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1088 else
1089 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1090 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1091
1092 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1093 }
1094
1095 /* philosophy:
1096 * It's easy to grab an item type from a pile, as long as it's
1097 * generic. This takes no game-time. For more detailed pickups
1098 * and selections, select-items should be used. This is a
1099 * grab-as-you-run type mode that's really useful for arrows for
1100 * example.
1101 * The drawback: right now it has no frontend, so you need to
1102 * stick the bits you want into a calculator in hex mode and then
1103 * convert to decimal and then 'pickup <#>
1104 */
1105
1106 /* the first two modes are exclusive: if NOTHING we return, if
1107 * STOP then we stop. All the rest are applied sequentially,
1108 * meaning if any test passes, the item gets picked up. */
1109
1110 /* if mode is set to pick nothing up, return */
1111
1112 if (op->contr->mode & PU_NOTHING)
1113 return 1;
1114
1115 /* if mode is set to stop when encountering objects, return */
1116 /* take STOP before INHIBIT since it doesn't actually pick
1117 * anything up */
1118
1119 if (op->contr->mode & PU_STOP)
1120 return 0;
1121
1122 /* useful for going into stores and not losing your settings... */
1123 /* and for battles wher you don't want to get loaded down while
1124 * fighting */
1125 if (op->contr->mode & PU_INHIBIT)
1126 return 1;
1127
1128 /* prevent us from turning into auto-thieves :) */
1129 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1130 continue; 1007 continue;
1008 }
1131 1009
1132 /* ignore known cursed objects */ 1010 /* we don't forget dragon food */
1133 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1011 if (op->contr->mode & PU_FLESH)
1012 if (tmp->type == FLESH)
1013 {
1014 CHK_PICK_PICKUP;
1134 continue; 1015 continue;
1016 }
1135 1017
1136 /* all food and drink if desired */ 1018 /* bows and arrows. Bows are good for selling! */
1137 /* question: don't pick up known-poisonous stuff? */ 1019 if (op->contr->mode & PU_BOW)
1020 if (tmp->type == BOW)
1021 {
1022 CHK_PICK_PICKUP;
1023 continue;
1024 }
1025
1026 if (op->contr->mode & PU_ARROW)
1027 if (tmp->type == ARROW)
1028 {
1029 CHK_PICK_PICKUP;
1030 continue;
1031 }
1032
1033 /* all kinds of armor etc. */
1034 if (op->contr->mode & PU_ARMOUR)
1035 if (tmp->type == ARMOUR)
1036 {
1037 CHK_PICK_PICKUP;
1038 continue;
1039 }
1040
1041 if (op->contr->mode & PU_HELMET)
1042 if (tmp->type == HELMET)
1043 {
1044 CHK_PICK_PICKUP;
1045 continue;
1046 }
1047
1048 if (op->contr->mode & PU_SHIELD)
1049 if (tmp->type == SHIELD)
1050 {
1051 CHK_PICK_PICKUP;
1052 continue;
1053 }
1054
1138 if (op->contr->mode & PU_FOOD) 1055 if (op->contr->mode & PU_BOOTS)
1139 if (tmp->type == FOOD) 1056 if (tmp->type == BOOTS)
1057 {
1058 CHK_PICK_PICKUP;
1059 continue;
1060 }
1061
1062 if (op->contr->mode & PU_GLOVES)
1063 if (tmp->type == GLOVES || tmp->type == BRACERS)
1064 {
1065 CHK_PICK_PICKUP;
1066 continue;
1067 }
1068
1069 if (op->contr->mode & PU_CLOAK)
1070 if (tmp->type == CLOAK)
1071 {
1072 CHK_PICK_PICKUP;
1073 continue;
1074 }
1075
1076 /* hoping to catch throwing daggers here */
1077 if (op->contr->mode & PU_MISSILEWEAPON)
1078 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1079 {
1080 CHK_PICK_PICKUP;
1081 continue;
1082 }
1083
1084 /* careful: chairs and tables are weapons! */
1085 if (op->contr->mode & PU_ALLWEAPON)
1086 {
1087 if (tmp->type == WEAPON)
1088 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1140 { 1089 {
1141 CHK_PICK_PICKUP; 1090 CHK_PICK_PICKUP;
1142 continue; 1091 continue;
1143 } 1092 }
1093 }
1144 1094
1095 /* misc stuff that's useful */
1145 if (op->contr->mode & PU_DRINK) 1096 if (op->contr->mode & PU_KEY)
1146 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1097 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1147 { 1098 {
1148 CHK_PICK_PICKUP; 1099 CHK_PICK_PICKUP;
1149 continue; 1100 continue;
1150 } 1101 }
1151 1102
1103 /* any of the last 4 bits set means we use the ratio for value
1104 * pickups */
1152 if (op->contr->mode & PU_POTION) 1105 if (op->contr->mode & PU_RATIO)
1153 if (tmp->type == POTION) 1106 {
1107 /* use value density to decide what else to grab */
1108 /* >=7 was >= op->contr->mode */
1109 /* >=7 is the old standard setting. Now we take the last 4 bits
1154 { 1110 */
1155 CHK_PICK_PICKUP;
1156 continue;
1157 }
1158
1159 /* spellbooks, skillscrolls and normal books/scrolls */
1160 if (op->contr->mode & PU_SPELLBOOK)
1161 if (tmp->type == SPELLBOOK)
1162 {
1163 CHK_PICK_PICKUP;
1164 continue;
1165 }
1166
1167 if (op->contr->mode & PU_SKILLSCROLL)
1168 if (tmp->type == SKILLSCROLL)
1169 {
1170 CHK_PICK_PICKUP;
1171 continue;
1172 }
1173
1174 if (op->contr->mode & PU_READABLES)
1175 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1176 {
1177 CHK_PICK_PICKUP;
1178 continue;
1179 }
1180
1181 /* wands/staves/rods/horns */
1182 if (op->contr->mode & PU_MAGIC_DEVICE)
1183 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1184 {
1185 CHK_PICK_PICKUP;
1186 continue;
1187 }
1188
1189 /* pick up all magical items */
1190 if (op->contr->mode & PU_MAGICAL) 1111 wvratio = op->contr->mode & PU_RATIO;
1191 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1112 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1192 {
1193 CHK_PICK_PICKUP;
1194 continue;
1195 }
1196
1197 if (op->contr->mode & PU_VALUABLES)
1198 { 1113 {
1199 if (tmp->type == MONEY || tmp->type == GEM) 1114#if 0
1115 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1116 if (tmp->name != NULL)
1200 { 1117 {
1201 CHK_PICK_PICKUP; 1118 fprintf (stderr, "%s", tmp->name);
1202 continue;
1203 } 1119 }
1204 }
1205
1206 /* rings & amulets - talismans seems to be typed AMULET */
1207 if (op->contr->mode & PU_JEWELS)
1208 if (tmp->type == RING || tmp->type == AMULET)
1209 {
1210 CHK_PICK_PICKUP;
1211 continue;
1212 }
1213
1214 /* we don't forget dragon food */
1215 if (op->contr->mode & PU_FLESH)
1216 if (tmp->type == FLESH)
1217 {
1218 CHK_PICK_PICKUP;
1219 continue;
1220 }
1221
1222 /* bows and arrows. Bows are good for selling! */
1223 if (op->contr->mode & PU_BOW)
1224 if (tmp->type == BOW)
1225 {
1226 CHK_PICK_PICKUP;
1227 continue;
1228 }
1229
1230 if (op->contr->mode & PU_ARROW)
1231 if (tmp->type == ARROW)
1232 {
1233 CHK_PICK_PICKUP;
1234 continue;
1235 }
1236
1237 /* all kinds of armor etc. */
1238 if (op->contr->mode & PU_ARMOUR)
1239 if (tmp->type == ARMOUR)
1240 {
1241 CHK_PICK_PICKUP;
1242 continue;
1243 }
1244
1245 if (op->contr->mode & PU_HELMET)
1246 if (tmp->type == HELMET)
1247 {
1248 CHK_PICK_PICKUP;
1249 continue;
1250 }
1251
1252 if (op->contr->mode & PU_SHIELD)
1253 if (tmp->type == SHIELD)
1254 {
1255 CHK_PICK_PICKUP;
1256 continue;
1257 }
1258
1259 if (op->contr->mode & PU_BOOTS)
1260 if (tmp->type == BOOTS)
1261 {
1262 CHK_PICK_PICKUP;
1263 continue;
1264 }
1265
1266 if (op->contr->mode & PU_GLOVES)
1267 if (tmp->type == GLOVES)
1268 {
1269 CHK_PICK_PICKUP;
1270 continue;
1271 }
1272
1273 if (op->contr->mode & PU_CLOAK)
1274 if (tmp->type == CLOAK)
1275 {
1276 CHK_PICK_PICKUP;
1277 continue;
1278 }
1279
1280 /* hoping to catch throwing daggers here */
1281 if (op->contr->mode & PU_MISSILEWEAPON)
1282 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1283 {
1284 CHK_PICK_PICKUP;
1285 continue;
1286 }
1287
1288 /* careful: chairs and tables are weapons! */
1289 if (op->contr->mode & PU_ALLWEAPON)
1290 {
1291 if (tmp->type == WEAPON && tmp->name != NULL)
1292 {
1293 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1294 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1295 {
1296 CHK_PICK_PICKUP;
1297 continue;
1298 }
1299 }
1300
1301 if (tmp->type == WEAPON && tmp->name == NULL)
1302 {
1303 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1304 {
1305 CHK_PICK_PICKUP;
1306 continue;
1307 }
1308 }
1309 }
1310
1311 /* misc stuff that's useful */
1312 if (op->contr->mode & PU_KEY)
1313 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1314 {
1315 CHK_PICK_PICKUP;
1316 continue;
1317 }
1318
1319 /* any of the last 4 bits set means we use the ratio for value
1320 * pickups */
1321 if (op->contr->mode & PU_RATIO)
1322 {
1323 /* use value density to decide what else to grab */
1324 /* >=7 was >= op->contr->mode */
1325 /* >=7 is the old standard setting. Now we take the last 4 bits
1326 * and multiply them by 5, giving 0..15*5== 5..75 */
1327 wvratio = (op->contr->mode & PU_RATIO) * 5;
1328 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1329 {
1330 CHK_PICK_PICKUP;
1331#if 0
1332 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1333 if (tmp->name != NULL)
1334 {
1335 fprintf (stderr, "%s", tmp->name);
1336 }
1337 else 1120 else
1338 fprintf (stderr, "%s", tmp->arch->archname); 1121 fprintf (stderr, "%s", tmp->arch->archname);
1339 fprintf (stderr, ",%d] = ", tmp->type); 1122 fprintf (stderr, ",%d] = ", tmp->type);
1340 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1123 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1341#endif 1124#endif
1125 CHK_PICK_PICKUP;
1342 continue; 1126 continue;
1343 }
1344 } 1127 }
1345 } /* the new pickup model */ 1128 } /* the new pickup model */
1346 } 1129 }
1347 1130
1348 return !stop; 1131 return !stop;
1132}
1133
1134/* routine for both players and monsters. We call this when
1135 * there is a possibility for our action distrubing our hiding
1136 * place or invisiblity spell. Artefact invisiblity causes
1137 * "noise" instead. If we arent invisible to begin with, we
1138 * return 0.
1139 */
1140static int
1141action_makes_visible (object *op)
1142{
1143 if (op->invisible && op->flag [FLAG_ALIVE])
1144 {
1145 if (op->flag [FLAG_MAKE_INVIS])
1146 {
1147 // artefact invisibility is permanent, but we still make noise
1148 // this is important for game-balance.
1149 if (op->contr)
1150 op->make_noise ();
1151
1152 return 0;
1153 }
1154
1155 if (op->contr && op->contr->tmp_invis == 0)
1156 return 0;
1157
1158 /* If monsters, they should become visible */
1159 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1160 {
1161 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1162 return 1;
1163 }
1164 }
1165
1166 return 0;
1349} 1167}
1350 1168
1351/* 1169/*
1352 * Find an arrow in the inventory and after that 1170 * Find an arrow in the inventory and after that
1353 * in the right type container (quiver). Pointer to the 1171 * in the right type container (quiver). Pointer to the
1354 * found object is returned. 1172 * found object is returned.
1355 */ 1173 */
1356object * 1174static object *
1357find_arrow (object *op, const char *type) 1175find_arrow (object *op, const char *type)
1358{ 1176{
1359 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1177 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1360 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1178 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1361 return splay (tmp); 1179 return splay (tmp);
1362 1180
1363 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1181 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1364 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1182 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1365 if (object *arrow = find_arrow (tmp, type)) 1183 if (object *arrow = find_arrow (tmp, type))
1366 { 1184 {
1367 splay (tmp); 1185 splay (tmp);
1368 return arrow; 1186 return arrow;
1369 } 1187 }
… …
1375 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1193 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1376 * against the target. A full test is not performed, simply a basic test 1194 * against the target. A full test is not performed, simply a basic test
1377 * of resistances. The archer is making a quick guess at what he sees down 1195 * of resistances. The archer is making a quick guess at what he sees down
1378 * the hall. Failing that it does it's best to pick the highest plus arrow. 1196 * the hall. Failing that it does it's best to pick the highest plus arrow.
1379 */ 1197 */
1380object * 1198static object *
1381find_better_arrow (object *op, object *target, const char *type, int *better) 1199find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1382{ 1200{
1383 object *tmp = NULL, *arrow, *ntmp; 1201 object *tmp = NULL, *arrow, *ntmp;
1384 int attacknum, attacktype, betterby = 0, i; 1202 int attacknum, attacktype, betterby = 0, i;
1385 1203
1386 if (!type) 1204 if (!type)
1387 return NULL; 1205 return NULL;
1388 1206
1389 for (arrow = op->inv; arrow; arrow = arrow->below) 1207 for (arrow = op->inv; arrow; arrow = arrow->below)
1390 { 1208 {
1391 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1209 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1392 { 1210 {
1393 i = 0; 1211 i = 0;
1394 ntmp = find_better_arrow (arrow, target, type, &i); 1212 ntmp = find_better_arrow (arrow, target, type, &i);
1213
1395 if (i > betterby) 1214 if (i > betterby)
1396 { 1215 {
1397 tmp = ntmp; 1216 tmp = ntmp;
1398 betterby = i; 1217 betterby = i;
1399 } 1218 }
1400 } 1219 }
1401 else if (arrow->type == ARROW && arrow->race == type) 1220 else if (arrow->type == ARROW && arrow->race == type)
1402 { 1221 {
1403 /* allways prefer assasination/slaying */ 1222 /* allways prefer assasination/slaying */
1404 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1223 if (target->race && arrow->slaying.contains (target->race))
1405 { 1224 {
1406 if (arrow->attacktype & AT_DEATH) 1225 if (arrow->attacktype & AT_DEATH)
1407 { 1226 {
1408 *better = 100; 1227 *better = 100;
1409 return arrow; 1228 return arrow;
… …
1424 { 1243 {
1425 tmp = arrow; 1244 tmp = arrow;
1426 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1245 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1427 } 1246 }
1428 } 1247 }
1248
1429 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1249 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1430 { 1250 {
1431 tmp = arrow; 1251 tmp = arrow;
1432 betterby = 2 + arrow->magic + arrow->stats.dam; 1252 betterby = 2 + arrow->magic + arrow->stats.dam;
1433 } 1253 }
1254
1434 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1255 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1435 { 1256 {
1436 tmp = arrow; 1257 tmp = arrow;
1437 betterby = 1 + arrow->magic + arrow->stats.dam; 1258 betterby = 1 + arrow->magic + arrow->stats.dam;
1438 } 1259 }
1439 } 1260 }
1440 } 1261 }
1441 } 1262 }
1263
1442 if (tmp == NULL && arrow == NULL) 1264 if (tmp == NULL && arrow == NULL)
1443 return find_arrow (op, type); 1265 return find_arrow (op, type);
1444 1266
1445 *better = betterby; 1267 *better = betterby;
1446 return tmp; 1268 return tmp;
… …
1450 * find_better_arrow to find a decent arrow to use. 1272 * find_better_arrow to find a decent arrow to use.
1451 * op = the shooter 1273 * op = the shooter
1452 * type = bow->race 1274 * type = bow->race
1453 * dir = fire direction 1275 * dir = fire direction
1454 */ 1276 */
1455object * 1277static object *
1456pick_arrow_target (object *op, const char *type, int dir) 1278pick_arrow_target (object *op, shstr_cmp type, int dir)
1457{ 1279{
1458 object *tmp = NULL; 1280 object *tmp = NULL;
1459 maptile *m; 1281 maptile *m;
1460 int i, mflags, found, number; 1282 int i, mflags, found, number;
1461 sint16 x, y; 1283 sint16 x, y;
… …
1476 for (i = 0, found = 0; i < 20; i++) 1298 for (i = 0, found = 0; i < 20; i++)
1477 { 1299 {
1478 x += freearr_x[dir]; 1300 x += freearr_x[dir];
1479 y += freearr_y[dir]; 1301 y += freearr_y[dir];
1480 mflags = get_map_flags (m, &m, x, y, &x, &y); 1302 mflags = get_map_flags (m, &m, x, y, &x, &y);
1303
1481 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1304 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1482 { 1305 {
1483 tmp = NULL; 1306 tmp = 0;
1484 break; 1307 break;
1485 } 1308 }
1486 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1309 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1487 { 1310 {
1488 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1311 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1489 * perhaps a bad assumption. 1312 * perhaps a bad assumption.
1490 */ 1313 */
1491 tmp = NULL; 1314 tmp = 0;
1492 break; 1315 break;
1493 } 1316 }
1317
1494 if (mflags & P_IS_ALIVE) 1318 if (mflags & P_IS_ALIVE)
1495 {
1496 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1319 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1497 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1320 if (tmp->flag [FLAG_ALIVE])
1498 {
1499 found++;
1500 break;
1501 }
1502 if (found)
1503 break; 1321 break;
1504 }
1505 } 1322 }
1506 if (tmp == NULL) 1323
1324 if (!tmp)
1507 return find_arrow (op, type); 1325 return find_arrow (op, type);
1508 1326
1509 if (tmp->head) 1327 if (tmp->head)
1510 tmp = tmp->head; 1328 tmp = tmp->head;
1511 1329
… …
1551 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1369 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1552 return 0; 1370 return 0;
1553 } 1371 }
1554 1372
1555 // optimisation: move object to top so we will find it quickly again 1373 // optimisation: move object to top so we will find it quickly again
1556 if (bow->below) 1374 splay (bow);
1557 {
1558 bow->remove ();
1559 op->insert (bow);
1560 }
1561
1562 } 1375 }
1563 1376
1564 if (!bow->race || !bow->skill) 1377 if (!bow->race || !bow->skill)
1565 { 1378 {
1566 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1379 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1573 { 1386 {
1574 if (op->type == PLAYER) 1387 if (op->type == PLAYER)
1575 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1388 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1576 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1389 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1577 else 1390 else
1578 CLEAR_FLAG (op, FLAG_READY_BOW); 1391 op->clr_flag (FLAG_READY_BOW);
1579 1392
1580 return 0; 1393 return 0;
1581 } 1394 }
1582 } 1395 }
1583 1396
… …
1592 } 1405 }
1593 1406
1594 /* this should not happen, but sometimes does */ 1407 /* this should not happen, but sometimes does */
1595 if (arrow->nrof == 0) 1408 if (arrow->nrof == 0)
1596 { 1409 {
1410 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1597 arrow->destroy (); 1411 arrow->destroy ();
1598 return 0; 1412 return 0;
1599 } 1413 }
1600 1414
1601 left = arrow; /* these are arrows left to the player */ 1415 left = arrow; /* these are arrows left to the player */
1602 arrow = get_split_ob (arrow, 1); 1416 arrow = arrow->split ();
1603 if (!arrow) 1417 if (!arrow)
1604 { 1418 {
1605 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1419 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1606 return 0; 1420 return 0;
1607 } 1421 }
… …
1611 arrow->direction = dir; 1425 arrow->direction = dir;
1612 1426
1613 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1427 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1614 arrow->stats.hp = arrow->stats.dam; 1428 arrow->stats.hp = arrow->stats.dam;
1615 arrow->stats.grace = arrow->attacktype; 1429 arrow->stats.grace = arrow->attacktype;
1616 1430 arrow->custom_name = arrow->slaying;
1617 if (arrow->slaying)
1618 arrow->spellarg = strdup (arrow->slaying);
1619 1431
1620#if 0 1432#if 0
1621 if (player *pl = op->contr) 1433 if (player *pl = op->contr)
1622 { 1434 {
1623 float speed = pl->weapon_sp; 1435 float speed = pl->weapon_sp;
… …
1633#endif 1445#endif
1634 1446
1635 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1636 1448
1637 /* update the speed */ 1449 /* update the speed */
1638 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1639 + bow->stats.dam / 7.f;
1640 1450
1641 arrow->set_speed (max (arrow->speed, 2.f));
1642 arrow->speed_left = 0; 1451 arrow->speed_left = 0;
1452 arrow->set_speed (max (2.f,
1453 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1454 + bow->stats.dam / 7.f
1455 ));
1643 1456
1644 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1457 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1645 1458
1646 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1647 { 1460 {
… …
1674 op->play_sound (sound_find ("fire_arrow")); 1487 op->play_sound (sound_find ("fire_arrow"));
1675 m->insert (arrow, sx, sy, op); 1488 m->insert (arrow, sx, sy, op);
1676 1489
1677 if (!arrow->destroyed ()) 1490 if (!arrow->destroyed ())
1678 move_arrow (arrow); 1491 move_arrow (arrow);
1679
1680 if (op->type == PLAYER)
1681 {
1682 if (left->destroyed ())
1683 esrv_del_item (op->contr, left->count);
1684 else
1685 esrv_send_item (op, left);
1686 }
1687 1492
1688 return 1; 1493 return 1;
1689} 1494}
1690 1495
1691/* Special fire code for players - this takes into 1496/* Special fire code for players - this takes into
… …
1693 * but monsters can't. Putting that code here 1498 * but monsters can't. Putting that code here
1694 * makes the fire_bow code much cleaner. 1499 * makes the fire_bow code much cleaner.
1695 * this function should only be called if 'op' is a player, 1500 * this function should only be called if 'op' is a player,
1696 * hence the function name. 1501 * hence the function name.
1697 */ 1502 */
1698int 1503static int
1699player_fire_bow (object *op, int dir) 1504player_fire_bow (object *op, int dir)
1700{ 1505{
1701 int ret = 0, wcmod = 0; 1506 int ret;
1702 1507
1703 if (op->contr->bowtype == bow_bestarrow) 1508 if (op->contr->bowtype == bow_bestarrow)
1704 { 1509 {
1705 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1510 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1706 } 1511 }
1707 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1512 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1708 { 1513 {
1709 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1514 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1710 wcmod = -1;
1711
1712 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1515 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1713 } 1516 }
1714 else if (op->contr->bowtype == bow_threewide) 1517 else if (op->contr->bowtype == bow_threewide)
1715 { 1518 {
1716 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1519 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1717 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1520 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1718 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1521 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1719 } 1522 }
1720 else if (op->contr->bowtype == bow_spreadshot) 1523 else if (op->contr->bowtype == bow_spreadshot)
1721 { 1524 {
1722 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1525 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1723 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1526 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1724 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1527 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1725 } 1528 }
1726 else 1529 else
1727 { 1530 {
… …
1733} 1536}
1734 1537
1735/* Fires a misc (wand/rod/horn) object in 'dir'. 1538/* Fires a misc (wand/rod/horn) object in 'dir'.
1736 * Broken apart from 'fire' to keep it more readable. 1539 * Broken apart from 'fire' to keep it more readable.
1737 */ 1540 */
1738void 1541static void
1739fire_misc_object (object *op, int dir) 1542fire_misc_object (object *op, int dir)
1740{ 1543{
1741 object *item = op->contr->ranged_ob; 1544 object *item = op->contr->ranged_ob;
1742 1545
1743 if (!item) 1546 if (!item)
… …
1750 { 1553 {
1751 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1554 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1752 return; 1555 return;
1753 } 1556 }
1754 1557
1755 if (!op->change_weapon (item)) 1558 if (!op->apply (item))
1756 return; 1559 return;
1757 1560
1758 if (item->type == WAND) 1561 if (item->type == WAND)
1759 { 1562 {
1760 if (item->stats.food <= 0) 1563 if (item->stats.food <= 0)
… …
1765 return; 1568 return;
1766 } 1569 }
1767 } 1570 }
1768 else if (item->type == ROD || item->type == HORN) 1571 else if (item->type == ROD || item->type == HORN)
1769 { 1572 {
1770 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1573 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1574
1575 // using the maximum of the rods charge allows at least one spell cast
1576 // for a rod or horn, this fixes some broken rods.
1577 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1771 { 1578 {
1772 op->contr->play_sound (sound_find ("wand_poof")); 1579 op->contr->play_sound (sound_find ("wand_poof"));
1773 1580
1774 if (item->type == ROD) 1581 if (item->type == ROD)
1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1582 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1780 } 1587 }
1781 } 1588 }
1782 1589
1783 if (cast_spell (op, item, dir, item->inv, NULL)) 1590 if (cast_spell (op, item, dir, item->inv, NULL))
1784 { 1591 {
1785 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1592 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1593
1786 if (item->type == WAND) 1594 if (item->type == WAND)
1787 { 1595 {
1788 if (!(--item->stats.food)) 1596 if (!(--item->stats.food))
1789 { 1597 {
1790 object *tmp; 1598 object *tmp;
1791 1599
1792 if (item->arch) 1600 if (item->arch)
1793 { 1601 {
1794 CLEAR_FLAG (item, FLAG_ANIMATE); 1602 item->clr_flag (FLAG_ANIMATE);
1795 item->face = item->arch->face; 1603 item->face = item->arch->face;
1796 item->set_speed (0); 1604 item->set_speed (0);
1797 } 1605 }
1798 1606
1799 if ((tmp = item->in_player ())) 1607 if (object *pl = item->visible_to ())
1800 esrv_update_item (UPD_ANIM, tmp, item); 1608 esrv_update_item (UPD_ANIM, pl, item);
1801 } 1609 }
1802 } 1610 }
1803 else if (item->type == ROD || item->type == HORN) 1611 else if (item->type == ROD || item->type == HORN)
1804 drain_rod_charge (item); 1612 drain_rod_charge (item);
1805 } 1613 }
1806} 1614}
1807 1615
1808/* Received a fire command for the player - go and do it. 1616/* Received a fire command for the player - go and do it.
1809 */ 1617 */
1810bool 1618bool
1811fire (object *op, int dir) 1619fire (object *who, int dir)
1812{ 1620{
1813 int spellcost = 0; 1621 int spellcost = 0;
1814 1622
1815 /* check for loss of invisiblity/hide */
1816 if (action_makes_visible (op))
1817 make_visible (op);
1818
1819 player *pl = op->contr; 1623 player *pl = who->contr;
1820 1624
1821 if (pl->golem) 1625 if (pl->golem)
1822 { 1626 {
1823 control_golem (op->contr->golem, dir); 1627 control_golem (who->contr->golem, dir);
1824 return false; 1628 return false;
1825 } 1629 }
1826 1630
1827 object *ob = pl->ranged_ob; 1631 object *ob = pl->ranged_ob;
1828 1632
1829 if (!ob) 1633 if (!ob)
1830 return false; 1634 return false;
1831 1635
1832 if (!op->change_weapon (ob))
1833 return false;
1834
1835 if (op->speed_left > 0.f) 1636 if (who->speed_left > 0.f)
1836 --op->speed_left; 1637 --who->speed_left;
1837 else 1638 else
1838 return false; 1639 return false;
1839 1640
1641 if (!who->apply (ob))
1642 return false;
1643
1644 /* check for loss of invisiblity/hide */
1645 if (action_makes_visible (who))
1646 make_visible (who);
1647
1840 switch (ob->type) 1648 switch (ob->type)
1841 { 1649 {
1842 case BOW: 1650 case BOW:
1843 player_fire_bow (op, dir); 1651 player_fire_bow (who, dir);
1844 break; 1652 break;
1845 1653
1846 case SPELL: 1654 case SPELL:
1847 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1655 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1848 break; 1656 break;
1849 1657
1850 case BUILDER: 1658 case BUILDER:
1851 apply_map_builder (op, dir); 1659 apply_map_builder (who, dir);
1852 break; 1660 break;
1853 1661
1854 case SKILL: 1662 case SKILL:
1855 do_skill (op, op, ob, dir, 0); 1663 do_skill (who, who, ob, dir, 0);
1856 break; 1664 break;
1857 1665
1666 case RANGED:
1667 do_skill (who, ob, who->chosen_skill, dir, 0);
1668 break;
1669
1858 default: 1670 default:
1859 fire_misc_object (op, dir); 1671 fire_misc_object (who, dir);
1860 break; 1672 break;
1861 } 1673 }
1862 1674
1863 return true; 1675 return true;
1864} 1676}
1865 1677
1866/* find_key 1678static object *
1867 * We try to find a key for the door as passed. If we find a key
1868 * and successfully use it, we return the key, otherwise NULL
1869 * This function merges both normal and locked door, since the logic
1870 * for both is the same - just the specific key is different.
1871 * pl is the player,
1872 * inv is the objects inventory to searched
1873 * door is the door we are trying to match against.
1874 * This function can be called recursively to search containers.
1875 */
1876object *
1877find_key (object *pl, object *container, object *door) 1679find_key_ (object *pl, object *container, object *door)
1878{ 1680{
1879 object *tmp, *key; 1681 object *tmp, *key;
1880 1682
1881 /* Should not happen, but sanity checking is never bad */ 1683 /* Should not happen, but sanity checking is never bad */
1882 if (!container->inv) 1684 if (!container->inv)
… …
1885 /* First, lets try to find a key in the top level inventory */ 1687 /* First, lets try to find a key in the top level inventory */
1886 for (tmp = container->inv; tmp; tmp = tmp->below) 1688 for (tmp = container->inv; tmp; tmp = tmp->below)
1887 { 1689 {
1888 if (door->type == DOOR && tmp->type == KEY) 1690 if (door->type == DOOR && tmp->type == KEY)
1889 break; 1691 break;
1692
1890 /* For sanity, we should really check door type, but other stuff 1693 /* For sanity, we should really check door type, but other stuff
1891 * (like containers) can be locked with special keys 1694 * (like containers) can be locked with special keys
1892 */ 1695 */
1893 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1696 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1894 break; 1697 break;
… …
1900 * a key, return 1703 * a key, return
1901 */ 1704 */
1902 if (!tmp) 1705 if (!tmp)
1903 { 1706 {
1904 for (tmp = container->inv; tmp; tmp = tmp->below) 1707 for (tmp = container->inv; tmp; tmp = tmp->below)
1905 {
1906 /* No reason to search empty containers */ 1708 /* No reason to search empty containers */
1907 if (tmp->type == CONTAINER && tmp->inv) 1709 if (tmp->type == CONTAINER && tmp->inv)
1908 {
1909 if ((key = find_key (pl, tmp, door))) 1710 if ((key = find_key_ (pl, tmp, door)))
1910 return key; 1711 return key;
1911 }
1912 }
1913 1712
1914 if (!tmp) 1713 if (!tmp)
1915 return NULL; 1714 return 0;
1916 } 1715 }
1917 1716
1918 /* We get down here if we have found a key. Now if its in a container, 1717 /* We get down here if we have found a key. Now if its in a container,
1919 * see if we actually want to use it 1718 * see if we actually want to use it
1920 */ 1719 */
1921 if (pl != container) 1720 if (pl != container)
1922 { 1721 {
1923 /* Only let players use keys in containers */ 1722 /* Only let players use keys in containers */
1924 if (!pl->contr) 1723 if (!pl->contr)
1925 return NULL; 1724 return 0;
1725
1926 /* cases where this fails: 1726 /* cases where this fails:
1927 * If we only search the player inventory, return now since we 1727 * If we only search the player inventory, return now since we
1928 * are not in the players inventory. 1728 * are not in the players inventory.
1929 * If the container is not active, return now since only active 1729 * If the container is not active, return now since only active
1930 * containers can be used. 1730 * containers can be used.
… …
1934 * inv must have been an container and must have been active. 1734 * inv must have been an container and must have been active.
1935 * 1735 *
1936 * Change the color so that the message doesn't disappear with 1736 * Change the color so that the message doesn't disappear with
1937 * all the others. 1737 * all the others.
1938 */ 1738 */
1939 if (pl->contr->usekeys == key_inventory || 1739 if (pl->contr->usekeys == key_inventory
1940 !QUERY_FLAG (container, FLAG_APPLIED) || 1740 || !container->flag [FLAG_APPLIED]
1941 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1741 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1942 { 1742 {
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1743 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1944 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1744 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1745 return NULL;
1946 } 1746 }
1947 } 1747 }
1948 1748
1949 return tmp; 1749 return tmp;
1750}
1751
1752/* find_key
1753 * We try to find a key for the door as passed. If we find a key
1754 * and successfully use it, we return the key, otherwise NULL
1755 * This function merges both normal and locked door, since the logic
1756 * for both is the same - just the specific key is different.
1757 * pl is the player,
1758 * inv is the objects inventory to searched
1759 * door is the door we are trying to match against.
1760 * This function can be called recursively to search containers.
1761 */
1762object *
1763find_key (object *pl, object *container, object *door)
1764{
1765 if (door->slaying && is_match_expr (door->slaying))
1766 {
1767 // for match expressions, we try to find the key by applying the match
1768 // to the op itself, which is supposed to find the "key", instead
1769 // of searching through containers ourselves.
1770
1771 return match_one (door->slaying, container, door, pl, pl);
1772 }
1773 else
1774 return find_key_ (pl, container, door);
1950} 1775}
1951 1776
1952/* moved door processing out of move_player_attack. 1777/* moved door processing out of move_player_attack.
1953 * returns 1 if player has opened the door with a key 1778 * returns 1 if player has opened the door with a key
1954 * such that the caller should not do anything more, 1779 * such that the caller should not do anything more,
… …
1981 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN); 1806 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1982 remove_door2 (door); /* remove door without violence ;-) */ 1807 remove_door2 (door); /* remove door without violence ;-) */
1983 } 1808 }
1984 1809
1985 /* Do this after we print the message */ 1810 /* Do this after we print the message */
1986 decrease_ob (key); /* Use up one of the keys */ 1811 key->decrease (); /* Use up one of the keys */
1987 /* Need to update the weight the container the key was in */
1988 if (container != op)
1989 esrv_update_item (UPD_WEIGHT, op, container);
1990 1812
1991 return 1; /* Nothing more to do below */ 1813 return 1; /* Nothing more to do below */
1992 } 1814 }
1993 else if (door->type == LOCKED_DOOR) 1815 else if (door->type == LOCKED_DOOR)
1994 { 1816 {
… …
2007 * going to try and move (not fire weapons). 1829 * going to try and move (not fire weapons).
2008 */ 1830 */
2009bool 1831bool
2010move_player_attack (object *op, int dir) 1832move_player_attack (object *op, int dir)
2011{ 1833{
2012 int on_battleground; 1834 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1835 {
1836 --op->speed_left;
1837 return true;
1838 }
2013 1839
2014 sint16 nx = freearr_x[dir] + op->x; 1840 sint16 nx = freearr_x[dir] + op->x;
2015 sint16 ny = freearr_y[dir] + op->y; 1841 sint16 ny = freearr_y[dir] + op->y;
2016 1842
2017 on_battleground = op_on_battleground (op, 0, 0);
2018
2019 if (out_of_map (op->map, nx, ny)) 1843 if (out_of_map (op->map, nx, ny))
2020 return false; 1844 return false;
2021
2022 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2023 {
2024 --op->speed_left;
2025 return true;
2026 }
2027 1845
2028 /* If braced, or can't move to the square, and it is not out of the 1846 /* If braced, or can't move to the square, and it is not out of the
2029 * map, attack it. Note order of if statement is important - don't 1847 * map, attack it. Note order of if statement is important - don't
2030 * want to be calling move_ob if braced, because move_ob will move the 1848 * want to be calling move_ob if braced, because move_ob will move the
2031 * player. This is a pretty nasty hack, because if we could 1849 * player. This is a pretty nasty hack, because if we could
… …
2049 || mon->flag [FLAG_CAN_ROLL]) 1867 || mon->flag [FLAG_CAN_ROLL])
2050 && mon != op) 1868 && mon != op)
2051 break; 1869 break;
2052 } 1870 }
2053 1871
2054 if (!mon) /* This happens anytime the player tries to move */ 1872 /* no monster == player tries to move into a wall or so */
2055 return false; /* into a wall */ 1873 if (!mon)
1874 {
1875 for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
1876 if (op->move_type & ob->move_block)
1877 {
1878 if (ob->move_block == MOVE_ALL)
1879 move_into_wall (op, ob);
1880 else
1881 {
1882 if (op->contr->ns->bumpmsg)
1883 {
1884 op->play_sound (sound_find ("blocked_move"));
1885
1886 op->statusmsg (ob->invisible
1887 ? "Something blocks you."
1888 : format ("Something blocks you from entering the %s.", query_name (ob))
1889 );
1890 }
1891 }
1892
1893 break;
1894 }
1895
1896 return false;
1897 }
2056 1898
2057 mon = mon->head_ (); 1899 mon = mon->head_ ();
2058 1900
2059 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 1901 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2060 if (op->contr->weapon_sp_left > 0.f) 1902 if (op->contr->weapon_sp_left > 0.f)
… …
2078 */ 1920 */
2079 if (op->type == PLAYER 1921 if (op->type == PLAYER
2080 && ((mon->owner && mon->owner->contr 1922 && ((mon->owner && mon->owner->contr
2081 && same_party (mon->owner->contr->party, op->contr->party)) 1923 && same_party (mon->owner->contr->party, op->contr->party))
2082 || mon->owner == op) 1924 || mon->owner == op)
2083 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1925 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
2084 { 1926 {
2085 /* If we're braced, we don't want to switch places with it */ 1927 /* If we're braced, we don't want to switch places with it */
2086 if (op->contr->braced) 1928 if (op->contr->braced)
2087 return false; 1929 return false;
2088 1930
… …
2091 --op->speed_left; 1933 --op->speed_left;
2092 1934
2093 op->play_sound (sound_find ("push_player")); 1935 op->play_sound (sound_find ("push_player"));
2094 push_ob (mon, dir, op); 1936 push_ob (mon, dir, op);
2095 1937
2096 if (op->contr->tmp_invis || op->hide) 1938 if (action_makes_visible (op))
2097 make_visible (op); 1939 make_visible (op);
2098 1940
2099 return true; 1941 return true;
2100 } 1942 }
2101 else 1943 else
2102 return false; 1944 return false;
2103 } 1945 }
1946
1947 bool on_battleground = op_on_battleground (op, 0, 0);
2104 1948
2105 /* in certain circumstances, you shouldn't attack friendly 1949 /* in certain circumstances, you shouldn't attack friendly
2106 * creatures. Note that if you are braced, you can't push 1950 * creatures. Note that if you are braced, you can't push
2107 * someone, but put it inside this loop so that you won't 1951 * someone, but put it inside this loop so that you won't
2108 * attack them either. 1952 * attack them either.
2109 */ 1953 */
2110 if ((mon->type == PLAYER || mon->enemy != op) 1954 if ((mon->type == PLAYER || mon->enemy != op)
2111 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1955 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2112 && ((op->contr->peaceful 1956 && ((op->contr->peaceful
2113 || (mon->type == PLAYER && mon->contr->peaceful)) 1957 || (mon->type == PLAYER && mon->contr->peaceful))
2114 && !on_battleground)) 1958 && !on_battleground))
2115 { 1959 {
2116 if (op->speed_left > 0.f) 1960 if (op->speed_left > 0.f)
… …
2123 push_ob (mon, dir, op); 1967 push_ob (mon, dir, op);
2124 } 1968 }
2125 else 1969 else
2126 op->statusmsg ("You withhold your attack"); 1970 op->statusmsg ("You withhold your attack");
2127 1971
2128 if (op->contr->tmp_invis || op->hide) 1972 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2129 make_visible (op); 1973 make_visible (op);
2130 1974
2131 return true; 1975 return true;
2132 } 1976 }
2133 } 1977 }
2134 /* If the object is a boulder or other rollable object, then 1978 /* If the object is a boulder or other rollable object, then
2135 * roll it if not braced. You can't roll it if you are braced. 1979 * roll it if not braced. You can't roll it if you are braced.
2136 */ 1980 */
2137 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1981 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2138 { 1982 {
2139 if (op->speed_left > 0.f) 1983 if (op->speed_left > 0.f)
2140 { 1984 {
2141 --op->speed_left; 1985 --op->speed_left;
2142 1986
… …
2151 * Way it works is like this: First, it must have some hit points 1995 * Way it works is like this: First, it must have some hit points
2152 * and be living. Then, it must be one of the following: 1996 * and be living. Then, it must be one of the following:
2153 * 1) Not a player, 2) A player, but of a different party. Note 1997 * 1) Not a player, 2) A player, but of a different party. Note
2154 * that party_number -1 is no party, so attacks can still happen. 1998 * that party_number -1 is no party, so attacks can still happen.
2155 */ 1999 */
2156 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2000 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2157 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2001 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2158 { 2002 {
2159 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 2003 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2160 { 2004 {
2161 --op->contr->weapon_sp_left; 2005 --op->contr->weapon_sp_left;
… …
2173} 2017}
2174 2018
2175bool 2019bool
2176move_player (object *op, int dir) 2020move_player (object *op, int dir)
2177{ 2021{
2178 int pick;
2179
2180 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2022 if (!op->map || op->map->state != MAP_ACTIVE)
2181 return 0; 2023 return 0;
2182 2024
2183 /* Sanity check: make sure dir is valid */ 2025 /* Sanity check: make sure dir is valid */
2184 if ((dir < 0) || (dir >= 9)) 2026 if (dir < 0 || dir > 8)
2185 { 2027 {
2186 LOG (llevError, "move_player: invalid direction %d\n", dir); 2028 LOG (llevError, "move_player: invalid direction %d\n", dir);
2187 return 0; 2029 return 0;
2188 } 2030 }
2189 2031
2190 /* peterm: added following line */ 2032 /* peterm: added following line */
2191 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2033 if (op->flag [FLAG_CONFUSED] && dir)
2192 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2034 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2193 2035
2194 op->facing = dir; 2036 op->facing = dir;
2195 2037
2196 if (op->hide) 2038 if (op->flag [FLAG_HIDDEN])
2197 do_hidden_move (op); 2039 do_hidden_move (op);
2198 2040
2199 bool retval; 2041 bool retval;
2042 int pick = 0;
2200 2043
2201 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2044 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2202 retval = RESULT_INT (0); 2045 retval = RESULT_INT (0);
2203 else if (op->contr->fire_on) 2046 else if (op->contr->fire_on)
2204 retval = fire (op, dir); 2047 retval = fire (op, dir);
… …
2235 * players. 2078 * players.
2236 */ 2079 */
2237bool 2080bool
2238handle_newcs_player (object *op) 2081handle_newcs_player (object *op)
2239{ 2082{
2240 if (QUERY_FLAG (op, FLAG_SCARED)) 2083 if (op->flag [FLAG_SCARED])
2241 { 2084 {
2242 if (op->speed_left > 0.f) 2085 if (op->speed_left > 0.f)
2243 { 2086 {
2244 --op->speed_left; 2087 --op->speed_left;
2245 flee_player (op); 2088 flee_player (op);
… …
2261 return move_player (op, op->direction); 2104 return move_player (op, op->direction);
2262 2105
2263 return false; 2106 return false;
2264} 2107}
2265 2108
2266int 2109static int
2267save_life (object *op) 2110save_life (object *op)
2268{ 2111{
2269 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2112 if (!op->flag [FLAG_LIFESAVE])
2270 return 0; 2113 return 0;
2271 2114
2272 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2115 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2273 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2116 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2274 { 2117 {
2275 op->play_sound (sound_find ("ob_evaporate")); 2118 op->play_sound (sound_find ("ob_evaporate"));
2276 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2119 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2277 2120
2278 if (op->contr)
2279 esrv_del_item (op->contr, tmp->count);
2280
2281 tmp->destroy (); 2121 tmp->destroy ();
2282 CLEAR_FLAG (op, FLAG_LIFESAVE); 2122 op->clr_flag (FLAG_LIFESAVE);
2283 2123
2284 if (op->stats.hp < 0) 2124 if (op->stats.hp < 0)
2285 op->stats.hp = op->stats.maxhp; 2125 op->stats.hp = op->stats.maxhp;
2286 2126
2287 if (op->stats.food < 0) 2127 if (op->stats.food < 0)
2288 op->stats.food = 999; 2128 op->stats.food = MAX_FOOD;
2289 2129
2290 op->update_stats (); 2130 op->update_stats ();
2291 return 1; 2131 return 1;
2292 } 2132 }
2293 2133
2294 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2134 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2295 CLEAR_FLAG (op, FLAG_LIFESAVE); 2135 op->clr_flag (FLAG_LIFESAVE);
2296 enter_player_savebed (op); /* bring him home. */ 2136 enter_player_savebed (op); /* bring him home. */
2297 return 0; 2137 return 0;
2298} 2138}
2299 2139
2300/* This goes throws the inventory and removes unpaid objects, and puts them 2140/* This goes throws the inventory and removes unpaid objects, and puts them
2301 * back in the map (location and map determined by values of env). This 2141 * back in the map (location and map determined by values of env). This
2302 * function will descend into containers. op is the object to start the search 2142 * function will descend into containers. op is the object to start the search
2303 * from. 2143 * from.
2304 */ 2144 */
2305static void 2145static void
2306drop_unpaid_items (object *op, object *env) 2146drop_unpaid_items (object *op, object *env)
2307{ 2147{
2308 while (op) 2148 while (op)
2309 { 2149 {
2310 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2150 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2311 2151
2312 if (QUERY_FLAG (op, FLAG_UNPAID)) 2152 if (op->flag [FLAG_UNPAID])
2313 {
2314 if (env->type == PLAYER)
2315 esrv_del_item (env->contr, op->count);
2316
2317 op->insert_at (env); 2153 op->insert_at (env);
2318 }
2319 else if (op->inv) 2154 else if (op->inv)
2320 drop_unpaid_items (op->inv, env); 2155 drop_unpaid_items (op->inv, env);
2321 2156
2322 op = next; 2157 op = next;
2323 } 2158 }
… …
2328{ 2163{
2329 if (!flag [FLAG_REMOVED]) 2164 if (!flag [FLAG_REMOVED])
2330 ::drop_unpaid_items (inv, this); 2165 ::drop_unpaid_items (inv, this);
2331} 2166}
2332 2167
2333/*
2334 * Returns pointer a static string containing gravestone text
2335 * Moved from apply.c to player.c - player.c is what
2336 * actually uses this function. player.c may not be quite the
2337 * best, a misc file for object actions is probably better,
2338 * but there isn't one in the server directory.
2339 */
2340char *
2341gravestone_text (object *op)
2342{
2343 static char buf2[MAX_BUF];
2344 char buf[MAX_BUF];
2345 time_t now = time (NULL);
2346
2347 strcpy (buf2, " R.I.P.\n\n");
2348 if (op->type == PLAYER)
2349 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2350 else
2351 sprintf (buf, "%s\n", &op->name);
2352
2353 strncat (buf2, " ", 20 - strlen (buf) / 2);
2354 strcat (buf2, buf);
2355 if (op->type == PLAYER)
2356 sprintf (buf, "who was in level %d when killed\n", op->level);
2357 else
2358 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2359
2360 strncat (buf2, " ", 20 - strlen (buf) / 2);
2361 strcat (buf2, buf);
2362 if (op->type == PLAYER)
2363 {
2364 sprintf (buf, "by %s.\n\n", op->contr->killer);
2365 strncat (buf2, " ", 21 - strlen (buf) / 2);
2366 strcat (buf2, buf);
2367 }
2368
2369 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2370 strncat (buf2, " ", 20 - strlen (buf) / 2);
2371 strcat (buf2, buf);
2372
2373 return buf2;
2374}
2375
2376void 2168void
2377do_some_living (object *op) 2169do_some_living (object *op)
2378{ 2170{
2379 int last_food = op->stats.food; 2171 int last_food = op->stats.food;
2380 int gen_hp, gen_sp, gen_grace; 2172 int gen_hp, gen_sp, gen_grace;
2381 int over_hp, over_sp, over_grace;
2382 int i; 2173 int i;
2383 int rate_hp = 1200; 2174 int rate_hp = 1200;
2384 int rate_sp = 2500; 2175 int rate_sp = 2500;
2385 int rate_grace = 2000; 2176 int rate_grace = 2000;
2386 const int max_hp = 1; 2177 const int max_hp = 1;
… …
2392 op->invisible = 1000; 2183 op->invisible = 1000;
2393 /* the socket code flashes the player visible/invisible 2184 /* the socket code flashes the player visible/invisible
2394 * depending on the value of invisible, so we need to 2185 * depending on the value of invisible, so we need to
2395 * alternate it here for it to work correctly. 2186 * alternate it here for it to work correctly.
2396 */ 2187 */
2397 if (pticks & 2) 2188 if (server_tick & 2)
2398 op->invisible--; 2189 op->invisible--;
2399 } 2190 }
2400 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2191 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2401 { 2192 {
2402 if (!op->invisible--) 2193 if (!op->invisible--)
2403 { 2194 {
2404 make_visible (op); 2195 make_visible (op);
2405 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2196 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2439 if (--op->last_grace < 0) 2230 if (--op->last_grace < 0)
2440 { 2231 {
2441 if (op->stats.grace < op->stats.maxgrace / 2) 2232 if (op->stats.grace < op->stats.maxgrace / 2)
2442 op->stats.grace++; /* no penalty in food for regaining grace */ 2233 op->stats.grace++; /* no penalty in food for regaining grace */
2443 2234
2235 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2236
2444 if (max_grace > 1) 2237 if (max_grace > 1)
2445 { 2238 {
2446 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2239 int over_grace = temp / rate_grace;
2240
2447 if (over_grace > 0) 2241 if (over_grace > 0)
2448 { 2242 {
2449 op->stats.sp += over_grace 2243 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2450 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2451 op->last_grace = 0; 2244 op->last_grace = 0;
2452 } 2245 }
2453 else 2246 else
2454 { 2247 op->last_grace = rate_grace / temp;
2455 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2456 }
2457 } 2248 }
2458 else 2249 else
2459 { 2250 op->last_grace = rate_grace / temp;
2460 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2251
2461 }
2462 /* wearing stuff doesn't detract from grace generation. */ 2252 /* wearing stuff doesn't detract from grace generation. */
2463 } 2253 }
2464 2254
2465 if (op->stats.food > 0) 2255 if (op->stats.food > 0)
2466 { 2256 {
… …
2472 if (op->stats.sp < op->stats.maxsp) 2262 if (op->stats.sp < op->stats.maxsp)
2473 { 2263 {
2474 op->stats.sp++; 2264 op->stats.sp++;
2475 2265
2476 /* dms do not consume food */ 2266 /* dms do not consume food */
2477 if (!QUERY_FLAG (op, FLAG_WIZ)) 2267 if (!op->flag [FLAG_WIZ])
2478 { 2268 {
2479 op->stats.food--; 2269 op->stats.food--;
2480 2270
2481 if (op->contr->digestion < 0) 2271 if (op->contr->digestion < 0)
2482 op->stats.food += op->contr->digestion; 2272 op->stats.food += op->contr->digestion;
… …
2485 } 2275 }
2486 } 2276 }
2487 2277
2488 if (max_sp > 1) 2278 if (max_sp > 1)
2489 { 2279 {
2490 over_sp = (gen_sp + 10) / rate_sp; 2280 int over_sp = (gen_sp + 10) / rate_sp;
2491 if (over_sp > 0) 2281 if (over_sp > 0)
2492 { 2282 {
2493 if (op->stats.sp < op->stats.maxsp) 2283 if (op->stats.sp < op->stats.maxsp)
2494 { 2284 {
2495 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2285 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2516 if (op->stats.hp < op->stats.maxhp) 2306 if (op->stats.hp < op->stats.maxhp)
2517 { 2307 {
2518 op->stats.hp++; 2308 op->stats.hp++;
2519 2309
2520 /* dms do not consume food */ 2310 /* dms do not consume food */
2521 if (!QUERY_FLAG (op, FLAG_WIZ)) 2311 if (!op->flag [FLAG_WIZ])
2522 { 2312 {
2523 op->stats.food--; 2313 op->stats.food--;
2524 2314
2525 if (op->contr->digestion < 0) 2315 if (op->contr->digestion < 0)
2526 op->stats.food += op->contr->digestion; 2316 op->stats.food += op->contr->digestion;
2527 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2317 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2528 op->stats.food = last_food; 2318 op->stats.food = last_food;
2529 } 2319 }
2530 } 2320 }
2531 2321
2322 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2323
2532 if (max_hp > 1) 2324 if (max_hp > 1)
2533 { 2325 {
2534 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2326 int over_hp = temp / rate_hp;
2535 2327
2536 if (over_hp > 0) 2328 if (over_hp > 0)
2537 { 2329 {
2538 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2330 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2539 op->last_heal = 0; 2331 op->last_heal = 0;
2540 } 2332 }
2541 else 2333 else
2542 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2334 op->last_heal = rate_hp / temp;
2543 } 2335 }
2544 else 2336 else
2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2337 op->last_heal = rate_hp / temp;
2546 } 2338 }
2547 } 2339 }
2548 2340
2549 /* Digestion */ 2341 /* Digestion */
2550 if (--op->last_eat < 0) 2342 if (--op->last_eat < 0)
… …
2553 penalty = max (0, -op->contr->digestion); 2345 penalty = max (0, -op->contr->digestion);
2554 2346
2555 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2347 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2556 2348
2557 /* dms do not consume food */ 2349 /* dms do not consume food */
2558 if (!QUERY_FLAG (op, FLAG_WIZ)) 2350 if (!op->flag [FLAG_WIZ])
2559 op->stats.food--; 2351 op->stats.food--;
2560 } 2352 }
2561 2353
2562 if (op->stats.food < 0 && op->stats.hp >= 0) 2354 if (op->stats.food < 0 && op->stats.hp >= 0)
2563 { 2355 {
2564 object *tmp, *flesh = 0; 2356 object *flesh = 0;
2565 2357
2566 for (tmp = op->inv; tmp; tmp = tmp->below) 2358 for_inv_removable (op, tmp)
2567 { 2359 {
2568 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2360 if (tmp->flag [FLAG_UNPAID])
2361 continue;
2362
2363 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2569 { 2364 {
2570 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2365 op->statusmsg ("You blindly grab for a bite of food. "
2571 { 2366 "H<To prevent you from starving, you ate some random item from your backpack.>");
2572 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2367 op->apply (tmp);
2573 manual_apply (op, tmp, 0); 2368
2574 if (op->stats.food >= 0 || op->stats.hp < 0) 2369 if (op->stats.food >= 0 || op->stats.hp < 0)
2575 break; 2370 break;
2576 } 2371 }
2577 else if (tmp->type == FLESH) 2372 else if (tmp->type == FLESH)
2578 flesh = tmp; 2373 flesh = tmp;
2579 } /* End if paid for object */ 2374 }
2580 } /* end of for loop */
2581 2375
2582 /* If player is still starving, it means they don't have any food, so 2376 /* If player is still starving, it means they don't have any food, so
2583 * eat flesh instead. 2377 * eat flesh instead.
2584 */ 2378 */
2585 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2379 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2586 { 2380 {
2587 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2381 op->statusmsg ("You blindly grab for a bite of food. "
2382 "H<To prevent you from starving, you ate some random item from your backpack.>");
2588 manual_apply (op, flesh, 0); 2383 op->apply (flesh);
2589 } 2384 }
2385
2386 // If player is still starving, alert him!
2387 if (op->stats.food < 0)
2388 op->failmsg ("You are starving! "
2389 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2590 } 2390 }
2591 2391
2592 if (op->stats.food < 0) 2392 if (op->stats.food < 0)
2593 { 2393 {
2594 op->stats.hp += op->stats.food; 2394 op->stats.hp += op->stats.food;
2595 op->stats.food = 0; 2395 op->stats.food = 0;
2396
2397 if (op->stats.hp < 0)
2398 {
2399 op->contr->killer = archetype::get ("killer_starvation");
2400 op->contr->killer->destroy ();
2596 } 2401 }
2402 }
2597 2403
2404 /* killer should be set here already */
2598 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2405 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2599 kill_player (op); 2406 kill_player (op);
2600 } 2407 }
2601} 2408}
2602 2409
2603/* If the player should die (lack of hp, food, etc), we call this. 2410/* If the player should die (lack of hp, food, etc), we call this.
… …
2607 */ 2414 */
2608void 2415void
2609kill_player (object *op) 2416kill_player (object *op)
2610{ 2417{
2611 int x, y; 2418 int x, y;
2612 char buf[MAX_BUF];
2613 maptile *map; /* this is for resurrection */ 2419 maptile *map; /* this is for resurrection */
2614 int will_kill_again; 2420 int will_kill_again;
2615 archetype *at; 2421 archetype *at;
2616 object *tmp; 2422 object *tmp;
2617 2423
2618 if (save_life (op)) 2424 if (save_life (op))
2619 return; 2425 return;
2426
2427 dynbuf_text deathtab;
2428
2429 /* restore player */
2430 at = archetype::find (shstr_poisoning);
2431 if (object *tmp = present_arch_in_ob (at, op))
2432 {
2433 tmp->destroy ();
2434 deathtab << "Your body feels cleansed...\r";
2435 }
2436
2437 at = archetype::find (shstr_confusion);
2438 if (object *tmp = present_arch_in_ob (at, op))
2439 {
2440 tmp->destroy ();
2441 deathtab << "Your mind feels clearer...\r";
2442 }
2443
2444 cure_disease (op, 0, 0); /* remove any disease */
2445
2446 max_it (op->stats.hp , op->stats.maxhp);
2447 max_it (op->stats.sp , op->stats.maxsp);
2448 max_it (op->stats.grace, op->stats.maxgrace);
2449 max_it (op->stats.food , 200);
2450
2451 // remove all spell effects that are active
2452 // to avoid long-term effects such as word-of-recall
2453 for (object *item = op->inv; item; )
2454 {
2455 object *next = item->below;
2456
2457 if (item->type == SPELL_EFFECT && item->active)
2458 item->destroy ();
2459
2460 item = next;
2461 }
2620 2462
2621 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2463 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2622 * in cities ONLY!!! It is very important that this doesn't get abused. 2464 * in cities ONLY!!! It is very important that this doesn't get abused.
2623 * Look at op_on_battleground() for more info --AndreasV 2465 * Look at op_on_battleground() for more info --AndreasV
2624 */ 2466 */
2625 if (op_on_battleground (op, &x, &y)) 2467 if (op_on_battleground (op, &x, &y))
2626 { 2468 {
2627 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2469 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2628 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2629
2630 /* restore player */
2631 at = archetype::find ("poisoning");
2632 if (object *tmp = present_arch_in_ob (at, op))
2633 {
2634 tmp->destroy ();
2635 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2636 }
2637
2638 at = archetype::find ("confusion");
2639 if (object *tmp = present_arch_in_ob (at, op))
2640 {
2641 tmp->destroy ();
2642 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2643 }
2644
2645 cure_disease (op, 0, 0); /* remove any disease */
2646 op->stats.hp = op->stats.maxhp;
2647 if (op->stats.food <= 0)
2648 op->stats.food = 999;
2649 2470
2650 /* create a bodypart-trophy to make the winner happy */ 2471 /* create a bodypart-trophy to make the winner happy */
2651 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2472 object *tmp = archetype::find (shstr_finger)->instance ();
2652 { 2473
2653 tmp->name = format ("%s's finger" , &op->name); 2474 tmp->name = format ("%s's finger" , &op->name);
2654 tmp->name_pl = format ("%s's fingers", &op->name); 2475 tmp->name_pl = format ("%s's fingers", &op->name);
2655 tmp->msg = format ( 2476 tmp->msg = format (
2656 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2477 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2657 &op->name, op->contr->title, (int) (op->level), op->contr->killer 2478 &op->name, op->contr->title,
2479 (int)op->level,
2480 op->contr->killer_name ()
2658 ); 2481 );
2659 tmp->value = 0, tmp->type = 0; 2482 tmp->value = 0, tmp->type = 0;
2660 tmp->materialname = "organics"; 2483 tmp->material = name_to_material (shstr_organic);
2661 tmp->insert_at (op, tmp); 2484 tmp->insert_at (op, tmp);
2662 }
2663 2485
2664 /* teleport defeated player to new destination */ 2486 /* teleport defeated player to new destination */
2665 transfer_ob (op, x, y, 0, NULL); 2487 transfer_ob (op, x, y, 0, NULL);
2666 op->contr->braced = 0; 2488 op->contr->braced = 0;
2489
2490 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2667 return; 2491 return;
2668 } 2492 }
2669 2493
2494 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2495 deathtab << "T<YOU HAVE DIED>\n\n";
2496
2670 INVOKE_PLAYER (DEATH, op->contr); 2497 INVOKE_PLAYER (DEATH, op->contr);
2671 2498
2672 command_kill_pets (op, 0); 2499 command_kill_pets (op, 0);
2673
2674 if (op->stats.food < 0)
2675 strcpy (op->contr->killer, "starvation");
2676 2500
2677 op->contr->play_sound (sound_find ("player_dies")); 2501 op->contr->play_sound (sound_find ("player_dies"));
2678 2502
2679 /* save the map location for corpse, gravestone */ 2503 /* save the map location for corpse, gravestone */
2680 x = op->x; 2504 x = op->x;
… …
2710 2534
2711 lost_a_stat = 0; 2535 lost_a_stat = 0;
2712 2536
2713 for (z = 0; z < num_stats_lose; z++) 2537 for (z = 0; z < num_stats_lose; z++)
2714 { 2538 {
2715 i = RANDOM () % NUM_STATS; 2539 i = rndm (NUM_STATS);
2716 2540
2717 if (settings.stat_loss_on_death) 2541 if (settings.stat_loss_on_death)
2718 { 2542 {
2719 /* Pick a random stat and take a point off it. Tell the player 2543 /* Pick a random stat and take a point off it. Tell the player
2720 * what he lost. 2544 * what he lost.
… …
2727 lost_a_stat = 1; 2551 lost_a_stat = 1;
2728 } 2552 }
2729 else 2553 else
2730 { 2554 {
2731 /* deplete a stat */ 2555 /* deplete a stat */
2732 archetype *deparch = archetype::find ("depletion"); 2556 archetype *deparch = archetype::find (shstr_depletion);
2733 object *dep; 2557 object *dep;
2734 2558
2735 dep = present_arch_in_ob (deparch, op); 2559 dep = present_arch_in_ob (deparch, op);
2736 if (!dep) 2560 if (!dep)
2737 { 2561 {
2738 dep = arch_to_object (deparch); 2562 dep = deparch->instance ();
2739 insert_ob_in_ob (dep, op); 2563 insert_ob_in_ob (dep, op);
2740 } 2564 }
2741 lose_this_stat = 1; 2565 lose_this_stat = 1;
2742 if (settings.balanced_stat_loss) 2566 if (settings.balanced_stat_loss)
2743 { 2567 {
… …
2771 } 2595 }
2772 } 2596 }
2773 2597
2774 if (lose_this_stat) 2598 if (lose_this_stat)
2775 { 2599 {
2776 this_stat = get_attr_value (&(dep->stats), i); 2600 this_stat = get_attr_value (&dep->stats, i);
2777 /* We could try to do something clever like find another 2601 /* We could try to do something clever like find another
2778 * stat to reduce if this fails. But chances are, if 2602 * stat to reduce if this fails. But chances are, if
2779 * stats have been depleted to -50, all are pretty low 2603 * stats have been depleted to -50, all are pretty low
2780 * and should be roughly the same, so it shouldn't make a 2604 * and should be roughly the same, so it shouldn't make a
2781 * difference. 2605 * difference.
2782 */ 2606 */
2783 if (this_stat >= -50) 2607 if (this_stat >= -50)
2784 { 2608 {
2785 change_attr_value (&(dep->stats), i, -1); 2609 change_attr_value (&(dep->stats), i, -1);
2786 SET_FLAG (dep, FLAG_APPLIED); 2610 dep->set_flag (FLAG_APPLIED);
2787 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2611 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2788 op->update_stats (); 2612 op->update_stats ();
2789 lost_a_stat = 1; 2613 lost_a_stat = 1;
2790 } 2614 }
2791 } 2615 }
2792 } 2616 }
2793 } 2617 }
2618
2794 /* If no stat lost, tell the player. */ 2619 /* If no stat lost, tell the player. */
2795 if (!lost_a_stat) 2620 if (!lost_a_stat)
2796 { 2621 {
2797 /* determine_god() seems to not work sometimes... why is this? 2622 /* determine_god() seems to not work sometimes... why is this?
2798 Should I be using something else? GD */ 2623 Should I be using something else? GD */
2799 const char *god = determine_god (op); 2624 shstr_tmp god = determine_god (op);
2800 2625
2801 if (god && (strcmp (god, "none"))) 2626 if (god != shstr_none)
2802 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2627 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2803 else 2628 else
2804 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2629 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2805 } 2630 }
2806#else 2631#else
2807 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2632 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2808#endif 2633#endif
2809 2634
2810 /* Put a gravestone up where the character 'almost' died. List the 2635 /* Put a gravestone up where the character 'almost' died. List the
2811 * exp loss on the stone. 2636 * exp loss on the stone.
2812 */ 2637 */
2813 tmp = arch_to_object (archetype::find ("gravestone")); 2638 tmp = archetype::find (shstr_gravestone)->instance ();
2814 sprintf (buf, "%s's gravestone", &op->name); 2639 tmp->name = format ("%s's gravestone", &op->name);
2815 tmp->name = buf; 2640 tmp->name_pl = format ("%s's gravestones", &op->name);
2816 sprintf (buf, "%s's gravestones", &op->name); 2641 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2817 tmp->name_pl = buf; 2642 &op->name, op->contr->title, op->contr->killer_name ());
2818 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);
2819 tmp->msg = buf;
2820 tmp->x = op->x, tmp->y = op->y; 2643 tmp->x = op->x, tmp->y = op->y;
2821 insert_ob_in_map (tmp, op->map, NULL, 0); 2644 insert_ob_in_map (tmp, op->map, NULL, 0);
2822 2645
2823 /**************************************/ 2646 /**************************************/
2824 /* */ 2647 /* */
2825 /* Subtract the experience points, */ 2648 /* Subtract the experience points, */
2826 /* if we died cause of food, give us */
2827 /* food, and reset HP's... */
2828 /* */ 2649 /* */
2829 /**************************************/ 2650 /**************************************/
2830 2651
2831 /* remove any poisoning and confusion the character may be suffering. */
2832 /* restore player */
2833 at = archetype::find ("poisoning");
2834 tmp = present_arch_in_ob (at, op);
2835
2836 if (tmp)
2837 {
2838 tmp->destroy ();
2839 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2840 }
2841
2842 at = archetype::find ("confusion");
2843 tmp = present_arch_in_ob (at, op);
2844 if (tmp)
2845 {
2846 tmp->destroy ();
2847 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2848 }
2849
2850 cure_disease (op, 0, 0); /* remove any disease */
2851
2852 /*add_exp(op, (op->stats.exp * -0.20)); */ 2652 /*add_exp(op, (op->stats.exp * -0.20)); */
2853 apply_death_exp_penalty (op); 2653 apply_death_exp_penalty (op);
2854 if (op->stats.food < 100)
2855 op->stats.food = 900;
2856 op->stats.hp = op->stats.maxhp;
2857 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2858 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2859 2654
2860 /* 2655 /*
2861 * Check to see if the player has any unpaid items. If so, remove them 2656 * Check to see if the player has any unpaid items. If so, remove them
2862 * and put them back in the map. 2657 * and put them back in the map.
2863 */ 2658 */
… …
2887 if (will_kill_again) 2682 if (will_kill_again)
2888 { 2683 {
2889 object *force; 2684 object *force;
2890 int at; 2685 int at;
2891 2686
2892 force = get_archetype (FORCE_NAME); 2687 force = archetype::get (FORCE_NAME);
2893 /* 50 ticks should be enough time for the spell to abate */ 2688 /* 50 ticks should be enough time for the spell to abate */
2894 force->speed = 0.1f;
2895 force->speed_left = -5.f; 2689 force->speed_left = -5.f;
2896 SET_FLAG (force, FLAG_APPLIED); 2690 force->set_speed (0.1f);
2691 force->set_flag (FLAG_APPLIED);
2692
2897 for (at = 0; at < NROFATTACKS; at++) 2693 for (at = 0; at < NROFATTACKS; at++)
2898 if (will_kill_again & (1 << at)) 2694 if (will_kill_again & (1 << at))
2899 force->resist[at] = 100; 2695 force->resist[at] = 100;
2900 2696
2901 insert_ob_in_ob (force, op); 2697 insert_ob_in_ob (force, op);
2902 op->update_stats (); 2698 op->update_stats ();
2903
2904 } 2699 }
2905 2700
2906 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2701 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2907} 2702}
2908 2703
2909void 2704static void
2910loot_object (object *op) 2705loot_object (object *op)
2911{ /* Grab and destroy some treasure */ 2706{ /* Grab and destroy some treasure */
2912 object *tmp, *tmp2, *next; 2707 object *tmp, *tmp2, *next;
2913 2708
2914 op->close_container (); /* close open sack first */ 2709 op->close_container (); /* close open sack first */
… …
2924 tmp->x = op->x, tmp->y = op->y; 2719 tmp->x = op->x, tmp->y = op->y;
2925 2720
2926 if (tmp->type == CONTAINER) 2721 if (tmp->type == CONTAINER)
2927 loot_object (tmp); /* empty container to ground */ 2722 loot_object (tmp); /* empty container to ground */
2928 2723
2929 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2724 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2930 { 2725 {
2931 if (tmp->nrof > 1) 2726 if (tmp->nrof > 1)
2932 { 2727 {
2933 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2728 tmp->decrease (rndm (1, tmp->nrof - 1));
2934 tmp2->destroy ();
2935 insert_ob_in_map (tmp, op->map, NULL, 0); 2729 insert_ob_in_map (tmp, op->map, NULL, 0);
2936 } 2730 }
2937 else 2731 else
2938 tmp->destroy (); 2732 tmp->destroy ();
2939 } 2733 }
… …
2946 * fix_weight(): Check recursively the weight of all players, and fix 2740 * fix_weight(): Check recursively the weight of all players, and fix
2947 * what needs to be fixed. Refresh windows and fix speed if anything 2741 * what needs to be fixed. Refresh windows and fix speed if anything
2948 * was changed. 2742 * was changed.
2949 */ 2743 */
2950void 2744void
2951fix_weight (void) 2745fix_weight ()
2952{ 2746{
2953 for_all_players (pl) 2747 for_all_players (pl)
2954 { 2748 {
2955 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2749 sint32 old = pl->ob->carrying;
2956 2750
2957 if (old == sum) 2751 pl->ob->update_weight ();
2958 continue; 2752
2753 if (old != pl->ob->carrying)
2754 {
2959 pl->ob->update_stats (); 2755 pl->ob->update_stats ();
2960 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2756 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2757 }
2961 } 2758 }
2962} 2759}
2963 2760
2964void 2761void
2965fix_luck (void) 2762fix_luck ()
2966{ 2763{
2967 for_all_players (pl) 2764 for_all_players (pl)
2968 if (!pl->ob->contr->ns->state) 2765 if (!pl->ob->contr->ns->state)
2969 pl->ob->change_luck (0); 2766 pl->ob->change_luck (0);
2970} 2767}
… …
3007} 2804}
3008 2805
3009void 2806void
3010make_visible (object *op) 2807make_visible (object *op)
3011{ 2808{
3012 op->hide = 0; 2809 op->flag [FLAG_HIDDEN] = 0;
3013 op->invisible = 0; 2810 op->invisible = 0;
3014 2811
3015 if (op->type == PLAYER) 2812 if (op->type == PLAYER)
3016 { 2813 {
3017 op->contr->tmp_invis = 0; 2814 op->contr->tmp_invis = 0;
… …
3022} 2819}
3023 2820
3024int 2821int
3025is_true_undead (object *op) 2822is_true_undead (object *op)
3026{ 2823{
3027 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2824 if (op->arch->flag [FLAG_UNDEAD])
3028 return 1; 2825 return 1;
3029 2826
3030 return 0; 2827 return 0;
3031} 2828}
3032 2829
… …
3042 2839
3043 if (!ob || !ob->map) 2840 if (!ob || !ob->map)
3044 return 0; 2841 return 0;
3045 2842
3046 /* so, on normal lighted maps, its hard to hide */ 2843 /* so, on normal lighted maps, its hard to hide */
3047 level = ob->map->darkness - 2; 2844 level = ob->map->darklevel () - 2;
3048 2845
3049 /* this also picks up whether the object is glowing. 2846 /* this also picks up whether the object is glowing.
3050 * If you carry a light on a non-dark map, its not 2847 * If you carry a light on a non-dark map, its not
3051 * as bad as carrying a light on a pitch dark map */ 2848 * as bad as carrying a light on a pitch dark map */
3052 if (has_carried_lights (ob)) 2849 if (ob->has_carried_lights ())
3053 level = -(10 + (2 * ob->map->darkness)); 2850 level = -(10 + (2 * ob->map->darklevel ()));
3054 2851
3055 /* scan through all nearby squares for terrain to hide in */ 2852 /* scan through all nearby squares for terrain to hide in */
3056 for (i = 0, x = ob->x, y = ob->y; 2853 for (i = 0, x = ob->x, y = ob->y;
3057 i <= SIZEOFFREE1; 2854 i <= SIZEOFFREE1;
3058 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2855 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
… …
3079 * spot (surrounded by clear terrain in broad daylight). -b.t. 2876 * spot (surrounded by clear terrain in broad daylight). -b.t.
3080 */ 2877 */
3081void 2878void
3082do_hidden_move (object *op) 2879do_hidden_move (object *op)
3083{ 2880{
3084 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2881 int hide = 0;
3085 object *skop;
3086 2882
3087 if (!op || !op->map) 2883 if (!op || !op->map)
3088 return; 2884 return;
3089 2885
3090 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2886 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2887 int num = random_roll (0, 19, op, PREFER_LOW);
3091 2888
3092 /* its *extremely* hard to run and sneak/hide at the same time! */ 2889 /* its *extremely* hard to run and sneak/hide at the same time! */
3093 if (op->type == PLAYER && op->contr->run_on) 2890 if (op->type == PLAYER && op->contr->run_on)
3094 if (!skop || num >= skop->level) 2891 if (!skop || num >= skop->level)
3095 { 2892 {
… …
3105 num -= hide; 2902 num -= hide;
3106 2903
3107 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2904 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3108 { 2905 {
3109 make_visible (op); 2906 make_visible (op);
2907
3110 if (op->type == PLAYER) 2908 if (op->type == PLAYER)
3111 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2909 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3112 } 2910 }
3113 else if (op->type == PLAYER && skop) 2911 else if (op->type == PLAYER && skop)
3114 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2912 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3129 2927
3130 if (who->type == PLAYER) 2928 if (who->type == PLAYER)
3131 player = 1; 2929 player = 1;
3132 2930
3133 else 2931 else
3134 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2932 friendly = who->flag [FLAG_FRIENDLY];
3135 2933
3136 /* search adjacent squares */ 2934 /* search adjacent squares */
3137 for (i = 1; i < 9; i++) 2935 for (i = 1; i < 9; i++)
3138 { 2936 {
3139 x = who->x + freearr_x[i]; 2937 x = who->x + freearr_x[i];
… …
3148 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2946 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3149 continue; 2947 continue;
3150 2948
3151 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2949 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3152 { 2950 {
3153 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2951 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3154 return 1; 2952 return 1;
3155 else if (tmp->type == PLAYER) 2953 else if (tmp->type == PLAYER)
3156 { 2954 {
3157 /*don't let a hidden DM prevent you from hiding */ 2955 /*don't let a hidden DM prevent you from hiding */
3158 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2956 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
3159 return 1; 2957 return 1;
3160 } 2958 }
3161 } 2959 }
3162 } 2960 }
3163 return 0; 2961 return 0;
… …
3204 while (op) 3002 while (op)
3205 { 3003 {
3206 dx = rv.distance_x + op->arch->x; 3004 dx = rv.distance_x + op->arch->x;
3207 dy = rv.distance_y + op->arch->y; 3005 dy = rv.distance_y + op->arch->y;
3208 3006
3209 /* only the viewable area the player sees is updated by LOS 3007 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3210 * code, so we need to restrict ourselves to that range of values
3211 * for any meaningful values.
3212 */
3213 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3214 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3215 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3216 return 1; 3008 return 1;
3217 3009
3218 op = op->more; 3010 op = op->more;
3219 }
3220
3221 return 0;
3222}
3223
3224/* routine for both players and monsters. We call this when
3225 * there is a possibility for our action distrubing our hiding
3226 * place or invisiblity spell. Artefact invisiblity is not
3227 * effected by this. If we arent invisible to begin with, we
3228 * return 0.
3229 */
3230int
3231action_makes_visible (object *op)
3232{
3233 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3234 {
3235 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3236 return 0;
3237
3238 if (op->contr && op->contr->tmp_invis == 0)
3239 return 0;
3240
3241 /* If monsters, they should become visible */
3242 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3243 {
3244 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3245 return 1;
3246 }
3247 } 3011 }
3248 3012
3249 return 0; 3013 return 0;
3250} 3014}
3251 3015
… …
3266 * and the exit-coordinates sp/hp must both be > 0. 3030 * and the exit-coordinates sp/hp must both be > 0.
3267 * => The intention here is to prevent abuse of the battleground- 3031 * => The intention here is to prevent abuse of the battleground-
3268 * feature (like pickable or hidden battleground tiles). */ 3032 * feature (like pickable or hidden battleground tiles). */
3269 for (object *tmp = op->below; tmp; tmp = tmp->below) 3033 for (object *tmp = op->below; tmp; tmp = tmp->below)
3270 { 3034 {
3271 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3035 if (tmp->flag [FLAG_IS_FLOOR])
3272 { 3036 {
3273 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3037 if (tmp->flag [FLAG_NO_PICK]
3274 && tmp->type == BATTLEGROUND 3038 && tmp->type == BATTLEGROUND
3275 && tmp->name == shstr_battleground 3039 && tmp->name == shstr_battleground
3276 && EXIT_X (tmp) && EXIT_Y (tmp)) 3040 && EXIT_X (tmp) && EXIT_Y (tmp))
3277 { 3041 {
3278 /* before we assign the exit, check if this is a teambattle */ 3042 /* before we assign the exit, check if this is a teambattle */
3279 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3043 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3280 {
3281 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3044 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3045 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3282 { 3046 {
3283 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3284 {
3285 if (x && y) 3047 if (x && y)
3286 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3048 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3287 3049
3288 return 1; 3050 return 1;
3289 }
3290 } 3051 }
3291 }
3292 3052
3293 if (x && y) 3053 if (x && y)
3294 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3054 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3295 3055
3296 return 1; 3056 return 1;
… …
3434 else 3194 else
3435 j = 1; 3195 j = 1;
3436 strcat (buf, spellpathnames[i]); 3196 strcat (buf, spellpathnames[i]);
3437 } 3197 }
3438 } 3198 }
3199
3439 strcat (buf, "."); 3200 strcat (buf, ".");
3440 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3201 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3441 } 3202 }
3442 3203
3443 /* evtl. adding flags: */ 3204 /* evtl. adding flags: */
3444 if (QUERY_FLAG (item, FLAG_XRAYS)) 3205 if (item->flag [FLAG_XRAYS])
3445 SET_FLAG (skin, FLAG_XRAYS); 3206 skin->set_flag (FLAG_XRAYS);
3446 if (QUERY_FLAG (item, FLAG_STEALTH)) 3207 if (item->flag [FLAG_STEALTH])
3447 SET_FLAG (skin, FLAG_STEALTH); 3208 skin->set_flag (FLAG_STEALTH);
3448 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3209 if (item->flag [FLAG_SEE_IN_DARK])
3449 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3210 skin->set_flag (FLAG_SEE_IN_DARK);
3450 3211
3451 /* print message if there is one */ 3212 /* print message if there is one */
3452 if (item->msg != NULL) 3213 if (item->msg != NULL)
3453 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3214 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3454 } 3215 }
3455 else 3216 else
3456 { 3217 {
3457 /* generate misc. treasure */ 3218 /* generate misc. treasure */
3458 tmp = arch_to_object (tr->item); 3219 tmp = tr->item->instance ();
3459 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3220 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3460 tmp = insert_ob_in_ob (tmp, who); 3221 who->insert (tmp);
3461 if (who->type == PLAYER)
3462 esrv_send_item (who, tmp);
3463 } 3222 }
3464} 3223}
3465 3224
3466/** 3225//-GPL
3467 * Unready an object for a player. This function does nothing if the object was
3468 * not readied.
3469 */
3470void
3471player_unready_range_ob (player *pl, object *ob)
3472{
3473 if (pl->ob->current_weapon == ob)
3474 pl->ob->current_weapon = 0;
3475
3476 if (pl->combat_ob == ob)
3477 pl->combat_ob = 0;
3478
3479 if (pl->ranged_ob == ob)
3480 pl->ranged_ob = 0;
3481}
3482 3226
3483sint8 3227sint8
3484player::visibility_at (maptile *map, int x, int y) const 3228player::darkness_at (maptile *map, int x, int y) const
3485{ 3229{
3486 if (!ns) 3230 if (!ns)
3487 return 0; 3231 return LOS_BLOCKED;
3488 3232
3489 int dx, dy; 3233 int dx, dy;
3490 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3234 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3491 return 0; 3235 return LOS_BLOCKED;
3492 3236
3493 x += dx - ns->current_x + ns->mapx / 2; 3237 x += dx - ns->current_x;
3494 y += dy - ns->current_y + ns->mapy / 2; 3238 y += dy - ns->current_y;
3495 3239
3496 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3497 return 0;
3498
3499 return 100 - blocked_los [x][y]; 3240 return blocked_los (x, y);
3500} 3241}
3501 3242
3502void 3243void
3503player::infobox (const char *title, const char *msg, int color) 3244player::infobox (const char *title, const char *msg, int color)
3504{ 3245{
… …
3516{ 3257{
3517 play_sound (sound_find ("generic_failure")); 3258 play_sound (sound_find ("generic_failure"));
3518 statusmsg (msg, color); 3259 statusmsg (msg, color);
3519} 3260}
3520 3261
3262void
3263object::failmsgf (const char *format, ...)
3264{
3265 if (!contr)
3266 return;
3267
3268 va_list ap;
3269 va_start (ap, format);
3270 contr->failmsg (vformat (format, ap));
3271 va_end (ap);
3272}
3273
3274void
3275player::failmsgf (const char *format, ...)
3276{
3277 va_list ap;
3278 va_start (ap, format);
3279 failmsg (vformat (format, ap));
3280 va_end (ap);
3281}
3282

Diff Legend

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