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

Diff Legend

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