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.83 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

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

Diff Legend

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