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