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

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

Diff Legend

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