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

Diff Legend

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