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.110 by root, Mon Apr 16 06:23:43 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#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 maplevel = ob->map->path;
200 ob->remove ();
201 ob->map = 0;
202 party = 0;
203
204 // for weird reasons, this is often "ob", keeping a circular reference
205 ranges [range_skill] = 0;
206
207 players.erase (this);
208}
209
210// connect the player with a specific client
211// also changed, rationalises, and fixes some incorrect settings
212void
213player::connect (client *ns)
214{
215 this->ns = ns;
216 ns->pl = this;
217
218 run_on = 0;
219 fire_on = 0;
220 ob->close_container (); //TODO: client-specific
221
222 ns->update_look = 0;
223 ns->look_position = 0;
224
225 clear_los (ob);
226
227 ns->reset_stats ();
228
229 /* make sure he's a player -- needed because of class change. */
230 ob->type = PLAYER; // we are paranoid
231 ob->race = ob->arch->clone.race;
232
233 if (!legal_range (ob, shoottype))
234 shoottype = range_none;
235
236 ob->carrying = sum_weight (ob);
237 link_player_skills (ob);
238
239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
240
241 assign (title, ob->arch->clone.name);
242
243 /* if it's a dragon player, set the correct title here */
244 if (is_dragon_pl (ob))
245 {
246 object *tmp, *abil = 0, *skin = 0;
247
248 shstr_cmp dragon_ability_force ("dragon_ability_force");
249 shstr_cmp dragon_skin_force ("dragon_skin_force");
250
251 for (tmp = ob->inv; tmp; tmp = tmp->below)
252 if (tmp->type == FORCE)
253 if (tmp->arch->name == dragon_ability_force)
254 abil = tmp;
255 else if (tmp->arch->name == dragon_skin_force)
256 skin = tmp;
257
258 set_dragon_name (ob, abil, skin);
259 }
260
261 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262
263 esrv_new_player (this, ob->weight + ob->carrying);
264
265 ob->update_stats ();
266 ns->floorbox_update ();
267
268 esrv_send_inventory (ob, ob);
269 esrv_add_spells (this, 0);
270
271 activate ();
272
273 send_rules (ob);
274 send_news (ob);
275 display_motd (ob);
276
277 INVOKE_PLAYER (CONNECT, this);
278 INVOKE_PLAYER (LOGIN, this);
279}
280
281void
282player::disconnect ()
283{
284 if (ns)
285 {
286 if (active)
287 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
288
289 INVOKE_PLAYER (DISCONNECT, this);
290
291 ns->reset_stats ();
292 ns->pl = 0;
293 this->ns = 0;
294 }
295
296 if (ob)
297 ob->close_container (); //TODO: client-specific
298
299 deactivate ();
300}
301
302// the need for this function can be explained
303// by load_object not returning the object
304void
305player::set_object (object *op)
306{
307 ob = op;
308 ob->contr = this; /* this aren't yet in archetype */
309
310 ob->speed_left = 0.5;
311 ob->speed = 1.0;
312 ob->direction = 5; /* So player faces south */
313}
314
315player::player ()
316{
317 /* There are some elements we want initialised to non zero value -
318 * we deal with that below this point.
319 */
320 outputs_sync = 6; /* Every 2 seconds */
321 outputs_count = 10; /* Keeps present behaviour */
322 unapply = unapply_nochoice;
323
324 savebed_map = first_map_path; /* Init. respawn position */
325
326 gen_sp_armour = 10;
327 shoottype = range_none;
328 bowtype = bow_normal;
329 petmode = pet_normal;
330 listening = 10;
331 usekeys = containers;
332 peaceful = 1; /* default peaceful */
333 do_los = 1;
334}
335
336void
337player::do_destroy ()
338{
339 disconnect ();
340
341 attachable::do_destroy ();
342
343 if (ob)
344 {
345 ob->destroy_inv (false);
346 ob->destroy ();
347 }
348}
349
350player::~player ()
351{
352 /* Clear item stack */
353 free (stack_items);
354}
355
321/* Tries to add player on the connection passwd in ns. 356/* 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 357 * All we can really get in this is some settings like host and display
323 * mode. 358 * mode.
324 */ 359 */
325
326int
327add_player (NewSocket * ns)
328{
329 player *p; 360player *
361player::create ()
362{
363 player *pl = new player;
330 364
331 p = get_player (NULL); 365 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 366
335 if (p->socket.faces_sent == NULL) 367 pl->ob->roll_stats ();
336 fatal (OUT_OF_MEMORY); 368 pl->ob->stats.wc = 2;
369 pl->ob->run_away = 25; /* Then we panick... */
337 370
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); 371 set_first_map (pl->ob);
345 372
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; 373 return pl;
354} 374}
355 375
356/* 376/*
357 * get_player_archetype() return next player archetype from archetype 377 * get_player_archetype() return next player archetype from archetype
358 * list. Not very efficient routine, but used only creating new players. 378 * list. Not very efficient routine, but used only creating new players.
… …
367 { 387 {
368 if (at == NULL || at->next == NULL) 388 if (at == NULL || at->next == NULL)
369 at = first_archetype; 389 at = first_archetype;
370 else 390 else
371 at = at->next; 391 at = at->next;
392
372 if (at->clone.type == PLAYER) 393 if (at->clone.type == PLAYER)
373 return at; 394 return at;
395
374 if (at == start) 396 if (at == start)
375 { 397 {
376 LOG (llevError, "No Player archetypes\n"); 398 LOG (llevError, "No Player archetypes\n");
377 exit (-1); 399 exit (-1);
378 } 400 }
379 } 401 }
380} 402}
381 403
382
383object * 404object *
384get_nearest_player (object *mon) 405get_nearest_player (object *mon)
385{ 406{
386 object *op = NULL; 407 object *op = NULL;
387 player *pl = NULL;
388 objectlink *ol; 408 objectlink *ol;
389 unsigned lastdist; 409 unsigned lastdist;
390 rv_vector rv; 410 rv_vector rv;
391 411
392 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 412 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
393 { 413 {
394 /* We should not find free objects on this friendly list, but it 414 /* We should not find free objects on this friendly list, but it
395 * does periodically happen. Given that, lets deal with it. 415 * does periodically happen. Given that, lets deal with it.
396 * While unlikely, it is possible the next object on the friendly 416 * While unlikely, it is possible the next object on the friendly
397 * list is also free, so encapsulate this in a while loop. 417 * list is also free, so encapsulate this in a while loop.
… …
401 object *tmp = ol->ob; 421 object *tmp = ol->ob;
402 422
403 /* Can't do much more other than log the fact, because the object 423 /* Can't do much more other than log the fact, because the object
404 * itself will have been cleared. 424 * itself will have been cleared.
405 */ 425 */
406 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 426 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
427 tmp->debug_desc ());
407 ol = ol->next; 428 ol = ol->next;
408 remove_friendly_object (tmp); 429 remove_friendly_object (tmp);
409 if (!ol) 430 if (!ol)
410 return op; 431 return op;
411 } 432 }
… …
424 { 445 {
425 op = ol->ob; 446 op = ol->ob;
426 lastdist = rv.distance; 447 lastdist = rv.distance;
427 } 448 }
428 } 449 }
429 for (pl = first_player; pl != NULL; pl = pl->next) 450
430 { 451 for_all_players (pl)
431 if (can_detect_enemy (mon, pl->ob, &rv)) 452 if (can_detect_enemy (mon, pl->ob, &rv))
432 {
433
434 if (lastdist > rv.distance) 453 if (lastdist > rv.distance)
435 { 454 {
436 op = pl->ob; 455 op = pl->ob;
437 lastdist = rv.distance; 456 lastdist = rv.distance;
438 } 457 }
439 } 458
440 }
441#if 0 459#if 0
442 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 460 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
443#endif 461#endif
444 return op; 462 return op;
445} 463}
… …
463 * circling behaviour. Unfortunately, this function is also used to determined 481 * 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 482 * if the creature should cast a spell, so returning a direction in that case
465 * is probably not a good thing. 483 * is probably not a good thing.
466 */ 484 */
467#define MAX_SPACES 50 485#define MAX_SPACES 50
468
469 486
470/* 487/*
471 * Returns the direction to the player, if valid. Returns 0 otherwise. 488 * 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 489 * 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 490 * player and if path is blocked then see if blockage is close enough to player that
… …
504 x = mon->x; 521 x = mon->x;
505 y = mon->y; 522 y = mon->y;
506 m = mon->map; 523 m = mon->map;
507 dir = rv.direction; 524 dir = rv.direction;
508 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
509 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
510 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
511 if (diff > max) 529 if (diff > max)
512 return 0; 530 return 0;
531
513 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
514 { 533 {
515 lastx = x; 534 lastx = x;
516 lasty = y; 535 lasty = y;
517 lastmap = m; 536 lastmap = m;
… …
599 max--; 618 max--;
600 lastdir = dir; 619 lastdir = dir;
601 if (!firstdir) 620 if (!firstdir)
602 firstdir = dir; 621 firstdir = dir;
603 } 622 }
623
604 if (diff <= 1) 624 if (diff <= 1)
605 { 625 {
606 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
607 * headed toward player for entire distance. 627 * headed toward player for entire distance.
608 */ 628 */
609 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 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); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
611 } 631 }
632
612 if (diff > max) 633 if (diff > max)
613 return 0; 634 return 0;
614 } 635 }
636
615 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
616 if (!max) 638 if (!max)
617 return 0; 639 return 0;
618 640
619 return firstdir; 641 return firstdir;
… …
646 (op->type == ARMOUR || op->type == BOOTS || 668 (op->type == ARMOUR || op->type == BOOTS ||
647 op->type == CLOAK || op->type == HELMET || 669 op->type == CLOAK || op->type == HELMET ||
648 op->type == SHIELD || op->type == GLOVES || 670 op->type == SHIELD || op->type == GLOVES ||
649 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
650 { 672 {
651 remove_ob (op); 673 op->destroy ();
652 free_object (op);
653 continue; 674 continue;
654 } 675 }
655 } 676 }
656 677
657 /* This really needs to be better - we should really give 678 /* This really needs to be better - we should really give
… …
668 if (tmp->type == op->type && tmp->name == op->name) 689 if (tmp->type == op->type && tmp->name == op->name)
669 break; 690 break;
670 691
671 if (tmp) 692 if (tmp)
672 { 693 {
673 remove_ob (op); 694 op->destroy ();
674 free_object (op);
675 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 695 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
676 continue; 696 continue;
677 } 697 }
698
678 if (op->nrof > 1) 699 if (op->nrof > 1)
679 op->nrof = 1; 700 op->nrof = 1;
680 } 701 }
681 702
682 if (op->type == SPELLBOOK && op->inv) 703 if (op->type == SPELLBOOK && op->inv)
… …
694 CLEAR_FLAG (op, FLAG_CURSED); 715 CLEAR_FLAG (op, FLAG_CURSED);
695 CLEAR_FLAG (op, FLAG_DAMNED); 716 CLEAR_FLAG (op, FLAG_DAMNED);
696 } 717 }
697 if (op->type == SPELL) 718 if (op->type == SPELL)
698 { 719 {
699 remove_ob (op); 720 op->destroy ();
700 free_object (op);
701 continue; 721 continue;
702 } 722 }
703 else if (op->type == SKILL) 723 else if (op->type == SKILL)
704 { 724 {
705 SET_FLAG (op, FLAG_CAN_USE_SKILL); 725 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
714 /* Need to set up the skill pointers */ 734 /* Need to set up the skill pointers */
715 link_player_skills (pl); 735 link_player_skills (pl);
716} 736}
717 737
718void 738void
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) 739get_party_password (object *op, partylist *party)
803{ 740{
804 if (party == NULL) 741 if (party == NULL)
805 { 742 {
806 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 743 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
807 return; 744 return;
808 } 745 }
746
809 op->contr->write_buf[0] = '\0'; 747 op->contr->write_buf[0] = '\0';
810 op->contr->state = ST_GET_PARTY_PASSWORD; 748 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
811 op->contr->party_to_join = party; 749 op->contr->party_to_join = party;
812 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 750 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
813} 751}
814
815 752
816/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 753/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
817int 754static int
818roll_stat (void) 755roll_stat (void)
819{ 756{
820 int a[4], i, j, k; 757 int a[4], i, j, k;
821 758
822 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
823 a[i] = (int) RANDOM () % 6 + 1; 760 a[i] = (int) rndm (6) + 1;
824 761
825 for (i = 0, j = 0, k = 7; i < 4; i++) 762 for (i = 0, j = 0, k = 7; i < 4; i++)
826 if (a[i] < k) 763 if (a[i] < k)
827 k = a[i], j = i; 764 k = a[i], j = i;
828 765
829 for (i = 0, k = 0; i < 4; i++) 766 for (i = 0, k = 0; i < 4; i++)
830 {
831 if (i != j) 767 if (i != j)
832 k += a[i]; 768 k += a[i];
833 } 769
834 return k; 770 return k;
835} 771}
836 772
837void 773void
838roll_stats (object *op) 774object::roll_stats ()
839{ 775{
840 int sum = 0;
841 int i = 0, j = 0;
842 int statsort[7]; 776 int statsort [7];
843 777
844 do 778 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 } 779 {
855 while (sum < 82 || sum > 116); 780 int sum = 0;
781 for (int i = 7; i--; )
782 sum += statsort [i] = roll_stat ();
856 783
784 if (sum >= 82 && sum <= 116)
785 break;
786 }
787
857 /* Sort the stats so that rerolling is easier... */ 788 // Sort the stats so that rerolling is easier...
858 statsort[0] = op->stats.Str; 789 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 790
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]; 791 stats.Str = statsort[0];
884 op->stats.Dex = statsort[1]; 792 stats.Dex = statsort[1];
885 op->stats.Con = statsort[2]; 793 stats.Con = statsort[2];
886 op->stats.Int = statsort[3]; 794 stats.Int = statsort[3];
887 op->stats.Wis = statsort[4]; 795 stats.Wis = statsort[4];
888 op->stats.Pow = statsort[5]; 796 stats.Pow = statsort[5];
889 op->stats.Cha = statsort[6]; 797 stats.Cha = statsort[6];
890 798
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; 799 stats.exp = 0;
902 op->stats.ac = 0; 800 stats.ac = 0;
903 801
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; 802 stats.hp = stats.maxhp;
910 op->stats.sp = op->stats.maxsp; 803 stats.sp = stats.maxsp;
911 op->stats.grace = op->stats.maxgrace; 804 stats.grace = stats.maxgrace;
805
806 if (contr)
807 {
808 contr->levhp[1] = 9;
809 contr->levsp[1] = 6;
810 contr->levgrace[1] = 3;
811
912 op->contr->orig_stats = op->stats; 812 contr->orig_stats = stats;
813 }
913} 814}
914 815
915void 816void
916Roll_Again (object *op) 817object::swap_stats (int a, int b)
917{ 818{
918 esrv_new_player (op->contr, 0); 819 int tmp = get_attr_value (&contr->orig_stats, a);
919 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 820 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)? "); 821 set_attr_value (&contr->orig_stats, b, tmp);
921}
922 822
923void 823 stats.Str = contr->orig_stats.Str;
924Swap_Stat (object *op, int Swap_Second) 824 stats.Dex = contr->orig_stats.Dex;
825 stats.Con = contr->orig_stats.Con;
826 stats.Int = contr->orig_stats.Int;
827 stats.Wis = contr->orig_stats.Wis;
828 stats.Pow = contr->orig_stats.Pow;
829 stats.Cha = contr->orig_stats.Cha;
830
831 //TODO: the following code looks so borked and should, at the very least,
832 // be merged with the similar code in roll_stats
833 stats.ac = 0;
834
835 level = 1;
836 stats.exp = 0;
837 stats.ac = 0;
838
839 stats.hp = stats.maxhp;
840 stats.sp = stats.maxsp;
841 stats.grace = stats.maxgrace;
842
843 if (contr)
844 {
845 contr->levhp[1] = 9;
846 contr->levsp[1] = 6;
847 contr->levgrace[1] = 3;
848
849 contr->orig_stats = stats;
850 }
851}
852
853static void
854start_info (object *op)
925{ 855{
926 signed char tmp;
927 char buf[MAX_BUF]; 856 char buf[MAX_BUF];
928 857
929 if (op->contr->Swap_First == -1) 858 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); 859 new_draw_info (NDI_UNIQUE, 0, op, buf);
945 op->stats.Str = op->contr->orig_stats.Str; 860 //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); 861 //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} 862}
1044 863
1045/* This function takes the key that is passed, and does the 864/* This function takes the key that is passed, and does the
1046 * appropriate action with it (change race, or other things). 865 * appropriate action with it (change race, or other things).
1047 * The function name is for historical reasons - now we have 866 * The function name is for historical reasons - now we have
1048 * separate race and class; this actually changes the RACE, 867 * separate race and class; this actually changes the RACE,
1049 * not the class. 868 * not the class.
1050 */ 869 */
1051
1052int 870int
1053key_change_class (object *op, char key) 871key_change_class (object *op, char key)
1054{ 872{
1055 int tmp_loop; 873 int tmp_loop;
1056 874
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') 875 if (key == 'd' || key == 'D')
1064 { 876 {
1065 char buf[MAX_BUF]; 877 char buf[MAX_BUF];
1066 878
1067 /* this must before then initial items are given */ 879 /* this must before then initial items are given */
1068 esrv_new_player (op->contr, op->weight + op->carrying); 880 esrv_new_player (op->contr, op->weight + op->carrying);
1069 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0); 881
882 treasurelist *tl = treasurelist::find ("starting_wealth");
883 if (tl)
884 create_treasure (tl, op, 0, 0, 0);
1070 885
1071 INVOKE_PLAYER (BIRTH, op->contr); 886 INVOKE_PLAYER (BIRTH, op->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr); 887 INVOKE_PLAYER (LOGIN, op->contr);
1073 888
1074 op->contr->state = ST_PLAYING; 889 op->contr->ns->state = ST_PLAYING;
1075 890
1076 if (op->msg) 891 if (op->msg)
1077 op->msg = NULL; 892 op->msg = NULL;
1078 893
1079 /* We create this now because some of the unique maps will need it 894 /* We create this now because some of the unique maps will need it
1080 * to save here. 895 * to save here.
1081 */ 896 */
1082 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
1083 make_path_to_file (buf); 898 make_path_to_file (buf);
1084 899
1085#ifdef AUTOSAVE
1086 op->contr->last_save_tick = pticks;
1087#endif
1088 start_info (op); 900 start_info (op);
1089 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
1090 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
1091 link_player_skills (op); 903 link_player_skills (op);
1092 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
1093 fix_player (op); 905 op->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, &op->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) = op->x;
1107 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = op->y;
1108 enter_exit (op, tmp); /* we don't really care if it succeeded; 920 op->enter_exit (tmp); /* we don't really care if it succeeded;
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; 928 return 0;
1118 } 929 }
1119 930
1120 /* Following actually changes the race - this is the default command 931 /* Following actually changes the race - this is the default command
1121 * if we don't match with one of the options above. 932 * if we don't match with one of the options above.
… …
1125 while (!tmp_loop) 936 while (!tmp_loop)
1126 { 937 {
1127 shstr name = op->name; 938 shstr name = op->name;
1128 int x = op->x, y = op->y; 939 int x = op->x, y = op->y;
1129 940
1130 remove_statbonus (op); 941 op->remove_statbonus ();
1131 remove_ob (op); 942 op->remove ();
1132 op->arch = get_player_archetype (op->arch); 943 op->arch = get_player_archetype (op->arch);
1133 copy_object (&op->arch->clone, op); 944 op->arch->clone.copy_to (op);
1134 op->instantiate (); 945 op->instantiate ();
1135 op->stats = op->contr->orig_stats; 946 op->stats = op->contr->orig_stats;
1136 op->name = op->name_pl = name; 947 op->name = op->name_pl = name;
1137 op->x = x; 948 op->x = x;
1138 op->y = y; 949 op->y = y;
1139 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (op, 2); /* So player faces south */
1140 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (op, op->map, op, 0);
1141 assign (op->contr->title, op->arch->clone.name); 952 assign (op->contr->title, op->arch->clone.name);
1142 add_statbonus (op); 953 op->add_statbonus ();
1143 tmp_loop = allowed_class (op); 954 tmp_loop = allowed_class (op);
1144 } 955 }
1145 956
1146 update_object (op, UP_OBJ_FACE); 957 update_object (op, UP_OBJ_FACE);
1147 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, op, op);
1148 fix_player (op); 959 op->update_stats ();
1149 op->stats.hp = op->stats.maxhp; 960 op->stats.hp = op->stats.maxhp;
1150 op->stats.sp = op->stats.maxsp; 961 op->stats.sp = op->stats.maxsp;
1151 op->stats.grace = 0; 962 op->stats.grace = 0;
1152 963
1153 if (op->msg) 964 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg); 965 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155 966
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0; 968 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} 969}
1208 970
1209void 971void
1210flee_player (object *op) 972flee_player (object *op)
1211{ 973{
… …
1241 { 1003 {
1242 op->enemy = NULL; 1004 op->enemy = NULL;
1243 CLEAR_FLAG (op, FLAG_SCARED); 1005 CLEAR_FLAG (op, FLAG_SCARED);
1244 return; 1006 return;
1245 } 1007 }
1008
1246 get_rangevector (op, op->enemy, &rv, 0); 1009 get_rangevector (op, op->enemy, &rv, 0);
1247 1010
1248 dir = absdir (4 + rv.direction); 1011 dir = absdir (4 + rv.direction);
1249 for (diff = 0; diff < 3; diff++) 1012 for (diff = 0; diff < 3; diff++)
1250 { 1013 {
1251 int m = 1 - (RANDOM () & 2); 1014 int m = 1 - (RANDOM () & 2);
1252 1015
1253 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1016 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1254 {
1255 return; 1017 return;
1256 }
1257 } 1018 }
1019
1258 /* Cornered, get rid of scared */ 1020 /* Cornered, get rid of scared */
1259 CLEAR_FLAG (op, FLAG_SCARED); 1021 CLEAR_FLAG (op, FLAG_SCARED);
1260 op->enemy = NULL; 1022 op->enemy = NULL;
1261} 1023}
1262 1024
… …
1268int 1030int
1269check_pick (object *op) 1031check_pick (object *op)
1270{ 1032{
1271 object *tmp, *next; 1033 object *tmp, *next;
1272 int stop = 0; 1034 int stop = 0;
1273 int j, k, wvratio; 1035 int wvratio;
1274 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1275 1037
1276 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1277 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1278 return 1; 1040 return 1;
1279 1041
… …
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1110 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)))); 1111 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1350 else 1112 else
1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1113 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)))); 1114 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115
1353 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1116 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 } 1117 }
1118
1384 /* philosophy: 1119 /* philosophy:
1385 * It's easy to grab an item type from a pile, as long as it's 1120 * It's easy to grab an item type from a pile, as long as it's
1386 * generic. This takes no game-time. For more detailed pickups 1121 * generic. This takes no game-time. For more detailed pickups
1387 * and selections, select-items shoul dbe used. This is a 1122 * and selections, select-items should be used. This is a
1388 * grab-as-you-run type mode that's really useful for arrows for 1123 * grab-as-you-run type mode that's really useful for arrows for
1389 * example. 1124 * example.
1390 * The drawback: right now it has no frontend, so you need to 1125 * The drawback: right now it has no frontend, so you need to
1391 * stick the bits you want into a calculator in hex mode and then 1126 * stick the bits you want into a calculator in hex mode and then
1392 * convert to decimal and then 'pickup <#> 1127 * convert to decimal and then 'pickup <#>
… …
1426 /* question: don't pick up known-poisonous stuff? */ 1161 /* question: don't pick up known-poisonous stuff? */
1427 if (op->contr->mode & PU_FOOD) 1162 if (op->contr->mode & PU_FOOD)
1428 if (tmp->type == FOOD) 1163 if (tmp->type == FOOD)
1429 { 1164 {
1430 pick_up (op, tmp); 1165 pick_up (op, tmp);
1431 if (0)
1432 fprintf (stderr, "FOOD\n");
1433 continue; 1166 continue;
1434 } 1167 }
1168
1435 if (op->contr->mode & PU_DRINK) 1169 if (op->contr->mode & PU_DRINK)
1436 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1170 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1437 { 1171 {
1438 pick_up (op, tmp); 1172 pick_up (op, tmp);
1439 if (0)
1440 fprintf (stderr, "DRINK\n");
1441 continue; 1173 continue;
1442 } 1174 }
1443 1175
1444 if (op->contr->mode & PU_POTION) 1176 if (op->contr->mode & PU_POTION)
1445 if (tmp->type == POTION) 1177 if (tmp->type == POTION)
1446 { 1178 {
1447 pick_up (op, tmp); 1179 pick_up (op, tmp);
1448 if (0)
1449 fprintf (stderr, "POTION\n");
1450 continue; 1180 continue;
1451 } 1181 }
1452 1182
1453 /* spellbooks, skillscrolls and normal books/scrolls */ 1183 /* spellbooks, skillscrolls and normal books/scrolls */
1454 if (op->contr->mode & PU_SPELLBOOK) 1184 if (op->contr->mode & PU_SPELLBOOK)
1455 if (tmp->type == SPELLBOOK) 1185 if (tmp->type == SPELLBOOK)
1456 { 1186 {
1457 pick_up (op, tmp); 1187 pick_up (op, tmp);
1458 if (0)
1459 fprintf (stderr, "SPELLBOOK\n");
1460 continue; 1188 continue;
1461 } 1189 }
1190
1462 if (op->contr->mode & PU_SKILLSCROLL) 1191 if (op->contr->mode & PU_SKILLSCROLL)
1463 if (tmp->type == SKILLSCROLL) 1192 if (tmp->type == SKILLSCROLL)
1464 { 1193 {
1465 pick_up (op, tmp); 1194 pick_up (op, tmp);
1466 if (0)
1467 fprintf (stderr, "SKILLSCROLL\n");
1468 continue; 1195 continue;
1469 } 1196 }
1197
1470 if (op->contr->mode & PU_READABLES) 1198 if (op->contr->mode & PU_READABLES)
1471 if (tmp->type == BOOK || tmp->type == SCROLL) 1199 if (tmp->type == BOOK || tmp->type == SCROLL)
1472 { 1200 {
1473 pick_up (op, tmp); 1201 pick_up (op, tmp);
1474 if (0)
1475 fprintf (stderr, "READABLES\n");
1476 continue; 1202 continue;
1477 } 1203 }
1478 1204
1479 /* wands/staves/rods/horns */ 1205 /* wands/staves/rods/horns */
1480 if (op->contr->mode & PU_MAGIC_DEVICE) 1206 if (op->contr->mode & PU_MAGIC_DEVICE)
1481 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1207 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1482 { 1208 {
1483 pick_up (op, tmp); 1209 pick_up (op, tmp);
1484 if (0)
1485 fprintf (stderr, "MAGIC_DEVICE\n");
1486 continue; 1210 continue;
1487 } 1211 }
1488 1212
1489 /* pick up all magical items */ 1213 /* pick up all magical items */
1490 if (op->contr->mode & PU_MAGICAL) 1214 if (op->contr->mode & PU_MAGICAL)
1491 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1215 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1492 { 1216 {
1493 pick_up (op, tmp); 1217 pick_up (op, tmp);
1494 if (0)
1495 fprintf (stderr, "MAGICAL\n");
1496 continue; 1218 continue;
1497 } 1219 }
1498 1220
1499 if (op->contr->mode & PU_VALUABLES) 1221 if (op->contr->mode & PU_VALUABLES)
1500 { 1222 {
1501 if (tmp->type == MONEY || tmp->type == GEM) 1223 if (tmp->type == MONEY || tmp->type == GEM)
1502 { 1224 {
1503 pick_up (op, tmp); 1225 pick_up (op, tmp);
1504 if (0)
1505 fprintf (stderr, "MONEY/GEM\n");
1506 continue; 1226 continue;
1507 } 1227 }
1508 } 1228 }
1509 1229
1510 /* rings & amulets - talismans seems to be typed AMULET */ 1230 /* rings & amulets - talismans seems to be typed AMULET */
1511 if (op->contr->mode & PU_JEWELS) 1231 if (op->contr->mode & PU_JEWELS)
1512 if (tmp->type == RING || tmp->type == AMULET) 1232 if (tmp->type == RING || tmp->type == AMULET)
1513 { 1233 {
1514 pick_up (op, tmp); 1234 pick_up (op, tmp);
1235 continue;
1515 if (0) 1236 }
1516 fprintf (stderr, "JEWELS\n"); 1237
1238 /* we don't forget dragon food */
1239 if (op->contr->mode & PU_FLESH)
1240 if (tmp->type == FLESH)
1241 {
1242 pick_up (op, tmp);
1517 continue; 1243 continue;
1518 } 1244 }
1519 1245
1520 /* bows and arrows. Bows are good for selling! */ 1246 /* bows and arrows. Bows are good for selling! */
1521 if (op->contr->mode & PU_BOW) 1247 if (op->contr->mode & PU_BOW)
1522 if (tmp->type == BOW) 1248 if (tmp->type == BOW)
1523 { 1249 {
1524 pick_up (op, tmp); 1250 pick_up (op, tmp);
1525 if (0)
1526 fprintf (stderr, "BOW\n");
1527 continue; 1251 continue;
1528 } 1252 }
1253
1529 if (op->contr->mode & PU_ARROW) 1254 if (op->contr->mode & PU_ARROW)
1530 if (tmp->type == ARROW) 1255 if (tmp->type == ARROW)
1531 { 1256 {
1532 pick_up (op, tmp); 1257 pick_up (op, tmp);
1533 if (0)
1534 fprintf (stderr, "ARROW\n");
1535 continue; 1258 continue;
1536 } 1259 }
1537 1260
1538 /* all kinds of armor etc. */ 1261 /* all kinds of armor etc. */
1539 if (op->contr->mode & PU_ARMOUR) 1262 if (op->contr->mode & PU_ARMOUR)
1540 if (tmp->type == ARMOUR) 1263 if (tmp->type == ARMOUR)
1541 { 1264 {
1542 pick_up (op, tmp); 1265 pick_up (op, tmp);
1543 if (0)
1544 fprintf (stderr, "ARMOUR\n");
1545 continue; 1266 continue;
1546 } 1267 }
1268
1547 if (op->contr->mode & PU_HELMET) 1269 if (op->contr->mode & PU_HELMET)
1548 if (tmp->type == HELMET) 1270 if (tmp->type == HELMET)
1549 { 1271 {
1550 pick_up (op, tmp); 1272 pick_up (op, tmp);
1551 if (0)
1552 fprintf (stderr, "HELMET\n");
1553 continue; 1273 continue;
1554 } 1274 }
1275
1555 if (op->contr->mode & PU_SHIELD) 1276 if (op->contr->mode & PU_SHIELD)
1556 if (tmp->type == SHIELD) 1277 if (tmp->type == SHIELD)
1557 { 1278 {
1558 pick_up (op, tmp); 1279 pick_up (op, tmp);
1559 if (0)
1560 fprintf (stderr, "SHIELD\n");
1561 continue; 1280 continue;
1562 } 1281 }
1282
1563 if (op->contr->mode & PU_BOOTS) 1283 if (op->contr->mode & PU_BOOTS)
1564 if (tmp->type == BOOTS) 1284 if (tmp->type == BOOTS)
1565 { 1285 {
1566 pick_up (op, tmp); 1286 pick_up (op, tmp);
1567 if (0)
1568 fprintf (stderr, "BOOTS\n");
1569 continue; 1287 continue;
1570 } 1288 }
1289
1571 if (op->contr->mode & PU_GLOVES) 1290 if (op->contr->mode & PU_GLOVES)
1572 if (tmp->type == GLOVES) 1291 if (tmp->type == GLOVES)
1573 { 1292 {
1574 pick_up (op, tmp); 1293 pick_up (op, tmp);
1575 if (0)
1576 fprintf (stderr, "GLOVES\n");
1577 continue; 1294 continue;
1578 } 1295 }
1296
1579 if (op->contr->mode & PU_CLOAK) 1297 if (op->contr->mode & PU_CLOAK)
1580 if (tmp->type == CLOAK) 1298 if (tmp->type == CLOAK)
1581 { 1299 {
1582 pick_up (op, tmp); 1300 pick_up (op, tmp);
1583 if (0)
1584 fprintf (stderr, "GLOVES\n");
1585 continue; 1301 continue;
1586 } 1302 }
1587 1303
1588 /* hoping to catch throwing daggers here */ 1304 /* hoping to catch throwing daggers here */
1589 if (op->contr->mode & PU_MISSILEWEAPON) 1305 if (op->contr->mode & PU_MISSILEWEAPON)
1590 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1306 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1591 { 1307 {
1592 pick_up (op, tmp); 1308 pick_up (op, tmp);
1593 if (0)
1594 fprintf (stderr, "MISSILEWEAPON\n");
1595 continue; 1309 continue;
1596 } 1310 }
1597 1311
1598 /* careful: chairs and tables are weapons! */ 1312 /* careful: chairs and tables are weapons! */
1599 if (op->contr->mode & PU_ALLWEAPON) 1313 if (op->contr->mode & PU_ALLWEAPON)
… …
1602 { 1316 {
1603 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1317 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1604 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1318 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1605 { 1319 {
1606 pick_up (op, tmp); 1320 pick_up (op, tmp);
1607 if (0)
1608 fprintf (stderr, "WEAPON\n");
1609 continue; 1321 continue;
1610 } 1322 }
1611 } 1323 }
1324
1612 if (tmp->type == WEAPON && tmp->name == NULL) 1325 if (tmp->type == WEAPON && tmp->name == NULL)
1613 { 1326 {
1614 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1327 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1615 { 1328 {
1616 pick_up (op, tmp); 1329 pick_up (op, tmp);
1617 if (0)
1618 fprintf (stderr, "WEAPON\n");
1619 continue; 1330 continue;
1620 } 1331 }
1621 } 1332 }
1622 } 1333 }
1623 1334
1624 /* misc stuff that's useful */ 1335 /* misc stuff that's useful */
1625 if (op->contr->mode & PU_KEY) 1336 if (op->contr->mode & PU_KEY)
1626 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1337 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1627 { 1338 {
1628 pick_up (op, tmp); 1339 pick_up (op, tmp);
1629 if (0)
1630 fprintf (stderr, "KEY\n");
1631 continue; 1340 continue;
1632 } 1341 }
1633 1342
1634 /* any of the last 4 bits set means we use the ratio for value 1343 /* any of the last 4 bits set means we use the ratio for value
1635 * pickups */ 1344 * pickups */
… …
1657 continue; 1366 continue;
1658 } 1367 }
1659 } 1368 }
1660 } /* the new pickup model */ 1369 } /* the new pickup model */
1661 } 1370 }
1371
1662 return !stop; 1372 return !stop;
1663} 1373}
1664 1374
1665/* 1375/*
1666 * Find an arrow in the inventory and after that 1376 * Find an arrow in the inventory and after that
… …
1668 * found object is returned. 1378 * found object is returned.
1669 */ 1379 */
1670object * 1380object *
1671find_arrow (object *op, const char *type) 1381find_arrow (object *op, const char *type)
1672{ 1382{
1673 object *tmp = NULL; 1383 object *tmp = 0;
1674 1384
1675 for (op = op->inv; op; op = op->below) 1385 for (op = op->inv; op; op = op->below)
1676 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1386 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1677 tmp = find_arrow (op, type); 1387 tmp = find_arrow (op, type);
1678 else if (op->type == ARROW && op->race == type) 1388 else if (op->type == ARROW && op->race == type)
1679 return op; 1389 return op;
1390
1680 return tmp; 1391 return tmp;
1681} 1392}
1682 1393
1683/* 1394/*
1684 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1395 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1685 * against the target. A full test is not performed, simply a basic test 1396 * against the target. A full test is not performed, simply a basic test
1686 * of resistances. The archer is making a quick guess at what he sees down 1397 * of resistances. The archer is making a quick guess at what he sees down
1687 * the hall. Failing that it does it's best to pick the highest plus arrow. 1398 * the hall. Failing that it does it's best to pick the highest plus arrow.
1688 */ 1399 */
1689
1690object * 1400object *
1691find_better_arrow (object *op, object *target, const char *type, int *better) 1401find_better_arrow (object *op, object *target, const char *type, int *better)
1692{ 1402{
1693 object *tmp = NULL, *arrow, *ntmp; 1403 object *tmp = NULL, *arrow, *ntmp;
1694 int attacknum, attacktype, betterby = 0, i; 1404 int attacknum, attacktype, betterby = 0, i;
… …
1843 if (!dir) 1553 if (!dir)
1844 { 1554 {
1845 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1555 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1846 return 0; 1556 return 0;
1847 } 1557 }
1558
1848 if (op->type == PLAYER) 1559 if (op->type == PLAYER)
1849 bow = op->contr->ranges[range_bow]; 1560 bow = op->contr->ranges[range_bow];
1850 else 1561 else
1851 { 1562 {
1852 for (bow = op->inv; bow; bow = bow->below) 1563 for (bow = op->inv; bow; bow = bow->below)
… …
1860 { 1571 {
1861 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1572 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1862 return 0; 1573 return 0;
1863 } 1574 }
1864 } 1575 }
1576
1865 if (!bow->race || !bow->skill) 1577 if (!bow->race || !bow->skill)
1866 { 1578 {
1867 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1579 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1868 return 0; 1580 return 0;
1869 } 1581 }
… …
1871 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1583 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1872 1584
1873 /* penalize ROF for bestarrow */ 1585 /* penalize ROF for bestarrow */
1874 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1586 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1875 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1587 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1588
1876 if (bowspeed < 1) 1589 if (bowspeed < 1)
1877 bowspeed = 1; 1590 bowspeed = 1;
1878 1591
1879 if (arrow == NULL) 1592 if (arrow == NULL)
1880 { 1593 {
… …
1886 else 1599 else
1887 CLEAR_FLAG (op, FLAG_READY_BOW); 1600 CLEAR_FLAG (op, FLAG_READY_BOW);
1888 return 0; 1601 return 0;
1889 } 1602 }
1890 } 1603 }
1604
1891 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1605 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1892 if (mflags & P_OUT_OF_MAP) 1606 if (mflags & P_OUT_OF_MAP)
1893 {
1894 return 0; 1607 return 0;
1895 } 1608
1896 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1609 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1897 { 1610 {
1898 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1611 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1899 return 0; 1612 return 0;
1900 } 1613 }
1901 1614
1902 /* this should not happen, but sometimes does */ 1615 /* this should not happen, but sometimes does */
1903 if (arrow->nrof == 0) 1616 if (arrow->nrof == 0)
1904 { 1617 {
1905 remove_ob (arrow); 1618 arrow->destroy ();
1906 free_object (arrow);
1907 return 0; 1619 return 0;
1908 } 1620 }
1909 1621
1910 left = arrow; /* these are arrows left to the player */ 1622 left = arrow; /* these are arrows left to the player */
1911 arrow = get_split_ob (arrow, 1); 1623 arrow = get_split_ob (arrow, 1);
1912 if (arrow == NULL) 1624 if (!arrow)
1913 { 1625 {
1914 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1626 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1915 return 0; 1627 return 0;
1916 } 1628 }
1917 set_owner (arrow, op); 1629
1630 arrow->set_owner (op);
1918 arrow->skill = bow->skill; 1631 arrow->skill = bow->skill;
1919
1920 arrow->direction = dir; 1632 arrow->direction = dir;
1921 arrow->x = sx;
1922 arrow->y = sy;
1923 1633
1924 if (op->type == PLAYER) 1634 if (op->type == PLAYER)
1925 { 1635 {
1926 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1636 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1927 fix_player (op); 1637 op->update_stats ();
1928 } 1638 }
1929 1639
1930 SET_ANIMATION (arrow, arrow->direction); 1640 SET_ANIMATION (arrow, arrow->direction);
1931 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1641 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1932 arrow->stats.hp = arrow->stats.dam; 1642 arrow->stats.hp = arrow->stats.dam;
1933 arrow->stats.grace = arrow->attacktype; 1643 arrow->stats.grace = arrow->attacktype;
1934 if (arrow->slaying != NULL) 1644 if (arrow->slaying != NULL)
1935 arrow->spellarg = strdup_local (arrow->slaying); 1645 arrow->spellarg = strdup (arrow->slaying);
1936 1646
1937 /* Note that this was different for monsters - they got their level 1647 /* Note that this was different for monsters - they got their level
1938 * added to the damage. I think the strength bonus is more proper. 1648 * added to the damage. I think the strength bonus is more proper.
1939 */ 1649 */
1940 1650
… …
1942 1652
1943 /* update the speed */ 1653 /* update the speed */
1944 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1654 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; 1655 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1946 1656
1947 if (arrow->speed < 1.0) 1657 arrow->set_speed (max (arrow->speed, 1.0));
1948 arrow->speed = 1.0;
1949 update_ob_speed (arrow);
1950 arrow->speed_left = 0; 1658 arrow->speed_left = 0;
1951 1659
1952 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1953 { 1661 {
1954 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1662 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1964 } 1672 }
1965 1673
1966 if (arrow->attacktype == AT_PHYSICAL) 1674 if (arrow->attacktype == AT_PHYSICAL)
1967 arrow->attacktype |= bow->attacktype; 1675 arrow->attacktype |= bow->attacktype;
1968 1676
1969 if (bow->slaying != NULL) 1677 if (bow->slaying)
1970 arrow->slaying = bow->slaying; 1678 arrow->slaying = bow->slaying;
1971 1679
1972 arrow->map = m;
1973 arrow->move_type = MOVE_FLY_LOW; 1680 arrow->move_type = MOVE_FLY_LOW;
1974 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1681 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1975 1682
1976 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1683 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1977 insert_ob_in_map (arrow, m, op, 0); 1684 m->insert (arrow, sx, sy, op);
1978 1685
1979 if (!arrow->destroyed ()) 1686 if (!arrow->destroyed ())
1980 move_arrow (arrow); 1687 move_arrow (arrow);
1981 1688
1982 if (op->type == PLAYER) 1689 if (op->type == PLAYER)
… …
2008 } 1715 }
2009 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1716 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
2010 { 1717 {
2011 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1718 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
2012 wcmod = -1; 1719 wcmod = -1;
1720
2013 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1721 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
2014 } 1722 }
2015 else if (op->contr->bowtype == bow_threewide) 1723 else if (op->contr->bowtype == bow_threewide)
2016 { 1724 {
2017 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1725 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
2087 1795
2088 if (item->arch) 1796 if (item->arch)
2089 { 1797 {
2090 CLEAR_FLAG (item, FLAG_ANIMATE); 1798 CLEAR_FLAG (item, FLAG_ANIMATE);
2091 item->face = item->arch->clone.face; 1799 item->face = item->arch->clone.face;
2092 item->speed = 0; 1800 item->set_speed (0);
2093 update_ob_speed (item);
2094 } 1801 }
1802
2095 if ((tmp = is_player_inv (item))) 1803 if ((tmp = item->in_player ()))
2096 esrv_update_item (UPD_ANIM, tmp, item); 1804 esrv_update_item (UPD_ANIM, tmp, item);
2097 } 1805 }
2098 } 1806 }
2099 else if (item->type == ROD || item->type == HORN) 1807 else if (item->type == ROD || item->type == HORN)
2100 {
2101 drain_rod_charge (item); 1808 drain_rod_charge (item);
2102 }
2103 } 1809 }
2104} 1810}
2105 1811
2106/* Received a fire command for the player - go and do it. 1812/* Received a fire command for the player - go and do it.
2107 */ 1813 */
… …
2130 case range_misc: 1836 case range_misc:
2131 fire_misc_object (op, dir); 1837 fire_misc_object (op, dir);
2132 return; 1838 return;
2133 1839
2134 case range_golem: /* Control summoned monsters from scrolls */ 1840 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) 1841 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2136 { 1842 {
2137 op->contr->ranges[range_golem] = NULL; 1843 op->contr->ranges[range_golem] = 0;
2138 op->contr->shoottype = range_none; 1844 op->contr->shoottype = range_none;
2139 op->contr->golem_count = 0;
2140 } 1845 }
2141 else 1846 else
2142 control_golem (op->contr->ranges[range_golem], dir); 1847 control_golem (op->contr->ranges[range_golem], dir);
2143 return; 1848 return;
2144 1849
… …
2147 { 1852 {
2148 if (op->type == PLAYER) 1853 if (op->type == PLAYER)
2149 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2150 return; 1855 return;
2151 } 1856 }
1857
2152 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1858 do_skill (op, op, op->chosen_skill, dir, NULL);
2153 return; 1859 return;
2154 case range_builder: 1860 case range_builder:
2155 apply_map_builder (op, dir); 1861 apply_map_builder (op, dir);
2156 return; 1862 return;
2157 default: 1863 default:
2158 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2159 return; 1865 return;
2160 } 1866 }
2161} 1867}
2162
2163
2164 1868
2165/* find_key 1869/* find_key
2166 * We try to find a key for the door as passed. If we find a key 1870 * We try to find a key for the door as passed. If we find a key
2167 * and successfully use it, we return the key, otherwise NULL 1871 * and successfully use it, we return the key, otherwise NULL
2168 * This function merges both normal and locked door, since the logic 1872 * This function merges both normal and locked door, since the logic
… …
2170 * pl is the player, 1874 * pl is the player,
2171 * inv is the objects inventory to searched 1875 * inv is the objects inventory to searched
2172 * door is the door we are trying to match against. 1876 * door is the door we are trying to match against.
2173 * This function can be called recursively to search containers. 1877 * This function can be called recursively to search containers.
2174 */ 1878 */
2175
2176object * 1879object *
2177find_key (object *pl, object *container, object *door) 1880find_key (object *pl, object *container, object *door)
2178{ 1881{
2179 object *tmp, *key; 1882 object *tmp, *key;
2180 1883
2181 /* Should not happen, but sanity checking is never bad */ 1884 /* Should not happen, but sanity checking is never bad */
2182 if (container->inv == NULL) 1885 if (!container->inv)
2183 return NULL; 1886 return 0;
2184 1887
2185 /* First, lets try to find a key in the top level inventory */ 1888 /* First, lets try to find a key in the top level inventory */
2186 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = container->inv; tmp; tmp = tmp->below)
2187 { 1890 {
2188 if (door->type == DOOR && tmp->type == KEY) 1891 if (door->type == DOOR && tmp->type == KEY)
2189 break; 1892 break;
2190 /* For sanity, we should really check door type, but other stuff 1893 /* For sanity, we should really check door type, but other stuff
2191 * (like containers) can be locked with special keys 1894 * (like containers) can be locked with special keys
2192 */ 1895 */
2193 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2194 break; 1897 break;
2195 } 1898 }
1899
2196 /* No key found - lets search inventories now */ 1900 /* No key found - lets search inventories now */
2197 /* If we find and use a key in an inventory, return at that time. 1901 /* If we find and use a key in an inventory, return at that time.
2198 * otherwise, if we search all the inventories and still don't find 1902 * otherwise, if we search all the inventories and still don't find
2199 * a key, return 1903 * a key, return
2200 */ 1904 */
2201 if (!tmp) 1905 if (!tmp)
2202 { 1906 {
2203 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1907 for (tmp = container->inv; tmp; tmp = tmp->below)
2204 { 1908 {
2205 /* No reason to search empty containers */ 1909 /* No reason to search empty containers */
2206 if (tmp->type == CONTAINER && tmp->inv) 1910 if (tmp->type == CONTAINER && tmp->inv)
2207 { 1911 {
2208 if ((key = find_key (pl, tmp, door)) != NULL) 1912 if ((key = find_key (pl, tmp, door)))
2209 return key; 1913 return key;
2210 } 1914 }
2211 } 1915 }
1916
2212 if (!tmp) 1917 if (!tmp)
2213 return NULL; 1918 return NULL;
2214 } 1919 }
1920
2215 /* We get down here if we have found a key. Now if its in a container, 1921 /* We get down here if we have found a key. Now if its in a container,
2216 * see if we actually want to use it 1922 * see if we actually want to use it
2217 */ 1923 */
2218 if (pl != container) 1924 if (pl != container)
2219 { 1925 {
… …
2240 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1946 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)); 1947 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2242 return NULL; 1948 return NULL;
2243 } 1949 }
2244 } 1950 }
1951
2245 return tmp; 1952 return tmp;
2246} 1953}
2247 1954
2248/* moved door processing out of move_player_attack. 1955/* moved door processing out of move_player_attack.
2249 * returns 1 if player has opened the door with a key 1956 * returns 1 if player has opened the door with a key
… …
2251 * 0 otherwise 1958 * 0 otherwise
2252 */ 1959 */
2253static int 1960static int
2254player_attack_door (object *op, object *door) 1961player_attack_door (object *op, object *door)
2255{ 1962{
2256
2257 /* If its a door, try to find a use a key. If we do destroy the door, 1963 /* If its a door, try to find a use a key. If we do destroy the door,
2258 * might as well return immediately as there is nothing more to do - 1964 * might as well return immediately as there is nothing more to do -
2259 * otherwise, we fall through to the rest of the code. 1965 * otherwise, we fall through to the rest of the code.
2260 */ 1966 */
2261 object *key = find_key (op, op, door); 1967 object *key = find_key (op, op, door);
… …
2268 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2269 if (action_makes_visible (op)) 1975 if (action_makes_visible (op))
2270 make_visible (op); 1976 make_visible (op);
2271 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2272 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1979
2273 if (door->type == DOOR) 1980 if (door->type == DOOR)
2274 {
2275 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2276 }
2277 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
2278 { 1983 {
2279 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1984 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2280 remove_door2 (door); /* remove door without violence ;-) */ 1985 remove_door2 (door); /* remove door without violence ;-) */
2281 } 1986 }
1987
2282 /* Do this after we print the message */ 1988 /* Do this after we print the message */
2283 decrease_ob (key); /* Use up one of the keys */ 1989 decrease_ob (key); /* Use up one of the keys */
2284 /* Need to update the weight the container the key was in */ 1990 /* Need to update the weight the container the key was in */
2285 if (container != op) 1991 if (container != op)
2286 esrv_update_item (UPD_WEIGHT, op, container); 1992 esrv_update_item (UPD_WEIGHT, op, container);
1993
2287 return 1; /* Nothing more to do below */ 1994 return 1; /* Nothing more to do below */
2288 } 1995 }
2289 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2290 { 1997 {
2291 /* Might as well return now - no other way to open this */ 1998 /* Might as well return now - no other way to open this */
2292 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1999 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2293 return 1; 2000 return 1;
2294 } 2001 }
2002
2295 return 0; 2003 return 0;
2296} 2004}
2297 2005
2298/* This function is just part of a breakup from move_player. 2006/* This function is just part of a breakup from move_player.
2299 * It should keep the code cleaner. 2007 * It should keep the code cleaner.
2300 * When this is called, the players direction has been updated 2008 * When this is called, the players direction has been updated
2301 * (taking into account confusion.) The player is also actually 2009 * (taking into account confusion.) The player is also actually
2302 * going to try and move (not fire weapons). 2010 * going to try and move (not fire weapons).
2303 */ 2011 */
2304
2305void 2012void
2306move_player_attack (object *op, int dir) 2013move_player_attack (object *op, int dir)
2307{ 2014{
2308 object *tmp, *mon; 2015 object *tmp, *mon;
2309 sint16 nx, ny; 2016 sint16 nx, ny;
… …
2311 maptile *m; 2018 maptile *m;
2312 2019
2313 nx = freearr_x[dir] + op->x; 2020 nx = freearr_x[dir] + op->x;
2314 ny = freearr_y[dir] + op->y; 2021 ny = freearr_y[dir] + op->y;
2315 2022
2316 on_battleground = op_on_battleground (op, NULL, NULL); 2023 on_battleground = op_on_battleground (op, 0, 0);
2317 2024
2318 /* If braced, or can't move to the square, and it is not out of the 2025 /* If braced, or can't move to the square, and it is not out of the
2319 * map, attack it. Note order of if statement is important - don't 2026 * map, attack it. Note order of if statement is important - don't
2320 * want to be calling move_ob if braced, because move_ob will move the 2027 * want to be calling move_ob if braced, because move_ob will move the
2321 * player. This is a pretty nasty hack, because if we could 2028 * player. This is a pretty nasty hack, because if we could
… …
2326 */ 2033 */
2327 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2034 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2328 { 2035 {
2329 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2036 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2330 { 2037 {
2331 m = get_map_from_coord (op->map, &nx, &ny); 2038 m = op->map->xy_find (nx, ny);
2332 if (!m) 2039 if (!m)
2333 return; /* Don't think this should happen */ 2040 return; /* Don't think this should happen */
2334 } 2041 }
2335 else 2042 else
2336 m = op->map; 2043 m = op->map;
2337 2044
2338 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2045 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; 2046 return;
2342 }
2343 2047
2344 mon = NULL; 2048 mon = 0;
2345 /* Go through all the objects, and find ones of interest. Only stop if 2049 /* Go through all the objects, and find ones of interest. Only stop if
2346 * we find a monster - that is something we know we want to attack. 2050 * we find a monster - that is something we know we want to attack.
2347 * if its a door or barrel (can roll) see if there may be monsters 2051 * if its a door or barrel (can roll) see if there may be monsters
2348 * on the space 2052 * on the space
2349 */ 2053 */
2350 while (tmp != NULL) 2054 while (tmp)
2351 { 2055 {
2352 if (tmp == op) 2056 if (tmp == op)
2353 { 2057 {
2354 tmp = tmp->above; 2058 tmp = tmp->above;
2355 continue; 2059 continue;
2356 } 2060 }
2061
2357 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 2062 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2358 { 2063 {
2359 mon = tmp; 2064 mon = tmp;
2360 break; 2065 break;
2361 } 2066 }
2067
2362 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) 2068 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2363 mon = tmp; 2069 mon = tmp;
2070
2364 tmp = tmp->above; 2071 tmp = tmp->above;
2365 } 2072 }
2366 2073
2367 if (mon == NULL) /* This happens anytime the player tries to move */ 2074 if (!mon) /* This happens anytime the player tries to move */
2368 return; /* into a wall */ 2075 return; /* into a wall */
2369 2076
2370 if (mon->head != NULL) 2077 if (mon->head)
2371 mon = mon->head; 2078 mon = mon->head;
2372 2079
2373 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2080 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2374 if (player_attack_door (op, mon)) 2081 if (player_attack_door (op, mon))
2375 return; 2082 return;
… …
2387 * player owns it and it is either friendly or unagressive. 2094 * player owns it and it is either friendly or unagressive.
2388 */ 2095 */
2389 if ((op->type == PLAYER) 2096 if ((op->type == PLAYER)
2390#if COZY_SERVER 2097#if COZY_SERVER
2391 && 2098 &&
2392 ((get_owner (mon) && get_owner (mon)->contr 2099 ((mon->owner && mon->owner->contr
2393 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2100 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2394#else 2101#else
2395 && get_owner (mon) == op 2102 && mon->owner == op
2396#endif 2103#endif
2397 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2104 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2398 { 2105 {
2399 /* If we're braced, we don't want to switch places with it */ 2106 /* If we're braced, we don't want to switch places with it */
2400 if (op->contr->braced) 2107 if (op->contr->braced)
2401 return; 2108 return;
2109
2402 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2110 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2403 (void) push_ob (mon, dir, op); 2111 (void) push_ob (mon, dir, op);
2404 if (op->contr->tmp_invis || op->hide) 2112 if (op->contr->tmp_invis || op->hide)
2405 make_visible (op); 2113 make_visible (op);
2114
2406 return; 2115 return;
2407 } 2116 }
2408 2117
2409 /* in certain circumstances, you shouldn't attack friendly 2118 /* in certain circumstances, you shouldn't attack friendly
2410 * creatures. Note that if you are braced, you can't push 2119 * creatures. Note that if you are braced, you can't push
… …
2412 * attack them either. 2121 * attack them either.
2413 */ 2122 */
2414 if ((mon->type == PLAYER || mon->enemy != op) && 2123 if ((mon->type == PLAYER || mon->enemy != op) &&
2415 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2124 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2416#ifdef PROHIBIT_PLAYERKILL 2125#ifdef PROHIBIT_PLAYERKILL
2417 (op->contr->peaceful 2126 (op->contr->peaceful
2418 || (mon->type == PLAYER 2127 || (mon->type == PLAYER
2419 && mon->contr-> 2128 && mon->contr->
2420 peaceful)) && 2129 peaceful)) &&
2421#else 2130#else
2422 op->contr->peaceful && 2131 op->contr->peaceful &&
2423#endif 2132#endif
2424 !on_battleground)) 2133 !on_battleground))
2425 { 2134 {
2426 if (!op->contr->braced) 2135 if (!op->contr->braced)
2427 { 2136 {
2428 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2137 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2429 (void) push_ob (mon, dir, op); 2138 push_ob (mon, dir, op);
2430 } 2139 }
2431 else 2140 else
2432 {
2433 new_draw_info (0, 0, op, "You withhold your attack"); 2141 new_draw_info (0, 0, op, "You withhold your attack");
2434 } 2142
2435 if (op->contr->tmp_invis || op->hide) 2143 if (op->contr->tmp_invis || op->hide)
2436 make_visible (op); 2144 make_visible (op);
2437 } 2145 }
2438 2146
2439 /* If the object is a boulder or other rollable object, then 2147 /* 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 2158 * 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: 2159 * 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 2160 * 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. 2161 * that party_number -1 is no party, so attacks can still happen.
2454 */ 2162 */
2455
2456 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2163 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))) 2164 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2458 { 2165 {
2459 2166
2460 /* If the player hasn't hit something this tick, and does 2167 /* If the player hasn't hit something this tick, and does
… …
2467 op->speed_left += op->speed / op->contr->weapon_sp; 2174 op->speed_left += op->speed / op->contr->weapon_sp;
2468 2175
2469 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2176 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2470 } 2177 }
2471 2178
2472 skill_attack (mon, op, 0, NULL, NULL); 2179 skill_attack (mon, op, 0, 0, 0);
2473 2180
2474 /* If attacking another player, that player gets automatic 2181 /* If attacking another player, that player gets automatic
2475 * hitback, and doesn't loose luck either. 2182 * hitback, and doesn't loose luck either.
2476 * Disable hitback on the battleground or if the target is 2183 * Disable hitback on the battleground or if the target is
2477 * the wiz. 2184 * the wiz.
… …
2479 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2186 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2480 { 2187 {
2481 short luck = mon->stats.luck; 2188 short luck = mon->stats.luck;
2482 2189
2483 mon->contr->has_hit = 1; 2190 mon->contr->has_hit = 1;
2484 skill_attack (op, mon, 0, NULL, NULL); 2191 skill_attack (op, mon, 0, 0, 0);
2485 mon->stats.luck = luck; 2192 mon->stats.luck = luck;
2486 } 2193 }
2194
2487 if (action_makes_visible (op)) 2195 if (action_makes_visible (op))
2488 make_visible (op); 2196 make_visible (op);
2489 } 2197 }
2490 } /* if player should attack something */ 2198 } /* if player should attack something */
2491} 2199}
… …
2493int 2201int
2494move_player (object *op, int dir) 2202move_player (object *op, int dir)
2495{ 2203{
2496 int pick; 2204 int pick;
2497 2205
2498 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2206 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2499 return 0; 2207 return 0;
2500 2208
2501 /* Sanity check: make sure dir is valid */ 2209 /* Sanity check: make sure dir is valid */
2502 if ((dir < 0) || (dir >= 9)) 2210 if ((dir < 0) || (dir >= 9))
2503 { 2211 {
2504 LOG (llevError, "move_player: invalid direction %d\n", dir); 2212 LOG (llevError, "move_player: invalid direction %d\n", dir);
2505 return 0; 2213 return 0;
2506 } 2214 }
2507 2215
2508 /* peterm: added following line */ 2216 /* peterm: added following line */
2509 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2510 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2511 2219
2512 op->facing = dir; 2220 op->facing = dir;
2513 2221
2514 if (op->hide) 2222 if (op->hide)
2515 do_hidden_move (op); 2223 do_hidden_move (op);
… …
2526 2234
2527 /* Add special check for newcs players and fire on - this way, the 2235 /* Add special check for newcs players and fire on - this way, the
2528 * server can handle repeat firing. 2236 * server can handle repeat firing.
2529 */ 2237 */
2530 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2238 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2531 {
2532 op->direction = dir; 2239 op->direction = dir;
2533 }
2534 else 2240 else
2535 {
2536 op->direction = 0; 2241 op->direction = 0;
2537 } 2242
2538 /* Update how the player looks. Use the facing, so direction may 2243 /* Update how the player looks. Use the facing, so direction may
2539 * get reset to zero. This allows for full animation capabilities 2244 * get reset to zero. This allows for full animation capabilities
2540 * for players. 2245 * for players.
2541 */ 2246 */
2542 animate_object (op, op->facing); 2247 animate_object (op, op->facing);
… …
2551 * Returns true if there are more actions we can do. 2256 * Returns true if there are more actions we can do.
2552 */ 2257 */
2553int 2258int
2554handle_newcs_player (object *op) 2259handle_newcs_player (object *op)
2555{ 2260{
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)) 2261 if (QUERY_FLAG (op, FLAG_SCARED))
2577 { 2262 {
2578 flee_player (op); 2263 flee_player (op);
2579 /* If player is still scared, that is his action for this tick */ 2264 /* If player is still scared, that is his action for this tick */
2580 if (QUERY_FLAG (op, FLAG_SCARED)) 2265 if (QUERY_FLAG (op, FLAG_SCARED))
… …
2587 /* I've been seeing crashes where the golem has been destroyed, but 2272 /* 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 2273 * 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 2274 * 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. 2275 * put this in a a workaround to clean up the golem pointer.
2591 */ 2276 */
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))) 2277 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2594 {
2595 op->contr->ranges[range_golem] = NULL; 2278 op->contr->ranges[range_golem] = 0;
2596 op->contr->golem_count = 0;
2597 }
2598 2279
2599 /* call this here - we also will call this in do_ericserver, but 2280 /* call this here - we also will call this in do_ericserver, but
2600 * the players time has been increased when doericserver has been 2281 * the players time has been increased when doericserver has been
2601 * called, so we recheck it here. 2282 * called, so we recheck it here.
2602 */ 2283 */
2603 HandleClient (&op->contr->socket, op->contr); 2284 if (op->contr->ns->handle_command ())
2285 return 1;
2286
2604 if (op->speed_left < 0) 2287 if (op->speed_left > 0)
2605 return 0; 2288 {
2606
2607 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2289 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2608 { 2290 {
2609 /* All move commands take 1 tick, at least for now */ 2291 /* All move commands take 1 tick, at least for now */
2610 op->speed_left--; 2292 op->speed_left--;
2611 2293
2612 /* Instead of all the stuff below, let move_player take care 2294 /* Instead of all the stuff below, let move_player take care
2613 * of it. Also, some of the skill stuff is only put in 2295 * of it. Also, some of the skill stuff is only put in
2614 * there, as well as the confusion stuff. 2296 * there, as well as the confusion stuff.
2615 */ 2297 */
2616 move_player (op, op->direction); 2298 move_player (op, op->direction);
2617 if (op->speed_left > 0) 2299
2618 return 1; 2300 return op->speed_left > 0;
2619 else 2301 }
2620 return 0;
2621 } 2302 }
2303
2622 return 0; 2304 return 0;
2623} 2305}
2624 2306
2625int 2307int
2626save_life (object *op) 2308save_life (object *op)
2627{ 2309{
2628 object *tmp;
2629
2630 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2310 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2631 return 0; 2311 return 0;
2632 2312
2633 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2313 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2634 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2314 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2635 { 2315 {
2636 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2316 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)); 2317 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2318
2638 if (op->contr) 2319 if (op->contr)
2639 esrv_del_item (op->contr, tmp->count); 2320 esrv_del_item (op->contr, tmp->count);
2640 remove_ob (tmp); 2321
2641 free_object (tmp); 2322 tmp->destroy ();
2642 CLEAR_FLAG (op, FLAG_LIFESAVE); 2323 CLEAR_FLAG (op, FLAG_LIFESAVE);
2324
2643 if (op->stats.hp < 0) 2325 if (op->stats.hp < 0)
2644 op->stats.hp = op->stats.maxhp; 2326 op->stats.hp = op->stats.maxhp;
2327
2645 if (op->stats.food < 0) 2328 if (op->stats.food < 0)
2646 op->stats.food = 999; 2329 op->stats.food = 999;
2647 fix_player (op); 2330
2331 op->update_stats ();
2648 return 1; 2332 return 1;
2649 } 2333 }
2334
2650 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2335 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2651 CLEAR_FLAG (op, FLAG_LIFESAVE); 2336 CLEAR_FLAG (op, FLAG_LIFESAVE);
2652 enter_player_savebed (op); /* bring him home. */ 2337 enter_player_savebed (op); /* bring him home. */
2653 return 0; 2338 return 0;
2654} 2339}
… …
2659 * from. 2344 * from.
2660 */ 2345 */
2661void 2346void
2662remove_unpaid_objects (object *op, object *env) 2347remove_unpaid_objects (object *op, object *env)
2663{ 2348{
2664 object *next;
2665
2666 while (op) 2349 while (op)
2667 { 2350 {
2668 next = op->below; /* Make sure we have a good value, in case 2351 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2669 * we remove object 'op' 2352
2670 */
2671 if (QUERY_FLAG (op, FLAG_UNPAID)) 2353 if (QUERY_FLAG (op, FLAG_UNPAID))
2672 { 2354 {
2673 remove_ob (op);
2674 op->x = env->x;
2675 op->y = env->y;
2676 if (env->type == PLAYER) 2355 if (env->type == PLAYER)
2677 esrv_del_item (env->contr, op->count); 2356 esrv_del_item (env->contr, op->count);
2678 insert_ob_in_map (op, env->map, NULL, 0); 2357
2358 op->insert_at (env);
2679 } 2359 }
2680 else if (op->inv) 2360 else if (op->inv)
2681 remove_unpaid_objects (op->inv, env); 2361 remove_unpaid_objects (op->inv, env);
2362
2682 op = next; 2363 op = next;
2683 } 2364 }
2684} 2365}
2685
2686 2366
2687/* 2367/*
2688 * Returns pointer a static string containing gravestone text 2368 * Returns pointer a static string containing gravestone text
2689 * Moved from apply.c to player.c - player.c is what 2369 * Moved from apply.c to player.c - player.c is what
2690 * actually uses this function. player.c may not be quite the 2370 * actually uses this function. player.c may not be quite the
… …
2701 strcpy (buf2, " R.I.P.\n\n"); 2381 strcpy (buf2, " R.I.P.\n\n");
2702 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2703 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2383 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2704 else 2384 else
2705 sprintf (buf, "%s\n", &op->name); 2385 sprintf (buf, "%s\n", &op->name);
2386
2706 strncat (buf2, " ", 20 - strlen (buf) / 2); 2387 strncat (buf2, " ", 20 - strlen (buf) / 2);
2707 strcat (buf2, buf); 2388 strcat (buf2, buf);
2708 if (op->type == PLAYER) 2389 if (op->type == PLAYER)
2709 sprintf (buf, "who was in level %d when killed\n", op->level); 2390 sprintf (buf, "who was in level %d when killed\n", op->level);
2710 else 2391 else
2711 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2392 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2393
2712 strncat (buf2, " ", 20 - strlen (buf) / 2); 2394 strncat (buf2, " ", 20 - strlen (buf) / 2);
2713 strcat (buf2, buf); 2395 strcat (buf2, buf);
2714 if (op->type == PLAYER) 2396 if (op->type == PLAYER)
2715 { 2397 {
2716 sprintf (buf, "by %s.\n\n", op->contr->killer); 2398 sprintf (buf, "by %s.\n\n", op->contr->killer);
2717 strncat (buf2, " ", 21 - strlen (buf) / 2); 2399 strncat (buf2, " ", 21 - strlen (buf) / 2);
2718 strcat (buf2, buf); 2400 strcat (buf2, buf);
2719 } 2401 }
2402
2720 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2403 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2721 strncat (buf2, " ", 20 - strlen (buf) / 2); 2404 strncat (buf2, " ", 20 - strlen (buf) / 2);
2722 strcat (buf2, buf); 2405 strcat (buf2, buf);
2406
2723 return buf2; 2407 return buf2;
2724} 2408}
2725
2726
2727 2409
2728void 2410void
2729do_some_living (object *op) 2411do_some_living (object *op)
2730{ 2412{
2731 int last_food = op->stats.food; 2413 int last_food = op->stats.food;
… …
2737 int rate_grace = 2000; 2419 int rate_grace = 2000;
2738 const int max_hp = 1; 2420 const int max_hp = 1;
2739 const int max_sp = 1; 2421 const int max_sp = 1;
2740 const int max_grace = 1; 2422 const int max_grace = 1;
2741 2423
2424 if (op->contr->hidden)
2425 {
2426 op->invisible = 1000;
2427 /* the socket code flashes the player visible/invisible
2428 * depending on the value of invisible, so we need to
2429 * alternate it here for it to work correctly.
2430 */
2431 if (pticks & 2)
2432 op->invisible--;
2433 }
2434 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2435 {
2436 if (!op->invisible--)
2437 {
2438 make_visible (op);
2439 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440 }
2441 }
2442
2742 if (op->contr->outputs_sync) 2443 if (op->contr->outputs_sync)
2743 {
2744 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2444 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) 2445 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2746 flush_output_element (op, &op->contr->outputs[i]); 2446 flush_output_element (op, &op->contr->outputs[i]);
2747 }
2748 2447
2749 if (op->contr->state == ST_PLAYING) 2448 if (op->contr->ns->state == ST_PLAYING)
2750 { 2449 {
2751
2752 /* these next three if clauses make it possible to SLOW DOWN 2450 /* these next three if clauses make it possible to SLOW DOWN
2753 hp/grace/spellpoint regeneration. */ 2451 hp/grace/spellpoint regeneration. */
2754 if (op->contr->gen_hp >= 0) 2452 if (op->contr->gen_hp >= 0)
2755 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2453 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2756 else 2454 else
2757 { 2455 {
2758 gen_hp = op->stats.maxhp; 2456 gen_hp = op->stats.maxhp;
2759 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2457 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2760 } 2458 }
2459
2761 if (op->contr->gen_sp >= 0) 2460 if (op->contr->gen_sp >= 0)
2762 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2461 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2763 else 2462 else
2764 { 2463 {
2765 gen_sp = op->stats.maxsp; 2464 gen_sp = op->stats.maxsp;
2766 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2465 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2767 } 2466 }
2467
2768 if (op->contr->gen_grace >= 0) 2468 if (op->contr->gen_grace >= 0)
2769 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2469 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2770 else 2470 else
2771 { 2471 {
2772 gen_grace = op->stats.maxgrace; 2472 gen_grace = op->stats.maxgrace;
… …
2788 op->stats.food += op->contr->digestion; 2488 op->stats.food += op->contr->digestion;
2789 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2489 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2790 op->stats.food = last_food; 2490 op->stats.food = last_food;
2791 } 2491 }
2792 } 2492 }
2493
2793 if (max_sp > 1) 2494 if (max_sp > 1)
2794 { 2495 {
2795 over_sp = (gen_sp + 10) / rate_sp; 2496 over_sp = (gen_sp + 10) / rate_sp;
2796 if (over_sp > 0) 2497 if (over_sp > 0)
2797 { 2498 {
2798 if (op->stats.sp < op->stats.maxsp) 2499 if (op->stats.sp < op->stats.maxsp)
2799 { 2500 {
2800 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2501 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2502
2801 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2503 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2802 op->stats.sp--; 2504 op->stats.sp--;
2505
2803 if (op->stats.sp > op->stats.maxsp) 2506 if (op->stats.sp > op->stats.maxsp)
2804 op->stats.sp = op->stats.maxsp; 2507 op->stats.sp = op->stats.maxsp;
2805 } 2508 }
2806 op->last_sp = 0; 2509 op->last_sp = 0;
2807 } 2510 }
2808 else 2511 else
2809 {
2810 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2512 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2811 }
2812 } 2513 }
2813 else 2514 else
2814 {
2815 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2515 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2816 }
2817 } 2516 }
2818 2517
2819 /* Regenerate Grace */ 2518 /* Regenerate Grace */
2820 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2519 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2821 if (--op->last_grace < 0) 2520 if (--op->last_grace < 0)
2822 { 2521 {
2823 if (op->stats.grace < op->stats.maxgrace / 2) 2522 if (op->stats.grace < op->stats.maxgrace / 2)
2824 op->stats.grace++; /* no penalty in food for regaining grace */ 2523 op->stats.grace++; /* no penalty in food for regaining grace */
2524
2825 if (max_grace > 1) 2525 if (max_grace > 1)
2826 { 2526 {
2827 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2527 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2828 if (over_grace > 0) 2528 if (over_grace > 0)
2829 { 2529 {
… …
2857 op->stats.food += op->contr->digestion; 2557 op->stats.food += op->contr->digestion;
2858 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2558 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2859 op->stats.food = last_food; 2559 op->stats.food = last_food;
2860 } 2560 }
2861 } 2561 }
2562
2862 if (max_hp > 1) 2563 if (max_hp > 1)
2863 { 2564 {
2864 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2565 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2865 if (over_hp > 0) 2566 if (over_hp > 0)
2866 { 2567 {
… …
2890 2591
2891 if (op->contr->gen_hp > 0) 2592 if (op->contr->gen_hp > 0)
2892 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2593 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2893 else 2594 else
2894 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2595 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2596
2895 /* dms do not consume food */ 2597 /* dms do not consume food */
2896 if (!QUERY_FLAG (op, FLAG_WIZ)) 2598 if (!QUERY_FLAG (op, FLAG_WIZ))
2897 op->stats.food--; 2599 op->stats.food--;
2898 } 2600 }
2899 }
2900 2601
2901 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2602 if (op->stats.food < 0 && op->stats.hp >= 0)
2902 { 2603 {
2903 object *tmp, *flesh = NULL; 2604 object *tmp, *flesh = 0;
2904 2605
2905 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2606 for (tmp = op->inv; tmp; tmp = tmp->below)
2906 { 2607 {
2907 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2608 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2908 {
2909 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2910 { 2609 {
2610 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2611 {
2911 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2612 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2912 manual_apply (op, tmp, 0); 2613 manual_apply (op, tmp, 0);
2913 if (op->stats.food >= 0 || op->stats.hp < 0) 2614 if (op->stats.food >= 0 || op->stats.hp < 0)
2914 break; 2615 break;
2915 } 2616 }
2916 else if (tmp->type == FLESH) 2617 else if (tmp->type == FLESH)
2917 flesh = tmp; 2618 flesh = tmp;
2918 } /* End if paid for object */ 2619 } /* End if paid for object */
2919 } /* end of for loop */ 2620 } /* end of for loop */
2621
2920 /* If player is still starving, it means they don't have any food, so 2622 /* If player is still starving, it means they don't have any food, so
2921 * eat flesh instead. 2623 * eat flesh instead.
2922 */ 2624 */
2923 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2625 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2924 { 2626 {
2925 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2627 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2926 manual_apply (op, flesh, 0); 2628 manual_apply (op, flesh, 0);
2927 } 2629 }
2928 } /* end if player is starving */ 2630 }
2929 2631
2930 while (op->stats.food < 0 && op->stats.hp > 0) 2632 while (op->stats.food < 0 && op->stats.hp >= 0)
2931 op->stats.food++, op->stats.hp--; 2633 op->stats.food++, op->stats.hp--;
2932 2634
2933 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2635 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2934 kill_player (op); 2636 kill_player (op);
2637 }
2935} 2638}
2936
2937
2938 2639
2939/* If the player should die (lack of hp, food, etc), we call this. 2640/* If the player should die (lack of hp, food, etc), we call this.
2940 * op is the player in jeopardy. If the player can not be saved (not 2641 * op is the player in jeopardy. If the player can not be saved (not
2941 * permadeath, no lifesave), this will take care of removing the player 2642 * permadeath, no lifesave), this will take care of removing the player
2942 * file. 2643 * file.
… …
2972 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2673 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2973 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2674 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2974 2675
2975 /* restore player */ 2676 /* restore player */
2976 at = archetype::find ("poisoning"); 2677 at = archetype::find ("poisoning");
2977 tmp = present_arch_in_ob (at, op); 2678 if (object *tmp = present_arch_in_ob (at, op))
2978 if (tmp)
2979 { 2679 {
2980 remove_ob (tmp); 2680 tmp->destroy ();
2981 free_object (tmp);
2982 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2681 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2983 } 2682 }
2984 2683
2985 at = archetype::find ("confusion"); 2684 at = archetype::find ("confusion");
2986 tmp = present_arch_in_ob (at, op); 2685 if (object *tmp = present_arch_in_ob (at, op))
2987 if (tmp)
2988 { 2686 {
2989 remove_ob (tmp); 2687 tmp->destroy ();
2990 free_object (tmp);
2991 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2688 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2992 } 2689 }
2993 2690
2994 cure_disease (op, 0); /* remove any disease */ 2691 cure_disease (op, 0); /* remove any disease */
2995 op->stats.hp = op->stats.maxhp; 2692 op->stats.hp = op->stats.maxhp;
2996 if (op->stats.food <= 0) 2693 if (op->stats.food <= 0)
2997 op->stats.food = 999; 2694 op->stats.food = 999;
2998 2695
2999 /* create a bodypart-trophy to make the winner happy */ 2696 /* create a bodypart-trophy to make the winner happy */
3000 tmp = arch_to_object (archetype::find ("finger")); 2697 if (object *tmp = arch_to_object (archetype::find ("finger")))
3001 if (tmp != NULL)
3002 { 2698 {
3003 sprintf (buf, "%s's finger", &op->name); 2699 sprintf (buf, "%s's finger", &op->name);
3004 tmp->name = buf; 2700 tmp->name = buf;
3005 sprintf (buf, " This finger has been cut off %s\n" 2701 sprintf (buf, " This finger has been cut off %s\n"
3006 " the %s, when he was defeated at\n level %d by %s.\n", 2702 " the %s, when he was defeated at\n level %d by %s.\n",
3007 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2703 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
3008 tmp->msg = buf; 2704 tmp->msg = buf;
3009 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2705 tmp->value = 0, tmp->type = 0;
3010 tmp->materialname = NULL; 2706 tmp->materialname = "organics";
3011 tmp->x = op->x, tmp->y = op->y; 2707 tmp->insert_at (op, tmp);
3012 insert_ob_in_map (tmp, op->map, op, 0);
3013 } 2708 }
3014 2709
3015 /* teleport defeated player to new destination */ 2710 /* teleport defeated player to new destination */
3016 transfer_ob (op, x, y, 0, NULL); 2711 transfer_ob (op, x, y, 0, NULL);
3017 op->contr->braced = 0; 2712 op->contr->braced = 0;
… …
3022 2717
3023 command_kill_pets (op, 0); 2718 command_kill_pets (op, 0);
3024 2719
3025 if (op->stats.food < 0) 2720 if (op->stats.food < 0)
3026 { 2721 {
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); 2722 sprintf (buf, "%s starved to death.", &op->name);
3035 strcpy (op->contr->killer, "starvation"); 2723 strcpy (op->contr->killer, "starvation");
3036 } 2724 }
3037 else 2725 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); 2726 sprintf (buf, "%s died.", &op->name);
3047 } 2727
3048 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2728 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3049 2729
3050 /* save the map location for corpse, gravestone */ 2730 /* save the map location for corpse, gravestone */
3051 x = op->x; 2731 x = op->x;
3052 y = op->y; 2732 y = op->y;
3053 map = op->map; 2733 map = op->map;
3054 2734
3055
3056 if (settings.not_permadeth == TRUE)
3057 {
3058 /* NOT_PERMADEATH code. This basically brings the character back to 2735 /* NOT_PERMADEATH code. This basically brings the character back to
3059 * life if they are dead - it takes some exp and a random stat. 2736 * life if they are dead - it takes some exp and a random stat.
3060 * See the config.h file for a little more in depth detail about this. 2737 * See the config.h file for a little more in depth detail about this.
3061 */ 2738 */
3062 2739
3063 /* Basically two ways to go - remove a stat permanently, or just 2740 /* Basically two ways to go - remove a stat permanently, or just
3064 * make it depletion. This bunch of code deals with that aspect 2741 * make it depletion. This bunch of code deals with that aspect
3065 * of death. 2742 * of death.
3066 */ 2743 */
3067#ifndef COZY_SERVER 2744#ifndef COZY_SERVER
3068 if (settings.balanced_stat_loss) 2745 if (settings.balanced_stat_loss)
3069 { 2746 {
3070 /* If stat loss is permanent, lose one stat only. */ 2747 /* If stat loss is permanent, lose one stat only. */
3071 /* Lower level chars don't lose as many stats because they suffer 2748 /* Lower level chars don't lose as many stats because they suffer
3072 more if they do. */ 2749 more if they do. */
3073 /* Higher level characters can afford things such as potions of 2750 /* Higher level characters can afford things such as potions of
3074 restoration, or better, stat potions. So we slug them that 2751 restoration, or better, stat potions. So we slug them that
3075 little bit harder. */ 2752 little bit harder. */
3076 /* GD */ 2753 /* GD */
3077 if (settings.stat_loss_on_death) 2754 if (settings.stat_loss_on_death)
3078 num_stats_lose = 1; 2755 num_stats_lose = 1;
3079 else
3080 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3081 }
3082 else 2756 else
3083 { 2757 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2758 }
2759 else
3084 num_stats_lose = 1; 2760 num_stats_lose = 1;
3085 } 2761
3086 lost_a_stat = 0; 2762 lost_a_stat = 0;
3087 2763
3088 for (z = 0; z < num_stats_lose; z++) 2764 for (z = 0; z < num_stats_lose; z++)
3089 { 2765 {
3090 i = RANDOM () % NUM_STATS; 2766 i = RANDOM () % NUM_STATS;
3091 2767
3092 if (settings.stat_loss_on_death) 2768 if (settings.stat_loss_on_death)
3093 { 2769 {
3094 /* Pick a random stat and take a point off it. Tell the player 2770 /* Pick a random stat and take a point off it. Tell the player
3095 * what he lost. 2771 * what he lost.
3096 */ 2772 */
3097 change_attr_value (&(op->stats), i, -1); 2773 change_attr_value (&(op->stats), i, -1);
3098 check_stat_bounds (&(op->stats)); 2774 check_stat_bounds (&(op->stats));
3099 change_attr_value (&(op->contr->orig_stats), i, -1); 2775 change_attr_value (&(op->contr->orig_stats), i, -1);
3100 check_stat_bounds (&(op->contr->orig_stats)); 2776 check_stat_bounds (&(op->contr->orig_stats));
3101 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2777 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3102 lost_a_stat = 1; 2778 lost_a_stat = 1;
2779 }
2780 else
2781 {
2782 /* deplete a stat */
2783 archetype *deparch = archetype::find ("depletion");
2784 object *dep;
2785
2786 dep = present_arch_in_ob (deparch, op);
2787 if (!dep)
2788 {
2789 dep = arch_to_object (deparch);
2790 insert_ob_in_ob (dep, op);
3103 } 2791 }
3104 else 2792 lose_this_stat = 1;
2793 if (settings.balanced_stat_loss)
3105 { 2794 {
3106 /* deplete a stat */ 2795 /* GD */
3107 archetype *deparch = archetype::find ("depletion"); 2796 /* Get the stat that we're about to deplete. */
3108 object *dep; 2797 this_stat = get_attr_value (&(dep->stats), i);
3109 2798 if (this_stat < 0)
3110 dep = present_arch_in_ob (deparch, op);
3111 if (!dep)
3112 { 2799 {
3113 dep = arch_to_object (deparch); 2800 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3114 insert_ob_in_ob (dep, op); 2801 int keep_chance = this_stat * this_stat;
3115 } 2802
3116 lose_this_stat = 1; 2803 /* 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) 2804 if (keep_chance < 1)
2805 keep_chance = 1;
2806
2807 /* There is a maximum depletion total per level. */
2808 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3123 { 2809 {
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; 2810 lose_this_stat = 0;
3135 /* Take loss chance vs keep chance to see if we 2811 /* Take loss chance vs keep chance to see if we
3136 retain the stat. */ 2812 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 } 2813 }
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 */ 2814 else
3158 if (this_stat >= -50)
3159 { 2815 {
3160 change_attr_value (&(dep->stats), i, -1); 2816 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; 2817 lose_this_stat = 0;
2818 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2819 this_stat, keep_chance, loss_chance,
2820 lose_this_stat?"LOSE":"KEEP"); */
3165 } 2821 }
3166 } 2822 }
3167 } 2823 }
2824
2825 if (lose_this_stat)
2826 {
2827 this_stat = get_attr_value (&(dep->stats), i);
2828 /* We could try to do something clever like find another
2829 * stat to reduce if this fails. But chances are, if
2830 * stats have been depleted to -50, all are pretty low
2831 * and should be roughly the same, so it shouldn't make a
2832 * difference.
2833 */
2834 if (this_stat >= -50)
2835 {
2836 change_attr_value (&(dep->stats), i, -1);
2837 SET_FLAG (dep, FLAG_APPLIED);
2838 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2839 op->update_stats ();
2840 lost_a_stat = 1;
2841 }
3168 } 2842 }
2843 }
2844 }
3169 /* If no stat lost, tell the player. */ 2845 /* If no stat lost, tell the player. */
3170 if (!lost_a_stat) 2846 if (!lost_a_stat)
3171 { 2847 {
3172 /* determine_god() seems to not work sometimes... why is this? 2848 /* determine_god() seems to not work sometimes... why is this?
3173 Should I be using something else? GD */ 2849 Should I be using something else? GD */
3174 const char *god = determine_god (op); 2850 const char *god = determine_god (op);
3175 2851
3176 if (god && (strcmp (god, "none"))) 2852 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); 2853 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3178 else 2854 else
3179 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you."); 2855 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3180 } 2856 }
2857#else
2858 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3181#endif 2859#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 2860
3184 /* Put a gravestone up where the character 'almost' died. List the 2861 /* Put a gravestone up where the character 'almost' died. List the
3185 * exp loss on the stone. 2862 * exp loss on the stone.
3186 */ 2863 */
3187 tmp = arch_to_object (archetype::find ("gravestone")); 2864 tmp = arch_to_object (archetype::find ("gravestone"));
3188 sprintf (buf, "%s's gravestone", &op->name); 2865 sprintf (buf, "%s's gravestone", &op->name);
3189 tmp->name = buf; 2866 tmp->name = buf;
3190 sprintf (buf, "%s's gravestones", &op->name); 2867 sprintf (buf, "%s's gravestones", &op->name);
3191 tmp->name_pl = buf; 2868 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); 2869 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
3193 tmp->msg = buf; 2870 tmp->msg = buf;
3194 tmp->x = op->x, tmp->y = op->y; 2871 tmp->x = op->x, tmp->y = op->y;
3195 insert_ob_in_map (tmp, op->map, NULL, 0); 2872 insert_ob_in_map (tmp, op->map, NULL, 0);
3196 2873
3197 /**************************************/ 2874 /**************************************/
3198 /* */ 2875 /* */
3199 /* Subtract the experience points, */ 2876 /* Subtract the experience points, */
3200 /* if we died cause of food, give us */ 2877 /* if we died cause of food, give us */
3201 /* food, and reset HP's... */ 2878 /* food, and reset HP's... */
3202 /* */ 2879 /* */
3203
3204 /**************************************/ 2880 /**************************************/
3205 2881
3206 /* remove any poisoning and confusion the character may be suffering. */ 2882 /* remove any poisoning and confusion the character may be suffering. */
3207 /* restore player */ 2883 /* restore player */
3208 at = archetype::find ("poisoning"); 2884 at = archetype::find ("poisoning");
3209 tmp = present_arch_in_ob (at, op); 2885 tmp = present_arch_in_ob (at, op);
2886
3210 if (tmp) 2887 if (tmp)
3211 { 2888 {
3212 remove_ob (tmp); 2889 tmp->destroy ();
3213 free_object (tmp);
3214 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2890 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3215 } 2891 }
3216 2892
3217 at = archetype::find ("confusion"); 2893 at = archetype::find ("confusion");
3218 tmp = present_arch_in_ob (at, op); 2894 tmp = present_arch_in_ob (at, op);
3219 if (tmp) 2895 if (tmp)
3220 { 2896 {
3221 remove_ob (tmp); 2897 tmp->destroy ();
3222 free_object (tmp);
3223 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2898 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3224 } 2899 }
2900
3225 cure_disease (op, 0); /* remove any disease */ 2901 cure_disease (op, 0); /* remove any disease */
3226 2902
3227 /*add_exp(op, (op->stats.exp * -0.20)); */ 2903 /*add_exp(op, (op->stats.exp * -0.20)); */
3228 apply_death_exp_penalty (op); 2904 apply_death_exp_penalty (op);
3229 if (op->stats.food < 100) 2905 if (op->stats.food < 100)
3230 op->stats.food = 900; 2906 op->stats.food = 900;
3231 op->stats.hp = op->stats.maxhp; 2907 op->stats.hp = op->stats.maxhp;
3232 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2908 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3233 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2909 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3234 2910
3235 /* 2911 /*
3236 * Check to see if the player is in a shop. IF so, then check to see if 2912 * Check to see if the player has any unpaid items. If so, remove them
3237 * the player has any unpaid items. If so, remove them and put them back 2913 * and put them back in the map.
3238 * in the map. 2914 */
3239 */
3240
3241 if (is_in_shop (op))
3242 remove_unpaid_objects (op->inv, op); 2915 remove_unpaid_objects (op->inv, op);
3243 2916
3244 /****************************************/ 2917 /****************************************/
3245 /* */ 2918 /* */
3246 /* Move player to his current respawn- */ 2919 /* Move player to his current respawn- */
3247 /* position (usually last savebed) */ 2920 /* position (usually last savebed) */
3248 /* */ 2921 /* */
3249
3250 /****************************************/ 2922 /****************************************/
3251 2923
3252 enter_player_savebed (op); 2924 enter_player_savebed (op);
3253 2925
3254 /* Save the player before inserting the force to reduce
3255 * chance of abuse.
3256 */
3257 op->contr->braced = 0; 2926 op->contr->braced = 0;
3258 save_player (op, 1);
3259 2927
3260 /* it is possible that the player has blown something up 2928 /* it is possible that the player has blown something up
3261 * at his savebed location, and that can have long lasting 2929 * at his savebed location, and that can have long lasting
3262 * spell effects. So first see if there is a spell effect 2930 * spell effects. So first see if there is a spell effect
3263 * on the space that might harm the player. 2931 * on the space that might harm the player.
3264 */ 2932 */
3265 will_kill_again = 0; 2933 will_kill_again = 0;
3266 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2934 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3267 {
3268 if (tmp->type == SPELL_EFFECT) 2935 if (tmp->type == SPELL_EFFECT)
3269 will_kill_again |= tmp->attacktype; 2936 will_kill_again |= tmp->attacktype;
3270 } 2937
3271 if (will_kill_again) 2938 if (will_kill_again)
3272 { 2939 {
3273 object *force; 2940 object *force;
3274 int at; 2941 int at;
3275 2942
3276 force = get_archetype (FORCE_NAME); 2943 force = get_archetype (FORCE_NAME);
3277 /* 50 ticks should be enough time for the spell to abate */ 2944 /* 50 ticks should be enough time for the spell to abate */
3278 force->speed = 0.1; 2945 force->speed = 0.1;
3279 force->speed_left = -5.0; 2946 force->speed_left = -5.0;
3280 SET_FLAG (force, FLAG_APPLIED); 2947 SET_FLAG (force, FLAG_APPLIED);
3281 for (at = 0; at < NROFATTACKS; at++) 2948 for (at = 0; at < NROFATTACKS; at++)
3282 {
3283 if (will_kill_again & (1 << at)) 2949 if (will_kill_again & (1 << at))
3284 force->resist[at] = 100; 2950 force->resist[at] = 100;
3285 } 2951
3286 insert_ob_in_ob (force, op); 2952 insert_ob_in_ob (force, op);
3287 fix_player (op); 2953 op->update_stats ();
3288 2954
3289 } 2955 }
3290 2956
3291 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2957 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} 2958}
3360
3361 2959
3362void 2960void
3363loot_object (object *op) 2961loot_object (object *op)
3364{ /* Grab and destroy some treasure */ 2962{ /* Grab and destroy some treasure */
3365 object *tmp, *tmp2, *next; 2963 object *tmp, *tmp2, *next;
3366 2964
3367 if (op->container) 2965 op->close_container (); /* close open sack first */
3368 { /* close open sack first */
3369 esrv_apply_container (op, op->container);
3370 }
3371 2966
3372 for (tmp = op->inv; tmp != NULL; tmp = next) 2967 for (tmp = op->inv; tmp; tmp = next)
3373 { 2968 {
3374 next = tmp->below; 2969 next = tmp->below;
3375 if (tmp->type == EXPERIENCE || tmp->invisible) 2970
2971 if (tmp->invisible)
3376 continue; 2972 continue;
3377 remove_ob (tmp); 2973
2974 tmp->remove ();
3378 tmp->x = op->x, tmp->y = op->y; 2975 tmp->x = op->x, tmp->y = op->y;
2976
3379 if (tmp->type == CONTAINER) 2977 if (tmp->type == CONTAINER)
3380 { /* empty container to ground */ 2978 loot_object (tmp); /* empty container to ground */
3381 loot_object (tmp); 2979
3382 }
3383 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2980 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3384 { 2981 {
3385 if (tmp->nrof > 1) 2982 if (tmp->nrof > 1)
3386 { 2983 {
3387 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2984 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3388 free_object (tmp2); 2985 tmp2->destroy ();
3389 insert_ob_in_map (tmp, op->map, NULL, 0); 2986 insert_ob_in_map (tmp, op->map, NULL, 0);
3390 } 2987 }
3391 else 2988 else
3392 free_object (tmp); 2989 tmp->destroy ();
3393 } 2990 }
3394 else 2991 else
3395 insert_ob_in_map (tmp, op->map, NULL, 0); 2992 insert_ob_in_map (tmp, op->map, NULL, 0);
3396 } 2993 }
3397} 2994}
… …
3399/* 2996/*
3400 * fix_weight(): Check recursively the weight of all players, and fix 2997 * fix_weight(): Check recursively the weight of all players, and fix
3401 * what needs to be fixed. Refresh windows and fix speed if anything 2998 * what needs to be fixed. Refresh windows and fix speed if anything
3402 * was changed. 2999 * was changed.
3403 */ 3000 */
3404
3405void 3001void
3406fix_weight (void) 3002fix_weight (void)
3407{ 3003{
3408 player *pl; 3004 for_all_players (pl)
3409
3410 for (pl = first_player; pl != NULL; pl = pl->next)
3411 { 3005 {
3412 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3006 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3413 3007
3414 if (old == sum) 3008 if (old == sum)
3415 continue; 3009 continue;
3416 fix_player (pl->ob); 3010 pl->ob->update_stats ();
3417 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 3011 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3418 } 3012 }
3419} 3013}
3420 3014
3421void 3015void
3422fix_luck (void) 3016fix_luck (void)
3423{ 3017{
3424 player *pl; 3018 for_all_players (pl)
3425
3426 for (pl = first_player; pl != NULL; pl = pl->next)
3427 if (!pl->ob->contr->state) 3019 if (!pl->ob->contr->ns->state)
3428 change_luck (pl->ob, 0); 3020 pl->ob->change_luck (0);
3429} 3021}
3430
3431 3022
3432/* cast_dust() - handles op throwing objects of type 'DUST'. 3023/* cast_dust() - handles op throwing objects of type 'DUST'.
3433 * This is much simpler in the new spell code - we basically 3024 * This is much simpler in the new spell code - we basically
3434 * just treat this as any other spell casting object. 3025 * just treat this as any other spell casting object.
3435 */ 3026 */
3436
3437void 3027void
3438cast_dust (object *op, object *throw_ob, int dir) 3028cast_dust (object *op, object *throw_ob, int dir)
3439{ 3029{
3440 object *skop, *spob; 3030 object *skop, *spob;
3441 3031
… …
3462 if (op->type == PLAYER) 3052 if (op->type == PLAYER)
3463 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 3053 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3464 3054
3465 cast_spell (op, throw_ob, dir, spob, NULL); 3055 cast_spell (op, throw_ob, dir, spob, NULL);
3466 3056
3467 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3057 throw_ob->destroy ();
3468 remove_ob (throw_ob);
3469 free_object (throw_ob);
3470} 3058}
3471 3059
3472void 3060void
3473make_visible (object *op) 3061make_visible (object *op)
3474{ 3062{
… …
3477 if (op->type == PLAYER) 3065 if (op->type == PLAYER)
3478 { 3066 {
3479 op->contr->tmp_invis = 0; 3067 op->contr->tmp_invis = 0;
3480 op->contr->invis_race = 0; 3068 op->contr->invis_race = 0;
3481 } 3069 }
3070
3482 update_object (op, UP_OBJ_FACE); 3071 update_object (op, UP_OBJ_CHANGE);
3483} 3072}
3484 3073
3485int 3074int
3486is_true_undead (object *op) 3075is_true_undead (object *op)
3487{ 3076{
3488 object *tmp = NULL;
3489
3490 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3077 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3491 return 1; 3078 return 1;
3492 3079
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; 3080 return 0;
3499} 3081}
3500 3082
3501/* look at the surrounding terrain to determine 3083/* look at the surrounding terrain to determine
3502 * the hideability of this object. Positive levels 3084 * the hideability of this object. Positive levels
… …
3558 3140
3559 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3141 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3560 3142
3561 /* its *extremely* hard to run and sneak/hide at the same time! */ 3143 /* its *extremely* hard to run and sneak/hide at the same time! */
3562 if (op->type == PLAYER && op->contr->run_on) 3144 if (op->type == PLAYER && op->contr->run_on)
3563 {
3564 if (!skop || num >= skop->level) 3145 if (!skop || num >= skop->level)
3565 { 3146 {
3566 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3147 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3567 make_visible (op); 3148 make_visible (op);
3568 return; 3149 return;
3569 } 3150 }
3570 else 3151 else
3571 num += 20; 3152 num += 20;
3572 } 3153
3573 num += op->map->difficulty; 3154 num += op->map->difficulty;
3574 hide = hideability (op); /* modify by terrain hidden level */ 3155 hide = hideability (op); /* modify by terrain hidden level */
3575 num -= hide; 3156 num -= hide;
3157
3576 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3158 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3577 { 3159 {
3578 make_visible (op); 3160 make_visible (op);
3579 if (op->type == PLAYER) 3161 if (op->type == PLAYER)
3580 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3162 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3581 } 3163 }
3582 else if (op->type == PLAYER && skop) 3164 else if (op->type == PLAYER && skop)
3583 {
3584 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3165 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3585 }
3586} 3166}
3587 3167
3588/* determine if who is standing near a hostile creature. */ 3168/* determine if who is standing near a hostile creature. */
3589 3169
3590int 3170int
… …
3617 if (mflags & P_OUT_OF_MAP) 3197 if (mflags & P_OUT_OF_MAP)
3618 continue; 3198 continue;
3619 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3199 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3620 continue; 3200 continue;
3621 3201
3622 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3202 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3623 { 3203 {
3624 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3204 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3625 return 1; 3205 return 1;
3626 else if (tmp->type == PLAYER) 3206 else if (tmp->type == PLAYER)
3627 { 3207 {
… …
3657 if (pl->type != PLAYER) 3237 if (pl->type != PLAYER)
3658 { 3238 {
3659 LOG (llevError, "player_can_view() called for non-player object\n"); 3239 LOG (llevError, "player_can_view() called for non-player object\n");
3660 return -1; 3240 return -1;
3661 } 3241 }
3242
3662 if (!pl || !op) 3243 if (!pl || !op)
3663 return 0; 3244 return 0;
3664 3245
3665 if (op->head)
3666 {
3667 op = op->head; 3246 op = op->head_ ();
3668 } 3247
3669 get_rangevector (pl, op, &rv, 0x1); 3248 get_rangevector (pl, op, &rv, 0x1);
3670 3249
3671 /* starting with the 'head' part, lets loop 3250 /* starting with the 'head' part, lets loop
3672 * through the object and find if it has any 3251 * through the object and find if it has any
3673 * part that is in the los array but isnt on 3252 * part that is in the los array but isnt on
… …
3681 3260
3682 /* only the viewable area the player sees is updated by LOS 3261 /* only the viewable area the player sees is updated by LOS
3683 * code, so we need to restrict ourselves to that range of values 3262 * code, so we need to restrict ourselves to that range of values
3684 * for any meaningful values. 3263 * for any meaningful values.
3685 */ 3264 */
3686 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3265 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3687 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3266 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3688 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3267 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3689 return 1; 3268 return 1;
3690 op = op->more; 3269 op = op->more;
3691 } 3270 }
3692 return 0; 3271 return 0;
3693} 3272}
… …
3790 char buf[MAX_BUF]; /* tmp. string buffer */ 3369 char buf[MAX_BUF]; /* tmp. string buffer */
3791 int i = 0, j = 0; 3370 int i = 0, j = 0;
3792 3371
3793 /* get the appropriate treasurelist */ 3372 /* get the appropriate treasurelist */
3794 if (atnr == ATNR_FIRE) 3373 if (atnr == ATNR_FIRE)
3795 trlist = find_treasurelist ("dragon_ability_fire"); 3374 trlist = treasurelist::find ("dragon_ability_fire");
3796 else if (atnr == ATNR_COLD) 3375 else if (atnr == ATNR_COLD)
3797 trlist = find_treasurelist ("dragon_ability_cold"); 3376 trlist = treasurelist::find ("dragon_ability_cold");
3798 else if (atnr == ATNR_ELECTRICITY) 3377 else if (atnr == ATNR_ELECTRICITY)
3799 trlist = find_treasurelist ("dragon_ability_elec"); 3378 trlist = treasurelist::find ("dragon_ability_elec");
3800 else if (atnr == ATNR_POISON) 3379 else if (atnr == ATNR_POISON)
3801 trlist = find_treasurelist ("dragon_ability_poison"); 3380 trlist = treasurelist::find ("dragon_ability_poison");
3802 3381
3803 if (trlist == NULL || who->type != PLAYER) 3382 if (trlist == NULL || who->type != PLAYER)
3804 return; 3383 return;
3805 3384
3806 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3385 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3807 3386
3808 if (tr == NULL || tr->item == NULL) 3387 if (!tr || !tr->item)
3809 { 3388 {
3810 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3389 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3811 return; 3390 return;
3812 } 3391 }
3813 3392
… …
3879 { 3458 {
3880 /* forces in the treasurelist can alter the player's stats */ 3459 /* forces in the treasurelist can alter the player's stats */
3881 object *skin; 3460 object *skin;
3882 3461
3883 /* first get the dragon skin force */ 3462 /* first get the dragon skin force */
3463 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); 3464 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3465 ;
3466
3885 if (skin == NULL) 3467 if (!skin)
3886 return; 3468 return;
3887 3469
3888 /* adding new spellpath attunements */ 3470 /* adding new spellpath attunements */
3889 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3471 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3890 { 3472 {
… …
3935 * not readied. 3517 * not readied.
3936 */ 3518 */
3937void 3519void
3938player_unready_range_ob (player *pl, object *ob) 3520player_unready_range_ob (player *pl, object *ob)
3939{ 3521{
3940 rangetype i;
3941
3942 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3522 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3943 {
3944 if (pl->ranges[i] == ob) 3523 if (pl->ranges[i] == ob)
3945 { 3524 {
3946 pl->ranges[i] = NULL; 3525 pl->ranges[i] = 0;
3947 if (pl->shoottype == i) 3526 if (pl->shoottype == i)
3948 {
3949 pl->shoottype = range_none; 3527 pl->shoottype = range_none;
3950 }
3951 } 3528 }
3952 }
3953} 3529}
3530
3531sint8
3532player::visibility_at (maptile *map, int x, int y) const
3533{
3534 if (!ns)
3535 return 0;
3536
3537 int dx, dy;
3538 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3539 return 0;
3540
3541 x += dx - ns->current_x + ns->mapx / 2;
3542 y += dy - ns->current_y + ns->mapy / 2;
3543
3544 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3545 return 0;
3546
3547 return 100 - blocked_los [x][y];
3548}

Diff Legend

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