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.48 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

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

Diff Legend

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