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.73 by root, Wed Dec 27 18:09:49 2006 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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

Diff Legend

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