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.116 by root, Sun Apr 29 03:44:36 2007 UTC vs.
Revision 1.300 by root, Sat Sep 16 22:17:42 2017 UTC

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

Diff Legend

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