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

Diff Legend

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