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

Diff Legend

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