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.114 by root, Wed Apr 25 18:47:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <pwd.h> 26#include <pwd.h>
26#include <sproto.h> 27#include <sproto.h>
27#include <sounds.h> 28#include <sounds.h>
28#include <living.h> 29#include <living.h>
29#include <object.h> 30#include <object.h>
30#include <spells.h> 31#include <spells.h>
31#include <skills.h> 32#include <skills.h>
32 33
33#ifdef COZY_SERVER 34#include <algorithm>
34extern int same_party (partylist *a, partylist *b); 35#include <functional>
35#endif
36 36
37player * 37playervec 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 38
76void 39void
77display_motd (const object *op) 40display_motd (const object *op)
78{ 41{
79 char buf[MAX_BUF]; 42 char buf[MAX_BUF];
… …
87 return; 50 return;
88 51
89 motd[0] = '\0'; 52 motd[0] = '\0';
90 size = 0; 53 size = 0;
91 54
92 while (fgets (buf, MAX_BUF, fp) != NULL) 55 while (fgets (buf, MAX_BUF, fp))
93 { 56 {
94 if (*buf == '#') 57 if (*buf == '#')
95 continue; 58 continue;
96 59
97 strncat (motd + size, buf, HUGE_BUF - size); 60 strncat (motd + size, buf, HUGE_BUF - size);
… …
116 return; 79 return;
117 80
118 rules[0] = '\0'; 81 rules[0] = '\0';
119 size = 0; 82 size = 0;
120 83
121 while (fgets (buf, MAX_BUF, fp) != NULL) 84 while (fgets (buf, MAX_BUF, fp))
122 { 85 {
123 if (*buf == '#') 86 if (*buf == '#')
124 continue; 87 continue;
125 88
126 if (size + strlen (buf) >= HUGE_BUF) 89 if (size + strlen (buf) >= HUGE_BUF)
… …
153 116
154 news[0] = '\0'; 117 news[0] = '\0';
155 subject[0] = '\0'; 118 subject[0] = '\0';
156 size = 0; 119 size = 0;
157 120
158 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
159 { 122 {
160 if (*buf == '#') 123 if (*buf == '#')
161 continue; 124 continue;
162 125
163 if (*buf == '%') 126 if (*buf == '%')
164 { /* send one news */ 127 { /* send one news */
165 if (size > 0) 128 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 */ 129 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 */
130
167 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
168 strip_endline (subject); 132 strip_endline (subject);
169 size = 0; 133 size = 0;
170 news[0] = '\0'; 134 news[0] = '\0';
171 } 135 }
… …
180 size += strlen (buf); 144 size += strlen (buf);
181 } 145 }
182 } 146 }
183 147
184 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 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); 149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
186 close_and_delete (fp, comp); 150 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} 151}
296 152
297/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
298static void 154static void
299set_first_map (object *op) 155set_first_map (object *op)
300{ 156{
301 strcpy (op->contr->maplevel, first_map_path); 157 op->contr->maplevel = first_map_path;
302 op->x = -1; 158 op->x = -1;
303 op->y = -1; 159 op->y = -1;
160}
161
162void
163player::enter_map ()
164{
165 object *tmp = object::create ();
166
167 EXIT_PATH (tmp) = maplevel;
168 EXIT_X (tmp) = ob->x;
169 EXIT_Y (tmp) = ob->y;
304 enter_exit (op, 0); 170 ob->enter_exit (tmp);
305}
306 171
172 tmp->destroy ();
173}
174
175void
176player::activate ()
177{
178 if (active)
179 return;
180
181 players.insert (this);
182 ob->remove ();
183 ob->map = 0;
184 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob);
187 enter_map ();
188}
189
190void
191player::deactivate ()
192{
193 if (!active)
194 return;
195
196 terminate_all_pets (ob);
197 remove_friendly_object (ob);
198 ob->deactivate_recursive ();
199
200 if (ob->map)
201 maplevel = ob->map->path;
202
203 ob->remove ();
204 ob->map = 0;
205 party = 0;
206
207 // for weird reasons, this is often "ob", keeping a circular reference
208 ranges [range_skill] = 0;
209
210 players.erase (this);
211}
212
213// connect the player with a specific client
214// also changed, rationalises, and fixes some incorrect settings
215void
216player::connect (client *ns)
217{
218 this->ns = ns;
219 ns->pl = this;
220
221 run_on = 0;
222 fire_on = 0;
223 ob->close_container (); //TODO: client-specific
224
225 ns->update_look = 0;
226 ns->look_position = 0;
227
228 clear_los (ob);
229
230 ns->reset_stats ();
231
232 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238
239 ob->carrying = sum_weight (ob);
240 link_player_skills (ob);
241
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243
244 assign (title, ob->arch->clone.name);
245
246 /* if it's a dragon player, set the correct title here */
247 if (is_dragon_pl (ob))
248 {
249 object *tmp, *abil = 0, *skin = 0;
250
251 shstr_cmp dragon_ability_force ("dragon_ability_force");
252 shstr_cmp dragon_skin_force ("dragon_skin_force");
253
254 for (tmp = ob->inv; tmp; tmp = tmp->below)
255 if (tmp->type == FORCE)
256 if (tmp->arch->name == dragon_ability_force)
257 abil = tmp;
258 else if (tmp->arch->name == dragon_skin_force)
259 skin = tmp;
260
261 set_dragon_name (ob, abil, skin);
262 }
263
264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265
266 esrv_new_player (this, ob->weight + ob->carrying);
267
268 ob->update_stats ();
269 ns->floorbox_update ();
270
271 esrv_send_inventory (ob, ob);
272 esrv_add_spells (this, 0);
273
274 activate ();
275
276 send_rules (ob);
277 send_news (ob);
278 display_motd (ob);
279
280 INVOKE_PLAYER (CONNECT, this);
281 INVOKE_PLAYER (LOGIN, this);
282}
283
284void
285player::disconnect ()
286{
287 if (ns)
288 {
289 if (active)
290 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
291
292 INVOKE_PLAYER (DISCONNECT, this);
293
294 ns->reset_stats ();
295 ns->pl = 0;
296 this->ns = 0;
297 }
298
299 if (ob)
300 ob->close_container (); //TODO: client-specific
301
302 deactivate ();
303}
304
305// the need for this function can be explained
306// by load_object not returning the object
307void
308player::set_object (object *op)
309{
310 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */
312
313 ob->speed_left = 0.5;
314 ob->speed = 1.0;
315 ob->direction = 5; /* So player faces south */
316}
317
318player::player ()
319{
320 /* There are some elements we want initialised to non zero value -
321 * we deal with that below this point.
322 */
323 outputs_sync = 4;
324 outputs_count = 4;
325 unapply = unapply_nochoice;
326
327 savebed_map = first_map_path; /* Init. respawn position */
328
329 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal;
332 petmode = pet_normal;
333 listening = 10;
334 usekeys = containers;
335 peaceful = 1; /* default peaceful */
336 do_los = 1;
337}
338
339void
340player::do_destroy ()
341{
342 disconnect ();
343
344 attachable::do_destroy ();
345
346 if (ob)
347 {
348 ob->destroy_inv (false);
349 ob->destroy ();
350 }
351}
352
353player::~player ()
354{
355 /* Clear item stack */
356 free (stack_items);
357}
358
307/* Tries to add player on the connection passwd in ns. 359/* 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 360 * All we can really get in this is some settings like host and display
309 * mode. 361 * mode.
310 */ 362 */
311 363player *
312int 364player::create ()
313add_player (client *ns)
314{ 365{
315 player *p = new player; 366 player *pl = new player;
316 367
317 p->socket = ns; 368 pl->set_object (arch_to_object (get_player_archetype (0)));
318 ns->pl = p;
319 369
320 p->next = first_player; 370 pl->ob->roll_stats ();
321 first_player = p; 371 pl->ob->stats.wc = 2;
372 pl->ob->run_away = 25; /* Then we panick... */
322 373
323 p = get_player (p);
324
325 set_first_map (p->ob); 374 set_first_map (pl->ob);
326 375
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; 376 return pl;
335} 377}
336 378
337/* 379/*
338 * get_player_archetype() return next player archetype from archetype 380 * get_player_archetype() return next player archetype from archetype
339 * list. Not very efficient routine, but used only creating new players. 381 * list. Not very efficient routine, but used only creating new players.
… …
364 406
365object * 407object *
366get_nearest_player (object *mon) 408get_nearest_player (object *mon)
367{ 409{
368 object *op = NULL; 410 object *op = NULL;
369 player *pl = NULL;
370 objectlink *ol; 411 objectlink *ol;
371 unsigned lastdist; 412 unsigned lastdist;
372 rv_vector rv; 413 rv_vector rv;
373 414
374 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 415 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
375 { 416 {
376 /* We should not find free objects on this friendly list, but it 417 /* We should not find free objects on this friendly list, but it
377 * does periodically happen. Given that, lets deal with it. 418 * does periodically happen. Given that, lets deal with it.
378 * While unlikely, it is possible the next object on the friendly 419 * While unlikely, it is possible the next object on the friendly
379 * list is also free, so encapsulate this in a while loop. 420 * list is also free, so encapsulate this in a while loop.
… …
383 object *tmp = ol->ob; 424 object *tmp = ol->ob;
384 425
385 /* Can't do much more other than log the fact, because the object 426 /* Can't do much more other than log the fact, because the object
386 * itself will have been cleared. 427 * itself will have been cleared.
387 */ 428 */
388 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 429 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430 tmp->debug_desc ());
389 ol = ol->next; 431 ol = ol->next;
390 remove_friendly_object (tmp); 432 remove_friendly_object (tmp);
391 if (!ol) 433 if (!ol)
392 return op; 434 return op;
393 } 435 }
… …
406 { 448 {
407 op = ol->ob; 449 op = ol->ob;
408 lastdist = rv.distance; 450 lastdist = rv.distance;
409 } 451 }
410 } 452 }
411 for (pl = first_player; pl != NULL; pl = pl->next) 453
412 { 454 for_all_players (pl)
413 if (can_detect_enemy (mon, pl->ob, &rv)) 455 if (can_detect_enemy (mon, pl->ob, &rv))
414 {
415
416 if (lastdist > rv.distance) 456 if (lastdist > rv.distance)
417 { 457 {
418 op = pl->ob; 458 op = pl->ob;
419 lastdist = rv.distance; 459 lastdist = rv.distance;
420 } 460 }
421 } 461
422 }
423#if 0 462#if 0
424 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 463 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
425#endif 464#endif
426 return op; 465 return op;
427} 466}
… …
445 * circling behaviour. Unfortunately, this function is also used to determined 484 * 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 485 * if the creature should cast a spell, so returning a direction in that case
447 * is probably not a good thing. 486 * is probably not a good thing.
448 */ 487 */
449#define MAX_SPACES 50 488#define MAX_SPACES 50
450
451 489
452/* 490/*
453 * Returns the direction to the player, if valid. Returns 0 otherwise. 491 * 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 492 * 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 493 * player and if path is blocked then see if blockage is close enough to player that
… …
486 x = mon->x; 524 x = mon->x;
487 y = mon->y; 525 y = mon->y;
488 m = mon->map; 526 m = mon->map;
489 dir = rv.direction; 527 dir = rv.direction;
490 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 528 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); 529 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
530
492 /* If we can't solve it within the search distance, return now. */ 531 /* If we can't solve it within the search distance, return now. */
493 if (diff > max) 532 if (diff > max)
494 return 0; 533 return 0;
534
495 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
496 { 536 {
497 lastx = x; 537 lastx = x;
498 lasty = y; 538 lasty = y;
499 lastmap = m; 539 lastmap = m;
… …
581 max--; 621 max--;
582 lastdir = dir; 622 lastdir = dir;
583 if (!firstdir) 623 if (!firstdir)
584 firstdir = dir; 624 firstdir = dir;
585 } 625 }
626
586 if (diff <= 1) 627 if (diff <= 1)
587 { 628 {
588 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
589 * headed toward player for entire distance. 630 * headed toward player for entire distance.
590 */ 631 */
591 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 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); 633 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
593 } 634 }
635
594 if (diff > max) 636 if (diff > max)
595 return 0; 637 return 0;
596 } 638 }
639
597 /* If we reached the max, didn't find a direction in time */ 640 /* If we reached the max, didn't find a direction in time */
598 if (!max) 641 if (!max)
599 return 0; 642 return 0;
600 643
601 return firstdir; 644 return firstdir;
… …
694 /* Need to set up the skill pointers */ 737 /* Need to set up the skill pointers */
695 link_player_skills (pl); 738 link_player_skills (pl);
696} 739}
697 740
698void 741void
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) 742get_party_password (object *op, partylist *party)
783{ 743{
784 if (party == NULL) 744 if (party == NULL)
785 { 745 {
786 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 746 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
787 return; 747 return;
788 } 748 }
749
789 op->contr->write_buf[0] = '\0'; 750 op->contr->write_buf[0] = '\0';
790 op->contr->state = ST_GET_PARTY_PASSWORD; 751 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
791 op->contr->party_to_join = party; 752 op->contr->party_to_join = party;
792 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 753 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
793} 754}
794
795 755
796/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 756/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
797int 757static int
798roll_stat (void) 758roll_stat (void)
799{ 759{
800 int a[4], i, j, k; 760 int a[4], i, j, k;
801 761
802 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
803 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
804 764
805 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
806 if (a[i] < k) 766 if (a[i] < k)
807 k = a[i], j = i; 767 k = a[i], j = i;
808 768
809 for (i = 0, k = 0; i < 4; i++) 769 for (i = 0, k = 0; i < 4; i++)
810 {
811 if (i != j) 770 if (i != j)
812 k += a[i]; 771 k += a[i];
813 } 772
814 return k; 773 return k;
815} 774}
816 775
817void 776void
818roll_stats (object *op) 777object::roll_stats ()
819{ 778{
820 int sum = 0;
821 int i = 0, j = 0;
822 int statsort[7]; 779 int statsort [7];
823 780
824 do 781 for (;;)
825 {
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 } 782 {
835 while (sum < 82 || sum > 116); 783 int sum = 0;
784 for (int i = 7; i--; )
785 sum += statsort [i] = roll_stat ();
836 786
787 if (sum >= 82 && sum <= 116)
788 break;
789 }
790
837 /* Sort the stats so that rerolling is easier... */ 791 // Sort the stats so that rerolling is easier...
838 statsort[0] = op->stats.Str; 792 std::sort (statsort, statsort + 7, 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 793
846 /* a quick and dirty bubblesort? */
847 do
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
863 op->stats.Str = statsort[0]; 794 stats.Str = statsort[0];
864 op->stats.Dex = statsort[1]; 795 stats.Dex = statsort[1];
865 op->stats.Con = statsort[2]; 796 stats.Con = statsort[2];
866 op->stats.Int = statsort[3]; 797 stats.Int = statsort[3];
867 op->stats.Wis = statsort[4]; 798 stats.Wis = statsort[4];
868 op->stats.Pow = statsort[5]; 799 stats.Pow = statsort[5];
869 op->stats.Cha = statsort[6]; 800 stats.Cha = statsort[6];
870 801
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; 802 stats.exp = 0;
882 op->stats.ac = 0; 803 stats.ac = 0;
883 804
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; 805 stats.hp = stats.maxhp;
890 op->stats.sp = op->stats.maxsp; 806 stats.sp = stats.maxsp;
891 op->stats.grace = op->stats.maxgrace; 807 stats.grace = stats.maxgrace;
808
809 if (contr)
810 {
811 contr->levhp[1] = 9;
812 contr->levsp[1] = 6;
813 contr->levgrace[1] = 3;
814
892 op->contr->orig_stats = op->stats; 815 contr->orig_stats = stats;
816 }
893} 817}
894 818
895void 819void
896Roll_Again (object *op) 820object::swap_stats (int a, int b)
897{ 821{
898 esrv_new_player (op->contr, 0); 822 int tmp = get_attr_value (&contr->orig_stats, a);
899 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, 823 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
900 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 824 set_attr_value (&contr->orig_stats, b, tmp);
901}
902 825
903void 826 stats.Str = contr->orig_stats.Str;
904Swap_Stat (object *op, int Swap_Second) 827 stats.Dex = contr->orig_stats.Dex;
828 stats.Con = contr->orig_stats.Con;
829 stats.Int = contr->orig_stats.Int;
830 stats.Wis = contr->orig_stats.Wis;
831 stats.Pow = contr->orig_stats.Pow;
832 stats.Cha = contr->orig_stats.Cha;
833
834 //TODO: the following code looks so borked and should, at the very least,
835 // be merged with the similar code in roll_stats
836 stats.ac = 0;
837
838 level = 1;
839 stats.exp = 0;
840 stats.ac = 0;
841
842 stats.hp = stats.maxhp;
843 stats.sp = stats.maxsp;
844 stats.grace = stats.maxgrace;
845
846 if (contr)
847 {
848 contr->levhp[1] = 9;
849 contr->levsp[1] = 6;
850 contr->levgrace[1] = 3;
851
852 contr->orig_stats = stats;
853 }
854}
855
856static void
857start_info (object *op)
905{ 858{
906 signed char tmp;
907 char buf[MAX_BUF]; 859 char buf[MAX_BUF];
908 860
909 if (op->contr->Swap_First == -1) 861 sprintf (buf, "Welcome to Crossfire 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); 862 new_draw_info (NDI_UNIQUE, 0, op, buf);
925 op->stats.Str = op->contr->orig_stats.Str; 863 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
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); 864 //new_draw_info (NDI_UNIQUE, 0, op, " ");
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} 865}
1024 866
1025/* This function takes the key that is passed, and does the 867/* This function takes the key that is passed, and does the
1026 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
1027 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
1028 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
1029 * not the class. 871 * not the class.
1030 */ 872 */
1031 873void
1032int 874player::chargen_race_done ()
1033key_change_class (object *op, char key)
1034{ 875{
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 */ 876 /* this must before then initial items are given */
1048 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
1049 878
1050 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
1051 if (tl) 880 if (tl)
1052 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
1053 882
1054 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
1055 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
1056 885
1057 op->contr->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
1058 887
1059 if (op->msg) 888 if (ob->msg)
1060 op->msg = NULL; 889 ob->msg = 0;
1061 890
1062 /* We create this now because some of the unique maps will need it 891 /* We create this now because some of the unique maps will need it
1063 * to save here. 892 * to save here.
1064 */ 893 */
894 {
895 char buf[MAX_BUF];
1065 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
1066 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
1067 899
1068#ifdef AUTOSAVE
1069 op->contr->last_save_tick = pticks;
1070#endif
1071 start_info (op); 900 start_info (ob);
1072 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
1073 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
1074 link_player_skills (op); 903 link_player_skills (ob);
1075 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
1076 fix_player (op); 905 ob->update_stats ();
1077 906
1078 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
1079 * is one for this race 908 * is one for this race
1080 */ 909 */
1081 if (*first_map_ext_path) 910 if (*first_map_ext_path)
1082 { 911 {
1083 object *tmp; 912 object *tmp;
1084 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
1085 914
1086 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
1087 tmp = object::create (); 916 tmp = object::create ();
1088 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
1089 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
1090 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
1091 enter_exit (op, tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
1092 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
1093 * default initial map */ 922 * default initial map */
1094 tmp->destroy (); 923 tmp->destroy ();
1095 } 924 }
1096 else 925 else
1097 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
1098 928
1099 return 0; 929void
1100 } 930player::chargen_race_next ()
1101 931{
1102 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
1103 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
1104 */ 934 */
1105 935
1106 tmp_loop = 0; 936 do
1107 while (!tmp_loop)
1108 { 937 {
1109 shstr name = op->name; 938 shstr name = ob->name;
1110 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
1111 940
1112 remove_statbonus (op); 941 ob->remove_statbonus ();
1113 op->remove (); 942 ob->remove ();
1114 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
1115 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
1116 op->instantiate (); 945 ob->instantiate ();
1117 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
1118 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
1119 op->x = x; 948 ob->x = x;
1120 op->y = y; 949 ob->y = y;
1121 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
1122 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
1123 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
1124 add_statbonus (op); 953 ob->add_statbonus ();
1125 tmp_loop = allowed_class (op);
1126 } 954 }
955 while (!allowed_class (ob));
1127 956
1128 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
1129 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
1130 fix_player (op); 959 ob->update_stats ();
1131 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
1132 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
1133 op->stats.grace = 0; 962 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} 963}
1190 964
1191void 965void
1192flee_player (object *op) 966flee_player (object *op)
1193{ 967{
… …
1223 { 997 {
1224 op->enemy = NULL; 998 op->enemy = NULL;
1225 CLEAR_FLAG (op, FLAG_SCARED); 999 CLEAR_FLAG (op, FLAG_SCARED);
1226 return; 1000 return;
1227 } 1001 }
1002
1228 get_rangevector (op, op->enemy, &rv, 0); 1003 get_rangevector (op, op->enemy, &rv, 0);
1229 1004
1230 dir = absdir (4 + rv.direction); 1005 dir = absdir (4 + rv.direction);
1231 for (diff = 0; diff < 3; diff++) 1006 for (diff = 0; diff < 3; diff++)
1232 { 1007 {
1233 int m = 1 - (RANDOM () & 2); 1008 int m = 1 - (RANDOM () & 2);
1234 1009
1235 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1010 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1236 {
1237 return; 1011 return;
1238 }
1239 } 1012 }
1013
1240 /* Cornered, get rid of scared */ 1014 /* Cornered, get rid of scared */
1241 CLEAR_FLAG (op, FLAG_SCARED); 1015 CLEAR_FLAG (op, FLAG_SCARED);
1242 op->enemy = NULL; 1016 op->enemy = NULL;
1243} 1017}
1244 1018
… …
1250int 1024int
1251check_pick (object *op) 1025check_pick (object *op)
1252{ 1026{
1253 object *tmp, *next; 1027 object *tmp, *next;
1254 int stop = 0; 1028 int stop = 0;
1255 int j, k, wvratio; 1029 int wvratio;
1256 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1257 1031
1258 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1259 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1260 return 1; 1034 return 1;
1261 1035
… …
1330 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 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)))); 1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1332 else 1106 else
1333 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 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)))); 1108 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1335 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 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 } 1111 }
1112
1366 /* philosophy: 1113 /* philosophy:
1367 * It's easy to grab an item type from a pile, as long as it's 1114 * 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 1115 * generic. This takes no game-time. For more detailed pickups
1369 * and selections, select-items shoul dbe used. This is a 1116 * and selections, select-items should be used. This is a
1370 * grab-as-you-run type mode that's really useful for arrows for 1117 * grab-as-you-run type mode that's really useful for arrows for
1371 * example. 1118 * example.
1372 * The drawback: right now it has no frontend, so you need to 1119 * 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 1120 * stick the bits you want into a calculator in hex mode and then
1374 * convert to decimal and then 'pickup <#> 1121 * convert to decimal and then 'pickup <#>
… …
1625 * found object is returned. 1372 * found object is returned.
1626 */ 1373 */
1627object * 1374object *
1628find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1629{ 1376{
1630 object *tmp = NULL; 1377 object *tmp = 0;
1631 1378
1632 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1633 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1634 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1635 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1636 return op; 1383 return op;
1384
1637 return tmp; 1385 return tmp;
1638} 1386}
1639 1387
1640/* 1388/*
1641 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * 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 1390 * 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 1391 * 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. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1645 */ 1393 */
1646
1647object * 1394object *
1648find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1649{ 1396{
1650 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1651 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1874 return 0; 1621 return 0;
1875 } 1622 }
1876 1623
1877 arrow->set_owner (op); 1624 arrow->set_owner (op);
1878 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1879
1880 arrow->direction = dir; 1626 arrow->direction = dir;
1881 arrow->x = sx;
1882 arrow->y = sy;
1883 1627
1884 if (op->type == PLAYER) 1628 if (op->type == PLAYER)
1885 { 1629 {
1886 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1630 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1887 fix_player (op); 1631 op->update_stats ();
1888 } 1632 }
1889 1633
1890 SET_ANIMATION (arrow, arrow->direction); 1634 SET_ANIMATION (arrow, arrow->direction);
1891 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1635 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1892 arrow->stats.hp = arrow->stats.dam; 1636 arrow->stats.hp = arrow->stats.dam;
… …
1902 1646
1903 /* update the speed */ 1647 /* update the speed */
1904 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1648 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; 1649 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1906 1650
1907 if (arrow->speed < 1.0) 1651 arrow->set_speed (max (arrow->speed, 1.0));
1908 arrow->speed = 1.0;
1909 update_ob_speed (arrow);
1910 arrow->speed_left = 0; 1652 arrow->speed_left = 0;
1911 1653
1912 if (op->type == PLAYER) 1654 if (op->type == PLAYER)
1913 { 1655 {
1914 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1656 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1927 arrow->attacktype |= bow->attacktype; 1669 arrow->attacktype |= bow->attacktype;
1928 1670
1929 if (bow->slaying) 1671 if (bow->slaying)
1930 arrow->slaying = bow->slaying; 1672 arrow->slaying = bow->slaying;
1931 1673
1932 arrow->map = m;
1933 arrow->move_type = MOVE_FLY_LOW; 1674 arrow->move_type = MOVE_FLY_LOW;
1934 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1675 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1935 1676
1936 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1677 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1937 insert_ob_in_map (arrow, m, op, 0); 1678 m->insert (arrow, sx, sy, op);
1938 1679
1939 if (!arrow->destroyed ()) 1680 if (!arrow->destroyed ())
1940 move_arrow (arrow); 1681 move_arrow (arrow);
1941 1682
1942 if (op->type == PLAYER) 1683 if (op->type == PLAYER)
… …
1968 } 1709 }
1969 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1710 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1970 { 1711 {
1971 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1712 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1972 wcmod = -1; 1713 wcmod = -1;
1714
1973 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1715 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1974 } 1716 }
1975 else if (op->contr->bowtype == bow_threewide) 1717 else if (op->contr->bowtype == bow_threewide)
1976 { 1718 {
1977 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1719 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
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->clone.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 */
… …
2090 case range_misc: 1830 case range_misc:
2091 fire_misc_object (op, dir); 1831 fire_misc_object (op, dir);
2092 return; 1832 return;
2093 1833
2094 case range_golem: /* Control summoned monsters from scrolls */ 1834 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); 1835 control_golem (op->contr->ranges[range_golem], dir);
2102 return; 1836 return;
2103 1837
2104 case range_skill: 1838 case range_skill:
2105 if (!op->chosen_skill) 1839 if (!op->chosen_skill)
2106 { 1840 {
2107 if (op->type == PLAYER) 1841 if (op->type == PLAYER)
2108 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1842 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1843
2109 return; 1844 return;
2110 } 1845 }
1846
2111 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1847 do_skill (op, op, op->chosen_skill, dir, NULL);
2112 return; 1848 return;
2113 case range_builder: 1849 case range_builder:
2114 apply_map_builder (op, dir); 1850 apply_map_builder (op, dir);
2115 return; 1851 return;
2116 default: 1852 default:
2117 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1853 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2118 return; 1854 return;
2119 } 1855 }
2120} 1856}
2121
2122
2123 1857
2124/* find_key 1858/* find_key
2125 * We try to find a key for the door as passed. If we find a key 1859 * 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 1860 * and successfully use it, we return the key, otherwise NULL
2127 * This function merges both normal and locked door, since the logic 1861 * This function merges both normal and locked door, since the logic
… …
2129 * pl is the player, 1863 * pl is the player,
2130 * inv is the objects inventory to searched 1864 * inv is the objects inventory to searched
2131 * door is the door we are trying to match against. 1865 * door is the door we are trying to match against.
2132 * This function can be called recursively to search containers. 1866 * This function can be called recursively to search containers.
2133 */ 1867 */
2134
2135object * 1868object *
2136find_key (object *pl, object *container, object *door) 1869find_key (object *pl, object *container, object *door)
2137{ 1870{
2138 object *tmp, *key; 1871 object *tmp, *key;
2139 1872
2140 /* Should not happen, but sanity checking is never bad */ 1873 /* Should not happen, but sanity checking is never bad */
2141 if (container->inv == NULL) 1874 if (!container->inv)
2142 return NULL; 1875 return 0;
2143 1876
2144 /* First, lets try to find a key in the top level inventory */ 1877 /* First, lets try to find a key in the top level inventory */
2145 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1878 for (tmp = container->inv; tmp; tmp = tmp->below)
2146 { 1879 {
2147 if (door->type == DOOR && tmp->type == KEY) 1880 if (door->type == DOOR && tmp->type == KEY)
2148 break; 1881 break;
2149 /* For sanity, we should really check door type, but other stuff 1882 /* For sanity, we should really check door type, but other stuff
2150 * (like containers) can be locked with special keys 1883 * (like containers) can be locked with special keys
2151 */ 1884 */
2152 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1885 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2153 break; 1886 break;
2154 } 1887 }
1888
2155 /* No key found - lets search inventories now */ 1889 /* No key found - lets search inventories now */
2156 /* If we find and use a key in an inventory, return at that time. 1890 /* 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 1891 * otherwise, if we search all the inventories and still don't find
2158 * a key, return 1892 * a key, return
2159 */ 1893 */
2160 if (!tmp) 1894 if (!tmp)
2161 { 1895 {
2162 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1896 for (tmp = container->inv; tmp; tmp = tmp->below)
2163 { 1897 {
2164 /* No reason to search empty containers */ 1898 /* No reason to search empty containers */
2165 if (tmp->type == CONTAINER && tmp->inv) 1899 if (tmp->type == CONTAINER && tmp->inv)
2166 { 1900 {
2167 if ((key = find_key (pl, tmp, door)) != NULL) 1901 if ((key = find_key (pl, tmp, door)))
2168 return key; 1902 return key;
2169 } 1903 }
2170 } 1904 }
1905
2171 if (!tmp) 1906 if (!tmp)
2172 return NULL; 1907 return NULL;
2173 } 1908 }
1909
2174 /* We get down here if we have found a key. Now if its in a container, 1910 /* 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 1911 * see if we actually want to use it
2176 */ 1912 */
2177 if (pl != container) 1913 if (pl != container)
2178 { 1914 {
… …
2199 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1935 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)); 1936 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2201 return NULL; 1937 return NULL;
2202 } 1938 }
2203 } 1939 }
1940
2204 return tmp; 1941 return tmp;
2205} 1942}
2206 1943
2207/* moved door processing out of move_player_attack. 1944/* moved door processing out of move_player_attack.
2208 * returns 1 if player has opened the door with a key 1945 * returns 1 if player has opened the door with a key
… …
2210 * 0 otherwise 1947 * 0 otherwise
2211 */ 1948 */
2212static int 1949static int
2213player_attack_door (object *op, object *door) 1950player_attack_door (object *op, object *door)
2214{ 1951{
2215
2216 /* If its a door, try to find a use a key. If we do destroy the door, 1952 /* If its a door, try to find a use a key. If we do destroy the door,
2217 * might as well return immediately as there is nothing more to do - 1953 * might as well return immediately as there is nothing more to do -
2218 * otherwise, we fall through to the rest of the code. 1954 * otherwise, we fall through to the rest of the code.
2219 */ 1955 */
2220 object *key = find_key (op, op, door); 1956 object *key = find_key (op, op, door);
… …
2227 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1963 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2228 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
2229 make_visible (op); 1965 make_visible (op);
2230 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2231 spring_trap (door->inv, op); 1967 spring_trap (door->inv, op);
1968
2232 if (door->type == DOOR) 1969 if (door->type == DOOR)
2233 {
2234 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1970 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2235 }
2236 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
2237 { 1972 {
2238 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1973 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2239 remove_door2 (door); /* remove door without violence ;-) */ 1974 remove_door2 (door); /* remove door without violence ;-) */
2240 } 1975 }
1976
2241 /* Do this after we print the message */ 1977 /* Do this after we print the message */
2242 decrease_ob (key); /* Use up one of the keys */ 1978 decrease_ob (key); /* Use up one of the keys */
2243 /* Need to update the weight the container the key was in */ 1979 /* Need to update the weight the container the key was in */
2244 if (container != op) 1980 if (container != op)
2245 esrv_update_item (UPD_WEIGHT, op, container); 1981 esrv_update_item (UPD_WEIGHT, op, container);
1982
2246 return 1; /* Nothing more to do below */ 1983 return 1; /* Nothing more to do below */
2247 } 1984 }
2248 else if (door->type == LOCKED_DOOR) 1985 else if (door->type == LOCKED_DOOR)
2249 { 1986 {
2250 /* Might as well return now - no other way to open this */ 1987 /* Might as well return now - no other way to open this */
2251 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1988 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2252 return 1; 1989 return 1;
2253 } 1990 }
1991
2254 return 0; 1992 return 0;
2255} 1993}
2256 1994
2257/* This function is just part of a breakup from move_player. 1995/* This function is just part of a breakup from move_player.
2258 * It should keep the code cleaner. 1996 * It should keep the code cleaner.
2259 * When this is called, the players direction has been updated 1997 * When this is called, the players direction has been updated
2260 * (taking into account confusion.) The player is also actually 1998 * (taking into account confusion.) The player is also actually
2261 * going to try and move (not fire weapons). 1999 * going to try and move (not fire weapons).
2262 */ 2000 */
2263
2264void 2001void
2265move_player_attack (object *op, int dir) 2002move_player_attack (object *op, int dir)
2266{ 2003{
2267 object *tmp, *mon; 2004 object *tmp, *mon;
2268 sint16 nx, ny; 2005 sint16 nx, ny;
… …
2270 maptile *m; 2007 maptile *m;
2271 2008
2272 nx = freearr_x[dir] + op->x; 2009 nx = freearr_x[dir] + op->x;
2273 ny = freearr_y[dir] + op->y; 2010 ny = freearr_y[dir] + op->y;
2274 2011
2275 on_battleground = op_on_battleground (op, NULL, NULL); 2012 on_battleground = op_on_battleground (op, 0, 0);
2276 2013
2277 /* If braced, or can't move to the square, and it is not out of the 2014 /* 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 2015 * 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 2016 * 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 2017 * player. This is a pretty nasty hack, because if we could
… …
2285 */ 2022 */
2286 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2023 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2287 { 2024 {
2288 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2025 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2289 { 2026 {
2290 m = get_map_from_coord (op->map, &nx, &ny); 2027 m = op->map->xy_find (nx, ny);
2291 if (!m) 2028 if (!m)
2292 return; /* Don't think this should happen */ 2029 return; /* Don't think this should happen */
2293 } 2030 }
2294 else 2031 else
2295 m = op->map; 2032 m = op->map;
2296 2033
2297 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2034 if (!(tmp = m->at (nx, ny).bot))
2298 {
2299 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2300 return; 2035 return;
2301 }
2302 2036
2303 mon = NULL; 2037 mon = 0;
2304 /* Go through all the objects, and find ones of interest. Only stop if 2038 /* 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. 2039 * 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 2040 * if its a door or barrel (can roll) see if there may be monsters
2307 * on the space 2041 * on the space
2308 */ 2042 */
2309 while (tmp != NULL) 2043 while (tmp)
2310 { 2044 {
2311 if (tmp == op) 2045 if (tmp == op)
2312 { 2046 {
2313 tmp = tmp->above; 2047 tmp = tmp->above;
2314 continue; 2048 continue;
… …
2324 mon = tmp; 2058 mon = tmp;
2325 2059
2326 tmp = tmp->above; 2060 tmp = tmp->above;
2327 } 2061 }
2328 2062
2329 if (mon == NULL) /* This happens anytime the player tries to move */ 2063 if (!mon) /* This happens anytime the player tries to move */
2330 return; /* into a wall */ 2064 return; /* into a wall */
2331 2065
2332 if (mon->head != NULL) 2066 if (mon->head)
2333 mon = mon->head; 2067 mon = mon->head;
2334 2068
2335 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2069 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2336 if (player_attack_door (op, mon)) 2070 if (player_attack_door (op, mon))
2337 return; 2071 return;
… …
2359 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2093 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2360 { 2094 {
2361 /* If we're braced, we don't want to switch places with it */ 2095 /* If we're braced, we don't want to switch places with it */
2362 if (op->contr->braced) 2096 if (op->contr->braced)
2363 return; 2097 return;
2098
2364 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2099 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2365 (void) push_ob (mon, dir, op); 2100 (void) push_ob (mon, dir, op);
2366 if (op->contr->tmp_invis || op->hide) 2101 if (op->contr->tmp_invis || op->hide)
2367 make_visible (op); 2102 make_visible (op);
2103
2368 return; 2104 return;
2369 } 2105 }
2370 2106
2371 /* in certain circumstances, you shouldn't attack friendly 2107 /* in certain circumstances, you shouldn't attack friendly
2372 * creatures. Note that if you are braced, you can't push 2108 * creatures. Note that if you are braced, you can't push
… …
2374 * attack them either. 2110 * attack them either.
2375 */ 2111 */
2376 if ((mon->type == PLAYER || mon->enemy != op) && 2112 if ((mon->type == PLAYER || mon->enemy != op) &&
2377 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2113 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2378#ifdef PROHIBIT_PLAYERKILL 2114#ifdef PROHIBIT_PLAYERKILL
2379 (op->contr->peaceful 2115 (op->contr->peaceful
2380 || (mon->type == PLAYER 2116 || (mon->type == PLAYER
2381 && mon->contr-> 2117 && mon->contr->
2382 peaceful)) && 2118 peaceful)) &&
2383#else 2119#else
2384 op->contr->peaceful && 2120 op->contr->peaceful &&
2385#endif 2121#endif
2386 !on_battleground)) 2122 !on_battleground))
2387 { 2123 {
2388 if (!op->contr->braced) 2124 if (!op->contr->braced)
2389 { 2125 {
2390 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2126 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2391 (void) push_ob (mon, dir, op); 2127 push_ob (mon, dir, op);
2392 } 2128 }
2393 else 2129 else
2394 {
2395 new_draw_info (0, 0, op, "You withhold your attack"); 2130 new_draw_info (0, 0, op, "You withhold your attack");
2396 } 2131
2397 if (op->contr->tmp_invis || op->hide) 2132 if (op->contr->tmp_invis || op->hide)
2398 make_visible (op); 2133 make_visible (op);
2399 } 2134 }
2400 2135
2401 /* If the object is a boulder or other rollable object, then 2136 /* If the object is a boulder or other rollable object, then
… …
2412 * Way it works is like this: First, it must have some hit points 2147 * 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: 2148 * 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 2149 * 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. 2150 * that party_number -1 is no party, so attacks can still happen.
2416 */ 2151 */
2417
2418 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2152 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))) 2153 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2420 { 2154 {
2421 2155
2422 /* If the player hasn't hit something this tick, and does 2156 /* If the player hasn't hit something this tick, and does
… …
2429 op->speed_left += op->speed / op->contr->weapon_sp; 2163 op->speed_left += op->speed / op->contr->weapon_sp;
2430 2164
2431 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2165 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2432 } 2166 }
2433 2167
2434 skill_attack (mon, op, 0, NULL, NULL); 2168 skill_attack (mon, op, 0, 0, 0);
2435 2169
2436 /* If attacking another player, that player gets automatic 2170 /* If attacking another player, that player gets automatic
2437 * hitback, and doesn't loose luck either. 2171 * hitback, and doesn't loose luck either.
2438 * Disable hitback on the battleground or if the target is 2172 * Disable hitback on the battleground or if the target is
2439 * the wiz. 2173 * the wiz.
… …
2441 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2175 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2442 { 2176 {
2443 short luck = mon->stats.luck; 2177 short luck = mon->stats.luck;
2444 2178
2445 mon->contr->has_hit = 1; 2179 mon->contr->has_hit = 1;
2446 skill_attack (op, mon, 0, NULL, NULL); 2180 skill_attack (op, mon, 0, 0, 0);
2447 mon->stats.luck = luck; 2181 mon->stats.luck = luck;
2448 } 2182 }
2183
2449 if (action_makes_visible (op)) 2184 if (action_makes_visible (op))
2450 make_visible (op); 2185 make_visible (op);
2451 } 2186 }
2452 } /* if player should attack something */ 2187 } /* if player should attack something */
2453} 2188}
… …
2455int 2190int
2456move_player (object *op, int dir) 2191move_player (object *op, int dir)
2457{ 2192{
2458 int pick; 2193 int pick;
2459 2194
2460 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2195 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2461 return 0; 2196 return 0;
2462 2197
2463 /* Sanity check: make sure dir is valid */ 2198 /* Sanity check: make sure dir is valid */
2464 if ((dir < 0) || (dir >= 9)) 2199 if ((dir < 0) || (dir >= 9))
2465 { 2200 {
2466 LOG (llevError, "move_player: invalid direction %d\n", dir); 2201 LOG (llevError, "move_player: invalid direction %d\n", dir);
2467 return 0; 2202 return 0;
2468 } 2203 }
2469 2204
2470 /* peterm: added following line */ 2205 /* peterm: added following line */
2471 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2206 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2472 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2207 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2473 2208
2474 op->facing = dir; 2209 op->facing = dir;
2475 2210
2476 if (op->hide) 2211 if (op->hide)
2477 do_hidden_move (op); 2212 do_hidden_move (op);
… …
2488 2223
2489 /* Add special check for newcs players and fire on - this way, the 2224 /* Add special check for newcs players and fire on - this way, the
2490 * server can handle repeat firing. 2225 * server can handle repeat firing.
2491 */ 2226 */
2492 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2227 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2493 {
2494 op->direction = dir; 2228 op->direction = dir;
2495 }
2496 else 2229 else
2497 {
2498 op->direction = 0; 2230 op->direction = 0;
2499 } 2231
2500 /* Update how the player looks. Use the facing, so direction may 2232 /* Update how the player looks. Use the facing, so direction may
2501 * get reset to zero. This allows for full animation capabilities 2233 * get reset to zero. This allows for full animation capabilities
2502 * for players. 2234 * for players.
2503 */ 2235 */
2504 animate_object (op, op->facing); 2236 animate_object (op, op->facing);
… …
2513 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do.
2514 */ 2246 */
2515int 2247int
2516handle_newcs_player (object *op) 2248handle_newcs_player (object *op)
2517{ 2249{
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)) 2250 if (QUERY_FLAG (op, FLAG_SCARED))
2539 { 2251 {
2540 flee_player (op); 2252 flee_player (op);
2541 /* If player is still scared, that is his action for this tick */ 2253 /* If player is still scared, that is his action for this tick */
2542 if (QUERY_FLAG (op, FLAG_SCARED)) 2254 if (QUERY_FLAG (op, FLAG_SCARED))
2543 { 2255 {
2544 op->speed_left--; 2256 op->speed_left--;
2545 return 0; 2257 return 0;
2546 } 2258 }
2547 } 2259 }
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 2260
2557 /* call this here - we also will call this in do_ericserver, but 2261 /* call this here - we also will call this in do_ericserver, but
2558 * the players time has been increased when doericserver has been 2262 * the players time has been increased when doericserver has been
2559 * called, so we recheck it here. 2263 * called, so we recheck it here.
2560 */ 2264 */
2561 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2265 if (op->contr->ns->handle_command ())
2562 for (int rep = 8; --rep && op->contr->socket->handle_command (); ) 2266 return 1;
2563 ;
2564 2267
2565 if (op->speed_left < 0) 2268 if (op->speed_left > 0)
2566 return 0; 2269 {
2567
2568 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2270 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2569 { 2271 {
2570 /* All move commands take 1 tick, at least for now */ 2272 /* All move commands take 1 tick, at least for now */
2571 op->speed_left--; 2273 op->speed_left--;
2572 2274
2573 /* Instead of all the stuff below, let move_player take care 2275 /* Instead of all the stuff below, let move_player take care
2574 * of it. Also, some of the skill stuff is only put in 2276 * of it. Also, some of the skill stuff is only put in
2575 * there, as well as the confusion stuff. 2277 * there, as well as the confusion stuff.
2576 */ 2278 */
2577 move_player (op, op->direction); 2279 move_player (op, op->direction);
2578 if (op->speed_left > 0) 2280
2579 return 1; 2281 return op->speed_left > 0;
2580 else 2282 }
2581 return 0;
2582 } 2283 }
2583 2284
2584 return 0; 2285 return 0;
2585} 2286}
2586 2287
… …
2606 op->stats.hp = op->stats.maxhp; 2307 op->stats.hp = op->stats.maxhp;
2607 2308
2608 if (op->stats.food < 0) 2309 if (op->stats.food < 0)
2609 op->stats.food = 999; 2310 op->stats.food = 999;
2610 2311
2611 fix_player (op); 2312 op->update_stats ();
2612 return 1; 2313 return 1;
2613 } 2314 }
2614 2315
2615 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2316 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2616 CLEAR_FLAG (op, FLAG_LIFESAVE); 2317 CLEAR_FLAG (op, FLAG_LIFESAVE);
… …
2624 * from. 2325 * from.
2625 */ 2326 */
2626void 2327void
2627remove_unpaid_objects (object *op, object *env) 2328remove_unpaid_objects (object *op, object *env)
2628{ 2329{
2629 object *next;
2630
2631 while (op) 2330 while (op)
2632 { 2331 {
2633 next = op->below; /* Make sure we have a good value, in case 2332 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2634 * we remove object 'op' 2333
2635 */
2636 if (QUERY_FLAG (op, FLAG_UNPAID)) 2334 if (QUERY_FLAG (op, FLAG_UNPAID))
2637 { 2335 {
2638 op->remove ();
2639 op->x = env->x;
2640 op->y = env->y;
2641 if (env->type == PLAYER) 2336 if (env->type == PLAYER)
2642 esrv_del_item (env->contr, op->count); 2337 esrv_del_item (env->contr, op->count);
2643 insert_ob_in_map (op, env->map, NULL, 0); 2338
2339 op->insert_at (env);
2644 } 2340 }
2645 else if (op->inv) 2341 else if (op->inv)
2646 remove_unpaid_objects (op->inv, env); 2342 remove_unpaid_objects (op->inv, env);
2647 2343
2648 op = next; 2344 op = next;
2649 } 2345 }
2650} 2346}
2651
2652 2347
2653/* 2348/*
2654 * Returns pointer a static string containing gravestone text 2349 * Returns pointer a static string containing gravestone text
2655 * Moved from apply.c to player.c - player.c is what 2350 * Moved from apply.c to player.c - player.c is what
2656 * actually uses this function. player.c may not be quite the 2351 * actually uses this function. player.c may not be quite the
… …
2690 strncat (buf2, " ", 20 - strlen (buf) / 2); 2385 strncat (buf2, " ", 20 - strlen (buf) / 2);
2691 strcat (buf2, buf); 2386 strcat (buf2, buf);
2692 2387
2693 return buf2; 2388 return buf2;
2694} 2389}
2695
2696
2697 2390
2698void 2391void
2699do_some_living (object *op) 2392do_some_living (object *op)
2700{ 2393{
2701 int last_food = op->stats.food; 2394 int last_food = op->stats.food;
… …
2707 int rate_grace = 2000; 2400 int rate_grace = 2000;
2708 const int max_hp = 1; 2401 const int max_hp = 1;
2709 const int max_sp = 1; 2402 const int max_sp = 1;
2710 const int max_grace = 1; 2403 const int max_grace = 1;
2711 2404
2712 if (op->contr->outputs_sync) 2405 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 } 2406 {
2407 op->invisible = 1000;
2408 /* the socket code flashes the player visible/invisible
2409 * depending on the value of invisible, so we need to
2410 * alternate it here for it to work correctly.
2411 */
2412 if (pticks & 2)
2413 op->invisible--;
2414 }
2415 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2416 {
2417 if (!op->invisible--)
2418 {
2419 make_visible (op);
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2421 }
2422 }
2718 2423
2719 if (op->contr->state == ST_PLAYING) 2424 if (op->contr->ns->state == ST_PLAYING)
2720 { 2425 {
2721
2722 /* these next three if clauses make it possible to SLOW DOWN 2426 /* these next three if clauses make it possible to SLOW DOWN
2723 hp/grace/spellpoint regeneration. */ 2427 hp/grace/spellpoint regeneration. */
2724 if (op->contr->gen_hp >= 0) 2428 if (op->contr->gen_hp >= 0)
2725 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2429 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2726 else 2430 else
2727 { 2431 {
2728 gen_hp = op->stats.maxhp; 2432 gen_hp = op->stats.maxhp;
2729 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2433 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2730 } 2434 }
2435
2731 if (op->contr->gen_sp >= 0) 2436 if (op->contr->gen_sp >= 0)
2732 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2437 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2733 else 2438 else
2734 { 2439 {
2735 gen_sp = op->stats.maxsp; 2440 gen_sp = op->stats.maxsp;
2736 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2441 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2737 } 2442 }
2443
2738 if (op->contr->gen_grace >= 0) 2444 if (op->contr->gen_grace >= 0)
2739 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2445 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2740 else 2446 else
2741 { 2447 {
2742 gen_grace = op->stats.maxgrace; 2448 gen_grace = op->stats.maxgrace;
2743 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2744 } 2450 }
2745 2451
2746 /* Regenerate Spell Points */ 2452 /* Regenerate Spell Points */
2747 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2748 { 2454 {
2749 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2455 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) 2456 if (op->stats.sp < op->stats.maxsp)
2751 { 2457 {
2752 op->stats.sp++; 2458 op->stats.sp++;
… …
2758 op->stats.food += op->contr->digestion; 2464 op->stats.food += op->contr->digestion;
2759 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2465 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2760 op->stats.food = last_food; 2466 op->stats.food = last_food;
2761 } 2467 }
2762 } 2468 }
2469
2763 if (max_sp > 1) 2470 if (max_sp > 1)
2764 { 2471 {
2765 over_sp = (gen_sp + 10) / rate_sp; 2472 over_sp = (gen_sp + 10) / rate_sp;
2766 if (over_sp > 0) 2473 if (over_sp > 0)
2767 { 2474 {
2768 if (op->stats.sp < op->stats.maxsp) 2475 if (op->stats.sp < op->stats.maxsp)
2769 { 2476 {
2770 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2477 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2478
2771 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2479 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2772 op->stats.sp--; 2480 op->stats.sp--;
2481
2773 if (op->stats.sp > op->stats.maxsp) 2482 if (op->stats.sp > op->stats.maxsp)
2774 op->stats.sp = op->stats.maxsp; 2483 op->stats.sp = op->stats.maxsp;
2775 } 2484 }
2776 op->last_sp = 0; 2485 op->last_sp = 0;
2777 } 2486 }
2778 else 2487 else
2779 {
2780 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2488 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2781 }
2782 } 2489 }
2783 else 2490 else
2784 {
2785 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2491 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2786 }
2787 } 2492 }
2788 2493
2789 /* Regenerate Grace */ 2494 /* Regenerate Grace */
2790 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2495 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2791 if (--op->last_grace < 0) 2496 if (--op->last_grace < 0)
2792 { 2497 {
2793 if (op->stats.grace < op->stats.maxgrace / 2) 2498 if (op->stats.grace < op->stats.maxgrace / 2)
2794 op->stats.grace++; /* no penalty in food for regaining grace */ 2499 op->stats.grace++; /* no penalty in food for regaining grace */
2500
2795 if (max_grace > 1) 2501 if (max_grace > 1)
2796 { 2502 {
2797 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2503 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2798 if (over_grace > 0) 2504 if (over_grace > 0)
2799 { 2505 {
… …
2827 op->stats.food += op->contr->digestion; 2533 op->stats.food += op->contr->digestion;
2828 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2534 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2829 op->stats.food = last_food; 2535 op->stats.food = last_food;
2830 } 2536 }
2831 } 2537 }
2538
2832 if (max_hp > 1) 2539 if (max_hp > 1)
2833 { 2540 {
2834 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2541 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2835 if (over_hp > 0) 2542 if (over_hp > 0)
2836 { 2543 {
… …
2860 2567
2861 if (op->contr->gen_hp > 0) 2568 if (op->contr->gen_hp > 0)
2862 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2569 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2863 else 2570 else
2864 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2571 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2572
2865 /* dms do not consume food */ 2573 /* dms do not consume food */
2866 if (!QUERY_FLAG (op, FLAG_WIZ)) 2574 if (!QUERY_FLAG (op, FLAG_WIZ))
2867 op->stats.food--; 2575 op->stats.food--;
2868 } 2576 }
2869 }
2870 2577
2871 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2578 if (op->stats.food < 0 && op->stats.hp >= 0)
2872 { 2579 {
2873 object *tmp, *flesh = NULL; 2580 object *tmp, *flesh = 0;
2874 2581
2875 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2582 for (tmp = op->inv; tmp; tmp = tmp->below)
2876 { 2583 {
2877 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2584 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2878 {
2879 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2880 { 2585 {
2586 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2587 {
2881 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2588 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882 manual_apply (op, tmp, 0); 2589 manual_apply (op, tmp, 0);
2883 if (op->stats.food >= 0 || op->stats.hp < 0) 2590 if (op->stats.food >= 0 || op->stats.hp < 0)
2884 break; 2591 break;
2885 } 2592 }
2886 else if (tmp->type == FLESH) 2593 else if (tmp->type == FLESH)
2887 flesh = tmp; 2594 flesh = tmp;
2888 } /* End if paid for object */ 2595 } /* End if paid for object */
2889 } /* end of for loop */ 2596 } /* end of for loop */
2597
2890 /* If player is still starving, it means they don't have any food, so 2598 /* If player is still starving, it means they don't have any food, so
2891 * eat flesh instead. 2599 * eat flesh instead.
2892 */ 2600 */
2893 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2601 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2894 { 2602 {
2895 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2603 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2896 manual_apply (op, flesh, 0); 2604 manual_apply (op, flesh, 0);
2897 } 2605 }
2898 } /* end if player is starving */ 2606 }
2899 2607
2900 while (op->stats.food < 0 && op->stats.hp > 0) 2608 while (op->stats.food < 0 && op->stats.hp >= 0)
2901 op->stats.food++, op->stats.hp--; 2609 op->stats.food++, op->stats.hp--;
2902 2610
2903 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2611 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2904 kill_player (op); 2612 kill_player (op);
2613 }
2905} 2614}
2906
2907
2908 2615
2909/* If the player should die (lack of hp, food, etc), we call this. 2616/* 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 2617 * 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 2618 * permadeath, no lifesave), this will take care of removing the player
2912 * file. 2619 * file.
… …
2942 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2649 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..."); 2650 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2944 2651
2945 /* restore player */ 2652 /* restore player */
2946 at = archetype::find ("poisoning"); 2653 at = archetype::find ("poisoning");
2947 tmp = present_arch_in_ob (at, op); 2654 if (object *tmp = present_arch_in_ob (at, op))
2948 if (tmp)
2949 { 2655 {
2950 tmp->destroy (); 2656 tmp->destroy ();
2951 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2657 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2952 } 2658 }
2953 2659
2954 at = archetype::find ("confusion"); 2660 at = archetype::find ("confusion");
2955 tmp = present_arch_in_ob (at, op); 2661 if (object *tmp = present_arch_in_ob (at, op))
2956 if (tmp)
2957 { 2662 {
2958 tmp->destroy (); 2663 tmp->destroy ();
2959 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2664 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2960 } 2665 }
2961 2666
… …
2963 op->stats.hp = op->stats.maxhp; 2668 op->stats.hp = op->stats.maxhp;
2964 if (op->stats.food <= 0) 2669 if (op->stats.food <= 0)
2965 op->stats.food = 999; 2670 op->stats.food = 999;
2966 2671
2967 /* create a bodypart-trophy to make the winner happy */ 2672 /* create a bodypart-trophy to make the winner happy */
2968 tmp = arch_to_object (archetype::find ("finger")); 2673 if (object *tmp = arch_to_object (archetype::find ("finger")))
2969 if (tmp != NULL)
2970 { 2674 {
2971 sprintf (buf, "%s's finger", &op->name); 2675 sprintf (buf, "%s's finger", &op->name);
2972 tmp->name = buf; 2676 tmp->name = buf;
2973 sprintf (buf, " This finger has been cut off %s\n" 2677 sprintf (buf, " This finger has been cut off %s\n"
2974 " the %s, when he was defeated at\n level %d by %s.\n", 2678 " the %s, when he was defeated at\n level %d by %s.\n",
2975 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2679 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2976 tmp->msg = buf; 2680 tmp->msg = buf;
2977 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2681 tmp->value = 0, tmp->type = 0;
2978 tmp->materialname = NULL; 2682 tmp->materialname = "organics";
2979 tmp->x = op->x, tmp->y = op->y; 2683 tmp->insert_at (op, tmp);
2980 insert_ob_in_map (tmp, op->map, op, 0);
2981 } 2684 }
2982 2685
2983 /* teleport defeated player to new destination */ 2686 /* teleport defeated player to new destination */
2984 transfer_ob (op, x, y, 0, NULL); 2687 transfer_ob (op, x, y, 0, NULL);
2985 op->contr->braced = 0; 2688 op->contr->braced = 0;
… …
2990 2693
2991 command_kill_pets (op, 0); 2694 command_kill_pets (op, 0);
2992 2695
2993 if (op->stats.food < 0) 2696 if (op->stats.food < 0)
2994 { 2697 {
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); 2698 sprintf (buf, "%s starved to death.", &op->name);
3003 strcpy (op->contr->killer, "starvation"); 2699 strcpy (op->contr->killer, "starvation");
3004 } 2700 }
3005 else 2701 else
3006 {
3007 if (op->contr->explore)
3008 {
3009 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
3010 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3011 op->stats.hp = op->stats.maxhp;
3012 return;
3013 }
3014 sprintf (buf, "%s died.", &op->name); 2702 sprintf (buf, "%s died.", &op->name);
3015 } 2703
3016 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2704 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3017 2705
3018 /* save the map location for corpse, gravestone */ 2706 /* save the map location for corpse, gravestone */
3019 x = op->x; 2707 x = op->x;
3020 y = op->y; 2708 y = op->y;
3021 map = op->map; 2709 map = op->map;
3022 2710
3023
3024 if (settings.not_permadeth == TRUE)
3025 {
3026 /* NOT_PERMADEATH code. This basically brings the character back to 2711 /* NOT_PERMADEATH code. This basically brings the character back to
3027 * life if they are dead - it takes some exp and a random stat. 2712 * 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. 2713 * See the config.h file for a little more in depth detail about this.
3029 */ 2714 */
3030 2715
3031 /* Basically two ways to go - remove a stat permanently, or just 2716 /* Basically two ways to go - remove a stat permanently, or just
3032 * make it depletion. This bunch of code deals with that aspect 2717 * make it depletion. This bunch of code deals with that aspect
3033 * of death. 2718 * of death.
3034 */ 2719 */
3035#ifndef COZY_SERVER 2720#ifndef COZY_SERVER
3036 if (settings.balanced_stat_loss) 2721 if (settings.balanced_stat_loss)
3037 { 2722 {
3038 /* If stat loss is permanent, lose one stat only. */ 2723 /* If stat loss is permanent, lose one stat only. */
3039 /* Lower level chars don't lose as many stats because they suffer 2724 /* Lower level chars don't lose as many stats because they suffer
3040 more if they do. */ 2725 more if they do. */
3041 /* Higher level characters can afford things such as potions of 2726 /* Higher level characters can afford things such as potions of
3042 restoration, or better, stat potions. So we slug them that 2727 restoration, or better, stat potions. So we slug them that
3043 little bit harder. */ 2728 little bit harder. */
3044 /* GD */ 2729 /* GD */
3045 if (settings.stat_loss_on_death) 2730 if (settings.stat_loss_on_death)
3046 num_stats_lose = 1; 2731 num_stats_lose = 1;
3047 else
3048 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3049 }
3050 else 2732 else
3051 { 2733 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2734 }
2735 else
3052 num_stats_lose = 1; 2736 num_stats_lose = 1;
3053 } 2737
3054 lost_a_stat = 0; 2738 lost_a_stat = 0;
3055 2739
3056 for (z = 0; z < num_stats_lose; z++) 2740 for (z = 0; z < num_stats_lose; z++)
3057 { 2741 {
3058 i = RANDOM () % NUM_STATS; 2742 i = RANDOM () % NUM_STATS;
3059 2743
3060 if (settings.stat_loss_on_death) 2744 if (settings.stat_loss_on_death)
3061 { 2745 {
3062 /* Pick a random stat and take a point off it. Tell the player 2746 /* Pick a random stat and take a point off it. Tell the player
3063 * what he lost. 2747 * what he lost.
3064 */ 2748 */
3065 change_attr_value (&(op->stats), i, -1); 2749 change_attr_value (&(op->stats), i, -1);
3066 check_stat_bounds (&(op->stats)); 2750 check_stat_bounds (&(op->stats));
3067 change_attr_value (&(op->contr->orig_stats), i, -1); 2751 change_attr_value (&(op->contr->orig_stats), i, -1);
3068 check_stat_bounds (&(op->contr->orig_stats)); 2752 check_stat_bounds (&(op->contr->orig_stats));
3069 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2753 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3070 lost_a_stat = 1; 2754 lost_a_stat = 1;
2755 }
2756 else
2757 {
2758 /* deplete a stat */
2759 archetype *deparch = archetype::find ("depletion");
2760 object *dep;
2761
2762 dep = present_arch_in_ob (deparch, op);
2763 if (!dep)
2764 {
2765 dep = arch_to_object (deparch);
2766 insert_ob_in_ob (dep, op);
3071 } 2767 }
3072 else 2768 lose_this_stat = 1;
2769 if (settings.balanced_stat_loss)
3073 { 2770 {
3074 /* deplete a stat */ 2771 /* GD */
3075 archetype *deparch = archetype::find ("depletion"); 2772 /* Get the stat that we're about to deplete. */
3076 object *dep; 2773 this_stat = get_attr_value (&(dep->stats), i);
3077 2774 if (this_stat < 0)
3078 dep = present_arch_in_ob (deparch, op);
3079 if (!dep)
3080 { 2775 {
3081 dep = arch_to_object (deparch); 2776 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3082 insert_ob_in_ob (dep, op); 2777 int keep_chance = this_stat * this_stat;
3083 } 2778
3084 lose_this_stat = 1; 2779 /* 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) 2780 if (keep_chance < 1)
2781 keep_chance = 1;
2782
2783 /* There is a maximum depletion total per level. */
2784 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3091 { 2785 {
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; 2786 lose_this_stat = 0;
3103 /* Take loss chance vs keep chance to see if we 2787 /* Take loss chance vs keep chance to see if we
3104 retain the stat. */ 2788 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 } 2789 }
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 */ 2790 else
3126 if (this_stat >= -50)
3127 { 2791 {
3128 change_attr_value (&(dep->stats), i, -1); 2792 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; 2793 lose_this_stat = 0;
2794 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2795 this_stat, keep_chance, loss_chance,
2796 lose_this_stat?"LOSE":"KEEP"); */
3133 } 2797 }
3134 } 2798 }
3135 } 2799 }
2800
2801 if (lose_this_stat)
2802 {
2803 this_stat = get_attr_value (&(dep->stats), i);
2804 /* We could try to do something clever like find another
2805 * stat to reduce if this fails. But chances are, if
2806 * stats have been depleted to -50, all are pretty low
2807 * and should be roughly the same, so it shouldn't make a
2808 * difference.
2809 */
2810 if (this_stat >= -50)
2811 {
2812 change_attr_value (&(dep->stats), i, -1);
2813 SET_FLAG (dep, FLAG_APPLIED);
2814 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2815 op->update_stats ();
2816 lost_a_stat = 1;
2817 }
3136 } 2818 }
2819 }
2820 }
3137 /* If no stat lost, tell the player. */ 2821 /* If no stat lost, tell the player. */
3138 if (!lost_a_stat) 2822 if (!lost_a_stat)
3139 { 2823 {
3140 /* determine_god() seems to not work sometimes... why is this? 2824 /* determine_god() seems to not work sometimes... why is this?
3141 Should I be using something else? GD */ 2825 Should I be using something else? GD */
3142 const char *god = determine_god (op); 2826 const char *god = determine_god (op);
3143 2827
3144 if (god && (strcmp (god, "none"))) 2828 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); 2829 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3146 else 2830 else
3147 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2831 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3148 } 2832 }
3149#else 2833#else
3150 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2834 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3151#endif 2835#endif
3152 2836
3153 /* Put a gravestone up where the character 'almost' died. List the 2837 /* Put a gravestone up where the character 'almost' died. List the
3154 * exp loss on the stone. 2838 * exp loss on the stone.
3155 */ 2839 */
3156 tmp = arch_to_object (archetype::find ("gravestone")); 2840 tmp = arch_to_object (archetype::find ("gravestone"));
3157 sprintf (buf, "%s's gravestone", &op->name); 2841 sprintf (buf, "%s's gravestone", &op->name);
3158 tmp->name = buf; 2842 tmp->name = buf;
3159 sprintf (buf, "%s's gravestones", &op->name); 2843 sprintf (buf, "%s's gravestones", &op->name);
3160 tmp->name_pl = buf; 2844 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); 2845 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; 2846 tmp->msg = buf;
3163 tmp->x = op->x, tmp->y = op->y; 2847 tmp->x = op->x, tmp->y = op->y;
3164 insert_ob_in_map (tmp, op->map, NULL, 0); 2848 insert_ob_in_map (tmp, op->map, NULL, 0);
3165 2849
3166 /**************************************/ 2850 /**************************************/
3167 /* */ 2851 /* */
3168 /* Subtract the experience points, */ 2852 /* Subtract the experience points, */
3169 /* if we died cause of food, give us */ 2853 /* if we died cause of food, give us */
3170 /* food, and reset HP's... */ 2854 /* food, and reset HP's... */
3171 /* */ 2855 /* */
3172 /**************************************/ 2856 /**************************************/
3173 2857
3174 /* remove any poisoning and confusion the character may be suffering. */ 2858 /* remove any poisoning and confusion the character may be suffering. */
3175 /* restore player */ 2859 /* restore player */
3176 at = archetype::find ("poisoning"); 2860 at = archetype::find ("poisoning");
3177 tmp = present_arch_in_ob (at, op); 2861 tmp = present_arch_in_ob (at, op);
3178 2862
3179 if (tmp) 2863 if (tmp)
3180 { 2864 {
3181 tmp->destroy (); 2865 tmp->destroy ();
3182 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2866 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3183 } 2867 }
3184 2868
3185 at = archetype::find ("confusion"); 2869 at = archetype::find ("confusion");
3186 tmp = present_arch_in_ob (at, op); 2870 tmp = present_arch_in_ob (at, op);
3187 if (tmp) 2871 if (tmp)
3188 { 2872 {
3189 tmp->destroy (); 2873 tmp->destroy ();
3190 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2874 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3191 } 2875 }
3192 2876
3193 cure_disease (op, 0); /* remove any disease */ 2877 cure_disease (op, 0); /* remove any disease */
3194 2878
3195 /*add_exp(op, (op->stats.exp * -0.20)); */ 2879 /*add_exp(op, (op->stats.exp * -0.20)); */
3196 apply_death_exp_penalty (op); 2880 apply_death_exp_penalty (op);
3197 if (op->stats.food < 100) 2881 if (op->stats.food < 100)
3198 op->stats.food = 900; 2882 op->stats.food = 900;
3199 op->stats.hp = op->stats.maxhp; 2883 op->stats.hp = op->stats.maxhp;
3200 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2884 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3201 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2885 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3202 2886
3203 /* 2887 /*
3204 * Check to see if the player is in a shop. IF so, then check to see if 2888 * 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 2889 * and put them back in the map.
3206 * in the map. 2890 */
3207 */
3208
3209 if (is_in_shop (op))
3210 remove_unpaid_objects (op->inv, op); 2891 remove_unpaid_objects (op->inv, op);
3211 2892
3212 /****************************************/ 2893 /****************************************/
3213 /* */ 2894 /* */
3214 /* Move player to his current respawn- */ 2895 /* Move player to his current respawn- */
3215 /* position (usually last savebed) */ 2896 /* position (usually last savebed) */
3216 /* */ 2897 /* */
3217 /****************************************/ 2898 /****************************************/
3218 2899
3219 enter_player_savebed (op); 2900 enter_player_savebed (op);
3220 2901
3221 /* Save the player before inserting the force to reduce
3222 * chance of abuse.
3223 */
3224 op->contr->braced = 0; 2902 op->contr->braced = 0;
3225 save_player (op, 1);
3226 2903
3227 /* it is possible that the player has blown something up 2904 /* it is possible that the player has blown something up
3228 * at his savebed location, and that can have long lasting 2905 * at his savebed location, and that can have long lasting
3229 * spell effects. So first see if there is a spell effect 2906 * spell effects. So first see if there is a spell effect
3230 * on the space that might harm the player. 2907 * on the space that might harm the player.
3231 */ 2908 */
3232 will_kill_again = 0; 2909 will_kill_again = 0;
3233 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2910 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3234 if (tmp->type == SPELL_EFFECT) 2911 if (tmp->type == SPELL_EFFECT)
3235 will_kill_again |= tmp->attacktype; 2912 will_kill_again |= tmp->attacktype;
3236 2913
3237 if (will_kill_again) 2914 if (will_kill_again)
3238 { 2915 {
3239 object *force; 2916 object *force;
3240 int at; 2917 int at;
3241 2918
3242 force = get_archetype (FORCE_NAME); 2919 force = get_archetype (FORCE_NAME);
3243 /* 50 ticks should be enough time for the spell to abate */ 2920 /* 50 ticks should be enough time for the spell to abate */
3244 force->speed = 0.1; 2921 force->speed = 0.1;
3245 force->speed_left = -5.0; 2922 force->speed_left = -5.0;
3246 SET_FLAG (force, FLAG_APPLIED); 2923 SET_FLAG (force, FLAG_APPLIED);
3247 for (at = 0; at < NROFATTACKS; at++) 2924 for (at = 0; at < NROFATTACKS; at++)
3248 if (will_kill_again & (1 << at)) 2925 if (will_kill_again & (1 << at))
3249 force->resist[at] = 100; 2926 force->resist[at] = 100;
3250 2927
3251 insert_ob_in_ob (force, op); 2928 insert_ob_in_ob (force, op);
3252 fix_player (op); 2929 op->update_stats ();
3253 2930
3254 } 2931 }
3255 2932
3256 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2933 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} 2934}
3325
3326 2935
3327void 2936void
3328loot_object (object *op) 2937loot_object (object *op)
3329{ /* Grab and destroy some treasure */ 2938{ /* Grab and destroy some treasure */
3330 object *tmp, *tmp2, *next; 2939 object *tmp, *tmp2, *next;
3331 2940
3332 if (op->container) 2941 op->close_container (); /* close open sack first */
3333 { /* close open sack first */
3334 esrv_apply_container (op, op->container);
3335 }
3336 2942
3337 for (tmp = op->inv; tmp != NULL; tmp = next) 2943 for (tmp = op->inv; tmp; tmp = next)
3338 { 2944 {
3339 next = tmp->below; 2945 next = tmp->below;
3340 if (tmp->type == EXPERIENCE || tmp->invisible) 2946
2947 if (tmp->invisible)
3341 continue; 2948 continue;
2949
3342 tmp->remove (); 2950 tmp->remove ();
3343 tmp->x = op->x, tmp->y = op->y; 2951 tmp->x = op->x, tmp->y = op->y;
2952
3344 if (tmp->type == CONTAINER) 2953 if (tmp->type == CONTAINER)
3345 { /* empty container to ground */ 2954 loot_object (tmp); /* empty container to ground */
3346 loot_object (tmp); 2955
3347 }
3348 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2956 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3349 { 2957 {
3350 if (tmp->nrof > 1) 2958 if (tmp->nrof > 1)
3351 { 2959 {
3352 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2960 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3353 tmp2->destroy (); 2961 tmp2->destroy ();
… …
3364/* 2972/*
3365 * fix_weight(): Check recursively the weight of all players, and fix 2973 * fix_weight(): Check recursively the weight of all players, and fix
3366 * what needs to be fixed. Refresh windows and fix speed if anything 2974 * what needs to be fixed. Refresh windows and fix speed if anything
3367 * was changed. 2975 * was changed.
3368 */ 2976 */
3369
3370void 2977void
3371fix_weight (void) 2978fix_weight (void)
3372{ 2979{
3373 player *pl; 2980 for_all_players (pl)
3374
3375 for (pl = first_player; pl != NULL; pl = pl->next)
3376 { 2981 {
3377 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2982 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3378 2983
3379 if (old == sum) 2984 if (old == sum)
3380 continue; 2985 continue;
3381 fix_player (pl->ob); 2986 pl->ob->update_stats ();
3382 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2987 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3383 } 2988 }
3384} 2989}
3385 2990
3386void 2991void
3387fix_luck (void) 2992fix_luck (void)
3388{ 2993{
3389 player *pl; 2994 for_all_players (pl)
3390
3391 for (pl = first_player; pl != NULL; pl = pl->next)
3392 if (!pl->ob->contr->state) 2995 if (!pl->ob->contr->ns->state)
3393 change_luck (pl->ob, 0); 2996 pl->ob->change_luck (0);
3394} 2997}
3395
3396 2998
3397/* cast_dust() - handles op throwing objects of type 'DUST'. 2999/* cast_dust() - handles op throwing objects of type 'DUST'.
3398 * This is much simpler in the new spell code - we basically 3000 * This is much simpler in the new spell code - we basically
3399 * just treat this as any other spell casting object. 3001 * just treat this as any other spell casting object.
3400 */ 3002 */
3401
3402void 3003void
3403cast_dust (object *op, object *throw_ob, int dir) 3004cast_dust (object *op, object *throw_ob, int dir)
3404{ 3005{
3405 object *skop, *spob; 3006 object *skop, *spob;
3406 3007
… …
3440 if (op->type == PLAYER) 3041 if (op->type == PLAYER)
3441 { 3042 {
3442 op->contr->tmp_invis = 0; 3043 op->contr->tmp_invis = 0;
3443 op->contr->invis_race = 0; 3044 op->contr->invis_race = 0;
3444 } 3045 }
3046
3445 update_object (op, UP_OBJ_FACE); 3047 update_object (op, UP_OBJ_CHANGE);
3446} 3048}
3447 3049
3448int 3050int
3449is_true_undead (object *op) 3051is_true_undead (object *op)
3450{ 3052{
3451 object *tmp = NULL;
3452
3453 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3053 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3454 return 1; 3054 return 1;
3455 3055
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; 3056 return 0;
3462} 3057}
3463 3058
3464/* look at the surrounding terrain to determine 3059/* look at the surrounding terrain to determine
3465 * the hideability of this object. Positive levels 3060 * the hideability of this object. Positive levels
… …
3521 3116
3522 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3117 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3523 3118
3524 /* its *extremely* hard to run and sneak/hide at the same time! */ 3119 /* its *extremely* hard to run and sneak/hide at the same time! */
3525 if (op->type == PLAYER && op->contr->run_on) 3120 if (op->type == PLAYER && op->contr->run_on)
3526 {
3527 if (!skop || num >= skop->level) 3121 if (!skop || num >= skop->level)
3528 { 3122 {
3529 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3123 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3530 make_visible (op); 3124 make_visible (op);
3531 return; 3125 return;
3532 } 3126 }
3533 else 3127 else
3534 num += 20; 3128 num += 20;
3535 } 3129
3536 num += op->map->difficulty; 3130 num += op->map->difficulty;
3537 hide = hideability (op); /* modify by terrain hidden level */ 3131 hide = hideability (op); /* modify by terrain hidden level */
3538 num -= hide; 3132 num -= hide;
3133
3539 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3134 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3540 { 3135 {
3541 make_visible (op); 3136 make_visible (op);
3542 if (op->type == PLAYER) 3137 if (op->type == PLAYER)
3543 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3138 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3544 } 3139 }
3545 else if (op->type == PLAYER && skop) 3140 else if (op->type == PLAYER && skop)
3546 {
3547 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3141 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3548 }
3549} 3142}
3550 3143
3551/* determine if who is standing near a hostile creature. */ 3144/* determine if who is standing near a hostile creature. */
3552 3145
3553int 3146int
… …
3580 if (mflags & P_OUT_OF_MAP) 3173 if (mflags & P_OUT_OF_MAP)
3581 continue; 3174 continue;
3582 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3175 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3583 continue; 3176 continue;
3584 3177
3585 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3178 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3586 { 3179 {
3587 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3180 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3588 return 1; 3181 return 1;
3589 else if (tmp->type == PLAYER) 3182 else if (tmp->type == PLAYER)
3590 { 3183 {
… …
3620 if (pl->type != PLAYER) 3213 if (pl->type != PLAYER)
3621 { 3214 {
3622 LOG (llevError, "player_can_view() called for non-player object\n"); 3215 LOG (llevError, "player_can_view() called for non-player object\n");
3623 return -1; 3216 return -1;
3624 } 3217 }
3218
3625 if (!pl || !op) 3219 if (!pl || !op)
3626 return 0; 3220 return 0;
3627 3221
3628 if (op->head)
3629 {
3630 op = op->head; 3222 op = op->head_ ();
3631 } 3223
3632 get_rangevector (pl, op, &rv, 0x1); 3224 get_rangevector (pl, op, &rv, 0x1);
3633 3225
3634 /* starting with the 'head' part, lets loop 3226 /* starting with the 'head' part, lets loop
3635 * through the object and find if it has any 3227 * through the object and find if it has any
3636 * part that is in the los array but isnt on 3228 * part that is in the los array but isnt on
… …
3644 3236
3645 /* only the viewable area the player sees is updated by LOS 3237 /* only the viewable area the player sees is updated by LOS
3646 * code, so we need to restrict ourselves to that range of values 3238 * code, so we need to restrict ourselves to that range of values
3647 * for any meaningful values. 3239 * for any meaningful values.
3648 */ 3240 */
3649 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3241 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3650 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3242 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3651 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3243 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3652 return 1; 3244 return 1;
3653 op = op->more; 3245 op = op->more;
3654 } 3246 }
3655 return 0; 3247 return 0;
3656} 3248}
… …
3753 char buf[MAX_BUF]; /* tmp. string buffer */ 3345 char buf[MAX_BUF]; /* tmp. string buffer */
3754 int i = 0, j = 0; 3346 int i = 0, j = 0;
3755 3347
3756 /* get the appropriate treasurelist */ 3348 /* get the appropriate treasurelist */
3757 if (atnr == ATNR_FIRE) 3349 if (atnr == ATNR_FIRE)
3758 trlist = find_treasurelist ("dragon_ability_fire"); 3350 trlist = treasurelist::find ("dragon_ability_fire");
3759 else if (atnr == ATNR_COLD) 3351 else if (atnr == ATNR_COLD)
3760 trlist = find_treasurelist ("dragon_ability_cold"); 3352 trlist = treasurelist::find ("dragon_ability_cold");
3761 else if (atnr == ATNR_ELECTRICITY) 3353 else if (atnr == ATNR_ELECTRICITY)
3762 trlist = find_treasurelist ("dragon_ability_elec"); 3354 trlist = treasurelist::find ("dragon_ability_elec");
3763 else if (atnr == ATNR_POISON) 3355 else if (atnr == ATNR_POISON)
3764 trlist = find_treasurelist ("dragon_ability_poison"); 3356 trlist = treasurelist::find ("dragon_ability_poison");
3765 3357
3766 if (trlist == NULL || who->type != PLAYER) 3358 if (trlist == NULL || who->type != PLAYER)
3767 return; 3359 return;
3768 3360
3769 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3361 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3770 3362
3771 if (tr == NULL || tr->item == NULL) 3363 if (!tr || !tr->item)
3772 { 3364 {
3773 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3365 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3774 return; 3366 return;
3775 } 3367 }
3776 3368
… …
3842 { 3434 {
3843 /* forces in the treasurelist can alter the player's stats */ 3435 /* forces in the treasurelist can alter the player's stats */
3844 object *skin; 3436 object *skin;
3845 3437
3846 /* first get the dragon skin force */ 3438 /* first get the dragon skin force */
3439 shstr_cmp dragon_skin_force ("dragon_skin_force");
3847 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3440 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3441 ;
3442
3848 if (skin == NULL) 3443 if (!skin)
3849 return; 3444 return;
3850 3445
3851 /* adding new spellpath attunements */ 3446 /* adding new spellpath attunements */
3852 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3447 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3853 { 3448 {
… …
3898 * not readied. 3493 * not readied.
3899 */ 3494 */
3900void 3495void
3901player_unready_range_ob (player *pl, object *ob) 3496player_unready_range_ob (player *pl, object *ob)
3902{ 3497{
3903 rangetype i;
3904
3905 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3498 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3906 {
3907 if (pl->ranges[i] == ob) 3499 if (pl->ranges[i] == ob)
3908 { 3500 {
3909 pl->ranges[i] = NULL; 3501 pl->ranges[i] = 0;
3910 if (pl->shoottype == i) 3502 if (pl->shoottype == i)
3911 {
3912 pl->shoottype = range_none; 3503 pl->shoottype = range_none;
3913 }
3914 } 3504 }
3915 }
3916} 3505}
3506
3507sint8
3508player::visibility_at (maptile *map, int x, int y) const
3509{
3510 if (!ns)
3511 return 0;
3512
3513 int dx, dy;
3514 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3515 return 0;
3516
3517 x += dx - ns->current_x + ns->mapx / 2;
3518 y += dy - ns->current_y + ns->mapy / 2;
3519
3520 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3521 return 0;
3522
3523 return 100 - blocked_los [x][y];
3524}

Diff Legend

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