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.151 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

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