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