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.39 by root, Thu Dec 14 14:23:09 2006 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 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#include <newclient.h>
33 33
34#ifdef COZY_SERVER 34#include <algorithm>
35extern int same_party (partylist *a, partylist *b); 35#include <functional>
36#endif
37 36
38player * 37playervec players;
39find_player (const char *plname)
40{
41 player *pl;
42
43 for (pl = first_player; pl != NULL; pl = pl->next)
44 {
45 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
46 return pl;
47 };
48 return NULL;
49}
50
51player *
52find_player_partial_name (const char *plname)
53{
54 player *pl;
55 player *found = NULL;
56 size_t namelen = strlen (plname);
57
58 for (pl = first_player; pl != NULL; pl = pl->next)
59 {
60 if ((size_t) strlen (pl->ob->name) < namelen)
61 continue;
62
63 if (!strcmp (pl->ob->name, plname))
64 return pl;
65
66 if (!strncasecmp (pl->ob->name, plname, namelen))
67 {
68 if (found)
69 return NULL;
70
71 found = pl;
72 }
73 }
74 return found;
75}
76 38
77void 39void
78display_motd (const object *op) 40display_motd (const object *op)
79{ 41{
80 char buf[MAX_BUF]; 42 char buf[MAX_BUF];
… …
83 int comp; 45 int comp;
84 int size; 46 int size;
85 47
86 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 48 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
87 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 49 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
88 {
89 return; 50 return;
90 } 51
91 motd[0] = '\0'; 52 motd[0] = '\0';
92 size = 0; 53 size = 0;
54
93 while (fgets (buf, MAX_BUF, fp) != NULL) 55 while (fgets (buf, MAX_BUF, fp))
94 { 56 {
95 if (*buf == '#') 57 if (*buf == '#')
96 continue; 58 continue;
59
97 strncat (motd + size, buf, HUGE_BUF - size); 60 strncat (motd + size, buf, HUGE_BUF - size);
98 size += strlen (buf); 61 size += strlen (buf);
99 } 62 }
63
100 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 64 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
101 close_and_delete (fp, comp); 65 close_and_delete (fp, comp);
102} 66}
103 67
104void 68void
… …
110 int comp; 74 int comp;
111 int size; 75 int size;
112 76
113 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 77 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 78 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
115 {
116 return; 79 return;
117 } 80
118 rules[0] = '\0'; 81 rules[0] = '\0';
119 size = 0; 82 size = 0;
83
120 while (fgets (buf, MAX_BUF, fp) != NULL) 84 while (fgets (buf, MAX_BUF, fp))
121 { 85 {
122 if (*buf == '#') 86 if (*buf == '#')
123 continue; 87 continue;
88
124 if (size + strlen (buf) >= HUGE_BUF) 89 if (size + strlen (buf) >= HUGE_BUF)
125 { 90 {
126 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 91 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
127 break; 92 break;
128 } 93 }
94
129 strncat (rules + size, buf, HUGE_BUF - size); 95 strncat (rules + size, buf, HUGE_BUF - size);
130 size += strlen (buf); 96 size += strlen (buf);
131 } 97 }
98
132 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 99 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
133 close_and_delete (fp, comp); 100 close_and_delete (fp, comp);
134} 101}
135 102
136void 103void
… …
144 int size; 111 int size;
145 112
146 sprintf (buf, "%s/%s", settings.confdir, settings.news); 113 sprintf (buf, "%s/%s", settings.confdir, settings.news);
147 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
148 return; 115 return;
116
149 news[0] = '\0'; 117 news[0] = '\0';
150 subject[0] = '\0'; 118 subject[0] = '\0';
151 size = 0; 119 size = 0;
120
152 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
153 { 122 {
154 if (*buf == '#') 123 if (*buf == '#')
155 continue; 124 continue;
125
156 if (*buf == '%') 126 if (*buf == '%')
157 { /* send one news */ 127 { /* send one news */
158 if (size > 0) 128 if (size > 0)
159 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
160 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
161 strip_endline (subject); 132 strip_endline (subject);
162 size = 0; 133 size = 0;
163 news[0] = '\0'; 134 news[0] = '\0';
164 } 135 }
… …
173 size += strlen (buf); 144 size += strlen (buf);
174 } 145 }
175 } 146 }
176 147
177 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
178 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);
179 close_and_delete (fp, comp); 150 close_and_delete (fp, comp);
180}
181
182int
183playername_ok (const char *cp)
184{
185 /* Don't allow - or _ as first character in the name */
186 if (*cp == '-' || *cp == '_')
187 return 0;
188
189 for (; *cp != '\0'; cp++)
190 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
191 return 0;
192 return 1;
193}
194
195/* This no longer sets the player map. Also, it now updates
196 * all the pointers so the caller doesn't need to do that.
197 * Caller is responsible for setting the correct map.
198 */
199
200/* Redo this to do both get_player_ob and get_player.
201 * Hopefully this will be less bugfree and simpler.
202 * Returns the player structure. If 'p' is null,
203 * we create a new one. Otherwise, we recycle
204 * the one that is passed.
205 */
206static player *
207get_player (player *p)
208{
209 object *op = arch_to_object (get_player_archetype (0));
210 int i;
211
212 /* Clears basically the entire player structure except
213 * for next and socket.
214 */
215 p->clear ();
216
217 /* There are some elements we want initialized to non zero value -
218 * we deal with that below this point.
219 */
220 p->party = NULL;
221 p->outputs_sync = 16; /* Every 2 seconds */
222 p->outputs_count = 8; /* Keeps present behaviour */
223 p->unapply = unapply_nochoice;
224 p->Swap_First = -1;
225
226#ifdef AUTOSAVE
227 p->last_save_tick = 9999999;
228#endif
229
230 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
231
232 op->contr = p; /* this aren't yet in archetype */
233 p->ob = op;
234 op->speed_left = 0.5;
235 op->speed = 1.0;
236 op->direction = 5; /* So player faces south */
237 op->stats.wc = 2;
238 op->run_away = 25; /* Then we panick... */
239
240 {
241 int oldmon = p->socket->monitor_spells; // what a hack
242 p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
243 roll_stats (op);
244 p->socket->monitor_spells = oldmon;
245 }
246 p->state = ST_ROLL_STAT;
247 clear_los (op);
248
249 p->gen_sp_armour = 10;
250 p->last_speed = -1;
251 p->shoottype = range_none;
252 p->bowtype = bow_normal;
253 p->petmode = pet_normal;
254 p->listening = 10;
255 p->usekeys = containers;
256 p->last_weapon_sp = -1;
257 p->peaceful = 1; /* default peaceful */
258 p->do_los = 1;
259 p->explore = 0;
260 p->no_shout = 0; /* default can shout */
261
262 assign (p->title, op->arch->clone.name);
263 op->race = op->arch->clone.race;
264
265 CLEAR_FLAG (op, FLAG_READY_SKILL);
266
267 /* we need to clear these to -1 and not zero - otherwise,
268 * if a player quits and starts a new character, we wont
269 * send new values to the client, as things like exp start
270 * at zero.
271 */
272 for (i = 0; i < NUM_SKILLS; i++)
273 {
274 p->last_skill_exp[i] = -1;
275 p->last_skill_ob[i] = NULL;
276 }
277
278 for (i = 0; i < NROFATTACKS; i++)
279 p->last_resist[i] = -1;
280
281 p->last_stats.exp = -1;
282 p->last_weight = (uint32) - 1;
283
284 p->socket->update_look = 0;
285 p->socket->look_position = 0;
286
287 return p;
288} 151}
289 152
290/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
291static void 154static void
292set_first_map (object *op) 155set_first_map (object *op)
293{ 156{
294 strcpy (op->contr->maplevel, first_map_path); 157 op->contr->maplevel = first_map_path;
295 op->x = -1; 158 op->x = -1;
296 op->y = -1; 159 op->y = -1;
297 enter_exit (op, NULL);
298} 160}
299 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
200 if (ob->map)
201 maplevel = ob->map->path;
202
203 ob->remove ();
204 ob->map = 0;
205 party = 0;
206
207 // for weird reasons, this is often "ob", keeping a circular reference
208 ranges [range_skill] = 0;
209
210 players.erase (this);
211}
212
213// connect the player with a specific client
214// also changed, rationalises, and fixes some incorrect settings
215void
216player::connect (client *ns)
217{
218 this->ns = ns;
219 ns->pl = this;
220
221 run_on = 0;
222 fire_on = 0;
223 ob->close_container (); //TODO: client-specific
224
225 ns->update_look = 0;
226 ns->look_position = 0;
227
228 clear_los (ob);
229
230 ns->reset_stats ();
231
232 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238
239 ob->carrying = sum_weight (ob);
240 link_player_skills (ob);
241
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243
244 assign (title, ob->arch->clone.name);
245
246 /* if it's a dragon player, set the correct title here */
247 if (is_dragon_pl (ob))
248 {
249 object *tmp, *abil = 0, *skin = 0;
250
251 shstr_cmp dragon_ability_force ("dragon_ability_force");
252 shstr_cmp dragon_skin_force ("dragon_skin_force");
253
254 for (tmp = ob->inv; tmp; tmp = tmp->below)
255 if (tmp->type == FORCE)
256 if (tmp->arch->name == dragon_ability_force)
257 abil = tmp;
258 else if (tmp->arch->name == dragon_skin_force)
259 skin = tmp;
260
261 set_dragon_name (ob, abil, skin);
262 }
263
264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265
266 esrv_new_player (this, ob->weight + ob->carrying);
267
268 ob->update_stats ();
269 ns->floorbox_update ();
270
271 esrv_send_inventory (ob, ob);
272 esrv_add_spells (this, 0);
273
274 activate ();
275
276 send_rules (ob);
277 send_news (ob);
278 display_motd (ob);
279
280 INVOKE_PLAYER (CONNECT, this);
281 INVOKE_PLAYER (LOGIN, this);
282}
283
284void
285player::disconnect ()
286{
287 if (ns)
288 {
289 if (active)
290 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
291
292 INVOKE_PLAYER (DISCONNECT, this);
293
294 ns->reset_stats ();
295 ns->pl = 0;
296 ns = 0;
297 }
298
299 if (ob)
300 ob->close_container (); //TODO: client-specific
301
302 deactivate ();
303}
304
305// the need for this function can be explained
306// by load_object not returning the object
307void
308player::set_object (object *op)
309{
310 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */
312
313 ob->speed_left = 0.5;
314 ob->speed = 1.0;
315 ob->direction = 5; /* So player faces south */
316}
317
318player::player ()
319{
320 /* There are some elements we want initialised to non zero value -
321 * we deal with that below this point.
322 */
323 outputs_sync = 4;
324 outputs_count = 4;
325 unapply = unapply_nochoice;
326
327 savebed_map = first_map_path; /* Init. respawn position */
328
329 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal;
332 petmode = pet_normal;
333 listening = 10;
334 usekeys = containers;
335 peaceful = 1; /* default peaceful */
336 do_los = 1;
337}
338
339void
340player::do_destroy ()
341{
342 disconnect ();
343
344 attachable::do_destroy ();
345
346 if (ob)
347 {
348 ob->destroy_inv (false);
349 ob->destroy ();
350 }
351}
352
353player::~player ()
354{
355 /* Clear item stack */
356 free (stack_items);
357}
358
300/* Tries to add player on the connection passwd in ns. 359/* Tries to add player on the connection passed in ns.
301 * All we can really get in this is some settings like host and display 360 * All we can really get in this is some settings like host and display
302 * mode. 361 * mode.
303 */ 362 */
304 363player *
305int 364player::create ()
306add_player (client_socket *ns)
307{ 365{
308 player *p = new player; 366 player *pl = new player;
309 367
310 p->socket = ns; 368 pl->set_object (arch_to_object (get_player_archetype (0)));
311 ns->pl = p;
312 369
313 p->next = first_player; 370 pl->ob->roll_stats ();
314 first_player = p; 371 pl->ob->stats.wc = 2;
372 pl->ob->run_away = 25; /* Then we panick... */
315 373
316 p = get_player (p);
317
318 set_first_map (p->ob); 374 set_first_map (pl->ob);
319 375
320 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
321 add_friendly_object (p->ob);
322 send_rules (p->ob);
323 send_news (p->ob);
324 display_motd (p->ob);
325 get_name (p->ob);
326
327 return 0; 376 return pl;
328} 377}
329 378
330/* 379/*
331 * get_player_archetype() return next player archetype from archetype 380 * get_player_archetype() return next player archetype from archetype
332 * list. Not very efficient routine, but used only creating new players. 381 * list. Not very efficient routine, but used only creating new players.
… …
341 { 390 {
342 if (at == NULL || at->next == NULL) 391 if (at == NULL || at->next == NULL)
343 at = first_archetype; 392 at = first_archetype;
344 else 393 else
345 at = at->next; 394 at = at->next;
395
346 if (at->clone.type == PLAYER) 396 if (at->clone.type == PLAYER)
347 return at; 397 return at;
398
348 if (at == start) 399 if (at == start)
349 { 400 {
350 LOG (llevError, "No Player archetypes\n"); 401 LOG (llevError, "No Player archetypes\n");
351 exit (-1); 402 exit (-1);
352 } 403 }
353 } 404 }
354} 405}
355 406
356
357object * 407object *
358get_nearest_player (object *mon) 408get_nearest_player (object *mon)
359{ 409{
360 object *op = NULL; 410 object *op = NULL;
361 player *pl = NULL;
362 objectlink *ol; 411 objectlink *ol;
363 unsigned lastdist; 412 unsigned lastdist;
364 rv_vector rv; 413 rv_vector rv;
365 414
366 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 415 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
367 { 416 {
368 /* We should not find free objects on this friendly list, but it 417 /* We should not find free objects on this friendly list, but it
369 * does periodically happen. Given that, lets deal with it. 418 * does periodically happen. Given that, lets deal with it.
370 * While unlikely, it is possible the next object on the friendly 419 * While unlikely, it is possible the next object on the friendly
371 * list is also free, so encapsulate this in a while loop. 420 * list is also free, so encapsulate this in a while loop.
… …
375 object *tmp = ol->ob; 424 object *tmp = ol->ob;
376 425
377 /* Can't do much more other than log the fact, because the object 426 /* Can't do much more other than log the fact, because the object
378 * itself will have been cleared. 427 * itself will have been cleared.
379 */ 428 */
380 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 429 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430 tmp->debug_desc ());
381 ol = ol->next; 431 ol = ol->next;
382 remove_friendly_object (tmp); 432 remove_friendly_object (tmp);
383 if (!ol) 433 if (!ol)
384 return op; 434 return op;
385 } 435 }
… …
398 { 448 {
399 op = ol->ob; 449 op = ol->ob;
400 lastdist = rv.distance; 450 lastdist = rv.distance;
401 } 451 }
402 } 452 }
403 for (pl = first_player; pl != NULL; pl = pl->next) 453
404 { 454 for_all_players (pl)
405 if (can_detect_enemy (mon, pl->ob, &rv)) 455 if (can_detect_enemy (mon, pl->ob, &rv))
406 {
407
408 if (lastdist > rv.distance) 456 if (lastdist > rv.distance)
409 { 457 {
410 op = pl->ob; 458 op = pl->ob;
411 lastdist = rv.distance; 459 lastdist = rv.distance;
412 } 460 }
413 } 461
414 }
415#if 0 462#if 0
416 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 463 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
417#endif 464#endif
418 return op; 465 return op;
419} 466}
… …
437 * circling behaviour. Unfortunately, this function is also used to determined 484 * circling behaviour. Unfortunately, this function is also used to determined
438 * if the creature should cast a spell, so returning a direction in that case 485 * if the creature should cast a spell, so returning a direction in that case
439 * is probably not a good thing. 486 * is probably not a good thing.
440 */ 487 */
441#define MAX_SPACES 50 488#define MAX_SPACES 50
442
443 489
444/* 490/*
445 * Returns the direction to the player, if valid. Returns 0 otherwise. 491 * Returns the direction to the player, if valid. Returns 0 otherwise.
446 * modified to verify there is a path to the player. Does this by stepping towards 492 * modified to verify there is a path to the player. Does this by stepping towards
447 * player and if path is blocked then see if blockage is close enough to player that 493 * player and if path is blocked then see if blockage is close enough to player that
… …
478 x = mon->x; 524 x = mon->x;
479 y = mon->y; 525 y = mon->y;
480 m = mon->map; 526 m = mon->map;
481 dir = rv.direction; 527 dir = rv.direction;
482 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 528 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
483 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 529 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
530
484 /* If we can't solve it within the search distance, return now. */ 531 /* If we can't solve it within the search distance, return now. */
485 if (diff > max) 532 if (diff > max)
486 return 0; 533 return 0;
534
487 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
488 { 536 {
489 lastx = x; 537 lastx = x;
490 lasty = y; 538 lasty = y;
491 lastmap = m; 539 lastmap = m;
… …
573 max--; 621 max--;
574 lastdir = dir; 622 lastdir = dir;
575 if (!firstdir) 623 if (!firstdir)
576 firstdir = dir; 624 firstdir = dir;
577 } 625 }
626
578 if (diff <= 1) 627 if (diff <= 1)
579 { 628 {
580 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
581 * headed toward player for entire distance. 630 * headed toward player for entire distance.
582 */ 631 */
583 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
584 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 633 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
585 } 634 }
635
586 if (diff > max) 636 if (diff > max)
587 return 0; 637 return 0;
588 } 638 }
639
589 /* If we reached the max, didn't find a direction in time */ 640 /* If we reached the max, didn't find a direction in time */
590 if (!max) 641 if (!max)
591 return 0; 642 return 0;
592 643
593 return firstdir; 644 return firstdir;
… …
686 /* Need to set up the skill pointers */ 737 /* Need to set up the skill pointers */
687 link_player_skills (pl); 738 link_player_skills (pl);
688} 739}
689 740
690void 741void
691get_name (object *op)
692{
693 op->contr->write_buf[0] = '\0';
694 op->contr->state = ST_GET_NAME;
695 send_query (op->contr->socket, 0, "What is your name?\n:");
696}
697
698void
699get_password (object *op)
700{
701 op->contr->write_buf[0] = '\0';
702 op->contr->state = ST_GET_PASSWORD;
703 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
704}
705
706void
707play_again (object *op)
708{
709 op->contr->state = ST_PLAY_AGAIN;
710 op->chosen_skill = NULL;
711 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
712 /* a bit of a hack, but there are various places early in th
713 * player creation process that a user can quit (eg, roll
714 * stats) that isn't removing the player. Taking a quick
715 * look, there are many places that call play_again without
716 * removing the player - it probably makes more sense
717 * to leave it to play_again to remove the object in all
718 * cases.
719 */
720 if (!QUERY_FLAG (op, FLAG_REMOVED))
721 op->remove ();
722 /* Need to set this to null - otherwise, it could point to garbage,
723 * and draw() doesn't check to see if the player is removed, only if
724 * the map is null or not swapped out.
725 */
726 op->map = NULL;
727}
728
729int
730receive_play_again (object *op, char key)
731{
732 if (key == 'q' || key == 'Q')
733 {
734 remove_friendly_object (op);
735 leave (op->contr, 0); /* ericserver will draw the message */
736 return 2;
737 }
738 else if (key == 'a' || key == 'A')
739 {
740 player *pl = op->contr;
741 shstr name = op->name;
742
743 op->contr = 0;
744 op->type = 0;
745 op->destroy (1);
746 pl = get_player (pl);
747 op = pl->ob;
748 add_friendly_object (op);
749 op->contr->password[0] = '~';
750 op->name = op->name_pl = 0;
751 /* Lets put a space in here */
752 new_draw_info (NDI_UNIQUE, 0, op, "\n");
753 get_name (op);
754 op->name = op->name_pl = name;
755 set_first_map (op);
756 }
757 else
758 /* user pressed something else so just ask again... */
759 play_again (op);
760
761 return 0;
762}
763
764void
765confirm_password (object *op)
766{
767
768 op->contr->write_buf[0] = '\0';
769 op->contr->state = ST_CONFIRM_PASSWORD;
770 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
771}
772
773void
774get_party_password (object *op, partylist *party) 742get_party_password (object *op, partylist *party)
775{ 743{
776 if (party == NULL) 744 if (party == NULL)
777 { 745 {
778 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 746 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
779 return; 747 return;
780 } 748 }
749
781 op->contr->write_buf[0] = '\0'; 750 op->contr->write_buf[0] = '\0';
782 op->contr->state = ST_GET_PARTY_PASSWORD; 751 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
783 op->contr->party_to_join = party; 752 op->contr->party_to_join = party;
784 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 753 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
785} 754}
786
787 755
788/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 756/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
789int 757static int
790roll_stat (void) 758roll_stat (void)
791{ 759{
792 int a[4], i, j, k; 760 int a[4], i, j, k;
793 761
794 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
795 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
796 764
797 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
798 if (a[i] < k) 766 if (a[i] < k)
799 k = a[i], j = i; 767 k = a[i], j = i;
800 768
801 for (i = 0, k = 0; i < 4; i++) 769 for (i = 0, k = 0; i < 4; i++)
802 {
803 if (i != j) 770 if (i != j)
804 k += a[i]; 771 k += a[i];
805 } 772
806 return k; 773 return k;
807} 774}
808 775
809void 776void
810roll_stats (object *op) 777object::roll_stats ()
811{ 778{
812 int sum = 0;
813 int i = 0, j = 0;
814 int statsort[7]; 779 int statsort [7];
815 780
816 do 781 for (;;)
817 {
818 op->stats.Str = roll_stat ();
819 op->stats.Dex = roll_stat ();
820 op->stats.Int = roll_stat ();
821 op->stats.Con = roll_stat ();
822 op->stats.Wis = roll_stat ();
823 op->stats.Pow = roll_stat ();
824 op->stats.Cha = roll_stat ();
825 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
826 } 782 {
827 while (sum < 82 || sum > 116); 783 int sum = 0;
784 for (int i = 7; i--; )
785 sum += statsort [i] = roll_stat ();
828 786
787 if (sum >= 82 && sum <= 116)
788 break;
789 }
790
829 /* Sort the stats so that rerolling is easier... */ 791 // Sort the stats so that rerolling is easier...
830 statsort[0] = op->stats.Str; 792 std::sort (statsort, statsort + 7, std::greater<int>());
831 statsort[1] = op->stats.Dex;
832 statsort[2] = op->stats.Int;
833 statsort[3] = op->stats.Con;
834 statsort[4] = op->stats.Wis;
835 statsort[5] = op->stats.Pow;
836 statsort[6] = op->stats.Cha;
837 793
838 /* a quick and dirty bubblesort? */
839 do
840 {
841 if (statsort[i] < statsort[i + 1])
842 {
843 j = statsort[i];
844 statsort[i] = statsort[i + 1];
845 statsort[i + 1] = j;
846 i = 0;
847 }
848 else
849 {
850 i++;
851 }
852 }
853 while (i < 6);
854
855 op->stats.Str = statsort[0]; 794 stats.Str = statsort[0];
856 op->stats.Dex = statsort[1]; 795 stats.Dex = statsort[1];
857 op->stats.Con = statsort[2]; 796 stats.Con = statsort[2];
858 op->stats.Int = statsort[3]; 797 stats.Int = statsort[3];
859 op->stats.Wis = statsort[4]; 798 stats.Wis = statsort[4];
860 op->stats.Pow = statsort[5]; 799 stats.Pow = statsort[5];
861 op->stats.Cha = statsort[6]; 800 stats.Cha = statsort[6];
862 801
863
864 op->contr->orig_stats.Str = op->stats.Str;
865 op->contr->orig_stats.Dex = op->stats.Dex;
866 op->contr->orig_stats.Int = op->stats.Int;
867 op->contr->orig_stats.Con = op->stats.Con;
868 op->contr->orig_stats.Wis = op->stats.Wis;
869 op->contr->orig_stats.Pow = op->stats.Pow;
870 op->contr->orig_stats.Cha = op->stats.Cha;
871
872 op->level = 1;
873 op->stats.exp = 0; 802 stats.exp = 0;
874 op->stats.ac = 0; 803 stats.ac = 0;
875 804
876 op->contr->levhp[1] = 9;
877 op->contr->levsp[1] = 6;
878 op->contr->levgrace[1] = 3;
879
880 fix_player (op);
881 op->stats.hp = op->stats.maxhp; 805 stats.hp = stats.maxhp;
882 op->stats.sp = op->stats.maxsp; 806 stats.sp = stats.maxsp;
883 op->stats.grace = op->stats.maxgrace; 807 stats.grace = stats.maxgrace;
808
809 if (contr)
810 {
811 contr->levhp[1] = 9;
812 contr->levsp[1] = 6;
813 contr->levgrace[1] = 3;
814
884 op->contr->orig_stats = op->stats; 815 contr->orig_stats = stats;
816 }
885} 817}
886 818
887void 819void
888Roll_Again (object *op) 820object::swap_stats (int a, int b)
889{ 821{
890 esrv_new_player (op->contr, 0); 822 int tmp = get_attr_value (&contr->orig_stats, a);
891 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, 823 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
892 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 824 set_attr_value (&contr->orig_stats, b, tmp);
893}
894 825
895void 826 stats.Str = contr->orig_stats.Str;
896Swap_Stat (object *op, int Swap_Second) 827 stats.Dex = contr->orig_stats.Dex;
828 stats.Con = contr->orig_stats.Con;
829 stats.Int = contr->orig_stats.Int;
830 stats.Wis = contr->orig_stats.Wis;
831 stats.Pow = contr->orig_stats.Pow;
832 stats.Cha = contr->orig_stats.Cha;
833
834 //TODO: the following code looks so borked and should, at the very least,
835 // be merged with the similar code in roll_stats
836 stats.ac = 0;
837
838 level = 1;
839 stats.exp = 0;
840 stats.ac = 0;
841
842 stats.hp = stats.maxhp;
843 stats.sp = stats.maxsp;
844 stats.grace = stats.maxgrace;
845
846 if (contr)
847 {
848 contr->levhp[1] = 9;
849 contr->levsp[1] = 6;
850 contr->levgrace[1] = 3;
851
852 contr->orig_stats = stats;
853 }
854}
855
856static void
857start_info (object *op)
897{ 858{
898 signed char tmp;
899 char buf[MAX_BUF]; 859 char buf[MAX_BUF];
900 860
901 if (op->contr->Swap_First == -1) 861 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
902 {
903 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
904 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
905 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
906 return;
907 }
908
909 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
910
911 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
912
913 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
914
915 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
916 new_draw_info (NDI_UNIQUE, 0, op, buf); 862 new_draw_info (NDI_UNIQUE, 0, op, buf);
917 op->stats.Str = op->contr->orig_stats.Str; 863 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
918 op->stats.Dex = op->contr->orig_stats.Dex;
919 op->stats.Con = op->contr->orig_stats.Con;
920 op->stats.Int = op->contr->orig_stats.Int;
921 op->stats.Wis = op->contr->orig_stats.Wis;
922 op->stats.Pow = op->contr->orig_stats.Pow;
923 op->stats.Cha = op->contr->orig_stats.Cha;
924 op->stats.ac = 0;
925
926 op->level = 1;
927 op->stats.exp = 0;
928 op->stats.ac = 0;
929
930 op->contr->levhp[1] = 9;
931 op->contr->levsp[1] = 6;
932 op->contr->levgrace[1] = 3;
933
934 fix_player (op);
935 op->stats.hp = op->stats.maxhp;
936 op->stats.sp = op->stats.maxsp;
937 op->stats.grace = op->stats.maxgrace;
938 op->contr->orig_stats = op->stats;
939 op->contr->Swap_First = -1;
940}
941
942
943/* This code has been greatly reduced, because with set_attr_value
944 * and get_attr_value, the stats can be accessed just numeric
945 * ids. stat_trans is a table that translate the number entered
946 * into the actual stat. It is needed because the order the stats
947 * are displayed in the stat window is not the same as how
948 * the number's access that stat. The table does that translation.
949 */
950int
951key_roll_stat (object *op, char key)
952{
953 int keynum = key - '0';
954 char buf[MAX_BUF];
955 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
956
957 if (keynum > 0 && keynum <= 7)
958 {
959 if (op->contr->Swap_First == -1)
960 {
961 op->contr->Swap_First = stat_trans[keynum];
962 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
963 new_draw_info (NDI_UNIQUE, 0, op, buf); 864 //new_draw_info (NDI_UNIQUE, 0, op, " ");
964 }
965 else
966 Swap_Stat (op, stat_trans[keynum]);
967
968 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
969 return 1;
970 }
971 switch (key)
972 {
973 case 'n':
974 case 'N':
975 {
976 SET_FLAG (op, FLAG_WIZ);
977 if (op->map == NULL)
978 {
979 LOG (llevError, "Map == NULL in state 2\n");
980 break;
981 }
982
983#if 0
984 /* So that enter_exit will put us at startx/starty */
985 op->x = -1;
986
987 enter_exit (op, NULL);
988#endif
989 SET_ANIMATION (op, 2); /* So player faces south */
990 /* Enter exit adds a player otherwise */
991 add_statbonus (op);
992 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
993 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
994 op->contr->state = ST_CHANGE_CLASS;
995 if (op->msg)
996 new_draw_info (NDI_BLUE, 0, op, op->msg);
997 return 0;
998 }
999 case 'y':
1000 case 'Y':
1001 roll_stats (op);
1002 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1003 return 1;
1004
1005 case 'q':
1006 case 'Q':
1007 play_again (op);
1008 return 1;
1009
1010 default:
1011 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1012 return 0;
1013 }
1014 return 0;
1015} 865}
1016 866
1017/* This function takes the key that is passed, and does the 867/* This function takes the key that is passed, and does the
1018 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
1019 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
1020 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
1021 * not the class. 871 * not the class.
1022 */ 872 */
1023 873void
1024int 874player::chargen_race_done ()
1025key_change_class (object *op, char key)
1026{ 875{
1027 int tmp_loop;
1028
1029 if (key == 'q' || key == 'Q')
1030 {
1031 op->remove ();
1032 play_again (op);
1033 return 0;
1034 }
1035 if (key == 'd' || key == 'D')
1036 {
1037 char buf[MAX_BUF];
1038
1039 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
1040 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
1041 878
1042 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
1043 if (tl) 880 if (tl)
1044 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
1045 882
1046 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
1047 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
1048 885
1049 op->contr->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
1050 887
1051 if (op->msg) 888 if (ob->msg)
1052 op->msg = NULL; 889 ob->msg = 0;
1053 890
1054 /* We create this now because some of the unique maps will need it 891 /* We create this now because some of the unique maps will need it
1055 * to save here. 892 * to save here.
1056 */ 893 */
894 {
895 char buf[MAX_BUF];
1057 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
1058 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
1059 899
1060#ifdef AUTOSAVE
1061 op->contr->last_save_tick = pticks;
1062#endif
1063 start_info (op); 900 start_info (ob);
1064 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
1065 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
1066 link_player_skills (op); 903 link_player_skills (ob);
1067 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
1068 fix_player (op); 905 ob->update_stats ();
1069 906
1070 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
1071 * is one for this race 908 * is one for this race
1072 */ 909 */
1073 if (*first_map_ext_path) 910 if (*first_map_ext_path)
1074 { 911 {
1075 object *tmp; 912 object *tmp;
1076 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
1077 914
1078 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
1079 tmp = object::create (); 916 tmp = object::create ();
1080 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
1081 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
1082 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
1083 enter_exit (op, tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
1084 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
1085 * default initial map */ 922 * default initial map */
1086 tmp->destroy (); 923 tmp->destroy ();
1087 } 924 }
1088 else 925 else
1089 {
1090 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
1091 } 927}
1092 return 0;
1093 }
1094 928
929void
930player::chargen_race_next ()
931{
1095 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
1096 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
1097 */ 934 */
1098 935
1099 tmp_loop = 0; 936 do
1100 while (!tmp_loop)
1101 { 937 {
1102 shstr name = op->name; 938 shstr name = ob->name;
1103 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
1104 940
1105 remove_statbonus (op); 941 ob->remove_statbonus ();
1106 op->remove (); 942 ob->remove ();
1107 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
1108 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
1109 op->instantiate (); 945 ob->instantiate ();
1110 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
1111 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
1112 op->x = x; 948 ob->x = x;
1113 op->y = y; 949 ob->y = y;
1114 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
1115 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
1116 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
1117 add_statbonus (op); 953 ob->add_statbonus ();
1118 tmp_loop = allowed_class (op);
1119 } 954 }
955 while (!allowed_class (ob));
1120 956
1121 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
1122 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
1123 fix_player (op); 959 ob->update_stats ();
1124 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
1125 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
1126 op->stats.grace = 0; 962 ob->stats.grace = 0;
1127
1128 if (op->msg)
1129 new_draw_info (NDI_BLUE, 0, op, op->msg);
1130
1131 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1132 return 0;
1133}
1134
1135int
1136key_confirm_quit (object *op, char key)
1137{
1138 char buf[MAX_BUF];
1139
1140 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1141 {
1142 op->contr->state = ST_PLAYING;
1143 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1144 return 1;
1145 }
1146
1147 INVOKE_PLAYER (LOGOUT, op->contr);
1148 INVOKE_PLAYER (QUIT, op->contr);
1149
1150 terminate_all_pets (op);
1151 leave_map (op);
1152 op->direction = 0;
1153 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1154
1155 strcpy (op->contr->killer, "quit");
1156 check_score (op);
1157 op->contr->party = NULL;
1158 if (settings.set_title == TRUE)
1159 op->contr->own_title[0] = '\0';
1160
1161 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1162 {
1163 maptile *mp, *next;
1164
1165 /* We need to hunt for any per player unique maps in memory and
1166 * get rid of them. The trailing slash in the path is intentional,
1167 * so that players named 'Ab' won't match against players 'Abe' pathname
1168 */
1169 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1170 for (mp = first_map; mp != NULL; mp = next)
1171 {
1172 next = mp->next;
1173 if (!strncmp (mp->path, buf, strlen (buf)))
1174 delete_map (mp);
1175 }
1176
1177 delete_character (op->name, 1);
1178 }
1179
1180 play_again (op);
1181 return 1;
1182} 963}
1183 964
1184void 965void
1185flee_player (object *op) 966flee_player (object *op)
1186{ 967{
… …
1216 { 997 {
1217 op->enemy = NULL; 998 op->enemy = NULL;
1218 CLEAR_FLAG (op, FLAG_SCARED); 999 CLEAR_FLAG (op, FLAG_SCARED);
1219 return; 1000 return;
1220 } 1001 }
1002
1221 get_rangevector (op, op->enemy, &rv, 0); 1003 get_rangevector (op, op->enemy, &rv, 0);
1222 1004
1223 dir = absdir (4 + rv.direction); 1005 dir = absdir (4 + rv.direction);
1224 for (diff = 0; diff < 3; diff++) 1006 for (diff = 0; diff < 3; diff++)
1225 { 1007 {
1226 int m = 1 - (RANDOM () & 2); 1008 int m = 1 - (RANDOM () & 2);
1227 1009
1228 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1010 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1229 {
1230 return; 1011 return;
1231 }
1232 } 1012 }
1013
1233 /* Cornered, get rid of scared */ 1014 /* Cornered, get rid of scared */
1234 CLEAR_FLAG (op, FLAG_SCARED); 1015 CLEAR_FLAG (op, FLAG_SCARED);
1235 op->enemy = NULL; 1016 op->enemy = NULL;
1236} 1017}
1237 1018
… …
1243int 1024int
1244check_pick (object *op) 1025check_pick (object *op)
1245{ 1026{
1246 object *tmp, *next; 1027 object *tmp, *next;
1247 int stop = 0; 1028 int stop = 0;
1248 int j, k, wvratio; 1029 int wvratio;
1249 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1250 1031
1251 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1252 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1253 return 1; 1034 return 1;
1254 1035
… …
1323 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1324 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1325 else 1106 else
1326 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1327 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1108 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1328 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1329
1330 sprintf (putstring, "...flags: ");
1331 for (k = 0; k < 4; k++)
1332 {
1333 for (j = 0; j < 32; j++)
1334 {
1335 if ((tmp->flags[k] >> j) & 0x01)
1336 {
1337 sprintf (tmpstr, "%d ", k * 32 + j);
1338 strcat (putstring, tmpstr);
1339 }
1340 }
1341 }
1342 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1343
1344#if 0
1345 /* print the flags too */
1346 for (k = 0; k < 4; k++)
1347 {
1348 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1349 for (j = 0; j < 32; j++)
1350 {
1351 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1352 if (!((j + 1) % 4))
1353 fprintf (stderr, " ");
1354 }
1355 fprintf (stderr, " [%d]\n", k * 32);
1356 }
1357#endif
1358 } 1111 }
1112
1359 /* philosophy: 1113 /* philosophy:
1360 * It's easy to grab an item type from a pile, as long as it's 1114 * It's easy to grab an item type from a pile, as long as it's
1361 * generic. This takes no game-time. For more detailed pickups 1115 * generic. This takes no game-time. For more detailed pickups
1362 * and selections, select-items shoul dbe used. This is a 1116 * and selections, select-items should be used. This is a
1363 * grab-as-you-run type mode that's really useful for arrows for 1117 * grab-as-you-run type mode that's really useful for arrows for
1364 * example. 1118 * example.
1365 * The drawback: right now it has no frontend, so you need to 1119 * The drawback: right now it has no frontend, so you need to
1366 * stick the bits you want into a calculator in hex mode and then 1120 * stick the bits you want into a calculator in hex mode and then
1367 * convert to decimal and then 'pickup <#> 1121 * convert to decimal and then 'pickup <#>
… …
1618 * found object is returned. 1372 * found object is returned.
1619 */ 1373 */
1620object * 1374object *
1621find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1622{ 1376{
1623 object *tmp = NULL; 1377 object *tmp = 0;
1624 1378
1625 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1626 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1627 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1628 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1629 return op; 1383 return op;
1384
1630 return tmp; 1385 return tmp;
1631} 1386}
1632 1387
1633/* 1388/*
1634 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1635 * against the target. A full test is not performed, simply a basic test 1390 * against the target. A full test is not performed, simply a basic test
1636 * of resistances. The archer is making a quick guess at what he sees down 1391 * of resistances. The archer is making a quick guess at what he sees down
1637 * the hall. Failing that it does it's best to pick the highest plus arrow. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1638 */ 1393 */
1639
1640object * 1394object *
1641find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1642{ 1396{
1643 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1644 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1793 if (!dir) 1547 if (!dir)
1794 { 1548 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1549 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1796 return 0; 1550 return 0;
1797 } 1551 }
1552
1798 if (op->type == PLAYER) 1553 if (op->type == PLAYER)
1799 bow = op->contr->ranges[range_bow]; 1554 bow = op->contr->ranges[range_bow];
1800 else 1555 else
1801 { 1556 {
1802 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
… …
1810 { 1565 {
1811 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1812 return 0; 1567 return 0;
1813 } 1568 }
1814 } 1569 }
1570
1815 if (!bow->race || !bow->skill) 1571 if (!bow->race || !bow->skill)
1816 { 1572 {
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1573 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1818 return 0; 1574 return 0;
1819 } 1575 }
… …
1821 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1577 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1822 1578
1823 /* penalize ROF for bestarrow */ 1579 /* penalize ROF for bestarrow */
1824 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1580 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1825 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1581 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1826 if (bowspeed < 1) 1583 if (bowspeed < 1)
1827 bowspeed = 1; 1584 bowspeed = 1;
1828 1585
1829 if (arrow == NULL) 1586 if (arrow == NULL)
1830 { 1587 {
… …
1833 if (op->type == PLAYER) 1590 if (op->type == PLAYER)
1834 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1591 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1835 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1592 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1836 else 1593 else
1837 CLEAR_FLAG (op, FLAG_READY_BOW); 1594 CLEAR_FLAG (op, FLAG_READY_BOW);
1595
1838 return 0; 1596 return 0;
1839 } 1597 }
1840 } 1598 }
1599
1841 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1600 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1842 if (mflags & P_OUT_OF_MAP) 1601 if (mflags & P_OUT_OF_MAP)
1843 {
1844 return 0; 1602 return 0;
1845 } 1603
1846 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1604 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1847 { 1605 {
1848 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1606 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1849 return 0; 1607 return 0;
1850 } 1608 }
… …
1856 return 0; 1614 return 0;
1857 } 1615 }
1858 1616
1859 left = arrow; /* these are arrows left to the player */ 1617 left = arrow; /* these are arrows left to the player */
1860 arrow = get_split_ob (arrow, 1); 1618 arrow = get_split_ob (arrow, 1);
1861 if (arrow == NULL) 1619 if (!arrow)
1862 { 1620 {
1863 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1621 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1864 return 0; 1622 return 0;
1865 } 1623 }
1624
1866 arrow->set_owner (op); 1625 arrow->set_owner (op);
1867 arrow->skill = bow->skill; 1626 arrow->skill = bow->skill;
1868
1869 arrow->direction = dir; 1627 arrow->direction = dir;
1870 arrow->x = sx;
1871 arrow->y = sy;
1872 1628
1873 if (op->type == PLAYER) 1629 if (op->type == PLAYER)
1874 { 1630 {
1875 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1631 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1876 fix_player (op); 1632 op->update_stats ();
1877 } 1633 }
1878 1634
1879 SET_ANIMATION (arrow, arrow->direction); 1635 SET_ANIMATION (arrow, arrow->direction);
1636
1880 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1637 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1881 arrow->stats.hp = arrow->stats.dam; 1638 arrow->stats.hp = arrow->stats.dam;
1882 arrow->stats.grace = arrow->attacktype; 1639 arrow->stats.grace = arrow->attacktype;
1640
1883 if (arrow->slaying != NULL) 1641 if (arrow->slaying)
1884 arrow->spellarg = strdup_local (arrow->slaying); 1642 arrow->spellarg = strdup (arrow->slaying);
1885 1643
1886 /* Note that this was different for monsters - they got their level 1644 arrow->stats.dam += op->stats.dam + arrow->magic;
1887 * added to the damage. I think the strength bonus is more proper.
1888 */
1889
1890 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1891 1645
1892 /* update the speed */ 1646 /* update the speed */
1893 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1647 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1894 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1648 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1895 1649
1896 if (arrow->speed < 1.0) 1650 arrow->set_speed (max (arrow->speed, 1.0));
1897 arrow->speed = 1.0;
1898 update_ob_speed (arrow);
1899 arrow->speed_left = 0; 1651 arrow->speed_left = 0;
1900 1652
1653 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654
1901 if (op->type == PLAYER) 1655 if (op->type == PLAYER)
1902 { 1656 {
1903 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1904 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1905 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1906
1907 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1657 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1658 arrow->stats.wc -= dex_bonus[op->stats.Dex];
1659
1660 if (!arrow->slaying)
1661 arrow->slaying = op->slaying;
1908 } 1662 }
1909 else 1663 else
1910 { 1664 {
1911 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1912 arrow->level = op->level; 1665 arrow->level = op->level;
1913 } 1666 arrow->stats.wc -= bow->magic;
1914 1667
1915 if (arrow->attacktype == AT_PHYSICAL) 1668 if (!arrow->slaying)
1669 arrow->slaying = bow->slaying;
1670 }
1671
1672 arrow->stats.wc -= arrow->level;
1673
1916 arrow->attacktype |= bow->attacktype; 1674 arrow->attacktype |= bow->attacktype;
1917 1675
1918 if (bow->slaying != NULL)
1919 arrow->slaying = bow->slaying;
1920
1921 arrow->map = m;
1922 arrow->move_type = MOVE_FLY_LOW; 1676 arrow->move_type = MOVE_FLY_LOW;
1923 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1677 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1924 1678
1925 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1679 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1926 insert_ob_in_map (arrow, m, op, 0); 1680 m->insert (arrow, sx, sy, op);
1927 1681
1928 if (!arrow->destroyed ()) 1682 if (!arrow->destroyed ())
1929 move_arrow (arrow); 1683 move_arrow (arrow);
1930 1684
1931 if (op->type == PLAYER) 1685 if (op->type == PLAYER)
… …
1957 } 1711 }
1958 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1712 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1959 { 1713 {
1960 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1714 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1961 wcmod = -1; 1715 wcmod = -1;
1716
1962 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1717 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1963 } 1718 }
1964 else if (op->contr->bowtype == bow_threewide) 1719 else if (op->contr->bowtype == bow_threewide)
1965 { 1720 {
1966 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1721 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
2036 1791
2037 if (item->arch) 1792 if (item->arch)
2038 { 1793 {
2039 CLEAR_FLAG (item, FLAG_ANIMATE); 1794 CLEAR_FLAG (item, FLAG_ANIMATE);
2040 item->face = item->arch->clone.face; 1795 item->face = item->arch->clone.face;
2041 item->speed = 0; 1796 item->set_speed (0);
2042 update_ob_speed (item);
2043 } 1797 }
1798
2044 if ((tmp = is_player_inv (item))) 1799 if ((tmp = item->in_player ()))
2045 esrv_update_item (UPD_ANIM, tmp, item); 1800 esrv_update_item (UPD_ANIM, tmp, item);
2046 } 1801 }
2047 } 1802 }
2048 else if (item->type == ROD || item->type == HORN) 1803 else if (item->type == ROD || item->type == HORN)
2049 {
2050 drain_rod_charge (item); 1804 drain_rod_charge (item);
2051 }
2052 } 1805 }
2053} 1806}
2054 1807
2055/* Received a fire command for the player - go and do it. 1808/* Received a fire command for the player - go and do it.
2056 */ 1809 */
… …
2079 case range_misc: 1832 case range_misc:
2080 fire_misc_object (op, dir); 1833 fire_misc_object (op, dir);
2081 return; 1834 return;
2082 1835
2083 case range_golem: /* Control summoned monsters from scrolls */ 1836 case range_golem: /* Control summoned monsters from scrolls */
2084 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2085 {
2086 op->contr->ranges[range_golem] = 0;
2087 op->contr->shoottype = range_none;
2088 }
2089 else
2090 control_golem (op->contr->ranges[range_golem], dir); 1837 control_golem (op->contr->ranges[range_golem], dir);
2091 return; 1838 return;
2092 1839
2093 case range_skill: 1840 case range_skill:
2094 if (!op->chosen_skill) 1841 if (!op->chosen_skill)
2095 { 1842 {
2096 if (op->type == PLAYER) 1843 if (op->type == PLAYER)
2097 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1844 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
2098 return; 1846 return;
2099 } 1847 }
1848
2100 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1849 do_skill (op, op, op->chosen_skill, dir, NULL);
2101 return; 1850 return;
2102 case range_builder: 1851 case range_builder:
2103 apply_map_builder (op, dir); 1852 apply_map_builder (op, dir);
2104 return; 1853 return;
2105 default: 1854 default:
2106 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1855 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2107 return; 1856 return;
2108 } 1857 }
2109} 1858}
2110
2111
2112 1859
2113/* find_key 1860/* find_key
2114 * We try to find a key for the door as passed. If we find a key 1861 * We try to find a key for the door as passed. If we find a key
2115 * and successfully use it, we return the key, otherwise NULL 1862 * and successfully use it, we return the key, otherwise NULL
2116 * This function merges both normal and locked door, since the logic 1863 * This function merges both normal and locked door, since the logic
… …
2118 * pl is the player, 1865 * pl is the player,
2119 * inv is the objects inventory to searched 1866 * inv is the objects inventory to searched
2120 * door is the door we are trying to match against. 1867 * door is the door we are trying to match against.
2121 * This function can be called recursively to search containers. 1868 * This function can be called recursively to search containers.
2122 */ 1869 */
2123
2124object * 1870object *
2125find_key (object *pl, object *container, object *door) 1871find_key (object *pl, object *container, object *door)
2126{ 1872{
2127 object *tmp, *key; 1873 object *tmp, *key;
2128 1874
2129 /* Should not happen, but sanity checking is never bad */ 1875 /* Should not happen, but sanity checking is never bad */
2130 if (container->inv == NULL) 1876 if (!container->inv)
2131 return NULL; 1877 return 0;
2132 1878
2133 /* First, lets try to find a key in the top level inventory */ 1879 /* First, lets try to find a key in the top level inventory */
2134 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1880 for (tmp = container->inv; tmp; tmp = tmp->below)
2135 { 1881 {
2136 if (door->type == DOOR && tmp->type == KEY) 1882 if (door->type == DOOR && tmp->type == KEY)
2137 break; 1883 break;
2138 /* For sanity, we should really check door type, but other stuff 1884 /* For sanity, we should really check door type, but other stuff
2139 * (like containers) can be locked with special keys 1885 * (like containers) can be locked with special keys
2140 */ 1886 */
2141 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1887 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2142 break; 1888 break;
2143 } 1889 }
1890
2144 /* No key found - lets search inventories now */ 1891 /* No key found - lets search inventories now */
2145 /* If we find and use a key in an inventory, return at that time. 1892 /* If we find and use a key in an inventory, return at that time.
2146 * otherwise, if we search all the inventories and still don't find 1893 * otherwise, if we search all the inventories and still don't find
2147 * a key, return 1894 * a key, return
2148 */ 1895 */
2149 if (!tmp) 1896 if (!tmp)
2150 { 1897 {
2151 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1898 for (tmp = container->inv; tmp; tmp = tmp->below)
2152 { 1899 {
2153 /* No reason to search empty containers */ 1900 /* No reason to search empty containers */
2154 if (tmp->type == CONTAINER && tmp->inv) 1901 if (tmp->type == CONTAINER && tmp->inv)
2155 { 1902 {
2156 if ((key = find_key (pl, tmp, door)) != NULL) 1903 if ((key = find_key (pl, tmp, door)))
2157 return key; 1904 return key;
2158 } 1905 }
2159 } 1906 }
1907
2160 if (!tmp) 1908 if (!tmp)
2161 return NULL; 1909 return NULL;
2162 } 1910 }
1911
2163 /* We get down here if we have found a key. Now if its in a container, 1912 /* We get down here if we have found a key. Now if its in a container,
2164 * see if we actually want to use it 1913 * see if we actually want to use it
2165 */ 1914 */
2166 if (pl != container) 1915 if (pl != container)
2167 { 1916 {
… …
2188 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1937 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2189 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1938 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2190 return NULL; 1939 return NULL;
2191 } 1940 }
2192 } 1941 }
1942
2193 return tmp; 1943 return tmp;
2194} 1944}
2195 1945
2196/* moved door processing out of move_player_attack. 1946/* moved door processing out of move_player_attack.
2197 * returns 1 if player has opened the door with a key 1947 * returns 1 if player has opened the door with a key
… …
2199 * 0 otherwise 1949 * 0 otherwise
2200 */ 1950 */
2201static int 1951static int
2202player_attack_door (object *op, object *door) 1952player_attack_door (object *op, object *door)
2203{ 1953{
2204
2205 /* If its a door, try to find a use a key. If we do destroy the door, 1954 /* If its a door, try to find a use a key. If we do destroy the door,
2206 * might as well return immediately as there is nothing more to do - 1955 * might as well return immediately as there is nothing more to do -
2207 * otherwise, we fall through to the rest of the code. 1956 * otherwise, we fall through to the rest of the code.
2208 */ 1957 */
2209 object *key = find_key (op, op, door); 1958 object *key = find_key (op, op, door);
… …
2216 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1965 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2217 if (action_makes_visible (op)) 1966 if (action_makes_visible (op))
2218 make_visible (op); 1967 make_visible (op);
2219 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1968 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2220 spring_trap (door->inv, op); 1969 spring_trap (door->inv, op);
1970
2221 if (door->type == DOOR) 1971 if (door->type == DOOR)
2222 {
2223 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1972 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2224 }
2225 else if (door->type == LOCKED_DOOR) 1973 else if (door->type == LOCKED_DOOR)
2226 { 1974 {
2227 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1975 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2228 remove_door2 (door); /* remove door without violence ;-) */ 1976 remove_door2 (door); /* remove door without violence ;-) */
2229 } 1977 }
1978
2230 /* Do this after we print the message */ 1979 /* Do this after we print the message */
2231 decrease_ob (key); /* Use up one of the keys */ 1980 decrease_ob (key); /* Use up one of the keys */
2232 /* Need to update the weight the container the key was in */ 1981 /* Need to update the weight the container the key was in */
2233 if (container != op) 1982 if (container != op)
2234 esrv_update_item (UPD_WEIGHT, op, container); 1983 esrv_update_item (UPD_WEIGHT, op, container);
1984
2235 return 1; /* Nothing more to do below */ 1985 return 1; /* Nothing more to do below */
2236 } 1986 }
2237 else if (door->type == LOCKED_DOOR) 1987 else if (door->type == LOCKED_DOOR)
2238 { 1988 {
2239 /* Might as well return now - no other way to open this */ 1989 /* Might as well return now - no other way to open this */
2240 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1990 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2241 return 1; 1991 return 1;
2242 } 1992 }
1993
2243 return 0; 1994 return 0;
2244} 1995}
2245 1996
2246/* This function is just part of a breakup from move_player. 1997/* This function is just part of a breakup from move_player.
2247 * It should keep the code cleaner. 1998 * It should keep the code cleaner.
2248 * When this is called, the players direction has been updated 1999 * When this is called, the players direction has been updated
2249 * (taking into account confusion.) The player is also actually 2000 * (taking into account confusion.) The player is also actually
2250 * going to try and move (not fire weapons). 2001 * going to try and move (not fire weapons).
2251 */ 2002 */
2252
2253void 2003void
2254move_player_attack (object *op, int dir) 2004move_player_attack (object *op, int dir)
2255{ 2005{
2256 object *tmp, *mon; 2006 object *tmp, *mon;
2257 sint16 nx, ny; 2007 sint16 nx, ny;
… …
2259 maptile *m; 2009 maptile *m;
2260 2010
2261 nx = freearr_x[dir] + op->x; 2011 nx = freearr_x[dir] + op->x;
2262 ny = freearr_y[dir] + op->y; 2012 ny = freearr_y[dir] + op->y;
2263 2013
2264 on_battleground = op_on_battleground (op, NULL, NULL); 2014 on_battleground = op_on_battleground (op, 0, 0);
2265 2015
2266 /* If braced, or can't move to the square, and it is not out of the 2016 /* If braced, or can't move to the square, and it is not out of the
2267 * map, attack it. Note order of if statement is important - don't 2017 * map, attack it. Note order of if statement is important - don't
2268 * want to be calling move_ob if braced, because move_ob will move the 2018 * want to be calling move_ob if braced, because move_ob will move the
2269 * player. This is a pretty nasty hack, because if we could 2019 * player. This is a pretty nasty hack, because if we could
… …
2274 */ 2024 */
2275 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2025 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2276 { 2026 {
2277 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2027 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2278 { 2028 {
2279 m = get_map_from_coord (op->map, &nx, &ny); 2029 m = op->map->xy_find (nx, ny);
2280 if (!m) 2030 if (!m)
2281 return; /* Don't think this should happen */ 2031 return; /* Don't think this should happen */
2282 } 2032 }
2283 else 2033 else
2284 m = op->map; 2034 m = op->map;
2285 2035
2286 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2036 if (!(tmp = m->at (nx, ny).bot))
2287 {
2288 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2289 return; 2037 return;
2290 }
2291 2038
2292 mon = NULL; 2039 mon = 0;
2293 /* Go through all the objects, and find ones of interest. Only stop if 2040 /* Go through all the objects, and find ones of interest. Only stop if
2294 * we find a monster - that is something we know we want to attack. 2041 * we find a monster - that is something we know we want to attack.
2295 * if its a door or barrel (can roll) see if there may be monsters 2042 * if its a door or barrel (can roll) see if there may be monsters
2296 * on the space 2043 * on the space
2297 */ 2044 */
2298 while (tmp != NULL) 2045 while (tmp)
2299 { 2046 {
2300 if (tmp == op) 2047 if (tmp == op)
2301 { 2048 {
2302 tmp = tmp->above; 2049 tmp = tmp->above;
2303 continue; 2050 continue;
… …
2313 mon = tmp; 2060 mon = tmp;
2314 2061
2315 tmp = tmp->above; 2062 tmp = tmp->above;
2316 } 2063 }
2317 2064
2318 if (mon == NULL) /* This happens anytime the player tries to move */ 2065 if (!mon) /* This happens anytime the player tries to move */
2319 return; /* into a wall */ 2066 return; /* into a wall */
2320 2067
2321 if (mon->head != NULL) 2068 if (mon->head)
2322 mon = mon->head; 2069 mon = mon->head;
2323 2070
2324 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2071 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2325 if (player_attack_door (op, mon)) 2072 if (player_attack_door (op, mon))
2326 return; 2073 return;
… …
2348 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2095 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2349 { 2096 {
2350 /* If we're braced, we don't want to switch places with it */ 2097 /* If we're braced, we don't want to switch places with it */
2351 if (op->contr->braced) 2098 if (op->contr->braced)
2352 return; 2099 return;
2100
2353 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2101 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2354 (void) push_ob (mon, dir, op); 2102 (void) push_ob (mon, dir, op);
2355 if (op->contr->tmp_invis || op->hide) 2103 if (op->contr->tmp_invis || op->hide)
2356 make_visible (op); 2104 make_visible (op);
2105
2357 return; 2106 return;
2358 } 2107 }
2359 2108
2360 /* in certain circumstances, you shouldn't attack friendly 2109 /* in certain circumstances, you shouldn't attack friendly
2361 * creatures. Note that if you are braced, you can't push 2110 * creatures. Note that if you are braced, you can't push
… …
2363 * attack them either. 2112 * attack them either.
2364 */ 2113 */
2365 if ((mon->type == PLAYER || mon->enemy != op) && 2114 if ((mon->type == PLAYER || mon->enemy != op) &&
2366 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2115 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2367#ifdef PROHIBIT_PLAYERKILL 2116#ifdef PROHIBIT_PLAYERKILL
2368 (op->contr->peaceful 2117 (op->contr->peaceful
2369 || (mon->type == PLAYER 2118 || (mon->type == PLAYER
2370 && mon->contr-> 2119 && mon->contr->
2371 peaceful)) && 2120 peaceful)) &&
2372#else 2121#else
2373 op->contr->peaceful && 2122 op->contr->peaceful &&
2374#endif 2123#endif
2375 !on_battleground)) 2124 !on_battleground))
2376 { 2125 {
2377 if (!op->contr->braced) 2126 if (!op->contr->braced)
2378 { 2127 {
2379 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2128 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2380 (void) push_ob (mon, dir, op); 2129 push_ob (mon, dir, op);
2381 } 2130 }
2382 else 2131 else
2383 {
2384 new_draw_info (0, 0, op, "You withhold your attack"); 2132 new_draw_info (0, 0, op, "You withhold your attack");
2385 } 2133
2386 if (op->contr->tmp_invis || op->hide) 2134 if (op->contr->tmp_invis || op->hide)
2387 make_visible (op); 2135 make_visible (op);
2388 } 2136 }
2389 2137
2390 /* If the object is a boulder or other rollable object, then 2138 /* If the object is a boulder or other rollable object, then
… …
2401 * Way it works is like this: First, it must have some hit points 2149 * Way it works is like this: First, it must have some hit points
2402 * and be living. Then, it must be one of the following: 2150 * and be living. Then, it must be one of the following:
2403 * 1) Not a player, 2) A player, but of a different party. Note 2151 * 1) Not a player, 2) A player, but of a different party. Note
2404 * that party_number -1 is no party, so attacks can still happen. 2152 * that party_number -1 is no party, so attacks can still happen.
2405 */ 2153 */
2406
2407 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2408 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2155 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2409 { 2156 {
2410 2157
2411 /* If the player hasn't hit something this tick, and does 2158 /* If the player hasn't hit something this tick, and does
… …
2418 op->speed_left += op->speed / op->contr->weapon_sp; 2165 op->speed_left += op->speed / op->contr->weapon_sp;
2419 2166
2420 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2167 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2421 } 2168 }
2422 2169
2423 skill_attack (mon, op, 0, NULL, NULL); 2170 skill_attack (mon, op, 0, 0, 0);
2424 2171
2425 /* If attacking another player, that player gets automatic 2172 /* If attacking another player, that player gets automatic
2426 * hitback, and doesn't loose luck either. 2173 * hitback, and doesn't loose luck either.
2427 * Disable hitback on the battleground or if the target is 2174 * Disable hitback on the battleground or if the target is
2428 * the wiz. 2175 * the wiz.
… …
2430 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2177 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2431 { 2178 {
2432 short luck = mon->stats.luck; 2179 short luck = mon->stats.luck;
2433 2180
2434 mon->contr->has_hit = 1; 2181 mon->contr->has_hit = 1;
2435 skill_attack (op, mon, 0, NULL, NULL); 2182 skill_attack (op, mon, 0, 0, 0);
2436 mon->stats.luck = luck; 2183 mon->stats.luck = luck;
2437 } 2184 }
2185
2438 if (action_makes_visible (op)) 2186 if (action_makes_visible (op))
2439 make_visible (op); 2187 make_visible (op);
2440 } 2188 }
2441 } /* if player should attack something */ 2189 } /* if player should attack something */
2442} 2190}
… …
2444int 2192int
2445move_player (object *op, int dir) 2193move_player (object *op, int dir)
2446{ 2194{
2447 int pick; 2195 int pick;
2448 2196
2449 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2197 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2450 return 0; 2198 return 0;
2451 2199
2452 /* Sanity check: make sure dir is valid */ 2200 /* Sanity check: make sure dir is valid */
2453 if ((dir < 0) || (dir >= 9)) 2201 if ((dir < 0) || (dir >= 9))
2454 { 2202 {
2455 LOG (llevError, "move_player: invalid direction %d\n", dir); 2203 LOG (llevError, "move_player: invalid direction %d\n", dir);
2456 return 0; 2204 return 0;
2457 } 2205 }
2458 2206
2459 /* peterm: added following line */ 2207 /* peterm: added following line */
2460 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2208 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2461 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2209 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2462 2210
2463 op->facing = dir; 2211 op->facing = dir;
2464 2212
2465 if (op->hide) 2213 if (op->hide)
2466 do_hidden_move (op); 2214 do_hidden_move (op);
… …
2477 2225
2478 /* Add special check for newcs players and fire on - this way, the 2226 /* Add special check for newcs players and fire on - this way, the
2479 * server can handle repeat firing. 2227 * server can handle repeat firing.
2480 */ 2228 */
2481 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2229 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2482 {
2483 op->direction = dir; 2230 op->direction = dir;
2484 }
2485 else 2231 else
2486 {
2487 op->direction = 0; 2232 op->direction = 0;
2488 } 2233
2489 /* Update how the player looks. Use the facing, so direction may 2234 /* Update how the player looks. Use the facing, so direction may
2490 * get reset to zero. This allows for full animation capabilities 2235 * get reset to zero. This allows for full animation capabilities
2491 * for players. 2236 * for players.
2492 */ 2237 */
2493 animate_object (op, op->facing); 2238 animate_object (op, op->facing);
… …
2502 * Returns true if there are more actions we can do. 2247 * Returns true if there are more actions we can do.
2503 */ 2248 */
2504int 2249int
2505handle_newcs_player (object *op) 2250handle_newcs_player (object *op)
2506{ 2251{
2507 if (op->contr->hidden)
2508 {
2509 op->invisible = 1000;
2510 /* the socket code flashes the player visible/invisible
2511 * depending on the value of invisible, so we need to
2512 * alternate it here for it to work correctly.
2513 */
2514 if (pticks & 2)
2515 op->invisible--;
2516 }
2517 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2518 {
2519 op->invisible--;
2520 if (!op->invisible)
2521 {
2522 make_visible (op);
2523 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2524 }
2525 }
2526
2527 if (QUERY_FLAG (op, FLAG_SCARED)) 2252 if (QUERY_FLAG (op, FLAG_SCARED))
2528 { 2253 {
2529 flee_player (op); 2254 flee_player (op);
2530 /* If player is still scared, that is his action for this tick */ 2255 /* If player is still scared, that is his action for this tick */
2531 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2532 { 2257 {
2533 op->speed_left--; 2258 op->speed_left--;
2534 return 0; 2259 return 0;
2535 } 2260 }
2536 } 2261 }
2537
2538 /* I've been seeing crashes where the golem has been destroyed, but
2539 * the player object still points to the defunct golem. The code that
2540 * destroys the golem looks correct, and it doesn't always happen, so
2541 * put this in a a workaround to clean up the golem pointer.
2542 */
2543 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2544 op->contr->ranges[range_golem] = 0;
2545 2262
2546 /* call this here - we also will call this in do_ericserver, but 2263 /* call this here - we also will call this in do_ericserver, but
2547 * the players time has been increased when doericserver has been 2264 * the players time has been increased when doericserver has been
2548 * called, so we recheck it here. 2265 * called, so we recheck it here.
2549 */ 2266 */
2550 HandleClient (op->contr->socket, op->contr); 2267 if (op->contr->ns->handle_command ())
2268 return 1;
2269
2551 if (op->speed_left < 0) 2270 if (op->speed_left > 0)
2552 return 0; 2271 {
2553
2554 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2272 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2555 { 2273 {
2556 /* All move commands take 1 tick, at least for now */ 2274 /* All move commands take 1 tick, at least for now */
2557 op->speed_left--; 2275 op->speed_left--;
2558 2276
2559 /* Instead of all the stuff below, let move_player take care 2277 /* Instead of all the stuff below, let move_player take care
2560 * of it. Also, some of the skill stuff is only put in 2278 * of it. Also, some of the skill stuff is only put in
2561 * there, as well as the confusion stuff. 2279 * there, as well as the confusion stuff.
2562 */ 2280 */
2563 move_player (op, op->direction); 2281 move_player (op, op->direction);
2564 if (op->speed_left > 0) 2282
2565 return 1; 2283 return op->speed_left > 0;
2566 else 2284 }
2567 return 0;
2568 } 2285 }
2286
2569 return 0; 2287 return 0;
2570} 2288}
2571 2289
2572int 2290int
2573save_life (object *op) 2291save_life (object *op)
2574{ 2292{
2575 object *tmp;
2576
2577 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2293 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2578 return 0; 2294 return 0;
2579 2295
2580 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2296 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2581 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2297 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2582 { 2298 {
2583 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2299 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2584 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2300 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2585 2301
… …
2593 op->stats.hp = op->stats.maxhp; 2309 op->stats.hp = op->stats.maxhp;
2594 2310
2595 if (op->stats.food < 0) 2311 if (op->stats.food < 0)
2596 op->stats.food = 999; 2312 op->stats.food = 999;
2597 2313
2598 fix_player (op); 2314 op->update_stats ();
2599 return 1; 2315 return 1;
2600 } 2316 }
2317
2601 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2318 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2602 CLEAR_FLAG (op, FLAG_LIFESAVE); 2319 CLEAR_FLAG (op, FLAG_LIFESAVE);
2603 enter_player_savebed (op); /* bring him home. */ 2320 enter_player_savebed (op); /* bring him home. */
2604 return 0; 2321 return 0;
2605} 2322}
… …
2610 * from. 2327 * from.
2611 */ 2328 */
2612void 2329void
2613remove_unpaid_objects (object *op, object *env) 2330remove_unpaid_objects (object *op, object *env)
2614{ 2331{
2615 object *next;
2616
2617 while (op) 2332 while (op)
2618 { 2333 {
2619 next = op->below; /* Make sure we have a good value, in case 2334 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2620 * we remove object 'op' 2335
2621 */
2622 if (QUERY_FLAG (op, FLAG_UNPAID)) 2336 if (QUERY_FLAG (op, FLAG_UNPAID))
2623 { 2337 {
2624 op->remove ();
2625 op->x = env->x;
2626 op->y = env->y;
2627 if (env->type == PLAYER) 2338 if (env->type == PLAYER)
2628 esrv_del_item (env->contr, op->count); 2339 esrv_del_item (env->contr, op->count);
2629 insert_ob_in_map (op, env->map, NULL, 0); 2340
2341 op->insert_at (env);
2630 } 2342 }
2631 else if (op->inv) 2343 else if (op->inv)
2632 remove_unpaid_objects (op->inv, env); 2344 remove_unpaid_objects (op->inv, env);
2345
2633 op = next; 2346 op = next;
2634 } 2347 }
2635} 2348}
2636
2637 2349
2638/* 2350/*
2639 * Returns pointer a static string containing gravestone text 2351 * Returns pointer a static string containing gravestone text
2640 * Moved from apply.c to player.c - player.c is what 2352 * Moved from apply.c to player.c - player.c is what
2641 * actually uses this function. player.c may not be quite the 2353 * actually uses this function. player.c may not be quite the
… …
2652 strcpy (buf2, " R.I.P.\n\n"); 2364 strcpy (buf2, " R.I.P.\n\n");
2653 if (op->type == PLAYER) 2365 if (op->type == PLAYER)
2654 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2366 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2655 else 2367 else
2656 sprintf (buf, "%s\n", &op->name); 2368 sprintf (buf, "%s\n", &op->name);
2369
2657 strncat (buf2, " ", 20 - strlen (buf) / 2); 2370 strncat (buf2, " ", 20 - strlen (buf) / 2);
2658 strcat (buf2, buf); 2371 strcat (buf2, buf);
2659 if (op->type == PLAYER) 2372 if (op->type == PLAYER)
2660 sprintf (buf, "who was in level %d when killed\n", op->level); 2373 sprintf (buf, "who was in level %d when killed\n", op->level);
2661 else 2374 else
2662 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2375 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2376
2663 strncat (buf2, " ", 20 - strlen (buf) / 2); 2377 strncat (buf2, " ", 20 - strlen (buf) / 2);
2664 strcat (buf2, buf); 2378 strcat (buf2, buf);
2665 if (op->type == PLAYER) 2379 if (op->type == PLAYER)
2666 { 2380 {
2667 sprintf (buf, "by %s.\n\n", op->contr->killer); 2381 sprintf (buf, "by %s.\n\n", op->contr->killer);
2668 strncat (buf2, " ", 21 - strlen (buf) / 2); 2382 strncat (buf2, " ", 21 - strlen (buf) / 2);
2669 strcat (buf2, buf); 2383 strcat (buf2, buf);
2670 } 2384 }
2385
2671 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2386 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2672 strncat (buf2, " ", 20 - strlen (buf) / 2); 2387 strncat (buf2, " ", 20 - strlen (buf) / 2);
2673 strcat (buf2, buf); 2388 strcat (buf2, buf);
2389
2674 return buf2; 2390 return buf2;
2675} 2391}
2676
2677
2678 2392
2679void 2393void
2680do_some_living (object *op) 2394do_some_living (object *op)
2681{ 2395{
2682 int last_food = op->stats.food; 2396 int last_food = op->stats.food;
… …
2688 int rate_grace = 2000; 2402 int rate_grace = 2000;
2689 const int max_hp = 1; 2403 const int max_hp = 1;
2690 const int max_sp = 1; 2404 const int max_sp = 1;
2691 const int max_grace = 1; 2405 const int max_grace = 1;
2692 2406
2693 if (op->contr->outputs_sync) 2407 if (op->contr->hidden)
2694 {
2695 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2696 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2697 flush_output_element (op, &op->contr->outputs[i]);
2698 } 2408 {
2409 op->invisible = 1000;
2410 /* the socket code flashes the player visible/invisible
2411 * depending on the value of invisible, so we need to
2412 * alternate it here for it to work correctly.
2413 */
2414 if (pticks & 2)
2415 op->invisible--;
2416 }
2417 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2418 {
2419 if (!op->invisible--)
2420 {
2421 make_visible (op);
2422 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2423 }
2424 }
2699 2425
2700 if (op->contr->state == ST_PLAYING) 2426 if (op->contr->ns->state == ST_PLAYING)
2701 { 2427 {
2702
2703 /* these next three if clauses make it possible to SLOW DOWN 2428 /* these next three if clauses make it possible to SLOW DOWN
2704 hp/grace/spellpoint regeneration. */ 2429 hp/grace/spellpoint regeneration. */
2705 if (op->contr->gen_hp >= 0) 2430 if (op->contr->gen_hp >= 0)
2706 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2431 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2707 else 2432 else
2708 { 2433 {
2709 gen_hp = op->stats.maxhp; 2434 gen_hp = op->stats.maxhp;
2710 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2435 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2711 } 2436 }
2437
2712 if (op->contr->gen_sp >= 0) 2438 if (op->contr->gen_sp >= 0)
2713 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2439 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2714 else 2440 else
2715 { 2441 {
2716 gen_sp = op->stats.maxsp; 2442 gen_sp = op->stats.maxsp;
2717 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2443 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2718 } 2444 }
2445
2719 if (op->contr->gen_grace >= 0) 2446 if (op->contr->gen_grace >= 0)
2720 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2447 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2721 else 2448 else
2722 { 2449 {
2723 gen_grace = op->stats.maxgrace; 2450 gen_grace = op->stats.maxgrace;
2724 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2725 } 2452 }
2726 2453
2727 /* Regenerate Spell Points */ 2454 /* Regenerate Spell Points */
2728 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2729 { 2456 {
2730 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2731 if (op->stats.sp < op->stats.maxsp) 2458 if (op->stats.sp < op->stats.maxsp)
2732 { 2459 {
2733 op->stats.sp++; 2460 op->stats.sp++;
… …
2739 op->stats.food += op->contr->digestion; 2466 op->stats.food += op->contr->digestion;
2740 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2467 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2741 op->stats.food = last_food; 2468 op->stats.food = last_food;
2742 } 2469 }
2743 } 2470 }
2471
2744 if (max_sp > 1) 2472 if (max_sp > 1)
2745 { 2473 {
2746 over_sp = (gen_sp + 10) / rate_sp; 2474 over_sp = (gen_sp + 10) / rate_sp;
2747 if (over_sp > 0) 2475 if (over_sp > 0)
2748 { 2476 {
2749 if (op->stats.sp < op->stats.maxsp) 2477 if (op->stats.sp < op->stats.maxsp)
2750 { 2478 {
2751 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2479 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2480
2752 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2481 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2753 op->stats.sp--; 2482 op->stats.sp--;
2483
2754 if (op->stats.sp > op->stats.maxsp) 2484 if (op->stats.sp > op->stats.maxsp)
2755 op->stats.sp = op->stats.maxsp; 2485 op->stats.sp = op->stats.maxsp;
2756 } 2486 }
2757 op->last_sp = 0; 2487 op->last_sp = 0;
2758 } 2488 }
2759 else 2489 else
2760 {
2761 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2490 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2762 }
2763 } 2491 }
2764 else 2492 else
2765 {
2766 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2493 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2767 }
2768 } 2494 }
2769 2495
2770 /* Regenerate Grace */ 2496 /* Regenerate Grace */
2771 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2497 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2772 if (--op->last_grace < 0) 2498 if (--op->last_grace < 0)
2773 { 2499 {
2774 if (op->stats.grace < op->stats.maxgrace / 2) 2500 if (op->stats.grace < op->stats.maxgrace / 2)
2775 op->stats.grace++; /* no penalty in food for regaining grace */ 2501 op->stats.grace++; /* no penalty in food for regaining grace */
2502
2776 if (max_grace > 1) 2503 if (max_grace > 1)
2777 { 2504 {
2778 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2505 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2779 if (over_grace > 0) 2506 if (over_grace > 0)
2780 { 2507 {
… …
2808 op->stats.food += op->contr->digestion; 2535 op->stats.food += op->contr->digestion;
2809 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2536 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2810 op->stats.food = last_food; 2537 op->stats.food = last_food;
2811 } 2538 }
2812 } 2539 }
2540
2813 if (max_hp > 1) 2541 if (max_hp > 1)
2814 { 2542 {
2815 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2543 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2816 if (over_hp > 0) 2544 if (over_hp > 0)
2817 { 2545 {
… …
2841 2569
2842 if (op->contr->gen_hp > 0) 2570 if (op->contr->gen_hp > 0)
2843 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2571 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2844 else 2572 else
2845 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2573 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2574
2846 /* dms do not consume food */ 2575 /* dms do not consume food */
2847 if (!QUERY_FLAG (op, FLAG_WIZ)) 2576 if (!QUERY_FLAG (op, FLAG_WIZ))
2848 op->stats.food--; 2577 op->stats.food--;
2849 } 2578 }
2850 }
2851 2579
2852 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2580 if (op->stats.food < 0 && op->stats.hp >= 0)
2853 { 2581 {
2854 object *tmp, *flesh = NULL; 2582 object *tmp, *flesh = 0;
2855 2583
2856 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2584 for (tmp = op->inv; tmp; tmp = tmp->below)
2857 { 2585 {
2858 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2586 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2859 {
2860 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2861 { 2587 {
2588 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2589 {
2862 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2590 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2863 manual_apply (op, tmp, 0); 2591 manual_apply (op, tmp, 0);
2864 if (op->stats.food >= 0 || op->stats.hp < 0) 2592 if (op->stats.food >= 0 || op->stats.hp < 0)
2865 break; 2593 break;
2866 } 2594 }
2867 else if (tmp->type == FLESH) 2595 else if (tmp->type == FLESH)
2868 flesh = tmp; 2596 flesh = tmp;
2869 } /* End if paid for object */ 2597 } /* End if paid for object */
2870 } /* end of for loop */ 2598 } /* end of for loop */
2599
2871 /* If player is still starving, it means they don't have any food, so 2600 /* If player is still starving, it means they don't have any food, so
2872 * eat flesh instead. 2601 * eat flesh instead.
2873 */ 2602 */
2874 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2603 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2875 { 2604 {
2876 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2605 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2877 manual_apply (op, flesh, 0); 2606 manual_apply (op, flesh, 0);
2878 } 2607 }
2879 } /* end if player is starving */ 2608 }
2880 2609
2881 while (op->stats.food < 0 && op->stats.hp > 0) 2610 while (op->stats.food < 0 && op->stats.hp >= 0)
2882 op->stats.food++, op->stats.hp--; 2611 op->stats.food++, op->stats.hp--;
2883 2612
2884 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2613 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2885 kill_player (op); 2614 kill_player (op);
2615 }
2886} 2616}
2887
2888
2889 2617
2890/* If the player should die (lack of hp, food, etc), we call this. 2618/* If the player should die (lack of hp, food, etc), we call this.
2891 * op is the player in jeopardy. If the player can not be saved (not 2619 * op is the player in jeopardy. If the player can not be saved (not
2892 * permadeath, no lifesave), this will take care of removing the player 2620 * permadeath, no lifesave), this will take care of removing the player
2893 * file. 2621 * file.
… …
2923 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2651 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2924 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2652 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2925 2653
2926 /* restore player */ 2654 /* restore player */
2927 at = archetype::find ("poisoning"); 2655 at = archetype::find ("poisoning");
2928 tmp = present_arch_in_ob (at, op); 2656 if (object *tmp = present_arch_in_ob (at, op))
2929 if (tmp)
2930 { 2657 {
2931 tmp->destroy (); 2658 tmp->destroy ();
2932 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2659 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2933 } 2660 }
2934 2661
2935 at = archetype::find ("confusion"); 2662 at = archetype::find ("confusion");
2936 tmp = present_arch_in_ob (at, op); 2663 if (object *tmp = present_arch_in_ob (at, op))
2937 if (tmp)
2938 { 2664 {
2939 tmp->destroy (); 2665 tmp->destroy ();
2940 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2666 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2941 } 2667 }
2942 2668
… …
2944 op->stats.hp = op->stats.maxhp; 2670 op->stats.hp = op->stats.maxhp;
2945 if (op->stats.food <= 0) 2671 if (op->stats.food <= 0)
2946 op->stats.food = 999; 2672 op->stats.food = 999;
2947 2673
2948 /* create a bodypart-trophy to make the winner happy */ 2674 /* create a bodypart-trophy to make the winner happy */
2949 tmp = arch_to_object (archetype::find ("finger")); 2675 if (object *tmp = arch_to_object (archetype::find ("finger")))
2950 if (tmp != NULL)
2951 { 2676 {
2952 sprintf (buf, "%s's finger", &op->name); 2677 sprintf (buf, "%s's finger", &op->name);
2953 tmp->name = buf; 2678 tmp->name = buf;
2954 sprintf (buf, " This finger has been cut off %s\n" 2679 sprintf (buf, " This finger has been cut off %s\n"
2955 " the %s, when he was defeated at\n level %d by %s.\n", 2680 " the %s, when he was defeated at\n level %d by %s.\n",
2956 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2681 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2957 tmp->msg = buf; 2682 tmp->msg = buf;
2958 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2683 tmp->value = 0, tmp->type = 0;
2959 tmp->materialname = NULL; 2684 tmp->materialname = "organics";
2960 tmp->x = op->x, tmp->y = op->y; 2685 tmp->insert_at (op, tmp);
2961 insert_ob_in_map (tmp, op->map, op, 0);
2962 } 2686 }
2963 2687
2964 /* teleport defeated player to new destination */ 2688 /* teleport defeated player to new destination */
2965 transfer_ob (op, x, y, 0, NULL); 2689 transfer_ob (op, x, y, 0, NULL);
2966 op->contr->braced = 0; 2690 op->contr->braced = 0;
… …
2971 2695
2972 command_kill_pets (op, 0); 2696 command_kill_pets (op, 0);
2973 2697
2974 if (op->stats.food < 0) 2698 if (op->stats.food < 0)
2975 { 2699 {
2976 if (op->contr->explore)
2977 {
2978 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2979 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2980 op->stats.food = 999;
2981 return;
2982 }
2983 sprintf (buf, "%s starved to death.", &op->name); 2700 sprintf (buf, "%s starved to death.", &op->name);
2984 strcpy (op->contr->killer, "starvation"); 2701 strcpy (op->contr->killer, "starvation");
2985 } 2702 }
2986 else 2703 else
2987 {
2988 if (op->contr->explore)
2989 {
2990 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2991 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2992 op->stats.hp = op->stats.maxhp;
2993 return;
2994 }
2995 sprintf (buf, "%s died.", &op->name); 2704 sprintf (buf, "%s died.", &op->name);
2996 } 2705
2997 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2706 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2998 2707
2999 /* save the map location for corpse, gravestone */ 2708 /* save the map location for corpse, gravestone */
3000 x = op->x; 2709 x = op->x;
3001 y = op->y; 2710 y = op->y;
3002 map = op->map; 2711 map = op->map;
3003 2712
3004
3005 if (settings.not_permadeth == TRUE)
3006 {
3007 /* NOT_PERMADEATH code. This basically brings the character back to 2713 /* NOT_PERMADEATH code. This basically brings the character back to
3008 * life if they are dead - it takes some exp and a random stat. 2714 * life if they are dead - it takes some exp and a random stat.
3009 * See the config.h file for a little more in depth detail about this. 2715 * See the config.h file for a little more in depth detail about this.
3010 */ 2716 */
3011 2717
3012 /* Basically two ways to go - remove a stat permanently, or just 2718 /* Basically two ways to go - remove a stat permanently, or just
3013 * make it depletion. This bunch of code deals with that aspect 2719 * make it depletion. This bunch of code deals with that aspect
3014 * of death. 2720 * of death.
3015 */ 2721 */
3016#ifndef COZY_SERVER 2722#ifndef COZY_SERVER
3017 if (settings.balanced_stat_loss) 2723 if (settings.balanced_stat_loss)
3018 { 2724 {
3019 /* If stat loss is permanent, lose one stat only. */ 2725 /* If stat loss is permanent, lose one stat only. */
3020 /* Lower level chars don't lose as many stats because they suffer 2726 /* Lower level chars don't lose as many stats because they suffer
3021 more if they do. */ 2727 more if they do. */
3022 /* Higher level characters can afford things such as potions of 2728 /* Higher level characters can afford things such as potions of
3023 restoration, or better, stat potions. So we slug them that 2729 restoration, or better, stat potions. So we slug them that
3024 little bit harder. */ 2730 little bit harder. */
3025 /* GD */ 2731 /* GD */
3026 if (settings.stat_loss_on_death) 2732 if (settings.stat_loss_on_death)
3027 num_stats_lose = 1; 2733 num_stats_lose = 1;
3028 else
3029 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3030 }
3031 else 2734 else
3032 { 2735 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2736 }
2737 else
3033 num_stats_lose = 1; 2738 num_stats_lose = 1;
3034 } 2739
3035 lost_a_stat = 0; 2740 lost_a_stat = 0;
3036 2741
3037 for (z = 0; z < num_stats_lose; z++) 2742 for (z = 0; z < num_stats_lose; z++)
3038 { 2743 {
3039 i = RANDOM () % NUM_STATS; 2744 i = RANDOM () % NUM_STATS;
3040 2745
3041 if (settings.stat_loss_on_death) 2746 if (settings.stat_loss_on_death)
3042 { 2747 {
3043 /* Pick a random stat and take a point off it. Tell the player 2748 /* Pick a random stat and take a point off it. Tell the player
3044 * what he lost. 2749 * what he lost.
3045 */ 2750 */
3046 change_attr_value (&(op->stats), i, -1); 2751 change_attr_value (&(op->stats), i, -1);
3047 check_stat_bounds (&(op->stats)); 2752 check_stat_bounds (&(op->stats));
3048 change_attr_value (&(op->contr->orig_stats), i, -1); 2753 change_attr_value (&(op->contr->orig_stats), i, -1);
3049 check_stat_bounds (&(op->contr->orig_stats)); 2754 check_stat_bounds (&(op->contr->orig_stats));
3050 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2755 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3051 lost_a_stat = 1; 2756 lost_a_stat = 1;
2757 }
2758 else
2759 {
2760 /* deplete a stat */
2761 archetype *deparch = archetype::find ("depletion");
2762 object *dep;
2763
2764 dep = present_arch_in_ob (deparch, op);
2765 if (!dep)
2766 {
2767 dep = arch_to_object (deparch);
2768 insert_ob_in_ob (dep, op);
3052 } 2769 }
3053 else 2770 lose_this_stat = 1;
2771 if (settings.balanced_stat_loss)
3054 { 2772 {
3055 /* deplete a stat */ 2773 /* GD */
3056 archetype *deparch = archetype::find ("depletion"); 2774 /* Get the stat that we're about to deplete. */
3057 object *dep; 2775 this_stat = get_attr_value (&(dep->stats), i);
3058 2776 if (this_stat < 0)
3059 dep = present_arch_in_ob (deparch, op);
3060 if (!dep)
3061 { 2777 {
3062 dep = arch_to_object (deparch); 2778 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3063 insert_ob_in_ob (dep, op); 2779 int keep_chance = this_stat * this_stat;
3064 } 2780
3065 lose_this_stat = 1; 2781 /* Yes, I am paranoid. Sue me. */
3066 if (settings.balanced_stat_loss)
3067 {
3068 /* GD */
3069 /* Get the stat that we're about to deplete. */
3070 this_stat = get_attr_value (&(dep->stats), i);
3071 if (this_stat < 0) 2782 if (keep_chance < 1)
2783 keep_chance = 1;
2784
2785 /* There is a maximum depletion total per level. */
2786 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3072 { 2787 {
3073 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3074 int keep_chance = this_stat * this_stat;
3075
3076 /* Yes, I am paranoid. Sue me. */
3077 if (keep_chance < 1)
3078 keep_chance = 1;
3079
3080 /* There is a maximum depletion total per level. */
3081 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3082 {
3083 lose_this_stat = 0; 2788 lose_this_stat = 0;
3084 /* Take loss chance vs keep chance to see if we 2789 /* Take loss chance vs keep chance to see if we
3085 retain the stat. */ 2790 retain the stat. */
3086 }
3087 else
3088 {
3089 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3090 lose_this_stat = 0;
3091 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3092 this_stat, keep_chance, loss_chance,
3093 lose_this_stat?"LOSE":"KEEP"); */
3094 }
3095 } 2791 }
3096 }
3097
3098 if (lose_this_stat)
3099 {
3100 this_stat = get_attr_value (&(dep->stats), i);
3101 /* We could try to do something clever like find another
3102 * stat to reduce if this fails. But chances are, if
3103 * stats have been depleted to -50, all are pretty low
3104 * and should be roughly the same, so it shouldn't make a
3105 * difference.
3106 */ 2792 else
3107 if (this_stat >= -50)
3108 { 2793 {
3109 change_attr_value (&(dep->stats), i, -1); 2794 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3110 SET_FLAG (dep, FLAG_APPLIED);
3111 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3112 fix_player (op);
3113 lost_a_stat = 1; 2795 lose_this_stat = 0;
2796 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2797 this_stat, keep_chance, loss_chance,
2798 lose_this_stat?"LOSE":"KEEP"); */
3114 } 2799 }
3115 } 2800 }
3116 } 2801 }
2802
2803 if (lose_this_stat)
2804 {
2805 this_stat = get_attr_value (&(dep->stats), i);
2806 /* We could try to do something clever like find another
2807 * stat to reduce if this fails. But chances are, if
2808 * stats have been depleted to -50, all are pretty low
2809 * and should be roughly the same, so it shouldn't make a
2810 * difference.
2811 */
2812 if (this_stat >= -50)
2813 {
2814 change_attr_value (&(dep->stats), i, -1);
2815 SET_FLAG (dep, FLAG_APPLIED);
2816 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2817 op->update_stats ();
2818 lost_a_stat = 1;
2819 }
3117 } 2820 }
2821 }
2822 }
3118 /* If no stat lost, tell the player. */ 2823 /* If no stat lost, tell the player. */
3119 if (!lost_a_stat) 2824 if (!lost_a_stat)
3120 { 2825 {
3121 /* determine_god() seems to not work sometimes... why is this? 2826 /* determine_god() seems to not work sometimes... why is this?
3122 Should I be using something else? GD */ 2827 Should I be using something else? GD */
3123 const char *god = determine_god (op); 2828 const char *god = determine_god (op);
3124 2829
3125 if (god && (strcmp (god, "none"))) 2830 if (god && (strcmp (god, "none")))
3126 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2831 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3127 else 2832 else
3128 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2833 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3129 } 2834 }
3130#else 2835#else
3131 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2836 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3132#endif 2837#endif
3133 2838
3134 /* Put a gravestone up where the character 'almost' died. List the 2839 /* Put a gravestone up where the character 'almost' died. List the
3135 * exp loss on the stone. 2840 * exp loss on the stone.
3136 */ 2841 */
3137 tmp = arch_to_object (archetype::find ("gravestone")); 2842 tmp = arch_to_object (archetype::find ("gravestone"));
3138 sprintf (buf, "%s's gravestone", &op->name); 2843 sprintf (buf, "%s's gravestone", &op->name);
3139 tmp->name = buf; 2844 tmp->name = buf;
3140 sprintf (buf, "%s's gravestones", &op->name); 2845 sprintf (buf, "%s's gravestones", &op->name);
3141 tmp->name_pl = buf; 2846 tmp->name_pl = buf;
3142 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); 2847 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);
3143 tmp->msg = buf; 2848 tmp->msg = buf;
3144 tmp->x = op->x, tmp->y = op->y; 2849 tmp->x = op->x, tmp->y = op->y;
3145 insert_ob_in_map (tmp, op->map, NULL, 0); 2850 insert_ob_in_map (tmp, op->map, NULL, 0);
3146 2851
3147 /**************************************/ 2852 /**************************************/
3148 /* */ 2853 /* */
3149 /* Subtract the experience points, */ 2854 /* Subtract the experience points, */
3150 /* if we died cause of food, give us */ 2855 /* if we died cause of food, give us */
3151 /* food, and reset HP's... */ 2856 /* food, and reset HP's... */
3152 /* */ 2857 /* */
3153 /**************************************/ 2858 /**************************************/
3154 2859
3155 /* remove any poisoning and confusion the character may be suffering. */ 2860 /* remove any poisoning and confusion the character may be suffering. */
3156 /* restore player */ 2861 /* restore player */
3157 at = archetype::find ("poisoning"); 2862 at = archetype::find ("poisoning");
3158 tmp = present_arch_in_ob (at, op); 2863 tmp = present_arch_in_ob (at, op);
3159 2864
3160 if (tmp) 2865 if (tmp)
3161 { 2866 {
3162 tmp->destroy (); 2867 tmp->destroy ();
3163 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2868 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3164 } 2869 }
3165 2870
3166 at = archetype::find ("confusion"); 2871 at = archetype::find ("confusion");
3167 tmp = present_arch_in_ob (at, op); 2872 tmp = present_arch_in_ob (at, op);
3168 if (tmp) 2873 if (tmp)
3169 { 2874 {
3170 tmp->destroy (); 2875 tmp->destroy ();
3171 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2876 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3172 } 2877 }
3173 2878
3174 cure_disease (op, 0); /* remove any disease */ 2879 cure_disease (op, 0); /* remove any disease */
3175 2880
3176 /*add_exp(op, (op->stats.exp * -0.20)); */ 2881 /*add_exp(op, (op->stats.exp * -0.20)); */
3177 apply_death_exp_penalty (op); 2882 apply_death_exp_penalty (op);
3178 if (op->stats.food < 100) 2883 if (op->stats.food < 100)
3179 op->stats.food = 900; 2884 op->stats.food = 900;
3180 op->stats.hp = op->stats.maxhp; 2885 op->stats.hp = op->stats.maxhp;
3181 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2886 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3182 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2887 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3183 2888
3184 /* 2889 /*
3185 * Check to see if the player is in a shop. IF so, then check to see if 2890 * Check to see if the player has any unpaid items. If so, remove them
3186 * the player has any unpaid items. If so, remove them and put them back 2891 * and put them back in the map.
3187 * in the map. 2892 */
3188 */
3189
3190 if (is_in_shop (op))
3191 remove_unpaid_objects (op->inv, op); 2893 remove_unpaid_objects (op->inv, op);
3192 2894
3193 /****************************************/ 2895 /****************************************/
3194 /* */ 2896 /* */
3195 /* Move player to his current respawn- */ 2897 /* Move player to his current respawn- */
3196 /* position (usually last savebed) */ 2898 /* position (usually last savebed) */
3197 /* */ 2899 /* */
3198 /****************************************/ 2900 /****************************************/
3199 2901
3200 enter_player_savebed (op); 2902 enter_player_savebed (op);
3201 2903
3202 /* Save the player before inserting the force to reduce
3203 * chance of abuse.
3204 */
3205 op->contr->braced = 0; 2904 op->contr->braced = 0;
3206 save_player (op, 1);
3207 2905
3208 /* it is possible that the player has blown something up 2906 /* it is possible that the player has blown something up
3209 * at his savebed location, and that can have long lasting 2907 * at his savebed location, and that can have long lasting
3210 * spell effects. So first see if there is a spell effect 2908 * spell effects. So first see if there is a spell effect
3211 * on the space that might harm the player. 2909 * on the space that might harm the player.
3212 */ 2910 */
3213 will_kill_again = 0; 2911 will_kill_again = 0;
3214 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2912 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3215 if (tmp->type == SPELL_EFFECT) 2913 if (tmp->type == SPELL_EFFECT)
3216 will_kill_again |= tmp->attacktype; 2914 will_kill_again |= tmp->attacktype;
3217 2915
3218 if (will_kill_again) 2916 if (will_kill_again)
3219 { 2917 {
3220 object *force; 2918 object *force;
3221 int at; 2919 int at;
3222 2920
3223 force = get_archetype (FORCE_NAME); 2921 force = get_archetype (FORCE_NAME);
3224 /* 50 ticks should be enough time for the spell to abate */ 2922 /* 50 ticks should be enough time for the spell to abate */
3225 force->speed = 0.1; 2923 force->speed = 0.1;
3226 force->speed_left = -5.0; 2924 force->speed_left = -5.0;
3227 SET_FLAG (force, FLAG_APPLIED); 2925 SET_FLAG (force, FLAG_APPLIED);
3228 for (at = 0; at < NROFATTACKS; at++) 2926 for (at = 0; at < NROFATTACKS; at++)
3229 if (will_kill_again & (1 << at)) 2927 if (will_kill_again & (1 << at))
3230 force->resist[at] = 100; 2928 force->resist[at] = 100;
3231 2929
3232 insert_ob_in_ob (force, op); 2930 insert_ob_in_ob (force, op);
3233 fix_player (op); 2931 op->update_stats ();
3234 2932
3235 } 2933 }
3236 2934
3237 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2935 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3238 return;
3239 } /* NOT_PERMADETH */
3240 else
3241 {
3242 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3243 * should probably be embedded in an else statement.
3244 */
3245
3246 op->contr->party = NULL;
3247 if (settings.set_title == TRUE)
3248 op->contr->own_title[0] = '\0';
3249 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3250 check_score (op);
3251
3252 if (op->contr->ranges[range_golem])
3253 {
3254 remove_friendly_object (op->contr->ranges[range_golem]);
3255 op->contr->ranges[range_golem]->destroy ();
3256 op->contr->ranges[range_golem] = 0;
3257 }
3258
3259 loot_object (op); /* Remove some of the items for good */
3260 op->remove ();
3261 op->direction = 0;
3262
3263 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3264 {
3265 delete_character (op->name, 0);
3266 if (settings.resurrection == TRUE)
3267 {
3268 /* save playerfile sans equipment when player dies
3269 ** then save it as player.pl.dead so that future resurrection
3270 ** type spells will work on them nicely
3271 */
3272 delete_character (op->name, 0);
3273 op->stats.hp = op->stats.maxhp;
3274 op->stats.food = 999;
3275
3276 /* set the location of where the person will reappear when */
3277 /* maybe resurrection code should fix map also */
3278 strcpy (op->contr->maplevel, settings.emergency_mapname);
3279 if (op->map != NULL)
3280 op->map = NULL;
3281 op->x = settings.emergency_x;
3282 op->y = settings.emergency_y;
3283 save_player (op, 0);
3284 op->map = map;
3285 /* please see resurrection.c: peterm */
3286 dead_player (op);
3287 }
3288 else
3289 delete_character (op->name, 1);
3290 }
3291
3292 play_again (op);
3293
3294 /* peterm: added to create a corpse at deathsite. */
3295 tmp = arch_to_object (archetype::find ("corpse_pl"));
3296 sprintf (buf, "%s", &op->name);
3297 tmp->name = tmp->name_pl = buf;
3298 tmp->level = op->level;
3299 tmp->x = x;
3300 tmp->y = y;
3301 tmp->msg = gravestone_text (op);
3302 SET_FLAG (tmp, FLAG_UNIQUE);
3303 insert_ob_in_map (tmp, map, NULL, 0);
3304 }
3305} 2936}
3306
3307 2937
3308void 2938void
3309loot_object (object *op) 2939loot_object (object *op)
3310{ /* Grab and destroy some treasure */ 2940{ /* Grab and destroy some treasure */
3311 object *tmp, *tmp2, *next; 2941 object *tmp, *tmp2, *next;
3312 2942
3313 if (op->container) 2943 op->close_container (); /* close open sack first */
3314 { /* close open sack first */
3315 esrv_apply_container (op, op->container);
3316 }
3317 2944
3318 for (tmp = op->inv; tmp != NULL; tmp = next) 2945 for (tmp = op->inv; tmp; tmp = next)
3319 { 2946 {
3320 next = tmp->below; 2947 next = tmp->below;
3321 if (tmp->type == EXPERIENCE || tmp->invisible) 2948
2949 if (tmp->invisible)
3322 continue; 2950 continue;
2951
3323 tmp->remove (); 2952 tmp->remove ();
3324 tmp->x = op->x, tmp->y = op->y; 2953 tmp->x = op->x, tmp->y = op->y;
2954
3325 if (tmp->type == CONTAINER) 2955 if (tmp->type == CONTAINER)
3326 { /* empty container to ground */ 2956 loot_object (tmp); /* empty container to ground */
3327 loot_object (tmp); 2957
3328 }
3329 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2958 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3330 { 2959 {
3331 if (tmp->nrof > 1) 2960 if (tmp->nrof > 1)
3332 { 2961 {
3333 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2962 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3334 tmp2->destroy (); 2963 tmp2->destroy ();
… …
3345/* 2974/*
3346 * fix_weight(): Check recursively the weight of all players, and fix 2975 * fix_weight(): Check recursively the weight of all players, and fix
3347 * what needs to be fixed. Refresh windows and fix speed if anything 2976 * what needs to be fixed. Refresh windows and fix speed if anything
3348 * was changed. 2977 * was changed.
3349 */ 2978 */
3350
3351void 2979void
3352fix_weight (void) 2980fix_weight (void)
3353{ 2981{
3354 player *pl; 2982 for_all_players (pl)
3355
3356 for (pl = first_player; pl != NULL; pl = pl->next)
3357 { 2983 {
3358 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2984 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3359 2985
3360 if (old == sum) 2986 if (old == sum)
3361 continue; 2987 continue;
3362 fix_player (pl->ob); 2988 pl->ob->update_stats ();
3363 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2989 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3364 } 2990 }
3365} 2991}
3366 2992
3367void 2993void
3368fix_luck (void) 2994fix_luck (void)
3369{ 2995{
3370 player *pl; 2996 for_all_players (pl)
3371
3372 for (pl = first_player; pl != NULL; pl = pl->next)
3373 if (!pl->ob->contr->state) 2997 if (!pl->ob->contr->ns->state)
3374 change_luck (pl->ob, 0); 2998 pl->ob->change_luck (0);
3375} 2999}
3376
3377 3000
3378/* cast_dust() - handles op throwing objects of type 'DUST'. 3001/* cast_dust() - handles op throwing objects of type 'DUST'.
3379 * This is much simpler in the new spell code - we basically 3002 * This is much simpler in the new spell code - we basically
3380 * just treat this as any other spell casting object. 3003 * just treat this as any other spell casting object.
3381 */ 3004 */
3382
3383void 3005void
3384cast_dust (object *op, object *throw_ob, int dir) 3006cast_dust (object *op, object *throw_ob, int dir)
3385{ 3007{
3386 object *skop, *spob; 3008 object *skop, *spob;
3387 3009
… …
3421 if (op->type == PLAYER) 3043 if (op->type == PLAYER)
3422 { 3044 {
3423 op->contr->tmp_invis = 0; 3045 op->contr->tmp_invis = 0;
3424 op->contr->invis_race = 0; 3046 op->contr->invis_race = 0;
3425 } 3047 }
3048
3426 update_object (op, UP_OBJ_FACE); 3049 update_object (op, UP_OBJ_CHANGE);
3427} 3050}
3428 3051
3429int 3052int
3430is_true_undead (object *op) 3053is_true_undead (object *op)
3431{ 3054{
3432 object *tmp = NULL;
3433
3434 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3055 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3435 return 1; 3056 return 1;
3436 3057
3437 if (op->type == PLAYER)
3438 for (tmp = op->inv; tmp; tmp = tmp->below)
3439 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3440 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3441 return 1;
3442 return 0; 3058 return 0;
3443} 3059}
3444 3060
3445/* look at the surrounding terrain to determine 3061/* look at the surrounding terrain to determine
3446 * the hideability of this object. Positive levels 3062 * the hideability of this object. Positive levels
… …
3502 3118
3503 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3119 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3504 3120
3505 /* its *extremely* hard to run and sneak/hide at the same time! */ 3121 /* its *extremely* hard to run and sneak/hide at the same time! */
3506 if (op->type == PLAYER && op->contr->run_on) 3122 if (op->type == PLAYER && op->contr->run_on)
3507 {
3508 if (!skop || num >= skop->level) 3123 if (!skop || num >= skop->level)
3509 { 3124 {
3510 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3125 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3511 make_visible (op); 3126 make_visible (op);
3512 return; 3127 return;
3513 } 3128 }
3514 else 3129 else
3515 num += 20; 3130 num += 20;
3516 } 3131
3517 num += op->map->difficulty; 3132 num += op->map->difficulty;
3518 hide = hideability (op); /* modify by terrain hidden level */ 3133 hide = hideability (op); /* modify by terrain hidden level */
3519 num -= hide; 3134 num -= hide;
3135
3520 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3136 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3521 { 3137 {
3522 make_visible (op); 3138 make_visible (op);
3523 if (op->type == PLAYER) 3139 if (op->type == PLAYER)
3524 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3140 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3525 } 3141 }
3526 else if (op->type == PLAYER && skop) 3142 else if (op->type == PLAYER && skop)
3527 {
3528 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3143 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3529 }
3530} 3144}
3531 3145
3532/* determine if who is standing near a hostile creature. */ 3146/* determine if who is standing near a hostile creature. */
3533 3147
3534int 3148int
… …
3561 if (mflags & P_OUT_OF_MAP) 3175 if (mflags & P_OUT_OF_MAP)
3562 continue; 3176 continue;
3563 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3177 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3564 continue; 3178 continue;
3565 3179
3566 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3180 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3567 { 3181 {
3568 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3182 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3569 return 1; 3183 return 1;
3570 else if (tmp->type == PLAYER) 3184 else if (tmp->type == PLAYER)
3571 { 3185 {
… …
3601 if (pl->type != PLAYER) 3215 if (pl->type != PLAYER)
3602 { 3216 {
3603 LOG (llevError, "player_can_view() called for non-player object\n"); 3217 LOG (llevError, "player_can_view() called for non-player object\n");
3604 return -1; 3218 return -1;
3605 } 3219 }
3220
3606 if (!pl || !op) 3221 if (!pl || !op)
3607 return 0; 3222 return 0;
3608 3223
3609 if (op->head)
3610 {
3611 op = op->head; 3224 op = op->head_ ();
3612 } 3225
3613 get_rangevector (pl, op, &rv, 0x1); 3226 get_rangevector (pl, op, &rv, 0x1);
3614 3227
3615 /* starting with the 'head' part, lets loop 3228 /* starting with the 'head' part, lets loop
3616 * through the object and find if it has any 3229 * through the object and find if it has any
3617 * part that is in the los array but isnt on 3230 * part that is in the los array but isnt on
… …
3625 3238
3626 /* only the viewable area the player sees is updated by LOS 3239 /* only the viewable area the player sees is updated by LOS
3627 * code, so we need to restrict ourselves to that range of values 3240 * code, so we need to restrict ourselves to that range of values
3628 * for any meaningful values. 3241 * for any meaningful values.
3629 */ 3242 */
3630 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3243 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3631 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3244 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3632 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3245 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3633 return 1; 3246 return 1;
3634 op = op->more; 3247 op = op->more;
3635 } 3248 }
3636 return 0; 3249 return 0;
3637} 3250}
… …
3734 char buf[MAX_BUF]; /* tmp. string buffer */ 3347 char buf[MAX_BUF]; /* tmp. string buffer */
3735 int i = 0, j = 0; 3348 int i = 0, j = 0;
3736 3349
3737 /* get the appropriate treasurelist */ 3350 /* get the appropriate treasurelist */
3738 if (atnr == ATNR_FIRE) 3351 if (atnr == ATNR_FIRE)
3739 trlist = find_treasurelist ("dragon_ability_fire"); 3352 trlist = treasurelist::find ("dragon_ability_fire");
3740 else if (atnr == ATNR_COLD) 3353 else if (atnr == ATNR_COLD)
3741 trlist = find_treasurelist ("dragon_ability_cold"); 3354 trlist = treasurelist::find ("dragon_ability_cold");
3742 else if (atnr == ATNR_ELECTRICITY) 3355 else if (atnr == ATNR_ELECTRICITY)
3743 trlist = find_treasurelist ("dragon_ability_elec"); 3356 trlist = treasurelist::find ("dragon_ability_elec");
3744 else if (atnr == ATNR_POISON) 3357 else if (atnr == ATNR_POISON)
3745 trlist = find_treasurelist ("dragon_ability_poison"); 3358 trlist = treasurelist::find ("dragon_ability_poison");
3746 3359
3747 if (trlist == NULL || who->type != PLAYER) 3360 if (trlist == NULL || who->type != PLAYER)
3748 return; 3361 return;
3749 3362
3750 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3363 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3751 3364
3752 if (tr == NULL || tr->item == NULL) 3365 if (!tr || !tr->item)
3753 { 3366 {
3754 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3367 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3755 return; 3368 return;
3756 } 3369 }
3757 3370
… …
3823 { 3436 {
3824 /* forces in the treasurelist can alter the player's stats */ 3437 /* forces in the treasurelist can alter the player's stats */
3825 object *skin; 3438 object *skin;
3826 3439
3827 /* first get the dragon skin force */ 3440 /* first get the dragon skin force */
3441 shstr_cmp dragon_skin_force ("dragon_skin_force");
3828 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3442 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3443 ;
3444
3829 if (skin == NULL) 3445 if (!skin)
3830 return; 3446 return;
3831 3447
3832 /* adding new spellpath attunements */ 3448 /* adding new spellpath attunements */
3833 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3449 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3834 { 3450 {
… …
3879 * not readied. 3495 * not readied.
3880 */ 3496 */
3881void 3497void
3882player_unready_range_ob (player *pl, object *ob) 3498player_unready_range_ob (player *pl, object *ob)
3883{ 3499{
3884 rangetype i;
3885
3886 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3500 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3887 {
3888 if (pl->ranges[i] == ob) 3501 if (pl->ranges[i] == ob)
3889 { 3502 {
3890 pl->ranges[i] = NULL; 3503 pl->ranges[i] = 0;
3891 if (pl->shoottype == i) 3504 if (pl->shoottype == i)
3892 {
3893 pl->shoottype = range_none; 3505 pl->shoottype = range_none;
3894 }
3895 } 3506 }
3896 }
3897} 3507}
3508
3509sint8
3510player::visibility_at (maptile *map, int x, int y) const
3511{
3512 if (!ns)
3513 return 0;
3514
3515 int dx, dy;
3516 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3517 return 0;
3518
3519 x += dx - ns->current_x + ns->mapx / 2;
3520 y += dy - ns->current_y + ns->mapy / 2;
3521
3522 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3523 return 0;
3524
3525 return 100 - blocked_los [x][y];
3526}

Diff Legend

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