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.25 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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

Diff Legend

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