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.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.273 by root, Sun Apr 18 05:54:18 2010 UTC

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

Diff Legend

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