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

Diff Legend

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