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

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

Diff Legend

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