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

Diff Legend

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