ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

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

Diff Legend

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