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.30 by root, Sat Dec 9 16:11:09 2006 UTC vs.
Revision 1.130 by root, Sat May 12 20:21:54 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>
27#endif
28#ifndef __CEXTRACT__
29# include <sproto.h> 26#include <sproto.h>
30#endif
31#include <sounds.h> 27#include <sounds.h>
32#include <living.h> 28#include <living.h>
33#include <object.h> 29#include <object.h>
34#include <spells.h> 30#include <spells.h>
35#include <skills.h> 31#include <skills.h>
36#include <newclient.h>
37 32
38#ifdef COZY_SERVER 33#include <algorithm>
39extern int same_party (partylist *a, partylist *b); 34#include <functional>
40#endif
41 35
42player * 36playervec 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 37
81void 38void
82display_motd (const object *op) 39display_motd (const object *op)
83{ 40{
84 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
87 int comp; 44 int comp;
88 int size; 45 int size;
89 46
90 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 47 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
91 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 48 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
92 {
93 return; 49 return;
94 } 50
95 motd[0] = '\0'; 51 motd[0] = '\0';
96 size = 0; 52 size = 0;
53
97 while (fgets (buf, MAX_BUF, fp) != NULL) 54 while (fgets (buf, MAX_BUF, fp))
98 { 55 {
99 if (*buf == '#') 56 if (*buf == '#')
100 continue; 57 continue;
58
101 strncat (motd + size, buf, HUGE_BUF - size); 59 strncat (motd + size, buf, HUGE_BUF - size);
102 size += strlen (buf); 60 size += strlen (buf);
103 } 61 }
62
104 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 63 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
105 close_and_delete (fp, comp); 64 close_and_delete (fp, comp);
106} 65}
107 66
108void 67void
… …
114 int comp; 73 int comp;
115 int size; 74 int size;
116 75
117 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 76 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
118 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 77 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
119 {
120 return; 78 return;
121 } 79
122 rules[0] = '\0'; 80 rules[0] = '\0';
123 size = 0; 81 size = 0;
82
124 while (fgets (buf, MAX_BUF, fp) != NULL) 83 while (fgets (buf, MAX_BUF, fp))
125 { 84 {
126 if (*buf == '#') 85 if (*buf == '#')
127 continue; 86 continue;
87
128 if (size + strlen (buf) >= HUGE_BUF) 88 if (size + strlen (buf) >= HUGE_BUF)
129 { 89 {
130 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 90 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
131 break; 91 break;
132 } 92 }
93
133 strncat (rules + size, buf, HUGE_BUF - size); 94 strncat (rules + size, buf, HUGE_BUF - size);
134 size += strlen (buf); 95 size += strlen (buf);
135 } 96 }
97
136 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 98 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
137 close_and_delete (fp, comp); 99 close_and_delete (fp, comp);
138} 100}
139 101
140void 102void
… …
148 int size; 110 int size;
149 111
150 sprintf (buf, "%s/%s", settings.confdir, settings.news); 112 sprintf (buf, "%s/%s", settings.confdir, settings.news);
151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 113 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
152 return; 114 return;
115
153 news[0] = '\0'; 116 news[0] = '\0';
154 subject[0] = '\0'; 117 subject[0] = '\0';
155 size = 0; 118 size = 0;
119
156 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
157 { 121 {
158 if (*buf == '#') 122 if (*buf == '#')
159 continue; 123 continue;
124
160 if (*buf == '%') 125 if (*buf == '%')
161 { /* send one news */ 126 { /* send one news */
162 if (size > 0) 127 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 */ 128 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 */
129
164 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
165 strip_endline (subject); 131 strip_endline (subject);
166 size = 0; 132 size = 0;
167 news[0] = '\0'; 133 news[0] = '\0';
168 } 134 }
… …
177 size += strlen (buf); 143 size += strlen (buf);
178 } 144 }
179 } 145 }
180 146
181 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 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); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
183 close_and_delete (fp, comp); 149 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} 150}
310 151
311/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
312static void 153static void
313set_first_map (object *op) 154set_first_map (object *op)
314{ 155{
315 strcpy (op->contr->maplevel, first_map_path); 156 op->contr->maplevel = first_map_path;
316 op->x = -1; 157 op->x = -1;
317 op->y = -1; 158 op->y = -1;
318 enter_exit (op, NULL);
319} 159}
320 160
161void
162player::enter_map ()
163{
164 object *tmp = object::create ();
165
166 EXIT_PATH (tmp) = maplevel;
167 EXIT_X (tmp) = ob->x;
168 EXIT_Y (tmp) = ob->y;
169 ob->enter_exit (tmp);
170
171 tmp->destroy ();
172}
173
174void
175player::activate ()
176{
177 if (active)
178 return;
179
180 players.insert (this);
181 ob->remove ();
182 ob->map = 0;
183 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob);
186 enter_map ();
187}
188
189void
190player::deactivate ()
191{
192 if (!active)
193 return;
194
195 terminate_all_pets (ob);
196 remove_friendly_object (ob);
197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
202 ob->remove ();
203 ob->map = 0;
204 party = 0;
205
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207
208 players.erase (this);
209}
210
211// connect the player with a specific client
212// also changes, rationalises, and fixes some incorrect settings
213void
214player::connect (client *ns)
215{
216 this->ns = ns;
217 ns->pl = this;
218
219 run_on = 0;
220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
222
223 ns->update_look = 0;
224 ns->look_position = 0;
225
226 clear_los (ob);
227
228 ns->reset_stats ();
229
230 /* make sure he's a player -- needed because of class change. */
231 ob->type = PLAYER; // we are paranoid
232 ob->race = ob->arch->clone.race;
233
234 ob->carrying = sum_weight (ob);
235 link_player_skills (ob);
236
237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238
239 assign (title, ob->arch->clone.name);
240
241 /* if it's a dragon player, set the correct title here */
242 if (is_dragon_pl (ob))
243 {
244 object *tmp, *abil = 0, *skin = 0;
245
246 shstr_cmp dragon_ability_force ("dragon_ability_force");
247 shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249 for (tmp = ob->inv; tmp; tmp = tmp->below)
250 if (tmp->type == FORCE)
251 if (tmp->arch->name == dragon_ability_force)
252 abil = tmp;
253 else if (tmp->arch->name == dragon_skin_force)
254 skin = tmp;
255
256 set_dragon_name (ob, abil, skin);
257 }
258
259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260
261 esrv_new_player (this, ob->weight + ob->carrying);
262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
279 ob->update_stats ();
280 ns->floorbox_update ();
281
282 esrv_send_inventory (ob, ob);
283 esrv_add_spells (this, 0);
284
285 activate ();
286
287 send_rules (ob);
288 send_news (ob);
289 display_motd (ob);
290
291 INVOKE_PLAYER (CONNECT, this);
292 INVOKE_PLAYER (LOGIN, this);
293}
294
295void
296player::disconnect ()
297{
298 if (ns)
299 {
300 if (active)
301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303 INVOKE_PLAYER (DISCONNECT, this);
304
305 ns->reset_stats ();
306 ns->pl = 0;
307 ns = 0;
308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
312
313 deactivate ();
314}
315
316// the need for this function can be explained
317// by load_object not returning the object
318void
319player::set_object (object *op)
320{
321 ob = op;
322 ob->contr = this; /* this aren't yet in archetype */
323
324 ob->speed_left = 0.5;
325 ob->speed = 1.0;
326 ob->direction = 5; /* So player faces south */
327}
328
329player::player ()
330{
331 /* There are some elements we want initialised to non zero value -
332 * we deal with that below this point.
333 */
334 outputs_sync = 4;
335 outputs_count = 4;
336 unapply = unapply_nochoice;
337
338 savebed_map = first_map_path; /* Init. respawn position */
339
340 gen_sp_armour = 10;
341 bowtype = bow_normal;
342 petmode = pet_normal;
343 listening = 10;
344 usekeys = containers;
345 peaceful = 1; /* default peaceful */
346 do_los = 1;
347}
348
349void
350player::do_destroy ()
351{
352 disconnect ();
353
354 attachable::do_destroy ();
355
356 if (ob)
357 {
358 ob->destroy_inv (false);
359 ob->destroy ();
360 }
361}
362
363player::~player ()
364{
365 /* Clear item stack */
366 free (stack_items);
367}
368
321/* Tries to add player on the connection passwd in ns. 369/* 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 370 * All we can really get in this is some settings like host and display
323 * mode. 371 * mode.
324 */ 372 */
325
326int
327add_player (NewSocket * ns)
328{
329 player *p; 373player *
374player::create ()
375{
376 player *pl = new player;
330 377
331 p = get_player (NULL); 378 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 379
335 if (p->socket.faces_sent == NULL) 380 pl->ob->roll_stats ();
336 fatal (OUT_OF_MEMORY); 381 pl->ob->stats.wc = 2;
382 pl->ob->run_away = 25; /* Then we panick... */
337 383
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); 384 set_first_map (pl->ob);
345 385
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; 386 return pl;
354} 387}
355 388
356/* 389/*
357 * get_player_archetype() return next player archetype from archetype 390 * get_player_archetype() return next player archetype from archetype
358 * list. Not very efficient routine, but used only creating new players. 391 * list. Not very efficient routine, but used only creating new players.
… …
367 { 400 {
368 if (at == NULL || at->next == NULL) 401 if (at == NULL || at->next == NULL)
369 at = first_archetype; 402 at = first_archetype;
370 else 403 else
371 at = at->next; 404 at = at->next;
405
372 if (at->clone.type == PLAYER) 406 if (at->clone.type == PLAYER)
373 return at; 407 return at;
408
374 if (at == start) 409 if (at == start)
375 { 410 {
376 LOG (llevError, "No Player archetypes\n"); 411 LOG (llevError, "No Player archetypes\n");
377 exit (-1); 412 exit (-1);
378 } 413 }
379 } 414 }
380} 415}
381 416
382
383object * 417object *
384get_nearest_player (object *mon) 418get_nearest_player (object *mon)
385{ 419{
386 object *op = NULL; 420 object *op = NULL;
387 player *pl = NULL;
388 objectlink *ol; 421 objectlink *ol;
389 unsigned lastdist; 422 unsigned lastdist;
390 rv_vector rv; 423 rv_vector rv;
391 424
392 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
393 { 426 {
394 /* We should not find free objects on this friendly list, but it 427 /* We should not find free objects on this friendly list, but it
395 * does periodically happen. Given that, lets deal with it. 428 * does periodically happen. Given that, lets deal with it.
396 * While unlikely, it is possible the next object on the friendly 429 * While unlikely, it is possible the next object on the friendly
397 * list is also free, so encapsulate this in a while loop. 430 * list is also free, so encapsulate this in a while loop.
… …
401 object *tmp = ol->ob; 434 object *tmp = ol->ob;
402 435
403 /* Can't do much more other than log the fact, because the object 436 /* Can't do much more other than log the fact, because the object
404 * itself will have been cleared. 437 * itself will have been cleared.
405 */ 438 */
406 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
407 ol = ol->next; 441 ol = ol->next;
408 remove_friendly_object (tmp); 442 remove_friendly_object (tmp);
409 if (!ol) 443 if (!ol)
410 return op; 444 return op;
411 } 445 }
… …
424 { 458 {
425 op = ol->ob; 459 op = ol->ob;
426 lastdist = rv.distance; 460 lastdist = rv.distance;
427 } 461 }
428 } 462 }
429 for (pl = first_player; pl != NULL; pl = pl->next) 463
430 { 464 for_all_players (pl)
431 if (can_detect_enemy (mon, pl->ob, &rv)) 465 if (can_detect_enemy (mon, pl->ob, &rv))
432 {
433
434 if (lastdist > rv.distance) 466 if (lastdist > rv.distance)
435 { 467 {
436 op = pl->ob; 468 op = pl->ob;
437 lastdist = rv.distance; 469 lastdist = rv.distance;
438 } 470 }
439 } 471
440 }
441#if 0 472#if 0
442 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 473 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
443#endif 474#endif
444 return op; 475 return op;
445} 476}
… …
463 * circling behaviour. Unfortunately, this function is also used to determined 494 * 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 495 * if the creature should cast a spell, so returning a direction in that case
465 * is probably not a good thing. 496 * is probably not a good thing.
466 */ 497 */
467#define MAX_SPACES 50 498#define MAX_SPACES 50
468
469 499
470/* 500/*
471 * Returns the direction to the player, if valid. Returns 0 otherwise. 501 * 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 502 * 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 503 * player and if path is blocked then see if blockage is close enough to player that
… …
504 x = mon->x; 534 x = mon->x;
505 y = mon->y; 535 y = mon->y;
506 m = mon->map; 536 m = mon->map;
507 dir = rv.direction; 537 dir = rv.direction;
508 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 538 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); 539 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
540
510 /* If we can't solve it within the search distance, return now. */ 541 /* If we can't solve it within the search distance, return now. */
511 if (diff > max) 542 if (diff > max)
512 return 0; 543 return 0;
544
513 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
514 { 546 {
515 lastx = x; 547 lastx = x;
516 lasty = y; 548 lasty = y;
517 lastmap = m; 549 lastmap = m;
… …
599 max--; 631 max--;
600 lastdir = dir; 632 lastdir = dir;
601 if (!firstdir) 633 if (!firstdir)
602 firstdir = dir; 634 firstdir = dir;
603 } 635 }
636
604 if (diff <= 1) 637 if (diff <= 1)
605 { 638 {
606 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
607 * headed toward player for entire distance. 640 * headed toward player for entire distance.
608 */ 641 */
609 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 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); 643 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
611 } 644 }
645
612 if (diff > max) 646 if (diff > max)
613 return 0; 647 return 0;
614 } 648 }
649
615 /* If we reached the max, didn't find a direction in time */ 650 /* If we reached the max, didn't find a direction in time */
616 if (!max) 651 if (!max)
617 return 0; 652 return 0;
618 653
619 return firstdir; 654 return firstdir;
… …
646 (op->type == ARMOUR || op->type == BOOTS || 681 (op->type == ARMOUR || op->type == BOOTS ||
647 op->type == CLOAK || op->type == HELMET || 682 op->type == CLOAK || op->type == HELMET ||
648 op->type == SHIELD || op->type == GLOVES || 683 op->type == SHIELD || op->type == GLOVES ||
649 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 684 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
650 { 685 {
651 remove_ob (op); 686 op->destroy ();
652 free_object (op);
653 continue; 687 continue;
654 } 688 }
655 } 689 }
656 690
657 /* This really needs to be better - we should really give 691 /* This really needs to be better - we should really give
… …
668 if (tmp->type == op->type && tmp->name == op->name) 702 if (tmp->type == op->type && tmp->name == op->name)
669 break; 703 break;
670 704
671 if (tmp) 705 if (tmp)
672 { 706 {
673 remove_ob (op); 707 op->destroy ();
674 free_object (op);
675 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 708 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
676 continue; 709 continue;
677 } 710 }
711
678 if (op->nrof > 1) 712 if (op->nrof > 1)
679 op->nrof = 1; 713 op->nrof = 1;
680 } 714 }
681 715
682 if (op->type == SPELLBOOK && op->inv) 716 if (op->type == SPELLBOOK && op->inv)
… …
694 CLEAR_FLAG (op, FLAG_CURSED); 728 CLEAR_FLAG (op, FLAG_CURSED);
695 CLEAR_FLAG (op, FLAG_DAMNED); 729 CLEAR_FLAG (op, FLAG_DAMNED);
696 } 730 }
697 if (op->type == SPELL) 731 if (op->type == SPELL)
698 { 732 {
699 remove_ob (op); 733 op->destroy ();
700 free_object (op);
701 continue; 734 continue;
702 } 735 }
703 else if (op->type == SKILL) 736 else if (op->type == SKILL)
704 { 737 {
705 SET_FLAG (op, FLAG_CAN_USE_SKILL); 738 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
714 /* Need to set up the skill pointers */ 747 /* Need to set up the skill pointers */
715 link_player_skills (pl); 748 link_player_skills (pl);
716} 749}
717 750
718void 751void
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->destroy (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) 752get_party_password (object *op, partylist *party)
803{ 753{
804 if (party == NULL) 754 if (party == NULL)
805 { 755 {
806 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 756 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
807 return; 757 return;
808 } 758 }
759
809 op->contr->write_buf[0] = '\0'; 760 op->contr->write_buf[0] = '\0';
810 op->contr->state = ST_GET_PARTY_PASSWORD; 761 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
811 op->contr->party_to_join = party; 762 op->contr->party_to_join = party;
812 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 763 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
813} 764}
814
815 765
816/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 766/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
817int 767static int
818roll_stat (void) 768roll_stat (void)
819{ 769{
820 int a[4], i, j, k; 770 int a[4], i, j, k;
821 771
822 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
823 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
824 774
825 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
826 if (a[i] < k) 776 if (a[i] < k)
827 k = a[i], j = i; 777 k = a[i], j = i;
828 778
829 for (i = 0, k = 0; i < 4; i++) 779 for (i = 0, k = 0; i < 4; i++)
830 {
831 if (i != j) 780 if (i != j)
832 k += a[i]; 781 k += a[i];
833 } 782
834 return k; 783 return k;
835} 784}
836 785
837void 786void
838roll_stats (object *op) 787object::roll_stats ()
839{ 788{
789 int statsort [NUM_STATS];
790
791 for (;;)
792 {
840 int sum = 0; 793 int sum = 0;
841 int i = 0, j = 0; 794 for (int i = NUM_STATS; i--; )
842 int statsort[7]; 795 sum += statsort [i] = roll_stat ();
843 796
844 do 797 if (sum >= 82 && sum <= 116)
798 break;
845 { 799 }
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 }
855 while (sum < 82 || sum > 116);
856 800
857 /* Sort the stats so that rerolling is easier... */ 801 // Sort the stats so that rerolling is easier...
858 statsort[0] = op->stats.Str; 802 std::sort (statsort, statsort + NUM_STATS, 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 803
866 /* a quick and dirty bubblesort? */ 804 for (int i = 0; i < NUM_STATS; ++i)
867 do 805 stats.stat (i) = statsort [i];
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 806
883 op->stats.Str = statsort[0];
884 op->stats.Dex = statsort[1];
885 op->stats.Con = statsort[2];
886 op->stats.Int = statsort[3];
887 op->stats.Wis = statsort[4];
888 op->stats.Pow = statsort[5];
889 op->stats.Cha = statsort[6];
890
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; 807 stats.exp = 0;
902 op->stats.ac = 0; 808 stats.ac = 0;
903 809
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; 810 stats.hp = stats.maxhp;
910 op->stats.sp = op->stats.maxsp; 811 stats.sp = stats.maxsp;
911 op->stats.grace = op->stats.maxgrace; 812 stats.grace = stats.maxgrace;
813
814 if (contr)
815 {
816 contr->levhp[1] = 9;
817 contr->levsp[1] = 6;
818 contr->levgrace[1] = 3;
819
912 op->contr->orig_stats = op->stats; 820 contr->orig_stats = stats;
821 }
913} 822}
914 823
915void 824void
916Roll_Again (object *op) 825object::swap_stats (int a, int b)
917{ 826{
918 esrv_new_player (op->contr, 0); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
919 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
920 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
921}
922 828
923void 829 for (int i = 0; i < NUM_STATS; ++i)
924Swap_Stat (object *op, int Swap_Second) 830 stats.stat (i) = contr->orig_stats.stat (i);
831
832 //TODO: the following code looks so borked and should, at the very least,
833 // be merged with the similar code in roll_stats
834 stats.ac = 0;
835
836 level = 1;
837 stats.exp = 0;
838 stats.ac = 0;
839
840 stats.hp = stats.maxhp;
841 stats.sp = stats.maxsp;
842 stats.grace = stats.maxgrace;
843
844 if (contr)
845 {
846 contr->levhp[1] = 9;
847 contr->levsp[1] = 6;
848 contr->levgrace[1] = 3;
849
850 contr->orig_stats = stats;
851 }
852}
853
854static void
855start_info (object *op)
925{ 856{
926 signed char tmp;
927 char buf[MAX_BUF]; 857 char buf[MAX_BUF];
928 858
929 if (op->contr->Swap_First == -1) 859 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); 860 new_draw_info (NDI_UNIQUE, 0, op, buf);
945 op->stats.Str = op->contr->orig_stats.Str; 861 //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); 862 //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} 863}
1044 864
1045/* This function takes the key that is passed, and does the 865/* This function takes the key that is passed, and does the
1046 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
1047 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
1048 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
1049 * not the class. 869 * not the class.
1050 */ 870 */
1051 871void
1052int 872player::chargen_race_done ()
1053key_change_class (object *op, char key)
1054{ 873{
1055 int tmp_loop;
1056
1057 if (key == 'q' || key == 'Q')
1058 {
1059 remove_ob (op);
1060 play_again (op);
1061 return 0;
1062 }
1063 if (key == 'd' || key == 'D')
1064 {
1065 char buf[MAX_BUF];
1066
1067 /* this must before then initial items are given */ 874 /* this must before then initial items are given */
1068 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
1069 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0);
1070 876
877 treasurelist *tl = treasurelist::find ("starting_wealth");
878 if (tl)
879 create_treasure (tl, ob, 0, 0, 0);
880
1071 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
1073 883
1074 op->contr->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
1075 885
1076 if (op->msg) 886 if (ob->msg)
1077 op->msg = NULL; 887 ob->msg = 0;
1078 888
1079 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
1080 * to save here. 890 * to save here.
1081 */ 891 */
892 {
893 char buf[MAX_BUF];
1082 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
1083 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
1084 897
1085#ifdef AUTOSAVE
1086 op->contr->last_save_tick = pticks;
1087#endif
1088 start_info (op); 898 start_info (ob);
1089 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
1090 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
1091 link_player_skills (op); 901 link_player_skills (ob);
1092 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
1093 fix_player (op); 903 ob->update_stats ();
1094 904
1095 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
1096 * is one for this race 906 * is one for this race
1097 */ 907 */
1098 if (*first_map_ext_path) 908 if (*first_map_ext_path)
1099 { 909 {
1100 object *tmp; 910 object *tmp;
1101 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
1102 912
1103 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
1104 tmp = get_object (); 914 tmp = object::create ();
1105 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
1106 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
1107 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
1108 enter_exit (op, tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
1109 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
1110 * default initial map */ 920 * default initial map */
1111 free_object (tmp); 921 tmp->destroy ();
1112 } 922 }
1113 else 923 else
1114 {
1115 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
1116 } 925}
1117 return 0;
1118 }
1119 926
927void
928player::chargen_race_next ()
929{
1120 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
1121 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
1122 */ 932 */
1123 933
1124 tmp_loop = 0; 934 do
1125 while (!tmp_loop)
1126 { 935 {
1127 shstr name = op->name; 936 shstr name = ob->name;
1128 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
1129 938
1130 remove_statbonus (op); 939 ob->remove_statbonus ();
1131 remove_ob (op); 940 ob->remove ();
1132 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
1133 copy_object (&op->arch->clone, op); 942 ob->arch->clone.copy_to (ob);
1134 op->instantiate (); 943 ob->instantiate ();
1135 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
1136 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
1137 op->x = x; 946 ob->x = x;
1138 op->y = y; 947 ob->y = y;
1139 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
1140 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
1141 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
1142 add_statbonus (op); 951 ob->add_statbonus ();
1143 tmp_loop = allowed_class (op);
1144 } 952 }
953 while (!allowed_class (ob));
1145 954
1146 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
1147 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
1148 fix_player (op); 957 ob->update_stats ();
1149 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
1150 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
1151 op->stats.grace = 0; 960 ob->stats.grace = 0;
1152
1153 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0;
1158}
1159
1160int
1161key_confirm_quit (object *op, char key)
1162{
1163 char buf[MAX_BUF];
1164
1165 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1166 {
1167 op->contr->state = ST_PLAYING;
1168 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1169 return 1;
1170 }
1171
1172 INVOKE_PLAYER (LOGOUT, op->contr);
1173 INVOKE_PLAYER (QUIT, op->contr);
1174
1175 terminate_all_pets (op);
1176 leave_map (op);
1177 op->direction = 0;
1178 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1179
1180 strcpy (op->contr->killer, "quit");
1181 check_score (op);
1182 op->contr->party = NULL;
1183 if (settings.set_title == TRUE)
1184 op->contr->own_title[0] = '\0';
1185
1186 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1187 {
1188 maptile *mp, *next;
1189
1190 /* We need to hunt for any per player unique maps in memory and
1191 * get rid of them. The trailing slash in the path is intentional,
1192 * so that players named 'Ab' won't match against players 'Abe' pathname
1193 */
1194 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1195 for (mp = first_map; mp != NULL; mp = next)
1196 {
1197 next = mp->next;
1198 if (!strncmp (mp->path, buf, strlen (buf)))
1199 delete_map (mp);
1200 }
1201
1202 delete_character (op->name, 1);
1203 }
1204
1205 play_again (op);
1206 return 1;
1207} 961}
1208 962
1209void 963void
1210flee_player (object *op) 964flee_player (object *op)
1211{ 965{
… …
1241 { 995 {
1242 op->enemy = NULL; 996 op->enemy = NULL;
1243 CLEAR_FLAG (op, FLAG_SCARED); 997 CLEAR_FLAG (op, FLAG_SCARED);
1244 return; 998 return;
1245 } 999 }
1000
1246 get_rangevector (op, op->enemy, &rv, 0); 1001 get_rangevector (op, op->enemy, &rv, 0);
1247 1002
1248 dir = absdir (4 + rv.direction); 1003 dir = absdir (4 + rv.direction);
1249 for (diff = 0; diff < 3; diff++) 1004 for (diff = 0; diff < 3; diff++)
1250 { 1005 {
1251 int m = 1 - (RANDOM () & 2); 1006 int m = 1 - (RANDOM () & 2);
1252 1007
1253 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1008 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1254 {
1255 return; 1009 return;
1256 }
1257 } 1010 }
1011
1258 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1259 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1260 op->enemy = NULL; 1014 op->enemy = NULL;
1261} 1015}
1262 1016
1263
1264/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* check_pick sees if there is stuff to be picked up/picks up stuff.
1265 * IT returns 1 if the player should keep on moving, 0 if he should 1018 * It returns 1 if the player should keep on moving, 0 if he should
1266 * stop. 1019 * stop.
1267 */ 1020 */
1268int 1021int
1269check_pick (object *op) 1022check_pick (object *op)
1270{ 1023{
1271 object *tmp, *next; 1024 object *tmp, *next;
1272 int stop = 0; 1025 int stop = 0;
1273 int j, k, wvratio; 1026 int wvratio;
1274 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1275 1028
1276 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1277 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1278 return 1; 1031 return 1;
1279 1032
… …
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1101 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)))); 1102 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1350 else 1103 else
1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 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)))); 1105 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106
1353 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1107 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 } 1108 }
1109
1384 /* philosophy: 1110 /* philosophy:
1385 * It's easy to grab an item type from a pile, as long as it's 1111 * 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 1112 * generic. This takes no game-time. For more detailed pickups
1387 * and selections, select-items shoul dbe used. This is a 1113 * and selections, select-items should be used. This is a
1388 * grab-as-you-run type mode that's really useful for arrows for 1114 * grab-as-you-run type mode that's really useful for arrows for
1389 * example. 1115 * example.
1390 * The drawback: right now it has no frontend, so you need to 1116 * 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 1117 * stick the bits you want into a calculator in hex mode and then
1392 * convert to decimal and then 'pickup <#> 1118 * convert to decimal and then 'pickup <#>
… …
1643 * found object is returned. 1369 * found object is returned.
1644 */ 1370 */
1645object * 1371object *
1646find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1647{ 1373{
1648 object *tmp = NULL; 1374 object *tmp = 0;
1649 1375
1650 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1651 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1652 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1653 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1654 return op; 1380 return op;
1381
1655 return tmp; 1382 return tmp;
1656} 1383}
1657 1384
1658/* 1385/*
1659 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1660 * against the target. A full test is not performed, simply a basic test 1387 * against the target. A full test is not performed, simply a basic test
1661 * of resistances. The archer is making a quick guess at what he sees down 1388 * of resistances. The archer is making a quick guess at what he sees down
1662 * the hall. Failing that it does it's best to pick the highest plus arrow. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1663 */ 1390 */
1664
1665object * 1391object *
1666find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1667{ 1393{
1668 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1669 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1735 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1736 * op = the shooter 1462 * op = the shooter
1737 * type = bow->race 1463 * type = bow->race
1738 * dir = fire direction 1464 * dir = fire direction
1739 */ 1465 */
1740
1741object * 1466object *
1742pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1743{ 1468{
1744 object *tmp = NULL; 1469 object *tmp = NULL;
1745 maptile *m; 1470 maptile *m;
… …
1818 if (!dir) 1543 if (!dir)
1819 { 1544 {
1820 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1821 return 0; 1546 return 0;
1822 } 1547 }
1823 if (op->type == PLAYER) 1548
1824 bow = op->contr->ranges[range_bow]; 1549 if (player *pl = op->contr)
1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1825 else 1555 else
1826 { 1556 {
1827 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1828 /* Don't check for applied - monsters don't apply bows - in that way, they 1558 /* Don't check for applied - monsters don't apply bows - in that way, they
1829 * don't need to switch back and forth between bows and weapons. 1559 * don't need to switch back and forth between bows and weapons.
… …
1834 if (!bow) 1564 if (!bow)
1835 { 1565 {
1836 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1837 return 0; 1567 return 0;
1838 } 1568 }
1569
1570 // optimisation: move object to top so we will find it quickly again
1571 if (bow->below)
1572 {
1573 bow->remove ();
1574 op->insert (bow);
1575 }
1576
1839 } 1577 }
1578
1840 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1841 { 1580 {
1842 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1843 return 0; 1582 return 0;
1844 } 1583 }
… …
1846 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1585 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1847 1586
1848 /* penalize ROF for bestarrow */ 1587 /* penalize ROF for bestarrow */
1849 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1588 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1850 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1589 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1590
1851 if (bowspeed < 1) 1591 if (bowspeed < 1)
1852 bowspeed = 1; 1592 bowspeed = 1;
1853 1593
1854 if (arrow == NULL) 1594 if (arrow == NULL)
1855 { 1595 {
… …
1858 if (op->type == PLAYER) 1598 if (op->type == PLAYER)
1859 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1599 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1860 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1600 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1861 else 1601 else
1862 CLEAR_FLAG (op, FLAG_READY_BOW); 1602 CLEAR_FLAG (op, FLAG_READY_BOW);
1603
1863 return 0; 1604 return 0;
1864 } 1605 }
1865 } 1606 }
1607
1866 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1608 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1867 if (mflags & P_OUT_OF_MAP) 1609 if (mflags & P_OUT_OF_MAP)
1868 {
1869 return 0; 1610 return 0;
1870 } 1611
1871 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1612 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1872 { 1613 {
1873 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1614 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1874 return 0; 1615 return 0;
1875 } 1616 }
1876 1617
1877 /* this should not happen, but sometimes does */ 1618 /* this should not happen, but sometimes does */
1878 if (arrow->nrof == 0) 1619 if (arrow->nrof == 0)
1879 { 1620 {
1880 remove_ob (arrow); 1621 arrow->destroy ();
1881 free_object (arrow);
1882 return 0; 1622 return 0;
1883 } 1623 }
1884 1624
1885 left = arrow; /* these are arrows left to the player */ 1625 left = arrow; /* these are arrows left to the player */
1886 arrow = get_split_ob (arrow, 1); 1626 arrow = get_split_ob (arrow, 1);
1887 if (arrow == NULL) 1627 if (!arrow)
1888 { 1628 {
1889 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1629 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1890 return 0; 1630 return 0;
1891 } 1631 }
1892 set_owner (arrow, op); 1632
1633 arrow->set_owner (op);
1893 arrow->skill = bow->skill; 1634 arrow->skill = bow->skill;
1894
1895 arrow->direction = dir; 1635 arrow->direction = dir;
1896 arrow->x = sx; 1636
1897 arrow->y = sy; 1637 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1638 arrow->stats.hp = arrow->stats.dam;
1639 arrow->stats.grace = arrow->attacktype;
1640
1641 if (arrow->slaying)
1642 arrow->spellarg = strdup (arrow->slaying);
1898 1643
1899 if (op->type == PLAYER) 1644 if (op->type == PLAYER)
1900 { 1645 {
1901 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1646 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1902 fix_player (op); 1647 op->update_stats ();
1903 } 1648 }
1904 1649
1905 SET_ANIMATION (arrow, arrow->direction); 1650 SET_ANIMATION (arrow, arrow->direction);
1906 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1907 arrow->stats.hp = arrow->stats.dam;
1908 arrow->stats.grace = arrow->attacktype;
1909 if (arrow->slaying != NULL)
1910 arrow->spellarg = strdup_local (arrow->slaying);
1911
1912 /* Note that this was different for monsters - they got their level
1913 * added to the damage. I think the strength bonus is more proper.
1914 */
1915
1916 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1917 1651
1918 /* update the speed */ 1652 /* update the speed */
1919 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1653 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1920 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1654 + bow->stats.dam / 7.0;
1921 1655
1922 if (arrow->speed < 1.0) 1656 arrow->set_speed (max (arrow->speed, 2.0));
1923 arrow->speed = 1.0;
1924 update_ob_speed (arrow);
1925 arrow->speed_left = 0; 1657 arrow->speed_left = 0;
1926 1658
1659 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1660
1927 if (op->type == PLAYER) 1661 if (op->type == PLAYER)
1928 { 1662 {
1929 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1930 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1931 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1932
1933 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1663 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1664 wc -= dex_bonus[op->stats.Dex];
1665
1666 if (!arrow->slaying)
1667 arrow->slaying = op->slaying;
1668
1669 arrow->attacktype |= op->attacktype;
1934 } 1670 }
1935 else 1671 else
1936 { 1672 {
1937 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1938 arrow->level = op->level; 1673 arrow->level = op->level;
1939 } 1674 arrow->stats.wc -= bow->magic;
1940 1675
1941 if (arrow->attacktype == AT_PHYSICAL) 1676 if (!arrow->slaying)
1677 arrow->slaying = bow->slaying;
1678
1942 arrow->attacktype |= bow->attacktype; 1679 arrow->attacktype |= bow->attacktype;
1680 }
1943 1681
1944 if (bow->slaying != NULL) 1682 wc -= arrow->level;
1945 arrow->slaying = bow->slaying; 1683 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1946 1684
1947 arrow->map = m; 1685 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1948 arrow->move_type = MOVE_FLY_LOW; 1686 arrow->move_type = MOVE_FLY_LOW;
1949 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1687 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1950 1688
1951 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1689 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1952 insert_ob_in_map (arrow, m, op, 0); 1690 m->insert (arrow, sx, sy, op);
1953 1691
1954 if (!arrow->destroyed ()) 1692 if (!arrow->destroyed ())
1955 move_arrow (arrow); 1693 move_arrow (arrow);
1956 1694
1957 if (op->type == PLAYER) 1695 if (op->type == PLAYER)
… …
1977{ 1715{
1978 int ret = 0, wcmod = 0; 1716 int ret = 0, wcmod = 0;
1979 1717
1980 if (op->contr->bowtype == bow_bestarrow) 1718 if (op->contr->bowtype == bow_bestarrow)
1981 { 1719 {
1982 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1720 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1983 } 1721 }
1984 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1722 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1985 { 1723 {
1986 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1724 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1987 wcmod = -1; 1725 wcmod = -1;
1726
1988 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1727 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1989 } 1728 }
1990 else if (op->contr->bowtype == bow_threewide) 1729 else if (op->contr->bowtype == bow_threewide)
1991 { 1730 {
1992 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1731 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1996 else if (op->contr->bowtype == bow_spreadshot) 1735 else if (op->contr->bowtype == bow_spreadshot)
1997 { 1736 {
1998 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1737 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1999 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
2000 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
2001
2002 } 1740 }
2003 else 1741 else
2004 { 1742 {
2005 /* Simple case */ 1743 /* Simple case */
2006 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1744 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
2007 } 1745 }
1746
2008 return ret; 1747 return ret;
2009} 1748}
2010 1749
2011 1750
2012/* Fires a misc (wand/rod/horn) object in 'dir'. 1751/* Fires a misc (wand/rod/horn) object in 'dir'.
2013 * Broken apart from 'fire' to keep it more readable. 1752 * Broken apart from 'fire' to keep it more readable.
2014 */ 1753 */
2015void 1754void
2016fire_misc_object (object *op, int dir) 1755fire_misc_object (object *op, int dir)
2017{ 1756{
2018 object *item; 1757 object *item = op->contr->ranged_ob;
2019 1758
2020 if (!op->contr->ranges[range_misc]) 1759 if (!item)
2021 { 1760 {
2022 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1761 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
2023 return; 1762 return;
2024 } 1763 }
2025 1764
2026 item = op->contr->ranges[range_misc];
2027 if (!item->inv) 1765 if (!item->inv)
2028 { 1766 {
2029 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1767 LOG (llevError, "Object %s lacks a spell\n", &item->name);
2030 return; 1768 return;
2031 } 1769 }
1770
1771 if (!op->change_weapon (item))
1772 return;
1773
2032 if (item->type == WAND) 1774 if (item->type == WAND)
2033 { 1775 {
2034 if (item->stats.food <= 0) 1776 if (item->stats.food <= 0)
2035 { 1777 {
2036 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1778 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
2037 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1780
2038 return; 1781 return;
2039 } 1782 }
2040 } 1783 }
2041 else if (item->type == ROD || item->type == HORN) 1784 else if (item->type == ROD || item->type == HORN)
2042 { 1785 {
2043 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1786 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
2044 { 1787 {
2045 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1788 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1789
2046 if (item->type == ROD) 1790 if (item->type == ROD)
2047 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
2048 else 1792 else
2049 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1793 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1794
2050 return; 1795 return;
2051 } 1796 }
2052 } 1797 }
2053 1798
2054 if (cast_spell (op, item, dir, item->inv, NULL)) 1799 if (cast_spell (op, item, dir, item->inv, NULL))
… …
2062 1807
2063 if (item->arch) 1808 if (item->arch)
2064 { 1809 {
2065 CLEAR_FLAG (item, FLAG_ANIMATE); 1810 CLEAR_FLAG (item, FLAG_ANIMATE);
2066 item->face = item->arch->clone.face; 1811 item->face = item->arch->clone.face;
2067 item->speed = 0; 1812 item->set_speed (0);
2068 update_ob_speed (item);
2069 } 1813 }
1814
2070 if ((tmp = is_player_inv (item))) 1815 if ((tmp = item->in_player ()))
2071 esrv_update_item (UPD_ANIM, tmp, item); 1816 esrv_update_item (UPD_ANIM, tmp, item);
2072 } 1817 }
2073 } 1818 }
2074 else if (item->type == ROD || item->type == HORN) 1819 else if (item->type == ROD || item->type == HORN)
2075 {
2076 drain_rod_charge (item); 1820 drain_rod_charge (item);
2077 }
2078 } 1821 }
2079} 1822}
2080 1823
2081/* Received a fire command for the player - go and do it. 1824/* Received a fire command for the player - go and do it.
2082 */ 1825 */
… …
2087 1830
2088 /* check for loss of invisiblity/hide */ 1831 /* check for loss of invisiblity/hide */
2089 if (action_makes_visible (op)) 1832 if (action_makes_visible (op))
2090 make_visible (op); 1833 make_visible (op);
2091 1834
2092 switch (op->contr->shoottype) 1835 player *pl = op->contr;
1836
1837 if (pl->golem)
2093 { 1838 {
2094 case range_none: 1839 control_golem (op->contr->golem, dir);
2095 return; 1840 return;
1841 }
2096 1842
2097 case range_bow: 1843 object *ob = pl->ranged_ob;
1844
1845 if (!ob)
1846 return;
1847
1848 switch (ob->type)
1849 {
1850 case BOW:
2098 player_fire_bow (op, dir); 1851 player_fire_bow (op, dir);
2099 return; 1852 break;
2100 1853
2101 case range_magic: /* Casting spells */ 1854 case SPELL:
2102 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1855 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
2103 return; 1856 break;
2104 1857
2105 case range_misc: 1858 case BUILDER:
1859 apply_map_builder (op, dir);
1860 break;
1861
1862 case SKILL:
1863 case SKILL_TOOL:
1864 do_skill (op, op, ob, dir, 0);
1865 break;
1866
1867 default:
2106 fire_misc_object (op, dir); 1868 fire_misc_object (op, dir);
2107 return; 1869 break;
2108
2109 case range_golem: /* Control summoned monsters from scrolls */
2110 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2111 {
2112 op->contr->ranges[range_golem] = 0;
2113 op->contr->shoottype = range_none;
2114 }
2115 else
2116 control_golem (op->contr->ranges[range_golem], dir);
2117 return;
2118
2119 case range_skill:
2120 if (!op->chosen_skill)
2121 {
2122 if (op->type == PLAYER)
2123 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2124 return;
2125 }
2126 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2127 return;
2128 case range_builder:
2129 apply_map_builder (op, dir);
2130 return;
2131 default:
2132 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2133 return;
2134 } 1870 }
2135} 1871}
2136
2137
2138 1872
2139/* find_key 1873/* find_key
2140 * We try to find a key for the door as passed. If we find a key 1874 * We try to find a key for the door as passed. If we find a key
2141 * and successfully use it, we return the key, otherwise NULL 1875 * and successfully use it, we return the key, otherwise NULL
2142 * This function merges both normal and locked door, since the logic 1876 * This function merges both normal and locked door, since the logic
… …
2144 * pl is the player, 1878 * pl is the player,
2145 * inv is the objects inventory to searched 1879 * inv is the objects inventory to searched
2146 * door is the door we are trying to match against. 1880 * door is the door we are trying to match against.
2147 * This function can be called recursively to search containers. 1881 * This function can be called recursively to search containers.
2148 */ 1882 */
2149
2150object * 1883object *
2151find_key (object *pl, object *container, object *door) 1884find_key (object *pl, object *container, object *door)
2152{ 1885{
2153 object *tmp, *key; 1886 object *tmp, *key;
2154 1887
2155 /* Should not happen, but sanity checking is never bad */ 1888 /* Should not happen, but sanity checking is never bad */
2156 if (container->inv == NULL) 1889 if (!container->inv)
2157 return NULL; 1890 return 0;
2158 1891
2159 /* First, lets try to find a key in the top level inventory */ 1892 /* First, lets try to find a key in the top level inventory */
2160 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1893 for (tmp = container->inv; tmp; tmp = tmp->below)
2161 { 1894 {
2162 if (door->type == DOOR && tmp->type == KEY) 1895 if (door->type == DOOR && tmp->type == KEY)
2163 break; 1896 break;
2164 /* For sanity, we should really check door type, but other stuff 1897 /* For sanity, we should really check door type, but other stuff
2165 * (like containers) can be locked with special keys 1898 * (like containers) can be locked with special keys
2166 */ 1899 */
2167 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1900 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2168 break; 1901 break;
2169 } 1902 }
1903
2170 /* No key found - lets search inventories now */ 1904 /* No key found - lets search inventories now */
2171 /* If we find and use a key in an inventory, return at that time. 1905 /* If we find and use a key in an inventory, return at that time.
2172 * otherwise, if we search all the inventories and still don't find 1906 * otherwise, if we search all the inventories and still don't find
2173 * a key, return 1907 * a key, return
2174 */ 1908 */
2175 if (!tmp) 1909 if (!tmp)
2176 { 1910 {
2177 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1911 for (tmp = container->inv; tmp; tmp = tmp->below)
2178 { 1912 {
2179 /* No reason to search empty containers */ 1913 /* No reason to search empty containers */
2180 if (tmp->type == CONTAINER && tmp->inv) 1914 if (tmp->type == CONTAINER && tmp->inv)
2181 { 1915 {
2182 if ((key = find_key (pl, tmp, door)) != NULL) 1916 if ((key = find_key (pl, tmp, door)))
2183 return key; 1917 return key;
2184 } 1918 }
2185 } 1919 }
1920
2186 if (!tmp) 1921 if (!tmp)
2187 return NULL; 1922 return NULL;
2188 } 1923 }
1924
2189 /* We get down here if we have found a key. Now if its in a container, 1925 /* We get down here if we have found a key. Now if its in a container,
2190 * see if we actually want to use it 1926 * see if we actually want to use it
2191 */ 1927 */
2192 if (pl != container) 1928 if (pl != container)
2193 { 1929 {
… …
2214 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1950 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2215 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1951 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2216 return NULL; 1952 return NULL;
2217 } 1953 }
2218 } 1954 }
1955
2219 return tmp; 1956 return tmp;
2220} 1957}
2221 1958
2222/* moved door processing out of move_player_attack. 1959/* moved door processing out of move_player_attack.
2223 * returns 1 if player has opened the door with a key 1960 * returns 1 if player has opened the door with a key
… …
2225 * 0 otherwise 1962 * 0 otherwise
2226 */ 1963 */
2227static int 1964static int
2228player_attack_door (object *op, object *door) 1965player_attack_door (object *op, object *door)
2229{ 1966{
2230
2231 /* If its a door, try to find a use a key. If we do destroy the door, 1967 /* If its a door, try to find a use a key. If we do destroy the door,
2232 * might as well return immediately as there is nothing more to do - 1968 * might as well return immediately as there is nothing more to do -
2233 * otherwise, we fall through to the rest of the code. 1969 * otherwise, we fall through to the rest of the code.
2234 */ 1970 */
2235 object *key = find_key (op, op, door); 1971 object *key = find_key (op, op, door);
… …
2238 if (key) 1974 if (key)
2239 { 1975 {
2240 object *container = key->env; 1976 object *container = key->env;
2241 1977
2242 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1978 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1979
2243 if (action_makes_visible (op)) 1980 if (action_makes_visible (op))
2244 make_visible (op); 1981 make_visible (op);
1982
2245 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1983 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2246 spring_trap (door->inv, op); 1984 spring_trap (door->inv, op);
1985
2247 if (door->type == DOOR) 1986 if (door->type == DOOR)
2248 {
2249 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1987 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2250 }
2251 else if (door->type == LOCKED_DOOR) 1988 else if (door->type == LOCKED_DOOR)
2252 { 1989 {
2253 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1990 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2254 remove_door2 (door); /* remove door without violence ;-) */ 1991 remove_door2 (door); /* remove door without violence ;-) */
2255 } 1992 }
1993
2256 /* Do this after we print the message */ 1994 /* Do this after we print the message */
2257 decrease_ob (key); /* Use up one of the keys */ 1995 decrease_ob (key); /* Use up one of the keys */
2258 /* Need to update the weight the container the key was in */ 1996 /* Need to update the weight the container the key was in */
2259 if (container != op) 1997 if (container != op)
2260 esrv_update_item (UPD_WEIGHT, op, container); 1998 esrv_update_item (UPD_WEIGHT, op, container);
1999
2261 return 1; /* Nothing more to do below */ 2000 return 1; /* Nothing more to do below */
2262 } 2001 }
2263 else if (door->type == LOCKED_DOOR) 2002 else if (door->type == LOCKED_DOOR)
2264 { 2003 {
2265 /* Might as well return now - no other way to open this */ 2004 /* Might as well return now - no other way to open this */
2266 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2005 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2267 return 1; 2006 return 1;
2268 } 2007 }
2008
2269 return 0; 2009 return 0;
2270} 2010}
2271 2011
2272/* This function is just part of a breakup from move_player. 2012/* This function is just part of a breakup from move_player.
2273 * It should keep the code cleaner. 2013 * It should keep the code cleaner.
2274 * When this is called, the players direction has been updated 2014 * When this is called, the players direction has been updated
2275 * (taking into account confusion.) The player is also actually 2015 * (taking into account confusion.) The player is also actually
2276 * going to try and move (not fire weapons). 2016 * going to try and move (not fire weapons).
2277 */ 2017 */
2278
2279void 2018void
2280move_player_attack (object *op, int dir) 2019move_player_attack (object *op, int dir)
2281{ 2020{
2282 object *tmp, *mon; 2021 object *tmp, *mon;
2283 sint16 nx, ny;
2284 int on_battleground; 2022 int on_battleground;
2285 maptile *m; 2023 maptile *m;
2286 2024
2287 nx = freearr_x[dir] + op->x; 2025 sint16 nx = freearr_x[dir] + op->x;
2288 ny = freearr_y[dir] + op->y; 2026 sint16 ny = freearr_y[dir] + op->y;
2289 2027
2290 on_battleground = op_on_battleground (op, NULL, NULL); 2028 on_battleground = op_on_battleground (op, 0, 0);
2291 2029
2292 /* If braced, or can't move to the square, and it is not out of the 2030 /* If braced, or can't move to the square, and it is not out of the
2293 * map, attack it. Note order of if statement is important - don't 2031 * map, attack it. Note order of if statement is important - don't
2294 * want to be calling move_ob if braced, because move_ob will move the 2032 * want to be calling move_ob if braced, because move_ob will move the
2295 * player. This is a pretty nasty hack, because if we could 2033 * player. This is a pretty nasty hack, because if we could
… …
2300 */ 2038 */
2301 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2039 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2302 { 2040 {
2303 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2041 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2304 { 2042 {
2305 m = get_map_from_coord (op->map, &nx, &ny); 2043 m = op->map->xy_find (nx, ny);
2306 if (!m) 2044 if (!m)
2307 return; /* Don't think this should happen */ 2045 return; /* Don't think this should happen */
2308 } 2046 }
2309 else 2047 else
2310 m = op->map; 2048 m = op->map;
2311 2049
2312 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2050 if (!(tmp = m->at (nx, ny).bot))
2313 {
2314 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2315 return; 2051 return;
2316 }
2317 2052
2318 mon = NULL; 2053 mon = 0;
2319 /* Go through all the objects, and find ones of interest. Only stop if 2054 /* Go through all the objects, and find ones of interest. Only stop if
2320 * we find a monster - that is something we know we want to attack. 2055 * we find a monster - that is something we know we want to attack.
2321 * if its a door or barrel (can roll) see if there may be monsters 2056 * if its a door or barrel (can roll) see if there may be monsters
2322 * on the space 2057 * on the space
2323 */ 2058 */
2324 while (tmp != NULL) 2059 while (tmp)
2325 { 2060 {
2326 if (tmp == op) 2061 if (tmp == op)
2327 { 2062 {
2328 tmp = tmp->above; 2063 tmp = tmp->above;
2329 continue; 2064 continue;
… …
2339 mon = tmp; 2074 mon = tmp;
2340 2075
2341 tmp = tmp->above; 2076 tmp = tmp->above;
2342 } 2077 }
2343 2078
2344 if (mon == NULL) /* This happens anytime the player tries to move */ 2079 if (!mon) /* This happens anytime the player tries to move */
2345 return; /* into a wall */ 2080 return; /* into a wall */
2346 2081
2347 if (mon->head != NULL) 2082 if (mon->head)
2348 mon = mon->head; 2083 mon = mon->head;
2349 2084
2350 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2085 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2351 if (player_attack_door (op, mon)) 2086 if (player_attack_door (op, mon))
2352 return; 2087 return;
… …
2364 * player owns it and it is either friendly or unagressive. 2099 * player owns it and it is either friendly or unagressive.
2365 */ 2100 */
2366 if ((op->type == PLAYER) 2101 if ((op->type == PLAYER)
2367#if COZY_SERVER 2102#if COZY_SERVER
2368 && 2103 &&
2369 ((get_owner (mon) && get_owner (mon)->contr 2104 ((mon->owner && mon->owner->contr
2370 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2105 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2371#else 2106#else
2372 && get_owner (mon) == op 2107 && mon->owner == op
2373#endif 2108#endif
2374 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2109 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2375 { 2110 {
2376 /* If we're braced, we don't want to switch places with it */ 2111 /* If we're braced, we don't want to switch places with it */
2377 if (op->contr->braced) 2112 if (op->contr->braced)
2378 return; 2113 return;
2114
2379 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2115 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2380 (void) push_ob (mon, dir, op); 2116 push_ob (mon, dir, op);
2381 if (op->contr->tmp_invis || op->hide) 2117 if (op->contr->tmp_invis || op->hide)
2382 make_visible (op); 2118 make_visible (op);
2119
2383 return; 2120 return;
2384 } 2121 }
2385 2122
2386 /* in certain circumstances, you shouldn't attack friendly 2123 /* in certain circumstances, you shouldn't attack friendly
2387 * creatures. Note that if you are braced, you can't push 2124 * creatures. Note that if you are braced, you can't push
… …
2389 * attack them either. 2126 * attack them either.
2390 */ 2127 */
2391 if ((mon->type == PLAYER || mon->enemy != op) && 2128 if ((mon->type == PLAYER || mon->enemy != op) &&
2392 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2129 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2393#ifdef PROHIBIT_PLAYERKILL 2130#ifdef PROHIBIT_PLAYERKILL
2394 (op->contr->peaceful 2131 (op->contr->peaceful
2395 || (mon->type == PLAYER 2132 || (mon->type == PLAYER
2396 && mon->contr-> 2133 && mon->contr->
2397 peaceful)) && 2134 peaceful)) &&
2398#else 2135#else
2399 op->contr->peaceful && 2136 op->contr->peaceful &&
2400#endif 2137#endif
2401 !on_battleground)) 2138 !on_battleground))
2402 { 2139 {
2403 if (!op->contr->braced) 2140 if (!op->contr->braced)
2404 { 2141 {
2405 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2142 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2406 (void) push_ob (mon, dir, op); 2143 push_ob (mon, dir, op);
2407 } 2144 }
2408 else 2145 else
2409 {
2410 new_draw_info (0, 0, op, "You withhold your attack"); 2146 new_draw_info (0, 0, op, "You withhold your attack");
2411 } 2147
2412 if (op->contr->tmp_invis || op->hide) 2148 if (op->contr->tmp_invis || op->hide)
2413 make_visible (op); 2149 make_visible (op);
2414 } 2150 }
2415 2151
2416 /* If the object is a boulder or other rollable object, then 2152 /* If the object is a boulder or other rollable object, then
… …
2427 * Way it works is like this: First, it must have some hit points 2163 * Way it works is like this: First, it must have some hit points
2428 * and be living. Then, it must be one of the following: 2164 * and be living. Then, it must be one of the following:
2429 * 1) Not a player, 2) A player, but of a different party. Note 2165 * 1) Not a player, 2) A player, but of a different party. Note
2430 * that party_number -1 is no party, so attacks can still happen. 2166 * that party_number -1 is no party, so attacks can still happen.
2431 */ 2167 */
2432
2433 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2168 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2434 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2169 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2435 { 2170 {
2436
2437 /* If the player hasn't hit something this tick, and does 2171 /* If the player hasn't hit something this tick, and does
2438 * so, give them speed boost based on weapon speed. Doing 2172 * so, give them speed boost based on weapon speed. Doing
2439 * it here is better than process_players2, which basically 2173 * it here is better than process_players2, which basically
2440 * incurred a 1 tick offset. 2174 * incurred a 1 tick offset.
2441 */ 2175 */
2442 if (!op->contr->has_hit) 2176 if (!op->contr->has_hit)
2443 { 2177 {
2444 op->speed_left += op->speed / op->contr->weapon_sp; 2178 op->speed_left += op->contr->weapon_sp - op->speed;
2445 2179
2446 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2180 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2447 } 2181 }
2448 2182
2449 skill_attack (mon, op, 0, NULL, NULL); 2183 skill_attack (mon, op, 0, 0, 0);
2450 2184
2451 /* If attacking another player, that player gets automatic 2185 /* If attacking another player, that player gets automatic
2452 * hitback, and doesn't loose luck either. 2186 * hitback, and doesn't loose luck either.
2453 * Disable hitback on the battleground or if the target is 2187 * Disable hitback on the battleground or if the target is
2454 * the wiz. 2188 * the wiz.
… …
2456 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2190 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2457 { 2191 {
2458 short luck = mon->stats.luck; 2192 short luck = mon->stats.luck;
2459 2193
2460 mon->contr->has_hit = 1; 2194 mon->contr->has_hit = 1;
2461 skill_attack (op, mon, 0, NULL, NULL); 2195 skill_attack (op, mon, 0, 0, 0);
2462 mon->stats.luck = luck; 2196 mon->stats.luck = luck;
2463 } 2197 }
2198
2464 if (action_makes_visible (op)) 2199 if (action_makes_visible (op))
2465 make_visible (op); 2200 make_visible (op);
2466 } 2201 }
2467 } /* if player should attack something */ 2202 } /* if player should attack something */
2468} 2203}
… …
2470int 2205int
2471move_player (object *op, int dir) 2206move_player (object *op, int dir)
2472{ 2207{
2473 int pick; 2208 int pick;
2474 2209
2475 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2210 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2476 return 0; 2211 return 0;
2477 2212
2478 /* Sanity check: make sure dir is valid */ 2213 /* Sanity check: make sure dir is valid */
2479 if ((dir < 0) || (dir >= 9)) 2214 if ((dir < 0) || (dir >= 9))
2480 { 2215 {
2481 LOG (llevError, "move_player: invalid direction %d\n", dir); 2216 LOG (llevError, "move_player: invalid direction %d\n", dir);
2482 return 0; 2217 return 0;
2483 } 2218 }
2484 2219
2485 /* peterm: added following line */ 2220 /* peterm: added following line */
2486 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2221 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2487 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2222 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2488 2223
2489 op->facing = dir; 2224 op->facing = dir;
2490 2225
2491 if (op->hide) 2226 if (op->hide)
2492 do_hidden_move (op); 2227 do_hidden_move (op);
… …
2503 2238
2504 /* Add special check for newcs players and fire on - this way, the 2239 /* Add special check for newcs players and fire on - this way, the
2505 * server can handle repeat firing. 2240 * server can handle repeat firing.
2506 */ 2241 */
2507 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2242 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2508 {
2509 op->direction = dir; 2243 op->direction = dir;
2510 }
2511 else 2244 else
2512 {
2513 op->direction = 0; 2245 op->direction = 0;
2514 } 2246
2515 /* Update how the player looks. Use the facing, so direction may 2247 /* Update how the player looks. Use the facing, so direction may
2516 * get reset to zero. This allows for full animation capabilities 2248 * get reset to zero. This allows for full animation capabilities
2517 * for players. 2249 * for players.
2518 */ 2250 */
2519 animate_object (op, op->facing); 2251 animate_object (op, op->facing);
… …
2528 * Returns true if there are more actions we can do. 2260 * Returns true if there are more actions we can do.
2529 */ 2261 */
2530int 2262int
2531handle_newcs_player (object *op) 2263handle_newcs_player (object *op)
2532{ 2264{
2533 if (op->contr->hidden)
2534 {
2535 op->invisible = 1000;
2536 /* the socket code flashes the player visible/invisible
2537 * depending on the value of invisible, so we need to
2538 * alternate it here for it to work correctly.
2539 */
2540 if (pticks & 2)
2541 op->invisible--;
2542 }
2543 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2544 {
2545 op->invisible--;
2546 if (!op->invisible)
2547 {
2548 make_visible (op);
2549 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2550 }
2551 }
2552
2553 if (QUERY_FLAG (op, FLAG_SCARED)) 2265 if (QUERY_FLAG (op, FLAG_SCARED))
2554 { 2266 {
2555 flee_player (op); 2267 flee_player (op);
2556 /* If player is still scared, that is his action for this tick */ 2268 /* If player is still scared, that is his action for this tick */
2557 if (QUERY_FLAG (op, FLAG_SCARED)) 2269 if (QUERY_FLAG (op, FLAG_SCARED))
2558 { 2270 {
2559 op->speed_left--; 2271 op->speed_left--;
2560 return 0; 2272 return 0;
2561 } 2273 }
2562 } 2274 }
2563
2564 /* I've been seeing crashes where the golem has been destroyed, but
2565 * the player object still points to the defunct golem. The code that
2566 * destroys the golem looks correct, and it doesn't always happen, so
2567 * put this in a a workaround to clean up the golem pointer.
2568 */
2569 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2570 op->contr->ranges[range_golem] = 0;
2571 2275
2572 /* call this here - we also will call this in do_ericserver, but 2276 /* call this here - we also will call this in do_ericserver, but
2573 * the players time has been increased when doericserver has been 2277 * the players time has been increased when doericserver has been
2574 * called, so we recheck it here. 2278 * called, so we recheck it here.
2575 */ 2279 */
2576 HandleClient (&op->contr->socket, op->contr); 2280 if (op->contr->ns->handle_command ())
2281 return 1;
2282
2577 if (op->speed_left < 0) 2283 if (op->speed_left > 0)
2578 return 0; 2284 {
2579
2580 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2285 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2581 { 2286 {
2582 /* All move commands take 1 tick, at least for now */ 2287 /* All move commands take 1 tick, at least for now */
2583 op->speed_left--; 2288 op->speed_left--;
2584 2289
2585 /* Instead of all the stuff below, let move_player take care 2290 /* Instead of all the stuff below, let move_player take care
2586 * of it. Also, some of the skill stuff is only put in 2291 * of it. Also, some of the skill stuff is only put in
2587 * there, as well as the confusion stuff. 2292 * there, as well as the confusion stuff.
2588 */ 2293 */
2589 move_player (op, op->direction); 2294 move_player (op, op->direction);
2590 if (op->speed_left > 0) 2295
2591 return 1; 2296 return op->speed_left > 0;
2592 else 2297 }
2593 return 0;
2594 } 2298 }
2299
2595 return 0; 2300 return 0;
2596} 2301}
2597 2302
2598int 2303int
2599save_life (object *op) 2304save_life (object *op)
2600{ 2305{
2601 object *tmp;
2602
2603 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2306 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2604 return 0; 2307 return 0;
2605 2308
2606 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2309 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2607 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2310 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2608 { 2311 {
2609 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2312 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2610 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2313 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2314
2611 if (op->contr) 2315 if (op->contr)
2612 esrv_del_item (op->contr, tmp->count); 2316 esrv_del_item (op->contr, tmp->count);
2613 remove_ob (tmp); 2317
2614 free_object (tmp); 2318 tmp->destroy ();
2615 CLEAR_FLAG (op, FLAG_LIFESAVE); 2319 CLEAR_FLAG (op, FLAG_LIFESAVE);
2320
2616 if (op->stats.hp < 0) 2321 if (op->stats.hp < 0)
2617 op->stats.hp = op->stats.maxhp; 2322 op->stats.hp = op->stats.maxhp;
2323
2618 if (op->stats.food < 0) 2324 if (op->stats.food < 0)
2619 op->stats.food = 999; 2325 op->stats.food = 999;
2620 fix_player (op); 2326
2327 op->update_stats ();
2621 return 1; 2328 return 1;
2622 } 2329 }
2330
2623 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2331 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2624 CLEAR_FLAG (op, FLAG_LIFESAVE); 2332 CLEAR_FLAG (op, FLAG_LIFESAVE);
2625 enter_player_savebed (op); /* bring him home. */ 2333 enter_player_savebed (op); /* bring him home. */
2626 return 0; 2334 return 0;
2627} 2335}
… …
2632 * from. 2340 * from.
2633 */ 2341 */
2634void 2342void
2635remove_unpaid_objects (object *op, object *env) 2343remove_unpaid_objects (object *op, object *env)
2636{ 2344{
2637 object *next;
2638
2639 while (op) 2345 while (op)
2640 { 2346 {
2641 next = op->below; /* Make sure we have a good value, in case 2347 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2642 * we remove object 'op' 2348
2643 */
2644 if (QUERY_FLAG (op, FLAG_UNPAID)) 2349 if (QUERY_FLAG (op, FLAG_UNPAID))
2645 { 2350 {
2646 remove_ob (op);
2647 op->x = env->x;
2648 op->y = env->y;
2649 if (env->type == PLAYER) 2351 if (env->type == PLAYER)
2650 esrv_del_item (env->contr, op->count); 2352 esrv_del_item (env->contr, op->count);
2651 insert_ob_in_map (op, env->map, NULL, 0); 2353
2354 op->insert_at (env);
2652 } 2355 }
2653 else if (op->inv) 2356 else if (op->inv)
2654 remove_unpaid_objects (op->inv, env); 2357 remove_unpaid_objects (op->inv, env);
2358
2655 op = next; 2359 op = next;
2656 } 2360 }
2657} 2361}
2658
2659 2362
2660/* 2363/*
2661 * Returns pointer a static string containing gravestone text 2364 * Returns pointer a static string containing gravestone text
2662 * Moved from apply.c to player.c - player.c is what 2365 * Moved from apply.c to player.c - player.c is what
2663 * actually uses this function. player.c may not be quite the 2366 * actually uses this function. player.c may not be quite the
… …
2674 strcpy (buf2, " R.I.P.\n\n"); 2377 strcpy (buf2, " R.I.P.\n\n");
2675 if (op->type == PLAYER) 2378 if (op->type == PLAYER)
2676 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2379 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2677 else 2380 else
2678 sprintf (buf, "%s\n", &op->name); 2381 sprintf (buf, "%s\n", &op->name);
2382
2679 strncat (buf2, " ", 20 - strlen (buf) / 2); 2383 strncat (buf2, " ", 20 - strlen (buf) / 2);
2680 strcat (buf2, buf); 2384 strcat (buf2, buf);
2681 if (op->type == PLAYER) 2385 if (op->type == PLAYER)
2682 sprintf (buf, "who was in level %d when killed\n", op->level); 2386 sprintf (buf, "who was in level %d when killed\n", op->level);
2683 else 2387 else
2684 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2388 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2389
2685 strncat (buf2, " ", 20 - strlen (buf) / 2); 2390 strncat (buf2, " ", 20 - strlen (buf) / 2);
2686 strcat (buf2, buf); 2391 strcat (buf2, buf);
2687 if (op->type == PLAYER) 2392 if (op->type == PLAYER)
2688 { 2393 {
2689 sprintf (buf, "by %s.\n\n", op->contr->killer); 2394 sprintf (buf, "by %s.\n\n", op->contr->killer);
2690 strncat (buf2, " ", 21 - strlen (buf) / 2); 2395 strncat (buf2, " ", 21 - strlen (buf) / 2);
2691 strcat (buf2, buf); 2396 strcat (buf2, buf);
2692 } 2397 }
2398
2693 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2399 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2694 strncat (buf2, " ", 20 - strlen (buf) / 2); 2400 strncat (buf2, " ", 20 - strlen (buf) / 2);
2695 strcat (buf2, buf); 2401 strcat (buf2, buf);
2402
2696 return buf2; 2403 return buf2;
2697} 2404}
2698
2699
2700 2405
2701void 2406void
2702do_some_living (object *op) 2407do_some_living (object *op)
2703{ 2408{
2704 int last_food = op->stats.food; 2409 int last_food = op->stats.food;
… …
2710 int rate_grace = 2000; 2415 int rate_grace = 2000;
2711 const int max_hp = 1; 2416 const int max_hp = 1;
2712 const int max_sp = 1; 2417 const int max_sp = 1;
2713 const int max_grace = 1; 2418 const int max_grace = 1;
2714 2419
2715 if (op->contr->outputs_sync) 2420 if (op->contr->hidden)
2716 {
2717 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2718 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2719 flush_output_element (op, &op->contr->outputs[i]);
2720 } 2421 {
2422 op->invisible = 1000;
2423 /* the socket code flashes the player visible/invisible
2424 * depending on the value of invisible, so we need to
2425 * alternate it here for it to work correctly.
2426 */
2427 if (pticks & 2)
2428 op->invisible--;
2429 }
2430 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2431 {
2432 if (!op->invisible--)
2433 {
2434 make_visible (op);
2435 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2436 }
2437 }
2721 2438
2722 if (op->contr->state == ST_PLAYING) 2439 if (op->contr->ns->state == ST_PLAYING)
2723 { 2440 {
2724
2725 /* these next three if clauses make it possible to SLOW DOWN 2441 /* these next three if clauses make it possible to SLOW DOWN
2726 hp/grace/spellpoint regeneration. */ 2442 hp/grace/spellpoint regeneration. */
2727 if (op->contr->gen_hp >= 0) 2443 if (op->contr->gen_hp >= 0)
2728 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2444 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2729 else 2445 else
2730 { 2446 {
2731 gen_hp = op->stats.maxhp; 2447 gen_hp = op->stats.maxhp;
2732 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2448 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2733 } 2449 }
2450
2734 if (op->contr->gen_sp >= 0) 2451 if (op->contr->gen_sp >= 0)
2735 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2452 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2736 else 2453 else
2737 { 2454 {
2738 gen_sp = op->stats.maxsp; 2455 gen_sp = op->stats.maxsp;
2739 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2456 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2740 } 2457 }
2458
2741 if (op->contr->gen_grace >= 0) 2459 if (op->contr->gen_grace >= 0)
2742 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2460 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2743 else 2461 else
2744 { 2462 {
2745 gen_grace = op->stats.maxgrace; 2463 gen_grace = op->stats.maxgrace;
2746 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2464 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2747 } 2465 }
2748 2466
2749 /* Regenerate Spell Points */ 2467 /* Regenerate Spell Points */
2750 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2468 if (!op->contr->golem && --op->last_sp < 0)
2751 { 2469 {
2752 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2470 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2753 if (op->stats.sp < op->stats.maxsp) 2471 if (op->stats.sp < op->stats.maxsp)
2754 { 2472 {
2755 op->stats.sp++; 2473 op->stats.sp++;
… …
2761 op->stats.food += op->contr->digestion; 2479 op->stats.food += op->contr->digestion;
2762 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2480 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2763 op->stats.food = last_food; 2481 op->stats.food = last_food;
2764 } 2482 }
2765 } 2483 }
2484
2766 if (max_sp > 1) 2485 if (max_sp > 1)
2767 { 2486 {
2768 over_sp = (gen_sp + 10) / rate_sp; 2487 over_sp = (gen_sp + 10) / rate_sp;
2769 if (over_sp > 0) 2488 if (over_sp > 0)
2770 { 2489 {
2771 if (op->stats.sp < op->stats.maxsp) 2490 if (op->stats.sp < op->stats.maxsp)
2772 { 2491 {
2773 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2492 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2493
2774 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2494 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2775 op->stats.sp--; 2495 op->stats.sp--;
2496
2776 if (op->stats.sp > op->stats.maxsp) 2497 if (op->stats.sp > op->stats.maxsp)
2777 op->stats.sp = op->stats.maxsp; 2498 op->stats.sp = op->stats.maxsp;
2778 } 2499 }
2779 op->last_sp = 0; 2500 op->last_sp = 0;
2780 } 2501 }
2781 else 2502 else
2782 {
2783 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2503 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2784 }
2785 } 2504 }
2786 else 2505 else
2787 {
2788 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2506 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2789 }
2790 } 2507 }
2791 2508
2792 /* Regenerate Grace */ 2509 /* Regenerate Grace */
2793 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2510 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2794 if (--op->last_grace < 0) 2511 if (--op->last_grace < 0)
2795 { 2512 {
2796 if (op->stats.grace < op->stats.maxgrace / 2) 2513 if (op->stats.grace < op->stats.maxgrace / 2)
2797 op->stats.grace++; /* no penalty in food for regaining grace */ 2514 op->stats.grace++; /* no penalty in food for regaining grace */
2515
2798 if (max_grace > 1) 2516 if (max_grace > 1)
2799 { 2517 {
2800 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2518 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2801 if (over_grace > 0) 2519 if (over_grace > 0)
2802 { 2520 {
… …
2830 op->stats.food += op->contr->digestion; 2548 op->stats.food += op->contr->digestion;
2831 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2549 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2832 op->stats.food = last_food; 2550 op->stats.food = last_food;
2833 } 2551 }
2834 } 2552 }
2553
2835 if (max_hp > 1) 2554 if (max_hp > 1)
2836 { 2555 {
2837 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2556 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2838 if (over_hp > 0) 2557 if (over_hp > 0)
2839 { 2558 {
… …
2863 2582
2864 if (op->contr->gen_hp > 0) 2583 if (op->contr->gen_hp > 0)
2865 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2584 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2866 else 2585 else
2867 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2586 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2587
2868 /* dms do not consume food */ 2588 /* dms do not consume food */
2869 if (!QUERY_FLAG (op, FLAG_WIZ)) 2589 if (!QUERY_FLAG (op, FLAG_WIZ))
2870 op->stats.food--; 2590 op->stats.food--;
2871 } 2591 }
2872 }
2873 2592
2874 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2593 if (op->stats.food < 0 && op->stats.hp >= 0)
2875 { 2594 {
2876 object *tmp, *flesh = NULL; 2595 object *tmp, *flesh = 0;
2877 2596
2878 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2597 for (tmp = op->inv; tmp; tmp = tmp->below)
2879 { 2598 {
2880 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2599 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2881 {
2882 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2883 { 2600 {
2601 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2602 {
2884 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2603 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2885 manual_apply (op, tmp, 0); 2604 manual_apply (op, tmp, 0);
2886 if (op->stats.food >= 0 || op->stats.hp < 0) 2605 if (op->stats.food >= 0 || op->stats.hp < 0)
2887 break; 2606 break;
2888 } 2607 }
2889 else if (tmp->type == FLESH) 2608 else if (tmp->type == FLESH)
2890 flesh = tmp; 2609 flesh = tmp;
2891 } /* End if paid for object */ 2610 } /* End if paid for object */
2892 } /* end of for loop */ 2611 } /* end of for loop */
2612
2893 /* If player is still starving, it means they don't have any food, so 2613 /* If player is still starving, it means they don't have any food, so
2894 * eat flesh instead. 2614 * eat flesh instead.
2895 */ 2615 */
2896 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2616 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2897 { 2617 {
2898 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2618 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2899 manual_apply (op, flesh, 0); 2619 manual_apply (op, flesh, 0);
2900 } 2620 }
2901 } /* end if player is starving */ 2621 }
2902 2622
2903 while (op->stats.food < 0 && op->stats.hp > 0) 2623 while (op->stats.food < 0 && op->stats.hp >= 0)
2904 op->stats.food++, op->stats.hp--; 2624 op->stats.food++, op->stats.hp--;
2905 2625
2906 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2626 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2907 kill_player (op); 2627 kill_player (op);
2628 }
2908} 2629}
2909
2910
2911 2630
2912/* If the player should die (lack of hp, food, etc), we call this. 2631/* If the player should die (lack of hp, food, etc), we call this.
2913 * op is the player in jeopardy. If the player can not be saved (not 2632 * op is the player in jeopardy. If the player can not be saved (not
2914 * permadeath, no lifesave), this will take care of removing the player 2633 * permadeath, no lifesave), this will take care of removing the player
2915 * file. 2634 * file.
… …
2945 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2664 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2946 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2665 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2947 2666
2948 /* restore player */ 2667 /* restore player */
2949 at = archetype::find ("poisoning"); 2668 at = archetype::find ("poisoning");
2950 tmp = present_arch_in_ob (at, op); 2669 if (object *tmp = present_arch_in_ob (at, op))
2951 if (tmp)
2952 { 2670 {
2953 remove_ob (tmp); 2671 tmp->destroy ();
2954 free_object (tmp);
2955 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2672 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2956 } 2673 }
2957 2674
2958 at = archetype::find ("confusion"); 2675 at = archetype::find ("confusion");
2959 tmp = present_arch_in_ob (at, op); 2676 if (object *tmp = present_arch_in_ob (at, op))
2960 if (tmp)
2961 { 2677 {
2962 remove_ob (tmp); 2678 tmp->destroy ();
2963 free_object (tmp);
2964 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2679 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2965 } 2680 }
2966 2681
2967 cure_disease (op, 0); /* remove any disease */ 2682 cure_disease (op, 0); /* remove any disease */
2968 op->stats.hp = op->stats.maxhp; 2683 op->stats.hp = op->stats.maxhp;
2969 if (op->stats.food <= 0) 2684 if (op->stats.food <= 0)
2970 op->stats.food = 999; 2685 op->stats.food = 999;
2971 2686
2972 /* create a bodypart-trophy to make the winner happy */ 2687 /* create a bodypart-trophy to make the winner happy */
2973 tmp = arch_to_object (archetype::find ("finger")); 2688 if (object *tmp = arch_to_object (archetype::find ("finger")))
2974 if (tmp != NULL)
2975 { 2689 {
2976 sprintf (buf, "%s's finger", &op->name); 2690 sprintf (buf, "%s's finger", &op->name);
2977 tmp->name = buf; 2691 tmp->name = buf;
2978 sprintf (buf, " This finger has been cut off %s\n" 2692 sprintf (buf, " This finger has been cut off %s\n"
2979 " the %s, when he was defeated at\n level %d by %s.\n", 2693 " the %s, when he was defeated at\n level %d by %s.\n",
2980 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2694 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2981 tmp->msg = buf; 2695 tmp->msg = buf;
2982 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2696 tmp->value = 0, tmp->type = 0;
2983 tmp->materialname = NULL; 2697 tmp->materialname = "organics";
2984 tmp->x = op->x, tmp->y = op->y; 2698 tmp->insert_at (op, tmp);
2985 insert_ob_in_map (tmp, op->map, op, 0);
2986 } 2699 }
2987 2700
2988 /* teleport defeated player to new destination */ 2701 /* teleport defeated player to new destination */
2989 transfer_ob (op, x, y, 0, NULL); 2702 transfer_ob (op, x, y, 0, NULL);
2990 op->contr->braced = 0; 2703 op->contr->braced = 0;
… …
2995 2708
2996 command_kill_pets (op, 0); 2709 command_kill_pets (op, 0);
2997 2710
2998 if (op->stats.food < 0) 2711 if (op->stats.food < 0)
2999 { 2712 {
3000 if (op->contr->explore)
3001 {
3002 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
3003 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3004 op->stats.food = 999;
3005 return;
3006 }
3007 sprintf (buf, "%s starved to death.", &op->name); 2713 sprintf (buf, "%s starved to death.", &op->name);
3008 strcpy (op->contr->killer, "starvation"); 2714 strcpy (op->contr->killer, "starvation");
3009 } 2715 }
3010 else 2716 else
3011 {
3012 if (op->contr->explore)
3013 {
3014 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
3015 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3016 op->stats.hp = op->stats.maxhp;
3017 return;
3018 }
3019 sprintf (buf, "%s died.", &op->name); 2717 sprintf (buf, "%s died.", &op->name);
3020 } 2718
3021 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2719 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3022 2720
3023 /* save the map location for corpse, gravestone */ 2721 /* save the map location for corpse, gravestone */
3024 x = op->x; 2722 x = op->x;
3025 y = op->y; 2723 y = op->y;
3026 map = op->map; 2724 map = op->map;
3027 2725
3028
3029 if (settings.not_permadeth == TRUE)
3030 {
3031 /* NOT_PERMADEATH code. This basically brings the character back to 2726 /* NOT_PERMADEATH code. This basically brings the character back to
3032 * life if they are dead - it takes some exp and a random stat. 2727 * life if they are dead - it takes some exp and a random stat.
3033 * See the config.h file for a little more in depth detail about this. 2728 * See the config.h file for a little more in depth detail about this.
3034 */ 2729 */
3035 2730
3036 /* Basically two ways to go - remove a stat permanently, or just 2731 /* Basically two ways to go - remove a stat permanently, or just
3037 * make it depletion. This bunch of code deals with that aspect 2732 * make it depletion. This bunch of code deals with that aspect
3038 * of death. 2733 * of death.
3039 */ 2734 */
3040#ifndef COZY_SERVER 2735#ifndef COZY_SERVER
3041 if (settings.balanced_stat_loss) 2736 if (settings.balanced_stat_loss)
3042 { 2737 {
3043 /* If stat loss is permanent, lose one stat only. */ 2738 /* If stat loss is permanent, lose one stat only. */
3044 /* Lower level chars don't lose as many stats because they suffer 2739 /* Lower level chars don't lose as many stats because they suffer
3045 more if they do. */ 2740 more if they do. */
3046 /* Higher level characters can afford things such as potions of 2741 /* Higher level characters can afford things such as potions of
3047 restoration, or better, stat potions. So we slug them that 2742 restoration, or better, stat potions. So we slug them that
3048 little bit harder. */ 2743 little bit harder. */
3049 /* GD */ 2744 /* GD */
3050 if (settings.stat_loss_on_death) 2745 if (settings.stat_loss_on_death)
3051 num_stats_lose = 1; 2746 num_stats_lose = 1;
3052 else
3053 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3054 }
3055 else 2747 else
3056 { 2748 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2749 }
2750 else
3057 num_stats_lose = 1; 2751 num_stats_lose = 1;
3058 } 2752
3059 lost_a_stat = 0; 2753 lost_a_stat = 0;
3060 2754
3061 for (z = 0; z < num_stats_lose; z++) 2755 for (z = 0; z < num_stats_lose; z++)
3062 { 2756 {
3063 i = RANDOM () % NUM_STATS; 2757 i = RANDOM () % NUM_STATS;
3064 2758
3065 if (settings.stat_loss_on_death) 2759 if (settings.stat_loss_on_death)
3066 { 2760 {
3067 /* Pick a random stat and take a point off it. Tell the player 2761 /* Pick a random stat and take a point off it. Tell the player
3068 * what he lost. 2762 * what he lost.
3069 */ 2763 */
3070 change_attr_value (&(op->stats), i, -1); 2764 change_attr_value (&(op->stats), i, -1);
3071 check_stat_bounds (&(op->stats)); 2765 check_stat_bounds (&(op->stats));
3072 change_attr_value (&(op->contr->orig_stats), i, -1); 2766 change_attr_value (&(op->contr->orig_stats), i, -1);
3073 check_stat_bounds (&(op->contr->orig_stats)); 2767 check_stat_bounds (&(op->contr->orig_stats));
3074 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2768 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3075 lost_a_stat = 1; 2769 lost_a_stat = 1;
2770 }
2771 else
2772 {
2773 /* deplete a stat */
2774 archetype *deparch = archetype::find ("depletion");
2775 object *dep;
2776
2777 dep = present_arch_in_ob (deparch, op);
2778 if (!dep)
2779 {
2780 dep = arch_to_object (deparch);
2781 insert_ob_in_ob (dep, op);
3076 } 2782 }
3077 else 2783 lose_this_stat = 1;
2784 if (settings.balanced_stat_loss)
3078 { 2785 {
3079 /* deplete a stat */ 2786 /* GD */
3080 archetype *deparch = archetype::find ("depletion"); 2787 /* Get the stat that we're about to deplete. */
3081 object *dep; 2788 this_stat = get_attr_value (&(dep->stats), i);
3082 2789 if (this_stat < 0)
3083 dep = present_arch_in_ob (deparch, op);
3084 if (!dep)
3085 { 2790 {
3086 dep = arch_to_object (deparch); 2791 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3087 insert_ob_in_ob (dep, op); 2792 int keep_chance = this_stat * this_stat;
3088 } 2793
3089 lose_this_stat = 1; 2794 /* Yes, I am paranoid. Sue me. */
3090 if (settings.balanced_stat_loss)
3091 {
3092 /* GD */
3093 /* Get the stat that we're about to deplete. */
3094 this_stat = get_attr_value (&(dep->stats), i);
3095 if (this_stat < 0) 2795 if (keep_chance < 1)
2796 keep_chance = 1;
2797
2798 /* There is a maximum depletion total per level. */
2799 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3096 { 2800 {
3097 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3098 int keep_chance = this_stat * this_stat;
3099
3100 /* Yes, I am paranoid. Sue me. */
3101 if (keep_chance < 1)
3102 keep_chance = 1;
3103
3104 /* There is a maximum depletion total per level. */
3105 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3106 {
3107 lose_this_stat = 0; 2801 lose_this_stat = 0;
3108 /* Take loss chance vs keep chance to see if we 2802 /* Take loss chance vs keep chance to see if we
3109 retain the stat. */ 2803 retain the stat. */
3110 }
3111 else
3112 {
3113 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3114 lose_this_stat = 0;
3115 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3116 this_stat, keep_chance, loss_chance,
3117 lose_this_stat?"LOSE":"KEEP"); */
3118 }
3119 } 2804 }
3120 }
3121
3122 if (lose_this_stat)
3123 {
3124 this_stat = get_attr_value (&(dep->stats), i);
3125 /* We could try to do something clever like find another
3126 * stat to reduce if this fails. But chances are, if
3127 * stats have been depleted to -50, all are pretty low
3128 * and should be roughly the same, so it shouldn't make a
3129 * difference.
3130 */ 2805 else
3131 if (this_stat >= -50)
3132 { 2806 {
3133 change_attr_value (&(dep->stats), i, -1); 2807 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3134 SET_FLAG (dep, FLAG_APPLIED);
3135 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3136 fix_player (op);
3137 lost_a_stat = 1; 2808 lose_this_stat = 0;
2809 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2810 this_stat, keep_chance, loss_chance,
2811 lose_this_stat?"LOSE":"KEEP"); */
3138 } 2812 }
3139 } 2813 }
3140 } 2814 }
2815
2816 if (lose_this_stat)
2817 {
2818 this_stat = get_attr_value (&(dep->stats), i);
2819 /* We could try to do something clever like find another
2820 * stat to reduce if this fails. But chances are, if
2821 * stats have been depleted to -50, all are pretty low
2822 * and should be roughly the same, so it shouldn't make a
2823 * difference.
2824 */
2825 if (this_stat >= -50)
2826 {
2827 change_attr_value (&(dep->stats), i, -1);
2828 SET_FLAG (dep, FLAG_APPLIED);
2829 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2830 op->update_stats ();
2831 lost_a_stat = 1;
2832 }
3141 } 2833 }
2834 }
2835 }
3142 /* If no stat lost, tell the player. */ 2836 /* If no stat lost, tell the player. */
3143 if (!lost_a_stat) 2837 if (!lost_a_stat)
3144 { 2838 {
3145 /* determine_god() seems to not work sometimes... why is this? 2839 /* determine_god() seems to not work sometimes... why is this?
3146 Should I be using something else? GD */ 2840 Should I be using something else? GD */
3147 const char *god = determine_god (op); 2841 const char *god = determine_god (op);
3148 2842
3149 if (god && (strcmp (god, "none"))) 2843 if (god && (strcmp (god, "none")))
3150 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2844 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3151 else 2845 else
3152 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2846 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3153 } 2847 }
3154#else 2848#else
3155 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2849 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3156#endif 2850#endif
3157 2851
3158 /* Put a gravestone up where the character 'almost' died. List the 2852 /* Put a gravestone up where the character 'almost' died. List the
3159 * exp loss on the stone. 2853 * exp loss on the stone.
3160 */ 2854 */
3161 tmp = arch_to_object (archetype::find ("gravestone")); 2855 tmp = arch_to_object (archetype::find ("gravestone"));
3162 sprintf (buf, "%s's gravestone", &op->name); 2856 sprintf (buf, "%s's gravestone", &op->name);
3163 tmp->name = buf; 2857 tmp->name = buf;
3164 sprintf (buf, "%s's gravestones", &op->name); 2858 sprintf (buf, "%s's gravestones", &op->name);
3165 tmp->name_pl = buf; 2859 tmp->name_pl = buf;
3166 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); 2860 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);
3167 tmp->msg = buf; 2861 tmp->msg = buf;
3168 tmp->x = op->x, tmp->y = op->y; 2862 tmp->x = op->x, tmp->y = op->y;
3169 insert_ob_in_map (tmp, op->map, NULL, 0); 2863 insert_ob_in_map (tmp, op->map, NULL, 0);
3170 2864
3171 /**************************************/ 2865 /**************************************/
3172 /* */ 2866 /* */
3173 /* Subtract the experience points, */ 2867 /* Subtract the experience points, */
3174 /* if we died cause of food, give us */ 2868 /* if we died cause of food, give us */
3175 /* food, and reset HP's... */ 2869 /* food, and reset HP's... */
3176 /* */ 2870 /* */
3177 /**************************************/ 2871 /**************************************/
3178 2872
3179 /* remove any poisoning and confusion the character may be suffering. */ 2873 /* remove any poisoning and confusion the character may be suffering. */
3180 /* restore player */ 2874 /* restore player */
3181 at = archetype::find ("poisoning"); 2875 at = archetype::find ("poisoning");
3182 tmp = present_arch_in_ob (at, op); 2876 tmp = present_arch_in_ob (at, op);
2877
3183 if (tmp) 2878 if (tmp)
3184 { 2879 {
3185 remove_ob (tmp); 2880 tmp->destroy ();
3186 free_object (tmp);
3187 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2881 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3188 } 2882 }
3189 2883
3190 at = archetype::find ("confusion"); 2884 at = archetype::find ("confusion");
3191 tmp = present_arch_in_ob (at, op); 2885 tmp = present_arch_in_ob (at, op);
3192 if (tmp) 2886 if (tmp)
3193 { 2887 {
3194 remove_ob (tmp); 2888 tmp->destroy ();
3195 free_object (tmp);
3196 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2889 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3197 } 2890 }
3198 2891
3199 cure_disease (op, 0); /* remove any disease */ 2892 cure_disease (op, 0); /* remove any disease */
3200 2893
3201 /*add_exp(op, (op->stats.exp * -0.20)); */ 2894 /*add_exp(op, (op->stats.exp * -0.20)); */
3202 apply_death_exp_penalty (op); 2895 apply_death_exp_penalty (op);
3203 if (op->stats.food < 100) 2896 if (op->stats.food < 100)
3204 op->stats.food = 900; 2897 op->stats.food = 900;
3205 op->stats.hp = op->stats.maxhp; 2898 op->stats.hp = op->stats.maxhp;
3206 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2899 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3207 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2900 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3208 2901
3209 /* 2902 /*
3210 * Check to see if the player is in a shop. IF so, then check to see if 2903 * Check to see if the player has any unpaid items. If so, remove them
3211 * the player has any unpaid items. If so, remove them and put them back 2904 * and put them back in the map.
3212 * in the map. 2905 */
3213 */
3214
3215 if (is_in_shop (op))
3216 remove_unpaid_objects (op->inv, op); 2906 remove_unpaid_objects (op->inv, op);
3217 2907
3218 /****************************************/ 2908 /****************************************/
3219 /* */ 2909 /* */
3220 /* Move player to his current respawn- */ 2910 /* Move player to his current respawn- */
3221 /* position (usually last savebed) */ 2911 /* position (usually last savebed) */
3222 /* */ 2912 /* */
3223 /****************************************/ 2913 /****************************************/
3224 2914
3225 enter_player_savebed (op); 2915 enter_player_savebed (op);
3226 2916
3227 /* Save the player before inserting the force to reduce
3228 * chance of abuse.
3229 */
3230 op->contr->braced = 0; 2917 op->contr->braced = 0;
3231 save_player (op, 1);
3232 2918
3233 /* it is possible that the player has blown something up 2919 /* it is possible that the player has blown something up
3234 * at his savebed location, and that can have long lasting 2920 * at his savebed location, and that can have long lasting
3235 * spell effects. So first see if there is a spell effect 2921 * spell effects. So first see if there is a spell effect
3236 * on the space that might harm the player. 2922 * on the space that might harm the player.
3237 */ 2923 */
3238 will_kill_again = 0; 2924 will_kill_again = 0;
3239 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2925 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3240 if (tmp->type == SPELL_EFFECT) 2926 if (tmp->type == SPELL_EFFECT)
3241 will_kill_again |= tmp->attacktype; 2927 will_kill_again |= tmp->attacktype;
3242 2928
3243 if (will_kill_again) 2929 if (will_kill_again)
3244 { 2930 {
3245 object *force; 2931 object *force;
3246 int at; 2932 int at;
3247 2933
3248 force = get_archetype (FORCE_NAME); 2934 force = get_archetype (FORCE_NAME);
3249 /* 50 ticks should be enough time for the spell to abate */ 2935 /* 50 ticks should be enough time for the spell to abate */
3250 force->speed = 0.1; 2936 force->speed = 0.1;
3251 force->speed_left = -5.0; 2937 force->speed_left = -5.0;
3252 SET_FLAG (force, FLAG_APPLIED); 2938 SET_FLAG (force, FLAG_APPLIED);
3253 for (at = 0; at < NROFATTACKS; at++) 2939 for (at = 0; at < NROFATTACKS; at++)
3254 if (will_kill_again & (1 << at)) 2940 if (will_kill_again & (1 << at))
3255 force->resist[at] = 100; 2941 force->resist[at] = 100;
3256 2942
3257 insert_ob_in_ob (force, op); 2943 insert_ob_in_ob (force, op);
3258 fix_player (op); 2944 op->update_stats ();
3259 2945
3260 } 2946 }
3261 2947
3262 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2948 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3263 return;
3264 } /* NOT_PERMADETH */
3265 else
3266 {
3267 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3268 * should probably be embedded in an else statement.
3269 */
3270
3271 op->contr->party = NULL;
3272 if (settings.set_title == TRUE)
3273 op->contr->own_title[0] = '\0';
3274 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3275 check_score (op);
3276
3277 if (op->contr->ranges[range_golem])
3278 {
3279 remove_friendly_object (op->contr->ranges[range_golem]);
3280 remove_ob (op->contr->ranges[range_golem]);
3281 free_object (op->contr->ranges[range_golem]);
3282 op->contr->ranges[range_golem] = 0;
3283 }
3284
3285 loot_object (op); /* Remove some of the items for good */
3286 remove_ob (op);
3287 op->direction = 0;
3288
3289 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3290 {
3291 delete_character (op->name, 0);
3292 if (settings.resurrection == TRUE)
3293 {
3294 /* save playerfile sans equipment when player dies
3295 ** then save it as player.pl.dead so that future resurrection
3296 ** type spells will work on them nicely
3297 */
3298 delete_character (op->name, 0);
3299 op->stats.hp = op->stats.maxhp;
3300 op->stats.food = 999;
3301
3302 /* set the location of where the person will reappear when */
3303 /* maybe resurrection code should fix map also */
3304 strcpy (op->contr->maplevel, settings.emergency_mapname);
3305 if (op->map != NULL)
3306 op->map = NULL;
3307 op->x = settings.emergency_x;
3308 op->y = settings.emergency_y;
3309 save_player (op, 0);
3310 op->map = map;
3311 /* please see resurrection.c: peterm */
3312 dead_player (op);
3313 }
3314 else
3315 delete_character (op->name, 1);
3316 }
3317
3318 play_again (op);
3319
3320 /* peterm: added to create a corpse at deathsite. */
3321 tmp = arch_to_object (archetype::find ("corpse_pl"));
3322 sprintf (buf, "%s", &op->name);
3323 tmp->name = tmp->name_pl = buf;
3324 tmp->level = op->level;
3325 tmp->x = x;
3326 tmp->y = y;
3327 tmp->msg = gravestone_text (op);
3328 SET_FLAG (tmp, FLAG_UNIQUE);
3329 insert_ob_in_map (tmp, map, NULL, 0);
3330 }
3331} 2949}
3332
3333 2950
3334void 2951void
3335loot_object (object *op) 2952loot_object (object *op)
3336{ /* Grab and destroy some treasure */ 2953{ /* Grab and destroy some treasure */
3337 object *tmp, *tmp2, *next; 2954 object *tmp, *tmp2, *next;
3338 2955
3339 if (op->container) 2956 op->close_container (); /* close open sack first */
3340 { /* close open sack first */
3341 esrv_apply_container (op, op->container);
3342 }
3343 2957
3344 for (tmp = op->inv; tmp != NULL; tmp = next) 2958 for (tmp = op->inv; tmp; tmp = next)
3345 { 2959 {
3346 next = tmp->below; 2960 next = tmp->below;
3347 if (tmp->type == EXPERIENCE || tmp->invisible) 2961
2962 if (tmp->invisible)
3348 continue; 2963 continue;
3349 remove_ob (tmp); 2964
2965 tmp->remove ();
3350 tmp->x = op->x, tmp->y = op->y; 2966 tmp->x = op->x, tmp->y = op->y;
2967
3351 if (tmp->type == CONTAINER) 2968 if (tmp->type == CONTAINER)
3352 { /* empty container to ground */ 2969 loot_object (tmp); /* empty container to ground */
3353 loot_object (tmp); 2970
3354 }
3355 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2971 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3356 { 2972 {
3357 if (tmp->nrof > 1) 2973 if (tmp->nrof > 1)
3358 { 2974 {
3359 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2975 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3360 free_object (tmp2); 2976 tmp2->destroy ();
3361 insert_ob_in_map (tmp, op->map, NULL, 0); 2977 insert_ob_in_map (tmp, op->map, NULL, 0);
3362 } 2978 }
3363 else 2979 else
3364 free_object (tmp); 2980 tmp->destroy ();
3365 } 2981 }
3366 else 2982 else
3367 insert_ob_in_map (tmp, op->map, NULL, 0); 2983 insert_ob_in_map (tmp, op->map, NULL, 0);
3368 } 2984 }
3369} 2985}
… …
3371/* 2987/*
3372 * fix_weight(): Check recursively the weight of all players, and fix 2988 * fix_weight(): Check recursively the weight of all players, and fix
3373 * what needs to be fixed. Refresh windows and fix speed if anything 2989 * what needs to be fixed. Refresh windows and fix speed if anything
3374 * was changed. 2990 * was changed.
3375 */ 2991 */
3376
3377void 2992void
3378fix_weight (void) 2993fix_weight (void)
3379{ 2994{
3380 player *pl; 2995 for_all_players (pl)
3381
3382 for (pl = first_player; pl != NULL; pl = pl->next)
3383 { 2996 {
3384 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2997 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3385 2998
3386 if (old == sum) 2999 if (old == sum)
3387 continue; 3000 continue;
3388 fix_player (pl->ob); 3001 pl->ob->update_stats ();
3389 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 3002 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3390 } 3003 }
3391} 3004}
3392 3005
3393void 3006void
3394fix_luck (void) 3007fix_luck (void)
3395{ 3008{
3396 player *pl; 3009 for_all_players (pl)
3397
3398 for (pl = first_player; pl != NULL; pl = pl->next)
3399 if (!pl->ob->contr->state) 3010 if (!pl->ob->contr->ns->state)
3400 change_luck (pl->ob, 0); 3011 pl->ob->change_luck (0);
3401} 3012}
3402
3403 3013
3404/* cast_dust() - handles op throwing objects of type 'DUST'. 3014/* cast_dust() - handles op throwing objects of type 'DUST'.
3405 * This is much simpler in the new spell code - we basically 3015 * This is much simpler in the new spell code - we basically
3406 * just treat this as any other spell casting object. 3016 * just treat this as any other spell casting object.
3407 */ 3017 */
3408
3409void 3018void
3410cast_dust (object *op, object *throw_ob, int dir) 3019cast_dust (object *op, object *throw_ob, int dir)
3411{ 3020{
3412 object *skop, *spob; 3021 object *skop, *spob;
3413 3022
… …
3434 if (op->type == PLAYER) 3043 if (op->type == PLAYER)
3435 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 3044 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3436 3045
3437 cast_spell (op, throw_ob, dir, spob, NULL); 3046 cast_spell (op, throw_ob, dir, spob, NULL);
3438 3047
3439 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3048 throw_ob->destroy ();
3440 remove_ob (throw_ob);
3441 free_object (throw_ob);
3442} 3049}
3443 3050
3444void 3051void
3445make_visible (object *op) 3052make_visible (object *op)
3446{ 3053{
… …
3449 if (op->type == PLAYER) 3056 if (op->type == PLAYER)
3450 { 3057 {
3451 op->contr->tmp_invis = 0; 3058 op->contr->tmp_invis = 0;
3452 op->contr->invis_race = 0; 3059 op->contr->invis_race = 0;
3453 } 3060 }
3061
3454 update_object (op, UP_OBJ_FACE); 3062 update_object (op, UP_OBJ_CHANGE);
3455} 3063}
3456 3064
3457int 3065int
3458is_true_undead (object *op) 3066is_true_undead (object *op)
3459{ 3067{
3460 object *tmp = NULL;
3461
3462 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3068 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3463 return 1; 3069 return 1;
3464 3070
3465 if (op->type == PLAYER)
3466 for (tmp = op->inv; tmp; tmp = tmp->below)
3467 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3468 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3469 return 1;
3470 return 0; 3071 return 0;
3471} 3072}
3472 3073
3473/* look at the surrounding terrain to determine 3074/* look at the surrounding terrain to determine
3474 * the hideability of this object. Positive levels 3075 * the hideability of this object. Positive levels
… …
3530 3131
3531 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3132 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3532 3133
3533 /* its *extremely* hard to run and sneak/hide at the same time! */ 3134 /* its *extremely* hard to run and sneak/hide at the same time! */
3534 if (op->type == PLAYER && op->contr->run_on) 3135 if (op->type == PLAYER && op->contr->run_on)
3535 {
3536 if (!skop || num >= skop->level) 3136 if (!skop || num >= skop->level)
3537 { 3137 {
3538 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3138 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3539 make_visible (op); 3139 make_visible (op);
3540 return; 3140 return;
3541 } 3141 }
3542 else 3142 else
3543 num += 20; 3143 num += 20;
3544 } 3144
3545 num += op->map->difficulty; 3145 num += op->map->difficulty;
3546 hide = hideability (op); /* modify by terrain hidden level */ 3146 hide = hideability (op); /* modify by terrain hidden level */
3547 num -= hide; 3147 num -= hide;
3148
3548 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3149 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3549 { 3150 {
3550 make_visible (op); 3151 make_visible (op);
3551 if (op->type == PLAYER) 3152 if (op->type == PLAYER)
3552 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3153 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3553 } 3154 }
3554 else if (op->type == PLAYER && skop) 3155 else if (op->type == PLAYER && skop)
3555 {
3556 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3156 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3557 }
3558} 3157}
3559 3158
3560/* determine if who is standing near a hostile creature. */ 3159/* determine if who is standing near a hostile creature. */
3561 3160
3562int 3161int
… …
3589 if (mflags & P_OUT_OF_MAP) 3188 if (mflags & P_OUT_OF_MAP)
3590 continue; 3189 continue;
3591 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3190 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3592 continue; 3191 continue;
3593 3192
3594 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3193 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3595 { 3194 {
3596 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3195 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3597 return 1; 3196 return 1;
3598 else if (tmp->type == PLAYER) 3197 else if (tmp->type == PLAYER)
3599 { 3198 {
… …
3629 if (pl->type != PLAYER) 3228 if (pl->type != PLAYER)
3630 { 3229 {
3631 LOG (llevError, "player_can_view() called for non-player object\n"); 3230 LOG (llevError, "player_can_view() called for non-player object\n");
3632 return -1; 3231 return -1;
3633 } 3232 }
3233
3634 if (!pl || !op) 3234 if (!pl || !op)
3635 return 0; 3235 return 0;
3636 3236
3637 if (op->head)
3638 {
3639 op = op->head; 3237 op = op->head_ ();
3640 } 3238
3641 get_rangevector (pl, op, &rv, 0x1); 3239 get_rangevector (pl, op, &rv, 0x1);
3642 3240
3643 /* starting with the 'head' part, lets loop 3241 /* starting with the 'head' part, lets loop
3644 * through the object and find if it has any 3242 * through the object and find if it has any
3645 * part that is in the los array but isnt on 3243 * part that is in the los array but isnt on
… …
3653 3251
3654 /* only the viewable area the player sees is updated by LOS 3252 /* only the viewable area the player sees is updated by LOS
3655 * code, so we need to restrict ourselves to that range of values 3253 * code, so we need to restrict ourselves to that range of values
3656 * for any meaningful values. 3254 * for any meaningful values.
3657 */ 3255 */
3658 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3256 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3659 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3257 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3660 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3258 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3661 return 1; 3259 return 1;
3662 op = op->more; 3260 op = op->more;
3663 } 3261 }
3664 return 0; 3262 return 0;
3665} 3263}
… …
3762 char buf[MAX_BUF]; /* tmp. string buffer */ 3360 char buf[MAX_BUF]; /* tmp. string buffer */
3763 int i = 0, j = 0; 3361 int i = 0, j = 0;
3764 3362
3765 /* get the appropriate treasurelist */ 3363 /* get the appropriate treasurelist */
3766 if (atnr == ATNR_FIRE) 3364 if (atnr == ATNR_FIRE)
3767 trlist = find_treasurelist ("dragon_ability_fire"); 3365 trlist = treasurelist::find ("dragon_ability_fire");
3768 else if (atnr == ATNR_COLD) 3366 else if (atnr == ATNR_COLD)
3769 trlist = find_treasurelist ("dragon_ability_cold"); 3367 trlist = treasurelist::find ("dragon_ability_cold");
3770 else if (atnr == ATNR_ELECTRICITY) 3368 else if (atnr == ATNR_ELECTRICITY)
3771 trlist = find_treasurelist ("dragon_ability_elec"); 3369 trlist = treasurelist::find ("dragon_ability_elec");
3772 else if (atnr == ATNR_POISON) 3370 else if (atnr == ATNR_POISON)
3773 trlist = find_treasurelist ("dragon_ability_poison"); 3371 trlist = treasurelist::find ("dragon_ability_poison");
3774 3372
3775 if (trlist == NULL || who->type != PLAYER) 3373 if (trlist == NULL || who->type != PLAYER)
3776 return; 3374 return;
3777 3375
3778 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3376 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3779 3377
3780 if (tr == NULL || tr->item == NULL) 3378 if (!tr || !tr->item)
3781 { 3379 {
3782 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3380 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3783 return; 3381 return;
3784 } 3382 }
3785 3383
… …
3851 { 3449 {
3852 /* forces in the treasurelist can alter the player's stats */ 3450 /* forces in the treasurelist can alter the player's stats */
3853 object *skin; 3451 object *skin;
3854 3452
3855 /* first get the dragon skin force */ 3453 /* first get the dragon skin force */
3454 shstr_cmp dragon_skin_force ("dragon_skin_force");
3856 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3455 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3456 ;
3457
3857 if (skin == NULL) 3458 if (!skin)
3858 return; 3459 return;
3859 3460
3860 /* adding new spellpath attunements */ 3461 /* adding new spellpath attunements */
3861 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3462 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3862 { 3463 {
… …
3907 * not readied. 3508 * not readied.
3908 */ 3509 */
3909void 3510void
3910player_unready_range_ob (player *pl, object *ob) 3511player_unready_range_ob (player *pl, object *ob)
3911{ 3512{
3912 rangetype i; 3513 if (pl->ob->current_weapon == ob)
3514 pl->ob->current_weapon = 0;
3913 3515
3914 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3516 if (pl->combat_ob == ob)
3915 { 3517 pl->combat_ob = 0;
3518
3916 if (pl->ranges[i] == ob) 3519 if (pl->ranged_ob == ob)
3917 { 3520 pl->ranged_ob = 0;
3918 pl->ranges[i] = NULL;
3919 if (pl->shoottype == i)
3920 {
3921 pl->shoottype = range_none;
3922 }
3923 }
3924 }
3925} 3521}
3522
3523sint8
3524player::visibility_at (maptile *map, int x, int y) const
3525{
3526 if (!ns)
3527 return 0;
3528
3529 int dx, dy;
3530 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3531 return 0;
3532
3533 x += dx - ns->current_x + ns->mapx / 2;
3534 y += dy - ns->current_y + ns->mapy / 2;
3535
3536 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3537 return 0;
3538
3539 return 100 - blocked_los [x][y];
3540}

Diff Legend

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