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