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.222 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

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

Diff Legend

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