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.41 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.177 by root, Thu Dec 27 15:32:41 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32#include <newclient.h>
33 31
34#ifdef COZY_SERVER 32#include <algorithm>
35extern int same_party (partylist *a, partylist *b); 33#include <functional>
36#endif
37 34
38player * 35playervec players;
39find_player (const char *plname)
40{
41 player *pl;
42
43 for (pl = first_player; pl != NULL; pl = pl->next)
44 {
45 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
46 return pl;
47 };
48 return NULL;
49}
50
51player *
52find_player_partial_name (const char *plname)
53{
54 player *pl;
55 player *found = NULL;
56 size_t namelen = strlen (plname);
57
58 for (pl = first_player; pl != NULL; pl = pl->next)
59 {
60 if ((size_t) strlen (pl->ob->name) < namelen)
61 continue;
62
63 if (!strcmp (pl->ob->name, plname))
64 return pl;
65
66 if (!strncasecmp (pl->ob->name, plname, namelen))
67 {
68 if (found)
69 return NULL;
70
71 found = pl;
72 }
73 }
74 return found;
75}
76 36
77void 37void
78display_motd (const object *op) 38display_motd (const object *op)
79{ 39{
80 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
83 int comp; 43 int comp;
84 int size; 44 int size;
85 45
86 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
87 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
88 {
89 return; 48 return;
90 } 49
91 motd[0] = '\0'; 50 motd[0] = '\0';
92 size = 0; 51 size = 0;
52
93 while (fgets (buf, MAX_BUF, fp) != NULL) 53 while (fgets (buf, MAX_BUF, fp))
94 { 54 {
95 if (*buf == '#') 55 if (*buf == '#')
96 continue; 56 continue;
57
97 strncat (motd + size, buf, HUGE_BUF - size); 58 strncat (motd + size, buf, HUGE_BUF - size);
98 size += strlen (buf); 59 size += strlen (buf);
99 } 60 }
61
100 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
101 close_and_delete (fp, comp); 63 close_and_delete (fp, comp);
102} 64}
103 65
104void 66void
… …
110 int comp; 72 int comp;
111 int size; 73 int size;
112 74
113 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
115 {
116 return; 77 return;
117 } 78
118 rules[0] = '\0'; 79 rules[0] = '\0';
119 size = 0; 80 size = 0;
81
120 while (fgets (buf, MAX_BUF, fp) != NULL) 82 while (fgets (buf, MAX_BUF, fp))
121 { 83 {
122 if (*buf == '#') 84 if (*buf == '#')
123 continue; 85 continue;
86
124 if (size + strlen (buf) >= HUGE_BUF) 87 if (size + strlen (buf) >= HUGE_BUF)
125 { 88 {
126 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
127 break; 90 break;
128 } 91 }
92
129 strncat (rules + size, buf, HUGE_BUF - size); 93 strncat (rules + size, buf, HUGE_BUF - size);
130 size += strlen (buf); 94 size += strlen (buf);
131 } 95 }
96
132 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
133 close_and_delete (fp, comp); 98 close_and_delete (fp, comp);
134} 99}
135 100
136void 101void
… …
144 int size; 109 int size;
145 110
146 sprintf (buf, "%s/%s", settings.confdir, settings.news); 111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
147 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
148 return; 113 return;
114
149 news[0] = '\0'; 115 news[0] = '\0';
150 subject[0] = '\0'; 116 subject[0] = '\0';
151 size = 0; 117 size = 0;
118
152 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
153 { 120 {
154 if (*buf == '#') 121 if (*buf == '#')
155 continue; 122 continue;
123
156 if (*buf == '%') 124 if (*buf == '%')
157 { /* send one news */ 125 { /* send one news */
158 if (size > 0) 126 if (size > 0)
159 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 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 */
128
160 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
161 strip_endline (subject); 130 strip_endline (subject);
162 size = 0; 131 size = 0;
163 news[0] = '\0'; 132 news[0] = '\0';
164 } 133 }
… …
173 size += strlen (buf); 142 size += strlen (buf);
174 } 143 }
175 } 144 }
176 145
177 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
178 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
179 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
180}
181
182int
183playername_ok (const char *cp)
184{
185 /* Don't allow - or _ as first character in the name */
186 if (*cp == '-' || *cp == '_')
187 return 0;
188
189 for (; *cp != '\0'; cp++)
190 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
191 return 0;
192 return 1;
193}
194
195/* This no longer sets the player map. Also, it now updates
196 * all the pointers so the caller doesn't need to do that.
197 * Caller is responsible for setting the correct map.
198 */
199
200/* Redo this to do both get_player_ob and get_player.
201 * Hopefully this will be less bugfree and simpler.
202 * Returns the player structure. If 'p' is null,
203 * we create a new one. Otherwise, we recycle
204 * the one that is passed.
205 */
206static player *
207get_player (player *p)
208{
209 object *op = arch_to_object (get_player_archetype (0));
210 int i;
211
212 /* Clears basically the entire player structure except
213 * for next and socket.
214 */
215 p->clear ();
216
217 /* There are some elements we want initialized to non zero value -
218 * we deal with that below this point.
219 */
220 p->party = NULL;
221 p->outputs_sync = 16; /* Every 2 seconds */
222 p->outputs_count = 8; /* Keeps present behaviour */
223 p->unapply = unapply_nochoice;
224 p->Swap_First = -1;
225
226#ifdef AUTOSAVE
227 p->last_save_tick = 9999999;
228#endif
229
230 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
231
232 op->contr = p; /* this aren't yet in archetype */
233 p->ob = op;
234 op->speed_left = 0.5;
235 op->speed = 1.0;
236 op->direction = 5; /* So player faces south */
237 op->stats.wc = 2;
238 op->run_away = 25; /* Then we panick... */
239
240 {
241 int oldmon = p->socket->monitor_spells; // what a hack
242 p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
243 roll_stats (op);
244 p->socket->monitor_spells = oldmon;
245 }
246 p->state = ST_ROLL_STAT;
247 clear_los (op);
248
249 p->gen_sp_armour = 10;
250 p->last_speed = -1;
251 p->shoottype = range_none;
252 p->bowtype = bow_normal;
253 p->petmode = pet_normal;
254 p->listening = 10;
255 p->usekeys = containers;
256 p->last_weapon_sp = -1;
257 p->peaceful = 1; /* default peaceful */
258 p->do_los = 1;
259 p->explore = 0;
260 p->no_shout = 0; /* default can shout */
261
262 assign (p->title, op->arch->clone.name);
263 op->race = op->arch->clone.race;
264
265 CLEAR_FLAG (op, FLAG_READY_SKILL);
266
267 /* we need to clear these to -1 and not zero - otherwise,
268 * if a player quits and starts a new character, we wont
269 * send new values to the client, as things like exp start
270 * at zero.
271 */
272 for (i = 0; i < NUM_SKILLS; i++)
273 {
274 p->last_skill_exp[i] = -1;
275 p->last_skill_ob[i] = NULL;
276 }
277
278 for (i = 0; i < NROFATTACKS; i++)
279 p->last_resist[i] = -1;
280
281 p->last_stats.exp = -1;
282 p->last_weight = (uint32) - 1;
283
284 p->socket->update_look = 0;
285 p->socket->look_position = 0;
286
287 return p;
288} 149}
289 150
290/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
291static void 152static void
292set_first_map (object *op) 153set_first_map (object *op)
293{ 154{
294 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
295 op->x = -1; 156 op->x = -1;
296 op->y = -1; 157 op->y = -1;
297 enter_exit (op, NULL);
298} 158}
299 159
160void
161player::activate ()
162{
163 if (active)
164 return;
165
166 players.insert (this);
167 ob->remove ();
168 ob->map = 0;
169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
173
174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
195}
196
197// connect the player with a specific client
198// also changes, rationalises, and fixes some incorrect settings
199void
200player::connect (client *ns)
201{
202 this->ns = ns;
203 ns->pl = this;
204
205 run_on = 0;
206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
208
209 ns->update_look = 0;
210 ns->look_position = 0;
211
212 clear_los (this);
213
214 ns->reset_stats ();
215
216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race;
219
220 ob->carrying = sum_weight (ob);
221 link_player_skills (ob);
222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224
225 assign (title, ob->arch->object::name);
226
227 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob))
229 {
230 object *tmp, *abil = 0, *skin = 0;
231
232 for (tmp = ob->inv; tmp; tmp = tmp->below)
233 if (tmp->type == FORCE)
234 if (tmp->arch->archname == shstr_dragon_ability_force)
235 abil = tmp;
236 else if (tmp->arch->archname == shstr_dragon_skin_force)
237 skin = tmp;
238
239 set_dragon_name (ob, abil, skin);
240 }
241
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243
244 esrv_new_player (this, ob->weight + ob->carrying);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
304
305 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED])
307 switch (op->type)
308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
313 case WAND:
314 case ROD:
315 case HORN:
316 case BOW:
317 ranged_ob = op;
318 break;
319
320 case WEAPON:
321 combat_ob = op;
322 break;
323 }
324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326}
327
328void
329player::set_observe (object *op)
330{
331 observe = op ? op : ob;
332 do_los = 1;
333}
334
335player::player ()
336{
337 /* There are some elements we want initialised to non zero value -
338 * we deal with that below this point.
339 */
340 outputs_sync = 4;
341 outputs_count = 4;
342 unapply = unapply_nochoice;
343
344 savebed_map = first_map_path; /* Init. respawn position */
345
346 gen_sp_armour = 10;
347 bowtype = bow_normal;
348 petmode = pet_normal;
349 listening = 10;
350 usekeys = containers;
351 peaceful = 1; /* default peaceful */
352 do_los = 1;
353
354 weapon_sp = 1.0f;
355 weapon_sp_left = 0.5f;
356}
357
358void
359player::do_destroy ()
360{
361 disconnect ();
362
363 attachable::do_destroy ();
364
365 if (ob)
366 {
367 ob->destroy_inv (false);
368 ob->destroy ();
369 }
370
371 ob = observe = 0;
372}
373
374player::~player ()
375{
376 /* Clear item stack */
377 free (stack_items);
378}
379
300/* Tries to add player on the connection passwd in ns. 380/* Tries to add player on the connection passed in ns.
301 * All we can really get in this is some settings like host and display 381 * All we can really get in this is some settings like host and display
302 * mode. 382 * mode.
303 */ 383 */
304 384player *
305int 385player::create ()
306add_player (client_socket *ns)
307{ 386{
308 player *p = new player; 387 player *pl = new player;
309 388
310 p->socket = ns; 389 pl->set_object (arch_to_object (get_player_archetype (0)));
311 ns->pl = p;
312 390
313 p->next = first_player; 391 pl->ob->roll_stats ();
314 first_player = p; 392 pl->ob->stats.wc = 2;
393 pl->ob->run_away = 25; /* Then we panick... */
315 394
316 p = get_player (p);
317
318 set_first_map (p->ob); 395 set_first_map (pl->ob);
319 396
320 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
321 add_friendly_object (p->ob);
322 send_rules (p->ob);
323 send_news (p->ob);
324 display_motd (p->ob);
325 get_name (p->ob);
326
327 return 0; 397 return pl;
328} 398}
329 399
330/* 400/*
331 * get_player_archetype() return next player archetype from archetype 401 * get_player_archetype() return next player archetype from archetype
332 * list. Not very efficient routine, but used only creating new players. 402 * list. Not very efficient routine, but used only creating new players.
333 * Note: there MUST be at least one player archetype! 403 * Note: there MUST be at least one player archetype!
334 */ 404 */
335archetype * 405archetype *
336get_player_archetype (archetype *at) 406get_player_archetype (archetype *at)
337{ 407{
338 archetype *start = at; 408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
339 409
340 for (;;) 410 for (;;)
341 { 411 {
342 if (at == NULL || at->next == NULL) 412 if (++i == archetypes.end ())
343 at = first_archetype; 413 i = archetypes.begin ();
344 else 414 else if (*i == at)
345 at = at->next; 415 cleanup ("not a single player archetype found");
416
346 if (at->clone.type == PLAYER) 417 if ((*i)->type == PLAYER)
347 return at; 418 return *i;
348 if (at == start)
349 {
350 LOG (llevError, "No Player archetypes\n");
351 exit (-1);
352 }
353 } 419 }
354} 420}
355
356 421
357object * 422object *
358get_nearest_player (object *mon) 423get_nearest_player (object *mon)
359{ 424{
360 object *op = NULL; 425 object *op = NULL;
361 player *pl = NULL;
362 objectlink *ol; 426 objectlink *ol;
363 unsigned lastdist; 427 unsigned lastdist;
364 rv_vector rv; 428 rv_vector rv;
365 429
366 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
367 { 431 {
368 /* We should not find free objects on this friendly list, but it
369 * does periodically happen. Given that, lets deal with it.
370 * While unlikely, it is possible the next object on the friendly
371 * list is also free, so encapsulate this in a while loop.
372 */
373 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
374 {
375 object *tmp = ol->ob;
376
377 /* Can't do much more other than log the fact, because the object
378 * itself will have been cleared.
379 */
380 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
381 ol = ol->next;
382 remove_friendly_object (tmp);
383 if (!ol)
384 return op;
385 }
386
387 /* Remove special check for player from this. First, it looks to cause
388 * some crashes (ol->ob->contr not set properly?), but secondly, a more
389 * complicated method of state checking would be needed in any case -
390 * as it was, a clever player could type quit, and the function would
391 * skip them over while waiting for confirmation. Remove
392 * on_same_map check, as can_detect_enemy also does this
393 */
394 if (!can_detect_enemy (mon, ol->ob, &rv)) 432 if (!can_detect_enemy (mon, ol->ob, &rv))
395 continue; 433 continue;
396 434
397 if (lastdist > rv.distance) 435 if (lastdist > rv.distance)
398 { 436 {
399 op = ol->ob; 437 op = ol->ob;
400 lastdist = rv.distance; 438 lastdist = rv.distance;
401 } 439 }
402 } 440 }
403 for (pl = first_player; pl != NULL; pl = pl->next) 441
404 { 442 for_all_players (pl)
405 if (can_detect_enemy (mon, pl->ob, &rv)) 443 if (can_detect_enemy (mon, pl->ob, &rv))
406 {
407
408 if (lastdist > rv.distance) 444 if (lastdist > rv.distance)
409 { 445 {
410 op = pl->ob; 446 op = pl->ob;
411 lastdist = rv.distance; 447 lastdist = rv.distance;
412 } 448 }
413 } 449
414 }
415#if 0 450#if 0
416 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 451 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
417#endif 452#endif
418 return op; 453 return op;
419} 454}
… …
437 * circling behaviour. Unfortunately, this function is also used to determined 472 * circling behaviour. Unfortunately, this function is also used to determined
438 * if the creature should cast a spell, so returning a direction in that case 473 * if the creature should cast a spell, so returning a direction in that case
439 * is probably not a good thing. 474 * is probably not a good thing.
440 */ 475 */
441#define MAX_SPACES 50 476#define MAX_SPACES 50
442
443 477
444/* 478/*
445 * Returns the direction to the player, if valid. Returns 0 otherwise. 479 * Returns the direction to the player, if valid. Returns 0 otherwise.
446 * modified to verify there is a path to the player. Does this by stepping towards 480 * modified to verify there is a path to the player. Does this by stepping towards
447 * player and if path is blocked then see if blockage is close enough to player that 481 * player and if path is blocked then see if blockage is close enough to player that
… …
478 x = mon->x; 512 x = mon->x;
479 y = mon->y; 513 y = mon->y;
480 m = mon->map; 514 m = mon->map;
481 dir = rv.direction; 515 dir = rv.direction;
482 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 516 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
483 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 517 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
518
484 /* If we can't solve it within the search distance, return now. */ 519 /* If we can't solve it within the search distance, return now. */
485 if (diff > max) 520 if (diff > max)
486 return 0; 521 return 0;
522
487 while (diff > 1 && max > 0) 523 while (diff > 1 && max > 0)
488 { 524 {
489 lastx = x; 525 lastx = x;
490 lasty = y; 526 lasty = y;
491 lastmap = m; 527 lastmap = m;
… …
573 max--; 609 max--;
574 lastdir = dir; 610 lastdir = dir;
575 if (!firstdir) 611 if (!firstdir)
576 firstdir = dir; 612 firstdir = dir;
577 } 613 }
614
578 if (diff <= 1) 615 if (diff <= 1)
579 { 616 {
580 /* Recalculate diff (distance) because we may not have actually 617 /* Recalculate diff (distance) because we may not have actually
581 * headed toward player for entire distance. 618 * headed toward player for entire distance.
582 */ 619 */
583 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 620 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
584 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 621 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
585 } 622 }
623
586 if (diff > max) 624 if (diff > max)
587 return 0; 625 return 0;
588 } 626 }
627
589 /* If we reached the max, didn't find a direction in time */ 628 /* If we reached the max, didn't find a direction in time */
590 if (!max) 629 if (!max)
591 return 0; 630 return 0;
592 631
593 return firstdir; 632 return firstdir;
594} 633}
595 634
596void 635void
597give_initial_items (object *pl, treasurelist * items) 636give_initial_items (object *pl, treasurelist * items)
598{ 637{
599 object *op, *next = NULL;
600
601 if (pl->randomitems != NULL) 638 if (pl->randomitems)
602 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 639 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
603 640
604 for (op = pl->inv; op; op = next) 641 for (object *next, *op = pl->inv; op; op = next)
605 { 642 {
606 next = op->below; 643 next = op->below;
607 644
608 /* Forces get applied per default, unless they have the 645 /* Forces get applied per default, unless they have the
609 * flag "neutral" set. Sorry but I can't think of a better way 646 * flag "neutral" set. Sorry but I can't think of a better way
… …
651 if (op->nrof > 1) 688 if (op->nrof > 1)
652 op->nrof = 1; 689 op->nrof = 1;
653 } 690 }
654 691
655 if (op->type == SPELLBOOK && op->inv) 692 if (op->type == SPELLBOOK && op->inv)
656 {
657 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 693 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
658 }
659 694
660 /* Give starting characters identified, uncursed, and undamned 695 /* Give starting characters identified, uncursed, and undamned
661 * items. Just don't identify gold or silver, or it won't be 696 * items. Just don't identify gold or silver, or it won't be
662 * merged properly. 697 * merged properly.
663 */ 698 */
… …
686 /* Need to set up the skill pointers */ 721 /* Need to set up the skill pointers */
687 link_player_skills (pl); 722 link_player_skills (pl);
688} 723}
689 724
690void 725void
691get_name (object *op)
692{
693 op->contr->write_buf[0] = '\0';
694 op->contr->state = ST_GET_NAME;
695 send_query (op->contr->socket, 0, "What is your name?\n:");
696}
697
698void
699get_password (object *op)
700{
701 op->contr->write_buf[0] = '\0';
702 op->contr->state = ST_GET_PASSWORD;
703 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
704}
705
706void
707play_again (object *op)
708{
709 op->contr->state = ST_PLAY_AGAIN;
710 op->chosen_skill = NULL;
711 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
712 /* a bit of a hack, but there are various places early in th
713 * player creation process that a user can quit (eg, roll
714 * stats) that isn't removing the player. Taking a quick
715 * look, there are many places that call play_again without
716 * removing the player - it probably makes more sense
717 * to leave it to play_again to remove the object in all
718 * cases.
719 */
720 if (!QUERY_FLAG (op, FLAG_REMOVED))
721 op->remove ();
722 /* Need to set this to null - otherwise, it could point to garbage,
723 * and draw() doesn't check to see if the player is removed, only if
724 * the map is null or not swapped out.
725 */
726 op->map = NULL;
727}
728
729int
730receive_play_again (object *op, char key)
731{
732 if (key == 'q' || key == 'Q')
733 {
734 remove_friendly_object (op);
735 leave (op->contr, 0); /* ericserver will draw the message */
736 return 2;
737 }
738 else if (key == 'a' || key == 'A')
739 {
740 player *pl = op->contr;
741 shstr name = op->name;
742
743 op->contr = 0;
744 op->type = 0;
745 op->destroy (1);
746 pl = get_player (pl);
747 op = pl->ob;
748 add_friendly_object (op);
749 op->contr->password[0] = '~';
750 op->name = op->name_pl = 0;
751 /* Lets put a space in here */
752 new_draw_info (NDI_UNIQUE, 0, op, "\n");
753 get_name (op);
754 op->name = op->name_pl = name;
755 set_first_map (op);
756 }
757 else
758 /* user pressed something else so just ask again... */
759 play_again (op);
760
761 return 0;
762}
763
764void
765confirm_password (object *op)
766{
767
768 op->contr->write_buf[0] = '\0';
769 op->contr->state = ST_CONFIRM_PASSWORD;
770 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
771}
772
773void
774get_party_password (object *op, partylist *party) 726get_party_password (object *op, partylist *party)
775{ 727{
776 if (party == NULL) 728 if (party == NULL)
777 { 729 {
778 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 730 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
779 return; 731 return;
780 } 732 }
733
781 op->contr->write_buf[0] = '\0'; 734 op->contr->write_buf[0] = '\0';
782 op->contr->state = ST_GET_PARTY_PASSWORD; 735 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
783 op->contr->party_to_join = party; 736 op->contr->party_to_join = party;
784 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 737 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
785} 738}
786
787 739
788/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 740/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
789int 741static int
790roll_stat (void) 742roll_stat (void)
791{ 743{
792 int a[4], i, j, k; 744 int a[4], i, j, k;
793 745
794 for (i = 0; i < 4; i++) 746 for (i = 0; i < 4; i++)
795 a[i] = (int) RANDOM () % 6 + 1; 747 a[i] = (int) rndm (6) + 1;
796 748
797 for (i = 0, j = 0, k = 7; i < 4; i++) 749 for (i = 0, j = 0, k = 7; i < 4; i++)
798 if (a[i] < k) 750 if (a[i] < k)
799 k = a[i], j = i; 751 k = a[i], j = i;
800 752
801 for (i = 0, k = 0; i < 4; i++) 753 for (i = 0, k = 0; i < 4; i++)
802 {
803 if (i != j) 754 if (i != j)
804 k += a[i]; 755 k += a[i];
805 } 756
806 return k; 757 return k;
807} 758}
808 759
809void 760void
810roll_stats (object *op) 761object::roll_stats ()
811{ 762{
763 int statsort [NUM_STATS];
764
765 for (;;)
766 {
812 int sum = 0; 767 int sum = 0;
813 int i = 0, j = 0; 768 for (int i = NUM_STATS; i--; )
814 int statsort[7]; 769 sum += statsort [i] = roll_stat ();
815 770
816 do 771 if (sum >= 82 && sum <= 116)
772 break;
817 { 773 }
818 op->stats.Str = roll_stat ();
819 op->stats.Dex = roll_stat ();
820 op->stats.Int = roll_stat ();
821 op->stats.Con = roll_stat ();
822 op->stats.Wis = roll_stat ();
823 op->stats.Pow = roll_stat ();
824 op->stats.Cha = roll_stat ();
825 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
826 }
827 while (sum < 82 || sum > 116);
828 774
829 /* Sort the stats so that rerolling is easier... */ 775 // Sort the stats so that rerolling is easier...
830 statsort[0] = op->stats.Str; 776 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
831 statsort[1] = op->stats.Dex;
832 statsort[2] = op->stats.Int;
833 statsort[3] = op->stats.Con;
834 statsort[4] = op->stats.Wis;
835 statsort[5] = op->stats.Pow;
836 statsort[6] = op->stats.Cha;
837 777
838 /* a quick and dirty bubblesort? */ 778 for (int i = 0; i < NUM_STATS; ++i)
839 do 779 stats.stat (i) = statsort [i];
840 {
841 if (statsort[i] < statsort[i + 1])
842 {
843 j = statsort[i];
844 statsort[i] = statsort[i + 1];
845 statsort[i + 1] = j;
846 i = 0;
847 }
848 else
849 {
850 i++;
851 }
852 }
853 while (i < 6);
854 780
855 op->stats.Str = statsort[0];
856 op->stats.Dex = statsort[1];
857 op->stats.Con = statsort[2];
858 op->stats.Int = statsort[3];
859 op->stats.Wis = statsort[4];
860 op->stats.Pow = statsort[5];
861 op->stats.Cha = statsort[6];
862
863
864 op->contr->orig_stats.Str = op->stats.Str;
865 op->contr->orig_stats.Dex = op->stats.Dex;
866 op->contr->orig_stats.Int = op->stats.Int;
867 op->contr->orig_stats.Con = op->stats.Con;
868 op->contr->orig_stats.Wis = op->stats.Wis;
869 op->contr->orig_stats.Pow = op->stats.Pow;
870 op->contr->orig_stats.Cha = op->stats.Cha;
871
872 op->level = 1;
873 op->stats.exp = 0; 781 stats.exp = 0;
874 op->stats.ac = 0; 782 stats.ac = 0;
875 783
876 op->contr->levhp[1] = 9;
877 op->contr->levsp[1] = 6;
878 op->contr->levgrace[1] = 3;
879
880 fix_player (op);
881 op->stats.hp = op->stats.maxhp; 784 stats.hp = stats.maxhp;
882 op->stats.sp = op->stats.maxsp; 785 stats.sp = stats.maxsp;
883 op->stats.grace = op->stats.maxgrace; 786 stats.grace = stats.maxgrace;
787
788 if (contr)
789 {
790 contr->levhp[1] = 9;
791 contr->levsp[1] = 6;
792 contr->levgrace[1] = 3;
793
884 op->contr->orig_stats = op->stats; 794 contr->orig_stats = stats;
795 }
885} 796}
886 797
887void 798void
888Roll_Again (object *op) 799object::swap_stats (int a, int b)
889{ 800{
890 esrv_new_player (op->contr, 0); 801 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
891 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
892 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
893}
894 802
895void 803 for (int i = 0; i < NUM_STATS; ++i)
896Swap_Stat (object *op, int Swap_Second) 804 stats.stat (i) = contr->orig_stats.stat (i);
805
806 //TODO: the following code looks so borked and should, at the very least,
807 // be merged with the similar code in roll_stats
808 stats.ac = 0;
809
810 level = 1;
811 stats.exp = 0;
812 stats.ac = 0;
813
814 stats.hp = stats.maxhp;
815 stats.sp = stats.maxsp;
816 stats.grace = stats.maxgrace;
817
818 if (contr)
819 {
820 contr->levhp[1] = 9;
821 contr->levsp[1] = 6;
822 contr->levgrace[1] = 3;
823
824 contr->orig_stats = stats;
825 }
826}
827
828static void
829start_info (object *op)
897{ 830{
898 signed char tmp;
899 char buf[MAX_BUF]; 831 char buf[MAX_BUF];
900 832
901 if (op->contr->Swap_First == -1) 833 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
902 {
903 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
904 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
905 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
906 return;
907 }
908
909 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
910
911 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
912
913 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
914
915 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
916 new_draw_info (NDI_UNIQUE, 0, op, buf); 834 new_draw_info (NDI_UNIQUE, 0, op, buf);
917 op->stats.Str = op->contr->orig_stats.Str;
918 op->stats.Dex = op->contr->orig_stats.Dex;
919 op->stats.Con = op->contr->orig_stats.Con;
920 op->stats.Int = op->contr->orig_stats.Int;
921 op->stats.Wis = op->contr->orig_stats.Wis;
922 op->stats.Pow = op->contr->orig_stats.Pow;
923 op->stats.Cha = op->contr->orig_stats.Cha;
924 op->stats.ac = 0;
925
926 op->level = 1;
927 op->stats.exp = 0;
928 op->stats.ac = 0;
929
930 op->contr->levhp[1] = 9;
931 op->contr->levsp[1] = 6;
932 op->contr->levgrace[1] = 3;
933
934 fix_player (op);
935 op->stats.hp = op->stats.maxhp;
936 op->stats.sp = op->stats.maxsp;
937 op->stats.grace = op->stats.maxgrace;
938 op->contr->orig_stats = op->stats;
939 op->contr->Swap_First = -1;
940}
941
942
943/* This code has been greatly reduced, because with set_attr_value
944 * and get_attr_value, the stats can be accessed just numeric
945 * ids. stat_trans is a table that translate the number entered
946 * into the actual stat. It is needed because the order the stats
947 * are displayed in the stat window is not the same as how
948 * the number's access that stat. The table does that translation.
949 */
950int
951key_roll_stat (object *op, char key)
952{
953 int keynum = key - '0';
954 char buf[MAX_BUF];
955 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
956
957 if (keynum > 0 && keynum <= 7)
958 {
959 if (op->contr->Swap_First == -1)
960 {
961 op->contr->Swap_First = stat_trans[keynum];
962 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
963 new_draw_info (NDI_UNIQUE, 0, op, buf);
964 }
965 else
966 Swap_Stat (op, stat_trans[keynum]);
967
968 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
969 return 1;
970 }
971 switch (key)
972 {
973 case 'n':
974 case 'N':
975 {
976 SET_FLAG (op, FLAG_WIZ);
977 if (op->map == NULL)
978 {
979 LOG (llevError, "Map == NULL in state 2\n");
980 break;
981 }
982
983#if 0
984 /* So that enter_exit will put us at startx/starty */
985 op->x = -1;
986
987 enter_exit (op, NULL);
988#endif
989 SET_ANIMATION (op, 2); /* So player faces south */
990 /* Enter exit adds a player otherwise */
991 add_statbonus (op);
992 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
993 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
994 op->contr->state = ST_CHANGE_CLASS;
995 if (op->msg)
996 new_draw_info (NDI_BLUE, 0, op, op->msg);
997 return 0;
998 }
999 case 'y':
1000 case 'Y':
1001 roll_stats (op);
1002 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1003 return 1;
1004
1005 case 'q':
1006 case 'Q':
1007 play_again (op);
1008 return 1;
1009
1010 default:
1011 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1012 return 0;
1013 }
1014 return 0;
1015} 835}
1016 836
1017/* This function takes the key that is passed, and does the 837/* This function takes the key that is passed, and does the
1018 * appropriate action with it (change race, or other things). 838 * appropriate action with it (change race, or other things).
1019 * The function name is for historical reasons - now we have 839 * The function name is for historical reasons - now we have
1020 * separate race and class; this actually changes the RACE, 840 * separate race and class; this actually changes the RACE,
1021 * not the class. 841 * not the class.
1022 */ 842 */
1023 843void
1024int 844player::chargen_race_done ()
1025key_change_class (object *op, char key)
1026{ 845{
1027 int tmp_loop;
1028
1029 if (key == 'q' || key == 'Q')
1030 {
1031 op->remove ();
1032 play_again (op);
1033 return 0;
1034 }
1035 if (key == 'd' || key == 'D')
1036 {
1037 char buf[MAX_BUF];
1038
1039 /* this must before then initial items are given */ 846 /* this must before then initial items are given */
1040 esrv_new_player (op->contr, op->weight + op->carrying); 847 esrv_new_player (ob->contr, ob->weight + ob->carrying);
1041 848
1042 treasurelist *tl = find_treasurelist ("starting_wealth"); 849 treasurelist *tl = treasurelist::find ("starting_wealth");
1043 if (tl) 850 if (tl)
1044 create_treasure (tl, op, 0, 0, 0); 851 create_treasure (tl, ob, 0, 0, 0);
1045 852
1046 INVOKE_PLAYER (BIRTH, op->contr); 853 INVOKE_PLAYER (BIRTH, ob->contr);
1047 INVOKE_PLAYER (LOGIN, op->contr); 854 INVOKE_PLAYER (LOGIN, ob->contr);
1048 855
1049 op->contr->state = ST_PLAYING; 856 ob->contr->ns->state = ST_PLAYING;
1050 857
1051 if (op->msg) 858 if (ob->msg)
1052 op->msg = NULL; 859 ob->msg = 0;
1053 860
1054 /* We create this now because some of the unique maps will need it 861 /* We create this now because some of the unique maps will need it
1055 * to save here. 862 * to save here.
1056 */ 863 */
864 {
865 char buf[MAX_BUF];
1057 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 866 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
1058 make_path_to_file (buf); 867 make_path_to_file (buf);
868 }
1059 869
1060#ifdef AUTOSAVE
1061 op->contr->last_save_tick = pticks;
1062#endif
1063 start_info (op); 870 start_info (ob);
1064 CLEAR_FLAG (op, FLAG_WIZ); 871 CLEAR_FLAG (ob, FLAG_WIZ);
1065 give_initial_items (op, op->randomitems); 872 give_initial_items (ob, ob->randomitems);
1066 link_player_skills (op); 873 link_player_skills (ob);
1067 esrv_send_inventory (op, op); 874 esrv_send_inventory (ob, ob);
1068 fix_player (op); 875 ob->update_stats ();
1069 876
1070 /* This moves the player to a different start map, if there 877 /* This moves the player to a different start map, if there
1071 * is one for this race 878 * is one for this race
1072 */ 879 */
1073 if (*first_map_ext_path) 880 if (*first_map_ext_path)
1074 { 881 {
1075 object *tmp; 882 object *tmp;
1076 char mapname[MAX_BUF]; 883 char mapname[MAX_BUF];
1077 884
1078 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 885 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
1079 tmp = object::create (); 886 tmp = object::create ();
1080 EXIT_PATH (tmp) = mapname; 887 EXIT_PATH (tmp) = mapname;
1081 EXIT_X (tmp) = op->x; 888 EXIT_X (tmp) = ob->x;
1082 EXIT_Y (tmp) = op->y; 889 EXIT_Y (tmp) = ob->y;
1083 enter_exit (op, tmp); /* we don't really care if it succeeded; 890 ob->enter_exit (tmp); /* we don't really care if it succeeded;
1084 * if the map isn't there, then stay on the 891 * if the map isn't there, then stay on the
1085 * default initial map */ 892 * default initial map */
1086 tmp->destroy (); 893 tmp->destroy ();
1087 } 894 }
1088 else 895 else
1089 {
1090 LOG (llevDebug, "first_map_ext_path not set\n"); 896 LOG (llevDebug, "first_map_ext_path not set\n");
1091 } 897}
1092 return 0;
1093 }
1094 898
899void
900player::chargen_race_next ()
901{
1095 /* Following actually changes the race - this is the default command 902 /* Following actually changes the race - this is the default command
1096 * if we don't match with one of the options above. 903 * if we don't match with one of the options above.
1097 */ 904 */
1098 905
1099 tmp_loop = 0; 906 do
1100 while (!tmp_loop)
1101 { 907 {
1102 shstr name = op->name; 908 shstr name = ob->name;
1103 int x = op->x, y = op->y; 909 int x = ob->x, y = ob->y;
1104 910
1105 remove_statbonus (op); 911 ob->remove_statbonus ();
1106 op->remove (); 912 ob->remove ();
1107 op->arch = get_player_archetype (op->arch); 913 ob->arch = get_player_archetype (ob->arch);
1108 op->arch->clone.copy_to (op); 914 ob->arch->copy_to (ob);
1109 op->instantiate (); 915 ob->instantiate ();
1110 op->stats = op->contr->orig_stats; 916 ob->stats = ob->contr->orig_stats;
1111 op->name = op->name_pl = name; 917 ob->name = ob->name_pl = name;
1112 op->x = x; 918 ob->x = x;
1113 op->y = y; 919 ob->y = y;
1114 SET_ANIMATION (op, 2); /* So player faces south */ 920 SET_ANIMATION (ob, 2); /* So player faces south */
1115 insert_ob_in_map (op, op->map, op, 0); 921 insert_ob_in_map (ob, ob->map, ob, 0);
1116 assign (op->contr->title, op->arch->clone.name); 922 assign (ob->contr->title, ob->arch->object::name);
1117 add_statbonus (op); 923 ob->add_statbonus ();
1118 tmp_loop = allowed_class (op);
1119 } 924 }
925 while (!allowed_class (ob));
1120 926
1121 update_object (op, UP_OBJ_FACE); 927 update_object (ob, UP_OBJ_FACE);
1122 esrv_update_item (UPD_FACE, op, op); 928 esrv_update_item (UPD_FACE, ob, ob);
1123 fix_player (op); 929 ob->update_stats ();
1124 op->stats.hp = op->stats.maxhp; 930 ob->stats.hp = ob->stats.maxhp;
1125 op->stats.sp = op->stats.maxsp; 931 ob->stats.sp = ob->stats.maxsp;
1126 op->stats.grace = 0; 932 ob->stats.grace = 0;
1127
1128 if (op->msg)
1129 new_draw_info (NDI_BLUE, 0, op, op->msg);
1130
1131 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1132 return 0;
1133}
1134
1135int
1136key_confirm_quit (object *op, char key)
1137{
1138 char buf[MAX_BUF];
1139
1140 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1141 {
1142 op->contr->state = ST_PLAYING;
1143 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1144 return 1;
1145 }
1146
1147 INVOKE_PLAYER (LOGOUT, op->contr);
1148 INVOKE_PLAYER (QUIT, op->contr);
1149
1150 terminate_all_pets (op);
1151 leave_map (op);
1152 op->direction = 0;
1153 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1154
1155 strcpy (op->contr->killer, "quit");
1156 check_score (op);
1157 op->contr->party = NULL;
1158 if (settings.set_title == TRUE)
1159 op->contr->own_title[0] = '\0';
1160
1161 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1162 {
1163 maptile *mp, *next;
1164
1165 /* We need to hunt for any per player unique maps in memory and
1166 * get rid of them. The trailing slash in the path is intentional,
1167 * so that players named 'Ab' won't match against players 'Abe' pathname
1168 */
1169 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1170 for (mp = first_map; mp != NULL; mp = next)
1171 {
1172 next = mp->next;
1173 if (!strncmp (mp->path, buf, strlen (buf)))
1174 delete_map (mp);
1175 }
1176
1177 delete_character (op->name, 1);
1178 }
1179
1180 play_again (op);
1181 return 1;
1182} 933}
1183 934
1184void 935void
1185flee_player (object *op) 936flee_player (object *op)
1186{ 937{
… …
1216 { 967 {
1217 op->enemy = NULL; 968 op->enemy = NULL;
1218 CLEAR_FLAG (op, FLAG_SCARED); 969 CLEAR_FLAG (op, FLAG_SCARED);
1219 return; 970 return;
1220 } 971 }
972
1221 get_rangevector (op, op->enemy, &rv, 0); 973 get_rangevector (op, op->enemy, &rv, 0);
1222 974
1223 dir = absdir (4 + rv.direction); 975 dir = absdir (4 + rv.direction);
1224 for (diff = 0; diff < 3; diff++) 976 for (diff = 0; diff < 3; diff++)
1225 { 977 {
1226 int m = 1 - (RANDOM () & 2); 978 int m = 1 - (RANDOM () & 2);
1227 979
1228 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 980 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1229 {
1230 return; 981 return;
1231 }
1232 } 982 }
983
1233 /* Cornered, get rid of scared */ 984 /* Cornered, get rid of scared */
1234 CLEAR_FLAG (op, FLAG_SCARED); 985 CLEAR_FLAG (op, FLAG_SCARED);
1235 op->enemy = NULL; 986 op->enemy = NULL;
1236} 987}
1237 988
1238
1239/* check_pick sees if there is stuff to be picked up/picks up stuff. 989/* check_pick sees if there is stuff to be picked up/picks up stuff.
1240 * IT returns 1 if the player should keep on moving, 0 if he should 990 * It returns 1 if the player should keep on moving, 0 if he should
1241 * stop. 991 * stop.
1242 */ 992 */
1243int 993int
1244check_pick (object *op) 994check_pick (object *op)
1245{ 995{
1246 object *tmp, *next; 996 object *tmp, *next;
1247 int stop = 0; 997 int stop = 0;
1248 int j, k, wvratio; 998 int wvratio;
1249 char putstring[128], tmpstr[16]; 999 char putstring[128];
1250 1000
1251 /* if you're flying, you cna't pick up anything */ 1001 /* if you're flying, you cna't pick up anything */
1252 if (op->move_type & MOVE_FLYING) 1002 if (op->move_type & MOVE_FLYING)
1253 return 1; 1003 return 1;
1254 1004
1255 next = op->below; 1005 next = op->below;
1256 1006
1007 int cnt = MAX_ITEM_PER_DROP;
1008#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1009
1257 /* loop while there are items on the floor that are not marked as 1010 /* loop while there are items on the floor that are not marked as
1258 * destroyed */ 1011 * destroyed */
1259 while (next && !next->destroyed ()) 1012 while (next && !next->destroyed ())
1260 { 1013 {
1261 tmp = next; 1014 tmp = next;
1262 next = tmp->below; 1015 next = tmp->below;
1263 1016
1017 if (cnt <= 0)
1018 {
1019 op->failmsg ("Couldn't pickup all items at once.");
1020 return 0;
1021 }
1022
1264 if (op->destroyed ()) 1023 if (op->destroyed ())
1265 return 0; 1024 return 0;
1266 1025
1267 if (!can_pick (op, tmp)) 1026 if (!can_pick (op, tmp))
1268 continue; 1027 continue;
1269 1028
1270 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1029 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1271 { 1030 {
1272 if (item_matched_string (op, tmp, op->contr->search_str)) 1031 if (item_matched_string (op, tmp, op->contr->search_str))
1273 pick_up (op, tmp); 1032 CHK_PICK_PICKUP;
1274 continue; 1033 continue;
1275 } 1034 }
1276 1035
1277 /* high not bit set? We're using the old autopickup model */ 1036 /* high not bit set? We're using the old autopickup model */
1278 if (!(op->contr->mode & PU_NEWMODE)) 1037 if (!(op->contr->mode & PU_NEWMODE))
… …
1280 switch (op->contr->mode) 1039 switch (op->contr->mode)
1281 { 1040 {
1282 case 0: 1041 case 0:
1283 return 1; /* don't pick up */ 1042 return 1; /* don't pick up */
1284 case 1: 1043 case 1:
1285 pick_up (op, tmp); 1044 CHK_PICK_PICKUP;
1286 return 1; 1045 return 1;
1287 case 2: 1046 case 2:
1288 pick_up (op, tmp); 1047 CHK_PICK_PICKUP;
1289 return 0; 1048 return 0;
1290 case 3: 1049 case 3:
1291 return 0; /* stop before pickup */ 1050 return 0; /* stop before pickup */
1292 case 4: 1051 case 4:
1293 pick_up (op, tmp); 1052 CHK_PICK_PICKUP;
1294 break; 1053 break;
1295 case 5: 1054 case 5:
1296 pick_up (op, tmp); 1055 CHK_PICK_PICKUP;
1297 stop = 1; 1056 stop = 1;
1298 break; 1057 break;
1299 case 6: 1058 case 6:
1300 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1059 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1301 pick_up (op, tmp); 1060 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1061 CHK_PICK_PICKUP;
1302 break; 1062 break;
1303 1063
1304 case 7: 1064 case 7:
1305 if (tmp->type == MONEY || tmp->type == GEM) 1065 if (tmp->type == MONEY || tmp->type == GEM)
1306 pick_up (op, tmp); 1066 CHK_PICK_PICKUP;
1307 break; 1067 break;
1308 1068
1309 default: 1069 default:
1310 /* use value density */ 1070 /* use value density */
1311 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1071 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1312 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1072 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1313 pick_up (op, tmp); 1073 CHK_PICK_PICKUP;
1314 } 1074 }
1315 } 1075 }
1316 else 1076 else
1317 { /* old model */ 1077 { /* old model */
1318 /* NEW pickup handling */ 1078 /* NEW pickup handling */
… …
1322 if (tmp->name != NULL) 1082 if (tmp->name != NULL)
1323 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1083 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1324 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1084 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1325 else 1085 else
1326 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1086 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1327 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1087 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1088
1328 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1089 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1329
1330 sprintf (putstring, "...flags: ");
1331 for (k = 0; k < 4; k++)
1332 {
1333 for (j = 0; j < 32; j++)
1334 {
1335 if ((tmp->flags[k] >> j) & 0x01)
1336 {
1337 sprintf (tmpstr, "%d ", k * 32 + j);
1338 strcat (putstring, tmpstr);
1339 }
1340 }
1341 }
1342 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1343
1344#if 0
1345 /* print the flags too */
1346 for (k = 0; k < 4; k++)
1347 {
1348 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1349 for (j = 0; j < 32; j++)
1350 {
1351 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1352 if (!((j + 1) % 4))
1353 fprintf (stderr, " ");
1354 }
1355 fprintf (stderr, " [%d]\n", k * 32);
1356 }
1357#endif
1358 } 1090 }
1091
1359 /* philosophy: 1092 /* philosophy:
1360 * It's easy to grab an item type from a pile, as long as it's 1093 * It's easy to grab an item type from a pile, as long as it's
1361 * generic. This takes no game-time. For more detailed pickups 1094 * generic. This takes no game-time. For more detailed pickups
1362 * and selections, select-items shoul dbe used. This is a 1095 * and selections, select-items should be used. This is a
1363 * grab-as-you-run type mode that's really useful for arrows for 1096 * grab-as-you-run type mode that's really useful for arrows for
1364 * example. 1097 * example.
1365 * The drawback: right now it has no frontend, so you need to 1098 * The drawback: right now it has no frontend, so you need to
1366 * stick the bits you want into a calculator in hex mode and then 1099 * stick the bits you want into a calculator in hex mode and then
1367 * convert to decimal and then 'pickup <#> 1100 * convert to decimal and then 'pickup <#>
… …
1400 /* all food and drink if desired */ 1133 /* all food and drink if desired */
1401 /* question: don't pick up known-poisonous stuff? */ 1134 /* question: don't pick up known-poisonous stuff? */
1402 if (op->contr->mode & PU_FOOD) 1135 if (op->contr->mode & PU_FOOD)
1403 if (tmp->type == FOOD) 1136 if (tmp->type == FOOD)
1404 { 1137 {
1405 pick_up (op, tmp); 1138 CHK_PICK_PICKUP;
1406 continue; 1139 continue;
1407 } 1140 }
1408 1141
1409 if (op->contr->mode & PU_DRINK) 1142 if (op->contr->mode & PU_DRINK)
1410 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1143 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1411 { 1144 {
1412 pick_up (op, tmp); 1145 CHK_PICK_PICKUP;
1413 continue; 1146 continue;
1414 } 1147 }
1415 1148
1416 if (op->contr->mode & PU_POTION) 1149 if (op->contr->mode & PU_POTION)
1417 if (tmp->type == POTION) 1150 if (tmp->type == POTION)
1418 { 1151 {
1419 pick_up (op, tmp); 1152 CHK_PICK_PICKUP;
1420 continue; 1153 continue;
1421 } 1154 }
1422 1155
1423 /* spellbooks, skillscrolls and normal books/scrolls */ 1156 /* spellbooks, skillscrolls and normal books/scrolls */
1424 if (op->contr->mode & PU_SPELLBOOK) 1157 if (op->contr->mode & PU_SPELLBOOK)
1425 if (tmp->type == SPELLBOOK) 1158 if (tmp->type == SPELLBOOK)
1426 { 1159 {
1427 pick_up (op, tmp); 1160 CHK_PICK_PICKUP;
1428 continue; 1161 continue;
1429 } 1162 }
1430 1163
1431 if (op->contr->mode & PU_SKILLSCROLL) 1164 if (op->contr->mode & PU_SKILLSCROLL)
1432 if (tmp->type == SKILLSCROLL) 1165 if (tmp->type == SKILLSCROLL)
1433 { 1166 {
1434 pick_up (op, tmp); 1167 CHK_PICK_PICKUP;
1435 continue; 1168 continue;
1436 } 1169 }
1437 1170
1438 if (op->contr->mode & PU_READABLES) 1171 if (op->contr->mode & PU_READABLES)
1439 if (tmp->type == BOOK || tmp->type == SCROLL) 1172 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1440 { 1173 {
1441 pick_up (op, tmp); 1174 CHK_PICK_PICKUP;
1442 continue; 1175 continue;
1443 } 1176 }
1444 1177
1445 /* wands/staves/rods/horns */ 1178 /* wands/staves/rods/horns */
1446 if (op->contr->mode & PU_MAGIC_DEVICE) 1179 if (op->contr->mode & PU_MAGIC_DEVICE)
1447 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1180 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1448 { 1181 {
1449 pick_up (op, tmp); 1182 CHK_PICK_PICKUP;
1450 continue; 1183 continue;
1451 } 1184 }
1452 1185
1453 /* pick up all magical items */ 1186 /* pick up all magical items */
1454 if (op->contr->mode & PU_MAGICAL) 1187 if (op->contr->mode & PU_MAGICAL)
1455 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1188 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1456 { 1189 {
1457 pick_up (op, tmp); 1190 CHK_PICK_PICKUP;
1458 continue; 1191 continue;
1459 } 1192 }
1460 1193
1461 if (op->contr->mode & PU_VALUABLES) 1194 if (op->contr->mode & PU_VALUABLES)
1462 { 1195 {
1463 if (tmp->type == MONEY || tmp->type == GEM) 1196 if (tmp->type == MONEY || tmp->type == GEM)
1464 { 1197 {
1465 pick_up (op, tmp); 1198 CHK_PICK_PICKUP;
1466 continue; 1199 continue;
1467 } 1200 }
1468 } 1201 }
1469 1202
1470 /* rings & amulets - talismans seems to be typed AMULET */ 1203 /* rings & amulets - talismans seems to be typed AMULET */
1471 if (op->contr->mode & PU_JEWELS) 1204 if (op->contr->mode & PU_JEWELS)
1472 if (tmp->type == RING || tmp->type == AMULET) 1205 if (tmp->type == RING || tmp->type == AMULET)
1473 { 1206 {
1474 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1475 continue; 1208 continue;
1476 } 1209 }
1477 1210
1478 /* we don't forget dragon food */ 1211 /* we don't forget dragon food */
1479 if (op->contr->mode & PU_FLESH) 1212 if (op->contr->mode & PU_FLESH)
1480 if (tmp->type == FLESH) 1213 if (tmp->type == FLESH)
1481 { 1214 {
1482 pick_up (op, tmp); 1215 CHK_PICK_PICKUP;
1483 continue; 1216 continue;
1484 } 1217 }
1485 1218
1486 /* bows and arrows. Bows are good for selling! */ 1219 /* bows and arrows. Bows are good for selling! */
1487 if (op->contr->mode & PU_BOW) 1220 if (op->contr->mode & PU_BOW)
1488 if (tmp->type == BOW) 1221 if (tmp->type == BOW)
1489 { 1222 {
1490 pick_up (op, tmp); 1223 CHK_PICK_PICKUP;
1491 continue; 1224 continue;
1492 } 1225 }
1493 1226
1494 if (op->contr->mode & PU_ARROW) 1227 if (op->contr->mode & PU_ARROW)
1495 if (tmp->type == ARROW) 1228 if (tmp->type == ARROW)
1496 { 1229 {
1497 pick_up (op, tmp); 1230 CHK_PICK_PICKUP;
1498 continue; 1231 continue;
1499 } 1232 }
1500 1233
1501 /* all kinds of armor etc. */ 1234 /* all kinds of armor etc. */
1502 if (op->contr->mode & PU_ARMOUR) 1235 if (op->contr->mode & PU_ARMOUR)
1503 if (tmp->type == ARMOUR) 1236 if (tmp->type == ARMOUR)
1504 { 1237 {
1505 pick_up (op, tmp); 1238 CHK_PICK_PICKUP;
1506 continue; 1239 continue;
1507 } 1240 }
1508 1241
1509 if (op->contr->mode & PU_HELMET) 1242 if (op->contr->mode & PU_HELMET)
1510 if (tmp->type == HELMET) 1243 if (tmp->type == HELMET)
1511 { 1244 {
1512 pick_up (op, tmp); 1245 CHK_PICK_PICKUP;
1513 continue; 1246 continue;
1514 } 1247 }
1515 1248
1516 if (op->contr->mode & PU_SHIELD) 1249 if (op->contr->mode & PU_SHIELD)
1517 if (tmp->type == SHIELD) 1250 if (tmp->type == SHIELD)
1518 { 1251 {
1519 pick_up (op, tmp); 1252 CHK_PICK_PICKUP;
1520 continue; 1253 continue;
1521 } 1254 }
1522 1255
1523 if (op->contr->mode & PU_BOOTS) 1256 if (op->contr->mode & PU_BOOTS)
1524 if (tmp->type == BOOTS) 1257 if (tmp->type == BOOTS)
1525 { 1258 {
1526 pick_up (op, tmp); 1259 CHK_PICK_PICKUP;
1527 continue; 1260 continue;
1528 } 1261 }
1529 1262
1530 if (op->contr->mode & PU_GLOVES) 1263 if (op->contr->mode & PU_GLOVES)
1531 if (tmp->type == GLOVES) 1264 if (tmp->type == GLOVES)
1532 { 1265 {
1533 pick_up (op, tmp); 1266 CHK_PICK_PICKUP;
1534 continue; 1267 continue;
1535 } 1268 }
1536 1269
1537 if (op->contr->mode & PU_CLOAK) 1270 if (op->contr->mode & PU_CLOAK)
1538 if (tmp->type == CLOAK) 1271 if (tmp->type == CLOAK)
1539 { 1272 {
1540 pick_up (op, tmp); 1273 CHK_PICK_PICKUP;
1541 continue; 1274 continue;
1542 } 1275 }
1543 1276
1544 /* hoping to catch throwing daggers here */ 1277 /* hoping to catch throwing daggers here */
1545 if (op->contr->mode & PU_MISSILEWEAPON) 1278 if (op->contr->mode & PU_MISSILEWEAPON)
1546 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1279 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1547 { 1280 {
1548 pick_up (op, tmp); 1281 CHK_PICK_PICKUP;
1549 continue; 1282 continue;
1550 } 1283 }
1551 1284
1552 /* careful: chairs and tables are weapons! */ 1285 /* careful: chairs and tables are weapons! */
1553 if (op->contr->mode & PU_ALLWEAPON) 1286 if (op->contr->mode & PU_ALLWEAPON)
1554 { 1287 {
1555 if (tmp->type == WEAPON && tmp->name != NULL) 1288 if (tmp->type == WEAPON && tmp->name != NULL)
1556 { 1289 {
1557 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1290 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1558 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1291 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1559 { 1292 {
1560 pick_up (op, tmp); 1293 CHK_PICK_PICKUP;
1561 continue; 1294 continue;
1562 } 1295 }
1563 } 1296 }
1564 1297
1565 if (tmp->type == WEAPON && tmp->name == NULL) 1298 if (tmp->type == WEAPON && tmp->name == NULL)
1566 { 1299 {
1567 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1300 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1568 { 1301 {
1569 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1570 continue; 1303 continue;
1571 } 1304 }
1572 } 1305 }
1573 } 1306 }
1574 1307
1575 /* misc stuff that's useful */ 1308 /* misc stuff that's useful */
1576 if (op->contr->mode & PU_KEY) 1309 if (op->contr->mode & PU_KEY)
1577 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1310 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1578 { 1311 {
1579 pick_up (op, tmp); 1312 CHK_PICK_PICKUP;
1580 continue; 1313 continue;
1581 } 1314 }
1582 1315
1583 /* any of the last 4 bits set means we use the ratio for value 1316 /* any of the last 4 bits set means we use the ratio for value
1584 * pickups */ 1317 * pickups */
… …
1589 /* >=7 is the old standard setting. Now we take the last 4 bits 1322 /* >=7 is the old standard setting. Now we take the last 4 bits
1590 * and multiply them by 5, giving 0..15*5== 5..75 */ 1323 * and multiply them by 5, giving 0..15*5== 5..75 */
1591 wvratio = (op->contr->mode & PU_RATIO) * 5; 1324 wvratio = (op->contr->mode & PU_RATIO) * 5;
1592 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1325 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1593 { 1326 {
1594 pick_up (op, tmp); 1327 CHK_PICK_PICKUP;
1595#if 0 1328#if 0
1596 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1329 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1597 if (tmp->name != NULL) 1330 if (tmp->name != NULL)
1598 { 1331 {
1599 fprintf (stderr, "%s", tmp->name); 1332 fprintf (stderr, "%s", tmp->name);
1600 } 1333 }
1601 else 1334 else
1602 fprintf (stderr, "%s", tmp->arch->name); 1335 fprintf (stderr, "%s", tmp->arch->archname);
1603 fprintf (stderr, ",%d] = ", tmp->type); 1336 fprintf (stderr, ",%d] = ", tmp->type);
1604 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1337 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1605#endif 1338#endif
1606 continue; 1339 continue;
1607 } 1340 }
… …
1618 * found object is returned. 1351 * found object is returned.
1619 */ 1352 */
1620object * 1353object *
1621find_arrow (object *op, const char *type) 1354find_arrow (object *op, const char *type)
1622{ 1355{
1623 object *tmp = NULL; 1356 object *tmp = 0;
1624 1357
1625 for (op = op->inv; op; op = op->below) 1358 for (op = op->inv; op; op = op->below)
1626 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1359 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1627 tmp = find_arrow (op, type); 1360 tmp = find_arrow (splay (op), type);
1628 else if (op->type == ARROW && op->race == type) 1361 else if (op->type == ARROW && op->race == type)
1629 return op; 1362 return splay (op);
1363
1630 return tmp; 1364 return tmp;
1631} 1365}
1632 1366
1633/* 1367/*
1634 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1368 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1635 * against the target. A full test is not performed, simply a basic test 1369 * against the target. A full test is not performed, simply a basic test
1636 * of resistances. The archer is making a quick guess at what he sees down 1370 * of resistances. The archer is making a quick guess at what he sees down
1637 * the hall. Failing that it does it's best to pick the highest plus arrow. 1371 * the hall. Failing that it does it's best to pick the highest plus arrow.
1638 */ 1372 */
1639
1640object * 1373object *
1641find_better_arrow (object *op, object *target, const char *type, int *better) 1374find_better_arrow (object *op, object *target, const char *type, int *better)
1642{ 1375{
1643 object *tmp = NULL, *arrow, *ntmp; 1376 object *tmp = NULL, *arrow, *ntmp;
1644 int attacknum, attacktype, betterby = 0, i; 1377 int attacknum, attacktype, betterby = 0, i;
… …
1677 else 1410 else
1678 { 1411 {
1679 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1412 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1680 { 1413 {
1681 attacktype = 1 << attacknum; 1414 attacktype = 1 << attacknum;
1682 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1415 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1683 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1416 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1684 { 1417 {
1685 tmp = arrow; 1418 tmp = arrow;
1686 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1419 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1687 } 1420 }
1688 } 1421 }
1689 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1422 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1690 { 1423 {
1691 tmp = arrow; 1424 tmp = arrow;
… …
1710 * find_better_arrow to find a decent arrow to use. 1443 * find_better_arrow to find a decent arrow to use.
1711 * op = the shooter 1444 * op = the shooter
1712 * type = bow->race 1445 * type = bow->race
1713 * dir = fire direction 1446 * dir = fire direction
1714 */ 1447 */
1715
1716object * 1448object *
1717pick_arrow_target (object *op, const char *type, int dir) 1449pick_arrow_target (object *op, const char *type, int dir)
1718{ 1450{
1719 object *tmp = NULL; 1451 object *tmp = NULL;
1720 maptile *m; 1452 maptile *m;
… …
1785 */ 1517 */
1786int 1518int
1787fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1519fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1788{ 1520{
1789 object *left, *bow; 1521 object *left, *bow;
1790 int bowspeed, mflags; 1522 int mflags;
1791 maptile *m; 1523 maptile *m;
1792 1524
1793 if (!dir) 1525 if (!dir)
1794 { 1526 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1527 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1796 return 0; 1528 return 0;
1797 } 1529 }
1798 if (op->type == PLAYER) 1530
1799 bow = op->contr->ranges[range_bow]; 1531 if (op->contr)
1532 bow = op->current_weapon;
1800 else 1533 else
1801 { 1534 {
1802 for (bow = op->inv; bow; bow = bow->below) 1535 for (bow = op->inv; bow; bow = bow->below)
1803 /* Don't check for applied - monsters don't apply bows - in that way, they 1536 /* Don't check for applied - monsters don't apply bows - in that way, they
1804 * don't need to switch back and forth between bows and weapons. 1537 * don't need to switch back and forth between bows and weapons.
… …
1809 if (!bow) 1542 if (!bow)
1810 { 1543 {
1811 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1544 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1812 return 0; 1545 return 0;
1813 } 1546 }
1547
1548 // optimisation: move object to top so we will find it quickly again
1549 if (bow->below)
1550 {
1551 bow->remove ();
1552 op->insert (bow);
1553 }
1554
1814 } 1555 }
1556
1815 if (!bow->race || !bow->skill) 1557 if (!bow->race || !bow->skill)
1816 { 1558 {
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1559 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1818 return 0; 1560 return 0;
1819 } 1561 }
1820
1821 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1822
1823 /* penalize ROF for bestarrow */
1824 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1825 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1826 if (bowspeed < 1)
1827 bowspeed = 1;
1828 1562
1829 if (arrow == NULL) 1563 if (arrow == NULL)
1830 { 1564 {
1831 if ((arrow = find_arrow (op, bow->race)) == NULL) 1565 if ((arrow = find_arrow (op, bow->race)) == NULL)
1832 { 1566 {
1833 if (op->type == PLAYER) 1567 if (op->type == PLAYER)
1834 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1568 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1835 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1569 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1836 else 1570 else
1837 CLEAR_FLAG (op, FLAG_READY_BOW); 1571 CLEAR_FLAG (op, FLAG_READY_BOW);
1572
1838 return 0; 1573 return 0;
1839 } 1574 }
1840 } 1575 }
1576
1841 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1577 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1842 if (mflags & P_OUT_OF_MAP) 1578 if (mflags & P_OUT_OF_MAP)
1843 {
1844 return 0; 1579 return 0;
1845 } 1580
1846 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1581 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1847 { 1582 {
1848 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1583 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1849 return 0; 1584 return 0;
1850 } 1585 }
… …
1856 return 0; 1591 return 0;
1857 } 1592 }
1858 1593
1859 left = arrow; /* these are arrows left to the player */ 1594 left = arrow; /* these are arrows left to the player */
1860 arrow = get_split_ob (arrow, 1); 1595 arrow = get_split_ob (arrow, 1);
1861 if (arrow == NULL) 1596 if (!arrow)
1862 { 1597 {
1863 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1598 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1864 return 0; 1599 return 0;
1865 } 1600 }
1601
1866 arrow->set_owner (op); 1602 arrow->set_owner (op);
1867 arrow->skill = bow->skill; 1603 arrow->skill = bow->skill;
1868
1869 arrow->direction = dir; 1604 arrow->direction = dir;
1870 arrow->x = sx; 1605
1871 arrow->y = sy; 1606 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1607 arrow->stats.hp = arrow->stats.dam;
1608 arrow->stats.grace = arrow->attacktype;
1609
1610 if (arrow->slaying)
1611 arrow->spellarg = strdup (arrow->slaying);
1612
1613#if 0
1614 if (player *pl = op->contr)
1615 {
1616 float speed = pl->weapon_sp;
1617
1618 /* penalize ROF for bestarrow */
1619 if (pl->bowtype == bow_bestarrow)
1620 speed *= .9f;
1621 else
1622 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1623
1624 op->speed_left += speed - op->speed;
1625 }
1626#endif
1627
1628 SET_ANIMATION (arrow, arrow->direction);
1629
1630 /* update the speed */
1631 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1632 + bow->stats.dam / 7.f;
1633
1634 arrow->set_speed (max (arrow->speed, 2.f));
1635 arrow->speed_left = 0;
1636
1637 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1872 1638
1873 if (op->type == PLAYER) 1639 if (op->type == PLAYER)
1874 { 1640 {
1875 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1876 fix_player (op);
1877 }
1878
1879 SET_ANIMATION (arrow, arrow->direction);
1880 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1881 arrow->stats.hp = arrow->stats.dam;
1882 arrow->stats.grace = arrow->attacktype;
1883 if (arrow->slaying != NULL)
1884 arrow->spellarg = strdup (arrow->slaying);
1885
1886 /* Note that this was different for monsters - they got their level
1887 * added to the damage. I think the strength bonus is more proper.
1888 */
1889
1890 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1891
1892 /* update the speed */
1893 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1894 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1895
1896 if (arrow->speed < 1.0)
1897 arrow->speed = 1.0;
1898 update_ob_speed (arrow);
1899 arrow->speed_left = 0;
1900
1901 if (op->type == PLAYER)
1902 {
1903 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1904 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1905 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1906
1907 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1641 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1642 wc -= dex_bonus[op->stats.Dex];
1643
1644 if (!arrow->slaying)
1645 arrow->slaying = op->slaying;
1646
1647 arrow->attacktype |= op->attacktype;
1908 } 1648 }
1909 else 1649 else
1910 { 1650 {
1911 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1912 arrow->level = op->level; 1651 arrow->level = op->level;
1913 } 1652 arrow->stats.wc -= bow->magic;
1914 1653
1915 if (arrow->attacktype == AT_PHYSICAL) 1654 if (!arrow->slaying)
1655 arrow->slaying = bow->slaying;
1656
1916 arrow->attacktype |= bow->attacktype; 1657 arrow->attacktype |= bow->attacktype;
1658 }
1917 1659
1918 if (bow->slaying != NULL) 1660 wc -= arrow->level;
1919 arrow->slaying = bow->slaying; 1661 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1920 1662
1921 arrow->map = m; 1663 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1922 arrow->move_type = MOVE_FLY_LOW; 1664 arrow->move_type = MOVE_FLY_LOW;
1923 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1665 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1924 1666
1925 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1667 op->play_sound (sound_find ("fire_arrow"));
1926 insert_ob_in_map (arrow, m, op, 0); 1668 m->insert (arrow, sx, sy, op);
1927 1669
1928 if (!arrow->destroyed ()) 1670 if (!arrow->destroyed ())
1929 move_arrow (arrow); 1671 move_arrow (arrow);
1930 1672
1931 if (op->type == PLAYER) 1673 if (op->type == PLAYER)
… …
1951{ 1693{
1952 int ret = 0, wcmod = 0; 1694 int ret = 0, wcmod = 0;
1953 1695
1954 if (op->contr->bowtype == bow_bestarrow) 1696 if (op->contr->bowtype == bow_bestarrow)
1955 { 1697 {
1956 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1698 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1957 } 1699 }
1958 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1700 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1959 { 1701 {
1960 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1702 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1961 wcmod = -1; 1703 wcmod = -1;
1704
1962 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1705 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1963 } 1706 }
1964 else if (op->contr->bowtype == bow_threewide) 1707 else if (op->contr->bowtype == bow_threewide)
1965 { 1708 {
1966 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1709 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1970 else if (op->contr->bowtype == bow_spreadshot) 1713 else if (op->contr->bowtype == bow_spreadshot)
1971 { 1714 {
1972 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1715 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1973 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1716 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1974 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1717 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1975
1976 } 1718 }
1977 else 1719 else
1978 { 1720 {
1979 /* Simple case */ 1721 /* Simple case */
1980 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1722 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1981 } 1723 }
1724
1982 return ret; 1725 return ret;
1983} 1726}
1984
1985 1727
1986/* Fires a misc (wand/rod/horn) object in 'dir'. 1728/* Fires a misc (wand/rod/horn) object in 'dir'.
1987 * Broken apart from 'fire' to keep it more readable. 1729 * Broken apart from 'fire' to keep it more readable.
1988 */ 1730 */
1989void 1731void
1990fire_misc_object (object *op, int dir) 1732fire_misc_object (object *op, int dir)
1991{ 1733{
1992 object *item; 1734 object *item = op->contr->ranged_ob;
1993 1735
1994 if (!op->contr->ranges[range_misc]) 1736 if (!item)
1995 { 1737 {
1996 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1738 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1997 return; 1739 return;
1998 } 1740 }
1999 1741
2000 item = op->contr->ranges[range_misc];
2001 if (!item->inv) 1742 if (!item->inv)
2002 { 1743 {
2003 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1744 LOG (llevError, "Object %s lacks a spell\n", &item->name);
2004 return; 1745 return;
2005 } 1746 }
1747
1748 if (!op->change_weapon (item))
1749 return;
1750
2006 if (item->type == WAND) 1751 if (item->type == WAND)
2007 { 1752 {
2008 if (item->stats.food <= 0) 1753 if (item->stats.food <= 0)
2009 { 1754 {
2010 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1755 op->contr->play_sound (sound_find ("wand_poof"));
2011 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1756 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1757
2012 return; 1758 return;
2013 } 1759 }
2014 } 1760 }
2015 else if (item->type == ROD || item->type == HORN) 1761 else if (item->type == ROD || item->type == HORN)
2016 { 1762 {
2017 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1763 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
2018 { 1764 {
2019 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1765 op->contr->play_sound (sound_find ("wand_poof"));
1766
2020 if (item->type == ROD) 1767 if (item->type == ROD)
2021 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1768 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
2022 else 1769 else
2023 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1770 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1771
2024 return; 1772 return;
2025 } 1773 }
2026 } 1774 }
2027 1775
2028 if (cast_spell (op, item, dir, item->inv, NULL)) 1776 if (cast_spell (op, item, dir, item->inv, NULL))
… …
2035 object *tmp; 1783 object *tmp;
2036 1784
2037 if (item->arch) 1785 if (item->arch)
2038 { 1786 {
2039 CLEAR_FLAG (item, FLAG_ANIMATE); 1787 CLEAR_FLAG (item, FLAG_ANIMATE);
2040 item->face = item->arch->clone.face; 1788 item->face = item->arch->face;
2041 item->speed = 0; 1789 item->set_speed (0);
2042 update_ob_speed (item);
2043 } 1790 }
1791
2044 if ((tmp = is_player_inv (item))) 1792 if ((tmp = item->in_player ()))
2045 esrv_update_item (UPD_ANIM, tmp, item); 1793 esrv_update_item (UPD_ANIM, tmp, item);
2046 } 1794 }
2047 } 1795 }
2048 else if (item->type == ROD || item->type == HORN) 1796 else if (item->type == ROD || item->type == HORN)
2049 {
2050 drain_rod_charge (item); 1797 drain_rod_charge (item);
2051 }
2052 } 1798 }
2053} 1799}
2054 1800
2055/* Received a fire command for the player - go and do it. 1801/* Received a fire command for the player - go and do it.
2056 */ 1802 */
2057void 1803bool
2058fire (object *op, int dir) 1804fire (object *op, int dir)
2059{ 1805{
2060 int spellcost = 0; 1806 int spellcost = 0;
2061 1807
2062 /* check for loss of invisiblity/hide */ 1808 /* check for loss of invisiblity/hide */
2063 if (action_makes_visible (op)) 1809 if (action_makes_visible (op))
2064 make_visible (op); 1810 make_visible (op);
2065 1811
2066 switch (op->contr->shoottype) 1812 player *pl = op->contr;
1813
1814 if (pl->golem)
1815 {
1816 control_golem (op->contr->golem, dir);
1817 return false;
2067 { 1818 }
2068 case range_none:
2069 return;
2070 1819
2071 case range_bow: 1820 object *ob = pl->ranged_ob;
1821
1822 if (!ob)
1823 return false;
1824
1825 if (!op->change_weapon (ob))
1826 return false;
1827
1828 if (op->speed_left > 0.f)
1829 --op->speed_left;
1830 else
1831 return false;
1832
1833 switch (ob->type)
1834 {
1835 case BOW:
2072 player_fire_bow (op, dir); 1836 player_fire_bow (op, dir);
2073 return; 1837 break;
2074 1838
2075 case range_magic: /* Casting spells */ 1839 case SPELL:
2076 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1840 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
2077 return; 1841 break;
2078 1842
2079 case range_misc: 1843 case BUILDER:
1844 apply_map_builder (op, dir);
1845 break;
1846
1847 case SKILL:
1848 do_skill (op, op, ob, dir, 0);
1849 break;
1850
1851 default:
2080 fire_misc_object (op, dir); 1852 fire_misc_object (op, dir);
2081 return; 1853 break;
2082
2083 case range_golem: /* Control summoned monsters from scrolls */
2084 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2085 {
2086 op->contr->ranges[range_golem] = 0;
2087 op->contr->shoottype = range_none;
2088 }
2089 else
2090 control_golem (op->contr->ranges[range_golem], dir);
2091 return;
2092
2093 case range_skill:
2094 if (!op->chosen_skill)
2095 {
2096 if (op->type == PLAYER)
2097 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2098 return;
2099 }
2100 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2101 return;
2102 case range_builder:
2103 apply_map_builder (op, dir);
2104 return;
2105 default:
2106 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2107 return;
2108 } 1854 }
2109}
2110 1855
2111 1856 return true;
1857}
2112 1858
2113/* find_key 1859/* find_key
2114 * We try to find a key for the door as passed. If we find a key 1860 * We try to find a key for the door as passed. If we find a key
2115 * and successfully use it, we return the key, otherwise NULL 1861 * and successfully use it, we return the key, otherwise NULL
2116 * This function merges both normal and locked door, since the logic 1862 * This function merges both normal and locked door, since the logic
… …
2118 * pl is the player, 1864 * pl is the player,
2119 * inv is the objects inventory to searched 1865 * inv is the objects inventory to searched
2120 * door is the door we are trying to match against. 1866 * door is the door we are trying to match against.
2121 * This function can be called recursively to search containers. 1867 * This function can be called recursively to search containers.
2122 */ 1868 */
2123
2124object * 1869object *
2125find_key (object *pl, object *container, object *door) 1870find_key (object *pl, object *container, object *door)
2126{ 1871{
2127 object *tmp, *key; 1872 object *tmp, *key;
2128 1873
2129 /* Should not happen, but sanity checking is never bad */ 1874 /* Should not happen, but sanity checking is never bad */
2130 if (container->inv == NULL) 1875 if (!container->inv)
2131 return NULL; 1876 return 0;
2132 1877
2133 /* First, lets try to find a key in the top level inventory */ 1878 /* First, lets try to find a key in the top level inventory */
2134 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1879 for (tmp = container->inv; tmp; tmp = tmp->below)
2135 { 1880 {
2136 if (door->type == DOOR && tmp->type == KEY) 1881 if (door->type == DOOR && tmp->type == KEY)
2137 break; 1882 break;
2138 /* For sanity, we should really check door type, but other stuff 1883 /* For sanity, we should really check door type, but other stuff
2139 * (like containers) can be locked with special keys 1884 * (like containers) can be locked with special keys
2140 */ 1885 */
2141 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1886 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2142 break; 1887 break;
2143 } 1888 }
1889
2144 /* No key found - lets search inventories now */ 1890 /* No key found - lets search inventories now */
2145 /* If we find and use a key in an inventory, return at that time. 1891 /* If we find and use a key in an inventory, return at that time.
2146 * otherwise, if we search all the inventories and still don't find 1892 * otherwise, if we search all the inventories and still don't find
2147 * a key, return 1893 * a key, return
2148 */ 1894 */
2149 if (!tmp) 1895 if (!tmp)
2150 { 1896 {
2151 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1897 for (tmp = container->inv; tmp; tmp = tmp->below)
2152 { 1898 {
2153 /* No reason to search empty containers */ 1899 /* No reason to search empty containers */
2154 if (tmp->type == CONTAINER && tmp->inv) 1900 if (tmp->type == CONTAINER && tmp->inv)
2155 { 1901 {
2156 if ((key = find_key (pl, tmp, door)) != NULL) 1902 if ((key = find_key (pl, tmp, door)))
2157 return key; 1903 return key;
2158 } 1904 }
2159 } 1905 }
1906
2160 if (!tmp) 1907 if (!tmp)
2161 return NULL; 1908 return NULL;
2162 } 1909 }
1910
2163 /* We get down here if we have found a key. Now if its in a container, 1911 /* We get down here if we have found a key. Now if its in a container,
2164 * see if we actually want to use it 1912 * see if we actually want to use it
2165 */ 1913 */
2166 if (pl != container) 1914 if (pl != container)
2167 { 1915 {
… …
2188 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1936 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2189 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1937 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2190 return NULL; 1938 return NULL;
2191 } 1939 }
2192 } 1940 }
1941
2193 return tmp; 1942 return tmp;
2194} 1943}
2195 1944
2196/* moved door processing out of move_player_attack. 1945/* moved door processing out of move_player_attack.
2197 * returns 1 if player has opened the door with a key 1946 * returns 1 if player has opened the door with a key
… …
2199 * 0 otherwise 1948 * 0 otherwise
2200 */ 1949 */
2201static int 1950static int
2202player_attack_door (object *op, object *door) 1951player_attack_door (object *op, object *door)
2203{ 1952{
2204
2205 /* If its a door, try to find a use a key. If we do destroy the door, 1953 /* If its a door, try to find a key. If we do destroy the door,
2206 * might as well return immediately as there is nothing more to do - 1954 * might as well return immediately as there is nothing more to do -
2207 * otherwise, we fall through to the rest of the code. 1955 * otherwise, we fall through to the rest of the code.
2208 */ 1956 */
2209 object *key = find_key (op, op, door); 1957 object *key = find_key (op, op, door);
2210 1958
2211 /* IF we found a key, do some extra work */ 1959 /* If we found a key, do some extra work */
2212 if (key) 1960 if (key)
2213 { 1961 {
2214 object *container = key->env; 1962 object *container = key->env;
2215 1963
2216 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2217 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
2218 make_visible (op); 1965 make_visible (op);
1966
2219 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1967 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2220 spring_trap (door->inv, op); 1968 spring_trap (door->inv, op);
1969
2221 if (door->type == DOOR) 1970 if (door->type == DOOR)
2222 {
2223 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1971 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2224 }
2225 else if (door->type == LOCKED_DOOR) 1972 else if (door->type == LOCKED_DOOR)
2226 { 1973 {
2227 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1974 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2228 remove_door2 (door); /* remove door without violence ;-) */ 1975 remove_door2 (door); /* remove door without violence ;-) */
2229 } 1976 }
1977
2230 /* Do this after we print the message */ 1978 /* Do this after we print the message */
2231 decrease_ob (key); /* Use up one of the keys */ 1979 decrease_ob (key); /* Use up one of the keys */
2232 /* Need to update the weight the container the key was in */ 1980 /* Need to update the weight the container the key was in */
2233 if (container != op) 1981 if (container != op)
2234 esrv_update_item (UPD_WEIGHT, op, container); 1982 esrv_update_item (UPD_WEIGHT, op, container);
1983
2235 return 1; /* Nothing more to do below */ 1984 return 1; /* Nothing more to do below */
2236 } 1985 }
2237 else if (door->type == LOCKED_DOOR) 1986 else if (door->type == LOCKED_DOOR)
2238 { 1987 {
2239 /* Might as well return now - no other way to open this */ 1988 /* Might as well return now - no other way to open this */
2240 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1989 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2241 return 1; 1990 return 1;
2242 } 1991 }
1992
2243 return 0; 1993 return 0;
2244} 1994}
2245 1995
2246/* This function is just part of a breakup from move_player. 1996/* This function is just part of a breakup from move_player.
2247 * It should keep the code cleaner. 1997 * It should keep the code cleaner.
2248 * When this is called, the players direction has been updated 1998 * When this is called, the players direction has been updated
2249 * (taking into account confusion.) The player is also actually 1999 * (taking into account confusion.) The player is also actually
2250 * going to try and move (not fire weapons). 2000 * going to try and move (not fire weapons).
2251 */ 2001 */
2252 2002bool
2253void
2254move_player_attack (object *op, int dir) 2003move_player_attack (object *op, int dir)
2255{ 2004{
2256 object *tmp, *mon;
2257 sint16 nx, ny;
2258 int on_battleground; 2005 int on_battleground;
2259 maptile *m;
2260 2006
2261 nx = freearr_x[dir] + op->x; 2007 sint16 nx = freearr_x[dir] + op->x;
2262 ny = freearr_y[dir] + op->y; 2008 sint16 ny = freearr_y[dir] + op->y;
2263 2009
2264 on_battleground = op_on_battleground (op, NULL, NULL); 2010 on_battleground = op_on_battleground (op, 0, 0);
2011
2012 if (out_of_map (op->map, nx, ny))
2013 return false;
2014
2015 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2016 {
2017 --op->speed_left;
2018 return true;
2019 }
2265 2020
2266 /* If braced, or can't move to the square, and it is not out of the 2021 /* If braced, or can't move to the square, and it is not out of the
2267 * map, attack it. Note order of if statement is important - don't 2022 * map, attack it. Note order of if statement is important - don't
2268 * want to be calling move_ob if braced, because move_ob will move the 2023 * want to be calling move_ob if braced, because move_ob will move the
2269 * player. This is a pretty nasty hack, because if we could 2024 * player. This is a pretty nasty hack, because if we could
2270 * move to some space, it then means that if we are braced, we should 2025 * move to some space, it then means that if we are braced, we should
2271 * do nothing at all. As it is, if we are braced, we go through 2026 * do nothing at all. As it is, if we are braced, we go through
2272 * quite a bit of processing. However, it probably is less than what 2027 * quite a bit of processing. However, it probably is less than what
2273 * move_ob uses. 2028 * move_ob uses.
2274 */ 2029 */
2275 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2030 maptile *m = op->map->xy_find (nx, ny);
2276 {
2277 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2278 {
2279 m = get_map_from_coord (op->map, &nx, &ny);
2280 if (!m)
2281 return; /* Don't think this should happen */
2282 }
2283 else
2284 m = op->map;
2285 2031
2286 if ((tmp = get_map_ob (m, nx, ny)) == NULL)
2287 {
2288 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2289 return;
2290 }
2291
2292 mon = NULL;
2293 /* Go through all the objects, and find ones of interest. Only stop if 2032 /* Go through all the objects, and find ones of interest. Only stop if
2294 * we find a monster - that is something we know we want to attack. 2033 * we find a monster - that is something we know we want to attack.
2295 * if its a door or barrel (can roll) see if there may be monsters 2034 * if its a door or barrel (can roll) see if there may be monsters
2296 * on the space 2035 * on the space
2297 */ 2036 */
2298 while (tmp != NULL) 2037 object *mon;
2299 { 2038 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2300 if (tmp == op) 2039 {
2301 { 2040 if ((mon->flag [FLAG_ALIVE]
2302 tmp = tmp->above; 2041 || mon->type == LOCKED_DOOR
2303 continue; 2042 || mon->flag [FLAG_CAN_ROLL])
2304 }
2305
2306 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2307 {
2308 mon = tmp; 2043 && mon != op)
2309 break; 2044 break;
2310 } 2045 }
2311 2046
2312 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2313 mon = tmp;
2314
2315 tmp = tmp->above;
2316 }
2317
2318 if (mon == NULL) /* This happens anytime the player tries to move */ 2047 if (!mon) /* This happens anytime the player tries to move */
2319 return; /* into a wall */ 2048 return false; /* into a wall */
2320 2049
2321 if (mon->head != NULL)
2322 mon = mon->head; 2050 mon = mon->head_ ();
2323 2051
2324 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2052 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2053 if (op->contr->weapon_sp_left > 0.f)
2325 if (player_attack_door (op, mon)) 2054 if (player_attack_door (op, mon))
2055 {
2056 --op->contr->weapon_sp_left;
2326 return; 2057 return true;
2058 }
2327 2059
2328 /* The following deals with possibly attacking peaceful 2060 /* The following deals with possibly attacking peaceful
2329 * or frienddly creatures. Basically, all players are considered 2061 * or friendly creatures. Basically, all players are considered
2330 * unaggressive. If the moving player has peaceful set, then the 2062 * unaggressive. If the moving player has peaceful set, then the
2331 * object should be pushed instead of attacked. It is assumed that 2063 * object should be pushed instead of attacked. It is assumed that
2332 * if you are braced, you will not attack friends accidently, 2064 * if you are braced, you will not attack friends accidently,
2333 * and thus will not push them. 2065 * and thus will not push them.
2334 */ 2066 */
2335 2067
2336 /* If the creature is a pet, push it even if the player is not 2068 /* If the creature is a pet, push it even if the player is not
2337 * peaceful. Our assumption is the creature is a pet if the 2069 * peaceful. Our assumption is the creature is a pet if the
2338 * player owns it and it is either friendly or unagressive. 2070 * player owns it and it is either friendly or unagressive.
2339 */ 2071 */
2340 if ((op->type == PLAYER) 2072 if (op->type == PLAYER
2341#if COZY_SERVER
2342 &&
2343 ((mon->owner && mon->owner->contr 2073 && ((mon->owner && mon->owner->contr
2344 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2074 && same_party (mon->owner->contr->party, op->contr->party))
2345#else
2346 && mon->owner == op 2075 || mon->owner == op)
2347#endif
2348 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2076 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2349 { 2077 {
2350 /* If we're braced, we don't want to switch places with it */ 2078 /* If we're braced, we don't want to switch places with it */
2351 if (op->contr->braced) 2079 if (op->contr->braced)
2352 return; 2080 return false;
2353 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2081
2082 if (op->speed_left > 0.f)
2083 {
2084 --op->speed_left;
2085
2086 op->play_sound (sound_find ("push_player"));
2354 (void) push_ob (mon, dir, op); 2087 push_ob (mon, dir, op);
2088
2355 if (op->contr->tmp_invis || op->hide) 2089 if (op->contr->tmp_invis || op->hide)
2356 make_visible (op); 2090 make_visible (op);
2091
2357 return; 2092 return true;
2358 } 2093 }
2094 else
2095 return false;
2096 }
2359 2097
2360 /* in certain circumstances, you shouldn't attack friendly 2098 /* in certain circumstances, you shouldn't attack friendly
2361 * creatures. Note that if you are braced, you can't push 2099 * creatures. Note that if you are braced, you can't push
2362 * someone, but put it inside this loop so that you won't 2100 * someone, but put it inside this loop so that you won't
2363 * attack them either. 2101 * attack them either.
2364 */ 2102 */
2365 if ((mon->type == PLAYER || mon->enemy != op) && 2103 if ((mon->type == PLAYER || mon->enemy != op)
2366 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2104 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2367#ifdef PROHIBIT_PLAYERKILL 2105 && ((op->contr->peaceful
2368 (op->contr->peaceful 2106 || (mon->type == PLAYER && mon->contr->peaceful))
2369 || (mon->type == PLAYER 2107 && !on_battleground))
2370 && mon->contr-> 2108 {
2371 peaceful)) && 2109 if (op->speed_left > 0.f)
2372#else
2373 op->contr->peaceful &&
2374#endif
2375 !on_battleground))
2376 { 2110 {
2111 --op->speed_left;
2112
2377 if (!op->contr->braced) 2113 if (!op->contr->braced)
2378 { 2114 {
2379 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2115 op->play_sound (sound_find ("push_player"));
2380 (void) push_ob (mon, dir, op); 2116 push_ob (mon, dir, op);
2381 } 2117 }
2382 else 2118 else
2383 { 2119 op->statusmsg ("You withhold your attack");
2384 new_draw_info (0, 0, op, "You withhold your attack"); 2120
2385 }
2386 if (op->contr->tmp_invis || op->hide) 2121 if (op->contr->tmp_invis || op->hide)
2387 make_visible (op); 2122 make_visible (op);
2388 }
2389 2123
2124 return true;
2125 }
2126 }
2390 /* If the object is a boulder or other rollable object, then 2127 /* If the object is a boulder or other rollable object, then
2391 * roll it if not braced. You can't roll it if you are braced. 2128 * roll it if not braced. You can't roll it if you are braced.
2392 */ 2129 */
2393 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2130 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2131 {
2132 if (op->speed_left > 0.f)
2394 { 2133 {
2134 --op->speed_left;
2135
2395 recursive_roll (mon, dir, op); 2136 recursive_roll (mon, dir, op);
2396 if (action_makes_visible (op)) 2137 if (action_makes_visible (op))
2397 make_visible (op); 2138 make_visible (op);
2398 }
2399 2139
2140 return true;
2141 }
2142 }
2400 /* Any generic living creature. Including things like doors. 2143 /* Any generic living creature. Including things like doors.
2401 * Way it works is like this: First, it must have some hit points 2144 * Way it works is like this: First, it must have some hit points
2402 * and be living. Then, it must be one of the following: 2145 * and be living. Then, it must be one of the following:
2403 * 1) Not a player, 2) A player, but of a different party. Note 2146 * 1) Not a player, 2) A player, but of a different party. Note
2404 * that party_number -1 is no party, so attacks can still happen. 2147 * that party_number -1 is no party, so attacks can still happen.
2405 */ 2148 */
2406
2407 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2149 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2408 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2150 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2409 { 2151 {
2410 2152 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2411 /* If the player hasn't hit something this tick, and does
2412 * so, give them speed boost based on weapon speed. Doing
2413 * it here is better than process_players2, which basically
2414 * incurred a 1 tick offset.
2415 */
2416 if (!op->contr->has_hit)
2417 { 2153 {
2418 op->speed_left += op->speed / op->contr->weapon_sp; 2154 --op->contr->weapon_sp_left;
2419 2155
2420 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2421 }
2422
2423 skill_attack (mon, op, 0, NULL, NULL); 2156 skill_attack (mon, op, 0, 0, 0);
2424 2157
2425 /* If attacking another player, that player gets automatic
2426 * hitback, and doesn't loose luck either.
2427 * Disable hitback on the battleground or if the target is
2428 * the wiz.
2429 */
2430 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2431 {
2432 short luck = mon->stats.luck;
2433
2434 mon->contr->has_hit = 1;
2435 skill_attack (op, mon, 0, NULL, NULL);
2436 mon->stats.luck = luck;
2437 }
2438 if (action_makes_visible (op)) 2158 if (action_makes_visible (op))
2439 make_visible (op); 2159 make_visible (op);
2440 }
2441 } /* if player should attack something */
2442}
2443 2160
2444int 2161 return true;
2162 }
2163 }
2164
2165 return false;
2166}
2167
2168bool
2445move_player (object *op, int dir) 2169move_player (object *op, int dir)
2446{ 2170{
2447 int pick; 2171 int pick;
2448 2172
2449 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2173 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2450 return 0; 2174 return 0;
2451 2175
2452 /* Sanity check: make sure dir is valid */ 2176 /* Sanity check: make sure dir is valid */
2453 if ((dir < 0) || (dir >= 9)) 2177 if ((dir < 0) || (dir >= 9))
2454 { 2178 {
2455 LOG (llevError, "move_player: invalid direction %d\n", dir); 2179 LOG (llevError, "move_player: invalid direction %d\n", dir);
2456 return 0; 2180 return 0;
2457 } 2181 }
2458 2182
2459 /* peterm: added following line */ 2183 /* peterm: added following line */
2460 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2184 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2461 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2185 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2462 2186
2463 op->facing = dir; 2187 op->facing = dir;
2464 2188
2465 if (op->hide) 2189 if (op->hide)
2466 do_hidden_move (op); 2190 do_hidden_move (op);
2467 2191
2192 bool retval;
2193
2468 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2194 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2469 /*nop */ ; 2195 retval = RESULT_INT (0);
2470 else if (op->contr->fire_on) 2196 else if (op->contr->fire_on)
2471 fire (op, dir); 2197 retval = fire (op, dir);
2472 else 2198 else
2473 { 2199 {
2474 move_player_attack (op, dir); 2200 retval = move_player_attack (op, dir);
2475 pick = check_pick (op); 2201 pick = check_pick (op);
2476 } 2202 }
2477 2203
2478 /* Add special check for newcs players and fire on - this way, the 2204 /* Add special check for newcs players and fire on - this way, the
2479 * server can handle repeat firing. 2205 * server can handle repeat firing.
2480 */ 2206 */
2481 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2207 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2482 {
2483 op->direction = dir; 2208 op->direction = dir;
2484 }
2485 else 2209 else
2486 {
2487 op->direction = 0; 2210 op->direction = 0;
2488 } 2211
2489 /* Update how the player looks. Use the facing, so direction may 2212 /* Update how the player looks. Use the facing, so direction may
2490 * get reset to zero. This allows for full animation capabilities 2213 * get reset to zero. This allows for full animation capabilities
2491 * for players. 2214 * for players.
2492 */ 2215 */
2493 animate_object (op, op->facing); 2216 animate_object (op, op->facing);
2494 return 0; 2217
2218 return retval;
2495} 2219}
2496 2220
2497/* This is similar to handle_player, below, but is only used by the 2221/* This is similar to handle_player, below, but is only used by the
2498 * new client/server stuff. 2222 * new client/server stuff.
2499 * This is sort of special, in that the new client/server actually uses 2223 * This is sort of special, in that the new client/server actually uses
2500 * the new speed values for commands. 2224 * the new speed values for commands.
2501 * 2225 *
2502 * Returns true if there are more actions we can do. 2226 * Returns true if there are more actions we can do. Should not do
2227 * many actions in a row, as that would be too unfair to other
2228 * players.
2503 */ 2229 */
2504int 2230bool
2505handle_newcs_player (object *op) 2231handle_newcs_player (object *op)
2506{ 2232{
2507 if (op->contr->hidden)
2508 {
2509 op->invisible = 1000;
2510 /* the socket code flashes the player visible/invisible
2511 * depending on the value of invisible, so we need to
2512 * alternate it here for it to work correctly.
2513 */
2514 if (pticks & 2)
2515 op->invisible--;
2516 }
2517 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2518 {
2519 op->invisible--;
2520 if (!op->invisible)
2521 {
2522 make_visible (op);
2523 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2524 }
2525 }
2526
2527 if (QUERY_FLAG (op, FLAG_SCARED)) 2233 if (QUERY_FLAG (op, FLAG_SCARED))
2528 { 2234 {
2529 flee_player (op); 2235 if (op->speed_left > 0.f)
2530 /* If player is still scared, that is his action for this tick */
2531 if (QUERY_FLAG (op, FLAG_SCARED))
2532 { 2236 {
2533 op->speed_left--; 2237 --op->speed_left;
2238 flee_player (op);
2239
2534 return 0; 2240 return true;
2535 } 2241 }
2242 else
2243 return false;
2536 } 2244 }
2537
2538 /* I've been seeing crashes where the golem has been destroyed, but
2539 * the player object still points to the defunct golem. The code that
2540 * destroys the golem looks correct, and it doesn't always happen, so
2541 * put this in a a workaround to clean up the golem pointer.
2542 */
2543 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2544 op->contr->ranges[range_golem] = 0;
2545 2245
2546 /* call this here - we also will call this in do_ericserver, but 2246 /* call this here - we also will call this in do_ericserver, but
2547 * the players time has been increased when doericserver has been 2247 * the players time has been increased when doericserver has been
2548 * called, so we recheck it here. 2248 * called, so we recheck it here.
2549 */ 2249 */
2550 HandleClient (op->contr->socket, op->contr); 2250 if (op->contr->ns->handle_command ())
2551 if (op->speed_left < 0)
2552 return 0; 2251 return true;
2553 2252
2554 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2253 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2555 {
2556 /* All move commands take 1 tick, at least for now */
2557 op->speed_left--;
2558
2559 /* Instead of all the stuff below, let move_player take care
2560 * of it. Also, some of the skill stuff is only put in
2561 * there, as well as the confusion stuff.
2562 */
2563 move_player (op, op->direction); 2254 return move_player (op, op->direction);
2564 if (op->speed_left > 0)
2565 return 1;
2566 else
2567 return 0;
2568 }
2569 2255
2570 return 0; 2256 return false;
2571} 2257}
2572 2258
2573int 2259int
2574save_life (object *op) 2260save_life (object *op)
2575{ 2261{
… …
2577 return 0; 2263 return 0;
2578 2264
2579 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2265 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2580 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2266 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2581 { 2267 {
2582 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2268 op->play_sound (sound_find ("ob_evaporate"));
2583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2269 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2584 2270
2585 if (op->contr) 2271 if (op->contr)
2586 esrv_del_item (op->contr, tmp->count); 2272 esrv_del_item (op->contr, tmp->count);
2587 2273
… …
2592 op->stats.hp = op->stats.maxhp; 2278 op->stats.hp = op->stats.maxhp;
2593 2279
2594 if (op->stats.food < 0) 2280 if (op->stats.food < 0)
2595 op->stats.food = 999; 2281 op->stats.food = 999;
2596 2282
2597 fix_player (op); 2283 op->update_stats ();
2598 return 1; 2284 return 1;
2599 } 2285 }
2600 2286
2601 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2287 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2602 CLEAR_FLAG (op, FLAG_LIFESAVE); 2288 CLEAR_FLAG (op, FLAG_LIFESAVE);
… …
2607/* This goes throws the inventory and removes unpaid objects, and puts them 2293/* This goes throws the inventory and removes unpaid objects, and puts them
2608 * back in the map (location and map determined by values of env). This 2294 * back in the map (location and map determined by values of env). This
2609 * function will descend into containers. op is the object to start the search 2295 * function will descend into containers. op is the object to start the search
2610 * from. 2296 * from.
2611 */ 2297 */
2612void 2298static void
2613remove_unpaid_objects (object *op, object *env) 2299drop_unpaid_items (object *op, object *env)
2614{ 2300{
2615 object *next;
2616
2617 while (op) 2301 while (op)
2618 { 2302 {
2619 next = op->below; /* Make sure we have a good value, in case 2303 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2620 * we remove object 'op' 2304
2621 */
2622 if (QUERY_FLAG (op, FLAG_UNPAID)) 2305 if (QUERY_FLAG (op, FLAG_UNPAID))
2623 { 2306 {
2624 op->remove ();
2625 op->x = env->x;
2626 op->y = env->y;
2627 if (env->type == PLAYER) 2307 if (env->type == PLAYER)
2628 esrv_del_item (env->contr, op->count); 2308 esrv_del_item (env->contr, op->count);
2629 insert_ob_in_map (op, env->map, NULL, 0); 2309
2310 op->insert_at (env);
2630 } 2311 }
2631 else if (op->inv) 2312 else if (op->inv)
2632 remove_unpaid_objects (op->inv, env); 2313 drop_unpaid_items (op->inv, env);
2633 2314
2634 op = next; 2315 op = next;
2635 } 2316 }
2636} 2317}
2637 2318
2319void
2320object::drop_unpaid_items ()
2321{
2322 if (!flag [FLAG_REMOVED])
2323 ::drop_unpaid_items (inv, this);
2324}
2638 2325
2639/* 2326/*
2640 * Returns pointer a static string containing gravestone text 2327 * Returns pointer a static string containing gravestone text
2641 * Moved from apply.c to player.c - player.c is what 2328 * Moved from apply.c to player.c - player.c is what
2642 * actually uses this function. player.c may not be quite the 2329 * actually uses this function. player.c may not be quite the
… …
2676 strncat (buf2, " ", 20 - strlen (buf) / 2); 2363 strncat (buf2, " ", 20 - strlen (buf) / 2);
2677 strcat (buf2, buf); 2364 strcat (buf2, buf);
2678 2365
2679 return buf2; 2366 return buf2;
2680} 2367}
2681
2682
2683 2368
2684void 2369void
2685do_some_living (object *op) 2370do_some_living (object *op)
2686{ 2371{
2687 int last_food = op->stats.food; 2372 int last_food = op->stats.food;
… …
2693 int rate_grace = 2000; 2378 int rate_grace = 2000;
2694 const int max_hp = 1; 2379 const int max_hp = 1;
2695 const int max_sp = 1; 2380 const int max_sp = 1;
2696 const int max_grace = 1; 2381 const int max_grace = 1;
2697 2382
2698 if (op->contr->outputs_sync) 2383 if (op->contr->hidden)
2699 {
2700 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2701 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2702 flush_output_element (op, &op->contr->outputs[i]);
2703 } 2384 {
2385 op->invisible = 1000;
2386 /* the socket code flashes the player visible/invisible
2387 * depending on the value of invisible, so we need to
2388 * alternate it here for it to work correctly.
2389 */
2390 if (pticks & 2)
2391 op->invisible--;
2392 }
2393 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2394 {
2395 if (!op->invisible--)
2396 {
2397 make_visible (op);
2398 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2399 }
2400 }
2704 2401
2705 if (op->contr->state == ST_PLAYING) 2402 if (op->contr->ns->state == ST_PLAYING)
2706 { 2403 {
2707
2708 /* these next three if clauses make it possible to SLOW DOWN 2404 /* these next three if clauses make it possible to SLOW DOWN
2709 hp/grace/spellpoint regeneration. */ 2405 hp/grace/spellpoint regeneration. */
2710 if (op->contr->gen_hp >= 0) 2406 if (op->contr->gen_hp >= 0)
2711 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2407 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2712 else 2408 else
2713 { 2409 {
2714 gen_hp = op->stats.maxhp; 2410 gen_hp = op->stats.maxhp;
2715 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2411 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2716 } 2412 }
2413
2717 if (op->contr->gen_sp >= 0) 2414 if (op->contr->gen_sp >= 0)
2718 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2415 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2719 else 2416 else
2720 { 2417 {
2721 gen_sp = op->stats.maxsp; 2418 gen_sp = op->stats.maxsp;
2722 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2419 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2723 } 2420 }
2421
2724 if (op->contr->gen_grace >= 0) 2422 if (op->contr->gen_grace >= 0)
2725 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2423 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2726 else 2424 else
2727 { 2425 {
2728 gen_grace = op->stats.maxgrace; 2426 gen_grace = op->stats.maxgrace;
2729 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2427 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2730 } 2428 }
2731 2429
2732 /* Regenerate Spell Points */
2733 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2734 {
2735 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2736 if (op->stats.sp < op->stats.maxsp)
2737 {
2738 op->stats.sp++;
2739 /* dms do not consume food */
2740 if (!QUERY_FLAG (op, FLAG_WIZ))
2741 {
2742 op->stats.food--;
2743 if (op->contr->digestion < 0)
2744 op->stats.food += op->contr->digestion;
2745 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2746 op->stats.food = last_food;
2747 }
2748 }
2749 if (max_sp > 1)
2750 {
2751 over_sp = (gen_sp + 10) / rate_sp;
2752 if (over_sp > 0)
2753 {
2754 if (op->stats.sp < op->stats.maxsp)
2755 {
2756 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2757 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2758 op->stats.sp--;
2759 if (op->stats.sp > op->stats.maxsp)
2760 op->stats.sp = op->stats.maxsp;
2761 }
2762 op->last_sp = 0;
2763 }
2764 else
2765 {
2766 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2767 }
2768 }
2769 else
2770 {
2771 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2772 }
2773 }
2774
2775 /* Regenerate Grace */ 2430 /* Regenerate Grace */
2776 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2431 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2777 if (--op->last_grace < 0) 2432 if (--op->last_grace < 0)
2778 { 2433 {
2779 if (op->stats.grace < op->stats.maxgrace / 2) 2434 if (op->stats.grace < op->stats.maxgrace / 2)
2780 op->stats.grace++; /* no penalty in food for regaining grace */ 2435 op->stats.grace++; /* no penalty in food for regaining grace */
2436
2781 if (max_grace > 1) 2437 if (max_grace > 1)
2782 { 2438 {
2783 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2439 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2784 if (over_grace > 0) 2440 if (over_grace > 0)
2785 { 2441 {
… …
2797 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2453 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2798 } 2454 }
2799 /* wearing stuff doesn't detract from grace generation. */ 2455 /* wearing stuff doesn't detract from grace generation. */
2800 } 2456 }
2801 2457
2458 if (op->stats.food > 0)
2459 {
2802 /* Regenerate Hit Points */ 2460 /* Regenerate Spell Points */
2803 if (--op->last_heal < 0) 2461 if (!op->contr->golem && --op->last_sp < 0)
2804 {
2805 if (op->stats.hp < op->stats.maxhp)
2806 { 2462 {
2807 op->stats.hp++; 2463 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2808 /* dms do not consume food */ 2464
2809 if (!QUERY_FLAG (op, FLAG_WIZ)) 2465 if (op->stats.sp < op->stats.maxsp)
2810 { 2466 {
2467 op->stats.sp++;
2468
2469 /* dms do not consume food */
2470 if (!QUERY_FLAG (op, FLAG_WIZ))
2471 {
2811 op->stats.food--; 2472 op->stats.food--;
2473
2812 if (op->contr->digestion < 0) 2474 if (op->contr->digestion < 0)
2813 op->stats.food += op->contr->digestion; 2475 op->stats.food += op->contr->digestion;
2814 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2476 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2815 op->stats.food = last_food; 2477 op->stats.food = last_food;
2478 }
2816 } 2479 }
2817 } 2480
2818 if (max_hp > 1) 2481 if (max_sp > 1)
2819 {
2820 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2821 if (over_hp > 0)
2822 { 2482 {
2823 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2483 over_sp = (gen_sp + 10) / rate_sp;
2484 if (over_sp > 0)
2485 {
2486 if (op->stats.sp < op->stats.maxsp)
2487 {
2488 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2489
2490 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2491 op->stats.sp--;
2492
2493 if (op->stats.sp > op->stats.maxsp)
2494 op->stats.sp = op->stats.maxsp;
2495 }
2496
2824 op->last_heal = 0; 2497 op->last_sp = 0;
2498 }
2499 else
2500 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2825 } 2501 }
2826 else 2502 else
2503 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2504 }
2505
2506 /* Regenerate Hit Points */
2507 if (--op->last_heal < 0)
2508 {
2509 if (op->stats.hp < op->stats.maxhp)
2827 { 2510 {
2828 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2511 op->stats.hp++;
2512
2513 /* dms do not consume food */
2514 if (!QUERY_FLAG (op, FLAG_WIZ))
2515 {
2516 op->stats.food--;
2517
2518 if (op->contr->digestion < 0)
2519 op->stats.food += op->contr->digestion;
2520 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2521 op->stats.food = last_food;
2522 }
2829 } 2523 }
2524
2525 if (max_hp > 1)
2526 {
2527 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2528
2529 if (over_hp > 0)
2530 {
2531 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2532 op->last_heal = 0;
2533 }
2534 else
2535 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2830 } 2536 }
2831 else 2537 else
2832 {
2833 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2538 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2834 } 2539 }
2835 } 2540 }
2836 2541
2837 /* Digestion */ 2542 /* Digestion */
2838 if (--op->last_eat < 0) 2543 if (--op->last_eat < 0)
2839 { 2544 {
2840#ifdef COZY_SERVER 2545 int bonus = max (0, op->contr->digestion),
2841 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2546 penalty = max (0, -op->contr->digestion);
2842 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2843#else
2844 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2845#endif
2846 2547
2847 if (op->contr->gen_hp > 0)
2848 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2548 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2849 else 2549
2850 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2851 /* dms do not consume food */ 2550 /* dms do not consume food */
2852 if (!QUERY_FLAG (op, FLAG_WIZ)) 2551 if (!QUERY_FLAG (op, FLAG_WIZ))
2853 op->stats.food--; 2552 op->stats.food--;
2854 } 2553 }
2855 }
2856 2554
2857 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2555 if (op->stats.food < 0 && op->stats.hp >= 0)
2858 { 2556 {
2859 object *tmp, *flesh = NULL; 2557 object *tmp, *flesh = 0;
2860 2558
2861 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2559 for (tmp = op->inv; tmp; tmp = tmp->below)
2862 {
2863 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2864 { 2560 {
2865 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2561 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2866 { 2562 {
2563 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2564 {
2867 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2565 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2868 manual_apply (op, tmp, 0); 2566 manual_apply (op, tmp, 0);
2869 if (op->stats.food >= 0 || op->stats.hp < 0) 2567 if (op->stats.food >= 0 || op->stats.hp < 0)
2870 break; 2568 break;
2871 } 2569 }
2872 else if (tmp->type == FLESH) 2570 else if (tmp->type == FLESH)
2873 flesh = tmp; 2571 flesh = tmp;
2874 } /* End if paid for object */ 2572 } /* End if paid for object */
2875 } /* end of for loop */ 2573 } /* end of for loop */
2574
2876 /* If player is still starving, it means they don't have any food, so 2575 /* If player is still starving, it means they don't have any food, so
2877 * eat flesh instead. 2576 * eat flesh instead.
2878 */ 2577 */
2879 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2578 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2880 { 2579 {
2881 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882 manual_apply (op, flesh, 0); 2581 manual_apply (op, flesh, 0);
2582 }
2583 }
2584
2585 if (op->stats.food < 0)
2883 } 2586 {
2884 } /* end if player is starving */ 2587 op->stats.hp += op->stats.food;
2588 op->stats.food = 0;
2589 }
2885 2590
2886 while (op->stats.food < 0 && op->stats.hp > 0) 2591 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2887 op->stats.food++, op->stats.hp--;
2888
2889 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
2890 kill_player (op); 2592 kill_player (op);
2593 }
2891} 2594}
2892
2893
2894 2595
2895/* If the player should die (lack of hp, food, etc), we call this. 2596/* If the player should die (lack of hp, food, etc), we call this.
2896 * op is the player in jeopardy. If the player can not be saved (not 2597 * op is the player in jeopardy. If the player can not be saved (not
2897 * permadeath, no lifesave), this will take care of removing the player 2598 * permadeath, no lifesave), this will take care of removing the player
2898 * file. 2599 * file.
2899 */ 2600 */
2900void 2601void
2901kill_player (object *op) 2602kill_player (object *op)
2902{ 2603{
2604 int x, y;
2903 char buf[MAX_BUF]; 2605 char buf[MAX_BUF];
2904 int x, y;
2905
2906 //int i;
2907 maptile *map; /* this is for resurrection */ 2606 maptile *map; /* this is for resurrection */
2908
2909 /* int z;
2910 int num_stats_lose;
2911 int lost_a_stat;
2912 int lose_this_stat;
2913 int this_stat; */
2914 int will_kill_again; 2607 int will_kill_again;
2915 archetype *at; 2608 archetype *at;
2916 object *tmp; 2609 object *tmp;
2917 2610
2918 if (save_life (op)) 2611 if (save_life (op))
2919 return; 2612 return;
2920
2921 2613
2922 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2614 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2923 * in cities ONLY!!! It is very important that this doesn't get abused. 2615 * in cities ONLY!!! It is very important that this doesn't get abused.
2924 * Look at op_on_battleground() for more info --AndreasV 2616 * Look at op_on_battleground() for more info --AndreasV
2925 */ 2617 */
… …
2928 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2620 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2929 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2621 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2930 2622
2931 /* restore player */ 2623 /* restore player */
2932 at = archetype::find ("poisoning"); 2624 at = archetype::find ("poisoning");
2933 tmp = present_arch_in_ob (at, op); 2625 if (object *tmp = present_arch_in_ob (at, op))
2934 if (tmp)
2935 { 2626 {
2936 tmp->destroy (); 2627 tmp->destroy ();
2937 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2628 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2938 } 2629 }
2939 2630
2940 at = archetype::find ("confusion"); 2631 at = archetype::find ("confusion");
2941 tmp = present_arch_in_ob (at, op); 2632 if (object *tmp = present_arch_in_ob (at, op))
2942 if (tmp)
2943 { 2633 {
2944 tmp->destroy (); 2634 tmp->destroy ();
2945 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2635 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2946 } 2636 }
2947 2637
2948 cure_disease (op, 0); /* remove any disease */ 2638 cure_disease (op, 0, 0); /* remove any disease */
2949 op->stats.hp = op->stats.maxhp; 2639 op->stats.hp = op->stats.maxhp;
2950 if (op->stats.food <= 0) 2640 if (op->stats.food <= 0)
2951 op->stats.food = 999; 2641 op->stats.food = 999;
2952 2642
2953 /* create a bodypart-trophy to make the winner happy */ 2643 /* create a bodypart-trophy to make the winner happy */
2954 tmp = arch_to_object (archetype::find ("finger")); 2644 if (object *tmp = arch_to_object (archetype::find ("finger")))
2955 if (tmp != NULL)
2956 { 2645 {
2957 sprintf (buf, "%s's finger", &op->name); 2646 tmp->name = format ("%s's finger" , &op->name);
2958 tmp->name = buf; 2647 tmp->name_pl = format ("%s's fingers", &op->name);
2959 sprintf (buf, " This finger has been cut off %s\n" 2648 tmp->msg = format (
2960 " the %s, when he was defeated at\n level %d by %s.\n", 2649 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2961 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2650 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2962 tmp->msg = buf; 2651 );
2963 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2652 tmp->value = 0, tmp->type = 0;
2964 tmp->materialname = NULL; 2653 tmp->materialname = "organics";
2965 tmp->x = op->x, tmp->y = op->y; 2654 tmp->insert_at (op, tmp);
2966 insert_ob_in_map (tmp, op->map, op, 0);
2967 } 2655 }
2968 2656
2969 /* teleport defeated player to new destination */ 2657 /* teleport defeated player to new destination */
2970 transfer_ob (op, x, y, 0, NULL); 2658 transfer_ob (op, x, y, 0, NULL);
2971 op->contr->braced = 0; 2659 op->contr->braced = 0;
… …
2975 INVOKE_PLAYER (DEATH, op->contr); 2663 INVOKE_PLAYER (DEATH, op->contr);
2976 2664
2977 command_kill_pets (op, 0); 2665 command_kill_pets (op, 0);
2978 2666
2979 if (op->stats.food < 0) 2667 if (op->stats.food < 0)
2980 {
2981 if (op->contr->explore)
2982 {
2983 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2984 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2985 op->stats.food = 999;
2986 return;
2987 }
2988 sprintf (buf, "%s starved to death.", &op->name);
2989 strcpy (op->contr->killer, "starvation"); 2668 strcpy (op->contr->killer, "starvation");
2669
2670 op->contr->play_sound (sound_find ("player_dies"));
2671
2672 /* save the map location for corpse, gravestone */
2673 x = op->x;
2674 y = op->y;
2675 map = op->map;
2676
2677 /* NOT_PERMADEATH code. This basically brings the character back to
2678 * life if they are dead - it takes some exp and a random stat.
2679 * See the config.h file for a little more in depth detail about this.
2680 */
2681
2682 /* Basically two ways to go - remove a stat permanently, or just
2683 * make it depletion. This bunch of code deals with that aspect
2684 * of death.
2685 */
2686#ifndef COZY_SERVER
2687 if (settings.balanced_stat_loss)
2688 {
2689 /* If stat loss is permanent, lose one stat only. */
2690 /* Lower level chars don't lose as many stats because they suffer
2691 more if they do. */
2692 /* Higher level characters can afford things such as potions of
2693 restoration, or better, stat potions. So we slug them that
2694 little bit harder. */
2695 /* GD */
2696 if (settings.stat_loss_on_death)
2697 num_stats_lose = 1;
2698 else
2699 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2990 } 2700 }
2991 else 2701 else
2992 { 2702 num_stats_lose = 1;
2993 if (op->contr->explore) 2703
2994 { 2704 lost_a_stat = 0;
2995 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are"); 2705
2996 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2706 for (z = 0; z < num_stats_lose; z++)
2997 op->stats.hp = op->stats.maxhp;
2998 return;
2999 }
3000 sprintf (buf, "%s died.", &op->name);
3001 } 2707 {
3002 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2708 i = RANDOM () % NUM_STATS;
3003 2709
3004 /* save the map location for corpse, gravestone */
3005 x = op->x;
3006 y = op->y;
3007 map = op->map;
3008
3009
3010 if (settings.not_permadeth == TRUE)
3011 {
3012 /* NOT_PERMADEATH code. This basically brings the character back to
3013 * life if they are dead - it takes some exp and a random stat.
3014 * See the config.h file for a little more in depth detail about this.
3015 */
3016
3017 /* Basically two ways to go - remove a stat permanently, or just
3018 * make it depletion. This bunch of code deals with that aspect
3019 * of death.
3020 */
3021#ifndef COZY_SERVER
3022 if (settings.balanced_stat_loss)
3023 {
3024 /* If stat loss is permanent, lose one stat only. */
3025 /* Lower level chars don't lose as many stats because they suffer
3026 more if they do. */
3027 /* Higher level characters can afford things such as potions of
3028 restoration, or better, stat potions. So we slug them that
3029 little bit harder. */
3030 /* GD */
3031 if (settings.stat_loss_on_death) 2710 if (settings.stat_loss_on_death)
3032 num_stats_lose = 1; 2711 {
3033 else 2712 /* Pick a random stat and take a point off it. Tell the player
3034 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2713 * what he lost.
2714 */
2715 change_attr_value (&(op->stats), i, -1);
2716 check_stat_bounds (&(op->stats));
2717 change_attr_value (&(op->contr->orig_stats), i, -1);
2718 check_stat_bounds (&(op->contr->orig_stats));
2719 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2720 lost_a_stat = 1;
3035 } 2721 }
3036 else 2722 else
3037 { 2723 {
3038 num_stats_lose = 1; 2724 /* deplete a stat */
3039 } 2725 archetype *deparch = archetype::find ("depletion");
3040 lost_a_stat = 0; 2726 object *dep;
3041 2727
3042 for (z = 0; z < num_stats_lose; z++) 2728 dep = present_arch_in_ob (deparch, op);
3043 { 2729 if (!dep)
3044 i = RANDOM () % NUM_STATS;
3045
3046 if (settings.stat_loss_on_death)
3047 { 2730 {
3048 /* Pick a random stat and take a point off it. Tell the player 2731 dep = arch_to_object (deparch);
3049 * what he lost. 2732 insert_ob_in_ob (dep, op);
3050 */
3051 change_attr_value (&(op->stats), i, -1);
3052 check_stat_bounds (&(op->stats));
3053 change_attr_value (&(op->contr->orig_stats), i, -1);
3054 check_stat_bounds (&(op->contr->orig_stats));
3055 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3056 lost_a_stat = 1;
3057 } 2733 }
3058 else 2734 lose_this_stat = 1;
2735 if (settings.balanced_stat_loss)
3059 { 2736 {
3060 /* deplete a stat */ 2737 /* GD */
3061 archetype *deparch = archetype::find ("depletion"); 2738 /* Get the stat that we're about to deplete. */
3062 object *dep; 2739 this_stat = get_attr_value (&(dep->stats), i);
3063 2740 if (this_stat < 0)
3064 dep = present_arch_in_ob (deparch, op);
3065 if (!dep)
3066 { 2741 {
3067 dep = arch_to_object (deparch); 2742 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3068 insert_ob_in_ob (dep, op); 2743 int keep_chance = this_stat * this_stat;
3069 } 2744
3070 lose_this_stat = 1; 2745 /* Yes, I am paranoid. Sue me. */
3071 if (settings.balanced_stat_loss)
3072 {
3073 /* GD */
3074 /* Get the stat that we're about to deplete. */
3075 this_stat = get_attr_value (&(dep->stats), i);
3076 if (this_stat < 0) 2746 if (keep_chance < 1)
2747 keep_chance = 1;
2748
2749 /* There is a maximum depletion total per level. */
2750 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3077 { 2751 {
3078 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3079 int keep_chance = this_stat * this_stat;
3080
3081 /* Yes, I am paranoid. Sue me. */
3082 if (keep_chance < 1)
3083 keep_chance = 1;
3084
3085 /* There is a maximum depletion total per level. */
3086 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3087 {
3088 lose_this_stat = 0; 2752 lose_this_stat = 0;
3089 /* Take loss chance vs keep chance to see if we 2753 /* Take loss chance vs keep chance to see if we
3090 retain the stat. */ 2754 retain the stat. */
3091 }
3092 else
3093 {
3094 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3095 lose_this_stat = 0;
3096 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3097 this_stat, keep_chance, loss_chance,
3098 lose_this_stat?"LOSE":"KEEP"); */
3099 }
3100 } 2755 }
3101 }
3102
3103 if (lose_this_stat)
3104 {
3105 this_stat = get_attr_value (&(dep->stats), i);
3106 /* We could try to do something clever like find another
3107 * stat to reduce if this fails. But chances are, if
3108 * stats have been depleted to -50, all are pretty low
3109 * and should be roughly the same, so it shouldn't make a
3110 * difference.
3111 */ 2756 else
3112 if (this_stat >= -50)
3113 { 2757 {
3114 change_attr_value (&(dep->stats), i, -1); 2758 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3115 SET_FLAG (dep, FLAG_APPLIED);
3116 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3117 fix_player (op);
3118 lost_a_stat = 1; 2759 lose_this_stat = 0;
2760 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2761 this_stat, keep_chance, loss_chance,
2762 lose_this_stat?"LOSE":"KEEP"); */
3119 } 2763 }
3120 } 2764 }
3121 } 2765 }
2766
2767 if (lose_this_stat)
2768 {
2769 this_stat = get_attr_value (&(dep->stats), i);
2770 /* We could try to do something clever like find another
2771 * stat to reduce if this fails. But chances are, if
2772 * stats have been depleted to -50, all are pretty low
2773 * and should be roughly the same, so it shouldn't make a
2774 * difference.
2775 */
2776 if (this_stat >= -50)
2777 {
2778 change_attr_value (&(dep->stats), i, -1);
2779 SET_FLAG (dep, FLAG_APPLIED);
2780 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2781 op->update_stats ();
2782 lost_a_stat = 1;
2783 }
3122 } 2784 }
2785 }
2786 }
3123 /* If no stat lost, tell the player. */ 2787 /* If no stat lost, tell the player. */
3124 if (!lost_a_stat) 2788 if (!lost_a_stat)
3125 { 2789 {
3126 /* determine_god() seems to not work sometimes... why is this? 2790 /* determine_god() seems to not work sometimes... why is this?
3127 Should I be using something else? GD */ 2791 Should I be using something else? GD */
3128 const char *god = determine_god (op); 2792 const char *god = determine_god (op);
3129 2793
3130 if (god && (strcmp (god, "none"))) 2794 if (god && (strcmp (god, "none")))
3131 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2795 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3132 else 2796 else
3133 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2797 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3134 } 2798 }
3135#else 2799#else
3136 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2800 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3137#endif 2801#endif
3138 2802
3139 /* Put a gravestone up where the character 'almost' died. List the 2803 /* Put a gravestone up where the character 'almost' died. List the
3140 * exp loss on the stone. 2804 * exp loss on the stone.
3141 */ 2805 */
3142 tmp = arch_to_object (archetype::find ("gravestone")); 2806 tmp = arch_to_object (archetype::find ("gravestone"));
3143 sprintf (buf, "%s's gravestone", &op->name); 2807 sprintf (buf, "%s's gravestone", &op->name);
3144 tmp->name = buf; 2808 tmp->name = buf;
3145 sprintf (buf, "%s's gravestones", &op->name); 2809 sprintf (buf, "%s's gravestones", &op->name);
3146 tmp->name_pl = buf; 2810 tmp->name_pl = buf;
3147 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); 2811 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);
3148 tmp->msg = buf; 2812 tmp->msg = buf;
3149 tmp->x = op->x, tmp->y = op->y; 2813 tmp->x = op->x, tmp->y = op->y;
3150 insert_ob_in_map (tmp, op->map, NULL, 0); 2814 insert_ob_in_map (tmp, op->map, NULL, 0);
3151 2815
3152 /**************************************/ 2816 /**************************************/
3153 /* */ 2817 /* */
3154 /* Subtract the experience points, */ 2818 /* Subtract the experience points, */
3155 /* if we died cause of food, give us */ 2819 /* if we died cause of food, give us */
3156 /* food, and reset HP's... */ 2820 /* food, and reset HP's... */
3157 /* */ 2821 /* */
3158 /**************************************/ 2822 /**************************************/
3159 2823
3160 /* remove any poisoning and confusion the character may be suffering. */ 2824 /* remove any poisoning and confusion the character may be suffering. */
3161 /* restore player */ 2825 /* restore player */
3162 at = archetype::find ("poisoning"); 2826 at = archetype::find ("poisoning");
3163 tmp = present_arch_in_ob (at, op); 2827 tmp = present_arch_in_ob (at, op);
3164 2828
3165 if (tmp) 2829 if (tmp)
3166 { 2830 {
3167 tmp->destroy (); 2831 tmp->destroy ();
3168 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2832 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3169 } 2833 }
3170 2834
3171 at = archetype::find ("confusion"); 2835 at = archetype::find ("confusion");
3172 tmp = present_arch_in_ob (at, op); 2836 tmp = present_arch_in_ob (at, op);
3173 if (tmp) 2837 if (tmp)
3174 { 2838 {
3175 tmp->destroy (); 2839 tmp->destroy ();
3176 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2840 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3177 } 2841 }
3178 2842
3179 cure_disease (op, 0); /* remove any disease */ 2843 cure_disease (op, 0, 0); /* remove any disease */
3180 2844
3181 /*add_exp(op, (op->stats.exp * -0.20)); */ 2845 /*add_exp(op, (op->stats.exp * -0.20)); */
3182 apply_death_exp_penalty (op); 2846 apply_death_exp_penalty (op);
3183 if (op->stats.food < 100) 2847 if (op->stats.food < 100)
3184 op->stats.food = 900; 2848 op->stats.food = 900;
3185 op->stats.hp = op->stats.maxhp; 2849 op->stats.hp = op->stats.maxhp;
3186 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2850 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3187 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2851 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3188 2852
3189 /* 2853 /*
3190 * Check to see if the player is in a shop. IF so, then check to see if 2854 * Check to see if the player has any unpaid items. If so, remove them
3191 * the player has any unpaid items. If so, remove them and put them back 2855 * and put them back in the map.
3192 * in the map. 2856 */
3193 */ 2857 op->drop_unpaid_items ();
3194 2858
3195 if (is_in_shop (op))
3196 remove_unpaid_objects (op->inv, op);
3197
3198 /****************************************/ 2859 /****************************************/
3199 /* */ 2860 /* */
3200 /* Move player to his current respawn- */ 2861 /* Move player to his current respawn- */
3201 /* position (usually last savebed) */ 2862 /* position (usually last savebed) */
3202 /* */ 2863 /* */
3203 /****************************************/ 2864 /****************************************/
3204 2865
3205 enter_player_savebed (op); 2866 enter_player_savebed (op);
3206 2867
3207 /* Save the player before inserting the force to reduce
3208 * chance of abuse.
3209 */
3210 op->contr->braced = 0; 2868 op->contr->braced = 0;
3211 save_player (op, 1);
3212 2869
3213 /* it is possible that the player has blown something up 2870 /* it is possible that the player has blown something up
3214 * at his savebed location, and that can have long lasting 2871 * at his savebed location, and that can have long lasting
3215 * spell effects. So first see if there is a spell effect 2872 * spell effects. So first see if there is a spell effect
3216 * on the space that might harm the player. 2873 * on the space that might harm the player.
3217 */ 2874 */
3218 will_kill_again = 0; 2875 will_kill_again = 0;
3219 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2876 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3220 if (tmp->type == SPELL_EFFECT) 2877 if (tmp->type == SPELL_EFFECT)
3221 will_kill_again |= tmp->attacktype; 2878 will_kill_again |= tmp->attacktype;
3222 2879
3223 if (will_kill_again) 2880 if (will_kill_again)
3224 { 2881 {
3225 object *force; 2882 object *force;
3226 int at; 2883 int at;
3227 2884
3228 force = get_archetype (FORCE_NAME); 2885 force = get_archetype (FORCE_NAME);
3229 /* 50 ticks should be enough time for the spell to abate */ 2886 /* 50 ticks should be enough time for the spell to abate */
3230 force->speed = 0.1; 2887 force->speed = 0.1f;
3231 force->speed_left = -5.0; 2888 force->speed_left = -5.f;
3232 SET_FLAG (force, FLAG_APPLIED); 2889 SET_FLAG (force, FLAG_APPLIED);
3233 for (at = 0; at < NROFATTACKS; at++) 2890 for (at = 0; at < NROFATTACKS; at++)
3234 if (will_kill_again & (1 << at)) 2891 if (will_kill_again & (1 << at))
3235 force->resist[at] = 100; 2892 force->resist[at] = 100;
3236 2893
3237 insert_ob_in_ob (force, op); 2894 insert_ob_in_ob (force, op);
3238 fix_player (op); 2895 op->update_stats ();
3239 2896
3240 } 2897 }
3241 2898
3242 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2899 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3243 return;
3244 } /* NOT_PERMADETH */
3245 else
3246 {
3247 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3248 * should probably be embedded in an else statement.
3249 */
3250
3251 op->contr->party = NULL;
3252 if (settings.set_title == TRUE)
3253 op->contr->own_title[0] = '\0';
3254 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3255 check_score (op);
3256
3257 if (op->contr->ranges[range_golem])
3258 {
3259 remove_friendly_object (op->contr->ranges[range_golem]);
3260 op->contr->ranges[range_golem]->destroy ();
3261 op->contr->ranges[range_golem] = 0;
3262 }
3263
3264 loot_object (op); /* Remove some of the items for good */
3265 op->remove ();
3266 op->direction = 0;
3267
3268 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3269 {
3270 delete_character (op->name, 0);
3271 if (settings.resurrection == TRUE)
3272 {
3273 /* save playerfile sans equipment when player dies
3274 ** then save it as player.pl.dead so that future resurrection
3275 ** type spells will work on them nicely
3276 */
3277 delete_character (op->name, 0);
3278 op->stats.hp = op->stats.maxhp;
3279 op->stats.food = 999;
3280
3281 /* set the location of where the person will reappear when */
3282 /* maybe resurrection code should fix map also */
3283 strcpy (op->contr->maplevel, settings.emergency_mapname);
3284 if (op->map != NULL)
3285 op->map = NULL;
3286 op->x = settings.emergency_x;
3287 op->y = settings.emergency_y;
3288 save_player (op, 0);
3289 op->map = map;
3290 /* please see resurrection.c: peterm */
3291 dead_player (op);
3292 }
3293 else
3294 delete_character (op->name, 1);
3295 }
3296
3297 play_again (op);
3298
3299 /* peterm: added to create a corpse at deathsite. */
3300 tmp = arch_to_object (archetype::find ("corpse_pl"));
3301 sprintf (buf, "%s", &op->name);
3302 tmp->name = tmp->name_pl = buf;
3303 tmp->level = op->level;
3304 tmp->x = x;
3305 tmp->y = y;
3306 tmp->msg = gravestone_text (op);
3307 SET_FLAG (tmp, FLAG_UNIQUE);
3308 insert_ob_in_map (tmp, map, NULL, 0);
3309 }
3310} 2900}
3311
3312 2901
3313void 2902void
3314loot_object (object *op) 2903loot_object (object *op)
3315{ /* Grab and destroy some treasure */ 2904{ /* Grab and destroy some treasure */
3316 object *tmp, *tmp2, *next; 2905 object *tmp, *tmp2, *next;
3317 2906
3318 if (op->container) 2907 op->close_container (); /* close open sack first */
3319 { /* close open sack first */
3320 esrv_apply_container (op, op->container);
3321 }
3322 2908
3323 for (tmp = op->inv; tmp != NULL; tmp = next) 2909 for (tmp = op->inv; tmp; tmp = next)
3324 { 2910 {
3325 next = tmp->below; 2911 next = tmp->below;
3326 if (tmp->type == EXPERIENCE || tmp->invisible) 2912
2913 if (tmp->invisible)
3327 continue; 2914 continue;
2915
3328 tmp->remove (); 2916 tmp->remove ();
3329 tmp->x = op->x, tmp->y = op->y; 2917 tmp->x = op->x, tmp->y = op->y;
2918
3330 if (tmp->type == CONTAINER) 2919 if (tmp->type == CONTAINER)
3331 { /* empty container to ground */ 2920 loot_object (tmp); /* empty container to ground */
3332 loot_object (tmp); 2921
3333 }
3334 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2922 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3335 { 2923 {
3336 if (tmp->nrof > 1) 2924 if (tmp->nrof > 1)
3337 { 2925 {
3338 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2926 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3339 tmp2->destroy (); 2927 tmp2->destroy ();
… …
3350/* 2938/*
3351 * fix_weight(): Check recursively the weight of all players, and fix 2939 * fix_weight(): Check recursively the weight of all players, and fix
3352 * what needs to be fixed. Refresh windows and fix speed if anything 2940 * what needs to be fixed. Refresh windows and fix speed if anything
3353 * was changed. 2941 * was changed.
3354 */ 2942 */
3355
3356void 2943void
3357fix_weight (void) 2944fix_weight (void)
3358{ 2945{
3359 player *pl; 2946 for_all_players (pl)
3360
3361 for (pl = first_player; pl != NULL; pl = pl->next)
3362 { 2947 {
3363 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2948 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3364 2949
3365 if (old == sum) 2950 if (old == sum)
3366 continue; 2951 continue;
3367 fix_player (pl->ob); 2952 pl->ob->update_stats ();
3368 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2953 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3369 } 2954 }
3370} 2955}
3371 2956
3372void 2957void
3373fix_luck (void) 2958fix_luck (void)
3374{ 2959{
3375 player *pl; 2960 for_all_players (pl)
3376
3377 for (pl = first_player; pl != NULL; pl = pl->next)
3378 if (!pl->ob->contr->state) 2961 if (!pl->ob->contr->ns->state)
3379 change_luck (pl->ob, 0); 2962 pl->ob->change_luck (0);
3380} 2963}
3381
3382 2964
3383/* cast_dust() - handles op throwing objects of type 'DUST'. 2965/* cast_dust() - handles op throwing objects of type 'DUST'.
3384 * This is much simpler in the new spell code - we basically 2966 * This is much simpler in the new spell code - we basically
3385 * just treat this as any other spell casting object. 2967 * just treat this as any other spell casting object.
3386 */ 2968 */
3387
3388void 2969void
3389cast_dust (object *op, object *throw_ob, int dir) 2970cast_dust (object *op, object *throw_ob, int dir)
3390{ 2971{
3391 object *skop, *spob; 2972 object *skop, *spob;
3392 2973
… …
3421void 3002void
3422make_visible (object *op) 3003make_visible (object *op)
3423{ 3004{
3424 op->hide = 0; 3005 op->hide = 0;
3425 op->invisible = 0; 3006 op->invisible = 0;
3007
3426 if (op->type == PLAYER) 3008 if (op->type == PLAYER)
3427 { 3009 {
3428 op->contr->tmp_invis = 0; 3010 op->contr->tmp_invis = 0;
3429 op->contr->invis_race = 0; 3011 op->contr->invis_race = 0;
3430 } 3012 }
3013
3431 update_object (op, UP_OBJ_FACE); 3014 update_object (op, UP_OBJ_CHANGE);
3432} 3015}
3433 3016
3434int 3017int
3435is_true_undead (object *op) 3018is_true_undead (object *op)
3436{ 3019{
3437 object *tmp = NULL;
3438
3439 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3020 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3440 return 1; 3021 return 1;
3441 3022
3442 if (op->type == PLAYER)
3443 for (tmp = op->inv; tmp; tmp = tmp->below)
3444 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3445 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3446 return 1;
3447 return 0; 3023 return 0;
3448} 3024}
3449 3025
3450/* look at the surrounding terrain to determine 3026/* look at the surrounding terrain to determine
3451 * the hideability of this object. Positive levels 3027 * the hideability of this object. Positive levels
3452 * indicate greater hideability. 3028 * indicate greater hideability.
3453 */ 3029 */
3454
3455int 3030int
3456hideability (object *ob) 3031hideability (object *ob)
3457{ 3032{
3458 int i, level = 0, mflag; 3033 int i, level = 0, mflag;
3459 sint16 x, y; 3034 sint16 x, y;
… …
3493/* For Hidden creatures - a chance of becoming 'unhidden' 3068/* For Hidden creatures - a chance of becoming 'unhidden'
3494 * every time they move - as we subtract off 'invisibility' 3069 * every time they move - as we subtract off 'invisibility'
3495 * AND, for players, if they move into a ridiculously unhideable 3070 * AND, for players, if they move into a ridiculously unhideable
3496 * spot (surrounded by clear terrain in broad daylight). -b.t. 3071 * spot (surrounded by clear terrain in broad daylight). -b.t.
3497 */ 3072 */
3498
3499void 3073void
3500do_hidden_move (object *op) 3074do_hidden_move (object *op)
3501{ 3075{
3502 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3076 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3503 object *skop; 3077 object *skop;
… …
3507 3081
3508 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3082 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3509 3083
3510 /* its *extremely* hard to run and sneak/hide at the same time! */ 3084 /* its *extremely* hard to run and sneak/hide at the same time! */
3511 if (op->type == PLAYER && op->contr->run_on) 3085 if (op->type == PLAYER && op->contr->run_on)
3512 {
3513 if (!skop || num >= skop->level) 3086 if (!skop || num >= skop->level)
3514 { 3087 {
3515 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3088 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3516 make_visible (op); 3089 make_visible (op);
3517 return; 3090 return;
3518 } 3091 }
3519 else 3092 else
3520 num += 20; 3093 num += 20;
3521 } 3094
3522 num += op->map->difficulty; 3095 num += op->map->difficulty;
3523 hide = hideability (op); /* modify by terrain hidden level */ 3096 hide = hideability (op); /* modify by terrain hidden level */
3524 num -= hide; 3097 num -= hide;
3098
3525 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3099 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3526 { 3100 {
3527 make_visible (op); 3101 make_visible (op);
3528 if (op->type == PLAYER) 3102 if (op->type == PLAYER)
3529 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3103 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3530 } 3104 }
3531 else if (op->type == PLAYER && skop) 3105 else if (op->type == PLAYER && skop)
3532 {
3533 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3106 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3534 }
3535} 3107}
3536 3108
3537/* determine if who is standing near a hostile creature. */ 3109/* determine if who is standing near a hostile creature. */
3538 3110
3539int 3111int
… …
3566 if (mflags & P_OUT_OF_MAP) 3138 if (mflags & P_OUT_OF_MAP)
3567 continue; 3139 continue;
3568 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3140 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3569 continue; 3141 continue;
3570 3142
3571 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3143 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3572 { 3144 {
3573 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3145 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3574 return 1; 3146 return 1;
3575 else if (tmp->type == PLAYER) 3147 else if (tmp->type == PLAYER)
3576 { 3148 {
… …
3587 * object op. This function works fine for monsters, 3159 * object op. This function works fine for monsters,
3588 * but we dont worry if the object isnt the top one in 3160 * but we dont worry if the object isnt the top one in
3589 * a pile (say a coin under a table would return "viewable" 3161 * a pile (say a coin under a table would return "viewable"
3590 * by this routine). Another question, should we be 3162 * by this routine). Another question, should we be
3591 * concerned with the direction the player is looking 3163 * concerned with the direction the player is looking
3592 * in? Realistically, most of use cant see stuff behind 3164 * in? Realistically, most of us can't see stuff behind
3593 * our backs...on the other hand, does the "facing" direction 3165 * our backs...on the other hand, does the "facing" direction
3594 * imply the way your head, or body is facing? Its possible 3166 * imply the way your head, or body is facing? It's possible
3595 * for them to differ. Sigh, this fctn could get a bit more complex. 3167 * for them to differ. Sigh, this fctn could get a bit more complex.
3596 * -b.t. 3168 * -b.t.
3597 * This function is now map tiling safe. 3169 * This function is now map tiling safe.
3598 */ 3170 */
3599
3600int 3171int
3601player_can_view (object *pl, object *op) 3172player_can_view (object *pl, object *op)
3602{ 3173{
3603 rv_vector rv; 3174 rv_vector rv;
3604 int dx, dy; 3175 int dx, dy;
… …
3606 if (pl->type != PLAYER) 3177 if (pl->type != PLAYER)
3607 { 3178 {
3608 LOG (llevError, "player_can_view() called for non-player object\n"); 3179 LOG (llevError, "player_can_view() called for non-player object\n");
3609 return -1; 3180 return -1;
3610 } 3181 }
3182
3611 if (!pl || !op) 3183 if (!pl || !op)
3612 return 0; 3184 return 0;
3613 3185
3614 if (op->head)
3615 {
3616 op = op->head; 3186 op = op->head_ ();
3617 } 3187
3618 get_rangevector (pl, op, &rv, 0x1); 3188 get_rangevector (pl, op, &rv, 0x1);
3619 3189
3620 /* starting with the 'head' part, lets loop 3190 /* starting with the 'head' part, lets loop
3621 * through the object and find if it has any 3191 * through the object and find if it has any
3622 * part that is in the los array but isnt on 3192 * part that is in the los array but isn't on
3623 * a blocked los square. 3193 * a blocked los square.
3624 * we use the archetype to figure out offsets. 3194 * we use the archetype to figure out offsets.
3625 */ 3195 */
3626 while (op) 3196 while (op)
3627 { 3197 {
3628 dx = rv.distance_x + op->arch->clone.x; 3198 dx = rv.distance_x + op->arch->x;
3629 dy = rv.distance_y + op->arch->clone.y; 3199 dy = rv.distance_y + op->arch->y;
3630 3200
3631 /* only the viewable area the player sees is updated by LOS 3201 /* only the viewable area the player sees is updated by LOS
3632 * code, so we need to restrict ourselves to that range of values 3202 * code, so we need to restrict ourselves to that range of values
3633 * for any meaningful values. 3203 * for any meaningful values.
3634 */ 3204 */
3635 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3636 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3637 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3207 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3638 return 1; 3208 return 1;
3209
3639 op = op->more; 3210 op = op->more;
3640 } 3211 }
3212
3641 return 0; 3213 return 0;
3642} 3214}
3643 3215
3644/* routine for both players and monsters. We call this when 3216/* routine for both players and monsters. We call this when
3645 * there is a possibility for our action distrubing our hiding 3217 * there is a possibility for our action distrubing our hiding
… …
3648 * return 0. 3220 * return 0.
3649 */ 3221 */
3650int 3222int
3651action_makes_visible (object *op) 3223action_makes_visible (object *op)
3652{ 3224{
3653
3654 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3655 { 3226 {
3656 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3657 return 0; 3228 return 0;
3658 3229
… …
3664 { 3235 {
3665 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3236 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3666 return 1; 3237 return 1;
3667 } 3238 }
3668 } 3239 }
3240
3669 return 0; 3241 return 0;
3670} 3242}
3671 3243
3672/* op_on_battleground - checks if the given object op (usually 3244/* op_on_battleground - checks if the given object op (usually
3673 * a player) is standing on a valid battleground-tile, 3245 * a player) is standing on a valid battleground-tile,
… …
3678 * Default is to do the same as before, so only people wanting to have different points need worry about this 3250 * Default is to do the same as before, so only people wanting to have different points need worry about this
3679 */ 3251 */
3680int 3252int
3681op_on_battleground (object *op, int *x, int *y) 3253op_on_battleground (object *op, int *x, int *y)
3682{ 3254{
3683 object *tmp;
3684
3685 /* A battleground-tile needs the following attributes to be valid: 3255 /* A battleground-tile needs the following attributes to be valid:
3686 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3256 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3687 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3257 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3688 * and the exit-coordinates sp/hp must both be > 0. 3258 * and the exit-coordinates sp/hp must both be > 0.
3689 * => The intention here is to prevent abuse of the battleground- 3259 * => The intention here is to prevent abuse of the battleground-
3690 * feature (like pickable or hidden battleground tiles). */ 3260 * feature (like pickable or hidden battleground tiles). */
3691 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3261 for (object *tmp = op->below; tmp; tmp = tmp->below)
3692 { 3262 {
3693 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3263 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3694 { 3264 {
3695 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3265 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3696 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3266 && tmp->type == BATTLEGROUND
3267 && tmp->name == shstr_battleground
3268 && EXIT_X (tmp) && EXIT_Y (tmp))
3697 { 3269 {
3698 /*before we assign the exit, check if this is a teambattle */ 3270 /* before we assign the exit, check if this is a teambattle */
3699 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3271 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3700 { 3272 {
3701 object *invtmp;
3702
3703 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3704 { 3274 {
3705 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3706 { 3276 {
3707 if (x != NULL && y != NULL) 3277 if (x && y)
3708 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279
3709 return 1; 3280 return 1;
3710 } 3281 }
3711 } 3282 }
3712 } 3283 }
3284
3713 if (x != NULL && y != NULL) 3285 if (x && y)
3714 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287
3715 return 1; 3288 return 1;
3716 } 3289 }
3717 } 3290 }
3718 } 3291 }
3292
3719 /* If we got here, did not find a battleground */ 3293 /* If we got here, did not find a battleground */
3720 return 0; 3294 return 0;
3721} 3295}
3722 3296
3723/* 3297/*
… …
3739 char buf[MAX_BUF]; /* tmp. string buffer */ 3313 char buf[MAX_BUF]; /* tmp. string buffer */
3740 int i = 0, j = 0; 3314 int i = 0, j = 0;
3741 3315
3742 /* get the appropriate treasurelist */ 3316 /* get the appropriate treasurelist */
3743 if (atnr == ATNR_FIRE) 3317 if (atnr == ATNR_FIRE)
3744 trlist = find_treasurelist ("dragon_ability_fire"); 3318 trlist = treasurelist::find (shstr_dragon_ability_fire);
3745 else if (atnr == ATNR_COLD) 3319 else if (atnr == ATNR_COLD)
3746 trlist = find_treasurelist ("dragon_ability_cold"); 3320 trlist = treasurelist::find (shstr_dragon_ability_cold);
3747 else if (atnr == ATNR_ELECTRICITY) 3321 else if (atnr == ATNR_ELECTRICITY)
3748 trlist = find_treasurelist ("dragon_ability_elec"); 3322 trlist = treasurelist::find (shstr_dragon_ability_elec);
3749 else if (atnr == ATNR_POISON) 3323 else if (atnr == ATNR_POISON)
3750 trlist = find_treasurelist ("dragon_ability_poison"); 3324 trlist = treasurelist::find (shstr_dragon_ability_poison);
3751 3325
3752 if (trlist == NULL || who->type != PLAYER) 3326 if (trlist == NULL || who->type != PLAYER)
3753 return; 3327 return;
3754 3328
3755 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3329 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3756 3330
3757 if (tr == NULL || tr->item == NULL) 3331 if (!tr || !tr->item)
3758 { 3332 {
3759 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3333 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3760 return; 3334 return;
3761 } 3335 }
3762 3336
3763 /* everything seems okay - now bring on the gift: */ 3337 /* everything seems okay - now bring on the gift: */
3764 item = &(tr->item->clone); 3338 item = tr->item;
3765 3339
3766 if (item->type == SPELL) 3340 if (item->type == SPELL)
3767 { 3341 {
3768 if (check_spell_known (who, item->name)) 3342 if (check_spell_known (who, item->name))
3769 return; 3343 return;
… …
3828 { 3402 {
3829 /* forces in the treasurelist can alter the player's stats */ 3403 /* forces in the treasurelist can alter the player's stats */
3830 object *skin; 3404 object *skin;
3831 3405
3832 /* first get the dragon skin force */ 3406 /* first get the dragon skin force */
3833 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3407 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3408 ;
3409
3834 if (skin == NULL) 3410 if (!skin)
3835 return; 3411 return;
3836 3412
3837 /* adding new spellpath attunements */ 3413 /* adding new spellpath attunements */
3838 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3414 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3839 { 3415 {
… …
3884 * not readied. 3460 * not readied.
3885 */ 3461 */
3886void 3462void
3887player_unready_range_ob (player *pl, object *ob) 3463player_unready_range_ob (player *pl, object *ob)
3888{ 3464{
3889 rangetype i; 3465 if (pl->ob->current_weapon == ob)
3466 pl->ob->current_weapon = 0;
3890 3467
3891 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3468 if (pl->combat_ob == ob)
3892 { 3469 pl->combat_ob = 0;
3470
3893 if (pl->ranges[i] == ob) 3471 if (pl->ranged_ob == ob)
3894 { 3472 pl->ranged_ob = 0;
3895 pl->ranges[i] = NULL;
3896 if (pl->shoottype == i)
3897 {
3898 pl->shoottype = range_none;
3899 }
3900 }
3901 }
3902} 3473}
3474
3475sint8
3476player::visibility_at (maptile *map, int x, int y) const
3477{
3478 if (!ns)
3479 return 0;
3480
3481 int dx, dy;
3482 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3483 return 0;
3484
3485 x += dx - ns->current_x + ns->mapx / 2;
3486 y += dy - ns->current_y + ns->mapy / 2;
3487
3488 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3489 return 0;
3490
3491 return 100 - blocked_los [x][y];
3492}
3493
3494void
3495player::infobox (const char *title, const char *msg, int color)
3496{
3497 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3498}
3499
3500void
3501player::statusmsg (const char *msg, int color)
3502{
3503 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3504}
3505
3506void
3507player::failmsg (const char *msg, int color)
3508{
3509 play_sound (sound_find ("generic_failure"));
3510 statusmsg (msg, color);
3511}
3512

Diff Legend

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