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

Diff Legend

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