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.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

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

Diff Legend

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