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.142 by root, Fri May 18 19:46:22 2007 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 UTC

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

Diff Legend

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