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.138 by root, Thu May 17 20:27:01 2007 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

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

Diff Legend

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