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.26 by root, Sun Sep 17 18:19:19 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#ifndef WIN32 /* ---win32 remove headers */
26# include <pwd.h> 26#include <pwd.h>
27#endif
28#ifndef __CEXTRACT__
29# include <sproto.h> 27#include <sproto.h>
30#endif
31#include <sounds.h> 28#include <sounds.h>
32#include <living.h> 29#include <living.h>
33#include <object.h> 30#include <object.h>
34#include <spells.h> 31#include <spells.h>
35#include <skills.h> 32#include <skills.h>
36#include <newclient.h>
37 33
38#ifdef COZY_SERVER 34#include <algorithm>
39extern int same_party (partylist *a, partylist *b); 35#include <functional>
40#endif
41 36
42player * 37playervec players;
43find_player (const char *plname)
44{
45 player *pl;
46
47 for (pl = first_player; pl != NULL; pl = pl->next)
48 {
49 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
50 return pl;
51 };
52 return NULL;
53}
54
55player *
56find_player_partial_name (const char *plname)
57{
58 player *pl;
59 player *found = NULL;
60 size_t namelen = strlen (plname);
61
62 for (pl = first_player; pl != NULL; pl = pl->next)
63 {
64 if ((size_t) strlen (pl->ob->name) < namelen)
65 continue;
66
67 if (!strcmp (pl->ob->name, plname))
68 return pl;
69
70 if (!strncasecmp (pl->ob->name, plname, namelen))
71 {
72 if (found)
73 return NULL;
74
75 found = pl;
76 }
77 }
78 return found;
79}
80 38
81void 39void
82display_motd (const object *op) 40display_motd (const object *op)
83{ 41{
84 char buf[MAX_BUF]; 42 char buf[MAX_BUF];
… …
87 int comp; 45 int comp;
88 int size; 46 int size;
89 47
90 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 48 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
91 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 49 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
92 {
93 return; 50 return;
94 } 51
95 motd[0] = '\0'; 52 motd[0] = '\0';
96 size = 0; 53 size = 0;
54
97 while (fgets (buf, MAX_BUF, fp) != NULL) 55 while (fgets (buf, MAX_BUF, fp))
98 { 56 {
99 if (*buf == '#') 57 if (*buf == '#')
100 continue; 58 continue;
59
101 strncat (motd + size, buf, HUGE_BUF - size); 60 strncat (motd + size, buf, HUGE_BUF - size);
102 size += strlen (buf); 61 size += strlen (buf);
103 } 62 }
63
104 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);
105 close_and_delete (fp, comp); 65 close_and_delete (fp, comp);
106} 66}
107 67
108void 68void
… …
114 int comp; 74 int comp;
115 int size; 75 int size;
116 76
117 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 77 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
118 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 78 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
119 {
120 return; 79 return;
121 } 80
122 rules[0] = '\0'; 81 rules[0] = '\0';
123 size = 0; 82 size = 0;
83
124 while (fgets (buf, MAX_BUF, fp) != NULL) 84 while (fgets (buf, MAX_BUF, fp))
125 { 85 {
126 if (*buf == '#') 86 if (*buf == '#')
127 continue; 87 continue;
88
128 if (size + strlen (buf) >= HUGE_BUF) 89 if (size + strlen (buf) >= HUGE_BUF)
129 { 90 {
130 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 91 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
131 break; 92 break;
132 } 93 }
94
133 strncat (rules + size, buf, HUGE_BUF - size); 95 strncat (rules + size, buf, HUGE_BUF - size);
134 size += strlen (buf); 96 size += strlen (buf);
135 } 97 }
98
136 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);
137 close_and_delete (fp, comp); 100 close_and_delete (fp, comp);
138} 101}
139 102
140void 103void
… …
148 int size; 111 int size;
149 112
150 sprintf (buf, "%s/%s", settings.confdir, settings.news); 113 sprintf (buf, "%s/%s", settings.confdir, settings.news);
151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
152 return; 115 return;
116
153 news[0] = '\0'; 117 news[0] = '\0';
154 subject[0] = '\0'; 118 subject[0] = '\0';
155 size = 0; 119 size = 0;
120
156 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
157 { 122 {
158 if (*buf == '#') 123 if (*buf == '#')
159 continue; 124 continue;
125
160 if (*buf == '%') 126 if (*buf == '%')
161 { /* send one news */ 127 { /* send one news */
162 if (size > 0) 128 if (size > 0)
163 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
164 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
165 strip_endline (subject); 132 strip_endline (subject);
166 size = 0; 133 size = 0;
167 news[0] = '\0'; 134 news[0] = '\0';
168 } 135 }
… …
177 size += strlen (buf); 144 size += strlen (buf);
178 } 145 }
179 } 146 }
180 147
181 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
182 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);
183 close_and_delete (fp, comp); 150 close_and_delete (fp, comp);
184}
185
186int
187playername_ok (const char *cp)
188{
189 /* Don't allow - or _ as first character in the name */
190 if (*cp == '-' || *cp == '_')
191 return 0;
192
193 for (; *cp != '\0'; cp++)
194 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
195 return 0;
196 return 1;
197}
198
199/* This no longer sets the player map. Also, it now updates
200 * all the pointers so the caller doesn't need to do that.
201 * Caller is responsible for setting the correct map.
202 */
203
204/* Redo this to do both get_player_ob and get_player.
205 * Hopefully this will be less bugfree and simpler.
206 * Returns the player structure. If 'p' is null,
207 * we create a new one. Otherwise, we recycle
208 * the one that is passed.
209 */
210static player *
211get_player (player *p)
212{
213 object *op = arch_to_object (get_player_archetype (NULL));
214 int i;
215
216 if (!p)
217 {
218 p = new player;
219
220 /* This adds the player in the linked list. There is extra
221 * complexity here because we want to add the new player at the
222 * end of the list - there is in fact no compelling reason that
223 * that needs to be done except for things like output of
224 * 'who'.
225 */
226 player *tmp = first_player;
227
228 while (tmp != NULL && tmp->next != NULL)
229 tmp = tmp->next;
230 if (tmp != NULL)
231 tmp->next = p;
232 else
233 first_player = p;
234
235 p->next = NULL;
236 }
237
238 /* Clears basically the entire player structure except
239 * for next and socket.
240 */
241 p->clear ();
242
243 /* There are some elements we want initialized to non zero value -
244 * we deal with that below this point.
245 */
246 p->party = NULL;
247 p->outputs_sync = 16; /* Every 2 seconds */
248 p->outputs_count = 8; /* Keeps present behaviour */
249 p->unapply = unapply_nochoice;
250 p->Swap_First = -1;
251
252#ifdef AUTOSAVE
253 p->last_save_tick = 9999999;
254#endif
255
256 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
257
258 op->contr = p; /* this aren't yet in archetype */
259 p->ob = op;
260 op->speed_left = 0.5;
261 op->speed = 1.0;
262 op->direction = 5; /* So player faces south */
263 op->stats.wc = 2;
264 op->run_away = 25; /* Then we panick... */
265 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
266
267 roll_stats (op);
268 p->state = ST_ROLL_STAT;
269 clear_los (op);
270
271 p->gen_sp_armour = 10;
272 p->last_speed = -1;
273 p->shoottype = range_none;
274 p->bowtype = bow_normal;
275 p->petmode = pet_normal;
276 p->listening = 10;
277 p->usekeys = containers;
278 p->last_weapon_sp = -1;
279 p->peaceful = 1; /* default peaceful */
280 p->do_los = 1;
281 p->explore = 0;
282 p->no_shout = 0; /* default can shout */
283
284 assign (p->title, op->arch->clone.name);
285 op->race = op->arch->clone.race;
286
287 CLEAR_FLAG (op, FLAG_READY_SKILL);
288
289 /* we need to clear these to -1 and not zero - otherwise,
290 * if a player quits and starts a new character, we wont
291 * send new values to the client, as things like exp start
292 * at zero.
293 */
294 for (i = 0; i < NUM_SKILLS; i++)
295 {
296 p->last_skill_exp[i] = -1;
297 p->last_skill_ob[i] = NULL;
298 }
299 for (i = 0; i < NROFATTACKS; i++)
300 {
301 p->last_resist[i] = -1;
302 }
303 p->last_stats.exp = -1;
304 p->last_weight = (uint32) - 1;
305
306 p->socket.update_look = 0;
307 p->socket.look_position = 0;
308 return p;
309} 151}
310 152
311/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
312static void 154static void
313set_first_map (object *op) 155set_first_map (object *op)
314{ 156{
315 strcpy (op->contr->maplevel, first_map_path); 157 op->contr->maplevel = first_map_path;
316 op->x = -1; 158 op->x = -1;
317 op->y = -1; 159 op->y = -1;
318 enter_exit (op, NULL);
319} 160}
320 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
321/* Tries to add player on the connection passwd in ns. 359/* Tries to add player on the connection passed in ns.
322 * 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
323 * mode. 361 * mode.
324 */ 362 */
325
326int
327add_player (NewSocket * ns)
328{
329 player *p; 363player *
364player::create ()
365{
366 player *pl = new player;
330 367
331 p = get_player (NULL); 368 pl->set_object (arch_to_object (get_player_archetype (0)));
332 p->socket = *ns;
333 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
334 369
335 if (p->socket.faces_sent == NULL) 370 pl->ob->roll_stats ();
336 fatal (OUT_OF_MEMORY); 371 pl->ob->stats.wc = 2;
372 pl->ob->run_away = 25; /* Then we panick... */
337 373
338 memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
339 /* Needed because the socket we just copied over needs to be cleared.
340 * Note that this can result in a client reset if there is partial data
341 * on the uncoming socket.
342 */
343 p->socket.inbuf.len = 0;
344 set_first_map (p->ob); 374 set_first_map (pl->ob);
345 375
346 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
347 add_friendly_object (p->ob);
348 send_rules (p->ob);
349 send_news (p->ob);
350 display_motd (p->ob);
351 get_name (p->ob);
352
353 return 0; 376 return pl;
354} 377}
355 378
356/* 379/*
357 * get_player_archetype() return next player archetype from archetype 380 * get_player_archetype() return next player archetype from archetype
358 * list. Not very efficient routine, but used only creating new players. 381 * list. Not very efficient routine, but used only creating new players.
… …
367 { 390 {
368 if (at == NULL || at->next == NULL) 391 if (at == NULL || at->next == NULL)
369 at = first_archetype; 392 at = first_archetype;
370 else 393 else
371 at = at->next; 394 at = at->next;
395
372 if (at->clone.type == PLAYER) 396 if (at->clone.type == PLAYER)
373 return at; 397 return at;
398
374 if (at == start) 399 if (at == start)
375 { 400 {
376 LOG (llevError, "No Player archetypes\n"); 401 LOG (llevError, "No Player archetypes\n");
377 exit (-1); 402 exit (-1);
378 } 403 }
379 } 404 }
380} 405}
381 406
382
383object * 407object *
384get_nearest_player (object *mon) 408get_nearest_player (object *mon)
385{ 409{
386 object *op = NULL; 410 object *op = NULL;
387 player *pl = NULL;
388 objectlink *ol; 411 objectlink *ol;
389 unsigned lastdist; 412 unsigned lastdist;
390 rv_vector rv; 413 rv_vector rv;
391 414
392 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 415 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
393 { 416 {
394 /* 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
395 * does periodically happen. Given that, lets deal with it. 418 * does periodically happen. Given that, lets deal with it.
396 * While unlikely, it is possible the next object on the friendly 419 * While unlikely, it is possible the next object on the friendly
397 * list is also free, so encapsulate this in a while loop. 420 * list is also free, so encapsulate this in a while loop.
… …
401 object *tmp = ol->ob; 424 object *tmp = ol->ob;
402 425
403 /* 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
404 * itself will have been cleared. 427 * itself will have been cleared.
405 */ 428 */
406 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 ());
407 ol = ol->next; 431 ol = ol->next;
408 remove_friendly_object (tmp); 432 remove_friendly_object (tmp);
409 if (!ol) 433 if (!ol)
410 return op; 434 return op;
411 } 435 }
… …
424 { 448 {
425 op = ol->ob; 449 op = ol->ob;
426 lastdist = rv.distance; 450 lastdist = rv.distance;
427 } 451 }
428 } 452 }
429 for (pl = first_player; pl != NULL; pl = pl->next) 453
430 { 454 for_all_players (pl)
431 if (can_detect_enemy (mon, pl->ob, &rv)) 455 if (can_detect_enemy (mon, pl->ob, &rv))
432 {
433
434 if (lastdist > rv.distance) 456 if (lastdist > rv.distance)
435 { 457 {
436 op = pl->ob; 458 op = pl->ob;
437 lastdist = rv.distance; 459 lastdist = rv.distance;
438 } 460 }
439 } 461
440 }
441#if 0 462#if 0
442 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)");
443#endif 464#endif
444 return op; 465 return op;
445} 466}
… …
463 * circling behaviour. Unfortunately, this function is also used to determined 484 * circling behaviour. Unfortunately, this function is also used to determined
464 * 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
465 * is probably not a good thing. 486 * is probably not a good thing.
466 */ 487 */
467#define MAX_SPACES 50 488#define MAX_SPACES 50
468
469 489
470/* 490/*
471 * Returns the direction to the player, if valid. Returns 0 otherwise. 491 * Returns the direction to the player, if valid. Returns 0 otherwise.
472 * 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
473 * 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
… …
504 x = mon->x; 524 x = mon->x;
505 y = mon->y; 525 y = mon->y;
506 m = mon->map; 526 m = mon->map;
507 dir = rv.direction; 527 dir = rv.direction;
508 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 */
509 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
510 /* 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. */
511 if (diff > max) 532 if (diff > max)
512 return 0; 533 return 0;
534
513 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
514 { 536 {
515 lastx = x; 537 lastx = x;
516 lasty = y; 538 lasty = y;
517 lastmap = m; 539 lastmap = m;
… …
599 max--; 621 max--;
600 lastdir = dir; 622 lastdir = dir;
601 if (!firstdir) 623 if (!firstdir)
602 firstdir = dir; 624 firstdir = dir;
603 } 625 }
626
604 if (diff <= 1) 627 if (diff <= 1)
605 { 628 {
606 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
607 * headed toward player for entire distance. 630 * headed toward player for entire distance.
608 */ 631 */
609 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
610 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));
611 } 634 }
635
612 if (diff > max) 636 if (diff > max)
613 return 0; 637 return 0;
614 } 638 }
639
615 /* 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 */
616 if (!max) 641 if (!max)
617 return 0; 642 return 0;
618 643
619 return firstdir; 644 return firstdir;
… …
646 (op->type == ARMOUR || op->type == BOOTS || 671 (op->type == ARMOUR || op->type == BOOTS ||
647 op->type == CLOAK || op->type == HELMET || 672 op->type == CLOAK || op->type == HELMET ||
648 op->type == SHIELD || op->type == GLOVES || 673 op->type == SHIELD || op->type == GLOVES ||
649 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 674 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
650 { 675 {
651 remove_ob (op); 676 op->destroy ();
652 free_object (op);
653 continue; 677 continue;
654 } 678 }
655 } 679 }
656 680
657 /* This really needs to be better - we should really give 681 /* This really needs to be better - we should really give
… …
668 if (tmp->type == op->type && tmp->name == op->name) 692 if (tmp->type == op->type && tmp->name == op->name)
669 break; 693 break;
670 694
671 if (tmp) 695 if (tmp)
672 { 696 {
673 remove_ob (op); 697 op->destroy ();
674 free_object (op);
675 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 698 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
676 continue; 699 continue;
677 } 700 }
701
678 if (op->nrof > 1) 702 if (op->nrof > 1)
679 op->nrof = 1; 703 op->nrof = 1;
680 } 704 }
681 705
682 if (op->type == SPELLBOOK && op->inv) 706 if (op->type == SPELLBOOK && op->inv)
… …
694 CLEAR_FLAG (op, FLAG_CURSED); 718 CLEAR_FLAG (op, FLAG_CURSED);
695 CLEAR_FLAG (op, FLAG_DAMNED); 719 CLEAR_FLAG (op, FLAG_DAMNED);
696 } 720 }
697 if (op->type == SPELL) 721 if (op->type == SPELL)
698 { 722 {
699 remove_ob (op); 723 op->destroy ();
700 free_object (op);
701 continue; 724 continue;
702 } 725 }
703 else if (op->type == SKILL) 726 else if (op->type == SKILL)
704 { 727 {
705 SET_FLAG (op, FLAG_CAN_USE_SKILL); 728 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
714 /* Need to set up the skill pointers */ 737 /* Need to set up the skill pointers */
715 link_player_skills (pl); 738 link_player_skills (pl);
716} 739}
717 740
718void 741void
719get_name (object *op)
720{
721 op->contr->write_buf[0] = '\0';
722 op->contr->state = ST_GET_NAME;
723 send_query (&op->contr->socket, 0, "What is your name?\n:");
724}
725
726void
727get_password (object *op)
728{
729 op->contr->write_buf[0] = '\0';
730 op->contr->state = ST_GET_PASSWORD;
731 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
732}
733
734void
735play_again (object *op)
736{
737 op->contr->state = ST_PLAY_AGAIN;
738 op->chosen_skill = NULL;
739 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
740 /* a bit of a hack, but there are various places early in th
741 * player creation process that a user can quit (eg, roll
742 * stats) that isn't removing the player. Taking a quick
743 * look, there are many places that call play_again without
744 * removing the player - it probably makes more sense
745 * to leave it to play_again to remove the object in all
746 * cases.
747 */
748 if (!QUERY_FLAG (op, FLAG_REMOVED))
749 remove_ob (op);
750 /* Need to set this to null - otherwise, it could point to garbage,
751 * and draw() doesn't check to see if the player is removed, only if
752 * the map is null or not swapped out.
753 */
754 op->map = NULL;
755}
756
757int
758receive_play_again (object *op, char key)
759{
760 if (key == 'q' || key == 'Q')
761 {
762 remove_friendly_object (op);
763 leave (op->contr, 0); /* ericserver will draw the message */
764 return 2;
765 }
766 else if (key == 'a' || key == 'A')
767 {
768 player *pl = op->contr;
769 shstr name = op->name;
770
771 op->contr = 0;
772 op->type = 0;
773 op->free (1);
774 pl = get_player (pl);
775 op = pl->ob;
776 add_friendly_object (op);
777 op->contr->password[0] = '~';
778 op->name = op->name_pl = 0;
779 /* Lets put a space in here */
780 new_draw_info (NDI_UNIQUE, 0, op, "\n");
781 get_name (op);
782 op->name = op->name_pl = name;
783 set_first_map (op);
784 }
785 else
786 /* user pressed something else so just ask again... */
787 play_again (op);
788
789 return 0;
790}
791
792void
793confirm_password (object *op)
794{
795
796 op->contr->write_buf[0] = '\0';
797 op->contr->state = ST_CONFIRM_PASSWORD;
798 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
799}
800
801void
802get_party_password (object *op, partylist *party) 742get_party_password (object *op, partylist *party)
803{ 743{
804 if (party == NULL) 744 if (party == NULL)
805 { 745 {
806 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);
807 return; 747 return;
808 } 748 }
749
809 op->contr->write_buf[0] = '\0'; 750 op->contr->write_buf[0] = '\0';
810 op->contr->state = ST_GET_PARTY_PASSWORD; 751 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
811 op->contr->party_to_join = party; 752 op->contr->party_to_join = party;
812 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:");
813} 754}
814
815 755
816/* 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. */
817int 757static int
818roll_stat (void) 758roll_stat (void)
819{ 759{
820 int a[4], i, j, k; 760 int a[4], i, j, k;
821 761
822 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
823 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
824 764
825 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
826 if (a[i] < k) 766 if (a[i] < k)
827 k = a[i], j = i; 767 k = a[i], j = i;
828 768
829 for (i = 0, k = 0; i < 4; i++) 769 for (i = 0, k = 0; i < 4; i++)
830 {
831 if (i != j) 770 if (i != j)
832 k += a[i]; 771 k += a[i];
833 } 772
834 return k; 773 return k;
835} 774}
836 775
837void 776void
838roll_stats (object *op) 777object::roll_stats ()
839{ 778{
840 int sum = 0;
841 int i = 0, j = 0;
842 int statsort[7]; 779 int statsort [7];
843 780
844 do 781 for (;;)
845 {
846 op->stats.Str = roll_stat ();
847 op->stats.Dex = roll_stat ();
848 op->stats.Int = roll_stat ();
849 op->stats.Con = roll_stat ();
850 op->stats.Wis = roll_stat ();
851 op->stats.Pow = roll_stat ();
852 op->stats.Cha = roll_stat ();
853 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
854 } 782 {
855 while (sum < 82 || sum > 116); 783 int sum = 0;
784 for (int i = 7; i--; )
785 sum += statsort [i] = roll_stat ();
856 786
787 if (sum >= 82 && sum <= 116)
788 break;
789 }
790
857 /* Sort the stats so that rerolling is easier... */ 791 // Sort the stats so that rerolling is easier...
858 statsort[0] = op->stats.Str; 792 std::sort (statsort, statsort + 7, std::greater<int>());
859 statsort[1] = op->stats.Dex;
860 statsort[2] = op->stats.Int;
861 statsort[3] = op->stats.Con;
862 statsort[4] = op->stats.Wis;
863 statsort[5] = op->stats.Pow;
864 statsort[6] = op->stats.Cha;
865 793
866 /* a quick and dirty bubblesort? */
867 do
868 {
869 if (statsort[i] < statsort[i + 1])
870 {
871 j = statsort[i];
872 statsort[i] = statsort[i + 1];
873 statsort[i + 1] = j;
874 i = 0;
875 }
876 else
877 {
878 i++;
879 }
880 }
881 while (i < 6);
882
883 op->stats.Str = statsort[0]; 794 stats.Str = statsort[0];
884 op->stats.Dex = statsort[1]; 795 stats.Dex = statsort[1];
885 op->stats.Con = statsort[2]; 796 stats.Con = statsort[2];
886 op->stats.Int = statsort[3]; 797 stats.Int = statsort[3];
887 op->stats.Wis = statsort[4]; 798 stats.Wis = statsort[4];
888 op->stats.Pow = statsort[5]; 799 stats.Pow = statsort[5];
889 op->stats.Cha = statsort[6]; 800 stats.Cha = statsort[6];
890 801
891
892 op->contr->orig_stats.Str = op->stats.Str;
893 op->contr->orig_stats.Dex = op->stats.Dex;
894 op->contr->orig_stats.Int = op->stats.Int;
895 op->contr->orig_stats.Con = op->stats.Con;
896 op->contr->orig_stats.Wis = op->stats.Wis;
897 op->contr->orig_stats.Pow = op->stats.Pow;
898 op->contr->orig_stats.Cha = op->stats.Cha;
899
900 op->level = 1;
901 op->stats.exp = 0; 802 stats.exp = 0;
902 op->stats.ac = 0; 803 stats.ac = 0;
903 804
904 op->contr->levhp[1] = 9;
905 op->contr->levsp[1] = 6;
906 op->contr->levgrace[1] = 3;
907
908 fix_player (op);
909 op->stats.hp = op->stats.maxhp; 805 stats.hp = stats.maxhp;
910 op->stats.sp = op->stats.maxsp; 806 stats.sp = stats.maxsp;
911 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
912 op->contr->orig_stats = op->stats; 815 contr->orig_stats = stats;
816 }
913} 817}
914 818
915void 819void
916Roll_Again (object *op) 820object::swap_stats (int a, int b)
917{ 821{
918 esrv_new_player (op->contr, 0); 822 int tmp = get_attr_value (&contr->orig_stats, a);
919 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 823 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
920 "[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);
921}
922 825
923void 826 stats.Str = contr->orig_stats.Str;
924Swap_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)
925{ 858{
926 signed char tmp;
927 char buf[MAX_BUF]; 859 char buf[MAX_BUF];
928 860
929 if (op->contr->Swap_First == -1) 861 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
930 {
931 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
932 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
933 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
934 return;
935 }
936
937 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
938
939 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
940
941 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
942
943 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
944 new_draw_info (NDI_UNIQUE, 0, op, buf); 862 new_draw_info (NDI_UNIQUE, 0, op, buf);
945 op->stats.Str = op->contr->orig_stats.Str; 863 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
946 op->stats.Dex = op->contr->orig_stats.Dex;
947 op->stats.Con = op->contr->orig_stats.Con;
948 op->stats.Int = op->contr->orig_stats.Int;
949 op->stats.Wis = op->contr->orig_stats.Wis;
950 op->stats.Pow = op->contr->orig_stats.Pow;
951 op->stats.Cha = op->contr->orig_stats.Cha;
952 op->stats.ac = 0;
953
954 op->level = 1;
955 op->stats.exp = 0;
956 op->stats.ac = 0;
957
958 op->contr->levhp[1] = 9;
959 op->contr->levsp[1] = 6;
960 op->contr->levgrace[1] = 3;
961
962 fix_player (op);
963 op->stats.hp = op->stats.maxhp;
964 op->stats.sp = op->stats.maxsp;
965 op->stats.grace = op->stats.maxgrace;
966 op->contr->orig_stats = op->stats;
967 op->contr->Swap_First = -1;
968}
969
970
971/* This code has been greatly reduced, because with set_attr_value
972 * and get_attr_value, the stats can be accessed just numeric
973 * ids. stat_trans is a table that translate the number entered
974 * into the actual stat. It is needed because the order the stats
975 * are displayed in the stat window is not the same as how
976 * the number's access that stat. The table does that translation.
977 */
978int
979key_roll_stat (object *op, char key)
980{
981 int keynum = key - '0';
982 char buf[MAX_BUF];
983 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
984
985 if (keynum > 0 && keynum <= 7)
986 {
987 if (op->contr->Swap_First == -1)
988 {
989 op->contr->Swap_First = stat_trans[keynum];
990 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
991 new_draw_info (NDI_UNIQUE, 0, op, buf); 864 //new_draw_info (NDI_UNIQUE, 0, op, " ");
992 }
993 else
994 Swap_Stat (op, stat_trans[keynum]);
995
996 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
997 return 1;
998 }
999 switch (key)
1000 {
1001 case 'n':
1002 case 'N':
1003 {
1004 SET_FLAG (op, FLAG_WIZ);
1005 if (op->map == NULL)
1006 {
1007 LOG (llevError, "Map == NULL in state 2\n");
1008 break;
1009 }
1010
1011#if 0
1012 /* So that enter_exit will put us at startx/starty */
1013 op->x = -1;
1014
1015 enter_exit (op, NULL);
1016#endif
1017 SET_ANIMATION (op, 2); /* So player faces south */
1018 /* Enter exit adds a player otherwise */
1019 add_statbonus (op);
1020 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
1021 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1022 op->contr->state = ST_CHANGE_CLASS;
1023 if (op->msg)
1024 new_draw_info (NDI_BLUE, 0, op, op->msg);
1025 return 0;
1026 }
1027 case 'y':
1028 case 'Y':
1029 roll_stats (op);
1030 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
1031 return 1;
1032
1033 case 'q':
1034 case 'Q':
1035 play_again (op);
1036 return 1;
1037
1038 default:
1039 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1040 return 0;
1041 }
1042 return 0;
1043} 865}
1044 866
1045/* This function takes the key that is passed, and does the 867/* This function takes the key that is passed, and does the
1046 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
1047 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
1048 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
1049 * not the class. 871 * not the class.
1050 */ 872 */
1051 873void
1052int 874player::chargen_race_done ()
1053key_change_class (object *op, char key)
1054{ 875{
1055 int tmp_loop;
1056
1057 if (key == 'q' || key == 'Q')
1058 {
1059 remove_ob (op);
1060 play_again (op);
1061 return 0;
1062 }
1063 if (key == 'd' || key == 'D')
1064 {
1065 char buf[MAX_BUF];
1066
1067 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
1068 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
1069 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0);
1070 878
879 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl)
881 create_treasure (tl, ob, 0, 0, 0);
882
1071 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
1073 885
1074 op->contr->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
1075 887
1076 if (op->msg) 888 if (ob->msg)
1077 op->msg = NULL; 889 ob->msg = 0;
1078 890
1079 /* 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
1080 * to save here. 892 * to save here.
1081 */ 893 */
894 {
895 char buf[MAX_BUF];
1082 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
1083 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
1084 899
1085#ifdef AUTOSAVE
1086 op->contr->last_save_tick = pticks;
1087#endif
1088 start_info (op); 900 start_info (ob);
1089 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
1090 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
1091 link_player_skills (op); 903 link_player_skills (ob);
1092 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
1093 fix_player (op); 905 ob->update_stats ();
1094 906
1095 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
1096 * is one for this race 908 * is one for this race
1097 */ 909 */
1098 if (*first_map_ext_path) 910 if (*first_map_ext_path)
1099 { 911 {
1100 object *tmp; 912 object *tmp;
1101 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
1102 914
1103 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);
1104 tmp = get_object (); 916 tmp = object::create ();
1105 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
1106 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
1107 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
1108 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;
1109 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
1110 * default initial map */ 922 * default initial map */
1111 free_object (tmp); 923 tmp->destroy ();
1112 } 924 }
1113 else 925 else
1114 {
1115 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
1116 } 927}
1117 return 0;
1118 }
1119 928
929void
930player::chargen_race_next ()
931{
1120 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
1121 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
1122 */ 934 */
1123 935
1124 tmp_loop = 0; 936 do
1125 while (!tmp_loop)
1126 { 937 {
1127 shstr name = op->name; 938 shstr name = ob->name;
1128 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
1129 940
1130 remove_statbonus (op); 941 ob->remove_statbonus ();
1131 remove_ob (op); 942 ob->remove ();
1132 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
1133 copy_object (&op->arch->clone, op); 944 ob->arch->clone.copy_to (ob);
1134 op->instantiate (); 945 ob->instantiate ();
1135 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
1136 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
1137 op->x = x; 948 ob->x = x;
1138 op->y = y; 949 ob->y = y;
1139 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
1140 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
1141 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
1142 add_statbonus (op); 953 ob->add_statbonus ();
1143 tmp_loop = allowed_class (op);
1144 } 954 }
955 while (!allowed_class (ob));
1145 956
1146 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
1147 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
1148 fix_player (op); 959 ob->update_stats ();
1149 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
1150 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
1151 op->stats.grace = 0; 962 ob->stats.grace = 0;
1152
1153 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0;
1158}
1159
1160int
1161key_confirm_quit (object *op, char key)
1162{
1163 char buf[MAX_BUF];
1164
1165 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1166 {
1167 op->contr->state = ST_PLAYING;
1168 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1169 return 1;
1170 }
1171
1172 INVOKE_PLAYER (LOGOUT, op->contr);
1173 INVOKE_PLAYER (QUIT, op->contr);
1174
1175 terminate_all_pets (op);
1176 leave_map (op);
1177 op->direction = 0;
1178 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1179
1180 strcpy (op->contr->killer, "quit");
1181 check_score (op);
1182 op->contr->party = NULL;
1183 if (settings.set_title == TRUE)
1184 op->contr->own_title[0] = '\0';
1185
1186 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1187 {
1188 maptile *mp, *next;
1189
1190 /* We need to hunt for any per player unique maps in memory and
1191 * get rid of them. The trailing slash in the path is intentional,
1192 * so that players named 'Ab' won't match against players 'Abe' pathname
1193 */
1194 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1195 for (mp = first_map; mp != NULL; mp = next)
1196 {
1197 next = mp->next;
1198 if (!strncmp (mp->path, buf, strlen (buf)))
1199 delete_map (mp);
1200 }
1201
1202 delete_character (op->name, 1);
1203 }
1204
1205 play_again (op);
1206 return 1;
1207} 963}
1208 964
1209void 965void
1210flee_player (object *op) 966flee_player (object *op)
1211{ 967{
… …
1241 { 997 {
1242 op->enemy = NULL; 998 op->enemy = NULL;
1243 CLEAR_FLAG (op, FLAG_SCARED); 999 CLEAR_FLAG (op, FLAG_SCARED);
1244 return; 1000 return;
1245 } 1001 }
1002
1246 get_rangevector (op, op->enemy, &rv, 0); 1003 get_rangevector (op, op->enemy, &rv, 0);
1247 1004
1248 dir = absdir (4 + rv.direction); 1005 dir = absdir (4 + rv.direction);
1249 for (diff = 0; diff < 3; diff++) 1006 for (diff = 0; diff < 3; diff++)
1250 { 1007 {
1251 int m = 1 - (RANDOM () & 2); 1008 int m = 1 - (RANDOM () & 2);
1252 1009
1253 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)))
1254 {
1255 return; 1011 return;
1256 }
1257 } 1012 }
1013
1258 /* Cornered, get rid of scared */ 1014 /* Cornered, get rid of scared */
1259 CLEAR_FLAG (op, FLAG_SCARED); 1015 CLEAR_FLAG (op, FLAG_SCARED);
1260 op->enemy = NULL; 1016 op->enemy = NULL;
1261} 1017}
1262 1018
… …
1268int 1024int
1269check_pick (object *op) 1025check_pick (object *op)
1270{ 1026{
1271 object *tmp, *next; 1027 object *tmp, *next;
1272 int stop = 0; 1028 int stop = 0;
1273 int j, k, wvratio; 1029 int wvratio;
1274 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1275 1031
1276 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1277 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1278 return 1; 1034 return 1;
1279 1035
… …
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1349 &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))));
1350 else 1106 else
1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1352 &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
1353 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1354
1355 sprintf (putstring, "...flags: ");
1356 for (k = 0; k < 4; k++)
1357 {
1358 for (j = 0; j < 32; j++)
1359 {
1360 if ((tmp->flags[k] >> j) & 0x01)
1361 {
1362 sprintf (tmpstr, "%d ", k * 32 + j);
1363 strcat (putstring, tmpstr);
1364 }
1365 }
1366 }
1367 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1368
1369#if 0
1370 /* print the flags too */
1371 for (k = 0; k < 4; k++)
1372 {
1373 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1374 for (j = 0; j < 32; j++)
1375 {
1376 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1377 if (!((j + 1) % 4))
1378 fprintf (stderr, " ");
1379 }
1380 fprintf (stderr, " [%d]\n", k * 32);
1381 }
1382#endif
1383 } 1111 }
1112
1384 /* philosophy: 1113 /* philosophy:
1385 * 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
1386 * generic. This takes no game-time. For more detailed pickups 1115 * generic. This takes no game-time. For more detailed pickups
1387 * and selections, select-items shoul dbe used. This is a 1116 * and selections, select-items should be used. This is a
1388 * 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
1389 * example. 1118 * example.
1390 * 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
1391 * 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
1392 * convert to decimal and then 'pickup <#> 1121 * convert to decimal and then 'pickup <#>
… …
1426 /* question: don't pick up known-poisonous stuff? */ 1155 /* question: don't pick up known-poisonous stuff? */
1427 if (op->contr->mode & PU_FOOD) 1156 if (op->contr->mode & PU_FOOD)
1428 if (tmp->type == FOOD) 1157 if (tmp->type == FOOD)
1429 { 1158 {
1430 pick_up (op, tmp); 1159 pick_up (op, tmp);
1431 if (0)
1432 fprintf (stderr, "FOOD\n");
1433 continue; 1160 continue;
1434 } 1161 }
1162
1435 if (op->contr->mode & PU_DRINK) 1163 if (op->contr->mode & PU_DRINK)
1436 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1164 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1437 { 1165 {
1438 pick_up (op, tmp); 1166 pick_up (op, tmp);
1439 if (0)
1440 fprintf (stderr, "DRINK\n");
1441 continue; 1167 continue;
1442 } 1168 }
1443 1169
1444 if (op->contr->mode & PU_POTION) 1170 if (op->contr->mode & PU_POTION)
1445 if (tmp->type == POTION) 1171 if (tmp->type == POTION)
1446 { 1172 {
1447 pick_up (op, tmp); 1173 pick_up (op, tmp);
1448 if (0)
1449 fprintf (stderr, "POTION\n");
1450 continue; 1174 continue;
1451 } 1175 }
1452 1176
1453 /* spellbooks, skillscrolls and normal books/scrolls */ 1177 /* spellbooks, skillscrolls and normal books/scrolls */
1454 if (op->contr->mode & PU_SPELLBOOK) 1178 if (op->contr->mode & PU_SPELLBOOK)
1455 if (tmp->type == SPELLBOOK) 1179 if (tmp->type == SPELLBOOK)
1456 { 1180 {
1457 pick_up (op, tmp); 1181 pick_up (op, tmp);
1458 if (0)
1459 fprintf (stderr, "SPELLBOOK\n");
1460 continue; 1182 continue;
1461 } 1183 }
1184
1462 if (op->contr->mode & PU_SKILLSCROLL) 1185 if (op->contr->mode & PU_SKILLSCROLL)
1463 if (tmp->type == SKILLSCROLL) 1186 if (tmp->type == SKILLSCROLL)
1464 { 1187 {
1465 pick_up (op, tmp); 1188 pick_up (op, tmp);
1466 if (0)
1467 fprintf (stderr, "SKILLSCROLL\n");
1468 continue; 1189 continue;
1469 } 1190 }
1191
1470 if (op->contr->mode & PU_READABLES) 1192 if (op->contr->mode & PU_READABLES)
1471 if (tmp->type == BOOK || tmp->type == SCROLL) 1193 if (tmp->type == BOOK || tmp->type == SCROLL)
1472 { 1194 {
1473 pick_up (op, tmp); 1195 pick_up (op, tmp);
1474 if (0)
1475 fprintf (stderr, "READABLES\n");
1476 continue; 1196 continue;
1477 } 1197 }
1478 1198
1479 /* wands/staves/rods/horns */ 1199 /* wands/staves/rods/horns */
1480 if (op->contr->mode & PU_MAGIC_DEVICE) 1200 if (op->contr->mode & PU_MAGIC_DEVICE)
1481 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1201 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1482 { 1202 {
1483 pick_up (op, tmp); 1203 pick_up (op, tmp);
1484 if (0)
1485 fprintf (stderr, "MAGIC_DEVICE\n");
1486 continue; 1204 continue;
1487 } 1205 }
1488 1206
1489 /* pick up all magical items */ 1207 /* pick up all magical items */
1490 if (op->contr->mode & PU_MAGICAL) 1208 if (op->contr->mode & PU_MAGICAL)
1491 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1209 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1492 { 1210 {
1493 pick_up (op, tmp); 1211 pick_up (op, tmp);
1494 if (0)
1495 fprintf (stderr, "MAGICAL\n");
1496 continue; 1212 continue;
1497 } 1213 }
1498 1214
1499 if (op->contr->mode & PU_VALUABLES) 1215 if (op->contr->mode & PU_VALUABLES)
1500 { 1216 {
1501 if (tmp->type == MONEY || tmp->type == GEM) 1217 if (tmp->type == MONEY || tmp->type == GEM)
1502 { 1218 {
1503 pick_up (op, tmp); 1219 pick_up (op, tmp);
1504 if (0)
1505 fprintf (stderr, "MONEY/GEM\n");
1506 continue; 1220 continue;
1507 } 1221 }
1508 } 1222 }
1509 1223
1510 /* rings & amulets - talismans seems to be typed AMULET */ 1224 /* rings & amulets - talismans seems to be typed AMULET */
1511 if (op->contr->mode & PU_JEWELS) 1225 if (op->contr->mode & PU_JEWELS)
1512 if (tmp->type == RING || tmp->type == AMULET) 1226 if (tmp->type == RING || tmp->type == AMULET)
1513 { 1227 {
1514 pick_up (op, tmp); 1228 pick_up (op, tmp);
1229 continue;
1515 if (0) 1230 }
1516 fprintf (stderr, "JEWELS\n"); 1231
1232 /* we don't forget dragon food */
1233 if (op->contr->mode & PU_FLESH)
1234 if (tmp->type == FLESH)
1235 {
1236 pick_up (op, tmp);
1517 continue; 1237 continue;
1518 } 1238 }
1519 1239
1520 /* bows and arrows. Bows are good for selling! */ 1240 /* bows and arrows. Bows are good for selling! */
1521 if (op->contr->mode & PU_BOW) 1241 if (op->contr->mode & PU_BOW)
1522 if (tmp->type == BOW) 1242 if (tmp->type == BOW)
1523 { 1243 {
1524 pick_up (op, tmp); 1244 pick_up (op, tmp);
1525 if (0)
1526 fprintf (stderr, "BOW\n");
1527 continue; 1245 continue;
1528 } 1246 }
1247
1529 if (op->contr->mode & PU_ARROW) 1248 if (op->contr->mode & PU_ARROW)
1530 if (tmp->type == ARROW) 1249 if (tmp->type == ARROW)
1531 { 1250 {
1532 pick_up (op, tmp); 1251 pick_up (op, tmp);
1533 if (0)
1534 fprintf (stderr, "ARROW\n");
1535 continue; 1252 continue;
1536 } 1253 }
1537 1254
1538 /* all kinds of armor etc. */ 1255 /* all kinds of armor etc. */
1539 if (op->contr->mode & PU_ARMOUR) 1256 if (op->contr->mode & PU_ARMOUR)
1540 if (tmp->type == ARMOUR) 1257 if (tmp->type == ARMOUR)
1541 { 1258 {
1542 pick_up (op, tmp); 1259 pick_up (op, tmp);
1543 if (0)
1544 fprintf (stderr, "ARMOUR\n");
1545 continue; 1260 continue;
1546 } 1261 }
1262
1547 if (op->contr->mode & PU_HELMET) 1263 if (op->contr->mode & PU_HELMET)
1548 if (tmp->type == HELMET) 1264 if (tmp->type == HELMET)
1549 { 1265 {
1550 pick_up (op, tmp); 1266 pick_up (op, tmp);
1551 if (0)
1552 fprintf (stderr, "HELMET\n");
1553 continue; 1267 continue;
1554 } 1268 }
1269
1555 if (op->contr->mode & PU_SHIELD) 1270 if (op->contr->mode & PU_SHIELD)
1556 if (tmp->type == SHIELD) 1271 if (tmp->type == SHIELD)
1557 { 1272 {
1558 pick_up (op, tmp); 1273 pick_up (op, tmp);
1559 if (0)
1560 fprintf (stderr, "SHIELD\n");
1561 continue; 1274 continue;
1562 } 1275 }
1276
1563 if (op->contr->mode & PU_BOOTS) 1277 if (op->contr->mode & PU_BOOTS)
1564 if (tmp->type == BOOTS) 1278 if (tmp->type == BOOTS)
1565 { 1279 {
1566 pick_up (op, tmp); 1280 pick_up (op, tmp);
1567 if (0)
1568 fprintf (stderr, "BOOTS\n");
1569 continue; 1281 continue;
1570 } 1282 }
1283
1571 if (op->contr->mode & PU_GLOVES) 1284 if (op->contr->mode & PU_GLOVES)
1572 if (tmp->type == GLOVES) 1285 if (tmp->type == GLOVES)
1573 { 1286 {
1574 pick_up (op, tmp); 1287 pick_up (op, tmp);
1575 if (0)
1576 fprintf (stderr, "GLOVES\n");
1577 continue; 1288 continue;
1578 } 1289 }
1290
1579 if (op->contr->mode & PU_CLOAK) 1291 if (op->contr->mode & PU_CLOAK)
1580 if (tmp->type == CLOAK) 1292 if (tmp->type == CLOAK)
1581 { 1293 {
1582 pick_up (op, tmp); 1294 pick_up (op, tmp);
1583 if (0)
1584 fprintf (stderr, "GLOVES\n");
1585 continue; 1295 continue;
1586 } 1296 }
1587 1297
1588 /* hoping to catch throwing daggers here */ 1298 /* hoping to catch throwing daggers here */
1589 if (op->contr->mode & PU_MISSILEWEAPON) 1299 if (op->contr->mode & PU_MISSILEWEAPON)
1590 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1300 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1591 { 1301 {
1592 pick_up (op, tmp); 1302 pick_up (op, tmp);
1593 if (0)
1594 fprintf (stderr, "MISSILEWEAPON\n");
1595 continue; 1303 continue;
1596 } 1304 }
1597 1305
1598 /* careful: chairs and tables are weapons! */ 1306 /* careful: chairs and tables are weapons! */
1599 if (op->contr->mode & PU_ALLWEAPON) 1307 if (op->contr->mode & PU_ALLWEAPON)
… …
1602 { 1310 {
1603 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1604 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1312 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1605 { 1313 {
1606 pick_up (op, tmp); 1314 pick_up (op, tmp);
1607 if (0)
1608 fprintf (stderr, "WEAPON\n");
1609 continue; 1315 continue;
1610 } 1316 }
1611 } 1317 }
1318
1612 if (tmp->type == WEAPON && tmp->name == NULL) 1319 if (tmp->type == WEAPON && tmp->name == NULL)
1613 { 1320 {
1614 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1321 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1615 { 1322 {
1616 pick_up (op, tmp); 1323 pick_up (op, tmp);
1617 if (0)
1618 fprintf (stderr, "WEAPON\n");
1619 continue; 1324 continue;
1620 } 1325 }
1621 } 1326 }
1622 } 1327 }
1623 1328
1624 /* misc stuff that's useful */ 1329 /* misc stuff that's useful */
1625 if (op->contr->mode & PU_KEY) 1330 if (op->contr->mode & PU_KEY)
1626 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1331 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1627 { 1332 {
1628 pick_up (op, tmp); 1333 pick_up (op, tmp);
1629 if (0)
1630 fprintf (stderr, "KEY\n");
1631 continue; 1334 continue;
1632 } 1335 }
1633 1336
1634 /* any of the last 4 bits set means we use the ratio for value 1337 /* any of the last 4 bits set means we use the ratio for value
1635 * pickups */ 1338 * pickups */
… …
1657 continue; 1360 continue;
1658 } 1361 }
1659 } 1362 }
1660 } /* the new pickup model */ 1363 } /* the new pickup model */
1661 } 1364 }
1365
1662 return !stop; 1366 return !stop;
1663} 1367}
1664 1368
1665/* 1369/*
1666 * Find an arrow in the inventory and after that 1370 * Find an arrow in the inventory and after that
… …
1668 * found object is returned. 1372 * found object is returned.
1669 */ 1373 */
1670object * 1374object *
1671find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1672{ 1376{
1673 object *tmp = NULL; 1377 object *tmp = 0;
1674 1378
1675 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1676 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))
1677 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1678 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1679 return op; 1383 return op;
1384
1680 return tmp; 1385 return tmp;
1681} 1386}
1682 1387
1683/* 1388/*
1684 * 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
1685 * 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
1686 * 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
1687 * 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.
1688 */ 1393 */
1689
1690object * 1394object *
1691find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1692{ 1396{
1693 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1694 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1843 if (!dir) 1547 if (!dir)
1844 { 1548 {
1845 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!");
1846 return 0; 1550 return 0;
1847 } 1551 }
1552
1848 if (op->type == PLAYER) 1553 if (op->type == PLAYER)
1849 bow = op->contr->ranges[range_bow]; 1554 bow = op->contr->ranges[range_bow];
1850 else 1555 else
1851 { 1556 {
1852 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
… …
1860 { 1565 {
1861 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1862 return 0; 1567 return 0;
1863 } 1568 }
1864 } 1569 }
1570
1865 if (!bow->race || !bow->skill) 1571 if (!bow->race || !bow->skill)
1866 { 1572 {
1867 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);
1868 return 0; 1574 return 0;
1869 } 1575 }
… …
1871 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1577 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1872 1578
1873 /* penalize ROF for bestarrow */ 1579 /* penalize ROF for bestarrow */
1874 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1580 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1875 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1581 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1876 if (bowspeed < 1) 1583 if (bowspeed < 1)
1877 bowspeed = 1; 1584 bowspeed = 1;
1878 1585
1879 if (arrow == NULL) 1586 if (arrow == NULL)
1880 { 1587 {
… …
1883 if (op->type == PLAYER) 1590 if (op->type == PLAYER)
1884 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);
1885 /* 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 */
1886 else 1593 else
1887 CLEAR_FLAG (op, FLAG_READY_BOW); 1594 CLEAR_FLAG (op, FLAG_READY_BOW);
1595
1888 return 0; 1596 return 0;
1889 } 1597 }
1890 } 1598 }
1599
1891 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1600 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1892 if (mflags & P_OUT_OF_MAP) 1601 if (mflags & P_OUT_OF_MAP)
1893 {
1894 return 0; 1602 return 0;
1895 } 1603
1896 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1604 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1897 { 1605 {
1898 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.");
1899 return 0; 1607 return 0;
1900 } 1608 }
1901 1609
1902 /* this should not happen, but sometimes does */ 1610 /* this should not happen, but sometimes does */
1903 if (arrow->nrof == 0) 1611 if (arrow->nrof == 0)
1904 { 1612 {
1905 remove_ob (arrow); 1613 arrow->destroy ();
1906 free_object (arrow);
1907 return 0; 1614 return 0;
1908 } 1615 }
1909 1616
1910 left = arrow; /* these are arrows left to the player */ 1617 left = arrow; /* these are arrows left to the player */
1911 arrow = get_split_ob (arrow, 1); 1618 arrow = get_split_ob (arrow, 1);
1912 if (arrow == NULL) 1619 if (!arrow)
1913 { 1620 {
1914 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);
1915 return 0; 1622 return 0;
1916 } 1623 }
1917 set_owner (arrow, op); 1624
1625 arrow->set_owner (op);
1918 arrow->skill = bow->skill; 1626 arrow->skill = bow->skill;
1919
1920 arrow->direction = dir; 1627 arrow->direction = dir;
1921 arrow->x = sx;
1922 arrow->y = sy;
1923 1628
1924 if (op->type == PLAYER) 1629 if (op->type == PLAYER)
1925 { 1630 {
1926 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1631 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1927 fix_player (op); 1632 op->update_stats ();
1928 } 1633 }
1929 1634
1930 SET_ANIMATION (arrow, arrow->direction); 1635 SET_ANIMATION (arrow, arrow->direction);
1636
1931 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1637 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1932 arrow->stats.hp = arrow->stats.dam; 1638 arrow->stats.hp = arrow->stats.dam;
1933 arrow->stats.grace = arrow->attacktype; 1639 arrow->stats.grace = arrow->attacktype;
1640
1934 if (arrow->slaying != NULL) 1641 if (arrow->slaying)
1935 arrow->spellarg = strdup_local (arrow->slaying); 1642 arrow->spellarg = strdup (arrow->slaying);
1936 1643
1937 /* Note that this was different for monsters - they got their level 1644 arrow->stats.dam += op->stats.dam + arrow->magic;
1938 * added to the damage. I think the strength bonus is more proper.
1939 */
1940
1941 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1942 1645
1943 /* update the speed */ 1646 /* update the speed */
1944 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1647 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1945 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;
1946 1649
1947 if (arrow->speed < 1.0) 1650 arrow->set_speed (max (arrow->speed, 1.0));
1948 arrow->speed = 1.0;
1949 update_ob_speed (arrow);
1950 arrow->speed_left = 0; 1651 arrow->speed_left = 0;
1951 1652
1653 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654
1952 if (op->type == PLAYER) 1655 if (op->type == PLAYER)
1953 { 1656 {
1954 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1955 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1956 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1957
1958 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;
1959 } 1662 }
1960 else 1663 else
1961 { 1664 {
1962 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1963 arrow->level = op->level; 1665 arrow->level = op->level;
1964 } 1666 arrow->stats.wc -= bow->magic;
1965 1667
1966 if (arrow->attacktype == AT_PHYSICAL) 1668 if (!arrow->slaying)
1669 arrow->slaying = bow->slaying;
1670 }
1671
1672 arrow->stats.wc -= arrow->level;
1673
1967 arrow->attacktype |= bow->attacktype; 1674 arrow->attacktype |= bow->attacktype;
1968 1675
1969 if (bow->slaying != NULL)
1970 arrow->slaying = bow->slaying;
1971
1972 arrow->map = m;
1973 arrow->move_type = MOVE_FLY_LOW; 1676 arrow->move_type = MOVE_FLY_LOW;
1974 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1677 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1975 1678
1976 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);
1977 insert_ob_in_map (arrow, m, op, 0); 1680 m->insert (arrow, sx, sy, op);
1978 1681
1979 if (!arrow->destroyed ()) 1682 if (!arrow->destroyed ())
1980 move_arrow (arrow); 1683 move_arrow (arrow);
1981 1684
1982 if (op->type == PLAYER) 1685 if (op->type == PLAYER)
… …
2008 } 1711 }
2009 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)
2010 { 1713 {
2011 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1714 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
2012 wcmod = -1; 1715 wcmod = -1;
1716
2013 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);
2014 } 1718 }
2015 else if (op->contr->bowtype == bow_threewide) 1719 else if (op->contr->bowtype == bow_threewide)
2016 { 1720 {
2017 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);
… …
2087 1791
2088 if (item->arch) 1792 if (item->arch)
2089 { 1793 {
2090 CLEAR_FLAG (item, FLAG_ANIMATE); 1794 CLEAR_FLAG (item, FLAG_ANIMATE);
2091 item->face = item->arch->clone.face; 1795 item->face = item->arch->clone.face;
2092 item->speed = 0; 1796 item->set_speed (0);
2093 update_ob_speed (item);
2094 } 1797 }
1798
2095 if ((tmp = is_player_inv (item))) 1799 if ((tmp = item->in_player ()))
2096 esrv_update_item (UPD_ANIM, tmp, item); 1800 esrv_update_item (UPD_ANIM, tmp, item);
2097 } 1801 }
2098 } 1802 }
2099 else if (item->type == ROD || item->type == HORN) 1803 else if (item->type == ROD || item->type == HORN)
2100 {
2101 drain_rod_charge (item); 1804 drain_rod_charge (item);
2102 }
2103 } 1805 }
2104} 1806}
2105 1807
2106/* Received a fire command for the player - go and do it. 1808/* Received a fire command for the player - go and do it.
2107 */ 1809 */
… …
2130 case range_misc: 1832 case range_misc:
2131 fire_misc_object (op, dir); 1833 fire_misc_object (op, dir);
2132 return; 1834 return;
2133 1835
2134 case range_golem: /* Control summoned monsters from scrolls */ 1836 case range_golem: /* Control summoned monsters from scrolls */
2135 if (op->contr->ranges[range_golem] == NULL || op->contr->golem_count != op->contr->ranges[range_golem]->count)
2136 {
2137 op->contr->ranges[range_golem] = NULL;
2138 op->contr->shoottype = range_none;
2139 op->contr->golem_count = 0;
2140 }
2141 else
2142 control_golem (op->contr->ranges[range_golem], dir); 1837 control_golem (op->contr->ranges[range_golem], dir);
2143 return; 1838 return;
2144 1839
2145 case range_skill: 1840 case range_skill:
2146 if (!op->chosen_skill) 1841 if (!op->chosen_skill)
2147 { 1842 {
2148 if (op->type == PLAYER) 1843 if (op->type == PLAYER)
2149 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
2150 return; 1846 return;
2151 } 1847 }
1848
2152 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1849 do_skill (op, op, op->chosen_skill, dir, NULL);
2153 return; 1850 return;
2154 case range_builder: 1851 case range_builder:
2155 apply_map_builder (op, dir); 1852 apply_map_builder (op, dir);
2156 return; 1853 return;
2157 default: 1854 default:
2158 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1855 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2159 return; 1856 return;
2160 } 1857 }
2161} 1858}
2162
2163
2164 1859
2165/* find_key 1860/* find_key
2166 * 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
2167 * and successfully use it, we return the key, otherwise NULL 1862 * and successfully use it, we return the key, otherwise NULL
2168 * This function merges both normal and locked door, since the logic 1863 * This function merges both normal and locked door, since the logic
… …
2170 * pl is the player, 1865 * pl is the player,
2171 * inv is the objects inventory to searched 1866 * inv is the objects inventory to searched
2172 * door is the door we are trying to match against. 1867 * door is the door we are trying to match against.
2173 * This function can be called recursively to search containers. 1868 * This function can be called recursively to search containers.
2174 */ 1869 */
2175
2176object * 1870object *
2177find_key (object *pl, object *container, object *door) 1871find_key (object *pl, object *container, object *door)
2178{ 1872{
2179 object *tmp, *key; 1873 object *tmp, *key;
2180 1874
2181 /* Should not happen, but sanity checking is never bad */ 1875 /* Should not happen, but sanity checking is never bad */
2182 if (container->inv == NULL) 1876 if (!container->inv)
2183 return NULL; 1877 return 0;
2184 1878
2185 /* 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 */
2186 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1880 for (tmp = container->inv; tmp; tmp = tmp->below)
2187 { 1881 {
2188 if (door->type == DOOR && tmp->type == KEY) 1882 if (door->type == DOOR && tmp->type == KEY)
2189 break; 1883 break;
2190 /* For sanity, we should really check door type, but other stuff 1884 /* For sanity, we should really check door type, but other stuff
2191 * (like containers) can be locked with special keys 1885 * (like containers) can be locked with special keys
2192 */ 1886 */
2193 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1887 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2194 break; 1888 break;
2195 } 1889 }
1890
2196 /* No key found - lets search inventories now */ 1891 /* No key found - lets search inventories now */
2197 /* 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.
2198 * 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
2199 * a key, return 1894 * a key, return
2200 */ 1895 */
2201 if (!tmp) 1896 if (!tmp)
2202 { 1897 {
2203 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1898 for (tmp = container->inv; tmp; tmp = tmp->below)
2204 { 1899 {
2205 /* No reason to search empty containers */ 1900 /* No reason to search empty containers */
2206 if (tmp->type == CONTAINER && tmp->inv) 1901 if (tmp->type == CONTAINER && tmp->inv)
2207 { 1902 {
2208 if ((key = find_key (pl, tmp, door)) != NULL) 1903 if ((key = find_key (pl, tmp, door)))
2209 return key; 1904 return key;
2210 } 1905 }
2211 } 1906 }
1907
2212 if (!tmp) 1908 if (!tmp)
2213 return NULL; 1909 return NULL;
2214 } 1910 }
1911
2215 /* 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,
2216 * see if we actually want to use it 1913 * see if we actually want to use it
2217 */ 1914 */
2218 if (pl != container) 1915 if (pl != container)
2219 { 1916 {
… …
2240 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1937 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2241 "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));
2242 return NULL; 1939 return NULL;
2243 } 1940 }
2244 } 1941 }
1942
2245 return tmp; 1943 return tmp;
2246} 1944}
2247 1945
2248/* moved door processing out of move_player_attack. 1946/* moved door processing out of move_player_attack.
2249 * returns 1 if player has opened the door with a key 1947 * returns 1 if player has opened the door with a key
… …
2251 * 0 otherwise 1949 * 0 otherwise
2252 */ 1950 */
2253static int 1951static int
2254player_attack_door (object *op, object *door) 1952player_attack_door (object *op, object *door)
2255{ 1953{
2256
2257 /* 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,
2258 * 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 -
2259 * otherwise, we fall through to the rest of the code. 1956 * otherwise, we fall through to the rest of the code.
2260 */ 1957 */
2261 object *key = find_key (op, op, door); 1958 object *key = find_key (op, op, door);
… …
2268 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);
2269 if (action_makes_visible (op)) 1966 if (action_makes_visible (op))
2270 make_visible (op); 1967 make_visible (op);
2271 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1968 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2272 spring_trap (door->inv, op); 1969 spring_trap (door->inv, op);
1970
2273 if (door->type == DOOR) 1971 if (door->type == DOOR)
2274 {
2275 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 */
2276 }
2277 else if (door->type == LOCKED_DOOR) 1973 else if (door->type == LOCKED_DOOR)
2278 { 1974 {
2279 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));
2280 remove_door2 (door); /* remove door without violence ;-) */ 1976 remove_door2 (door); /* remove door without violence ;-) */
2281 } 1977 }
1978
2282 /* Do this after we print the message */ 1979 /* Do this after we print the message */
2283 decrease_ob (key); /* Use up one of the keys */ 1980 decrease_ob (key); /* Use up one of the keys */
2284 /* Need to update the weight the container the key was in */ 1981 /* Need to update the weight the container the key was in */
2285 if (container != op) 1982 if (container != op)
2286 esrv_update_item (UPD_WEIGHT, op, container); 1983 esrv_update_item (UPD_WEIGHT, op, container);
1984
2287 return 1; /* Nothing more to do below */ 1985 return 1; /* Nothing more to do below */
2288 } 1986 }
2289 else if (door->type == LOCKED_DOOR) 1987 else if (door->type == LOCKED_DOOR)
2290 { 1988 {
2291 /* Might as well return now - no other way to open this */ 1989 /* Might as well return now - no other way to open this */
2292 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1990 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2293 return 1; 1991 return 1;
2294 } 1992 }
1993
2295 return 0; 1994 return 0;
2296} 1995}
2297 1996
2298/* This function is just part of a breakup from move_player. 1997/* This function is just part of a breakup from move_player.
2299 * It should keep the code cleaner. 1998 * It should keep the code cleaner.
2300 * When this is called, the players direction has been updated 1999 * When this is called, the players direction has been updated
2301 * (taking into account confusion.) The player is also actually 2000 * (taking into account confusion.) The player is also actually
2302 * going to try and move (not fire weapons). 2001 * going to try and move (not fire weapons).
2303 */ 2002 */
2304
2305void 2003void
2306move_player_attack (object *op, int dir) 2004move_player_attack (object *op, int dir)
2307{ 2005{
2308 object *tmp, *mon; 2006 object *tmp, *mon;
2309 sint16 nx, ny; 2007 sint16 nx, ny;
… …
2311 maptile *m; 2009 maptile *m;
2312 2010
2313 nx = freearr_x[dir] + op->x; 2011 nx = freearr_x[dir] + op->x;
2314 ny = freearr_y[dir] + op->y; 2012 ny = freearr_y[dir] + op->y;
2315 2013
2316 on_battleground = op_on_battleground (op, NULL, NULL); 2014 on_battleground = op_on_battleground (op, 0, 0);
2317 2015
2318 /* 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
2319 * 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
2320 * 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
2321 * player. This is a pretty nasty hack, because if we could 2019 * player. This is a pretty nasty hack, because if we could
… …
2326 */ 2024 */
2327 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))
2328 { 2026 {
2329 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2027 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2330 { 2028 {
2331 m = get_map_from_coord (op->map, &nx, &ny); 2029 m = op->map->xy_find (nx, ny);
2332 if (!m) 2030 if (!m)
2333 return; /* Don't think this should happen */ 2031 return; /* Don't think this should happen */
2334 } 2032 }
2335 else 2033 else
2336 m = op->map; 2034 m = op->map;
2337 2035
2338 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2036 if (!(tmp = m->at (nx, ny).bot))
2339 {
2340 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2341 return; 2037 return;
2342 }
2343 2038
2344 mon = NULL; 2039 mon = 0;
2345 /* 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
2346 * 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.
2347 * 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
2348 * on the space 2043 * on the space
2349 */ 2044 */
2350 while (tmp != NULL) 2045 while (tmp)
2351 { 2046 {
2352 if (tmp == op) 2047 if (tmp == op)
2353 { 2048 {
2354 tmp = tmp->above; 2049 tmp = tmp->above;
2355 continue; 2050 continue;
2356 } 2051 }
2052
2357 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 2053 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2358 { 2054 {
2359 mon = tmp; 2055 mon = tmp;
2360 break; 2056 break;
2361 } 2057 }
2058
2362 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) 2059 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2363 mon = tmp; 2060 mon = tmp;
2061
2364 tmp = tmp->above; 2062 tmp = tmp->above;
2365 } 2063 }
2366 2064
2367 if (mon == NULL) /* This happens anytime the player tries to move */ 2065 if (!mon) /* This happens anytime the player tries to move */
2368 return; /* into a wall */ 2066 return; /* into a wall */
2369 2067
2370 if (mon->head != NULL) 2068 if (mon->head)
2371 mon = mon->head; 2069 mon = mon->head;
2372 2070
2373 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))
2374 if (player_attack_door (op, mon)) 2072 if (player_attack_door (op, mon))
2375 return; 2073 return;
… …
2387 * player owns it and it is either friendly or unagressive. 2085 * player owns it and it is either friendly or unagressive.
2388 */ 2086 */
2389 if ((op->type == PLAYER) 2087 if ((op->type == PLAYER)
2390#if COZY_SERVER 2088#if COZY_SERVER
2391 && 2089 &&
2392 ((get_owner (mon) && get_owner (mon)->contr 2090 ((mon->owner && mon->owner->contr
2393 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2091 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2394#else 2092#else
2395 && get_owner (mon) == op 2093 && mon->owner == op
2396#endif 2094#endif
2397 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2095 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2398 { 2096 {
2399 /* 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 */
2400 if (op->contr->braced) 2098 if (op->contr->braced)
2401 return; 2099 return;
2100
2402 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);
2403 (void) push_ob (mon, dir, op); 2102 (void) push_ob (mon, dir, op);
2404 if (op->contr->tmp_invis || op->hide) 2103 if (op->contr->tmp_invis || op->hide)
2405 make_visible (op); 2104 make_visible (op);
2105
2406 return; 2106 return;
2407 } 2107 }
2408 2108
2409 /* in certain circumstances, you shouldn't attack friendly 2109 /* in certain circumstances, you shouldn't attack friendly
2410 * creatures. Note that if you are braced, you can't push 2110 * creatures. Note that if you are braced, you can't push
… …
2412 * attack them either. 2112 * attack them either.
2413 */ 2113 */
2414 if ((mon->type == PLAYER || mon->enemy != op) && 2114 if ((mon->type == PLAYER || mon->enemy != op) &&
2415 (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)) && (
2416#ifdef PROHIBIT_PLAYERKILL 2116#ifdef PROHIBIT_PLAYERKILL
2417 (op->contr->peaceful 2117 (op->contr->peaceful
2418 || (mon->type == PLAYER 2118 || (mon->type == PLAYER
2419 && mon->contr-> 2119 && mon->contr->
2420 peaceful)) && 2120 peaceful)) &&
2421#else 2121#else
2422 op->contr->peaceful && 2122 op->contr->peaceful &&
2423#endif 2123#endif
2424 !on_battleground)) 2124 !on_battleground))
2425 { 2125 {
2426 if (!op->contr->braced) 2126 if (!op->contr->braced)
2427 { 2127 {
2428 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);
2429 (void) push_ob (mon, dir, op); 2129 push_ob (mon, dir, op);
2430 } 2130 }
2431 else 2131 else
2432 {
2433 new_draw_info (0, 0, op, "You withhold your attack"); 2132 new_draw_info (0, 0, op, "You withhold your attack");
2434 } 2133
2435 if (op->contr->tmp_invis || op->hide) 2134 if (op->contr->tmp_invis || op->hide)
2436 make_visible (op); 2135 make_visible (op);
2437 } 2136 }
2438 2137
2439 /* If the object is a boulder or other rollable object, then 2138 /* If the object is a boulder or other rollable object, then
… …
2450 * 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
2451 * and be living. Then, it must be one of the following: 2150 * and be living. Then, it must be one of the following:
2452 * 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
2453 * 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.
2454 */ 2153 */
2455
2456 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2457 ((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)))
2458 { 2156 {
2459 2157
2460 /* If the player hasn't hit something this tick, and does 2158 /* If the player hasn't hit something this tick, and does
… …
2467 op->speed_left += op->speed / op->contr->weapon_sp; 2165 op->speed_left += op->speed / op->contr->weapon_sp;
2468 2166
2469 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 */
2470 } 2168 }
2471 2169
2472 skill_attack (mon, op, 0, NULL, NULL); 2170 skill_attack (mon, op, 0, 0, 0);
2473 2171
2474 /* If attacking another player, that player gets automatic 2172 /* If attacking another player, that player gets automatic
2475 * hitback, and doesn't loose luck either. 2173 * hitback, and doesn't loose luck either.
2476 * Disable hitback on the battleground or if the target is 2174 * Disable hitback on the battleground or if the target is
2477 * the wiz. 2175 * the wiz.
… …
2479 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))
2480 { 2178 {
2481 short luck = mon->stats.luck; 2179 short luck = mon->stats.luck;
2482 2180
2483 mon->contr->has_hit = 1; 2181 mon->contr->has_hit = 1;
2484 skill_attack (op, mon, 0, NULL, NULL); 2182 skill_attack (op, mon, 0, 0, 0);
2485 mon->stats.luck = luck; 2183 mon->stats.luck = luck;
2486 } 2184 }
2185
2487 if (action_makes_visible (op)) 2186 if (action_makes_visible (op))
2488 make_visible (op); 2187 make_visible (op);
2489 } 2188 }
2490 } /* if player should attack something */ 2189 } /* if player should attack something */
2491} 2190}
… …
2493int 2192int
2494move_player (object *op, int dir) 2193move_player (object *op, int dir)
2495{ 2194{
2496 int pick; 2195 int pick;
2497 2196
2498 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2197 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2499 return 0; 2198 return 0;
2500 2199
2501 /* Sanity check: make sure dir is valid */ 2200 /* Sanity check: make sure dir is valid */
2502 if ((dir < 0) || (dir >= 9)) 2201 if ((dir < 0) || (dir >= 9))
2503 { 2202 {
2504 LOG (llevError, "move_player: invalid direction %d\n", dir); 2203 LOG (llevError, "move_player: invalid direction %d\n", dir);
2505 return 0; 2204 return 0;
2506 } 2205 }
2507 2206
2508 /* peterm: added following line */ 2207 /* peterm: added following line */
2509 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2208 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2510 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2209 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2511 2210
2512 op->facing = dir; 2211 op->facing = dir;
2513 2212
2514 if (op->hide) 2213 if (op->hide)
2515 do_hidden_move (op); 2214 do_hidden_move (op);
… …
2526 2225
2527 /* 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
2528 * server can handle repeat firing. 2227 * server can handle repeat firing.
2529 */ 2228 */
2530 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2229 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2531 {
2532 op->direction = dir; 2230 op->direction = dir;
2533 }
2534 else 2231 else
2535 {
2536 op->direction = 0; 2232 op->direction = 0;
2537 } 2233
2538 /* Update how the player looks. Use the facing, so direction may 2234 /* Update how the player looks. Use the facing, so direction may
2539 * get reset to zero. This allows for full animation capabilities 2235 * get reset to zero. This allows for full animation capabilities
2540 * for players. 2236 * for players.
2541 */ 2237 */
2542 animate_object (op, op->facing); 2238 animate_object (op, op->facing);
… …
2551 * Returns true if there are more actions we can do. 2247 * Returns true if there are more actions we can do.
2552 */ 2248 */
2553int 2249int
2554handle_newcs_player (object *op) 2250handle_newcs_player (object *op)
2555{ 2251{
2556 if (op->contr->hidden)
2557 {
2558 op->invisible = 1000;
2559 /* the socket code flashes the player visible/invisible
2560 * depending on the value of invisible, so we need to
2561 * alternate it here for it to work correctly.
2562 */
2563 if (pticks & 2)
2564 op->invisible--;
2565 }
2566 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2567 {
2568 op->invisible--;
2569 if (!op->invisible)
2570 {
2571 make_visible (op);
2572 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2573 }
2574 }
2575
2576 if (QUERY_FLAG (op, FLAG_SCARED)) 2252 if (QUERY_FLAG (op, FLAG_SCARED))
2577 { 2253 {
2578 flee_player (op); 2254 flee_player (op);
2579 /* 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 */
2580 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2581 { 2257 {
2582 op->speed_left--; 2258 op->speed_left--;
2583 return 0; 2259 return 0;
2584 } 2260 }
2585 }
2586
2587 /* I've been seeing crashes where the golem has been destroyed, but
2588 * the player object still points to the defunct golem. The code that
2589 * destroys the golem looks correct, and it doesn't always happen, so
2590 * put this in a a workaround to clean up the golem pointer.
2591 */
2592 if (op->contr->ranges[range_golem] &&
2593 ((op->contr->golem_count != op->contr->ranges[range_golem]->count) || QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)))
2594 {
2595 op->contr->ranges[range_golem] = NULL;
2596 op->contr->golem_count = 0;
2597 } 2261 }
2598 2262
2599 /* 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
2600 * the players time has been increased when doericserver has been 2264 * the players time has been increased when doericserver has been
2601 * called, so we recheck it here. 2265 * called, so we recheck it here.
2602 */ 2266 */
2603 HandleClient (&op->contr->socket, op->contr); 2267 if (op->contr->ns->handle_command ())
2268 return 1;
2269
2604 if (op->speed_left < 0) 2270 if (op->speed_left > 0)
2605 return 0; 2271 {
2606
2607 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2272 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2608 { 2273 {
2609 /* All move commands take 1 tick, at least for now */ 2274 /* All move commands take 1 tick, at least for now */
2610 op->speed_left--; 2275 op->speed_left--;
2611 2276
2612 /* Instead of all the stuff below, let move_player take care 2277 /* Instead of all the stuff below, let move_player take care
2613 * 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
2614 * there, as well as the confusion stuff. 2279 * there, as well as the confusion stuff.
2615 */ 2280 */
2616 move_player (op, op->direction); 2281 move_player (op, op->direction);
2617 if (op->speed_left > 0) 2282
2618 return 1; 2283 return op->speed_left > 0;
2619 else 2284 }
2620 return 0;
2621 } 2285 }
2286
2622 return 0; 2287 return 0;
2623} 2288}
2624 2289
2625int 2290int
2626save_life (object *op) 2291save_life (object *op)
2627{ 2292{
2628 object *tmp;
2629
2630 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2293 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2631 return 0; 2294 return 0;
2632 2295
2633 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2296 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2634 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2297 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2635 { 2298 {
2636 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);
2637 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));
2301
2638 if (op->contr) 2302 if (op->contr)
2639 esrv_del_item (op->contr, tmp->count); 2303 esrv_del_item (op->contr, tmp->count);
2640 remove_ob (tmp); 2304
2641 free_object (tmp); 2305 tmp->destroy ();
2642 CLEAR_FLAG (op, FLAG_LIFESAVE); 2306 CLEAR_FLAG (op, FLAG_LIFESAVE);
2307
2643 if (op->stats.hp < 0) 2308 if (op->stats.hp < 0)
2644 op->stats.hp = op->stats.maxhp; 2309 op->stats.hp = op->stats.maxhp;
2310
2645 if (op->stats.food < 0) 2311 if (op->stats.food < 0)
2646 op->stats.food = 999; 2312 op->stats.food = 999;
2647 fix_player (op); 2313
2314 op->update_stats ();
2648 return 1; 2315 return 1;
2649 } 2316 }
2317
2650 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2318 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2651 CLEAR_FLAG (op, FLAG_LIFESAVE); 2319 CLEAR_FLAG (op, FLAG_LIFESAVE);
2652 enter_player_savebed (op); /* bring him home. */ 2320 enter_player_savebed (op); /* bring him home. */
2653 return 0; 2321 return 0;
2654} 2322}
… …
2659 * from. 2327 * from.
2660 */ 2328 */
2661void 2329void
2662remove_unpaid_objects (object *op, object *env) 2330remove_unpaid_objects (object *op, object *env)
2663{ 2331{
2664 object *next;
2665
2666 while (op) 2332 while (op)
2667 { 2333 {
2668 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' */
2669 * we remove object 'op' 2335
2670 */
2671 if (QUERY_FLAG (op, FLAG_UNPAID)) 2336 if (QUERY_FLAG (op, FLAG_UNPAID))
2672 { 2337 {
2673 remove_ob (op);
2674 op->x = env->x;
2675 op->y = env->y;
2676 if (env->type == PLAYER) 2338 if (env->type == PLAYER)
2677 esrv_del_item (env->contr, op->count); 2339 esrv_del_item (env->contr, op->count);
2678 insert_ob_in_map (op, env->map, NULL, 0); 2340
2341 op->insert_at (env);
2679 } 2342 }
2680 else if (op->inv) 2343 else if (op->inv)
2681 remove_unpaid_objects (op->inv, env); 2344 remove_unpaid_objects (op->inv, env);
2345
2682 op = next; 2346 op = next;
2683 } 2347 }
2684} 2348}
2685
2686 2349
2687/* 2350/*
2688 * Returns pointer a static string containing gravestone text 2351 * Returns pointer a static string containing gravestone text
2689 * Moved from apply.c to player.c - player.c is what 2352 * Moved from apply.c to player.c - player.c is what
2690 * actually uses this function. player.c may not be quite the 2353 * actually uses this function. player.c may not be quite the
… …
2701 strcpy (buf2, " R.I.P.\n\n"); 2364 strcpy (buf2, " R.I.P.\n\n");
2702 if (op->type == PLAYER) 2365 if (op->type == PLAYER)
2703 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2366 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2704 else 2367 else
2705 sprintf (buf, "%s\n", &op->name); 2368 sprintf (buf, "%s\n", &op->name);
2369
2706 strncat (buf2, " ", 20 - strlen (buf) / 2); 2370 strncat (buf2, " ", 20 - strlen (buf) / 2);
2707 strcat (buf2, buf); 2371 strcat (buf2, buf);
2708 if (op->type == PLAYER) 2372 if (op->type == PLAYER)
2709 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);
2710 else 2374 else
2711 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
2712 strncat (buf2, " ", 20 - strlen (buf) / 2); 2377 strncat (buf2, " ", 20 - strlen (buf) / 2);
2713 strcat (buf2, buf); 2378 strcat (buf2, buf);
2714 if (op->type == PLAYER) 2379 if (op->type == PLAYER)
2715 { 2380 {
2716 sprintf (buf, "by %s.\n\n", op->contr->killer); 2381 sprintf (buf, "by %s.\n\n", op->contr->killer);
2717 strncat (buf2, " ", 21 - strlen (buf) / 2); 2382 strncat (buf2, " ", 21 - strlen (buf) / 2);
2718 strcat (buf2, buf); 2383 strcat (buf2, buf);
2719 } 2384 }
2385
2720 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2386 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2721 strncat (buf2, " ", 20 - strlen (buf) / 2); 2387 strncat (buf2, " ", 20 - strlen (buf) / 2);
2722 strcat (buf2, buf); 2388 strcat (buf2, buf);
2389
2723 return buf2; 2390 return buf2;
2724} 2391}
2725
2726
2727 2392
2728void 2393void
2729do_some_living (object *op) 2394do_some_living (object *op)
2730{ 2395{
2731 int last_food = op->stats.food; 2396 int last_food = op->stats.food;
… …
2737 int rate_grace = 2000; 2402 int rate_grace = 2000;
2738 const int max_hp = 1; 2403 const int max_hp = 1;
2739 const int max_sp = 1; 2404 const int max_sp = 1;
2740 const int max_grace = 1; 2405 const int max_grace = 1;
2741 2406
2742 if (op->contr->outputs_sync) 2407 if (op->contr->hidden)
2743 {
2744 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2745 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2746 flush_output_element (op, &op->contr->outputs[i]);
2747 } 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 }
2748 2425
2749 if (op->contr->state == ST_PLAYING) 2426 if (op->contr->ns->state == ST_PLAYING)
2750 { 2427 {
2751
2752 /* these next three if clauses make it possible to SLOW DOWN 2428 /* these next three if clauses make it possible to SLOW DOWN
2753 hp/grace/spellpoint regeneration. */ 2429 hp/grace/spellpoint regeneration. */
2754 if (op->contr->gen_hp >= 0) 2430 if (op->contr->gen_hp >= 0)
2755 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2431 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2756 else 2432 else
2757 { 2433 {
2758 gen_hp = op->stats.maxhp; 2434 gen_hp = op->stats.maxhp;
2759 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2435 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2760 } 2436 }
2437
2761 if (op->contr->gen_sp >= 0) 2438 if (op->contr->gen_sp >= 0)
2762 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2439 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2763 else 2440 else
2764 { 2441 {
2765 gen_sp = op->stats.maxsp; 2442 gen_sp = op->stats.maxsp;
2766 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2443 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2767 } 2444 }
2445
2768 if (op->contr->gen_grace >= 0) 2446 if (op->contr->gen_grace >= 0)
2769 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2447 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2770 else 2448 else
2771 { 2449 {
2772 gen_grace = op->stats.maxgrace; 2450 gen_grace = op->stats.maxgrace;
2773 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2774 } 2452 }
2775 2453
2776 /* Regenerate Spell Points */ 2454 /* Regenerate Spell Points */
2777 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2778 { 2456 {
2779 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);
2780 if (op->stats.sp < op->stats.maxsp) 2458 if (op->stats.sp < op->stats.maxsp)
2781 { 2459 {
2782 op->stats.sp++; 2460 op->stats.sp++;
… …
2788 op->stats.food += op->contr->digestion; 2466 op->stats.food += op->contr->digestion;
2789 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))
2790 op->stats.food = last_food; 2468 op->stats.food = last_food;
2791 } 2469 }
2792 } 2470 }
2471
2793 if (max_sp > 1) 2472 if (max_sp > 1)
2794 { 2473 {
2795 over_sp = (gen_sp + 10) / rate_sp; 2474 over_sp = (gen_sp + 10) / rate_sp;
2796 if (over_sp > 0) 2475 if (over_sp > 0)
2797 { 2476 {
2798 if (op->stats.sp < op->stats.maxsp) 2477 if (op->stats.sp < op->stats.maxsp)
2799 { 2478 {
2800 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2479 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2480
2801 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))
2802 op->stats.sp--; 2482 op->stats.sp--;
2483
2803 if (op->stats.sp > op->stats.maxsp) 2484 if (op->stats.sp > op->stats.maxsp)
2804 op->stats.sp = op->stats.maxsp; 2485 op->stats.sp = op->stats.maxsp;
2805 } 2486 }
2806 op->last_sp = 0; 2487 op->last_sp = 0;
2807 } 2488 }
2808 else 2489 else
2809 {
2810 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);
2811 }
2812 } 2491 }
2813 else 2492 else
2814 {
2815 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);
2816 }
2817 } 2494 }
2818 2495
2819 /* Regenerate Grace */ 2496 /* Regenerate Grace */
2820 /* 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. */
2821 if (--op->last_grace < 0) 2498 if (--op->last_grace < 0)
2822 { 2499 {
2823 if (op->stats.grace < op->stats.maxgrace / 2) 2500 if (op->stats.grace < op->stats.maxgrace / 2)
2824 op->stats.grace++; /* no penalty in food for regaining grace */ 2501 op->stats.grace++; /* no penalty in food for regaining grace */
2502
2825 if (max_grace > 1) 2503 if (max_grace > 1)
2826 { 2504 {
2827 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2505 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2828 if (over_grace > 0) 2506 if (over_grace > 0)
2829 { 2507 {
… …
2857 op->stats.food += op->contr->digestion; 2535 op->stats.food += op->contr->digestion;
2858 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))
2859 op->stats.food = last_food; 2537 op->stats.food = last_food;
2860 } 2538 }
2861 } 2539 }
2540
2862 if (max_hp > 1) 2541 if (max_hp > 1)
2863 { 2542 {
2864 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2543 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2865 if (over_hp > 0) 2544 if (over_hp > 0)
2866 { 2545 {
… …
2890 2569
2891 if (op->contr->gen_hp > 0) 2570 if (op->contr->gen_hp > 0)
2892 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);
2893 else 2572 else
2894 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2573 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2574
2895 /* dms do not consume food */ 2575 /* dms do not consume food */
2896 if (!QUERY_FLAG (op, FLAG_WIZ)) 2576 if (!QUERY_FLAG (op, FLAG_WIZ))
2897 op->stats.food--; 2577 op->stats.food--;
2898 } 2578 }
2899 }
2900 2579
2901 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2580 if (op->stats.food < 0 && op->stats.hp >= 0)
2902 { 2581 {
2903 object *tmp, *flesh = NULL; 2582 object *tmp, *flesh = 0;
2904 2583
2905 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2584 for (tmp = op->inv; tmp; tmp = tmp->below)
2906 { 2585 {
2907 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2586 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2908 {
2909 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2910 { 2587 {
2588 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2589 {
2911 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.");
2912 manual_apply (op, tmp, 0); 2591 manual_apply (op, tmp, 0);
2913 if (op->stats.food >= 0 || op->stats.hp < 0) 2592 if (op->stats.food >= 0 || op->stats.hp < 0)
2914 break; 2593 break;
2915 } 2594 }
2916 else if (tmp->type == FLESH) 2595 else if (tmp->type == FLESH)
2917 flesh = tmp; 2596 flesh = tmp;
2918 } /* End if paid for object */ 2597 } /* End if paid for object */
2919 } /* end of for loop */ 2598 } /* end of for loop */
2599
2920 /* 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
2921 * eat flesh instead. 2601 * eat flesh instead.
2922 */ 2602 */
2923 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2603 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2924 { 2604 {
2925 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.");
2926 manual_apply (op, flesh, 0); 2606 manual_apply (op, flesh, 0);
2927 } 2607 }
2928 } /* end if player is starving */ 2608 }
2929 2609
2930 while (op->stats.food < 0 && op->stats.hp > 0) 2610 while (op->stats.food < 0 && op->stats.hp >= 0)
2931 op->stats.food++, op->stats.hp--; 2611 op->stats.food++, op->stats.hp--;
2932 2612
2933 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))
2934 kill_player (op); 2614 kill_player (op);
2615 }
2935} 2616}
2936
2937
2938 2617
2939/* 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.
2940 * 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
2941 * permadeath, no lifesave), this will take care of removing the player 2620 * permadeath, no lifesave), this will take care of removing the player
2942 * file. 2621 * file.
… …
2972 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!");
2973 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...");
2974 2653
2975 /* restore player */ 2654 /* restore player */
2976 at = archetype::find ("poisoning"); 2655 at = archetype::find ("poisoning");
2977 tmp = present_arch_in_ob (at, op); 2656 if (object *tmp = present_arch_in_ob (at, op))
2978 if (tmp)
2979 { 2657 {
2980 remove_ob (tmp); 2658 tmp->destroy ();
2981 free_object (tmp);
2982 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2659 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2983 } 2660 }
2984 2661
2985 at = archetype::find ("confusion"); 2662 at = archetype::find ("confusion");
2986 tmp = present_arch_in_ob (at, op); 2663 if (object *tmp = present_arch_in_ob (at, op))
2987 if (tmp)
2988 { 2664 {
2989 remove_ob (tmp); 2665 tmp->destroy ();
2990 free_object (tmp);
2991 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2666 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2992 } 2667 }
2993 2668
2994 cure_disease (op, 0); /* remove any disease */ 2669 cure_disease (op, 0); /* remove any disease */
2995 op->stats.hp = op->stats.maxhp; 2670 op->stats.hp = op->stats.maxhp;
2996 if (op->stats.food <= 0) 2671 if (op->stats.food <= 0)
2997 op->stats.food = 999; 2672 op->stats.food = 999;
2998 2673
2999 /* create a bodypart-trophy to make the winner happy */ 2674 /* create a bodypart-trophy to make the winner happy */
3000 tmp = arch_to_object (archetype::find ("finger")); 2675 if (object *tmp = arch_to_object (archetype::find ("finger")))
3001 if (tmp != NULL)
3002 { 2676 {
3003 sprintf (buf, "%s's finger", &op->name); 2677 sprintf (buf, "%s's finger", &op->name);
3004 tmp->name = buf; 2678 tmp->name = buf;
3005 sprintf (buf, " This finger has been cut off %s\n" 2679 sprintf (buf, " This finger has been cut off %s\n"
3006 " 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",
3007 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2681 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
3008 tmp->msg = buf; 2682 tmp->msg = buf;
3009 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2683 tmp->value = 0, tmp->type = 0;
3010 tmp->materialname = NULL; 2684 tmp->materialname = "organics";
3011 tmp->x = op->x, tmp->y = op->y; 2685 tmp->insert_at (op, tmp);
3012 insert_ob_in_map (tmp, op->map, op, 0);
3013 } 2686 }
3014 2687
3015 /* teleport defeated player to new destination */ 2688 /* teleport defeated player to new destination */
3016 transfer_ob (op, x, y, 0, NULL); 2689 transfer_ob (op, x, y, 0, NULL);
3017 op->contr->braced = 0; 2690 op->contr->braced = 0;
… …
3022 2695
3023 command_kill_pets (op, 0); 2696 command_kill_pets (op, 0);
3024 2697
3025 if (op->stats.food < 0) 2698 if (op->stats.food < 0)
3026 { 2699 {
3027 if (op->contr->explore)
3028 {
3029 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
3030 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3031 op->stats.food = 999;
3032 return;
3033 }
3034 sprintf (buf, "%s starved to death.", &op->name); 2700 sprintf (buf, "%s starved to death.", &op->name);
3035 strcpy (op->contr->killer, "starvation"); 2701 strcpy (op->contr->killer, "starvation");
3036 } 2702 }
3037 else 2703 else
3038 {
3039 if (op->contr->explore)
3040 {
3041 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
3042 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3043 op->stats.hp = op->stats.maxhp;
3044 return;
3045 }
3046 sprintf (buf, "%s died.", &op->name); 2704 sprintf (buf, "%s died.", &op->name);
3047 } 2705
3048 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2706 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3049 2707
3050 /* save the map location for corpse, gravestone */ 2708 /* save the map location for corpse, gravestone */
3051 x = op->x; 2709 x = op->x;
3052 y = op->y; 2710 y = op->y;
3053 map = op->map; 2711 map = op->map;
3054 2712
3055
3056 if (settings.not_permadeth == TRUE)
3057 {
3058 /* NOT_PERMADEATH code. This basically brings the character back to 2713 /* NOT_PERMADEATH code. This basically brings the character back to
3059 * 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.
3060 * 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.
3061 */ 2716 */
3062 2717
3063 /* Basically two ways to go - remove a stat permanently, or just 2718 /* Basically two ways to go - remove a stat permanently, or just
3064 * make it depletion. This bunch of code deals with that aspect 2719 * make it depletion. This bunch of code deals with that aspect
3065 * of death. 2720 * of death.
3066 */ 2721 */
3067#ifndef COZY_SERVER 2722#ifndef COZY_SERVER
3068 if (settings.balanced_stat_loss) 2723 if (settings.balanced_stat_loss)
3069 { 2724 {
3070 /* If stat loss is permanent, lose one stat only. */ 2725 /* If stat loss is permanent, lose one stat only. */
3071 /* 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
3072 more if they do. */ 2727 more if they do. */
3073 /* Higher level characters can afford things such as potions of 2728 /* Higher level characters can afford things such as potions of
3074 restoration, or better, stat potions. So we slug them that 2729 restoration, or better, stat potions. So we slug them that
3075 little bit harder. */ 2730 little bit harder. */
3076 /* GD */ 2731 /* GD */
3077 if (settings.stat_loss_on_death) 2732 if (settings.stat_loss_on_death)
3078 num_stats_lose = 1; 2733 num_stats_lose = 1;
3079 else
3080 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3081 }
3082 else 2734 else
3083 { 2735 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2736 }
2737 else
3084 num_stats_lose = 1; 2738 num_stats_lose = 1;
3085 } 2739
3086 lost_a_stat = 0; 2740 lost_a_stat = 0;
3087 2741
3088 for (z = 0; z < num_stats_lose; z++) 2742 for (z = 0; z < num_stats_lose; z++)
3089 { 2743 {
3090 i = RANDOM () % NUM_STATS; 2744 i = RANDOM () % NUM_STATS;
3091 2745
3092 if (settings.stat_loss_on_death) 2746 if (settings.stat_loss_on_death)
3093 { 2747 {
3094 /* 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
3095 * what he lost. 2749 * what he lost.
3096 */ 2750 */
3097 change_attr_value (&(op->stats), i, -1); 2751 change_attr_value (&(op->stats), i, -1);
3098 check_stat_bounds (&(op->stats)); 2752 check_stat_bounds (&(op->stats));
3099 change_attr_value (&(op->contr->orig_stats), i, -1); 2753 change_attr_value (&(op->contr->orig_stats), i, -1);
3100 check_stat_bounds (&(op->contr->orig_stats)); 2754 check_stat_bounds (&(op->contr->orig_stats));
3101 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2755 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3102 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);
3103 } 2769 }
3104 else 2770 lose_this_stat = 1;
2771 if (settings.balanced_stat_loss)
3105 { 2772 {
3106 /* deplete a stat */ 2773 /* GD */
3107 archetype *deparch = archetype::find ("depletion"); 2774 /* Get the stat that we're about to deplete. */
3108 object *dep; 2775 this_stat = get_attr_value (&(dep->stats), i);
3109 2776 if (this_stat < 0)
3110 dep = present_arch_in_ob (deparch, op);
3111 if (!dep)
3112 { 2777 {
3113 dep = arch_to_object (deparch); 2778 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3114 insert_ob_in_ob (dep, op); 2779 int keep_chance = this_stat * this_stat;
3115 } 2780
3116 lose_this_stat = 1; 2781 /* Yes, I am paranoid. Sue me. */
3117 if (settings.balanced_stat_loss)
3118 {
3119 /* GD */
3120 /* Get the stat that we're about to deplete. */
3121 this_stat = get_attr_value (&(dep->stats), i);
3122 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)
3123 { 2787 {
3124 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3125 int keep_chance = this_stat * this_stat;
3126
3127 /* Yes, I am paranoid. Sue me. */
3128 if (keep_chance < 1)
3129 keep_chance = 1;
3130
3131 /* There is a maximum depletion total per level. */
3132 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3133 {
3134 lose_this_stat = 0; 2788 lose_this_stat = 0;
3135 /* Take loss chance vs keep chance to see if we 2789 /* Take loss chance vs keep chance to see if we
3136 retain the stat. */ 2790 retain the stat. */
3137 }
3138 else
3139 {
3140 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3141 lose_this_stat = 0;
3142 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3143 this_stat, keep_chance, loss_chance,
3144 lose_this_stat?"LOSE":"KEEP"); */
3145 }
3146 } 2791 }
3147 }
3148
3149 if (lose_this_stat)
3150 {
3151 this_stat = get_attr_value (&(dep->stats), i);
3152 /* We could try to do something clever like find another
3153 * stat to reduce if this fails. But chances are, if
3154 * stats have been depleted to -50, all are pretty low
3155 * and should be roughly the same, so it shouldn't make a
3156 * difference.
3157 */ 2792 else
3158 if (this_stat >= -50)
3159 { 2793 {
3160 change_attr_value (&(dep->stats), i, -1); 2794 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3161 SET_FLAG (dep, FLAG_APPLIED);
3162 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3163 fix_player (op);
3164 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"); */
3165 } 2799 }
3166 } 2800 }
3167 } 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 }
3168 } 2820 }
2821 }
2822 }
3169 /* If no stat lost, tell the player. */ 2823 /* If no stat lost, tell the player. */
3170 if (!lost_a_stat) 2824 if (!lost_a_stat)
3171 { 2825 {
3172 /* determine_god() seems to not work sometimes... why is this? 2826 /* determine_god() seems to not work sometimes... why is this?
3173 Should I be using something else? GD */ 2827 Should I be using something else? GD */
3174 const char *god = determine_god (op); 2828 const char *god = determine_god (op);
3175 2829
3176 if (god && (strcmp (god, "none"))) 2830 if (god && (strcmp (god, "none")))
3177 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);
3178 else 2832 else
3179 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.");
3180 } 2834 }
2835#else
2836 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3181#endif 2837#endif
3182 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3183 2838
3184 /* Put a gravestone up where the character 'almost' died. List the 2839 /* Put a gravestone up where the character 'almost' died. List the
3185 * exp loss on the stone. 2840 * exp loss on the stone.
3186 */ 2841 */
3187 tmp = arch_to_object (archetype::find ("gravestone")); 2842 tmp = arch_to_object (archetype::find ("gravestone"));
3188 sprintf (buf, "%s's gravestone", &op->name); 2843 sprintf (buf, "%s's gravestone", &op->name);
3189 tmp->name = buf; 2844 tmp->name = buf;
3190 sprintf (buf, "%s's gravestones", &op->name); 2845 sprintf (buf, "%s's gravestones", &op->name);
3191 tmp->name_pl = buf; 2846 tmp->name_pl = buf;
3192 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);
3193 tmp->msg = buf; 2848 tmp->msg = buf;
3194 tmp->x = op->x, tmp->y = op->y; 2849 tmp->x = op->x, tmp->y = op->y;
3195 insert_ob_in_map (tmp, op->map, NULL, 0); 2850 insert_ob_in_map (tmp, op->map, NULL, 0);
3196 2851
3197 /**************************************/ 2852 /**************************************/
3198 /* */ 2853 /* */
3199 /* Subtract the experience points, */ 2854 /* Subtract the experience points, */
3200 /* if we died cause of food, give us */ 2855 /* if we died cause of food, give us */
3201 /* food, and reset HP's... */ 2856 /* food, and reset HP's... */
3202 /* */ 2857 /* */
3203
3204 /**************************************/ 2858 /**************************************/
3205 2859
3206 /* remove any poisoning and confusion the character may be suffering. */ 2860 /* remove any poisoning and confusion the character may be suffering. */
3207 /* restore player */ 2861 /* restore player */
3208 at = archetype::find ("poisoning"); 2862 at = archetype::find ("poisoning");
3209 tmp = present_arch_in_ob (at, op); 2863 tmp = present_arch_in_ob (at, op);
2864
3210 if (tmp) 2865 if (tmp)
3211 { 2866 {
3212 remove_ob (tmp); 2867 tmp->destroy ();
3213 free_object (tmp);
3214 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2868 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3215 } 2869 }
3216 2870
3217 at = archetype::find ("confusion"); 2871 at = archetype::find ("confusion");
3218 tmp = present_arch_in_ob (at, op); 2872 tmp = present_arch_in_ob (at, op);
3219 if (tmp) 2873 if (tmp)
3220 { 2874 {
3221 remove_ob (tmp); 2875 tmp->destroy ();
3222 free_object (tmp);
3223 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2876 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3224 } 2877 }
2878
3225 cure_disease (op, 0); /* remove any disease */ 2879 cure_disease (op, 0); /* remove any disease */
3226 2880
3227 /*add_exp(op, (op->stats.exp * -0.20)); */ 2881 /*add_exp(op, (op->stats.exp * -0.20)); */
3228 apply_death_exp_penalty (op); 2882 apply_death_exp_penalty (op);
3229 if (op->stats.food < 100) 2883 if (op->stats.food < 100)
3230 op->stats.food = 900; 2884 op->stats.food = 900;
3231 op->stats.hp = op->stats.maxhp; 2885 op->stats.hp = op->stats.maxhp;
3232 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2886 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3233 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2887 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3234 2888
3235 /* 2889 /*
3236 * 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
3237 * the player has any unpaid items. If so, remove them and put them back 2891 * and put them back in the map.
3238 * in the map. 2892 */
3239 */
3240
3241 if (is_in_shop (op))
3242 remove_unpaid_objects (op->inv, op); 2893 remove_unpaid_objects (op->inv, op);
3243 2894
3244 /****************************************/ 2895 /****************************************/
3245 /* */ 2896 /* */
3246 /* Move player to his current respawn- */ 2897 /* Move player to his current respawn- */
3247 /* position (usually last savebed) */ 2898 /* position (usually last savebed) */
3248 /* */ 2899 /* */
3249
3250 /****************************************/ 2900 /****************************************/
3251 2901
3252 enter_player_savebed (op); 2902 enter_player_savebed (op);
3253 2903
3254 /* Save the player before inserting the force to reduce
3255 * chance of abuse.
3256 */
3257 op->contr->braced = 0; 2904 op->contr->braced = 0;
3258 save_player (op, 1);
3259 2905
3260 /* it is possible that the player has blown something up 2906 /* it is possible that the player has blown something up
3261 * at his savebed location, and that can have long lasting 2907 * at his savebed location, and that can have long lasting
3262 * spell effects. So first see if there is a spell effect 2908 * spell effects. So first see if there is a spell effect
3263 * on the space that might harm the player. 2909 * on the space that might harm the player.
3264 */ 2910 */
3265 will_kill_again = 0; 2911 will_kill_again = 0;
3266 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)
3267 {
3268 if (tmp->type == SPELL_EFFECT) 2913 if (tmp->type == SPELL_EFFECT)
3269 will_kill_again |= tmp->attacktype; 2914 will_kill_again |= tmp->attacktype;
3270 } 2915
3271 if (will_kill_again) 2916 if (will_kill_again)
3272 { 2917 {
3273 object *force; 2918 object *force;
3274 int at; 2919 int at;
3275 2920
3276 force = get_archetype (FORCE_NAME); 2921 force = get_archetype (FORCE_NAME);
3277 /* 50 ticks should be enough time for the spell to abate */ 2922 /* 50 ticks should be enough time for the spell to abate */
3278 force->speed = 0.1; 2923 force->speed = 0.1;
3279 force->speed_left = -5.0; 2924 force->speed_left = -5.0;
3280 SET_FLAG (force, FLAG_APPLIED); 2925 SET_FLAG (force, FLAG_APPLIED);
3281 for (at = 0; at < NROFATTACKS; at++) 2926 for (at = 0; at < NROFATTACKS; at++)
3282 {
3283 if (will_kill_again & (1 << at)) 2927 if (will_kill_again & (1 << at))
3284 force->resist[at] = 100; 2928 force->resist[at] = 100;
3285 } 2929
3286 insert_ob_in_ob (force, op); 2930 insert_ob_in_ob (force, op);
3287 fix_player (op); 2931 op->update_stats ();
3288 2932
3289 } 2933 }
3290 2934
3291 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2935 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3292 return;
3293 } /* NOT_PERMADETH */
3294 else
3295 {
3296 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3297 * should probably be embedded in an else statement.
3298 */
3299
3300 op->contr->party = NULL;
3301 if (settings.set_title == TRUE)
3302 op->contr->own_title[0] = '\0';
3303 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3304 check_score (op);
3305 if (op->contr->ranges[range_golem] != NULL)
3306 {
3307 remove_friendly_object (op->contr->ranges[range_golem]);
3308 remove_ob (op->contr->ranges[range_golem]);
3309 free_object (op->contr->ranges[range_golem]);
3310 op->contr->ranges[range_golem] = NULL;
3311 op->contr->golem_count = 0;
3312 }
3313 loot_object (op); /* Remove some of the items for good */
3314 remove_ob (op);
3315 op->direction = 0;
3316
3317 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3318 {
3319 delete_character (op->name, 0);
3320 if (settings.resurrection == TRUE)
3321 {
3322 /* save playerfile sans equipment when player dies
3323 ** then save it as player.pl.dead so that future resurrection
3324 ** type spells will work on them nicely
3325 */
3326 delete_character (op->name, 0);
3327 op->stats.hp = op->stats.maxhp;
3328 op->stats.food = 999;
3329
3330 /* set the location of where the person will reappear when */
3331 /* maybe resurrection code should fix map also */
3332 strcpy (op->contr->maplevel, settings.emergency_mapname);
3333 if (op->map != NULL)
3334 op->map = NULL;
3335 op->x = settings.emergency_x;
3336 op->y = settings.emergency_y;
3337 save_player (op, 0);
3338 op->map = map;
3339 /* please see resurrection.c: peterm */
3340 dead_player (op);
3341 }
3342 else
3343 delete_character (op->name, 1);
3344 }
3345
3346 play_again (op);
3347
3348 /* peterm: added to create a corpse at deathsite. */
3349 tmp = arch_to_object (archetype::find ("corpse_pl"));
3350 sprintf (buf, "%s", &op->name);
3351 tmp->name = tmp->name_pl = buf;
3352 tmp->level = op->level;
3353 tmp->x = x;
3354 tmp->y = y;
3355 tmp->msg = gravestone_text (op);
3356 SET_FLAG (tmp, FLAG_UNIQUE);
3357 insert_ob_in_map (tmp, map, NULL, 0);
3358 }
3359} 2936}
3360
3361 2937
3362void 2938void
3363loot_object (object *op) 2939loot_object (object *op)
3364{ /* Grab and destroy some treasure */ 2940{ /* Grab and destroy some treasure */
3365 object *tmp, *tmp2, *next; 2941 object *tmp, *tmp2, *next;
3366 2942
3367 if (op->container) 2943 op->close_container (); /* close open sack first */
3368 { /* close open sack first */
3369 esrv_apply_container (op, op->container);
3370 }
3371 2944
3372 for (tmp = op->inv; tmp != NULL; tmp = next) 2945 for (tmp = op->inv; tmp; tmp = next)
3373 { 2946 {
3374 next = tmp->below; 2947 next = tmp->below;
3375 if (tmp->type == EXPERIENCE || tmp->invisible) 2948
2949 if (tmp->invisible)
3376 continue; 2950 continue;
3377 remove_ob (tmp); 2951
2952 tmp->remove ();
3378 tmp->x = op->x, tmp->y = op->y; 2953 tmp->x = op->x, tmp->y = op->y;
2954
3379 if (tmp->type == CONTAINER) 2955 if (tmp->type == CONTAINER)
3380 { /* empty container to ground */ 2956 loot_object (tmp); /* empty container to ground */
3381 loot_object (tmp); 2957
3382 }
3383 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))))
3384 { 2959 {
3385 if (tmp->nrof > 1) 2960 if (tmp->nrof > 1)
3386 { 2961 {
3387 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2962 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3388 free_object (tmp2); 2963 tmp2->destroy ();
3389 insert_ob_in_map (tmp, op->map, NULL, 0); 2964 insert_ob_in_map (tmp, op->map, NULL, 0);
3390 } 2965 }
3391 else 2966 else
3392 free_object (tmp); 2967 tmp->destroy ();
3393 } 2968 }
3394 else 2969 else
3395 insert_ob_in_map (tmp, op->map, NULL, 0); 2970 insert_ob_in_map (tmp, op->map, NULL, 0);
3396 } 2971 }
3397} 2972}
… …
3399/* 2974/*
3400 * fix_weight(): Check recursively the weight of all players, and fix 2975 * fix_weight(): Check recursively the weight of all players, and fix
3401 * 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
3402 * was changed. 2977 * was changed.
3403 */ 2978 */
3404
3405void 2979void
3406fix_weight (void) 2980fix_weight (void)
3407{ 2981{
3408 player *pl; 2982 for_all_players (pl)
3409
3410 for (pl = first_player; pl != NULL; pl = pl->next)
3411 { 2983 {
3412 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2984 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3413 2985
3414 if (old == sum) 2986 if (old == sum)
3415 continue; 2987 continue;
3416 fix_player (pl->ob); 2988 pl->ob->update_stats ();
3417 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);
3418 } 2990 }
3419} 2991}
3420 2992
3421void 2993void
3422fix_luck (void) 2994fix_luck (void)
3423{ 2995{
3424 player *pl; 2996 for_all_players (pl)
3425
3426 for (pl = first_player; pl != NULL; pl = pl->next)
3427 if (!pl->ob->contr->state) 2997 if (!pl->ob->contr->ns->state)
3428 change_luck (pl->ob, 0); 2998 pl->ob->change_luck (0);
3429} 2999}
3430
3431 3000
3432/* cast_dust() - handles op throwing objects of type 'DUST'. 3001/* cast_dust() - handles op throwing objects of type 'DUST'.
3433 * This is much simpler in the new spell code - we basically 3002 * This is much simpler in the new spell code - we basically
3434 * just treat this as any other spell casting object. 3003 * just treat this as any other spell casting object.
3435 */ 3004 */
3436
3437void 3005void
3438cast_dust (object *op, object *throw_ob, int dir) 3006cast_dust (object *op, object *throw_ob, int dir)
3439{ 3007{
3440 object *skop, *spob; 3008 object *skop, *spob;
3441 3009
… …
3462 if (op->type == PLAYER) 3030 if (op->type == PLAYER)
3463 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 3031 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3464 3032
3465 cast_spell (op, throw_ob, dir, spob, NULL); 3033 cast_spell (op, throw_ob, dir, spob, NULL);
3466 3034
3467 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3035 throw_ob->destroy ();
3468 remove_ob (throw_ob);
3469 free_object (throw_ob);
3470} 3036}
3471 3037
3472void 3038void
3473make_visible (object *op) 3039make_visible (object *op)
3474{ 3040{
… …
3477 if (op->type == PLAYER) 3043 if (op->type == PLAYER)
3478 { 3044 {
3479 op->contr->tmp_invis = 0; 3045 op->contr->tmp_invis = 0;
3480 op->contr->invis_race = 0; 3046 op->contr->invis_race = 0;
3481 } 3047 }
3048
3482 update_object (op, UP_OBJ_FACE); 3049 update_object (op, UP_OBJ_CHANGE);
3483} 3050}
3484 3051
3485int 3052int
3486is_true_undead (object *op) 3053is_true_undead (object *op)
3487{ 3054{
3488 object *tmp = NULL;
3489
3490 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3055 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3491 return 1; 3056 return 1;
3492 3057
3493 if (op->type == PLAYER)
3494 for (tmp = op->inv; tmp; tmp = tmp->below)
3495 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3496 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3497 return 1;
3498 return 0; 3058 return 0;
3499} 3059}
3500 3060
3501/* look at the surrounding terrain to determine 3061/* look at the surrounding terrain to determine
3502 * the hideability of this object. Positive levels 3062 * the hideability of this object. Positive levels
… …
3558 3118
3559 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3119 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3560 3120
3561 /* 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! */
3562 if (op->type == PLAYER && op->contr->run_on) 3122 if (op->type == PLAYER && op->contr->run_on)
3563 {
3564 if (!skop || num >= skop->level) 3123 if (!skop || num >= skop->level)
3565 { 3124 {
3566 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!");
3567 make_visible (op); 3126 make_visible (op);
3568 return; 3127 return;
3569 } 3128 }
3570 else 3129 else
3571 num += 20; 3130 num += 20;
3572 } 3131
3573 num += op->map->difficulty; 3132 num += op->map->difficulty;
3574 hide = hideability (op); /* modify by terrain hidden level */ 3133 hide = hideability (op); /* modify by terrain hidden level */
3575 num -= hide; 3134 num -= hide;
3135
3576 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3136 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3577 { 3137 {
3578 make_visible (op); 3138 make_visible (op);
3579 if (op->type == PLAYER) 3139 if (op->type == PLAYER)
3580 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!");
3581 } 3141 }
3582 else if (op->type == PLAYER && skop) 3142 else if (op->type == PLAYER && skop)
3583 {
3584 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);
3585 }
3586} 3144}
3587 3145
3588/* determine if who is standing near a hostile creature. */ 3146/* determine if who is standing near a hostile creature. */
3589 3147
3590int 3148int
… …
3617 if (mflags & P_OUT_OF_MAP) 3175 if (mflags & P_OUT_OF_MAP)
3618 continue; 3176 continue;
3619 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)))
3620 continue; 3178 continue;
3621 3179
3622 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)
3623 { 3181 {
3624 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))
3625 return 1; 3183 return 1;
3626 else if (tmp->type == PLAYER) 3184 else if (tmp->type == PLAYER)
3627 { 3185 {
… …
3657 if (pl->type != PLAYER) 3215 if (pl->type != PLAYER)
3658 { 3216 {
3659 LOG (llevError, "player_can_view() called for non-player object\n"); 3217 LOG (llevError, "player_can_view() called for non-player object\n");
3660 return -1; 3218 return -1;
3661 } 3219 }
3220
3662 if (!pl || !op) 3221 if (!pl || !op)
3663 return 0; 3222 return 0;
3664 3223
3665 if (op->head)
3666 {
3667 op = op->head; 3224 op = op->head_ ();
3668 } 3225
3669 get_rangevector (pl, op, &rv, 0x1); 3226 get_rangevector (pl, op, &rv, 0x1);
3670 3227
3671 /* starting with the 'head' part, lets loop 3228 /* starting with the 'head' part, lets loop
3672 * through the object and find if it has any 3229 * through the object and find if it has any
3673 * part that is in the los array but isnt on 3230 * part that is in the los array but isnt on
… …
3681 3238
3682 /* only the viewable area the player sees is updated by LOS 3239 /* only the viewable area the player sees is updated by LOS
3683 * 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
3684 * for any meaningful values. 3241 * for any meaningful values.
3685 */ 3242 */
3686 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3243 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3687 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3244 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3688 !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)])
3689 return 1; 3246 return 1;
3690 op = op->more; 3247 op = op->more;
3691 } 3248 }
3692 return 0; 3249 return 0;
3693} 3250}
… …
3790 char buf[MAX_BUF]; /* tmp. string buffer */ 3347 char buf[MAX_BUF]; /* tmp. string buffer */
3791 int i = 0, j = 0; 3348 int i = 0, j = 0;
3792 3349
3793 /* get the appropriate treasurelist */ 3350 /* get the appropriate treasurelist */
3794 if (atnr == ATNR_FIRE) 3351 if (atnr == ATNR_FIRE)
3795 trlist = find_treasurelist ("dragon_ability_fire"); 3352 trlist = treasurelist::find ("dragon_ability_fire");
3796 else if (atnr == ATNR_COLD) 3353 else if (atnr == ATNR_COLD)
3797 trlist = find_treasurelist ("dragon_ability_cold"); 3354 trlist = treasurelist::find ("dragon_ability_cold");
3798 else if (atnr == ATNR_ELECTRICITY) 3355 else if (atnr == ATNR_ELECTRICITY)
3799 trlist = find_treasurelist ("dragon_ability_elec"); 3356 trlist = treasurelist::find ("dragon_ability_elec");
3800 else if (atnr == ATNR_POISON) 3357 else if (atnr == ATNR_POISON)
3801 trlist = find_treasurelist ("dragon_ability_poison"); 3358 trlist = treasurelist::find ("dragon_ability_poison");
3802 3359
3803 if (trlist == NULL || who->type != PLAYER) 3360 if (trlist == NULL || who->type != PLAYER)
3804 return; 3361 return;
3805 3362
3806 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++);
3807 3364
3808 if (tr == NULL || tr->item == NULL) 3365 if (!tr || !tr->item)
3809 { 3366 {
3810 /* 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]); */
3811 return; 3368 return;
3812 } 3369 }
3813 3370
… …
3879 { 3436 {
3880 /* forces in the treasurelist can alter the player's stats */ 3437 /* forces in the treasurelist can alter the player's stats */
3881 object *skin; 3438 object *skin;
3882 3439
3883 /* first get the dragon skin force */ 3440 /* first get the dragon skin force */
3441 shstr_cmp dragon_skin_force ("dragon_skin_force");
3884 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
3885 if (skin == NULL) 3445 if (!skin)
3886 return; 3446 return;
3887 3447
3888 /* adding new spellpath attunements */ 3448 /* adding new spellpath attunements */
3889 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3449 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3890 { 3450 {
… …
3935 * not readied. 3495 * not readied.
3936 */ 3496 */
3937void 3497void
3938player_unready_range_ob (player *pl, object *ob) 3498player_unready_range_ob (player *pl, object *ob)
3939{ 3499{
3940 rangetype i;
3941
3942 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))
3943 {
3944 if (pl->ranges[i] == ob) 3501 if (pl->ranges[i] == ob)
3945 { 3502 {
3946 pl->ranges[i] = NULL; 3503 pl->ranges[i] = 0;
3947 if (pl->shoottype == i) 3504 if (pl->shoottype == i)
3948 {
3949 pl->shoottype = range_none; 3505 pl->shoottype = range_none;
3950 }
3951 } 3506 }
3952 }
3953} 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