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.150 by root, Sun Jun 10 03:11:17 2007 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

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

Diff Legend

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