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.121 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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