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.231 by root, Sat Oct 3 18:46:26 2009 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24#include <global.h> 27#include <global.h>
25#include <sproto.h> 28#include <sproto.h>
26#include <sounds.h> 29#include <sounds.h>
27#include <living.h> 30#include <living.h>
… …
32#include <algorithm> 35#include <algorithm>
33#include <functional> 36#include <functional>
34 37
35playervec players; 38playervec players;
36 39
37void
38display_motd (const object *op)
39{
40 char buf[MAX_BUF];
41 char motd[HUGE_BUF];
42 FILE *fp;
43 int comp;
44 int size;
45
46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48 return;
49
50 motd[0] = '\0';
51 size = 0;
52
53 while (fgets (buf, MAX_BUF, fp))
54 {
55 if (*buf == '#')
56 continue;
57
58 strncat (motd + size, buf, HUGE_BUF - size);
59 size += strlen (buf);
60 }
61
62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63 close_and_delete (fp, comp);
64}
65
66void
67send_rules (const object *op)
68{
69 char buf[MAX_BUF];
70 char rules[HUGE_BUF];
71 FILE *fp;
72 int comp;
73 int size;
74
75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77 return;
78
79 rules[0] = '\0';
80 size = 0;
81
82 while (fgets (buf, MAX_BUF, fp))
83 {
84 if (*buf == '#')
85 continue;
86
87 if (size + strlen (buf) >= HUGE_BUF)
88 {
89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90 break;
91 }
92
93 strncat (rules + size, buf, HUGE_BUF - size);
94 size += strlen (buf);
95 }
96
97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98 close_and_delete (fp, comp);
99}
100
101void
102send_news (const object *op)
103{
104 char buf[MAX_BUF];
105 char news[HUGE_BUF];
106 char subject[MAX_BUF];
107 FILE *fp;
108 int comp;
109 int size;
110
111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113 return;
114
115 news[0] = '\0';
116 subject[0] = '\0';
117 size = 0;
118
119 while (fgets (buf, MAX_BUF, fp))
120 {
121 if (*buf == '#')
122 continue;
123
124 if (*buf == '%')
125 { /* send one news */
126 if (size > 0)
127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
131
132 strcpy (subject, buf + 1);
133 strip_endline (subject);
134 size = 0;
135 news[0] = '\0';
136 }
137 else
138 {
139 if (size + strlen (buf) >= HUGE_BUF)
140 {
141 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142 break;
143 }
144 strncat (news + size, buf, HUGE_BUF - size);
145 size += strlen (buf);
146 }
147 }
148
149 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
150 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151 close_and_delete (fp, comp);
152}
153
154/* This loads the first map an puts the player on it. */ 40/* This loads the first map an puts the player on it. */
155static void 41static void
156set_first_map (object *op) 42set_first_map (object *op)
157{ 43{
158 op->contr->maplevel = first_map_path; 44 op->contr->maplevel = first_map_path;
… …
168 54
169 players.insert (this); 55 players.insert (this);
170 ob->remove (); 56 ob->remove ();
171 ob->map = 0; 57 ob->map = 0;
172 ob->activate_recursive (); 58 ob->activate_recursive ();
173 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 ob->clr_flag (FLAG_FRIENDLY);
174 add_friendly_object (ob); 60 add_friendly_object (ob);
175} 61}
176 62
177void 63void
178player::deactivate () 64player::deactivate ()
… …
190 ob->remove (); 76 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
192 ob->map = 0; 78 ob->map = 0;
193 party = 0; 79 party = 0;
194 80
195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197 players.erase (this); 81 players.erase (this);
198} 82}
199 83
200// connect the player with a specific client 84// connect the player with a specific client
201// also changes, rationalises, and fixes some incorrect settings 85// also changes, rationalises, and fixes some incorrect settings
… …
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->set_speed (1.0f);
300 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
301 188
302 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
303
304 ob->flag [FLAG_READY_WEAPON] = false;
305 ob->flag [FLAG_READY_SKILL] = false;
306 ob->flag [FLAG_READY_BOW] = false;
307
308 for (object *op = ob->inv; op; op = op->below)
309 if (op->flag [FLAG_APPLIED])
310 switch (op->type)
311 {
312 case SKILL:
313 ob->flag [FLAG_APPLIED] = false;
314 break;
315
316 case WAND:
317 case ROD:
318 case HORN:
319 case BOW:
320 ranged_ob = op;
321 break;
322
323 case WEAPON:
324 combat_ob = op;
325 break;
326 }
327
328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
330} 190}
331 191
332void 192void
333player::set_observe (object *op) 193player::set_observe (object *op)
334{ 194{
335 observe = op ? op : ob; 195 observe = viewpoint = op ? op : ob;
336 do_los = 1; 196 do_los = 1;
337} 197}
198
199void
200player::set_viewpoint (object *op)
201{
202 viewpoint = op ? op : (object *)observe;
203 do_los = 1;
204}
205
206//+GPL
338 207
339player::player () 208player::player ()
340{ 209{
341 /* There are some elements we want initialised to non zero value - 210 /* There are some elements we want initialised to non zero value -
342 * we deal with that below this point. 211 * we deal with that below this point.
… …
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, mflags, blocked;
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 }
… …
693 if (op->nrof > 1) 554 if (op->nrof > 1)
694 op->nrof = 1; 555 op->nrof = 1;
695 } 556 }
696 557
697 if (op->type == SPELLBOOK && op->inv) 558 if (op->type == SPELLBOOK && op->inv)
698 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 559 op->inv->clr_flag (FLAG_STARTEQUIP);
699 560
700 /* Give starting characters identified, uncursed, and undamned 561 /* Give starting characters identified, uncursed, and undamned
701 * items. Just don't identify gold or silver, or it won't be 562 * items. Just don't identify gold or silver, or it won't be
702 * merged properly. 563 * merged properly.
703 */ 564 */
704 if (need_identify (op)) 565 if (op->need_identify ())
705 { 566 {
706 SET_FLAG (op, FLAG_IDENTIFIED); 567 op->set_flag (FLAG_IDENTIFIED);
707 CLEAR_FLAG (op, FLAG_CURSED); 568 op->clr_flag (FLAG_CURSED);
708 CLEAR_FLAG (op, FLAG_DAMNED); 569 op->clr_flag (FLAG_DAMNED);
709 } 570 }
710 571
711 if (op->type == SPELL) 572 if (op->type == SPELL)
712 { 573 {
713 op->destroy (); 574 op->destroy ();
714 continue; 575 continue;
715 } 576 }
716 else if (op->type == SKILL) 577 else if (op->type == SKILL)
717 { 578 {
718 SET_FLAG (op, FLAG_CAN_USE_SKILL); 579 op->set_flag (FLAG_CAN_USE_SKILL);
719 op->stats.exp = 0; 580 op->stats.exp = 0;
720 op->level = 1; 581 op->level = 1;
721 } 582 }
722 else /* lock all 'normal items by default */ 583 else /* lock all 'normal items by default */
723 SET_FLAG (op, FLAG_INV_LOCKED); 584 op->set_flag (FLAG_INV_LOCKED);
724 } /* for loop of objects in player inv */ 585 } /* for loop of objects in player inv */
725 586
726 /* Need to set up the skill pointers */ 587 /* Need to set up the skill pointers */
727 pl->contr->link_skills (); 588 pl->contr->link_skills ();
728} 589}
… …
742 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 603 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743} 604}
744 605
745/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 606/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746static int 607static int
747roll_stat (void) 608roll_stat ()
748{ 609{
749 int a[4], i, j, k; 610 int a[4], i, j, k;
750 611
751 for (i = 0; i < 4; i++) 612 for (i = 0; i < 4; i++)
752 a[i] = (int) rndm (6) + 1; 613 a[i] = rndm (1, 6);
753 614
754 for (i = 0, j = 0, k = 7; i < 4; i++) 615 for (i = 0, j = 0, k = 7; i < 4; i++)
755 if (a[i] < k) 616 if (a[i] < k)
756 k = a[i], j = i; 617 k = a[i], j = i;
757 618
… …
849player::chargen_race_done () 710player::chargen_race_done ()
850{ 711{
851 /* this must before then initial items are given */ 712 /* this must before then initial items are given */
852 esrv_new_player (ob->contr); 713 esrv_new_player (ob->contr);
853 714
854 treasurelist *tl = treasurelist::find ("starting_wealth"); 715 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
855 if (tl) 716 if (tl)
856 create_treasure (tl, ob, 0, 0, 0); 717 create_treasure (tl, ob, 0, 0, 0);
857 718
858 INVOKE_PLAYER (BIRTH, ob->contr); 719 INVOKE_PLAYER (BIRTH, ob->contr);
859 INVOKE_PLAYER (LOGIN, ob->contr);
860 720
861 ob->contr->ns->state = ST_PLAYING; 721 ob->contr->ns->state = ST_PLAYING;
862 722
863 if (ob->msg) 723 if (ob->msg)
864 ob->msg = 0; 724 ob->msg = 0;
865 725
866 start_info (ob); 726 start_info (ob);
867 CLEAR_FLAG (ob, FLAG_WIZ); 727 ob->clr_flag (FLAG_WIZ);
868 give_initial_items (ob, ob->randomitems); 728 give_initial_items (ob, ob->randomitems);
869 esrv_send_inventory (ob, ob); 729 esrv_send_inventory (ob, ob);
870 ob->update_stats (); 730 ob->update_stats ();
871 731
872 /* This moves the player to a different start map, if there 732 /* This moves the player to a different start map, if there
… …
912 ob->stats.hp = ob->stats.maxhp; 772 ob->stats.hp = ob->stats.maxhp;
913 ob->stats.sp = ob->stats.maxsp; 773 ob->stats.sp = ob->stats.maxsp;
914 ob->stats.grace = 0; 774 ob->stats.grace = 0;
915} 775}
916 776
917void 777static void
918flee_player (object *op) 778flee_player (object *op)
919{ 779{
920 int dir, diff; 780 int dir, diff;
921 rv_vector rv; 781 rv_vector rv;
922 782
923 if (op->stats.hp < 0) 783 if (op->stats.hp < 0)
924 { 784 {
925 LOG (llevDebug, "Fleeing player is dead.\n"); 785 LOG (llevDebug, "Fleeing player is dead.\n");
926 CLEAR_FLAG (op, FLAG_SCARED); 786 op->clr_flag (FLAG_SCARED);
927 return; 787 return;
928 } 788 }
929 789
930 if (!op->enemy) 790 if (!op->enemy)
931 { 791 {
932 LOG (llevDebug, "Fleeing player had no enemy.\n"); 792 LOG (llevDebug, "Fleeing player had no enemy.\n");
933 CLEAR_FLAG (op, FLAG_SCARED); 793 op->clr_flag (FLAG_SCARED);
934 return; 794 return;
935 } 795 }
936 796
937 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 797 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
938 { 798 {
939 op->enemy = NULL; 799 op->enemy = NULL;
940 CLEAR_FLAG (op, FLAG_SCARED); 800 op->clr_flag (FLAG_SCARED);
941 return; 801 return;
942 } 802 }
943 803
944 get_rangevector (op, op->enemy, &rv, 0); 804 get_rangevector (op, op->enemy, &rv, 0);
945 805
946 dir = absdir (4 + rv.direction); 806 dir = absdir (4 + rv.direction);
947 for (diff = 0; diff < 3; diff++) 807 for (diff = 0; diff < 3; diff++)
948 { 808 {
949 int m = 1 - rndm (2) * 2; 809 int m = 1 - rndm (2) * 2;
950 810
951 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 811 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
952 return; 812 return;
953 } 813 }
954 814
955 /* Cornered, get rid of scared */ 815 /* Cornered, get rid of scared */
956 CLEAR_FLAG (op, FLAG_SCARED); 816 op->clr_flag (FLAG_SCARED);
957 op->enemy = NULL; 817 op->enemy = NULL;
958} 818}
959 819
960/* check_pick sees if there is stuff to be picked up/picks up stuff. 820/* check_pick sees if there is stuff to be picked up/picks up stuff.
961 * It returns 1 if the player should keep on moving, 0 if he should 821 * It returns 1 if the player should keep on moving, 0 if he should
… …
966{ 826{
967 object *tmp, *next; 827 object *tmp, *next;
968 int stop = 0; 828 int stop = 0;
969 int wvratio; 829 int wvratio;
970 830
971 /* if you're flying, you cna't pick up anything */ 831 /* if you're flying, you can't pick up anything */
972 if (op->move_type & MOVE_FLYING) 832 if (op->move_type & MOVE_FLYING)
973 return 1; 833 return 1;
974 834
975 next = op->below; 835 next = op->below;
976 836
977 int cnt = MAX_ITEM_PER_DROP; 837 int cnt = MAX_ITEM_PER_ACTION;
978#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 838#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979 839
980 /* loop while there are items on the floor that are not marked as 840 /* loop while there are items on the floor that are not marked as
981 * destroyed */ 841 * destroyed */
982 while (next && !next->destroyed ()) 842 while (next && !next->destroyed ())
… …
1008 if (op->contr->mode & PU_DEBUG) 868 if (op->contr->mode & PU_DEBUG)
1009 { 869 {
1010 /* some debugging code to figure out item information */ 870 /* some debugging code to figure out item information */
1011 const char *str = tmp->name 871 const char *str = tmp->name
1012 ? format ("item name: %s item type: %d weight/value: %d", 872 ? format ("item name: %s item type: %d weight/value: %d",
1013 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) 873 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1014 : format ("item name: %s item type: %d weight/value: %d", 874 : format ("item name: %s item type: %d weight/value: %d",
1015 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 875 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1016 876
1017 new_draw_info (NDI_UNIQUE, 0, op, str); 877 new_draw_info (NDI_UNIQUE, 0, op, str);
1018 } 878 }
1019 879
1020 if (op->contr->mode & PU_INHIBIT) 880 if (op->contr->mode & PU_INHIBIT)
… …
1053 * fighting */ 913 * fighting */
1054 if (op->contr->mode & PU_INHIBIT) 914 if (op->contr->mode & PU_INHIBIT)
1055 return 1; 915 return 1;
1056 916
1057 /* prevent us from turning into auto-thieves :) */ 917 /* prevent us from turning into auto-thieves :) */
1058 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 918 if (tmp->flag [FLAG_UNPAID])
1059 continue; 919 continue;
1060 920
1061 /* ignore known cursed objects */ 921 /* ignore known cursed objects */
1062 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 922 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
1063 continue; 923 continue;
1064 924
1065 /* all food and drink if desired */ 925 /* all food and drink if desired */
1066 /* question: don't pick up known-poisonous stuff? */ 926 /* question: don't pick up known-poisonous stuff? */
1067 if (op->contr->mode & PU_FOOD) 927 if (op->contr->mode & PU_FOOD)
… …
1070 CHK_PICK_PICKUP; 930 CHK_PICK_PICKUP;
1071 continue; 931 continue;
1072 } 932 }
1073 933
1074 if (op->contr->mode & PU_DRINK) 934 if (op->contr->mode & PU_DRINK)
1075 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 935 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
1076 { 936 {
1077 CHK_PICK_PICKUP; 937 CHK_PICK_PICKUP;
1078 continue; 938 continue;
1079 } 939 }
1080 940
… …
1107 continue; 967 continue;
1108 } 968 }
1109 969
1110 /* wands/staves/rods/horns */ 970 /* wands/staves/rods/horns */
1111 if (op->contr->mode & PU_MAGIC_DEVICE) 971 if (op->contr->mode & PU_MAGIC_DEVICE)
1112 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 972 if (tmp->type == WAND
973 || tmp->type == ROD
974 || tmp->type == HORN
975 || tmp->type == POWER_CRYSTAL)
1113 { 976 {
1114 CHK_PICK_PICKUP; 977 CHK_PICK_PICKUP;
1115 continue; 978 continue;
1116 } 979 }
1117 980
1118 /* pick up all magical items */ 981 /* pick up all magical items */
1119 if (op->contr->mode & PU_MAGICAL) 982 if (op->contr->mode & PU_MAGICAL)
1120 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 983 if (tmp->flag [FLAG_KNOWN_MAGICAL]
984 && !tmp->flag [FLAG_KNOWN_CURSED])
1121 { 985 {
1122 CHK_PICK_PICKUP; 986 CHK_PICK_PICKUP;
1123 continue; 987 continue;
1124 } 988 }
1125 989
… …
1132 } 996 }
1133 } 997 }
1134 998
1135 /* rings & amulets - talismans seems to be typed AMULET */ 999 /* rings & amulets - talismans seems to be typed AMULET */
1136 if (op->contr->mode & PU_JEWELS) 1000 if (op->contr->mode & PU_JEWELS)
1137 if (tmp->type == RING || tmp->type == AMULET) 1001 if (tmp->type == RING
1002 || tmp->type == AMULET
1003 || tmp->type == GIRDLE
1004 || tmp->type == SKILL_TOOL)
1138 { 1005 {
1139 CHK_PICK_PICKUP; 1006 CHK_PICK_PICKUP;
1140 continue; 1007 continue;
1141 } 1008 }
1142 1009
… …
1191 CHK_PICK_PICKUP; 1058 CHK_PICK_PICKUP;
1192 continue; 1059 continue;
1193 } 1060 }
1194 1061
1195 if (op->contr->mode & PU_GLOVES) 1062 if (op->contr->mode & PU_GLOVES)
1196 if (tmp->type == GLOVES) 1063 if (tmp->type == GLOVES || tmp->type == BRACERS)
1197 { 1064 {
1198 CHK_PICK_PICKUP; 1065 CHK_PICK_PICKUP;
1199 continue; 1066 continue;
1200 } 1067 }
1201 1068
… …
1206 continue; 1073 continue;
1207 } 1074 }
1208 1075
1209 /* hoping to catch throwing daggers here */ 1076 /* hoping to catch throwing daggers here */
1210 if (op->contr->mode & PU_MISSILEWEAPON) 1077 if (op->contr->mode & PU_MISSILEWEAPON)
1211 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1078 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1212 { 1079 {
1213 CHK_PICK_PICKUP; 1080 CHK_PICK_PICKUP;
1214 continue; 1081 continue;
1215 } 1082 }
1216 1083
… …
1251 fprintf (stderr, "%s", tmp->name); 1118 fprintf (stderr, "%s", tmp->name);
1252 } 1119 }
1253 else 1120 else
1254 fprintf (stderr, "%s", tmp->arch->archname); 1121 fprintf (stderr, "%s", tmp->arch->archname);
1255 fprintf (stderr, ",%d] = ", tmp->type); 1122 fprintf (stderr, ",%d] = ", tmp->type);
1256 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1123 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1257#endif 1124#endif
1258 CHK_PICK_PICKUP; 1125 CHK_PICK_PICKUP;
1259 continue; 1126 continue;
1260 } 1127 }
1261 } /* the new pickup model */ 1128 } /* the new pickup model */
1262 } 1129 }
1263 1130
1264 return !stop; 1131 return !stop;
1265} 1132}
1266 1133
1134/* routine for both players and monsters. We call this when
1135 * there is a possibility for our action distrubing our hiding
1136 * place or invisiblity spell. Artefact invisiblity causes
1137 * "noise" instead. If we arent invisible to begin with, we
1138 * return 0.
1139 */
1140static int
1141action_makes_visible (object *op)
1142{
1143 if (op->invisible && op->flag [FLAG_ALIVE])
1144 {
1145 if (op->flag [FLAG_MAKE_INVIS])
1146 {
1147 // artefact invisibility is permanent, but we still make noise
1148 // this is important for game-balance.
1149 if (op->contr)
1150 op->make_noise ();
1151
1152 return 0;
1153 }
1154
1155 if (op->contr && op->contr->tmp_invis == 0)
1156 return 0;
1157
1158 /* If monsters, they should become visible */
1159 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1160 {
1161 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1162 return 1;
1163 }
1164 }
1165
1166 return 0;
1167}
1168
1267/* 1169/*
1268 * Find an arrow in the inventory and after that 1170 * Find an arrow in the inventory and after that
1269 * in the right type container (quiver). Pointer to the 1171 * in the right type container (quiver). Pointer to the
1270 * found object is returned. 1172 * found object is returned.
1271 */ 1173 */
1272object * 1174static object *
1273find_arrow (object *op, const char *type) 1175find_arrow (object *op, const char *type)
1274{ 1176{
1275 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1177 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1276 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1178 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1277 return splay (tmp); 1179 return splay (tmp);
1278 1180
1279 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1181 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1280 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1182 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1281 if (object *arrow = find_arrow (tmp, type)) 1183 if (object *arrow = find_arrow (tmp, type))
1282 { 1184 {
1283 splay (tmp); 1185 splay (tmp);
1284 return arrow; 1186 return arrow;
1285 } 1187 }
… …
1291 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1193 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1292 * against the target. A full test is not performed, simply a basic test 1194 * against the target. A full test is not performed, simply a basic test
1293 * of resistances. The archer is making a quick guess at what he sees down 1195 * of resistances. The archer is making a quick guess at what he sees down
1294 * the hall. Failing that it does it's best to pick the highest plus arrow. 1196 * the hall. Failing that it does it's best to pick the highest plus arrow.
1295 */ 1197 */
1296object * 1198static object *
1297find_better_arrow (object *op, object *target, shstr_cmp type, int *better) 1199find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1298{ 1200{
1299 object *tmp = NULL, *arrow, *ntmp; 1201 object *tmp = NULL, *arrow, *ntmp;
1300 int attacknum, attacktype, betterby = 0, i; 1202 int attacknum, attacktype, betterby = 0, i;
1301 1203
1302 if (!type) 1204 if (!type)
1303 return NULL; 1205 return NULL;
1304 1206
1305 for (arrow = op->inv; arrow; arrow = arrow->below) 1207 for (arrow = op->inv; arrow; arrow = arrow->below)
1306 { 1208 {
1307 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1209 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1308 { 1210 {
1309 i = 0; 1211 i = 0;
1310 ntmp = find_better_arrow (arrow, target, type, &i); 1212 ntmp = find_better_arrow (arrow, target, type, &i);
1311 1213
1312 if (i > betterby) 1214 if (i > betterby)
… …
1370 * find_better_arrow to find a decent arrow to use. 1272 * find_better_arrow to find a decent arrow to use.
1371 * op = the shooter 1273 * op = the shooter
1372 * type = bow->race 1274 * type = bow->race
1373 * dir = fire direction 1275 * dir = fire direction
1374 */ 1276 */
1375object * 1277static object *
1376pick_arrow_target (object *op, shstr_cmp type, int dir) 1278pick_arrow_target (object *op, shstr_cmp type, int dir)
1377{ 1279{
1378 object *tmp = NULL; 1280 object *tmp = NULL;
1379 maptile *m; 1281 maptile *m;
1380 int i, mflags, found, number; 1282 int i, mflags, found, number;
… …
1413 break; 1315 break;
1414 } 1316 }
1415 1317
1416 if (mflags & P_IS_ALIVE) 1318 if (mflags & P_IS_ALIVE)
1417 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1319 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1418 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1320 if (tmp->flag [FLAG_ALIVE])
1419 break; 1321 break;
1420 } 1322 }
1421 1323
1422 if (!tmp) 1324 if (!tmp)
1423 return find_arrow (op, type); 1325 return find_arrow (op, type);
… …
1484 { 1386 {
1485 if (op->type == PLAYER) 1387 if (op->type == PLAYER)
1486 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1388 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1487 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1389 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1488 else 1390 else
1489 CLEAR_FLAG (op, FLAG_READY_BOW); 1391 op->clr_flag (FLAG_READY_BOW);
1490 1392
1491 return 0; 1393 return 0;
1492 } 1394 }
1493 } 1395 }
1494 1396
… …
1543#endif 1445#endif
1544 1446
1545 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1546 1448
1547 /* update the speed */ 1449 /* update the speed */
1548 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1549 + bow->stats.dam / 7.f;
1550 1450
1551 arrow->set_speed (max (arrow->speed, 2.f));
1552 arrow->speed_left = 0; 1451 arrow->speed_left = 0;
1452 arrow->set_speed (max (2.f,
1453 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1454 + bow->stats.dam / 7.f
1455 ));
1553 1456
1554 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1457 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1555 1458
1556 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1557 { 1460 {
… …
1595 * but monsters can't. Putting that code here 1498 * but monsters can't. Putting that code here
1596 * makes the fire_bow code much cleaner. 1499 * makes the fire_bow code much cleaner.
1597 * this function should only be called if 'op' is a player, 1500 * this function should only be called if 'op' is a player,
1598 * hence the function name. 1501 * hence the function name.
1599 */ 1502 */
1600int 1503static int
1601player_fire_bow (object *op, int dir) 1504player_fire_bow (object *op, int dir)
1602{ 1505{
1603 int ret; 1506 int ret;
1604 1507
1605 if (op->contr->bowtype == bow_bestarrow) 1508 if (op->contr->bowtype == bow_bestarrow)
… …
1633} 1536}
1634 1537
1635/* Fires a misc (wand/rod/horn) object in 'dir'. 1538/* Fires a misc (wand/rod/horn) object in 'dir'.
1636 * Broken apart from 'fire' to keep it more readable. 1539 * Broken apart from 'fire' to keep it more readable.
1637 */ 1540 */
1638void 1541static void
1639fire_misc_object (object *op, int dir) 1542fire_misc_object (object *op, int dir)
1640{ 1543{
1641 object *item = op->contr->ranged_ob; 1544 object *item = op->contr->ranged_ob;
1642 1545
1643 if (!item) 1546 if (!item)
… …
1650 { 1553 {
1651 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1554 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1652 return; 1555 return;
1653 } 1556 }
1654 1557
1655 if (!op->change_weapon (item)) 1558 if (!op->apply (item))
1656 return; 1559 return;
1657 1560
1658 if (item->type == WAND) 1561 if (item->type == WAND)
1659 { 1562 {
1660 if (item->stats.food <= 0) 1563 if (item->stats.food <= 0)
… …
1665 return; 1568 return;
1666 } 1569 }
1667 } 1570 }
1668 else if (item->type == ROD || item->type == HORN) 1571 else if (item->type == ROD || item->type == HORN)
1669 { 1572 {
1670 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1573 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1671 1574
1672 // using the maximum of the rods charge allows at least one spell cast 1575 // using the maximum of the rods charge allows at least one spell cast
1673 // for a rod or horn, this fixes some broken rods. 1576 // for a rod or horn, this fixes some broken rods.
1674 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1577 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1675 { 1578 {
1676 op->contr->play_sound (sound_find ("wand_poof")); 1579 op->contr->play_sound (sound_find ("wand_poof"));
1677 1580
1678 if (item->type == ROD) 1581 if (item->type == ROD)
1679 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1582 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1694 { 1597 {
1695 object *tmp; 1598 object *tmp;
1696 1599
1697 if (item->arch) 1600 if (item->arch)
1698 { 1601 {
1699 CLEAR_FLAG (item, FLAG_ANIMATE); 1602 item->clr_flag (FLAG_ANIMATE);
1700 item->face = item->arch->face; 1603 item->face = item->arch->face;
1701 item->set_speed (0); 1604 item->set_speed (0);
1702 } 1605 }
1703 1606
1704 if (object *pl = item->visible_to ()) 1607 if (object *pl = item->visible_to ())
… …
1711} 1614}
1712 1615
1713/* Received a fire command for the player - go and do it. 1616/* Received a fire command for the player - go and do it.
1714 */ 1617 */
1715bool 1618bool
1716fire (object *op, int dir) 1619fire (object *who, int dir)
1717{ 1620{
1718 int spellcost = 0; 1621 int spellcost = 0;
1719 1622
1720 player *pl = op->contr; 1623 player *pl = who->contr;
1721 1624
1722 if (pl->golem) 1625 if (pl->golem)
1723 { 1626 {
1724 control_golem (op->contr->golem, dir); 1627 control_golem (who->contr->golem, dir);
1725 return false; 1628 return false;
1726 } 1629 }
1727 1630
1728 object *ob = pl->ranged_ob; 1631 object *ob = pl->ranged_ob;
1729 1632
1730 if (!ob) 1633 if (!ob)
1731 return false; 1634 return false;
1732 1635
1733 if (op->speed_left > 0.f) 1636 if (who->speed_left > 0.f)
1734 --op->speed_left; 1637 --who->speed_left;
1735 else 1638 else
1736 return false; 1639 return false;
1737 1640
1738 if (!op->change_weapon (ob)) 1641 if (!who->apply (ob))
1739 return false; 1642 return false;
1740 1643
1741 /* check for loss of invisiblity/hide */ 1644 /* check for loss of invisiblity/hide */
1742 if (action_makes_visible (op)) 1645 if (action_makes_visible (who))
1743 make_visible (op); 1646 make_visible (who);
1744 1647
1745 switch (ob->type) 1648 switch (ob->type)
1746 { 1649 {
1747 case BOW: 1650 case BOW:
1748 player_fire_bow (op, dir); 1651 player_fire_bow (who, dir);
1749 break; 1652 break;
1750 1653
1751 case SPELL: 1654 case SPELL:
1752 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1655 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1753 break; 1656 break;
1754 1657
1755 case BUILDER: 1658 case BUILDER:
1756 apply_map_builder (op, dir); 1659 apply_map_builder (who, dir);
1757 break; 1660 break;
1758 1661
1759 case SKILL: 1662 case SKILL:
1760 do_skill (op, op, ob, dir, 0); 1663 do_skill (who, who, ob, dir, 0);
1761 break; 1664 break;
1762 1665
1666 case RANGED:
1667 do_skill (who, ob, who->chosen_skill, dir, 0);
1668 break;
1669
1763 default: 1670 default:
1764 fire_misc_object (op, dir); 1671 fire_misc_object (who, dir);
1765 break; 1672 break;
1766 } 1673 }
1767 1674
1768 return true; 1675 return true;
1769} 1676}
1770 1677
1771/* find_key 1678static object *
1772 * We try to find a key for the door as passed. If we find a key
1773 * and successfully use it, we return the key, otherwise NULL
1774 * This function merges both normal and locked door, since the logic
1775 * for both is the same - just the specific key is different.
1776 * pl is the player,
1777 * inv is the objects inventory to searched
1778 * door is the door we are trying to match against.
1779 * This function can be called recursively to search containers.
1780 */
1781object *
1782find_key (object *pl, object *container, object *door) 1679find_key_ (object *pl, object *container, object *door)
1783{ 1680{
1784 object *tmp, *key; 1681 object *tmp, *key;
1785 1682
1786 /* Should not happen, but sanity checking is never bad */ 1683 /* Should not happen, but sanity checking is never bad */
1787 if (!container->inv) 1684 if (!container->inv)
… …
1790 /* First, lets try to find a key in the top level inventory */ 1687 /* First, lets try to find a key in the top level inventory */
1791 for (tmp = container->inv; tmp; tmp = tmp->below) 1688 for (tmp = container->inv; tmp; tmp = tmp->below)
1792 { 1689 {
1793 if (door->type == DOOR && tmp->type == KEY) 1690 if (door->type == DOOR && tmp->type == KEY)
1794 break; 1691 break;
1692
1795 /* For sanity, we should really check door type, but other stuff 1693 /* For sanity, we should really check door type, but other stuff
1796 * (like containers) can be locked with special keys 1694 * (like containers) can be locked with special keys
1797 */ 1695 */
1798 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1696 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1799 break; 1697 break;
… …
1805 * a key, return 1703 * a key, return
1806 */ 1704 */
1807 if (!tmp) 1705 if (!tmp)
1808 { 1706 {
1809 for (tmp = container->inv; tmp; tmp = tmp->below) 1707 for (tmp = container->inv; tmp; tmp = tmp->below)
1810 {
1811 /* No reason to search empty containers */ 1708 /* No reason to search empty containers */
1812 if (tmp->type == CONTAINER && tmp->inv) 1709 if (tmp->type == CONTAINER && tmp->inv)
1813 {
1814 if ((key = find_key (pl, tmp, door))) 1710 if ((key = find_key_ (pl, tmp, door)))
1815 return key; 1711 return key;
1816 }
1817 }
1818 1712
1819 if (!tmp) 1713 if (!tmp)
1820 return NULL; 1714 return 0;
1821 } 1715 }
1822 1716
1823 /* We get down here if we have found a key. Now if its in a container, 1717 /* We get down here if we have found a key. Now if its in a container,
1824 * see if we actually want to use it 1718 * see if we actually want to use it
1825 */ 1719 */
1826 if (pl != container) 1720 if (pl != container)
1827 { 1721 {
1828 /* Only let players use keys in containers */ 1722 /* Only let players use keys in containers */
1829 if (!pl->contr) 1723 if (!pl->contr)
1830 return NULL; 1724 return 0;
1725
1831 /* cases where this fails: 1726 /* cases where this fails:
1832 * If we only search the player inventory, return now since we 1727 * If we only search the player inventory, return now since we
1833 * are not in the players inventory. 1728 * are not in the players inventory.
1834 * If the container is not active, return now since only active 1729 * If the container is not active, return now since only active
1835 * containers can be used. 1730 * containers can be used.
… …
1839 * inv must have been an container and must have been active. 1734 * inv must have been an container and must have been active.
1840 * 1735 *
1841 * Change the color so that the message doesn't disappear with 1736 * Change the color so that the message doesn't disappear with
1842 * all the others. 1737 * all the others.
1843 */ 1738 */
1844 if (pl->contr->usekeys == key_inventory || 1739 if (pl->contr->usekeys == key_inventory
1845 !QUERY_FLAG (container, FLAG_APPLIED) || 1740 || !container->flag [FLAG_APPLIED]
1846 (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1741 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1847 { 1742 {
1848 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1743 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1849 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1744 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1850 return NULL; 1745 return NULL;
1851 } 1746 }
1852 } 1747 }
1853 1748
1854 return tmp; 1749 return tmp;
1750}
1751
1752/* find_key
1753 * We try to find a key for the door as passed. If we find a key
1754 * and successfully use it, we return the key, otherwise NULL
1755 * This function merges both normal and locked door, since the logic
1756 * for both is the same - just the specific key is different.
1757 * pl is the player,
1758 * inv is the objects inventory to searched
1759 * door is the door we are trying to match against.
1760 * This function can be called recursively to search containers.
1761 */
1762object *
1763find_key (object *pl, object *container, object *door)
1764{
1765 if (door->slaying && is_match_expr (door->slaying))
1766 {
1767 // for match expressions, we try to find the key by applying the match
1768 // to the op itself, which is supposed to find the "key", instead
1769 // of searching through containers ourselves.
1770
1771 return match_one (door->slaying, container, door, pl, pl);
1772 }
1773 else
1774 return find_key_ (pl, container, door);
1855} 1775}
1856 1776
1857/* moved door processing out of move_player_attack. 1777/* moved door processing out of move_player_attack.
1858 * returns 1 if player has opened the door with a key 1778 * returns 1 if player has opened the door with a key
1859 * such that the caller should not do anything more, 1779 * such that the caller should not do anything more,
… …
1909 * going to try and move (not fire weapons). 1829 * going to try and move (not fire weapons).
1910 */ 1830 */
1911bool 1831bool
1912move_player_attack (object *op, int dir) 1832move_player_attack (object *op, int dir)
1913{ 1833{
1914 int on_battleground; 1834 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1835 {
1836 --op->speed_left;
1837 return true;
1838 }
1915 1839
1916 sint16 nx = freearr_x[dir] + op->x; 1840 sint16 nx = freearr_x[dir] + op->x;
1917 sint16 ny = freearr_y[dir] + op->y; 1841 sint16 ny = freearr_y[dir] + op->y;
1918 1842
1919 on_battleground = op_on_battleground (op, 0, 0);
1920
1921 if (out_of_map (op->map, nx, ny)) 1843 if (out_of_map (op->map, nx, ny))
1922 return false; 1844 return false;
1923
1924 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1925 {
1926 --op->speed_left;
1927 return true;
1928 }
1929 1845
1930 /* If braced, or can't move to the square, and it is not out of the 1846 /* If braced, or can't move to the square, and it is not out of the
1931 * map, attack it. Note order of if statement is important - don't 1847 * map, attack it. Note order of if statement is important - don't
1932 * want to be calling move_ob if braced, because move_ob will move the 1848 * want to be calling move_ob if braced, because move_ob will move the
1933 * player. This is a pretty nasty hack, because if we could 1849 * player. This is a pretty nasty hack, because if we could
… …
1980 */ 1896 */
1981 if (op->type == PLAYER 1897 if (op->type == PLAYER
1982 && ((mon->owner && mon->owner->contr 1898 && ((mon->owner && mon->owner->contr
1983 && same_party (mon->owner->contr->party, op->contr->party)) 1899 && same_party (mon->owner->contr->party, op->contr->party))
1984 || mon->owner == op) 1900 || mon->owner == op)
1985 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1901 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1986 { 1902 {
1987 /* If we're braced, we don't want to switch places with it */ 1903 /* If we're braced, we don't want to switch places with it */
1988 if (op->contr->braced) 1904 if (op->contr->braced)
1989 return false; 1905 return false;
1990 1906
… …
2001 return true; 1917 return true;
2002 } 1918 }
2003 else 1919 else
2004 return false; 1920 return false;
2005 } 1921 }
1922
1923 bool on_battleground = op_on_battleground (op, 0, 0);
2006 1924
2007 /* in certain circumstances, you shouldn't attack friendly 1925 /* in certain circumstances, you shouldn't attack friendly
2008 * creatures. Note that if you are braced, you can't push 1926 * creatures. Note that if you are braced, you can't push
2009 * someone, but put it inside this loop so that you won't 1927 * someone, but put it inside this loop so that you won't
2010 * attack them either. 1928 * attack them either.
2011 */ 1929 */
2012 if ((mon->type == PLAYER || mon->enemy != op) 1930 if ((mon->type == PLAYER || mon->enemy != op)
2013 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1931 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2014 && ((op->contr->peaceful 1932 && ((op->contr->peaceful
2015 || (mon->type == PLAYER && mon->contr->peaceful)) 1933 || (mon->type == PLAYER && mon->contr->peaceful))
2016 && !on_battleground)) 1934 && !on_battleground))
2017 { 1935 {
2018 if (op->speed_left > 0.f) 1936 if (op->speed_left > 0.f)
… …
2034 } 1952 }
2035 } 1953 }
2036 /* If the object is a boulder or other rollable object, then 1954 /* If the object is a boulder or other rollable object, then
2037 * roll it if not braced. You can't roll it if you are braced. 1955 * roll it if not braced. You can't roll it if you are braced.
2038 */ 1956 */
2039 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1957 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2040 { 1958 {
2041 if (op->speed_left > 0.f) 1959 if (op->speed_left > 0.f)
2042 { 1960 {
2043 --op->speed_left; 1961 --op->speed_left;
2044 1962
… …
2053 * Way it works is like this: First, it must have some hit points 1971 * Way it works is like this: First, it must have some hit points
2054 * and be living. Then, it must be one of the following: 1972 * and be living. Then, it must be one of the following:
2055 * 1) Not a player, 2) A player, but of a different party. Note 1973 * 1) Not a player, 2) A player, but of a different party. Note
2056 * that party_number -1 is no party, so attacks can still happen. 1974 * that party_number -1 is no party, so attacks can still happen.
2057 */ 1975 */
2058 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1976 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2059 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1977 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2060 { 1978 {
2061 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 1979 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2062 { 1980 {
2063 --op->contr->weapon_sp_left; 1981 --op->contr->weapon_sp_left;
… …
2075} 1993}
2076 1994
2077bool 1995bool
2078move_player (object *op, int dir) 1996move_player (object *op, int dir)
2079{ 1997{
2080 int pick;
2081
2082 if (!op->map || op->map->in_memory != MAP_ACTIVE) 1998 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2083 return 0; 1999 return 0;
2084 2000
2085 /* Sanity check: make sure dir is valid */ 2001 /* Sanity check: make sure dir is valid */
2086 if ((dir < 0) || (dir >= 9)) 2002 if (dir < 0 || dir > 8)
2087 { 2003 {
2088 LOG (llevError, "move_player: invalid direction %d\n", dir); 2004 LOG (llevError, "move_player: invalid direction %d\n", dir);
2089 return 0; 2005 return 0;
2090 } 2006 }
2091 2007
2092 /* peterm: added following line */ 2008 /* peterm: added following line */
2093 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2009 if (op->flag [FLAG_CONFUSED] && dir)
2094 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2010 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2095 2011
2096 op->facing = dir; 2012 op->facing = dir;
2097 2013
2098 if (op->flag [FLAG_HIDDEN]) 2014 if (op->flag [FLAG_HIDDEN])
2099 do_hidden_move (op); 2015 do_hidden_move (op);
2100 2016
2101 bool retval; 2017 bool retval;
2018 int pick = 0;
2102 2019
2103 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2020 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2104 retval = RESULT_INT (0); 2021 retval = RESULT_INT (0);
2105 else if (op->contr->fire_on) 2022 else if (op->contr->fire_on)
2106 retval = fire (op, dir); 2023 retval = fire (op, dir);
… …
2137 * players. 2054 * players.
2138 */ 2055 */
2139bool 2056bool
2140handle_newcs_player (object *op) 2057handle_newcs_player (object *op)
2141{ 2058{
2142 if (QUERY_FLAG (op, FLAG_SCARED)) 2059 if (op->flag [FLAG_SCARED])
2143 { 2060 {
2144 if (op->speed_left > 0.f) 2061 if (op->speed_left > 0.f)
2145 { 2062 {
2146 --op->speed_left; 2063 --op->speed_left;
2147 flee_player (op); 2064 flee_player (op);
… …
2163 return move_player (op, op->direction); 2080 return move_player (op, op->direction);
2164 2081
2165 return false; 2082 return false;
2166} 2083}
2167 2084
2168int 2085static int
2169save_life (object *op) 2086save_life (object *op)
2170{ 2087{
2171 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2088 if (!op->flag [FLAG_LIFESAVE])
2172 return 0; 2089 return 0;
2173 2090
2174 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2091 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2175 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2092 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2176 { 2093 {
2177 op->play_sound (sound_find ("ob_evaporate")); 2094 op->play_sound (sound_find ("ob_evaporate"));
2178 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2095 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2179 2096
2180 tmp->destroy (); 2097 tmp->destroy ();
2181 CLEAR_FLAG (op, FLAG_LIFESAVE); 2098 op->clr_flag (FLAG_LIFESAVE);
2182 2099
2183 if (op->stats.hp < 0) 2100 if (op->stats.hp < 0)
2184 op->stats.hp = op->stats.maxhp; 2101 op->stats.hp = op->stats.maxhp;
2185 2102
2186 if (op->stats.food < 0) 2103 if (op->stats.food < 0)
2187 op->stats.food = 999; 2104 op->stats.food = MAX_FOOD;
2188 2105
2189 op->update_stats (); 2106 op->update_stats ();
2190 return 1; 2107 return 1;
2191 } 2108 }
2192 2109
2193 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2110 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2194 CLEAR_FLAG (op, FLAG_LIFESAVE); 2111 op->clr_flag (FLAG_LIFESAVE);
2195 enter_player_savebed (op); /* bring him home. */ 2112 enter_player_savebed (op); /* bring him home. */
2196 return 0; 2113 return 0;
2197} 2114}
2198 2115
2199/* This goes throws the inventory and removes unpaid objects, and puts them 2116/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2206{ 2123{
2207 while (op) 2124 while (op)
2208 { 2125 {
2209 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2126 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2210 2127
2211 if (QUERY_FLAG (op, FLAG_UNPAID)) 2128 if (op->flag [FLAG_UNPAID])
2212 op->insert_at (env); 2129 op->insert_at (env);
2213 else if (op->inv) 2130 else if (op->inv)
2214 drop_unpaid_items (op->inv, env); 2131 drop_unpaid_items (op->inv, env);
2215 2132
2216 op = next; 2133 op = next;
… …
2222{ 2139{
2223 if (!flag [FLAG_REMOVED]) 2140 if (!flag [FLAG_REMOVED])
2224 ::drop_unpaid_items (inv, this); 2141 ::drop_unpaid_items (inv, this);
2225} 2142}
2226 2143
2227/*
2228 * Returns pointer a static string containing gravestone text
2229 * Moved from apply.c to player.c - player.c is what
2230 * actually uses this function. player.c may not be quite the
2231 * best, a misc file for object actions is probably better,
2232 * but there isn't one in the server directory.
2233 */
2234const char *
2235gravestone_text (object *op)
2236{
2237 static dynbuf_text buf;
2238
2239 buf << "---- R.I.P. ----\n\n"
2240 << op->name;
2241
2242 if (op->type == PLAYER)
2243 buf << " the " << op->contr->title;
2244
2245 buf << "\n\n";
2246
2247 buf << "who was level ";
2248 buf << (sint32)op->level << "\n\n" // OO breakdown
2249 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2250
2251 if (op->type == PLAYER)
2252 buf << "by " << op->contr->killer_name () << ".\n\n";
2253
2254 {
2255 static char buf2[128];
2256 time_t now = time (NULL);
2257 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2258 buf << buf2;
2259 }
2260
2261 return buf;
2262}
2263
2264void 2144void
2265do_some_living (object *op) 2145do_some_living (object *op)
2266{ 2146{
2267 int last_food = op->stats.food; 2147 int last_food = op->stats.food;
2268 int gen_hp, gen_sp, gen_grace; 2148 int gen_hp, gen_sp, gen_grace;
2269 int over_hp, over_sp, over_grace;
2270 int i; 2149 int i;
2271 int rate_hp = 1200; 2150 int rate_hp = 1200;
2272 int rate_sp = 2500; 2151 int rate_sp = 2500;
2273 int rate_grace = 2000; 2152 int rate_grace = 2000;
2274 const int max_hp = 1; 2153 const int max_hp = 1;
… …
2283 * alternate it here for it to work correctly. 2162 * alternate it here for it to work correctly.
2284 */ 2163 */
2285 if (pticks & 2) 2164 if (pticks & 2)
2286 op->invisible--; 2165 op->invisible--;
2287 } 2166 }
2288 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2167 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2289 { 2168 {
2290 if (!op->invisible--) 2169 if (!op->invisible--)
2291 { 2170 {
2292 make_visible (op); 2171 make_visible (op);
2293 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2172 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2327 if (--op->last_grace < 0) 2206 if (--op->last_grace < 0)
2328 { 2207 {
2329 if (op->stats.grace < op->stats.maxgrace / 2) 2208 if (op->stats.grace < op->stats.maxgrace / 2)
2330 op->stats.grace++; /* no penalty in food for regaining grace */ 2209 op->stats.grace++; /* no penalty in food for regaining grace */
2331 2210
2211 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2212
2332 if (max_grace > 1) 2213 if (max_grace > 1)
2333 { 2214 {
2334 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2215 int over_grace = temp / rate_grace;
2216
2335 if (over_grace > 0) 2217 if (over_grace > 0)
2336 { 2218 {
2337 op->stats.sp += over_grace 2219 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2338 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2339 op->last_grace = 0; 2220 op->last_grace = 0;
2340 } 2221 }
2341 else 2222 else
2342 { 2223 op->last_grace = rate_grace / temp;
2343 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2344 }
2345 } 2224 }
2346 else 2225 else
2347 { 2226 op->last_grace = rate_grace / temp;
2348 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2227
2349 }
2350 /* wearing stuff doesn't detract from grace generation. */ 2228 /* wearing stuff doesn't detract from grace generation. */
2351 } 2229 }
2352 2230
2353 if (op->stats.food > 0) 2231 if (op->stats.food > 0)
2354 { 2232 {
… …
2360 if (op->stats.sp < op->stats.maxsp) 2238 if (op->stats.sp < op->stats.maxsp)
2361 { 2239 {
2362 op->stats.sp++; 2240 op->stats.sp++;
2363 2241
2364 /* dms do not consume food */ 2242 /* dms do not consume food */
2365 if (!QUERY_FLAG (op, FLAG_WIZ)) 2243 if (!op->flag [FLAG_WIZ])
2366 { 2244 {
2367 op->stats.food--; 2245 op->stats.food--;
2368 2246
2369 if (op->contr->digestion < 0) 2247 if (op->contr->digestion < 0)
2370 op->stats.food += op->contr->digestion; 2248 op->stats.food += op->contr->digestion;
… …
2373 } 2251 }
2374 } 2252 }
2375 2253
2376 if (max_sp > 1) 2254 if (max_sp > 1)
2377 { 2255 {
2378 over_sp = (gen_sp + 10) / rate_sp; 2256 int over_sp = (gen_sp + 10) / rate_sp;
2379 if (over_sp > 0) 2257 if (over_sp > 0)
2380 { 2258 {
2381 if (op->stats.sp < op->stats.maxsp) 2259 if (op->stats.sp < op->stats.maxsp)
2382 { 2260 {
2383 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2261 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2404 if (op->stats.hp < op->stats.maxhp) 2282 if (op->stats.hp < op->stats.maxhp)
2405 { 2283 {
2406 op->stats.hp++; 2284 op->stats.hp++;
2407 2285
2408 /* dms do not consume food */ 2286 /* dms do not consume food */
2409 if (!QUERY_FLAG (op, FLAG_WIZ)) 2287 if (!op->flag [FLAG_WIZ])
2410 { 2288 {
2411 op->stats.food--; 2289 op->stats.food--;
2412 2290
2413 if (op->contr->digestion < 0) 2291 if (op->contr->digestion < 0)
2414 op->stats.food += op->contr->digestion; 2292 op->stats.food += op->contr->digestion;
2415 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2293 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2416 op->stats.food = last_food; 2294 op->stats.food = last_food;
2417 } 2295 }
2418 } 2296 }
2419 2297
2298 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2299
2420 if (max_hp > 1) 2300 if (max_hp > 1)
2421 { 2301 {
2422 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2302 int over_hp = temp / rate_hp;
2423 2303
2424 if (over_hp > 0) 2304 if (over_hp > 0)
2425 { 2305 {
2426 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2306 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2427 op->last_heal = 0; 2307 op->last_heal = 0;
2428 } 2308 }
2429 else 2309 else
2430 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2310 op->last_heal = rate_hp / temp;
2431 } 2311 }
2432 else 2312 else
2433 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2313 op->last_heal = rate_hp / temp;
2434 } 2314 }
2435 } 2315 }
2436 2316
2437 /* Digestion */ 2317 /* Digestion */
2438 if (--op->last_eat < 0) 2318 if (--op->last_eat < 0)
… …
2441 penalty = max (0, -op->contr->digestion); 2321 penalty = max (0, -op->contr->digestion);
2442 2322
2443 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2323 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2444 2324
2445 /* dms do not consume food */ 2325 /* dms do not consume food */
2446 if (!QUERY_FLAG (op, FLAG_WIZ)) 2326 if (!op->flag [FLAG_WIZ])
2447 op->stats.food--; 2327 op->stats.food--;
2448 } 2328 }
2449 2329
2450 if (op->stats.food < 0 && op->stats.hp >= 0) 2330 if (op->stats.food < 0 && op->stats.hp >= 0)
2451 { 2331 {
2452 object *flesh = 0; 2332 object *flesh = 0;
2453 2333
2454 for_inv_removable (op, tmp) 2334 for_inv_removable (op, tmp)
2455 { 2335 {
2456 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2336 if (tmp->flag [FLAG_UNPAID])
2457 continue; 2337 continue;
2458 2338
2459 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2339 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2460 { 2340 {
2461 op->statusmsg ("You blindly grab for a bite of food. " 2341 op->statusmsg ("You blindly grab for a bite of food. "
2462 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2342 "H<To prevent you from starving, you ate some random item from your backpack.>");
2463 manual_apply (op, tmp, 0); 2343 op->apply (tmp);
2464 2344
2465 if (op->stats.food >= 0 || op->stats.hp < 0) 2345 if (op->stats.food >= 0 || op->stats.hp < 0)
2466 break; 2346 break;
2467 } 2347 }
2468 else if (tmp->type == FLESH) 2348 else if (tmp->type == FLESH)
… …
2474 */ 2354 */
2475 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2355 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2476 { 2356 {
2477 op->statusmsg ("You blindly grab for a bite of food. " 2357 op->statusmsg ("You blindly grab for a bite of food. "
2478 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2358 "H<To prevent you from starving, you ate some random item from your backpack.>");
2479 manual_apply (op, flesh, 0); 2359 op->apply (flesh);
2480 } 2360 }
2481 2361
2482 // If player is still starving, alert him! 2362 // If player is still starving, alert him!
2483 if (op->stats.food < 0) 2363 if (op->stats.food < 0)
2484 op->failmsg ("You are starving! " 2364 op->failmsg ("You are starving! "
… …
2496 op->contr->killer->destroy (); 2376 op->contr->killer->destroy ();
2497 } 2377 }
2498 } 2378 }
2499 2379
2500 /* killer should be set here already */ 2380 /* killer should be set here already */
2501 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2381 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2502 kill_player (op); 2382 kill_player (op);
2503 } 2383 }
2504} 2384}
2505 2385
2506/* If the player should die (lack of hp, food, etc), we call this. 2386/* If the player should die (lack of hp, food, etc), we call this.
… …
2521 return; 2401 return;
2522 2402
2523 dynbuf_text deathtab; 2403 dynbuf_text deathtab;
2524 2404
2525 /* restore player */ 2405 /* restore player */
2526 at = archetype::find ("poisoning"); 2406 at = archetype::find (shstr_poisoning);
2527 if (object *tmp = present_arch_in_ob (at, op)) 2407 if (object *tmp = present_arch_in_ob (at, op))
2528 { 2408 {
2529 tmp->destroy (); 2409 tmp->destroy ();
2530 deathtab << "Your body feels cleansed...\r"; 2410 deathtab << "Your body feels cleansed...\r";
2531 } 2411 }
2532 2412
2533 at = archetype::find ("confusion"); 2413 at = archetype::find (shstr_confusion);
2534 if (object *tmp = present_arch_in_ob (at, op)) 2414 if (object *tmp = present_arch_in_ob (at, op))
2535 { 2415 {
2536 tmp->destroy (); 2416 tmp->destroy ();
2537 deathtab << "Your mind feels clearer...\r"; 2417 deathtab << "Your mind feels clearer...\r";
2538 } 2418 }
… …
2540 cure_disease (op, 0, 0); /* remove any disease */ 2420 cure_disease (op, 0, 0); /* remove any disease */
2541 2421
2542 max_it (op->stats.hp , op->stats.maxhp); 2422 max_it (op->stats.hp , op->stats.maxhp);
2543 max_it (op->stats.sp , op->stats.maxsp); 2423 max_it (op->stats.sp , op->stats.maxsp);
2544 max_it (op->stats.grace, op->stats.maxgrace); 2424 max_it (op->stats.grace, op->stats.maxgrace);
2545
2546 if (op->stats.food <= 0) 2425 max_it (op->stats.food , 200);
2547 op->stats.food = 999;
2548 2426
2549 // remove all spell effects that are active 2427 // remove all spell effects that are active
2550 // to avoid long-term effects such as word-of-recall 2428 // to avoid long-term effects such as word-of-recall
2551 for (object *item = op->inv; item; ) 2429 for (object *item = op->inv; item; )
2552 { 2430 {
… …
2565 if (op_on_battleground (op, &x, &y)) 2443 if (op_on_battleground (op, &x, &y))
2566 { 2444 {
2567 deathtab << "You almost died in combat, but local medics have saved your life...\r"; 2445 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2568 2446
2569 /* create a bodypart-trophy to make the winner happy */ 2447 /* create a bodypart-trophy to make the winner happy */
2570 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2448 object *tmp = archetype::find (shstr_finger)->instance ();
2571 { 2449
2572 tmp->name = format ("%s's finger" , &op->name); 2450 tmp->name = format ("%s's finger" , &op->name);
2573 tmp->name_pl = format ("%s's fingers", &op->name); 2451 tmp->name_pl = format ("%s's fingers", &op->name);
2574 tmp->msg = format ( 2452 tmp->msg = format (
2575 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2453 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2576 &op->name, op->contr->title, 2454 &op->name, op->contr->title,
2577 (int)op->level, 2455 (int)op->level,
2578 op->contr->killer_name () 2456 op->contr->killer_name ()
2579 ); 2457 );
2580 tmp->value = 0, tmp->type = 0; 2458 tmp->value = 0, tmp->type = 0;
2581 tmp->materialname = "organics"; 2459 tmp->material = name_to_material (shstr_organic);
2582 tmp->insert_at (op, tmp); 2460 tmp->insert_at (op, tmp);
2583 }
2584 2461
2585 /* teleport defeated player to new destination */ 2462 /* teleport defeated player to new destination */
2586 transfer_ob (op, x, y, 0, NULL); 2463 transfer_ob (op, x, y, 0, NULL);
2587 op->contr->braced = 0; 2464 op->contr->braced = 0;
2588 2465
… …
2650 lost_a_stat = 1; 2527 lost_a_stat = 1;
2651 } 2528 }
2652 else 2529 else
2653 { 2530 {
2654 /* deplete a stat */ 2531 /* deplete a stat */
2655 archetype *deparch = archetype::find ("depletion"); 2532 archetype *deparch = archetype::find (shstr_depletion);
2656 object *dep; 2533 object *dep;
2657 2534
2658 dep = present_arch_in_ob (deparch, op); 2535 dep = present_arch_in_ob (deparch, op);
2659 if (!dep) 2536 if (!dep)
2660 { 2537 {
2661 dep = arch_to_object (deparch); 2538 dep = deparch->instance ();
2662 insert_ob_in_ob (dep, op); 2539 insert_ob_in_ob (dep, op);
2663 } 2540 }
2664 lose_this_stat = 1; 2541 lose_this_stat = 1;
2665 if (settings.balanced_stat_loss) 2542 if (settings.balanced_stat_loss)
2666 { 2543 {
… …
2704 * difference. 2581 * difference.
2705 */ 2582 */
2706 if (this_stat >= -50) 2583 if (this_stat >= -50)
2707 { 2584 {
2708 change_attr_value (&(dep->stats), i, -1); 2585 change_attr_value (&(dep->stats), i, -1);
2709 SET_FLAG (dep, FLAG_APPLIED); 2586 dep->set_flag (FLAG_APPLIED);
2710 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2587 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2711 op->update_stats (); 2588 op->update_stats ();
2712 lost_a_stat = 1; 2589 lost_a_stat = 1;
2713 } 2590 }
2714 } 2591 }
… …
2732#endif 2609#endif
2733 2610
2734 /* Put a gravestone up where the character 'almost' died. List the 2611 /* Put a gravestone up where the character 'almost' died. List the
2735 * exp loss on the stone. 2612 * exp loss on the stone.
2736 */ 2613 */
2737 tmp = arch_to_object (archetype::find ("gravestone")); 2614 tmp = archetype::find (shstr_gravestone)->instance ();
2738 tmp->name = format ("%s's gravestone", &op->name); 2615 tmp->name = format ("%s's gravestone", &op->name);
2739 tmp->name_pl = format ("%s's gravestones", &op->name); 2616 tmp->name_pl = format ("%s's gravestones", &op->name);
2740 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", 2617 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2741 &op->name, op->contr->title, op->contr->killer_name ()); 2618 &op->name, op->contr->title, op->contr->killer_name ());
2742 tmp->x = op->x, tmp->y = op->y; 2619 tmp->x = op->x, tmp->y = op->y;
… …
2783 object *force; 2660 object *force;
2784 int at; 2661 int at;
2785 2662
2786 force = get_archetype (FORCE_NAME); 2663 force = get_archetype (FORCE_NAME);
2787 /* 50 ticks should be enough time for the spell to abate */ 2664 /* 50 ticks should be enough time for the spell to abate */
2788 force->speed = 0.1f;
2789 force->speed_left = -5.f; 2665 force->speed_left = -5.f;
2790 SET_FLAG (force, FLAG_APPLIED); 2666 force->set_speed (0.1f);
2667 force->set_flag (FLAG_APPLIED);
2668
2791 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2792 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2793 force->resist[at] = 100; 2671 force->resist[at] = 100;
2794 2672
2795 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
… …
2797 } 2675 }
2798 2676
2799 op->contr->infobox (MSG_CHANNEL ("death"), deathtab); 2677 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2800} 2678}
2801 2679
2802void 2680static void
2803loot_object (object *op) 2681loot_object (object *op)
2804{ /* Grab and destroy some treasure */ 2682{ /* Grab and destroy some treasure */
2805 object *tmp, *tmp2, *next; 2683 object *tmp, *tmp2, *next;
2806 2684
2807 op->close_container (); /* close open sack first */ 2685 op->close_container (); /* close open sack first */
… …
2817 tmp->x = op->x, tmp->y = op->y; 2695 tmp->x = op->x, tmp->y = op->y;
2818 2696
2819 if (tmp->type == CONTAINER) 2697 if (tmp->type == CONTAINER)
2820 loot_object (tmp); /* empty container to ground */ 2698 loot_object (tmp); /* empty container to ground */
2821 2699
2822 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2700 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2823 { 2701 {
2824 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2825 { 2703 {
2826 tmp->decrease (rndm (1, tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2827 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2838 * fix_weight(): Check recursively the weight of all players, and fix 2716 * fix_weight(): Check recursively the weight of all players, and fix
2839 * what needs to be fixed. Refresh windows and fix speed if anything 2717 * what needs to be fixed. Refresh windows and fix speed if anything
2840 * was changed. 2718 * was changed.
2841 */ 2719 */
2842void 2720void
2843fix_weight (void) 2721fix_weight ()
2844{ 2722{
2845 for_all_players (pl) 2723 for_all_players (pl)
2846 { 2724 {
2847 sint32 old = pl->ob->carrying; 2725 sint32 old = pl->ob->carrying;
2848 2726
… …
2855 } 2733 }
2856 } 2734 }
2857} 2735}
2858 2736
2859void 2737void
2860fix_luck (void) 2738fix_luck ()
2861{ 2739{
2862 for_all_players (pl) 2740 for_all_players (pl)
2863 if (!pl->ob->contr->ns->state) 2741 if (!pl->ob->contr->ns->state)
2864 pl->ob->change_luck (0); 2742 pl->ob->change_luck (0);
2865} 2743}
… …
2917} 2795}
2918 2796
2919int 2797int
2920is_true_undead (object *op) 2798is_true_undead (object *op)
2921{ 2799{
2922 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2800 if (op->arch->flag [FLAG_UNDEAD])
2923 return 1; 2801 return 1;
2924 2802
2925 return 0; 2803 return 0;
2926} 2804}
2927 2805
… …
3025 2903
3026 if (who->type == PLAYER) 2904 if (who->type == PLAYER)
3027 player = 1; 2905 player = 1;
3028 2906
3029 else 2907 else
3030 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2908 friendly = who->flag [FLAG_FRIENDLY];
3031 2909
3032 /* search adjacent squares */ 2910 /* search adjacent squares */
3033 for (i = 1; i < 9; i++) 2911 for (i = 1; i < 9; i++)
3034 { 2912 {
3035 x = who->x + freearr_x[i]; 2913 x = who->x + freearr_x[i];
… …
3044 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2922 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3045 continue; 2923 continue;
3046 2924
3047 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2925 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3048 { 2926 {
3049 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2927 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3050 return 1; 2928 return 1;
3051 else if (tmp->type == PLAYER) 2929 else if (tmp->type == PLAYER)
3052 { 2930 {
3053 /*don't let a hidden DM prevent you from hiding */ 2931 /*don't let a hidden DM prevent you from hiding */
3054 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2932 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
3055 return 1; 2933 return 1;
3056 } 2934 }
3057 } 2935 }
3058 } 2936 }
3059 return 0; 2937 return 0;
… …
3109 } 2987 }
3110 2988
3111 return 0; 2989 return 0;
3112} 2990}
3113 2991
3114/* routine for both players and monsters. We call this when
3115 * there is a possibility for our action distrubing our hiding
3116 * place or invisiblity spell. Artefact invisiblity causes
3117 * "noise" instead. If we arent invisible to begin with, we
3118 * return 0.
3119 */
3120int
3121action_makes_visible (object *op)
3122{
3123 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3124 {
3125 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3126 {
3127 // artefact invisibility is permanent, but we still make noise
3128 // this is important for game-balance.
3129 if (op->contr)
3130 op->make_noise ();
3131
3132 return 0;
3133 }
3134
3135 if (op->contr && op->contr->tmp_invis == 0)
3136 return 0;
3137
3138 /* If monsters, they should become visible */
3139 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3140 {
3141 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3142 return 1;
3143 }
3144 }
3145
3146 return 0;
3147}
3148
3149/* op_on_battleground - checks if the given object op (usually 2992/* op_on_battleground - checks if the given object op (usually
3150 * a player) is standing on a valid battleground-tile, 2993 * a player) is standing on a valid battleground-tile,
3151 * function returns TRUE/FALSE. If true x, y returns the battleground 2994 * function returns TRUE/FALSE. If true x, y returns the battleground
3152 * -exit-coord. (and if x, y not NULL) 2995 * -exit-coord. (and if x, y not NULL)
3153 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set 2996 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
… …
3163 * and the exit-coordinates sp/hp must both be > 0. 3006 * and the exit-coordinates sp/hp must both be > 0.
3164 * => The intention here is to prevent abuse of the battleground- 3007 * => The intention here is to prevent abuse of the battleground-
3165 * feature (like pickable or hidden battleground tiles). */ 3008 * feature (like pickable or hidden battleground tiles). */
3166 for (object *tmp = op->below; tmp; tmp = tmp->below) 3009 for (object *tmp = op->below; tmp; tmp = tmp->below)
3167 { 3010 {
3168 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3011 if (tmp->flag [FLAG_IS_FLOOR])
3169 { 3012 {
3170 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3013 if (tmp->flag [FLAG_NO_PICK]
3171 && tmp->type == BATTLEGROUND 3014 && tmp->type == BATTLEGROUND
3172 && tmp->name == shstr_battleground 3015 && tmp->name == shstr_battleground
3173 && EXIT_X (tmp) && EXIT_Y (tmp)) 3016 && EXIT_X (tmp) && EXIT_Y (tmp))
3174 { 3017 {
3175 /* before we assign the exit, check if this is a teambattle */ 3018 /* before we assign the exit, check if this is a teambattle */
3176 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3019 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3177 {
3178 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3020 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3021 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3179 { 3022 {
3180 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3181 {
3182 if (x && y) 3023 if (x && y)
3183 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3024 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3184 3025
3185 return 1; 3026 return 1;
3186 }
3187 } 3027 }
3188 }
3189 3028
3190 if (x && y) 3029 if (x && y)
3191 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3030 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3192 3031
3193 return 1; 3032 return 1;
… …
3331 else 3170 else
3332 j = 1; 3171 j = 1;
3333 strcat (buf, spellpathnames[i]); 3172 strcat (buf, spellpathnames[i]);
3334 } 3173 }
3335 } 3174 }
3175
3336 strcat (buf, "."); 3176 strcat (buf, ".");
3337 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3177 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3338 } 3178 }
3339 3179
3340 /* evtl. adding flags: */ 3180 /* evtl. adding flags: */
3341 if (QUERY_FLAG (item, FLAG_XRAYS)) 3181 if (item->flag [FLAG_XRAYS])
3342 SET_FLAG (skin, FLAG_XRAYS); 3182 skin->set_flag (FLAG_XRAYS);
3343 if (QUERY_FLAG (item, FLAG_STEALTH)) 3183 if (item->flag [FLAG_STEALTH])
3344 SET_FLAG (skin, FLAG_STEALTH); 3184 skin->set_flag (FLAG_STEALTH);
3345 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3185 if (item->flag [FLAG_SEE_IN_DARK])
3346 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3186 skin->set_flag (FLAG_SEE_IN_DARK);
3347 3187
3348 /* print message if there is one */ 3188 /* print message if there is one */
3349 if (item->msg != NULL) 3189 if (item->msg != NULL)
3350 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3190 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3351 } 3191 }
3352 else 3192 else
3353 { 3193 {
3354 /* generate misc. treasure */ 3194 /* generate misc. treasure */
3355 tmp = arch_to_object (tr->item); 3195 tmp = tr->item->instance ();
3356 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3196 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3357 who->insert (tmp); 3197 who->insert (tmp);
3358 } 3198 }
3359} 3199}
3360 3200
3361/** 3201//-GPL
3362 * Unready an object for a player. This function does nothing if the object was
3363 * not readied.
3364 */
3365void
3366player_unready_range_ob (player *pl, object *ob)
3367{
3368 if (pl->ob->current_weapon == ob)
3369 pl->ob->current_weapon = 0;
3370
3371 if (pl->combat_ob == ob)
3372 pl->combat_ob = 0;
3373
3374 if (pl->ranged_ob == ob)
3375 pl->ranged_ob = 0;
3376}
3377 3202
3378sint8 3203sint8
3379player::darkness_at (maptile *map, int x, int y) const 3204player::darkness_at (maptile *map, int x, int y) const
3380{ 3205{
3381 if (!ns) 3206 if (!ns)
… …
3408{ 3233{
3409 play_sound (sound_find ("generic_failure")); 3234 play_sound (sound_find ("generic_failure"));
3410 statusmsg (msg, color); 3235 statusmsg (msg, color);
3411} 3236}
3412 3237
3238void
3239object::failmsgf (const char *format, ...)
3240{
3241 if (!contr)
3242 return;
3243
3244 va_list ap;
3245 va_start (ap, format);
3246 contr->failmsg (vformat (format, ap));
3247 va_end (ap);
3248}
3249
3250void
3251player::failmsgf (const char *format, ...)
3252{
3253 va_list ap;
3254 va_start (ap, format);
3255 failmsg (vformat (format, ap));
3256 va_end (ap);
3257}
3258

Diff Legend

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