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.45 by root, Sat Dec 16 17:16:52 2006 UTC vs.
Revision 1.110 by root, Mon Apr 16 06:23:43 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;
304 enter_exit (op, NULL);
305} 160}
306 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;
170 ob->enter_exit (tmp);
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 maplevel = ob->map->path;
200 ob->remove ();
201 ob->map = 0;
202 party = 0;
203
204 // for weird reasons, this is often "ob", keeping a circular reference
205 ranges [range_skill] = 0;
206
207 players.erase (this);
208}
209
210// connect the player with a specific client
211// also changed, rationalises, and fixes some incorrect settings
212void
213player::connect (client *ns)
214{
215 this->ns = ns;
216 ns->pl = this;
217
218 run_on = 0;
219 fire_on = 0;
220 ob->close_container (); //TODO: client-specific
221
222 ns->update_look = 0;
223 ns->look_position = 0;
224
225 clear_los (ob);
226
227 ns->reset_stats ();
228
229 /* make sure he's a player -- needed because of class change. */
230 ob->type = PLAYER; // we are paranoid
231 ob->race = ob->arch->clone.race;
232
233 if (!legal_range (ob, shoottype))
234 shoottype = range_none;
235
236 ob->carrying = sum_weight (ob);
237 link_player_skills (ob);
238
239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
240
241 assign (title, ob->arch->clone.name);
242
243 /* if it's a dragon player, set the correct title here */
244 if (is_dragon_pl (ob))
245 {
246 object *tmp, *abil = 0, *skin = 0;
247
248 shstr_cmp dragon_ability_force ("dragon_ability_force");
249 shstr_cmp dragon_skin_force ("dragon_skin_force");
250
251 for (tmp = ob->inv; tmp; tmp = tmp->below)
252 if (tmp->type == FORCE)
253 if (tmp->arch->name == dragon_ability_force)
254 abil = tmp;
255 else if (tmp->arch->name == dragon_skin_force)
256 skin = tmp;
257
258 set_dragon_name (ob, abil, skin);
259 }
260
261 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262
263 esrv_new_player (this, ob->weight + ob->carrying);
264
265 ob->update_stats ();
266 ns->floorbox_update ();
267
268 esrv_send_inventory (ob, ob);
269 esrv_add_spells (this, 0);
270
271 activate ();
272
273 send_rules (ob);
274 send_news (ob);
275 display_motd (ob);
276
277 INVOKE_PLAYER (CONNECT, this);
278 INVOKE_PLAYER (LOGIN, this);
279}
280
281void
282player::disconnect ()
283{
284 if (ns)
285 {
286 if (active)
287 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
288
289 INVOKE_PLAYER (DISCONNECT, this);
290
291 ns->reset_stats ();
292 ns->pl = 0;
293 this->ns = 0;
294 }
295
296 if (ob)
297 ob->close_container (); //TODO: client-specific
298
299 deactivate ();
300}
301
302// the need for this function can be explained
303// by load_object not returning the object
304void
305player::set_object (object *op)
306{
307 ob = op;
308 ob->contr = this; /* this aren't yet in archetype */
309
310 ob->speed_left = 0.5;
311 ob->speed = 1.0;
312 ob->direction = 5; /* So player faces south */
313}
314
315player::player ()
316{
317 /* There are some elements we want initialised to non zero value -
318 * we deal with that below this point.
319 */
320 outputs_sync = 6; /* Every 2 seconds */
321 outputs_count = 10; /* Keeps present behaviour */
322 unapply = unapply_nochoice;
323
324 savebed_map = first_map_path; /* Init. respawn position */
325
326 gen_sp_armour = 10;
327 shoottype = range_none;
328 bowtype = bow_normal;
329 petmode = pet_normal;
330 listening = 10;
331 usekeys = containers;
332 peaceful = 1; /* default peaceful */
333 do_los = 1;
334}
335
336void
337player::do_destroy ()
338{
339 disconnect ();
340
341 attachable::do_destroy ();
342
343 if (ob)
344 {
345 ob->destroy_inv (false);
346 ob->destroy ();
347 }
348}
349
350player::~player ()
351{
352 /* Clear item stack */
353 free (stack_items);
354}
355
307/* Tries to add player on the connection passwd in ns. 356/* 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 357 * All we can really get in this is some settings like host and display
309 * mode. 358 * mode.
310 */ 359 */
311 360player *
312int 361player::create ()
313add_player (client *ns)
314{ 362{
315 player *p = new player; 363 player *pl = new player;
316 364
317 p->socket = ns; 365 pl->set_object (arch_to_object (get_player_archetype (0)));
318 ns->pl = p;
319 366
320 p->next = first_player; 367 pl->ob->roll_stats ();
321 first_player = p; 368 pl->ob->stats.wc = 2;
369 pl->ob->run_away = 25; /* Then we panick... */
322 370
323 p = get_player (p);
324
325 set_first_map (p->ob); 371 set_first_map (pl->ob);
326 372
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; 373 return pl;
335} 374}
336 375
337/* 376/*
338 * get_player_archetype() return next player archetype from archetype 377 * get_player_archetype() return next player archetype from archetype
339 * list. Not very efficient routine, but used only creating new players. 378 * list. Not very efficient routine, but used only creating new players.
… …
348 { 387 {
349 if (at == NULL || at->next == NULL) 388 if (at == NULL || at->next == NULL)
350 at = first_archetype; 389 at = first_archetype;
351 else 390 else
352 at = at->next; 391 at = at->next;
392
353 if (at->clone.type == PLAYER) 393 if (at->clone.type == PLAYER)
354 return at; 394 return at;
395
355 if (at == start) 396 if (at == start)
356 { 397 {
357 LOG (llevError, "No Player archetypes\n"); 398 LOG (llevError, "No Player archetypes\n");
358 exit (-1); 399 exit (-1);
359 } 400 }
360 } 401 }
361} 402}
362 403
363
364object * 404object *
365get_nearest_player (object *mon) 405get_nearest_player (object *mon)
366{ 406{
367 object *op = NULL; 407 object *op = NULL;
368 player *pl = NULL;
369 objectlink *ol; 408 objectlink *ol;
370 unsigned lastdist; 409 unsigned lastdist;
371 rv_vector rv; 410 rv_vector rv;
372 411
373 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 412 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
374 { 413 {
375 /* We should not find free objects on this friendly list, but it 414 /* We should not find free objects on this friendly list, but it
376 * does periodically happen. Given that, lets deal with it. 415 * does periodically happen. Given that, lets deal with it.
377 * While unlikely, it is possible the next object on the friendly 416 * While unlikely, it is possible the next object on the friendly
378 * list is also free, so encapsulate this in a while loop. 417 * list is also free, so encapsulate this in a while loop.
… …
382 object *tmp = ol->ob; 421 object *tmp = ol->ob;
383 422
384 /* Can't do much more other than log the fact, because the object 423 /* Can't do much more other than log the fact, because the object
385 * itself will have been cleared. 424 * itself will have been cleared.
386 */ 425 */
387 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 426 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
427 tmp->debug_desc ());
388 ol = ol->next; 428 ol = ol->next;
389 remove_friendly_object (tmp); 429 remove_friendly_object (tmp);
390 if (!ol) 430 if (!ol)
391 return op; 431 return op;
392 } 432 }
… …
405 { 445 {
406 op = ol->ob; 446 op = ol->ob;
407 lastdist = rv.distance; 447 lastdist = rv.distance;
408 } 448 }
409 } 449 }
410 for (pl = first_player; pl != NULL; pl = pl->next) 450
411 { 451 for_all_players (pl)
412 if (can_detect_enemy (mon, pl->ob, &rv)) 452 if (can_detect_enemy (mon, pl->ob, &rv))
413 {
414
415 if (lastdist > rv.distance) 453 if (lastdist > rv.distance)
416 { 454 {
417 op = pl->ob; 455 op = pl->ob;
418 lastdist = rv.distance; 456 lastdist = rv.distance;
419 } 457 }
420 } 458
421 }
422#if 0 459#if 0
423 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 460 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
424#endif 461#endif
425 return op; 462 return op;
426} 463}
… …
444 * circling behaviour. Unfortunately, this function is also used to determined 481 * circling behaviour. Unfortunately, this function is also used to determined
445 * if the creature should cast a spell, so returning a direction in that case 482 * if the creature should cast a spell, so returning a direction in that case
446 * is probably not a good thing. 483 * is probably not a good thing.
447 */ 484 */
448#define MAX_SPACES 50 485#define MAX_SPACES 50
449
450 486
451/* 487/*
452 * Returns the direction to the player, if valid. Returns 0 otherwise. 488 * Returns the direction to the player, if valid. Returns 0 otherwise.
453 * modified to verify there is a path to the player. Does this by stepping towards 489 * modified to verify there is a path to the player. Does this by stepping towards
454 * player and if path is blocked then see if blockage is close enough to player that 490 * player and if path is blocked then see if blockage is close enough to player that
… …
485 x = mon->x; 521 x = mon->x;
486 y = mon->y; 522 y = mon->y;
487 m = mon->map; 523 m = mon->map;
488 dir = rv.direction; 524 dir = rv.direction;
489 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
490 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
491 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
492 if (diff > max) 529 if (diff > max)
493 return 0; 530 return 0;
531
494 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
495 { 533 {
496 lastx = x; 534 lastx = x;
497 lasty = y; 535 lasty = y;
498 lastmap = m; 536 lastmap = m;
… …
580 max--; 618 max--;
581 lastdir = dir; 619 lastdir = dir;
582 if (!firstdir) 620 if (!firstdir)
583 firstdir = dir; 621 firstdir = dir;
584 } 622 }
623
585 if (diff <= 1) 624 if (diff <= 1)
586 { 625 {
587 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
588 * headed toward player for entire distance. 627 * headed toward player for entire distance.
589 */ 628 */
590 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
591 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
592 } 631 }
632
593 if (diff > max) 633 if (diff > max)
594 return 0; 634 return 0;
595 } 635 }
636
596 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
597 if (!max) 638 if (!max)
598 return 0; 639 return 0;
599 640
600 return firstdir; 641 return firstdir;
… …
693 /* Need to set up the skill pointers */ 734 /* Need to set up the skill pointers */
694 link_player_skills (pl); 735 link_player_skills (pl);
695} 736}
696 737
697void 738void
698get_name (object *op)
699{
700 op->contr->write_buf[0] = '\0';
701 op->contr->state = ST_GET_NAME;
702 send_query (op->contr->socket, 0, "What is your name?\n:");
703}
704
705void
706get_password (object *op)
707{
708 op->contr->write_buf[0] = '\0';
709 op->contr->state = ST_GET_PASSWORD;
710 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
711}
712
713void
714play_again (object *op)
715{
716 op->contr->state = ST_PLAY_AGAIN;
717 op->chosen_skill = NULL;
718 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
719 /* a bit of a hack, but there are various places early in th
720 * player creation process that a user can quit (eg, roll
721 * stats) that isn't removing the player. Taking a quick
722 * look, there are many places that call play_again without
723 * removing the player - it probably makes more sense
724 * to leave it to play_again to remove the object in all
725 * cases.
726 */
727 if (!QUERY_FLAG (op, FLAG_REMOVED))
728 op->remove ();
729 /* Need to set this to null - otherwise, it could point to garbage,
730 * and draw() doesn't check to see if the player is removed, only if
731 * the map is null or not swapped out.
732 */
733 op->map = NULL;
734}
735
736int
737receive_play_again (object *op, char key)
738{
739 if (key == 'q' || key == 'Q')
740 {
741 remove_friendly_object (op);
742 leave (op->contr, 0); /* ericserver will draw the message */
743 return 2;
744 }
745 else if (key == 'a' || key == 'A')
746 {
747 player *pl = op->contr;
748 shstr name = op->name;
749
750 op->contr = 0;
751 op->type = 0;
752 op->destroy (1);
753 pl = get_player (pl);
754 op = pl->ob;
755 add_friendly_object (op);
756 op->contr->password[0] = '~';
757 op->name = op->name_pl = 0;
758 /* Lets put a space in here */
759 new_draw_info (NDI_UNIQUE, 0, op, "\n");
760 get_name (op);
761 op->name = op->name_pl = name;
762 set_first_map (op);
763 }
764 else
765 /* user pressed something else so just ask again... */
766 play_again (op);
767
768 return 0;
769}
770
771void
772confirm_password (object *op)
773{
774
775 op->contr->write_buf[0] = '\0';
776 op->contr->state = ST_CONFIRM_PASSWORD;
777 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
778}
779
780void
781get_party_password (object *op, partylist *party) 739get_party_password (object *op, partylist *party)
782{ 740{
783 if (party == NULL) 741 if (party == NULL)
784 { 742 {
785 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 743 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
786 return; 744 return;
787 } 745 }
746
788 op->contr->write_buf[0] = '\0'; 747 op->contr->write_buf[0] = '\0';
789 op->contr->state = ST_GET_PARTY_PASSWORD; 748 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
790 op->contr->party_to_join = party; 749 op->contr->party_to_join = party;
791 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 750 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
792} 751}
793
794 752
795/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 753/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
796int 754static int
797roll_stat (void) 755roll_stat (void)
798{ 756{
799 int a[4], i, j, k; 757 int a[4], i, j, k;
800 758
801 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
802 a[i] = (int) RANDOM () % 6 + 1; 760 a[i] = (int) rndm (6) + 1;
803 761
804 for (i = 0, j = 0, k = 7; i < 4; i++) 762 for (i = 0, j = 0, k = 7; i < 4; i++)
805 if (a[i] < k) 763 if (a[i] < k)
806 k = a[i], j = i; 764 k = a[i], j = i;
807 765
808 for (i = 0, k = 0; i < 4; i++) 766 for (i = 0, k = 0; i < 4; i++)
809 {
810 if (i != j) 767 if (i != j)
811 k += a[i]; 768 k += a[i];
812 } 769
813 return k; 770 return k;
814} 771}
815 772
816void 773void
817roll_stats (object *op) 774object::roll_stats ()
818{ 775{
819 int sum = 0;
820 int i = 0, j = 0;
821 int statsort[7]; 776 int statsort [7];
822 777
823 do 778 for (;;)
824 {
825 op->stats.Str = roll_stat ();
826 op->stats.Dex = roll_stat ();
827 op->stats.Int = roll_stat ();
828 op->stats.Con = roll_stat ();
829 op->stats.Wis = roll_stat ();
830 op->stats.Pow = roll_stat ();
831 op->stats.Cha = roll_stat ();
832 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
833 } 779 {
834 while (sum < 82 || sum > 116); 780 int sum = 0;
781 for (int i = 7; i--; )
782 sum += statsort [i] = roll_stat ();
835 783
784 if (sum >= 82 && sum <= 116)
785 break;
786 }
787
836 /* Sort the stats so that rerolling is easier... */ 788 // Sort the stats so that rerolling is easier...
837 statsort[0] = op->stats.Str; 789 std::sort (statsort, statsort + 7, std::greater<int>());
838 statsort[1] = op->stats.Dex;
839 statsort[2] = op->stats.Int;
840 statsort[3] = op->stats.Con;
841 statsort[4] = op->stats.Wis;
842 statsort[5] = op->stats.Pow;
843 statsort[6] = op->stats.Cha;
844 790
845 /* a quick and dirty bubblesort? */
846 do
847 {
848 if (statsort[i] < statsort[i + 1])
849 {
850 j = statsort[i];
851 statsort[i] = statsort[i + 1];
852 statsort[i + 1] = j;
853 i = 0;
854 }
855 else
856 {
857 i++;
858 }
859 }
860 while (i < 6);
861
862 op->stats.Str = statsort[0]; 791 stats.Str = statsort[0];
863 op->stats.Dex = statsort[1]; 792 stats.Dex = statsort[1];
864 op->stats.Con = statsort[2]; 793 stats.Con = statsort[2];
865 op->stats.Int = statsort[3]; 794 stats.Int = statsort[3];
866 op->stats.Wis = statsort[4]; 795 stats.Wis = statsort[4];
867 op->stats.Pow = statsort[5]; 796 stats.Pow = statsort[5];
868 op->stats.Cha = statsort[6]; 797 stats.Cha = statsort[6];
869 798
870
871 op->contr->orig_stats.Str = op->stats.Str;
872 op->contr->orig_stats.Dex = op->stats.Dex;
873 op->contr->orig_stats.Int = op->stats.Int;
874 op->contr->orig_stats.Con = op->stats.Con;
875 op->contr->orig_stats.Wis = op->stats.Wis;
876 op->contr->orig_stats.Pow = op->stats.Pow;
877 op->contr->orig_stats.Cha = op->stats.Cha;
878
879 op->level = 1;
880 op->stats.exp = 0; 799 stats.exp = 0;
881 op->stats.ac = 0; 800 stats.ac = 0;
882 801
883 op->contr->levhp[1] = 9;
884 op->contr->levsp[1] = 6;
885 op->contr->levgrace[1] = 3;
886
887 fix_player (op);
888 op->stats.hp = op->stats.maxhp; 802 stats.hp = stats.maxhp;
889 op->stats.sp = op->stats.maxsp; 803 stats.sp = stats.maxsp;
890 op->stats.grace = op->stats.maxgrace; 804 stats.grace = stats.maxgrace;
805
806 if (contr)
807 {
808 contr->levhp[1] = 9;
809 contr->levsp[1] = 6;
810 contr->levgrace[1] = 3;
811
891 op->contr->orig_stats = op->stats; 812 contr->orig_stats = stats;
813 }
892} 814}
893 815
894void 816void
895Roll_Again (object *op) 817object::swap_stats (int a, int b)
896{ 818{
897 esrv_new_player (op->contr, 0); 819 int tmp = get_attr_value (&contr->orig_stats, a);
898 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, 820 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
899 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 821 set_attr_value (&contr->orig_stats, b, tmp);
900}
901 822
902void 823 stats.Str = contr->orig_stats.Str;
903Swap_Stat (object *op, int Swap_Second) 824 stats.Dex = contr->orig_stats.Dex;
825 stats.Con = contr->orig_stats.Con;
826 stats.Int = contr->orig_stats.Int;
827 stats.Wis = contr->orig_stats.Wis;
828 stats.Pow = contr->orig_stats.Pow;
829 stats.Cha = contr->orig_stats.Cha;
830
831 //TODO: the following code looks so borked and should, at the very least,
832 // be merged with the similar code in roll_stats
833 stats.ac = 0;
834
835 level = 1;
836 stats.exp = 0;
837 stats.ac = 0;
838
839 stats.hp = stats.maxhp;
840 stats.sp = stats.maxsp;
841 stats.grace = stats.maxgrace;
842
843 if (contr)
844 {
845 contr->levhp[1] = 9;
846 contr->levsp[1] = 6;
847 contr->levgrace[1] = 3;
848
849 contr->orig_stats = stats;
850 }
851}
852
853static void
854start_info (object *op)
904{ 855{
905 signed char tmp;
906 char buf[MAX_BUF]; 856 char buf[MAX_BUF];
907 857
908 if (op->contr->Swap_First == -1) 858 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
909 {
910 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
911 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
912 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
913 return;
914 }
915
916 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
917
918 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
919
920 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
921
922 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
923 new_draw_info (NDI_UNIQUE, 0, op, buf); 859 new_draw_info (NDI_UNIQUE, 0, op, buf);
924 op->stats.Str = op->contr->orig_stats.Str; 860 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
925 op->stats.Dex = op->contr->orig_stats.Dex;
926 op->stats.Con = op->contr->orig_stats.Con;
927 op->stats.Int = op->contr->orig_stats.Int;
928 op->stats.Wis = op->contr->orig_stats.Wis;
929 op->stats.Pow = op->contr->orig_stats.Pow;
930 op->stats.Cha = op->contr->orig_stats.Cha;
931 op->stats.ac = 0;
932
933 op->level = 1;
934 op->stats.exp = 0;
935 op->stats.ac = 0;
936
937 op->contr->levhp[1] = 9;
938 op->contr->levsp[1] = 6;
939 op->contr->levgrace[1] = 3;
940
941 fix_player (op);
942 op->stats.hp = op->stats.maxhp;
943 op->stats.sp = op->stats.maxsp;
944 op->stats.grace = op->stats.maxgrace;
945 op->contr->orig_stats = op->stats;
946 op->contr->Swap_First = -1;
947}
948
949
950/* This code has been greatly reduced, because with set_attr_value
951 * and get_attr_value, the stats can be accessed just numeric
952 * ids. stat_trans is a table that translate the number entered
953 * into the actual stat. It is needed because the order the stats
954 * are displayed in the stat window is not the same as how
955 * the number's access that stat. The table does that translation.
956 */
957int
958key_roll_stat (object *op, char key)
959{
960 int keynum = key - '0';
961 char buf[MAX_BUF];
962 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
963
964 if (keynum > 0 && keynum <= 7)
965 {
966 if (op->contr->Swap_First == -1)
967 {
968 op->contr->Swap_First = stat_trans[keynum];
969 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
970 new_draw_info (NDI_UNIQUE, 0, op, buf); 861 //new_draw_info (NDI_UNIQUE, 0, op, " ");
971 }
972 else
973 Swap_Stat (op, stat_trans[keynum]);
974
975 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
976 return 1;
977 }
978 switch (key)
979 {
980 case 'n':
981 case 'N':
982 {
983 SET_FLAG (op, FLAG_WIZ);
984 if (op->map == NULL)
985 {
986 LOG (llevError, "Map == NULL in state 2\n");
987 break;
988 }
989
990#if 0
991 /* So that enter_exit will put us at startx/starty */
992 op->x = -1;
993
994 enter_exit (op, NULL);
995#endif
996 SET_ANIMATION (op, 2); /* So player faces south */
997 /* Enter exit adds a player otherwise */
998 add_statbonus (op);
999 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
1000 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1001 op->contr->state = ST_CHANGE_CLASS;
1002 if (op->msg)
1003 new_draw_info (NDI_BLUE, 0, op, op->msg);
1004 return 0;
1005 }
1006 case 'y':
1007 case 'Y':
1008 roll_stats (op);
1009 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1010 return 1;
1011
1012 case 'q':
1013 case 'Q':
1014 play_again (op);
1015 return 1;
1016
1017 default:
1018 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1019 return 0;
1020 }
1021 return 0;
1022} 862}
1023 863
1024/* This function takes the key that is passed, and does the 864/* This function takes the key that is passed, and does the
1025 * appropriate action with it (change race, or other things). 865 * appropriate action with it (change race, or other things).
1026 * The function name is for historical reasons - now we have 866 * The function name is for historical reasons - now we have
1027 * separate race and class; this actually changes the RACE, 867 * separate race and class; this actually changes the RACE,
1028 * not the class. 868 * not the class.
1029 */ 869 */
1030
1031int 870int
1032key_change_class (object *op, char key) 871key_change_class (object *op, char key)
1033{ 872{
1034 int tmp_loop; 873 int tmp_loop;
1035 874
1036 if (key == 'q' || key == 'Q')
1037 {
1038 op->remove ();
1039 play_again (op);
1040 return 0;
1041 }
1042 if (key == 'd' || key == 'D') 875 if (key == 'd' || key == 'D')
1043 { 876 {
1044 char buf[MAX_BUF]; 877 char buf[MAX_BUF];
1045 878
1046 /* this must before then initial items are given */ 879 /* this must before then initial items are given */
1047 esrv_new_player (op->contr, op->weight + op->carrying); 880 esrv_new_player (op->contr, op->weight + op->carrying);
1048 881
1049 treasurelist *tl = find_treasurelist ("starting_wealth"); 882 treasurelist *tl = treasurelist::find ("starting_wealth");
1050 if (tl) 883 if (tl)
1051 create_treasure (tl, op, 0, 0, 0); 884 create_treasure (tl, op, 0, 0, 0);
1052 885
1053 INVOKE_PLAYER (BIRTH, op->contr); 886 INVOKE_PLAYER (BIRTH, op->contr);
1054 INVOKE_PLAYER (LOGIN, op->contr); 887 INVOKE_PLAYER (LOGIN, op->contr);
1055 888
1056 op->contr->state = ST_PLAYING; 889 op->contr->ns->state = ST_PLAYING;
1057 890
1058 if (op->msg) 891 if (op->msg)
1059 op->msg = NULL; 892 op->msg = NULL;
1060 893
1061 /* We create this now because some of the unique maps will need it 894 /* We create this now because some of the unique maps will need it
1062 * to save here. 895 * to save here.
1063 */ 896 */
1064 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
1065 make_path_to_file (buf); 898 make_path_to_file (buf);
1066 899
1067#ifdef AUTOSAVE
1068 op->contr->last_save_tick = pticks;
1069#endif
1070 start_info (op); 900 start_info (op);
1071 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
1072 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
1073 link_player_skills (op); 903 link_player_skills (op);
1074 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
1075 fix_player (op); 905 op->update_stats ();
1076 906
1077 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
1078 * is one for this race 908 * is one for this race
1079 */ 909 */
1080 if (*first_map_ext_path) 910 if (*first_map_ext_path)
1081 { 911 {
1082 object *tmp; 912 object *tmp;
1083 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
1084 914
1085 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, &op->arch->name);
1086 tmp = object::create (); 916 tmp = object::create ();
1087 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
1088 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = op->x;
1089 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = op->y;
1090 enter_exit (op, tmp); /* we don't really care if it succeeded; 920 op->enter_exit (tmp); /* we don't really care if it succeeded;
1091 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
1092 * default initial map */ 922 * default initial map */
1093 tmp->destroy (); 923 tmp->destroy ();
1094 } 924 }
1095 else 925 else
1096 {
1097 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
1098 } 927
1099 return 0; 928 return 0;
1100 } 929 }
1101 930
1102 /* Following actually changes the race - this is the default command 931 /* Following actually changes the race - this is the default command
1103 * if we don't match with one of the options above. 932 * if we don't match with one of the options above.
… …
1107 while (!tmp_loop) 936 while (!tmp_loop)
1108 { 937 {
1109 shstr name = op->name; 938 shstr name = op->name;
1110 int x = op->x, y = op->y; 939 int x = op->x, y = op->y;
1111 940
1112 remove_statbonus (op); 941 op->remove_statbonus ();
1113 op->remove (); 942 op->remove ();
1114 op->arch = get_player_archetype (op->arch); 943 op->arch = get_player_archetype (op->arch);
1115 op->arch->clone.copy_to (op); 944 op->arch->clone.copy_to (op);
1116 op->instantiate (); 945 op->instantiate ();
1117 op->stats = op->contr->orig_stats; 946 op->stats = op->contr->orig_stats;
… …
1119 op->x = x; 948 op->x = x;
1120 op->y = y; 949 op->y = y;
1121 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (op, 2); /* So player faces south */
1122 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (op, op->map, op, 0);
1123 assign (op->contr->title, op->arch->clone.name); 952 assign (op->contr->title, op->arch->clone.name);
1124 add_statbonus (op); 953 op->add_statbonus ();
1125 tmp_loop = allowed_class (op); 954 tmp_loop = allowed_class (op);
1126 } 955 }
1127 956
1128 update_object (op, UP_OBJ_FACE); 957 update_object (op, UP_OBJ_FACE);
1129 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, op, op);
1130 fix_player (op); 959 op->update_stats ();
1131 op->stats.hp = op->stats.maxhp; 960 op->stats.hp = op->stats.maxhp;
1132 op->stats.sp = op->stats.maxsp; 961 op->stats.sp = op->stats.maxsp;
1133 op->stats.grace = 0; 962 op->stats.grace = 0;
1134 963
1135 if (op->msg) 964 if (op->msg)
1136 new_draw_info (NDI_BLUE, 0, op, op->msg); 965 new_draw_info (NDI_BLUE, 0, op, op->msg);
1137 966
1138 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1139 return 0; 968 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} 969}
1190 970
1191void 971void
1192flee_player (object *op) 972flee_player (object *op)
1193{ 973{
… …
1223 { 1003 {
1224 op->enemy = NULL; 1004 op->enemy = NULL;
1225 CLEAR_FLAG (op, FLAG_SCARED); 1005 CLEAR_FLAG (op, FLAG_SCARED);
1226 return; 1006 return;
1227 } 1007 }
1008
1228 get_rangevector (op, op->enemy, &rv, 0); 1009 get_rangevector (op, op->enemy, &rv, 0);
1229 1010
1230 dir = absdir (4 + rv.direction); 1011 dir = absdir (4 + rv.direction);
1231 for (diff = 0; diff < 3; diff++) 1012 for (diff = 0; diff < 3; diff++)
1232 { 1013 {
1233 int m = 1 - (RANDOM () & 2); 1014 int m = 1 - (RANDOM () & 2);
1234 1015
1235 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1016 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1236 {
1237 return; 1017 return;
1238 }
1239 } 1018 }
1019
1240 /* Cornered, get rid of scared */ 1020 /* Cornered, get rid of scared */
1241 CLEAR_FLAG (op, FLAG_SCARED); 1021 CLEAR_FLAG (op, FLAG_SCARED);
1242 op->enemy = NULL; 1022 op->enemy = NULL;
1243} 1023}
1244 1024
… …
1250int 1030int
1251check_pick (object *op) 1031check_pick (object *op)
1252{ 1032{
1253 object *tmp, *next; 1033 object *tmp, *next;
1254 int stop = 0; 1034 int stop = 0;
1255 int j, k, wvratio; 1035 int wvratio;
1256 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1257 1037
1258 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1259 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1260 return 1; 1040 return 1;
1261 1041
… …
1330 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1110 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)))); 1111 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1332 else 1112 else
1333 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1113 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)))); 1114 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115
1335 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1116 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 } 1117 }
1118
1366 /* philosophy: 1119 /* philosophy:
1367 * It's easy to grab an item type from a pile, as long as it's 1120 * 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 1121 * generic. This takes no game-time. For more detailed pickups
1369 * and selections, select-items shoul dbe used. This is a 1122 * and selections, select-items should be used. This is a
1370 * grab-as-you-run type mode that's really useful for arrows for 1123 * grab-as-you-run type mode that's really useful for arrows for
1371 * example. 1124 * example.
1372 * The drawback: right now it has no frontend, so you need to 1125 * 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 1126 * stick the bits you want into a calculator in hex mode and then
1374 * convert to decimal and then 'pickup <#> 1127 * convert to decimal and then 'pickup <#>
… …
1625 * found object is returned. 1378 * found object is returned.
1626 */ 1379 */
1627object * 1380object *
1628find_arrow (object *op, const char *type) 1381find_arrow (object *op, const char *type)
1629{ 1382{
1630 object *tmp = NULL; 1383 object *tmp = 0;
1631 1384
1632 for (op = op->inv; op; op = op->below) 1385 for (op = op->inv; op; op = op->below)
1633 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1386 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1634 tmp = find_arrow (op, type); 1387 tmp = find_arrow (op, type);
1635 else if (op->type == ARROW && op->race == type) 1388 else if (op->type == ARROW && op->race == type)
1636 return op; 1389 return op;
1390
1637 return tmp; 1391 return tmp;
1638} 1392}
1639 1393
1640/* 1394/*
1641 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1395 * 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 1396 * 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 1397 * 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. 1398 * the hall. Failing that it does it's best to pick the highest plus arrow.
1645 */ 1399 */
1646
1647object * 1400object *
1648find_better_arrow (object *op, object *target, const char *type, int *better) 1401find_better_arrow (object *op, object *target, const char *type, int *better)
1649{ 1402{
1650 object *tmp = NULL, *arrow, *ntmp; 1403 object *tmp = NULL, *arrow, *ntmp;
1651 int attacknum, attacktype, betterby = 0, i; 1404 int attacknum, attacktype, betterby = 0, i;
… …
1800 if (!dir) 1553 if (!dir)
1801 { 1554 {
1802 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1555 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1803 return 0; 1556 return 0;
1804 } 1557 }
1558
1805 if (op->type == PLAYER) 1559 if (op->type == PLAYER)
1806 bow = op->contr->ranges[range_bow]; 1560 bow = op->contr->ranges[range_bow];
1807 else 1561 else
1808 { 1562 {
1809 for (bow = op->inv; bow; bow = bow->below) 1563 for (bow = op->inv; bow; bow = bow->below)
… …
1817 { 1571 {
1818 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1572 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1819 return 0; 1573 return 0;
1820 } 1574 }
1821 } 1575 }
1576
1822 if (!bow->race || !bow->skill) 1577 if (!bow->race || !bow->skill)
1823 { 1578 {
1824 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1579 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1825 return 0; 1580 return 0;
1826 } 1581 }
… …
1828 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1583 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1829 1584
1830 /* penalize ROF for bestarrow */ 1585 /* penalize ROF for bestarrow */
1831 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1586 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1832 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1587 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1588
1833 if (bowspeed < 1) 1589 if (bowspeed < 1)
1834 bowspeed = 1; 1590 bowspeed = 1;
1835 1591
1836 if (arrow == NULL) 1592 if (arrow == NULL)
1837 { 1593 {
… …
1843 else 1599 else
1844 CLEAR_FLAG (op, FLAG_READY_BOW); 1600 CLEAR_FLAG (op, FLAG_READY_BOW);
1845 return 0; 1601 return 0;
1846 } 1602 }
1847 } 1603 }
1604
1848 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1605 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1849 if (mflags & P_OUT_OF_MAP) 1606 if (mflags & P_OUT_OF_MAP)
1850 {
1851 return 0; 1607 return 0;
1852 } 1608
1853 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1609 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1854 { 1610 {
1855 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1611 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1856 return 0; 1612 return 0;
1857 } 1613 }
… …
1863 return 0; 1619 return 0;
1864 } 1620 }
1865 1621
1866 left = arrow; /* these are arrows left to the player */ 1622 left = arrow; /* these are arrows left to the player */
1867 arrow = get_split_ob (arrow, 1); 1623 arrow = get_split_ob (arrow, 1);
1868 if (arrow == NULL) 1624 if (!arrow)
1869 { 1625 {
1870 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1626 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1871 return 0; 1627 return 0;
1872 } 1628 }
1629
1873 arrow->set_owner (op); 1630 arrow->set_owner (op);
1874 arrow->skill = bow->skill; 1631 arrow->skill = bow->skill;
1875
1876 arrow->direction = dir; 1632 arrow->direction = dir;
1877 arrow->x = sx;
1878 arrow->y = sy;
1879 1633
1880 if (op->type == PLAYER) 1634 if (op->type == PLAYER)
1881 { 1635 {
1882 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1636 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1883 fix_player (op); 1637 op->update_stats ();
1884 } 1638 }
1885 1639
1886 SET_ANIMATION (arrow, arrow->direction); 1640 SET_ANIMATION (arrow, arrow->direction);
1887 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1641 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1888 arrow->stats.hp = arrow->stats.dam; 1642 arrow->stats.hp = arrow->stats.dam;
… …
1898 1652
1899 /* update the speed */ 1653 /* update the speed */
1900 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1654 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1901 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1655 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1902 1656
1903 if (arrow->speed < 1.0) 1657 arrow->set_speed (max (arrow->speed, 1.0));
1904 arrow->speed = 1.0;
1905 update_ob_speed (arrow);
1906 arrow->speed_left = 0; 1658 arrow->speed_left = 0;
1907 1659
1908 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1909 { 1661 {
1910 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1662 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1920 } 1672 }
1921 1673
1922 if (arrow->attacktype == AT_PHYSICAL) 1674 if (arrow->attacktype == AT_PHYSICAL)
1923 arrow->attacktype |= bow->attacktype; 1675 arrow->attacktype |= bow->attacktype;
1924 1676
1925 if (bow->slaying != NULL) 1677 if (bow->slaying)
1926 arrow->slaying = bow->slaying; 1678 arrow->slaying = bow->slaying;
1927 1679
1928 arrow->map = m;
1929 arrow->move_type = MOVE_FLY_LOW; 1680 arrow->move_type = MOVE_FLY_LOW;
1930 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1681 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1931 1682
1932 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1683 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1933 insert_ob_in_map (arrow, m, op, 0); 1684 m->insert (arrow, sx, sy, op);
1934 1685
1935 if (!arrow->destroyed ()) 1686 if (!arrow->destroyed ())
1936 move_arrow (arrow); 1687 move_arrow (arrow);
1937 1688
1938 if (op->type == PLAYER) 1689 if (op->type == PLAYER)
… …
1964 } 1715 }
1965 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1716 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1966 { 1717 {
1967 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1718 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1968 wcmod = -1; 1719 wcmod = -1;
1720
1969 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1721 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1970 } 1722 }
1971 else if (op->contr->bowtype == bow_threewide) 1723 else if (op->contr->bowtype == bow_threewide)
1972 { 1724 {
1973 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1725 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
2043 1795
2044 if (item->arch) 1796 if (item->arch)
2045 { 1797 {
2046 CLEAR_FLAG (item, FLAG_ANIMATE); 1798 CLEAR_FLAG (item, FLAG_ANIMATE);
2047 item->face = item->arch->clone.face; 1799 item->face = item->arch->clone.face;
2048 item->speed = 0; 1800 item->set_speed (0);
2049 update_ob_speed (item);
2050 } 1801 }
1802
2051 if ((tmp = is_player_inv (item))) 1803 if ((tmp = item->in_player ()))
2052 esrv_update_item (UPD_ANIM, tmp, item); 1804 esrv_update_item (UPD_ANIM, tmp, item);
2053 } 1805 }
2054 } 1806 }
2055 else if (item->type == ROD || item->type == HORN) 1807 else if (item->type == ROD || item->type == HORN)
2056 {
2057 drain_rod_charge (item); 1808 drain_rod_charge (item);
2058 }
2059 } 1809 }
2060} 1810}
2061 1811
2062/* Received a fire command for the player - go and do it. 1812/* Received a fire command for the player - go and do it.
2063 */ 1813 */
… …
2102 { 1852 {
2103 if (op->type == PLAYER) 1853 if (op->type == PLAYER)
2104 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2105 return; 1855 return;
2106 } 1856 }
1857
2107 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1858 do_skill (op, op, op->chosen_skill, dir, NULL);
2108 return; 1859 return;
2109 case range_builder: 1860 case range_builder:
2110 apply_map_builder (op, dir); 1861 apply_map_builder (op, dir);
2111 return; 1862 return;
2112 default: 1863 default:
2113 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2114 return; 1865 return;
2115 } 1866 }
2116} 1867}
2117
2118
2119 1868
2120/* find_key 1869/* find_key
2121 * We try to find a key for the door as passed. If we find a key 1870 * We try to find a key for the door as passed. If we find a key
2122 * and successfully use it, we return the key, otherwise NULL 1871 * and successfully use it, we return the key, otherwise NULL
2123 * This function merges both normal and locked door, since the logic 1872 * This function merges both normal and locked door, since the logic
… …
2125 * pl is the player, 1874 * pl is the player,
2126 * inv is the objects inventory to searched 1875 * inv is the objects inventory to searched
2127 * door is the door we are trying to match against. 1876 * door is the door we are trying to match against.
2128 * This function can be called recursively to search containers. 1877 * This function can be called recursively to search containers.
2129 */ 1878 */
2130
2131object * 1879object *
2132find_key (object *pl, object *container, object *door) 1880find_key (object *pl, object *container, object *door)
2133{ 1881{
2134 object *tmp, *key; 1882 object *tmp, *key;
2135 1883
2136 /* Should not happen, but sanity checking is never bad */ 1884 /* Should not happen, but sanity checking is never bad */
2137 if (container->inv == NULL) 1885 if (!container->inv)
2138 return NULL; 1886 return 0;
2139 1887
2140 /* First, lets try to find a key in the top level inventory */ 1888 /* First, lets try to find a key in the top level inventory */
2141 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = container->inv; tmp; tmp = tmp->below)
2142 { 1890 {
2143 if (door->type == DOOR && tmp->type == KEY) 1891 if (door->type == DOOR && tmp->type == KEY)
2144 break; 1892 break;
2145 /* For sanity, we should really check door type, but other stuff 1893 /* For sanity, we should really check door type, but other stuff
2146 * (like containers) can be locked with special keys 1894 * (like containers) can be locked with special keys
2147 */ 1895 */
2148 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2149 break; 1897 break;
2150 } 1898 }
1899
2151 /* No key found - lets search inventories now */ 1900 /* No key found - lets search inventories now */
2152 /* If we find and use a key in an inventory, return at that time. 1901 /* If we find and use a key in an inventory, return at that time.
2153 * otherwise, if we search all the inventories and still don't find 1902 * otherwise, if we search all the inventories and still don't find
2154 * a key, return 1903 * a key, return
2155 */ 1904 */
2156 if (!tmp) 1905 if (!tmp)
2157 { 1906 {
2158 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1907 for (tmp = container->inv; tmp; tmp = tmp->below)
2159 { 1908 {
2160 /* No reason to search empty containers */ 1909 /* No reason to search empty containers */
2161 if (tmp->type == CONTAINER && tmp->inv) 1910 if (tmp->type == CONTAINER && tmp->inv)
2162 { 1911 {
2163 if ((key = find_key (pl, tmp, door)) != NULL) 1912 if ((key = find_key (pl, tmp, door)))
2164 return key; 1913 return key;
2165 } 1914 }
2166 } 1915 }
1916
2167 if (!tmp) 1917 if (!tmp)
2168 return NULL; 1918 return NULL;
2169 } 1919 }
1920
2170 /* We get down here if we have found a key. Now if its in a container, 1921 /* We get down here if we have found a key. Now if its in a container,
2171 * see if we actually want to use it 1922 * see if we actually want to use it
2172 */ 1923 */
2173 if (pl != container) 1924 if (pl != container)
2174 { 1925 {
… …
2195 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2196 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1947 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2197 return NULL; 1948 return NULL;
2198 } 1949 }
2199 } 1950 }
1951
2200 return tmp; 1952 return tmp;
2201} 1953}
2202 1954
2203/* moved door processing out of move_player_attack. 1955/* moved door processing out of move_player_attack.
2204 * returns 1 if player has opened the door with a key 1956 * returns 1 if player has opened the door with a key
… …
2206 * 0 otherwise 1958 * 0 otherwise
2207 */ 1959 */
2208static int 1960static int
2209player_attack_door (object *op, object *door) 1961player_attack_door (object *op, object *door)
2210{ 1962{
2211
2212 /* If its a door, try to find a use a key. If we do destroy the door, 1963 /* If its a door, try to find a use a key. If we do destroy the door,
2213 * might as well return immediately as there is nothing more to do - 1964 * might as well return immediately as there is nothing more to do -
2214 * otherwise, we fall through to the rest of the code. 1965 * otherwise, we fall through to the rest of the code.
2215 */ 1966 */
2216 object *key = find_key (op, op, door); 1967 object *key = find_key (op, op, door);
… …
2223 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2224 if (action_makes_visible (op)) 1975 if (action_makes_visible (op))
2225 make_visible (op); 1976 make_visible (op);
2226 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2227 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1979
2228 if (door->type == DOOR) 1980 if (door->type == DOOR)
2229 {
2230 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2231 }
2232 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
2233 { 1983 {
2234 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1984 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2235 remove_door2 (door); /* remove door without violence ;-) */ 1985 remove_door2 (door); /* remove door without violence ;-) */
2236 } 1986 }
1987
2237 /* Do this after we print the message */ 1988 /* Do this after we print the message */
2238 decrease_ob (key); /* Use up one of the keys */ 1989 decrease_ob (key); /* Use up one of the keys */
2239 /* Need to update the weight the container the key was in */ 1990 /* Need to update the weight the container the key was in */
2240 if (container != op) 1991 if (container != op)
2241 esrv_update_item (UPD_WEIGHT, op, container); 1992 esrv_update_item (UPD_WEIGHT, op, container);
1993
2242 return 1; /* Nothing more to do below */ 1994 return 1; /* Nothing more to do below */
2243 } 1995 }
2244 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2245 { 1997 {
2246 /* Might as well return now - no other way to open this */ 1998 /* Might as well return now - no other way to open this */
2247 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1999 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2248 return 1; 2000 return 1;
2249 } 2001 }
2002
2250 return 0; 2003 return 0;
2251} 2004}
2252 2005
2253/* This function is just part of a breakup from move_player. 2006/* This function is just part of a breakup from move_player.
2254 * It should keep the code cleaner. 2007 * It should keep the code cleaner.
2255 * When this is called, the players direction has been updated 2008 * When this is called, the players direction has been updated
2256 * (taking into account confusion.) The player is also actually 2009 * (taking into account confusion.) The player is also actually
2257 * going to try and move (not fire weapons). 2010 * going to try and move (not fire weapons).
2258 */ 2011 */
2259
2260void 2012void
2261move_player_attack (object *op, int dir) 2013move_player_attack (object *op, int dir)
2262{ 2014{
2263 object *tmp, *mon; 2015 object *tmp, *mon;
2264 sint16 nx, ny; 2016 sint16 nx, ny;
… …
2266 maptile *m; 2018 maptile *m;
2267 2019
2268 nx = freearr_x[dir] + op->x; 2020 nx = freearr_x[dir] + op->x;
2269 ny = freearr_y[dir] + op->y; 2021 ny = freearr_y[dir] + op->y;
2270 2022
2271 on_battleground = op_on_battleground (op, NULL, NULL); 2023 on_battleground = op_on_battleground (op, 0, 0);
2272 2024
2273 /* If braced, or can't move to the square, and it is not out of the 2025 /* If braced, or can't move to the square, and it is not out of the
2274 * map, attack it. Note order of if statement is important - don't 2026 * map, attack it. Note order of if statement is important - don't
2275 * want to be calling move_ob if braced, because move_ob will move the 2027 * want to be calling move_ob if braced, because move_ob will move the
2276 * player. This is a pretty nasty hack, because if we could 2028 * player. This is a pretty nasty hack, because if we could
… …
2281 */ 2033 */
2282 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2034 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2283 { 2035 {
2284 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2036 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2285 { 2037 {
2286 m = get_map_from_coord (op->map, &nx, &ny); 2038 m = op->map->xy_find (nx, ny);
2287 if (!m) 2039 if (!m)
2288 return; /* Don't think this should happen */ 2040 return; /* Don't think this should happen */
2289 } 2041 }
2290 else 2042 else
2291 m = op->map; 2043 m = op->map;
2292 2044
2293 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2045 if (!(tmp = m->at (nx, ny).bot))
2294 {
2295 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2296 return; 2046 return;
2297 }
2298 2047
2299 mon = NULL; 2048 mon = 0;
2300 /* Go through all the objects, and find ones of interest. Only stop if 2049 /* Go through all the objects, and find ones of interest. Only stop if
2301 * we find a monster - that is something we know we want to attack. 2050 * we find a monster - that is something we know we want to attack.
2302 * if its a door or barrel (can roll) see if there may be monsters 2051 * if its a door or barrel (can roll) see if there may be monsters
2303 * on the space 2052 * on the space
2304 */ 2053 */
2305 while (tmp != NULL) 2054 while (tmp)
2306 { 2055 {
2307 if (tmp == op) 2056 if (tmp == op)
2308 { 2057 {
2309 tmp = tmp->above; 2058 tmp = tmp->above;
2310 continue; 2059 continue;
… …
2320 mon = tmp; 2069 mon = tmp;
2321 2070
2322 tmp = tmp->above; 2071 tmp = tmp->above;
2323 } 2072 }
2324 2073
2325 if (mon == NULL) /* This happens anytime the player tries to move */ 2074 if (!mon) /* This happens anytime the player tries to move */
2326 return; /* into a wall */ 2075 return; /* into a wall */
2327 2076
2328 if (mon->head != NULL) 2077 if (mon->head)
2329 mon = mon->head; 2078 mon = mon->head;
2330 2079
2331 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2080 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2332 if (player_attack_door (op, mon)) 2081 if (player_attack_door (op, mon))
2333 return; 2082 return;
… …
2355 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2104 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2356 { 2105 {
2357 /* If we're braced, we don't want to switch places with it */ 2106 /* If we're braced, we don't want to switch places with it */
2358 if (op->contr->braced) 2107 if (op->contr->braced)
2359 return; 2108 return;
2109
2360 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2110 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2361 (void) push_ob (mon, dir, op); 2111 (void) push_ob (mon, dir, op);
2362 if (op->contr->tmp_invis || op->hide) 2112 if (op->contr->tmp_invis || op->hide)
2363 make_visible (op); 2113 make_visible (op);
2114
2364 return; 2115 return;
2365 } 2116 }
2366 2117
2367 /* in certain circumstances, you shouldn't attack friendly 2118 /* in certain circumstances, you shouldn't attack friendly
2368 * creatures. Note that if you are braced, you can't push 2119 * creatures. Note that if you are braced, you can't push
… …
2370 * attack them either. 2121 * attack them either.
2371 */ 2122 */
2372 if ((mon->type == PLAYER || mon->enemy != op) && 2123 if ((mon->type == PLAYER || mon->enemy != op) &&
2373 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2124 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2374#ifdef PROHIBIT_PLAYERKILL 2125#ifdef PROHIBIT_PLAYERKILL
2375 (op->contr->peaceful 2126 (op->contr->peaceful
2376 || (mon->type == PLAYER 2127 || (mon->type == PLAYER
2377 && mon->contr-> 2128 && mon->contr->
2378 peaceful)) && 2129 peaceful)) &&
2379#else 2130#else
2380 op->contr->peaceful && 2131 op->contr->peaceful &&
2381#endif 2132#endif
2382 !on_battleground)) 2133 !on_battleground))
2383 { 2134 {
2384 if (!op->contr->braced) 2135 if (!op->contr->braced)
2385 { 2136 {
2386 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2137 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2387 (void) push_ob (mon, dir, op); 2138 push_ob (mon, dir, op);
2388 } 2139 }
2389 else 2140 else
2390 {
2391 new_draw_info (0, 0, op, "You withhold your attack"); 2141 new_draw_info (0, 0, op, "You withhold your attack");
2392 } 2142
2393 if (op->contr->tmp_invis || op->hide) 2143 if (op->contr->tmp_invis || op->hide)
2394 make_visible (op); 2144 make_visible (op);
2395 } 2145 }
2396 2146
2397 /* If the object is a boulder or other rollable object, then 2147 /* If the object is a boulder or other rollable object, then
… …
2408 * Way it works is like this: First, it must have some hit points 2158 * Way it works is like this: First, it must have some hit points
2409 * and be living. Then, it must be one of the following: 2159 * and be living. Then, it must be one of the following:
2410 * 1) Not a player, 2) A player, but of a different party. Note 2160 * 1) Not a player, 2) A player, but of a different party. Note
2411 * that party_number -1 is no party, so attacks can still happen. 2161 * that party_number -1 is no party, so attacks can still happen.
2412 */ 2162 */
2413
2414 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2163 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2415 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2164 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2416 { 2165 {
2417 2166
2418 /* If the player hasn't hit something this tick, and does 2167 /* If the player hasn't hit something this tick, and does
… …
2425 op->speed_left += op->speed / op->contr->weapon_sp; 2174 op->speed_left += op->speed / op->contr->weapon_sp;
2426 2175
2427 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2176 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2428 } 2177 }
2429 2178
2430 skill_attack (mon, op, 0, NULL, NULL); 2179 skill_attack (mon, op, 0, 0, 0);
2431 2180
2432 /* If attacking another player, that player gets automatic 2181 /* If attacking another player, that player gets automatic
2433 * hitback, and doesn't loose luck either. 2182 * hitback, and doesn't loose luck either.
2434 * Disable hitback on the battleground or if the target is 2183 * Disable hitback on the battleground or if the target is
2435 * the wiz. 2184 * the wiz.
… …
2437 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2186 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2438 { 2187 {
2439 short luck = mon->stats.luck; 2188 short luck = mon->stats.luck;
2440 2189
2441 mon->contr->has_hit = 1; 2190 mon->contr->has_hit = 1;
2442 skill_attack (op, mon, 0, NULL, NULL); 2191 skill_attack (op, mon, 0, 0, 0);
2443 mon->stats.luck = luck; 2192 mon->stats.luck = luck;
2444 } 2193 }
2194
2445 if (action_makes_visible (op)) 2195 if (action_makes_visible (op))
2446 make_visible (op); 2196 make_visible (op);
2447 } 2197 }
2448 } /* if player should attack something */ 2198 } /* if player should attack something */
2449} 2199}
… …
2451int 2201int
2452move_player (object *op, int dir) 2202move_player (object *op, int dir)
2453{ 2203{
2454 int pick; 2204 int pick;
2455 2205
2456 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2206 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2457 return 0; 2207 return 0;
2458 2208
2459 /* Sanity check: make sure dir is valid */ 2209 /* Sanity check: make sure dir is valid */
2460 if ((dir < 0) || (dir >= 9)) 2210 if ((dir < 0) || (dir >= 9))
2461 { 2211 {
2462 LOG (llevError, "move_player: invalid direction %d\n", dir); 2212 LOG (llevError, "move_player: invalid direction %d\n", dir);
2463 return 0; 2213 return 0;
2464 } 2214 }
2465 2215
2466 /* peterm: added following line */ 2216 /* peterm: added following line */
2467 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2468 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2469 2219
2470 op->facing = dir; 2220 op->facing = dir;
2471 2221
2472 if (op->hide) 2222 if (op->hide)
2473 do_hidden_move (op); 2223 do_hidden_move (op);
… …
2484 2234
2485 /* Add special check for newcs players and fire on - this way, the 2235 /* Add special check for newcs players and fire on - this way, the
2486 * server can handle repeat firing. 2236 * server can handle repeat firing.
2487 */ 2237 */
2488 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2238 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2489 {
2490 op->direction = dir; 2239 op->direction = dir;
2491 }
2492 else 2240 else
2493 {
2494 op->direction = 0; 2241 op->direction = 0;
2495 } 2242
2496 /* Update how the player looks. Use the facing, so direction may 2243 /* Update how the player looks. Use the facing, so direction may
2497 * get reset to zero. This allows for full animation capabilities 2244 * get reset to zero. This allows for full animation capabilities
2498 * for players. 2245 * for players.
2499 */ 2246 */
2500 animate_object (op, op->facing); 2247 animate_object (op, op->facing);
… …
2509 * Returns true if there are more actions we can do. 2256 * Returns true if there are more actions we can do.
2510 */ 2257 */
2511int 2258int
2512handle_newcs_player (object *op) 2259handle_newcs_player (object *op)
2513{ 2260{
2514 if (op->contr->hidden)
2515 {
2516 op->invisible = 1000;
2517 /* the socket code flashes the player visible/invisible
2518 * depending on the value of invisible, so we need to
2519 * alternate it here for it to work correctly.
2520 */
2521 if (pticks & 2)
2522 op->invisible--;
2523 }
2524 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2525 {
2526 op->invisible--;
2527 if (!op->invisible)
2528 {
2529 make_visible (op);
2530 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2531 }
2532 }
2533
2534 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (QUERY_FLAG (op, FLAG_SCARED))
2535 { 2262 {
2536 flee_player (op); 2263 flee_player (op);
2537 /* If player is still scared, that is his action for this tick */ 2264 /* If player is still scared, that is his action for this tick */
2538 if (QUERY_FLAG (op, FLAG_SCARED)) 2265 if (QUERY_FLAG (op, FLAG_SCARED))
… …
2552 2279
2553 /* call this here - we also will call this in do_ericserver, but 2280 /* call this here - we also will call this in do_ericserver, but
2554 * the players time has been increased when doericserver has been 2281 * the players time has been increased when doericserver has been
2555 * called, so we recheck it here. 2282 * called, so we recheck it here.
2556 */ 2283 */
2557 op->contr->socket->handle_command (); 2284 if (op->contr->ns->handle_command ())
2285 return 1;
2286
2558 if (op->speed_left < 0) 2287 if (op->speed_left > 0)
2559 return 0; 2288 {
2560
2561 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2289 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2562 { 2290 {
2563 /* All move commands take 1 tick, at least for now */ 2291 /* All move commands take 1 tick, at least for now */
2564 op->speed_left--; 2292 op->speed_left--;
2565 2293
2566 /* Instead of all the stuff below, let move_player take care 2294 /* Instead of all the stuff below, let move_player take care
2567 * of it. Also, some of the skill stuff is only put in 2295 * of it. Also, some of the skill stuff is only put in
2568 * there, as well as the confusion stuff. 2296 * there, as well as the confusion stuff.
2569 */ 2297 */
2570 move_player (op, op->direction); 2298 move_player (op, op->direction);
2571 if (op->speed_left > 0) 2299
2572 return 1; 2300 return op->speed_left > 0;
2573 else 2301 }
2574 return 0;
2575 } 2302 }
2576 2303
2577 return 0; 2304 return 0;
2578} 2305}
2579 2306
… …
2599 op->stats.hp = op->stats.maxhp; 2326 op->stats.hp = op->stats.maxhp;
2600 2327
2601 if (op->stats.food < 0) 2328 if (op->stats.food < 0)
2602 op->stats.food = 999; 2329 op->stats.food = 999;
2603 2330
2604 fix_player (op); 2331 op->update_stats ();
2605 return 1; 2332 return 1;
2606 } 2333 }
2607 2334
2608 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2335 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2609 CLEAR_FLAG (op, FLAG_LIFESAVE); 2336 CLEAR_FLAG (op, FLAG_LIFESAVE);
… …
2617 * from. 2344 * from.
2618 */ 2345 */
2619void 2346void
2620remove_unpaid_objects (object *op, object *env) 2347remove_unpaid_objects (object *op, object *env)
2621{ 2348{
2622 object *next;
2623
2624 while (op) 2349 while (op)
2625 { 2350 {
2626 next = op->below; /* Make sure we have a good value, in case 2351 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2627 * we remove object 'op' 2352
2628 */
2629 if (QUERY_FLAG (op, FLAG_UNPAID)) 2353 if (QUERY_FLAG (op, FLAG_UNPAID))
2630 { 2354 {
2631 op->remove ();
2632 op->x = env->x;
2633 op->y = env->y;
2634 if (env->type == PLAYER) 2355 if (env->type == PLAYER)
2635 esrv_del_item (env->contr, op->count); 2356 esrv_del_item (env->contr, op->count);
2636 insert_ob_in_map (op, env->map, NULL, 0); 2357
2358 op->insert_at (env);
2637 } 2359 }
2638 else if (op->inv) 2360 else if (op->inv)
2639 remove_unpaid_objects (op->inv, env); 2361 remove_unpaid_objects (op->inv, env);
2640 2362
2641 op = next; 2363 op = next;
2642 } 2364 }
2643} 2365}
2644
2645 2366
2646/* 2367/*
2647 * Returns pointer a static string containing gravestone text 2368 * Returns pointer a static string containing gravestone text
2648 * Moved from apply.c to player.c - player.c is what 2369 * Moved from apply.c to player.c - player.c is what
2649 * actually uses this function. player.c may not be quite the 2370 * actually uses this function. player.c may not be quite the
… …
2683 strncat (buf2, " ", 20 - strlen (buf) / 2); 2404 strncat (buf2, " ", 20 - strlen (buf) / 2);
2684 strcat (buf2, buf); 2405 strcat (buf2, buf);
2685 2406
2686 return buf2; 2407 return buf2;
2687} 2408}
2688
2689
2690 2409
2691void 2410void
2692do_some_living (object *op) 2411do_some_living (object *op)
2693{ 2412{
2694 int last_food = op->stats.food; 2413 int last_food = op->stats.food;
… …
2700 int rate_grace = 2000; 2419 int rate_grace = 2000;
2701 const int max_hp = 1; 2420 const int max_hp = 1;
2702 const int max_sp = 1; 2421 const int max_sp = 1;
2703 const int max_grace = 1; 2422 const int max_grace = 1;
2704 2423
2424 if (op->contr->hidden)
2425 {
2426 op->invisible = 1000;
2427 /* the socket code flashes the player visible/invisible
2428 * depending on the value of invisible, so we need to
2429 * alternate it here for it to work correctly.
2430 */
2431 if (pticks & 2)
2432 op->invisible--;
2433 }
2434 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2435 {
2436 if (!op->invisible--)
2437 {
2438 make_visible (op);
2439 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440 }
2441 }
2442
2705 if (op->contr->outputs_sync) 2443 if (op->contr->outputs_sync)
2706 {
2707 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2444 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2708 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2445 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2709 flush_output_element (op, &op->contr->outputs[i]); 2446 flush_output_element (op, &op->contr->outputs[i]);
2710 }
2711 2447
2712 if (op->contr->state == ST_PLAYING) 2448 if (op->contr->ns->state == ST_PLAYING)
2713 { 2449 {
2714
2715 /* these next three if clauses make it possible to SLOW DOWN 2450 /* these next three if clauses make it possible to SLOW DOWN
2716 hp/grace/spellpoint regeneration. */ 2451 hp/grace/spellpoint regeneration. */
2717 if (op->contr->gen_hp >= 0) 2452 if (op->contr->gen_hp >= 0)
2718 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2453 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2719 else 2454 else
2720 { 2455 {
2721 gen_hp = op->stats.maxhp; 2456 gen_hp = op->stats.maxhp;
2722 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2457 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2723 } 2458 }
2459
2724 if (op->contr->gen_sp >= 0) 2460 if (op->contr->gen_sp >= 0)
2725 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2461 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2726 else 2462 else
2727 { 2463 {
2728 gen_sp = op->stats.maxsp; 2464 gen_sp = op->stats.maxsp;
2729 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2465 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2730 } 2466 }
2467
2731 if (op->contr->gen_grace >= 0) 2468 if (op->contr->gen_grace >= 0)
2732 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2469 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2733 else 2470 else
2734 { 2471 {
2735 gen_grace = op->stats.maxgrace; 2472 gen_grace = op->stats.maxgrace;
… …
2751 op->stats.food += op->contr->digestion; 2488 op->stats.food += op->contr->digestion;
2752 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2489 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2753 op->stats.food = last_food; 2490 op->stats.food = last_food;
2754 } 2491 }
2755 } 2492 }
2493
2756 if (max_sp > 1) 2494 if (max_sp > 1)
2757 { 2495 {
2758 over_sp = (gen_sp + 10) / rate_sp; 2496 over_sp = (gen_sp + 10) / rate_sp;
2759 if (over_sp > 0) 2497 if (over_sp > 0)
2760 { 2498 {
2761 if (op->stats.sp < op->stats.maxsp) 2499 if (op->stats.sp < op->stats.maxsp)
2762 { 2500 {
2763 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2501 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2502
2764 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2503 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2765 op->stats.sp--; 2504 op->stats.sp--;
2505
2766 if (op->stats.sp > op->stats.maxsp) 2506 if (op->stats.sp > op->stats.maxsp)
2767 op->stats.sp = op->stats.maxsp; 2507 op->stats.sp = op->stats.maxsp;
2768 } 2508 }
2769 op->last_sp = 0; 2509 op->last_sp = 0;
2770 } 2510 }
2771 else 2511 else
2772 {
2773 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2512 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2774 }
2775 } 2513 }
2776 else 2514 else
2777 {
2778 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2515 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2779 }
2780 } 2516 }
2781 2517
2782 /* Regenerate Grace */ 2518 /* Regenerate Grace */
2783 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2519 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2784 if (--op->last_grace < 0) 2520 if (--op->last_grace < 0)
2785 { 2521 {
2786 if (op->stats.grace < op->stats.maxgrace / 2) 2522 if (op->stats.grace < op->stats.maxgrace / 2)
2787 op->stats.grace++; /* no penalty in food for regaining grace */ 2523 op->stats.grace++; /* no penalty in food for regaining grace */
2524
2788 if (max_grace > 1) 2525 if (max_grace > 1)
2789 { 2526 {
2790 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2527 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2791 if (over_grace > 0) 2528 if (over_grace > 0)
2792 { 2529 {
… …
2820 op->stats.food += op->contr->digestion; 2557 op->stats.food += op->contr->digestion;
2821 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2558 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2822 op->stats.food = last_food; 2559 op->stats.food = last_food;
2823 } 2560 }
2824 } 2561 }
2562
2825 if (max_hp > 1) 2563 if (max_hp > 1)
2826 { 2564 {
2827 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2565 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2828 if (over_hp > 0) 2566 if (over_hp > 0)
2829 { 2567 {
… …
2853 2591
2854 if (op->contr->gen_hp > 0) 2592 if (op->contr->gen_hp > 0)
2855 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2593 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2856 else 2594 else
2857 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2595 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2596
2858 /* dms do not consume food */ 2597 /* dms do not consume food */
2859 if (!QUERY_FLAG (op, FLAG_WIZ)) 2598 if (!QUERY_FLAG (op, FLAG_WIZ))
2860 op->stats.food--; 2599 op->stats.food--;
2861 } 2600 }
2862 }
2863 2601
2864 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2602 if (op->stats.food < 0 && op->stats.hp >= 0)
2865 { 2603 {
2866 object *tmp, *flesh = NULL; 2604 object *tmp, *flesh = 0;
2867 2605
2868 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2606 for (tmp = op->inv; tmp; tmp = tmp->below)
2869 { 2607 {
2870 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2608 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2871 {
2872 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2873 { 2609 {
2610 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2611 {
2874 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2612 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2875 manual_apply (op, tmp, 0); 2613 manual_apply (op, tmp, 0);
2876 if (op->stats.food >= 0 || op->stats.hp < 0) 2614 if (op->stats.food >= 0 || op->stats.hp < 0)
2877 break; 2615 break;
2878 } 2616 }
2879 else if (tmp->type == FLESH) 2617 else if (tmp->type == FLESH)
2880 flesh = tmp; 2618 flesh = tmp;
2881 } /* End if paid for object */ 2619 } /* End if paid for object */
2882 } /* end of for loop */ 2620 } /* end of for loop */
2621
2883 /* If player is still starving, it means they don't have any food, so 2622 /* If player is still starving, it means they don't have any food, so
2884 * eat flesh instead. 2623 * eat flesh instead.
2885 */ 2624 */
2886 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2625 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2887 { 2626 {
2888 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2627 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2889 manual_apply (op, flesh, 0); 2628 manual_apply (op, flesh, 0);
2890 } 2629 }
2891 } /* end if player is starving */ 2630 }
2892 2631
2893 while (op->stats.food < 0 && op->stats.hp > 0) 2632 while (op->stats.food < 0 && op->stats.hp >= 0)
2894 op->stats.food++, op->stats.hp--; 2633 op->stats.food++, op->stats.hp--;
2895 2634
2896 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2635 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2897 kill_player (op); 2636 kill_player (op);
2637 }
2898} 2638}
2899
2900
2901 2639
2902/* If the player should die (lack of hp, food, etc), we call this. 2640/* If the player should die (lack of hp, food, etc), we call this.
2903 * op is the player in jeopardy. If the player can not be saved (not 2641 * op is the player in jeopardy. If the player can not be saved (not
2904 * permadeath, no lifesave), this will take care of removing the player 2642 * permadeath, no lifesave), this will take care of removing the player
2905 * file. 2643 * file.
… …
2935 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2673 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2936 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2674 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2937 2675
2938 /* restore player */ 2676 /* restore player */
2939 at = archetype::find ("poisoning"); 2677 at = archetype::find ("poisoning");
2940 tmp = present_arch_in_ob (at, op); 2678 if (object *tmp = present_arch_in_ob (at, op))
2941 if (tmp)
2942 { 2679 {
2943 tmp->destroy (); 2680 tmp->destroy ();
2944 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2681 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2945 } 2682 }
2946 2683
2947 at = archetype::find ("confusion"); 2684 at = archetype::find ("confusion");
2948 tmp = present_arch_in_ob (at, op); 2685 if (object *tmp = present_arch_in_ob (at, op))
2949 if (tmp)
2950 { 2686 {
2951 tmp->destroy (); 2687 tmp->destroy ();
2952 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2688 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2953 } 2689 }
2954 2690
… …
2956 op->stats.hp = op->stats.maxhp; 2692 op->stats.hp = op->stats.maxhp;
2957 if (op->stats.food <= 0) 2693 if (op->stats.food <= 0)
2958 op->stats.food = 999; 2694 op->stats.food = 999;
2959 2695
2960 /* create a bodypart-trophy to make the winner happy */ 2696 /* create a bodypart-trophy to make the winner happy */
2961 tmp = arch_to_object (archetype::find ("finger")); 2697 if (object *tmp = arch_to_object (archetype::find ("finger")))
2962 if (tmp != NULL)
2963 { 2698 {
2964 sprintf (buf, "%s's finger", &op->name); 2699 sprintf (buf, "%s's finger", &op->name);
2965 tmp->name = buf; 2700 tmp->name = buf;
2966 sprintf (buf, " This finger has been cut off %s\n" 2701 sprintf (buf, " This finger has been cut off %s\n"
2967 " the %s, when he was defeated at\n level %d by %s.\n", 2702 " the %s, when he was defeated at\n level %d by %s.\n",
2968 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2703 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2969 tmp->msg = buf; 2704 tmp->msg = buf;
2970 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2705 tmp->value = 0, tmp->type = 0;
2971 tmp->materialname = NULL; 2706 tmp->materialname = "organics";
2972 tmp->x = op->x, tmp->y = op->y; 2707 tmp->insert_at (op, tmp);
2973 insert_ob_in_map (tmp, op->map, op, 0);
2974 } 2708 }
2975 2709
2976 /* teleport defeated player to new destination */ 2710 /* teleport defeated player to new destination */
2977 transfer_ob (op, x, y, 0, NULL); 2711 transfer_ob (op, x, y, 0, NULL);
2978 op->contr->braced = 0; 2712 op->contr->braced = 0;
… …
2983 2717
2984 command_kill_pets (op, 0); 2718 command_kill_pets (op, 0);
2985 2719
2986 if (op->stats.food < 0) 2720 if (op->stats.food < 0)
2987 { 2721 {
2988 if (op->contr->explore)
2989 {
2990 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2991 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2992 op->stats.food = 999;
2993 return;
2994 }
2995 sprintf (buf, "%s starved to death.", &op->name); 2722 sprintf (buf, "%s starved to death.", &op->name);
2996 strcpy (op->contr->killer, "starvation"); 2723 strcpy (op->contr->killer, "starvation");
2997 } 2724 }
2998 else 2725 else
2999 {
3000 if (op->contr->explore)
3001 {
3002 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
3003 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3004 op->stats.hp = op->stats.maxhp;
3005 return;
3006 }
3007 sprintf (buf, "%s died.", &op->name); 2726 sprintf (buf, "%s died.", &op->name);
3008 } 2727
3009 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2728 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3010 2729
3011 /* save the map location for corpse, gravestone */ 2730 /* save the map location for corpse, gravestone */
3012 x = op->x; 2731 x = op->x;
3013 y = op->y; 2732 y = op->y;
3014 map = op->map; 2733 map = op->map;
3015 2734
3016
3017 if (settings.not_permadeth == TRUE)
3018 {
3019 /* NOT_PERMADEATH code. This basically brings the character back to 2735 /* NOT_PERMADEATH code. This basically brings the character back to
3020 * life if they are dead - it takes some exp and a random stat. 2736 * life if they are dead - it takes some exp and a random stat.
3021 * See the config.h file for a little more in depth detail about this. 2737 * See the config.h file for a little more in depth detail about this.
3022 */ 2738 */
3023 2739
3024 /* Basically two ways to go - remove a stat permanently, or just 2740 /* Basically two ways to go - remove a stat permanently, or just
3025 * make it depletion. This bunch of code deals with that aspect 2741 * make it depletion. This bunch of code deals with that aspect
3026 * of death. 2742 * of death.
3027 */ 2743 */
3028#ifndef COZY_SERVER 2744#ifndef COZY_SERVER
3029 if (settings.balanced_stat_loss) 2745 if (settings.balanced_stat_loss)
3030 { 2746 {
3031 /* If stat loss is permanent, lose one stat only. */ 2747 /* If stat loss is permanent, lose one stat only. */
3032 /* Lower level chars don't lose as many stats because they suffer 2748 /* Lower level chars don't lose as many stats because they suffer
3033 more if they do. */ 2749 more if they do. */
3034 /* Higher level characters can afford things such as potions of 2750 /* Higher level characters can afford things such as potions of
3035 restoration, or better, stat potions. So we slug them that 2751 restoration, or better, stat potions. So we slug them that
3036 little bit harder. */ 2752 little bit harder. */
3037 /* GD */ 2753 /* GD */
3038 if (settings.stat_loss_on_death) 2754 if (settings.stat_loss_on_death)
3039 num_stats_lose = 1; 2755 num_stats_lose = 1;
3040 else
3041 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3042 }
3043 else 2756 else
3044 { 2757 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2758 }
2759 else
3045 num_stats_lose = 1; 2760 num_stats_lose = 1;
3046 } 2761
3047 lost_a_stat = 0; 2762 lost_a_stat = 0;
3048 2763
3049 for (z = 0; z < num_stats_lose; z++) 2764 for (z = 0; z < num_stats_lose; z++)
3050 { 2765 {
3051 i = RANDOM () % NUM_STATS; 2766 i = RANDOM () % NUM_STATS;
3052 2767
3053 if (settings.stat_loss_on_death) 2768 if (settings.stat_loss_on_death)
3054 { 2769 {
3055 /* Pick a random stat and take a point off it. Tell the player 2770 /* Pick a random stat and take a point off it. Tell the player
3056 * what he lost. 2771 * what he lost.
3057 */ 2772 */
3058 change_attr_value (&(op->stats), i, -1); 2773 change_attr_value (&(op->stats), i, -1);
3059 check_stat_bounds (&(op->stats)); 2774 check_stat_bounds (&(op->stats));
3060 change_attr_value (&(op->contr->orig_stats), i, -1); 2775 change_attr_value (&(op->contr->orig_stats), i, -1);
3061 check_stat_bounds (&(op->contr->orig_stats)); 2776 check_stat_bounds (&(op->contr->orig_stats));
3062 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2777 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3063 lost_a_stat = 1; 2778 lost_a_stat = 1;
2779 }
2780 else
2781 {
2782 /* deplete a stat */
2783 archetype *deparch = archetype::find ("depletion");
2784 object *dep;
2785
2786 dep = present_arch_in_ob (deparch, op);
2787 if (!dep)
2788 {
2789 dep = arch_to_object (deparch);
2790 insert_ob_in_ob (dep, op);
3064 } 2791 }
3065 else 2792 lose_this_stat = 1;
2793 if (settings.balanced_stat_loss)
3066 { 2794 {
3067 /* deplete a stat */ 2795 /* GD */
3068 archetype *deparch = archetype::find ("depletion"); 2796 /* Get the stat that we're about to deplete. */
3069 object *dep; 2797 this_stat = get_attr_value (&(dep->stats), i);
3070 2798 if (this_stat < 0)
3071 dep = present_arch_in_ob (deparch, op);
3072 if (!dep)
3073 { 2799 {
3074 dep = arch_to_object (deparch); 2800 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3075 insert_ob_in_ob (dep, op); 2801 int keep_chance = this_stat * this_stat;
3076 } 2802
3077 lose_this_stat = 1; 2803 /* Yes, I am paranoid. Sue me. */
3078 if (settings.balanced_stat_loss)
3079 {
3080 /* GD */
3081 /* Get the stat that we're about to deplete. */
3082 this_stat = get_attr_value (&(dep->stats), i);
3083 if (this_stat < 0) 2804 if (keep_chance < 1)
2805 keep_chance = 1;
2806
2807 /* There is a maximum depletion total per level. */
2808 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3084 { 2809 {
3085 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3086 int keep_chance = this_stat * this_stat;
3087
3088 /* Yes, I am paranoid. Sue me. */
3089 if (keep_chance < 1)
3090 keep_chance = 1;
3091
3092 /* There is a maximum depletion total per level. */
3093 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3094 {
3095 lose_this_stat = 0; 2810 lose_this_stat = 0;
3096 /* Take loss chance vs keep chance to see if we 2811 /* Take loss chance vs keep chance to see if we
3097 retain the stat. */ 2812 retain the stat. */
3098 }
3099 else
3100 {
3101 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3102 lose_this_stat = 0;
3103 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3104 this_stat, keep_chance, loss_chance,
3105 lose_this_stat?"LOSE":"KEEP"); */
3106 }
3107 } 2813 }
3108 }
3109
3110 if (lose_this_stat)
3111 {
3112 this_stat = get_attr_value (&(dep->stats), i);
3113 /* We could try to do something clever like find another
3114 * stat to reduce if this fails. But chances are, if
3115 * stats have been depleted to -50, all are pretty low
3116 * and should be roughly the same, so it shouldn't make a
3117 * difference.
3118 */ 2814 else
3119 if (this_stat >= -50)
3120 { 2815 {
3121 change_attr_value (&(dep->stats), i, -1); 2816 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3122 SET_FLAG (dep, FLAG_APPLIED);
3123 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3124 fix_player (op);
3125 lost_a_stat = 1; 2817 lose_this_stat = 0;
2818 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2819 this_stat, keep_chance, loss_chance,
2820 lose_this_stat?"LOSE":"KEEP"); */
3126 } 2821 }
3127 } 2822 }
3128 } 2823 }
2824
2825 if (lose_this_stat)
2826 {
2827 this_stat = get_attr_value (&(dep->stats), i);
2828 /* We could try to do something clever like find another
2829 * stat to reduce if this fails. But chances are, if
2830 * stats have been depleted to -50, all are pretty low
2831 * and should be roughly the same, so it shouldn't make a
2832 * difference.
2833 */
2834 if (this_stat >= -50)
2835 {
2836 change_attr_value (&(dep->stats), i, -1);
2837 SET_FLAG (dep, FLAG_APPLIED);
2838 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2839 op->update_stats ();
2840 lost_a_stat = 1;
2841 }
3129 } 2842 }
2843 }
2844 }
3130 /* If no stat lost, tell the player. */ 2845 /* If no stat lost, tell the player. */
3131 if (!lost_a_stat) 2846 if (!lost_a_stat)
3132 { 2847 {
3133 /* determine_god() seems to not work sometimes... why is this? 2848 /* determine_god() seems to not work sometimes... why is this?
3134 Should I be using something else? GD */ 2849 Should I be using something else? GD */
3135 const char *god = determine_god (op); 2850 const char *god = determine_god (op);
3136 2851
3137 if (god && (strcmp (god, "none"))) 2852 if (god && (strcmp (god, "none")))
3138 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2853 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3139 else 2854 else
3140 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2855 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3141 } 2856 }
3142#else 2857#else
3143 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2858 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3144#endif 2859#endif
3145 2860
3146 /* Put a gravestone up where the character 'almost' died. List the 2861 /* Put a gravestone up where the character 'almost' died. List the
3147 * exp loss on the stone. 2862 * exp loss on the stone.
3148 */ 2863 */
3149 tmp = arch_to_object (archetype::find ("gravestone")); 2864 tmp = arch_to_object (archetype::find ("gravestone"));
3150 sprintf (buf, "%s's gravestone", &op->name); 2865 sprintf (buf, "%s's gravestone", &op->name);
3151 tmp->name = buf; 2866 tmp->name = buf;
3152 sprintf (buf, "%s's gravestones", &op->name); 2867 sprintf (buf, "%s's gravestones", &op->name);
3153 tmp->name_pl = buf; 2868 tmp->name_pl = buf;
3154 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); 2869 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);
3155 tmp->msg = buf; 2870 tmp->msg = buf;
3156 tmp->x = op->x, tmp->y = op->y; 2871 tmp->x = op->x, tmp->y = op->y;
3157 insert_ob_in_map (tmp, op->map, NULL, 0); 2872 insert_ob_in_map (tmp, op->map, NULL, 0);
3158 2873
3159 /**************************************/ 2874 /**************************************/
3160 /* */ 2875 /* */
3161 /* Subtract the experience points, */ 2876 /* Subtract the experience points, */
3162 /* if we died cause of food, give us */ 2877 /* if we died cause of food, give us */
3163 /* food, and reset HP's... */ 2878 /* food, and reset HP's... */
3164 /* */ 2879 /* */
3165 /**************************************/ 2880 /**************************************/
3166 2881
3167 /* remove any poisoning and confusion the character may be suffering. */ 2882 /* remove any poisoning and confusion the character may be suffering. */
3168 /* restore player */ 2883 /* restore player */
3169 at = archetype::find ("poisoning"); 2884 at = archetype::find ("poisoning");
3170 tmp = present_arch_in_ob (at, op); 2885 tmp = present_arch_in_ob (at, op);
3171 2886
3172 if (tmp) 2887 if (tmp)
3173 { 2888 {
3174 tmp->destroy (); 2889 tmp->destroy ();
3175 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2890 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3176 } 2891 }
3177 2892
3178 at = archetype::find ("confusion"); 2893 at = archetype::find ("confusion");
3179 tmp = present_arch_in_ob (at, op); 2894 tmp = present_arch_in_ob (at, op);
3180 if (tmp) 2895 if (tmp)
3181 { 2896 {
3182 tmp->destroy (); 2897 tmp->destroy ();
3183 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2898 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3184 } 2899 }
3185 2900
3186 cure_disease (op, 0); /* remove any disease */ 2901 cure_disease (op, 0); /* remove any disease */
3187 2902
3188 /*add_exp(op, (op->stats.exp * -0.20)); */ 2903 /*add_exp(op, (op->stats.exp * -0.20)); */
3189 apply_death_exp_penalty (op); 2904 apply_death_exp_penalty (op);
3190 if (op->stats.food < 100) 2905 if (op->stats.food < 100)
3191 op->stats.food = 900; 2906 op->stats.food = 900;
3192 op->stats.hp = op->stats.maxhp; 2907 op->stats.hp = op->stats.maxhp;
3193 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2908 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3194 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2909 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3195 2910
3196 /* 2911 /*
3197 * Check to see if the player is in a shop. IF so, then check to see if 2912 * Check to see if the player has any unpaid items. If so, remove them
3198 * the player has any unpaid items. If so, remove them and put them back 2913 * and put them back in the map.
3199 * in the map. 2914 */
3200 */
3201
3202 if (is_in_shop (op))
3203 remove_unpaid_objects (op->inv, op); 2915 remove_unpaid_objects (op->inv, op);
3204 2916
3205 /****************************************/ 2917 /****************************************/
3206 /* */ 2918 /* */
3207 /* Move player to his current respawn- */ 2919 /* Move player to his current respawn- */
3208 /* position (usually last savebed) */ 2920 /* position (usually last savebed) */
3209 /* */ 2921 /* */
3210 /****************************************/ 2922 /****************************************/
3211 2923
3212 enter_player_savebed (op); 2924 enter_player_savebed (op);
3213 2925
3214 /* Save the player before inserting the force to reduce
3215 * chance of abuse.
3216 */
3217 op->contr->braced = 0; 2926 op->contr->braced = 0;
3218 save_player (op, 1);
3219 2927
3220 /* it is possible that the player has blown something up 2928 /* it is possible that the player has blown something up
3221 * at his savebed location, and that can have long lasting 2929 * at his savebed location, and that can have long lasting
3222 * spell effects. So first see if there is a spell effect 2930 * spell effects. So first see if there is a spell effect
3223 * on the space that might harm the player. 2931 * on the space that might harm the player.
3224 */ 2932 */
3225 will_kill_again = 0; 2933 will_kill_again = 0;
3226 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2934 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3227 if (tmp->type == SPELL_EFFECT) 2935 if (tmp->type == SPELL_EFFECT)
3228 will_kill_again |= tmp->attacktype; 2936 will_kill_again |= tmp->attacktype;
3229 2937
3230 if (will_kill_again) 2938 if (will_kill_again)
3231 { 2939 {
3232 object *force; 2940 object *force;
3233 int at; 2941 int at;
3234 2942
3235 force = get_archetype (FORCE_NAME); 2943 force = get_archetype (FORCE_NAME);
3236 /* 50 ticks should be enough time for the spell to abate */ 2944 /* 50 ticks should be enough time for the spell to abate */
3237 force->speed = 0.1; 2945 force->speed = 0.1;
3238 force->speed_left = -5.0; 2946 force->speed_left = -5.0;
3239 SET_FLAG (force, FLAG_APPLIED); 2947 SET_FLAG (force, FLAG_APPLIED);
3240 for (at = 0; at < NROFATTACKS; at++) 2948 for (at = 0; at < NROFATTACKS; at++)
3241 if (will_kill_again & (1 << at)) 2949 if (will_kill_again & (1 << at))
3242 force->resist[at] = 100; 2950 force->resist[at] = 100;
3243 2951
3244 insert_ob_in_ob (force, op); 2952 insert_ob_in_ob (force, op);
3245 fix_player (op); 2953 op->update_stats ();
3246 2954
3247 } 2955 }
3248 2956
3249 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2957 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3250 return;
3251 } /* NOT_PERMADETH */
3252 else
3253 {
3254 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3255 * should probably be embedded in an else statement.
3256 */
3257
3258 op->contr->party = NULL;
3259 if (settings.set_title == TRUE)
3260 op->contr->own_title[0] = '\0';
3261 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3262 check_score (op);
3263
3264 if (op->contr->ranges[range_golem])
3265 {
3266 remove_friendly_object (op->contr->ranges[range_golem]);
3267 op->contr->ranges[range_golem]->destroy ();
3268 op->contr->ranges[range_golem] = 0;
3269 }
3270
3271 loot_object (op); /* Remove some of the items for good */
3272 op->remove ();
3273 op->direction = 0;
3274
3275 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3276 {
3277 delete_character (op->name, 0);
3278 if (settings.resurrection == TRUE)
3279 {
3280 /* save playerfile sans equipment when player dies
3281 ** then save it as player.pl.dead so that future resurrection
3282 ** type spells will work on them nicely
3283 */
3284 delete_character (op->name, 0);
3285 op->stats.hp = op->stats.maxhp;
3286 op->stats.food = 999;
3287
3288 /* set the location of where the person will reappear when */
3289 /* maybe resurrection code should fix map also */
3290 strcpy (op->contr->maplevel, settings.emergency_mapname);
3291 if (op->map != NULL)
3292 op->map = NULL;
3293 op->x = settings.emergency_x;
3294 op->y = settings.emergency_y;
3295 save_player (op, 0);
3296 op->map = map;
3297 /* please see resurrection.c: peterm */
3298 dead_player (op);
3299 }
3300 else
3301 delete_character (op->name, 1);
3302 }
3303
3304 play_again (op);
3305
3306 /* peterm: added to create a corpse at deathsite. */
3307 tmp = arch_to_object (archetype::find ("corpse_pl"));
3308 sprintf (buf, "%s", &op->name);
3309 tmp->name = tmp->name_pl = buf;
3310 tmp->level = op->level;
3311 tmp->x = x;
3312 tmp->y = y;
3313 tmp->msg = gravestone_text (op);
3314 SET_FLAG (tmp, FLAG_UNIQUE);
3315 insert_ob_in_map (tmp, map, NULL, 0);
3316 }
3317} 2958}
3318
3319 2959
3320void 2960void
3321loot_object (object *op) 2961loot_object (object *op)
3322{ /* Grab and destroy some treasure */ 2962{ /* Grab and destroy some treasure */
3323 object *tmp, *tmp2, *next; 2963 object *tmp, *tmp2, *next;
3324 2964
3325 if (op->container) 2965 op->close_container (); /* close open sack first */
3326 { /* close open sack first */
3327 esrv_apply_container (op, op->container);
3328 }
3329 2966
3330 for (tmp = op->inv; tmp != NULL; tmp = next) 2967 for (tmp = op->inv; tmp; tmp = next)
3331 { 2968 {
3332 next = tmp->below; 2969 next = tmp->below;
3333 if (tmp->type == EXPERIENCE || tmp->invisible) 2970
2971 if (tmp->invisible)
3334 continue; 2972 continue;
2973
3335 tmp->remove (); 2974 tmp->remove ();
3336 tmp->x = op->x, tmp->y = op->y; 2975 tmp->x = op->x, tmp->y = op->y;
2976
3337 if (tmp->type == CONTAINER) 2977 if (tmp->type == CONTAINER)
3338 { /* empty container to ground */ 2978 loot_object (tmp); /* empty container to ground */
3339 loot_object (tmp); 2979
3340 }
3341 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2980 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3342 { 2981 {
3343 if (tmp->nrof > 1) 2982 if (tmp->nrof > 1)
3344 { 2983 {
3345 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2984 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3346 tmp2->destroy (); 2985 tmp2->destroy ();
… …
3357/* 2996/*
3358 * fix_weight(): Check recursively the weight of all players, and fix 2997 * fix_weight(): Check recursively the weight of all players, and fix
3359 * what needs to be fixed. Refresh windows and fix speed if anything 2998 * what needs to be fixed. Refresh windows and fix speed if anything
3360 * was changed. 2999 * was changed.
3361 */ 3000 */
3362
3363void 3001void
3364fix_weight (void) 3002fix_weight (void)
3365{ 3003{
3366 player *pl; 3004 for_all_players (pl)
3367
3368 for (pl = first_player; pl != NULL; pl = pl->next)
3369 { 3005 {
3370 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3006 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3371 3007
3372 if (old == sum) 3008 if (old == sum)
3373 continue; 3009 continue;
3374 fix_player (pl->ob); 3010 pl->ob->update_stats ();
3375 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 3011 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3376 } 3012 }
3377} 3013}
3378 3014
3379void 3015void
3380fix_luck (void) 3016fix_luck (void)
3381{ 3017{
3382 player *pl; 3018 for_all_players (pl)
3383
3384 for (pl = first_player; pl != NULL; pl = pl->next)
3385 if (!pl->ob->contr->state) 3019 if (!pl->ob->contr->ns->state)
3386 change_luck (pl->ob, 0); 3020 pl->ob->change_luck (0);
3387} 3021}
3388
3389 3022
3390/* cast_dust() - handles op throwing objects of type 'DUST'. 3023/* cast_dust() - handles op throwing objects of type 'DUST'.
3391 * This is much simpler in the new spell code - we basically 3024 * This is much simpler in the new spell code - we basically
3392 * just treat this as any other spell casting object. 3025 * just treat this as any other spell casting object.
3393 */ 3026 */
3394
3395void 3027void
3396cast_dust (object *op, object *throw_ob, int dir) 3028cast_dust (object *op, object *throw_ob, int dir)
3397{ 3029{
3398 object *skop, *spob; 3030 object *skop, *spob;
3399 3031
… …
3433 if (op->type == PLAYER) 3065 if (op->type == PLAYER)
3434 { 3066 {
3435 op->contr->tmp_invis = 0; 3067 op->contr->tmp_invis = 0;
3436 op->contr->invis_race = 0; 3068 op->contr->invis_race = 0;
3437 } 3069 }
3070
3438 update_object (op, UP_OBJ_FACE); 3071 update_object (op, UP_OBJ_CHANGE);
3439} 3072}
3440 3073
3441int 3074int
3442is_true_undead (object *op) 3075is_true_undead (object *op)
3443{ 3076{
3444 object *tmp = NULL;
3445
3446 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3077 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3447 return 1; 3078 return 1;
3448 3079
3449 if (op->type == PLAYER)
3450 for (tmp = op->inv; tmp; tmp = tmp->below)
3451 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3452 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3453 return 1;
3454 return 0; 3080 return 0;
3455} 3081}
3456 3082
3457/* look at the surrounding terrain to determine 3083/* look at the surrounding terrain to determine
3458 * the hideability of this object. Positive levels 3084 * the hideability of this object. Positive levels
… …
3514 3140
3515 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3141 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3516 3142
3517 /* its *extremely* hard to run and sneak/hide at the same time! */ 3143 /* its *extremely* hard to run and sneak/hide at the same time! */
3518 if (op->type == PLAYER && op->contr->run_on) 3144 if (op->type == PLAYER && op->contr->run_on)
3519 {
3520 if (!skop || num >= skop->level) 3145 if (!skop || num >= skop->level)
3521 { 3146 {
3522 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3147 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3523 make_visible (op); 3148 make_visible (op);
3524 return; 3149 return;
3525 } 3150 }
3526 else 3151 else
3527 num += 20; 3152 num += 20;
3528 } 3153
3529 num += op->map->difficulty; 3154 num += op->map->difficulty;
3530 hide = hideability (op); /* modify by terrain hidden level */ 3155 hide = hideability (op); /* modify by terrain hidden level */
3531 num -= hide; 3156 num -= hide;
3157
3532 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3158 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3533 { 3159 {
3534 make_visible (op); 3160 make_visible (op);
3535 if (op->type == PLAYER) 3161 if (op->type == PLAYER)
3536 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3162 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3537 } 3163 }
3538 else if (op->type == PLAYER && skop) 3164 else if (op->type == PLAYER && skop)
3539 {
3540 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3165 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3541 }
3542} 3166}
3543 3167
3544/* determine if who is standing near a hostile creature. */ 3168/* determine if who is standing near a hostile creature. */
3545 3169
3546int 3170int
… …
3573 if (mflags & P_OUT_OF_MAP) 3197 if (mflags & P_OUT_OF_MAP)
3574 continue; 3198 continue;
3575 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3199 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3576 continue; 3200 continue;
3577 3201
3578 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3202 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3579 { 3203 {
3580 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3204 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3581 return 1; 3205 return 1;
3582 else if (tmp->type == PLAYER) 3206 else if (tmp->type == PLAYER)
3583 { 3207 {
… …
3613 if (pl->type != PLAYER) 3237 if (pl->type != PLAYER)
3614 { 3238 {
3615 LOG (llevError, "player_can_view() called for non-player object\n"); 3239 LOG (llevError, "player_can_view() called for non-player object\n");
3616 return -1; 3240 return -1;
3617 } 3241 }
3242
3618 if (!pl || !op) 3243 if (!pl || !op)
3619 return 0; 3244 return 0;
3620 3245
3621 if (op->head)
3622 {
3623 op = op->head; 3246 op = op->head_ ();
3624 } 3247
3625 get_rangevector (pl, op, &rv, 0x1); 3248 get_rangevector (pl, op, &rv, 0x1);
3626 3249
3627 /* starting with the 'head' part, lets loop 3250 /* starting with the 'head' part, lets loop
3628 * through the object and find if it has any 3251 * through the object and find if it has any
3629 * part that is in the los array but isnt on 3252 * part that is in the los array but isnt on
… …
3637 3260
3638 /* only the viewable area the player sees is updated by LOS 3261 /* only the viewable area the player sees is updated by LOS
3639 * code, so we need to restrict ourselves to that range of values 3262 * code, so we need to restrict ourselves to that range of values
3640 * for any meaningful values. 3263 * for any meaningful values.
3641 */ 3264 */
3642 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3265 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3643 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3266 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3644 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3267 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3645 return 1; 3268 return 1;
3646 op = op->more; 3269 op = op->more;
3647 } 3270 }
3648 return 0; 3271 return 0;
3649} 3272}
… …
3746 char buf[MAX_BUF]; /* tmp. string buffer */ 3369 char buf[MAX_BUF]; /* tmp. string buffer */
3747 int i = 0, j = 0; 3370 int i = 0, j = 0;
3748 3371
3749 /* get the appropriate treasurelist */ 3372 /* get the appropriate treasurelist */
3750 if (atnr == ATNR_FIRE) 3373 if (atnr == ATNR_FIRE)
3751 trlist = find_treasurelist ("dragon_ability_fire"); 3374 trlist = treasurelist::find ("dragon_ability_fire");
3752 else if (atnr == ATNR_COLD) 3375 else if (atnr == ATNR_COLD)
3753 trlist = find_treasurelist ("dragon_ability_cold"); 3376 trlist = treasurelist::find ("dragon_ability_cold");
3754 else if (atnr == ATNR_ELECTRICITY) 3377 else if (atnr == ATNR_ELECTRICITY)
3755 trlist = find_treasurelist ("dragon_ability_elec"); 3378 trlist = treasurelist::find ("dragon_ability_elec");
3756 else if (atnr == ATNR_POISON) 3379 else if (atnr == ATNR_POISON)
3757 trlist = find_treasurelist ("dragon_ability_poison"); 3380 trlist = treasurelist::find ("dragon_ability_poison");
3758 3381
3759 if (trlist == NULL || who->type != PLAYER) 3382 if (trlist == NULL || who->type != PLAYER)
3760 return; 3383 return;
3761 3384
3762 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3385 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3763 3386
3764 if (tr == NULL || tr->item == NULL) 3387 if (!tr || !tr->item)
3765 { 3388 {
3766 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3389 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3767 return; 3390 return;
3768 } 3391 }
3769 3392
… …
3835 { 3458 {
3836 /* forces in the treasurelist can alter the player's stats */ 3459 /* forces in the treasurelist can alter the player's stats */
3837 object *skin; 3460 object *skin;
3838 3461
3839 /* first get the dragon skin force */ 3462 /* first get the dragon skin force */
3463 shstr_cmp dragon_skin_force ("dragon_skin_force");
3840 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3464 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3465 ;
3466
3841 if (skin == NULL) 3467 if (!skin)
3842 return; 3468 return;
3843 3469
3844 /* adding new spellpath attunements */ 3470 /* adding new spellpath attunements */
3845 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3471 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3846 { 3472 {
… …
3891 * not readied. 3517 * not readied.
3892 */ 3518 */
3893void 3519void
3894player_unready_range_ob (player *pl, object *ob) 3520player_unready_range_ob (player *pl, object *ob)
3895{ 3521{
3896 rangetype i;
3897
3898 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3522 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3899 {
3900 if (pl->ranges[i] == ob) 3523 if (pl->ranges[i] == ob)
3901 { 3524 {
3902 pl->ranges[i] = NULL; 3525 pl->ranges[i] = 0;
3903 if (pl->shoottype == i) 3526 if (pl->shoottype == i)
3904 {
3905 pl->shoottype = range_none; 3527 pl->shoottype = range_none;
3906 }
3907 } 3528 }
3908 }
3909} 3529}
3530
3531sint8
3532player::visibility_at (maptile *map, int x, int y) const
3533{
3534 if (!ns)
3535 return 0;
3536
3537 int dx, dy;
3538 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3539 return 0;
3540
3541 x += dx - ns->current_x + ns->mapx / 2;
3542 y += dy - ns->current_y + ns->mapy / 2;
3543
3544 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3545 return 0;
3546
3547 return 100 - blocked_los [x][y];
3548}

Diff Legend

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