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.56 by root, Sat Dec 23 05:25:18 2006 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 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#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec players;
37find_player (const char *plname)
38{
39 player *pl;
40
41 for (pl = first_player; pl; pl = pl->next)
42 if (pl->ob && !strcmp (query_name (pl->ob), plname))
43 return pl;
44
45 return 0;
46}
47 36
48void 37void
49display_motd (const object *op) 38display_motd (const object *op)
50{ 39{
51 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
125 114
126 news[0] = '\0'; 115 news[0] = '\0';
127 subject[0] = '\0'; 116 subject[0] = '\0';
128 size = 0; 117 size = 0;
129 118
130 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
131 { 120 {
132 if (*buf == '#') 121 if (*buf == '#')
133 continue; 122 continue;
134 123
135 if (*buf == '%') 124 if (*buf == '%')
136 { /* send one news */ 125 { /* send one news */
137 if (size > 0) 126 if (size > 0)
138 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
139 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
140 strip_endline (subject); 130 strip_endline (subject);
141 size = 0; 131 size = 0;
142 news[0] = '\0'; 132 news[0] = '\0';
143 } 133 }
… …
152 size += strlen (buf); 142 size += strlen (buf);
153 } 143 }
154 } 144 }
155 145
156 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
157 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);
158 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
159} 149}
160 150
161/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
162static void 152static void
163set_first_map (object *op) 153set_first_map (object *op)
164{ 154{
165 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
166 op->x = -1; 156 op->x = -1;
167 op->y = -1; 157 op->y = -1;
168 enter_exit (op, 0); 158}
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);
169} 195}
170 196
171// connect the player with a specific client 197// connect the player with a specific client
172// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
173void 199void
174player::connect (client *ns) 200player::connect (client *ns)
175{ 201{
176 this->ns = ns; 202 this->ns = ns;
177 ns->pl = this; 203 ns->pl = this;
178 204
179 next = first_player; 205 run_on = 0;
180 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
181 208
182 ns->update_look = 0; 209 ns->update_look = 0;
183 ns->look_position = 0; 210 ns->look_position = 0;
184 211
185 clear_los (ob); 212 clear_los (this);
186 213
214 ns->reset_stats ();
215
216 /* make sure he's a player -- needed because of class change. */
187 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
188 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
189 219
190 if (!legal_range (ob, shoottype)) 220 ob->update_weight ();
191 shoottype = range_none;
192
193 ob->carrying = sum_weight (ob);
194 link_player_skills (ob); 221 link_player_skills (ob);
195 222
196 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
197 ob->update_stats ();
198 update_ob_speed (ob);
199 224
200 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
201
202 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
203 * from the class, and not race. I don't see any way to get the class information
204 * to then update this. I don't think this will actually break anything - anyone
205 * that can use armour should be able to use a shield. What this may 'break'
206 * are features new characters get, eg, if someone starts up with a Q, they
207 * should be able to use a shield. However, old Q's won't get that advantage.
208 */
209 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
210 SET_FLAG (ob, FLAG_USE_SHIELD);
211 226
212 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
213 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
214 { 229 {
215 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
216 231
217 shstr_cmp dragon_ability_force ("dragon_ability_force");
218 shstr_cmp dragon_skin_force ("dragon_skin_force");
219
220 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
221 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
222 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
223 abil = tmp; 235 abil = tmp;
224 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
225 skin = tmp; 237 skin = tmp;
226 238
227 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
228 } 240 }
229 241
230 CLEAR_FLAG (ob, FLAG_FRIENDLY);
231 add_friendly_object (ob);
232
233 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
234
235 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
236 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name); 243
244 esrv_new_player (this, ob->weight + ob->carrying);
245
246 ob->update_stats ();
237 247
238 ns->floorbox_update (); 248 ns->floorbox_update ();
239
240 esrv_new_player (this, ob->weight + ob->carrying);
241 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
242 esrv_add_spells (this, 0); 250 esrv_add_spells (this, 0);
243 251
244 enter_exit (ob, 0); 252 activate ();
245 253
246// send_rules (ob);//TODO 254 send_rules (ob);
247// send_news (ob);//TODO 255 send_news (ob);
248// display_motd (ob);//TODO 256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
249 INVOKE_PLAYER (LOGIN, 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 ();
250} 286}
251 287
252// the need for this function can be explained 288// the need for this function can be explained
253// by load_object not returning the object 289// by load_object not returning the object
254void 290void
255player::set_object (object *op) 291player::set_object (object *op)
256{ 292{
257 ob = op; 293 ob = observe = op;
258 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
259 295
296 ob->speed = 1.0f;
260 ob->speed_left = 0.5; 297 ob->speed_left = 0.5f;
261 ob->speed = 1.0; 298
262 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
263 ob->stats.wc = 2;
264 ob->run_away = 25; /* Then we panick... */
265 300
266 set_first_map (ob); 301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
267 304
268 ob->roll_stats (); 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 ob->deactivate (); // change_Weapon activates, fix this better
327}
328
329void
330player::set_observe (object *op)
331{
332 observe = op ? op : ob;
333 do_los = 1;
269} 334}
270 335
271player::player () 336player::player ()
272{ 337{
273 /* There are some elements we want initialized to non zero value - 338 /* There are some elements we want initialised to non zero value -
274 * we deal with that below this point. 339 * we deal with that below this point.
275 */ 340 */
276 outputs_sync = 16; /* Every 2 seconds */ 341 outputs_sync = 4;
277 outputs_count = 8; /* Keeps present behaviour */ 342 outputs_count = 4;
278 unapply = unapply_nochoice; 343 unapply = unapply_nochoice;
279 344
280 assign (savebed_map, first_map_path); /* Init. respawn position */ 345 savebed_map = first_map_path; /* Init. respawn position */
281 346
282 gen_sp_armour = 10; 347 gen_sp_armour = 10;
283 last_speed = -1;
284 shoottype = range_none;
285 bowtype = bow_normal; 348 bowtype = bow_normal;
286 petmode = pet_normal; 349 petmode = pet_normal;
287 listening = 10; 350 listening = 10;
288 usekeys = containers; 351 usekeys = containers;
289 last_weapon_sp = -1;
290 peaceful = 1; /* default peaceful */ 352 peaceful = 1; /* default peaceful */
291 do_los = 1; 353 do_los = 1;
292 354
293 /* we need to clear these to -1 and not zero - otherwise, 355 weapon_sp = 1.0f;
294 * if a player quits and starts a new character, we wont 356 weapon_sp_left = 0.5f;
295 * send new values to the client, as things like exp start 357}
296 * at zero.
297 */
298 for (int i = 0; i < NUM_SKILLS; i++)
299 last_skill_exp[i] = -1;
300 358
301 for (int i = 0; i < NROFATTACKS; i++) 359void
302 last_resist[i] = -1; 360player::do_destroy ()
361{
362 disconnect ();
303 363
304 last_stats.exp = -1; 364 attachable::do_destroy ();
305 last_weight = (uint32) - 1; 365
366 if (ob)
367 {
368 ob->destroy_inv (false);
369 ob->destroy ();
370 }
371
372 ob = observe = 0;
306} 373}
307 374
308player::~player () 375player::~player ()
309{ 376{
310 terminate_all_pets (ob);
311
312 if (first_player != this)
313 {
314 player *prev = first_player;
315
316 while (prev && prev->next && prev->next != this)
317 prev = prev->next;
318
319 if (prev->next != this)
320 {
321 LOG (llevError, "Free_player: Can't find previous player.\n");
322 abort ();
323 }
324
325 prev->next = next;
326 }
327 else
328 first_player = next;
329
330 if (ob)
331 {
332 ob->contr = 0;
333 ob->destroy (1);
334 }
335
336 if (ns)
337 {
338 ns->send_packet ("goodbye");
339 ns->flush ();
340 ns->pl = 0;
341 ns->destroy ();
342 }
343
344 /* Clear item stack */ 377 /* Clear item stack */
345 free (stack_items); 378 free (stack_items);
346} 379}
347 380
348/* Tries to add player on the connection passed in ns. 381/* Tries to add player on the connection passed in ns.
… …
353player::create () 386player::create ()
354{ 387{
355 player *pl = new player; 388 player *pl = new player;
356 389
357 pl->set_object (arch_to_object (get_player_archetype (0))); 390 pl->set_object (arch_to_object (get_player_archetype (0)));
391
392 pl->ob->roll_stats ();
393 pl->ob->stats.wc = 2;
394 pl->ob->run_away = 25; /* Then we panick... */
395
396 set_first_map (pl->ob);
358 397
359 return pl; 398 return pl;
360} 399}
361 400
362/* 401/*
… …
365 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
366 */ 405 */
367archetype * 406archetype *
368get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
369{ 408{
370 archetype *start = at; 409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
415 archvec::iterator i = archetypes.find (nat);
371 416
372 for (;;) 417 for (;;)
373 { 418 {
374 if (at == NULL || at->next == NULL) 419 if (++i == archetypes.end ())
375 at = first_archetype; 420 i = archetypes.begin ();
376 else 421 else if (*i == at)
377 at = at->next; 422 cleanup ("not a single player archetype found");
378 423
379 if (at->clone.type == PLAYER) 424 if ((*i)->type == PLAYER)
380 return at; 425 return *i;
381
382 if (at == start)
383 {
384 LOG (llevError, "No Player archetypes\n");
385 exit (-1);
386 }
387 } 426 }
388} 427}
389 428
390object * 429object *
391get_nearest_player (object *mon) 430get_nearest_player (object *mon)
392{ 431{
393 object *op = NULL; 432 object *op = NULL;
394 player *pl = NULL;
395 objectlink *ol; 433 objectlink *ol;
396 unsigned lastdist; 434 unsigned lastdist;
397 rv_vector rv; 435 rv_vector rv;
398 436
399 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
400 { 438 {
401 /* We should not find free objects on this friendly list, but it
402 * does periodically happen. Given that, lets deal with it.
403 * While unlikely, it is possible the next object on the friendly
404 * list is also free, so encapsulate this in a while loop.
405 */
406 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
407 {
408 object *tmp = ol->ob;
409
410 /* Can't do much more other than log the fact, because the object
411 * itself will have been cleared.
412 */
413 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
414 ol = ol->next;
415 remove_friendly_object (tmp);
416 if (!ol)
417 return op;
418 }
419
420 /* Remove special check for player from this. First, it looks to cause
421 * some crashes (ol->ob->contr not set properly?), but secondly, a more
422 * complicated method of state checking would be needed in any case -
423 * as it was, a clever player could type quit, and the function would
424 * skip them over while waiting for confirmation. Remove
425 * on_same_map check, as can_detect_enemy also does this
426 */
427 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
428 continue; 440 continue;
429 441
430 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
431 { 443 {
432 op = ol->ob; 444 op = ol->ob;
433 lastdist = rv.distance; 445 lastdist = rv.distance;
434 } 446 }
435 } 447 }
436 for (pl = first_player; pl != NULL; pl = pl->next) 448
437 { 449 for_all_players (pl)
438 if (can_detect_enemy (mon, pl->ob, &rv)) 450 if (can_detect_enemy (mon, pl->ob, &rv))
439 {
440
441 if (lastdist > rv.distance) 451 if (lastdist > rv.distance)
442 { 452 {
443 op = pl->ob; 453 op = pl->ob;
444 lastdist = rv.distance; 454 lastdist = rv.distance;
445 } 455 }
446 } 456
447 }
448#if 0 457#if 0
449 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 458 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
450#endif 459#endif
451 return op; 460 return op;
452} 461}
… …
510 x = mon->x; 519 x = mon->x;
511 y = mon->y; 520 y = mon->y;
512 m = mon->map; 521 m = mon->map;
513 dir = rv.direction; 522 dir = rv.direction;
514 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 523 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
515 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 524 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
525
516 /* If we can't solve it within the search distance, return now. */ 526 /* If we can't solve it within the search distance, return now. */
517 if (diff > max) 527 if (diff > max)
518 return 0; 528 return 0;
529
519 while (diff > 1 && max > 0) 530 while (diff > 1 && max > 0)
520 { 531 {
521 lastx = x; 532 lastx = x;
522 lasty = y; 533 lasty = y;
523 lastmap = m; 534 lastmap = m;
… …
605 max--; 616 max--;
606 lastdir = dir; 617 lastdir = dir;
607 if (!firstdir) 618 if (!firstdir)
608 firstdir = dir; 619 firstdir = dir;
609 } 620 }
621
610 if (diff <= 1) 622 if (diff <= 1)
611 { 623 {
612 /* Recalculate diff (distance) because we may not have actually 624 /* Recalculate diff (distance) because we may not have actually
613 * headed toward player for entire distance. 625 * headed toward player for entire distance.
614 */ 626 */
615 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 627 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
616 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 628 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
617 } 629 }
630
618 if (diff > max) 631 if (diff > max)
619 return 0; 632 return 0;
620 } 633 }
634
621 /* If we reached the max, didn't find a direction in time */ 635 /* If we reached the max, didn't find a direction in time */
622 if (!max) 636 if (!max)
623 return 0; 637 return 0;
624 638
625 return firstdir; 639 return firstdir;
626} 640}
627 641
628void 642void
629give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
630{ 644{
631 object *op, *next = NULL;
632
633 if (pl->randomitems != NULL) 645 if (pl->randomitems)
634 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
635 647
636 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
637 { 649 {
638 next = op->below; 650 next = op->below;
639 651
640 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
641 * flag "neutral" set. Sorry but I can't think of a better way 653 * flag "neutral" set. Sorry but I can't think of a better way
… …
646 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
647 * by this player due to race restrictions 659 * by this player due to race restrictions
648 */ 660 */
649 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
650 { 662 {
651 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
652 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
653 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
654 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
655 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
656 { 670 {
657 op->destroy (); 671 op->destroy ();
658 continue; 672 continue;
659 } 673 }
660 } 674 }
… …
683 if (op->nrof > 1) 697 if (op->nrof > 1)
684 op->nrof = 1; 698 op->nrof = 1;
685 } 699 }
686 700
687 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
688 {
689 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
690 }
691 703
692 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
693 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
694 * merged properly. 706 * merged properly.
695 */ 707 */
696 if (need_identify (op)) 708 if (need_identify (op))
697 { 709 {
698 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
699 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
700 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
701 } 713 }
714
702 if (op->type == SPELL) 715 if (op->type == SPELL)
703 { 716 {
704 op->destroy (); 717 op->destroy ();
705 continue; 718 continue;
706 } 719 }
… …
708 { 721 {
709 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
710 op->stats.exp = 0; 723 op->stats.exp = 0;
711 op->level = 1; 724 op->level = 1;
712 } 725 }
713 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
714 else
715 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
716 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
717 729
718 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
719 link_player_skills (pl); 731 link_player_skills (pl);
… …
739roll_stat (void) 751roll_stat (void)
740{ 752{
741 int a[4], i, j, k; 753 int a[4], i, j, k;
742 754
743 for (i = 0; i < 4; i++) 755 for (i = 0; i < 4; i++)
744 a[i] = (int) RANDOM () % 6 + 1; 756 a[i] = (int) rndm (6) + 1;
745 757
746 for (i = 0, j = 0, k = 7; i < 4; i++) 758 for (i = 0, j = 0, k = 7; i < 4; i++)
747 if (a[i] < k) 759 if (a[i] < k)
748 k = a[i], j = i; 760 k = a[i], j = i;
749 761
… …
755} 767}
756 768
757void 769void
758object::roll_stats () 770object::roll_stats ()
759{ 771{
760 int statsort [7]; 772 int statsort [NUM_STATS];
761 773
762 for (;;) 774 for (;;)
763 { 775 {
764 int sum = 0; 776 int sum = 0;
765 for (int i = 7; i--; ) 777 for (int i = NUM_STATS; i--; )
766 sum += statsort [i] = roll_stat (); 778 sum += statsort [i] = roll_stat ();
767 779
768 if (sum >= 82 && sum <= 116) 780 if (sum >= 82 && sum <= 116)
769 break; 781 break;
770 } 782 }
771 783
772 // Sort the stats so that rerolling is easier... 784 // Sort the stats so that rerolling is easier...
773 std::sort (statsort, statsort + 7, std::greater<int>()); 785 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
774 786
787 for (int i = 0; i < NUM_STATS; ++i)
775 stats.Str = statsort[0]; 788 stats.stat (i) = statsort [i];
776 stats.Dex = statsort[1];
777 stats.Con = statsort[2];
778 stats.Int = statsort[3];
779 stats.Wis = statsort[4];
780 stats.Pow = statsort[5];
781 stats.Cha = statsort[6];
782 789
783 stats.exp = 0; 790 stats.exp = 0;
784 stats.ac = 0; 791 stats.ac = 0;
785 792
786 stats.hp = stats.maxhp; 793 stats.hp = stats.maxhp;
… …
798} 805}
799 806
800void 807void
801object::swap_stats (int a, int b) 808object::swap_stats (int a, int b)
802{ 809{
803 int tmp = get_attr_value (&contr->orig_stats, a); 810 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
804 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
805 set_attr_value (&contr->orig_stats, b, tmp);
806 811
812 for (int i = 0; i < NUM_STATS; ++i)
807 stats.Str = contr->orig_stats.Str; 813 stats.stat (i) = contr->orig_stats.stat (i);
808 stats.Dex = contr->orig_stats.Dex;
809 stats.Con = contr->orig_stats.Con;
810 stats.Int = contr->orig_stats.Int;
811 stats.Wis = contr->orig_stats.Wis;
812 stats.Pow = contr->orig_stats.Pow;
813 stats.Cha = contr->orig_stats.Cha;
814 814
815 //TODO: the following code looks so borked and should, at the very least, 815 //TODO: the following code looks so borked and should, at the very least,
816 // be merged with the similar code in roll_stats 816 // be merged with the similar code in roll_stats
817 stats.ac = 0; 817 stats.ac = 0;
818 818
… …
830 contr->levsp[1] = 6; 830 contr->levsp[1] = 6;
831 contr->levgrace[1] = 3; 831 contr->levgrace[1] = 3;
832 832
833 contr->orig_stats = stats; 833 contr->orig_stats = stats;
834 } 834 }
835}
836
837static void
838start_info (object *op)
839{
840 char buf[MAX_BUF];
841
842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
843 new_draw_info (NDI_UNIQUE, 0, op, buf);
835} 844}
836 845
837/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
838 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
839 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
840 * separate race and class; this actually changes the RACE, 849 * separate race and class; this actually changes the RACE,
841 * not the class. 850 * not the class.
842 */ 851 */
843int 852void
844key_change_class (object *op, char key) 853player::chargen_race_done ()
845{ 854{
846 int tmp_loop;
847
848 if (key == 'd' || key == 'D')
849 {
850 char buf[MAX_BUF];
851
852 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
853 esrv_new_player (op->contr, op->weight + op->carrying); 856 esrv_new_player (ob->contr, ob->weight + ob->carrying);
854 857
855 treasurelist *tl = find_treasurelist ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
856 if (tl) 859 if (tl)
857 create_treasure (tl, op, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
858 861
859 INVOKE_PLAYER (BIRTH, op->contr); 862 INVOKE_PLAYER (BIRTH, ob->contr);
860 INVOKE_PLAYER (LOGIN, op->contr); 863 INVOKE_PLAYER (LOGIN, ob->contr);
861 864
862 op->contr->ns->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
863 866
864 if (op->msg) 867 if (ob->msg)
865 op->msg = NULL; 868 ob->msg = 0;
866 869
867 /* We create this now because some of the unique maps will need it 870 /* We create this now because some of the unique maps will need it
868 * to save here. 871 * to save here.
869 */ 872 */
873 {
874 char buf[MAX_BUF];
870 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 875 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
871 make_path_to_file (buf); 876 make_path_to_file (buf);
877 }
872 878
873#ifdef AUTOSAVE
874 op->contr->last_save_tick = pticks;
875#endif
876 start_info (op); 879 start_info (ob);
877 CLEAR_FLAG (op, FLAG_WIZ); 880 CLEAR_FLAG (ob, FLAG_WIZ);
878 give_initial_items (op, op->randomitems); 881 give_initial_items (ob, ob->randomitems);
879 link_player_skills (op); 882 link_player_skills (ob);
880 esrv_send_inventory (op, op); 883 esrv_send_inventory (ob, ob);
881 op->update_stats (); 884 ob->update_stats ();
882 885
883 /* This moves the player to a different start map, if there 886 /* This moves the player to a different start map, if there
884 * is one for this race 887 * is one for this race
885 */ 888 */
886 if (*first_map_ext_path) 889 if (*first_map_ext_path)
887 { 890 {
888 object *tmp; 891 object *tmp;
889 char mapname[MAX_BUF]; 892 char mapname[MAX_BUF];
890 893
891 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 894 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
892 tmp = object::create (); 895 tmp = object::create ();
893 EXIT_PATH (tmp) = mapname; 896 EXIT_PATH (tmp) = mapname;
894 EXIT_X (tmp) = op->x; 897 EXIT_X (tmp) = ob->x;
895 EXIT_Y (tmp) = op->y; 898 EXIT_Y (tmp) = ob->y;
896 enter_exit (op, tmp); /* we don't really care if it succeeded; 899 ob->enter_exit (tmp); /* we don't really care if it succeeded;
897 * if the map isn't there, then stay on the 900 * if the map isn't there, then stay on the
898 * default initial map */ 901 * default initial map */
899 tmp->destroy (); 902 tmp->destroy ();
900 } 903 }
901 else 904 else
902 LOG (llevDebug, "first_map_ext_path not set\n"); 905 LOG (llevDebug, "first_map_ext_path not set\n");
906}
903 907
904 return 0; 908void
905 } 909player::chargen_race_next ()
906 910{
907 /* Following actually changes the race - this is the default command 911 /* Following actually changes the race - this is the default command
908 * if we don't match with one of the options above. 912 * if we don't match with one of the options above.
909 */ 913 */
910 914
911 tmp_loop = 0; 915 do
912 while (!tmp_loop)
913 { 916 {
914 shstr name = op->name; 917 shstr name = ob->name;
915 int x = op->x, y = op->y; 918 int x = ob->x, y = ob->y;
916 919
917 op->remove_statbonus (); 920 ob->remove_statbonus ();
918 op->remove (); 921 ob->remove ();
919 op->arch = get_player_archetype (op->arch); 922 ob->arch = get_player_archetype (ob->arch);
920 op->arch->clone.copy_to (op); 923 ob->arch->copy_to (ob);
921 op->instantiate (); 924 ob->instantiate ();
922 op->stats = op->contr->orig_stats; 925 ob->stats = ob->contr->orig_stats;
923 op->name = op->name_pl = name; 926 ob->name = ob->name_pl = name;
924 op->x = x; 927 ob->x = x;
925 op->y = y; 928 ob->y = y;
926 SET_ANIMATION (op, 2); /* So player faces south */ 929 SET_ANIMATION (ob, 2); /* So player faces south */
927 insert_ob_in_map (op, op->map, op, 0); 930 insert_ob_in_map (ob, ob->map, ob, 0);
928 assign (op->contr->title, op->arch->clone.name); 931 assign (ob->contr->title, ob->arch->object::name);
929 op->add_statbonus (); 932 ob->add_statbonus ();
930 tmp_loop = allowed_class (op);
931 } 933 }
934 while (!allowed_class (ob));
932 935
933 update_object (op, UP_OBJ_FACE); 936 update_object (ob, UP_OBJ_FACE);
934 esrv_update_item (UPD_FACE, op, op); 937 esrv_update_item (UPD_FACE, ob, ob);
935 op->update_stats (); 938 ob->update_stats ();
936 op->stats.hp = op->stats.maxhp; 939 ob->stats.hp = ob->stats.maxhp;
937 op->stats.sp = op->stats.maxsp; 940 ob->stats.sp = ob->stats.maxsp;
938 op->stats.grace = 0; 941 ob->stats.grace = 0;
939
940 if (op->msg)
941 new_draw_info (NDI_BLUE, 0, op, op->msg);
942
943 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
944 return 0;
945}
946
947int
948key_confirm_quit (object *op, char key)
949{
950 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
951 {
952 op->contr->ns->state = ST_PLAYING;
953 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
954 return 1;
955 }
956
957 INVOKE_PLAYER (LOGOUT, op->contr);
958 INVOKE_PLAYER (QUIT, op->contr);
959
960 terminate_all_pets (op);
961 leave_map (op);
962 op->direction = 0;
963 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
964
965 strcpy (op->contr->killer, "quit");
966 check_score (op);
967 op->contr->party = 0;
968 op->contr->own_title[0] = '\0';
969
970 object_ptr ob = op;
971
972 delete ob->contr;
973
974 /* We need to hunt for any per player unique maps in memory and
975 * get rid of them. The trailing slash in the path is intentional,
976 * so that players named 'Ab' won't match against players 'Abe' pathname
977 */
978 char buf[MAX_BUF];
979 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
980
981 for (maptile *next, *mp = first_map; mp; mp = next)
982 {
983 next = mp->next;
984
985 if (!strncmp (mp->path, buf, strlen (buf)))
986 delete_map (mp);
987 }
988
989 delete_character (ob->name, 1);
990
991 return 1;
992} 942}
993 943
994void 944void
995flee_player (object *op) 945flee_player (object *op)
996{ 946{
… …
1043 /* Cornered, get rid of scared */ 993 /* Cornered, get rid of scared */
1044 CLEAR_FLAG (op, FLAG_SCARED); 994 CLEAR_FLAG (op, FLAG_SCARED);
1045 op->enemy = NULL; 995 op->enemy = NULL;
1046} 996}
1047 997
1048
1049/* check_pick sees if there is stuff to be picked up/picks up stuff. 998/* check_pick sees if there is stuff to be picked up/picks up stuff.
1050 * IT returns 1 if the player should keep on moving, 0 if he should 999 * It returns 1 if the player should keep on moving, 0 if he should
1051 * stop. 1000 * stop.
1052 */ 1001 */
1053int 1002int
1054check_pick (object *op) 1003check_pick (object *op)
1055{ 1004{
1056 object *tmp, *next; 1005 object *tmp, *next;
1057 int stop = 0; 1006 int stop = 0;
1058 int j, k, wvratio; 1007 int wvratio;
1059 char putstring[128], tmpstr[16]; 1008 char putstring[128];
1060 1009
1061 /* if you're flying, you cna't pick up anything */ 1010 /* if you're flying, you cna't pick up anything */
1062 if (op->move_type & MOVE_FLYING) 1011 if (op->move_type & MOVE_FLYING)
1063 return 1; 1012 return 1;
1064 1013
1065 next = op->below; 1014 next = op->below;
1066 1015
1016 int cnt = MAX_ITEM_PER_DROP;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018
1067 /* loop while there are items on the floor that are not marked as 1019 /* loop while there are items on the floor that are not marked as
1068 * destroyed */ 1020 * destroyed */
1069 while (next && !next->destroyed ()) 1021 while (next && !next->destroyed ())
1070 { 1022 {
1071 tmp = next; 1023 tmp = next;
1072 next = tmp->below; 1024 next = tmp->below;
1073 1025
1026 if (cnt <= 0)
1027 {
1028 op->failmsg ("Couldn't pickup all items at once.");
1029 return 0;
1030 }
1031
1074 if (op->destroyed ()) 1032 if (op->destroyed ())
1075 return 0; 1033 return 0;
1076 1034
1077 if (!can_pick (op, tmp)) 1035 if (!can_pick (op, tmp))
1078 continue; 1036 continue;
1079 1037
1080 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1081 { 1039 {
1082 if (item_matched_string (op, tmp, op->contr->search_str)) 1040 if (item_matched_string (op, tmp, op->contr->search_str))
1083 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1084 continue; 1042 continue;
1085 } 1043 }
1086 1044
1087 /* high not bit set? We're using the old autopickup model */ 1045 /* high not bit set? We're using the old autopickup model */
1088 if (!(op->contr->mode & PU_NEWMODE)) 1046 if (!(op->contr->mode & PU_NEWMODE))
… …
1090 switch (op->contr->mode) 1048 switch (op->contr->mode)
1091 { 1049 {
1092 case 0: 1050 case 0:
1093 return 1; /* don't pick up */ 1051 return 1; /* don't pick up */
1094 case 1: 1052 case 1:
1095 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1096 return 1; 1054 return 1;
1097 case 2: 1055 case 2:
1098 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1099 return 0; 1057 return 0;
1100 case 3: 1058 case 3:
1101 return 0; /* stop before pickup */ 1059 return 0; /* stop before pickup */
1102 case 4: 1060 case 4:
1103 pick_up (op, tmp); 1061 CHK_PICK_PICKUP;
1104 break; 1062 break;
1105 case 5: 1063 case 5:
1106 pick_up (op, tmp); 1064 CHK_PICK_PICKUP;
1107 stop = 1; 1065 stop = 1;
1108 break; 1066 break;
1109 case 6: 1067 case 6:
1110 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1111 pick_up (op, tmp); 1069 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1070 CHK_PICK_PICKUP;
1112 break; 1071 break;
1113 1072
1114 case 7: 1073 case 7:
1115 if (tmp->type == MONEY || tmp->type == GEM) 1074 if (tmp->type == MONEY || tmp->type == GEM)
1116 pick_up (op, tmp); 1075 CHK_PICK_PICKUP;
1117 break; 1076 break;
1118 1077
1119 default: 1078 default:
1120 /* use value density */ 1079 /* use value density */
1121 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1080 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1122 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1081 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1123 pick_up (op, tmp); 1082 CHK_PICK_PICKUP;
1124 } 1083 }
1125 } 1084 }
1126 else 1085 else
1127 { /* old model */ 1086 { /* old model */
1128 /* NEW pickup handling */ 1087 /* NEW pickup handling */
… …
1132 if (tmp->name != NULL) 1091 if (tmp->name != NULL)
1133 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1092 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1134 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1093 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1135 else 1094 else
1136 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1095 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1137 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1096 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1097
1138 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1098 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1139
1140 sprintf (putstring, "...flags: ");
1141 for (k = 0; k < 4; k++)
1142 {
1143 for (j = 0; j < 32; j++)
1144 {
1145 if ((tmp->flags[k] >> j) & 0x01)
1146 {
1147 sprintf (tmpstr, "%d ", k * 32 + j);
1148 strcat (putstring, tmpstr);
1149 }
1150 }
1151 }
1152 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1153
1154#if 0
1155 /* print the flags too */
1156 for (k = 0; k < 4; k++)
1157 {
1158 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1159 for (j = 0; j < 32; j++)
1160 {
1161 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1162 if (!((j + 1) % 4))
1163 fprintf (stderr, " ");
1164 }
1165 fprintf (stderr, " [%d]\n", k * 32);
1166 }
1167#endif
1168 } 1099 }
1100
1169 /* philosophy: 1101 /* philosophy:
1170 * It's easy to grab an item type from a pile, as long as it's 1102 * It's easy to grab an item type from a pile, as long as it's
1171 * generic. This takes no game-time. For more detailed pickups 1103 * generic. This takes no game-time. For more detailed pickups
1172 * and selections, select-items shoul dbe used. This is a 1104 * and selections, select-items should be used. This is a
1173 * grab-as-you-run type mode that's really useful for arrows for 1105 * grab-as-you-run type mode that's really useful for arrows for
1174 * example. 1106 * example.
1175 * The drawback: right now it has no frontend, so you need to 1107 * The drawback: right now it has no frontend, so you need to
1176 * stick the bits you want into a calculator in hex mode and then 1108 * stick the bits you want into a calculator in hex mode and then
1177 * convert to decimal and then 'pickup <#> 1109 * convert to decimal and then 'pickup <#>
… …
1210 /* all food and drink if desired */ 1142 /* all food and drink if desired */
1211 /* question: don't pick up known-poisonous stuff? */ 1143 /* question: don't pick up known-poisonous stuff? */
1212 if (op->contr->mode & PU_FOOD) 1144 if (op->contr->mode & PU_FOOD)
1213 if (tmp->type == FOOD) 1145 if (tmp->type == FOOD)
1214 { 1146 {
1215 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1216 continue; 1148 continue;
1217 } 1149 }
1218 1150
1219 if (op->contr->mode & PU_DRINK) 1151 if (op->contr->mode & PU_DRINK)
1220 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1152 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1221 { 1153 {
1222 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1223 continue; 1155 continue;
1224 } 1156 }
1225 1157
1226 if (op->contr->mode & PU_POTION) 1158 if (op->contr->mode & PU_POTION)
1227 if (tmp->type == POTION) 1159 if (tmp->type == POTION)
1228 { 1160 {
1229 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1230 continue; 1162 continue;
1231 } 1163 }
1232 1164
1233 /* spellbooks, skillscrolls and normal books/scrolls */ 1165 /* spellbooks, skillscrolls and normal books/scrolls */
1234 if (op->contr->mode & PU_SPELLBOOK) 1166 if (op->contr->mode & PU_SPELLBOOK)
1235 if (tmp->type == SPELLBOOK) 1167 if (tmp->type == SPELLBOOK)
1236 { 1168 {
1237 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1238 continue; 1170 continue;
1239 } 1171 }
1240 1172
1241 if (op->contr->mode & PU_SKILLSCROLL) 1173 if (op->contr->mode & PU_SKILLSCROLL)
1242 if (tmp->type == SKILLSCROLL) 1174 if (tmp->type == SKILLSCROLL)
1243 { 1175 {
1244 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1245 continue; 1177 continue;
1246 } 1178 }
1247 1179
1248 if (op->contr->mode & PU_READABLES) 1180 if (op->contr->mode & PU_READABLES)
1249 if (tmp->type == BOOK || tmp->type == SCROLL) 1181 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1250 { 1182 {
1251 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1252 continue; 1184 continue;
1253 } 1185 }
1254 1186
1255 /* wands/staves/rods/horns */ 1187 /* wands/staves/rods/horns */
1256 if (op->contr->mode & PU_MAGIC_DEVICE) 1188 if (op->contr->mode & PU_MAGIC_DEVICE)
1257 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1189 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1258 { 1190 {
1259 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1260 continue; 1192 continue;
1261 } 1193 }
1262 1194
1263 /* pick up all magical items */ 1195 /* pick up all magical items */
1264 if (op->contr->mode & PU_MAGICAL) 1196 if (op->contr->mode & PU_MAGICAL)
1265 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1197 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1266 { 1198 {
1267 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1268 continue; 1200 continue;
1269 } 1201 }
1270 1202
1271 if (op->contr->mode & PU_VALUABLES) 1203 if (op->contr->mode & PU_VALUABLES)
1272 { 1204 {
1273 if (tmp->type == MONEY || tmp->type == GEM) 1205 if (tmp->type == MONEY || tmp->type == GEM)
1274 { 1206 {
1275 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1276 continue; 1208 continue;
1277 } 1209 }
1278 } 1210 }
1279 1211
1280 /* rings & amulets - talismans seems to be typed AMULET */ 1212 /* rings & amulets - talismans seems to be typed AMULET */
1281 if (op->contr->mode & PU_JEWELS) 1213 if (op->contr->mode & PU_JEWELS)
1282 if (tmp->type == RING || tmp->type == AMULET) 1214 if (tmp->type == RING || tmp->type == AMULET)
1283 { 1215 {
1284 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1285 continue; 1217 continue;
1286 } 1218 }
1287 1219
1288 /* we don't forget dragon food */ 1220 /* we don't forget dragon food */
1289 if (op->contr->mode & PU_FLESH) 1221 if (op->contr->mode & PU_FLESH)
1290 if (tmp->type == FLESH) 1222 if (tmp->type == FLESH)
1291 { 1223 {
1292 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1293 continue; 1225 continue;
1294 } 1226 }
1295 1227
1296 /* bows and arrows. Bows are good for selling! */ 1228 /* bows and arrows. Bows are good for selling! */
1297 if (op->contr->mode & PU_BOW) 1229 if (op->contr->mode & PU_BOW)
1298 if (tmp->type == BOW) 1230 if (tmp->type == BOW)
1299 { 1231 {
1300 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1301 continue; 1233 continue;
1302 } 1234 }
1303 1235
1304 if (op->contr->mode & PU_ARROW) 1236 if (op->contr->mode & PU_ARROW)
1305 if (tmp->type == ARROW) 1237 if (tmp->type == ARROW)
1306 { 1238 {
1307 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1308 continue; 1240 continue;
1309 } 1241 }
1310 1242
1311 /* all kinds of armor etc. */ 1243 /* all kinds of armor etc. */
1312 if (op->contr->mode & PU_ARMOUR) 1244 if (op->contr->mode & PU_ARMOUR)
1313 if (tmp->type == ARMOUR) 1245 if (tmp->type == ARMOUR)
1314 { 1246 {
1315 pick_up (op, tmp); 1247 CHK_PICK_PICKUP;
1316 continue; 1248 continue;
1317 } 1249 }
1318 1250
1319 if (op->contr->mode & PU_HELMET) 1251 if (op->contr->mode & PU_HELMET)
1320 if (tmp->type == HELMET) 1252 if (tmp->type == HELMET)
1321 { 1253 {
1322 pick_up (op, tmp); 1254 CHK_PICK_PICKUP;
1323 continue; 1255 continue;
1324 } 1256 }
1325 1257
1326 if (op->contr->mode & PU_SHIELD) 1258 if (op->contr->mode & PU_SHIELD)
1327 if (tmp->type == SHIELD) 1259 if (tmp->type == SHIELD)
1328 { 1260 {
1329 pick_up (op, tmp); 1261 CHK_PICK_PICKUP;
1330 continue; 1262 continue;
1331 } 1263 }
1332 1264
1333 if (op->contr->mode & PU_BOOTS) 1265 if (op->contr->mode & PU_BOOTS)
1334 if (tmp->type == BOOTS) 1266 if (tmp->type == BOOTS)
1335 { 1267 {
1336 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1337 continue; 1269 continue;
1338 } 1270 }
1339 1271
1340 if (op->contr->mode & PU_GLOVES) 1272 if (op->contr->mode & PU_GLOVES)
1341 if (tmp->type == GLOVES) 1273 if (tmp->type == GLOVES)
1342 { 1274 {
1343 pick_up (op, tmp); 1275 CHK_PICK_PICKUP;
1344 continue; 1276 continue;
1345 } 1277 }
1346 1278
1347 if (op->contr->mode & PU_CLOAK) 1279 if (op->contr->mode & PU_CLOAK)
1348 if (tmp->type == CLOAK) 1280 if (tmp->type == CLOAK)
1349 { 1281 {
1350 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1351 continue; 1283 continue;
1352 } 1284 }
1353 1285
1354 /* hoping to catch throwing daggers here */ 1286 /* hoping to catch throwing daggers here */
1355 if (op->contr->mode & PU_MISSILEWEAPON) 1287 if (op->contr->mode & PU_MISSILEWEAPON)
1356 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1288 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1357 { 1289 {
1358 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1359 continue; 1291 continue;
1360 } 1292 }
1361 1293
1362 /* careful: chairs and tables are weapons! */ 1294 /* careful: chairs and tables are weapons! */
1363 if (op->contr->mode & PU_ALLWEAPON) 1295 if (op->contr->mode & PU_ALLWEAPON)
1364 { 1296 {
1365 if (tmp->type == WEAPON && tmp->name != NULL) 1297 if (tmp->type == WEAPON && tmp->name != NULL)
1366 { 1298 {
1367 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1299 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1368 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1300 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1369 { 1301 {
1370 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1371 continue; 1303 continue;
1372 } 1304 }
1373 } 1305 }
1374 1306
1375 if (tmp->type == WEAPON && tmp->name == NULL) 1307 if (tmp->type == WEAPON && tmp->name == NULL)
1376 { 1308 {
1377 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1309 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1378 { 1310 {
1379 pick_up (op, tmp); 1311 CHK_PICK_PICKUP;
1380 continue; 1312 continue;
1381 } 1313 }
1382 } 1314 }
1383 } 1315 }
1384 1316
1385 /* misc stuff that's useful */ 1317 /* misc stuff that's useful */
1386 if (op->contr->mode & PU_KEY) 1318 if (op->contr->mode & PU_KEY)
1387 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1319 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1388 { 1320 {
1389 pick_up (op, tmp); 1321 CHK_PICK_PICKUP;
1390 continue; 1322 continue;
1391 } 1323 }
1392 1324
1393 /* any of the last 4 bits set means we use the ratio for value 1325 /* any of the last 4 bits set means we use the ratio for value
1394 * pickups */ 1326 * pickups */
… …
1399 /* >=7 is the old standard setting. Now we take the last 4 bits 1331 /* >=7 is the old standard setting. Now we take the last 4 bits
1400 * and multiply them by 5, giving 0..15*5== 5..75 */ 1332 * and multiply them by 5, giving 0..15*5== 5..75 */
1401 wvratio = (op->contr->mode & PU_RATIO) * 5; 1333 wvratio = (op->contr->mode & PU_RATIO) * 5;
1402 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1334 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1403 { 1335 {
1404 pick_up (op, tmp); 1336 CHK_PICK_PICKUP;
1405#if 0 1337#if 0
1406 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1338 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1407 if (tmp->name != NULL) 1339 if (tmp->name != NULL)
1408 { 1340 {
1409 fprintf (stderr, "%s", tmp->name); 1341 fprintf (stderr, "%s", tmp->name);
1410 } 1342 }
1411 else 1343 else
1412 fprintf (stderr, "%s", tmp->arch->name); 1344 fprintf (stderr, "%s", tmp->arch->archname);
1413 fprintf (stderr, ",%d] = ", tmp->type); 1345 fprintf (stderr, ",%d] = ", tmp->type);
1414 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1346 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1415#endif 1347#endif
1416 continue; 1348 continue;
1417 } 1349 }
… …
1428 * found object is returned. 1360 * found object is returned.
1429 */ 1361 */
1430object * 1362object *
1431find_arrow (object *op, const char *type) 1363find_arrow (object *op, const char *type)
1432{ 1364{
1433 object *tmp = NULL;
1434
1435 for (op = op->inv; op; op = op->below) 1365 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1436 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437 tmp = find_arrow (op, type);
1438 else if (op->type == ARROW && op->race == type) 1366 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1367 return splay (tmp);
1368
1369 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1370 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1371 if (object *arrow = find_arrow (tmp, type))
1372 {
1373 splay (tmp);
1439 return op; 1374 return arrow;
1375 }
1376
1440 return tmp; 1377 return 0;
1441} 1378}
1442 1379
1443/* 1380/*
1444 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1381 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1445 * against the target. A full test is not performed, simply a basic test 1382 * against the target. A full test is not performed, simply a basic test
1446 * of resistances. The archer is making a quick guess at what he sees down 1383 * of resistances. The archer is making a quick guess at what he sees down
1447 * the hall. Failing that it does it's best to pick the highest plus arrow. 1384 * the hall. Failing that it does it's best to pick the highest plus arrow.
1448 */ 1385 */
1449
1450object * 1386object *
1451find_better_arrow (object *op, object *target, const char *type, int *better) 1387find_better_arrow (object *op, object *target, const char *type, int *better)
1452{ 1388{
1453 object *tmp = NULL, *arrow, *ntmp; 1389 object *tmp = NULL, *arrow, *ntmp;
1454 int attacknum, attacktype, betterby = 0, i; 1390 int attacknum, attacktype, betterby = 0, i;
… …
1487 else 1423 else
1488 { 1424 {
1489 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1425 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1490 { 1426 {
1491 attacktype = 1 << attacknum; 1427 attacktype = 1 << attacknum;
1492 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1428 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1493 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1429 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1494 { 1430 {
1495 tmp = arrow; 1431 tmp = arrow;
1496 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1432 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1497 } 1433 }
1498 } 1434 }
1499 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1435 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1500 { 1436 {
1501 tmp = arrow; 1437 tmp = arrow;
… …
1520 * find_better_arrow to find a decent arrow to use. 1456 * find_better_arrow to find a decent arrow to use.
1521 * op = the shooter 1457 * op = the shooter
1522 * type = bow->race 1458 * type = bow->race
1523 * dir = fire direction 1459 * dir = fire direction
1524 */ 1460 */
1525
1526object * 1461object *
1527pick_arrow_target (object *op, const char *type, int dir) 1462pick_arrow_target (object *op, const char *type, int dir)
1528{ 1463{
1529 object *tmp = NULL; 1464 object *tmp = NULL;
1530 maptile *m; 1465 maptile *m;
… …
1595 */ 1530 */
1596int 1531int
1597fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1532fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598{ 1533{
1599 object *left, *bow; 1534 object *left, *bow;
1600 int bowspeed, mflags; 1535 int mflags;
1601 maptile *m; 1536 maptile *m;
1602 1537
1603 if (!dir) 1538 if (!dir)
1604 { 1539 {
1605 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1540 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606 return 0; 1541 return 0;
1607 } 1542 }
1608 1543
1609 if (op->type == PLAYER) 1544 if (op->contr)
1610 bow = op->contr->ranges[range_bow]; 1545 bow = op->current_weapon;
1611 else 1546 else
1612 { 1547 {
1613 for (bow = op->inv; bow; bow = bow->below) 1548 for (bow = op->inv; bow; bow = bow->below)
1614 /* Don't check for applied - monsters don't apply bows - in that way, they 1549 /* Don't check for applied - monsters don't apply bows - in that way, they
1615 * don't need to switch back and forth between bows and weapons. 1550 * don't need to switch back and forth between bows and weapons.
… …
1620 if (!bow) 1555 if (!bow)
1621 { 1556 {
1622 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1557 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623 return 0; 1558 return 0;
1624 } 1559 }
1560
1561 // optimisation: move object to top so we will find it quickly again
1562 if (bow->below)
1563 {
1564 bow->remove ();
1565 op->insert (bow);
1566 }
1567
1625 } 1568 }
1626 1569
1627 if (!bow->race || !bow->skill) 1570 if (!bow->race || !bow->skill)
1628 { 1571 {
1629 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1572 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630 return 0; 1573 return 0;
1631 } 1574 }
1632
1633 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635 /* penalize ROF for bestarrow */
1636 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639 if (bowspeed < 1)
1640 bowspeed = 1;
1641 1575
1642 if (arrow == NULL) 1576 if (arrow == NULL)
1643 { 1577 {
1644 if ((arrow = find_arrow (op, bow->race)) == NULL) 1578 if ((arrow = find_arrow (op, bow->race)) == NULL)
1645 { 1579 {
1646 if (op->type == PLAYER) 1580 if (op->type == PLAYER)
1647 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1582 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649 else 1583 else
1650 CLEAR_FLAG (op, FLAG_READY_BOW); 1584 CLEAR_FLAG (op, FLAG_READY_BOW);
1585
1651 return 0; 1586 return 0;
1652 } 1587 }
1653 } 1588 }
1654 1589
1655 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1590 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1668 arrow->destroy (); 1603 arrow->destroy ();
1669 return 0; 1604 return 0;
1670 } 1605 }
1671 1606
1672 left = arrow; /* these are arrows left to the player */ 1607 left = arrow; /* these are arrows left to the player */
1673 arrow = get_split_ob (arrow, 1); 1608 arrow = arrow->split ();
1674 if (!arrow) 1609 if (!arrow)
1675 { 1610 {
1676 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1677 return 0; 1612 return 0;
1678 } 1613 }
1679 1614
1680 arrow->set_owner (op); 1615 arrow->set_owner (op);
1681 arrow->skill = bow->skill; 1616 arrow->skill = bow->skill;
1682
1683 arrow->direction = dir; 1617 arrow->direction = dir;
1684 arrow->x = sx; 1618
1685 arrow->y = sy; 1619 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1620 arrow->stats.hp = arrow->stats.dam;
1621 arrow->stats.grace = arrow->attacktype;
1622
1623 if (arrow->slaying)
1624 arrow->spellarg = strdup (arrow->slaying);
1625
1626#if 0
1627 if (player *pl = op->contr)
1628 {
1629 float speed = pl->weapon_sp;
1630
1631 /* penalize ROF for bestarrow */
1632 if (pl->bowtype == bow_bestarrow)
1633 speed *= .9f;
1634 else
1635 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1636
1637 op->speed_left += speed - op->speed;
1638 }
1639#endif
1640
1641 SET_ANIMATION (arrow, arrow->direction);
1642
1643 /* update the speed */
1644 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1645 + bow->stats.dam / 7.f;
1646
1647 arrow->set_speed (max (arrow->speed, 2.f));
1648 arrow->speed_left = 0;
1649
1650 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1686 1651
1687 if (op->type == PLAYER) 1652 if (op->type == PLAYER)
1688 { 1653 {
1689 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1690 op->update_stats ();
1691 }
1692
1693 SET_ANIMATION (arrow, arrow->direction);
1694 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1695 arrow->stats.hp = arrow->stats.dam;
1696 arrow->stats.grace = arrow->attacktype;
1697 if (arrow->slaying != NULL)
1698 arrow->spellarg = strdup (arrow->slaying);
1699
1700 /* Note that this was different for monsters - they got their level
1701 * added to the damage. I think the strength bonus is more proper.
1702 */
1703
1704 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1705
1706 /* update the speed */
1707 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1708 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1709
1710 if (arrow->speed < 1.0)
1711 arrow->speed = 1.0;
1712 update_ob_speed (arrow);
1713 arrow->speed_left = 0;
1714
1715 if (op->type == PLAYER)
1716 {
1717 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1719 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1654 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1655 wc -= dex_bonus[op->stats.Dex];
1656
1657 if (!arrow->slaying)
1658 arrow->slaying = op->slaying;
1659
1660 arrow->attacktype |= op->attacktype;
1722 } 1661 }
1723 else 1662 else
1724 { 1663 {
1725 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726 arrow->level = op->level; 1664 arrow->level = op->level;
1727 } 1665 arrow->stats.wc -= bow->magic;
1728 1666
1729 if (arrow->attacktype == AT_PHYSICAL) 1667 if (!arrow->slaying)
1668 arrow->slaying = bow->slaying;
1669
1730 arrow->attacktype |= bow->attacktype; 1670 arrow->attacktype |= bow->attacktype;
1671 }
1731 1672
1732 if (bow->slaying) 1673 wc -= arrow->level;
1733 arrow->slaying = bow->slaying; 1674 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734 1675
1735 arrow->map = m; 1676 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736 arrow->move_type = MOVE_FLY_LOW; 1677 arrow->move_type = MOVE_FLY_LOW;
1737 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738 1679
1739 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1680 op->play_sound (sound_find ("fire_arrow"));
1740 insert_ob_in_map (arrow, m, op, 0); 1681 m->insert (arrow, sx, sy, op);
1741 1682
1742 if (!arrow->destroyed ()) 1683 if (!arrow->destroyed ())
1743 move_arrow (arrow); 1684 move_arrow (arrow);
1744
1745 if (op->type == PLAYER)
1746 {
1747 if (left->destroyed ())
1748 esrv_del_item (op->contr, left->count);
1749 else
1750 esrv_send_item (op, left);
1751 }
1752 1685
1753 return 1; 1686 return 1;
1754} 1687}
1755 1688
1756/* Special fire code for players - this takes into 1689/* Special fire code for players - this takes into
… …
1765{ 1698{
1766 int ret = 0, wcmod = 0; 1699 int ret = 0, wcmod = 0;
1767 1700
1768 if (op->contr->bowtype == bow_bestarrow) 1701 if (op->contr->bowtype == bow_bestarrow)
1769 { 1702 {
1770 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1703 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771 } 1704 }
1772 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1705 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773 { 1706 {
1774 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1707 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775 wcmod = -1; 1708 wcmod = -1;
1709
1776 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1710 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1777 } 1711 }
1778 else if (op->contr->bowtype == bow_threewide) 1712 else if (op->contr->bowtype == bow_threewide)
1779 { 1713 {
1780 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1714 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1784 else if (op->contr->bowtype == bow_spreadshot) 1718 else if (op->contr->bowtype == bow_spreadshot)
1785 { 1719 {
1786 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1720 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1787 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);
1788 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1722 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790 } 1723 }
1791 else 1724 else
1792 { 1725 {
1793 /* Simple case */ 1726 /* Simple case */
1794 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1727 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795 } 1728 }
1729
1796 return ret; 1730 return ret;
1797} 1731}
1798
1799 1732
1800/* Fires a misc (wand/rod/horn) object in 'dir'. 1733/* Fires a misc (wand/rod/horn) object in 'dir'.
1801 * Broken apart from 'fire' to keep it more readable. 1734 * Broken apart from 'fire' to keep it more readable.
1802 */ 1735 */
1803void 1736void
1804fire_misc_object (object *op, int dir) 1737fire_misc_object (object *op, int dir)
1805{ 1738{
1806 object *item; 1739 object *item = op->contr->ranged_ob;
1807 1740
1808 if (!op->contr->ranges[range_misc]) 1741 if (!item)
1809 { 1742 {
1810 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811 return; 1744 return;
1812 } 1745 }
1813 1746
1814 item = op->contr->ranges[range_misc];
1815 if (!item->inv) 1747 if (!item->inv)
1816 { 1748 {
1817 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1749 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818 return; 1750 return;
1819 } 1751 }
1752
1753 if (!op->change_weapon (item))
1754 return;
1755
1820 if (item->type == WAND) 1756 if (item->type == WAND)
1821 { 1757 {
1822 if (item->stats.food <= 0) 1758 if (item->stats.food <= 0)
1823 { 1759 {
1824 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1762
1826 return; 1763 return;
1827 } 1764 }
1828 } 1765 }
1829 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1830 { 1767 {
1831 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832 { 1769 {
1833 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1770 op->contr->play_sound (sound_find ("wand_poof"));
1771
1834 if (item->type == ROD) 1772 if (item->type == ROD)
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836 else 1774 else
1837 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1776
1838 return; 1777 return;
1839 } 1778 }
1840 } 1779 }
1841 1780
1842 if (cast_spell (op, item, dir, item->inv, NULL)) 1781 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1849 object *tmp; 1788 object *tmp;
1850 1789
1851 if (item->arch) 1790 if (item->arch)
1852 { 1791 {
1853 CLEAR_FLAG (item, FLAG_ANIMATE); 1792 CLEAR_FLAG (item, FLAG_ANIMATE);
1854 item->face = item->arch->clone.face; 1793 item->face = item->arch->face;
1855 item->speed = 0; 1794 item->set_speed (0);
1856 update_ob_speed (item);
1857 } 1795 }
1796
1858 if ((tmp = item->in_player ())) 1797 if ((tmp = item->in_player ()))
1859 esrv_update_item (UPD_ANIM, tmp, item); 1798 esrv_update_item (UPD_ANIM, tmp, item);
1860 } 1799 }
1861 } 1800 }
1862 else if (item->type == ROD || item->type == HORN) 1801 else if (item->type == ROD || item->type == HORN)
1863 {
1864 drain_rod_charge (item); 1802 drain_rod_charge (item);
1865 }
1866 } 1803 }
1867} 1804}
1868 1805
1869/* Received a fire command for the player - go and do it. 1806/* Received a fire command for the player - go and do it.
1870 */ 1807 */
1871void 1808bool
1872fire (object *op, int dir) 1809fire (object *op, int dir)
1873{ 1810{
1874 int spellcost = 0; 1811 int spellcost = 0;
1875 1812
1876 /* check for loss of invisiblity/hide */ 1813 /* check for loss of invisiblity/hide */
1877 if (action_makes_visible (op)) 1814 if (action_makes_visible (op))
1878 make_visible (op); 1815 make_visible (op);
1879 1816
1880 switch (op->contr->shoottype) 1817 player *pl = op->contr;
1818
1819 if (pl->golem)
1820 {
1821 control_golem (op->contr->golem, dir);
1822 return false;
1881 { 1823 }
1882 case range_none:
1883 return;
1884 1824
1885 case range_bow: 1825 object *ob = pl->ranged_ob;
1826
1827 if (!ob)
1828 return false;
1829
1830 if (!op->change_weapon (ob))
1831 return false;
1832
1833 if (op->speed_left > 0.f)
1834 --op->speed_left;
1835 else
1836 return false;
1837
1838 switch (ob->type)
1839 {
1840 case BOW:
1886 player_fire_bow (op, dir); 1841 player_fire_bow (op, dir);
1887 return; 1842 break;
1888 1843
1889 case range_magic: /* Casting spells */ 1844 case SPELL:
1890 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1845 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1891 return; 1846 break;
1892 1847
1893 case range_misc: 1848 case BUILDER:
1849 apply_map_builder (op, dir);
1850 break;
1851
1852 case SKILL:
1853 do_skill (op, op, ob, dir, 0);
1854 break;
1855
1856 default:
1894 fire_misc_object (op, dir); 1857 fire_misc_object (op, dir);
1895 return; 1858 break;
1896
1897 case range_golem: /* Control summoned monsters from scrolls */
1898 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1899 {
1900 op->contr->ranges[range_golem] = 0;
1901 op->contr->shoottype = range_none;
1902 }
1903 else
1904 control_golem (op->contr->ranges[range_golem], dir);
1905 return;
1906
1907 case range_skill:
1908 if (!op->chosen_skill)
1909 {
1910 if (op->type == PLAYER)
1911 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1912 return;
1913 }
1914 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1915 return;
1916 case range_builder:
1917 apply_map_builder (op, dir);
1918 return;
1919 default:
1920 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1921 return;
1922 } 1859 }
1923}
1924 1860
1925 1861 return true;
1862}
1926 1863
1927/* find_key 1864/* find_key
1928 * We try to find a key for the door as passed. If we find a key 1865 * We try to find a key for the door as passed. If we find a key
1929 * and successfully use it, we return the key, otherwise NULL 1866 * and successfully use it, we return the key, otherwise NULL
1930 * This function merges both normal and locked door, since the logic 1867 * This function merges both normal and locked door, since the logic
… …
1932 * pl is the player, 1869 * pl is the player,
1933 * inv is the objects inventory to searched 1870 * inv is the objects inventory to searched
1934 * door is the door we are trying to match against. 1871 * door is the door we are trying to match against.
1935 * This function can be called recursively to search containers. 1872 * This function can be called recursively to search containers.
1936 */ 1873 */
1937
1938object * 1874object *
1939find_key (object *pl, object *container, object *door) 1875find_key (object *pl, object *container, object *door)
1940{ 1876{
1941 object *tmp, *key; 1877 object *tmp, *key;
1942 1878
1943 /* Should not happen, but sanity checking is never bad */ 1879 /* Should not happen, but sanity checking is never bad */
1944 if (container->inv == NULL) 1880 if (!container->inv)
1945 return NULL; 1881 return 0;
1946 1882
1947 /* First, lets try to find a key in the top level inventory */ 1883 /* First, lets try to find a key in the top level inventory */
1948 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1884 for (tmp = container->inv; tmp; tmp = tmp->below)
1949 { 1885 {
1950 if (door->type == DOOR && tmp->type == KEY) 1886 if (door->type == DOOR && tmp->type == KEY)
1951 break; 1887 break;
1952 /* For sanity, we should really check door type, but other stuff 1888 /* For sanity, we should really check door type, but other stuff
1953 * (like containers) can be locked with special keys 1889 * (like containers) can be locked with special keys
1954 */ 1890 */
1955 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1891 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1956 break; 1892 break;
1957 } 1893 }
1894
1958 /* No key found - lets search inventories now */ 1895 /* No key found - lets search inventories now */
1959 /* If we find and use a key in an inventory, return at that time. 1896 /* If we find and use a key in an inventory, return at that time.
1960 * otherwise, if we search all the inventories and still don't find 1897 * otherwise, if we search all the inventories and still don't find
1961 * a key, return 1898 * a key, return
1962 */ 1899 */
1963 if (!tmp) 1900 if (!tmp)
1964 { 1901 {
1965 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1902 for (tmp = container->inv; tmp; tmp = tmp->below)
1966 { 1903 {
1967 /* No reason to search empty containers */ 1904 /* No reason to search empty containers */
1968 if (tmp->type == CONTAINER && tmp->inv) 1905 if (tmp->type == CONTAINER && tmp->inv)
1969 { 1906 {
1970 if ((key = find_key (pl, tmp, door)) != NULL) 1907 if ((key = find_key (pl, tmp, door)))
1971 return key; 1908 return key;
1972 } 1909 }
1973 } 1910 }
1911
1974 if (!tmp) 1912 if (!tmp)
1975 return NULL; 1913 return NULL;
1976 } 1914 }
1915
1977 /* We get down here if we have found a key. Now if its in a container, 1916 /* We get down here if we have found a key. Now if its in a container,
1978 * see if we actually want to use it 1917 * see if we actually want to use it
1979 */ 1918 */
1980 if (pl != container) 1919 if (pl != container)
1981 { 1920 {
… …
2002 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1941 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2003 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1942 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2004 return NULL; 1943 return NULL;
2005 } 1944 }
2006 } 1945 }
1946
2007 return tmp; 1947 return tmp;
2008} 1948}
2009 1949
2010/* moved door processing out of move_player_attack. 1950/* moved door processing out of move_player_attack.
2011 * returns 1 if player has opened the door with a key 1951 * returns 1 if player has opened the door with a key
… …
2013 * 0 otherwise 1953 * 0 otherwise
2014 */ 1954 */
2015static int 1955static int
2016player_attack_door (object *op, object *door) 1956player_attack_door (object *op, object *door)
2017{ 1957{
2018 /* If its a door, try to find a use a key. If we do destroy the door, 1958 /* If its a door, try to find a key. If we do destroy the door,
2019 * might as well return immediately as there is nothing more to do - 1959 * might as well return immediately as there is nothing more to do -
2020 * otherwise, we fall through to the rest of the code. 1960 * otherwise, we fall through to the rest of the code.
2021 */ 1961 */
2022 object *key = find_key (op, op, door); 1962 object *key = find_key (op, op, door);
2023 1963
2024 /* IF we found a key, do some extra work */ 1964 /* If we found a key, do some extra work */
2025 if (key) 1965 if (key)
2026 { 1966 {
2027 object *container = key->env; 1967 object *container = key->env;
2028 1968
2029 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2030 if (action_makes_visible (op)) 1969 if (action_makes_visible (op))
2031 make_visible (op); 1970 make_visible (op);
1971
2032 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1972 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2033 spring_trap (door->inv, op); 1973 spring_trap (door->inv, op);
1974
2034 if (door->type == DOOR) 1975 if (door->type == DOOR)
2035 {
2036 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1976 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2037 }
2038 else if (door->type == LOCKED_DOOR) 1977 else if (door->type == LOCKED_DOOR)
2039 { 1978 {
2040 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1979 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2041 remove_door2 (door); /* remove door without violence ;-) */ 1980 remove_door2 (door); /* remove door without violence ;-) */
2042 } 1981 }
1982
2043 /* Do this after we print the message */ 1983 /* Do this after we print the message */
2044 decrease_ob (key); /* Use up one of the keys */ 1984 key->decrease (); /* Use up one of the keys */
2045 /* Need to update the weight the container the key was in */ 1985 /* Need to update the weight the container the key was in */
2046 if (container != op) 1986 if (container != op)
2047 esrv_update_item (UPD_WEIGHT, op, container); 1987 esrv_update_item (UPD_WEIGHT, op, container);
1988
2048 return 1; /* Nothing more to do below */ 1989 return 1; /* Nothing more to do below */
2049 } 1990 }
2050 else if (door->type == LOCKED_DOOR) 1991 else if (door->type == LOCKED_DOOR)
2051 { 1992 {
2052 /* Might as well return now - no other way to open this */ 1993 /* Might as well return now - no other way to open this */
2053 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1994 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2054 return 1; 1995 return 1;
2055 } 1996 }
1997
2056 return 0; 1998 return 0;
2057} 1999}
2058 2000
2059/* This function is just part of a breakup from move_player. 2001/* This function is just part of a breakup from move_player.
2060 * It should keep the code cleaner. 2002 * It should keep the code cleaner.
2061 * When this is called, the players direction has been updated 2003 * When this is called, the players direction has been updated
2062 * (taking into account confusion.) The player is also actually 2004 * (taking into account confusion.) The player is also actually
2063 * going to try and move (not fire weapons). 2005 * going to try and move (not fire weapons).
2064 */ 2006 */
2065void 2007bool
2066move_player_attack (object *op, int dir) 2008move_player_attack (object *op, int dir)
2067{ 2009{
2068 object *tmp, *mon;
2069 sint16 nx, ny;
2070 int on_battleground; 2010 int on_battleground;
2071 maptile *m;
2072 2011
2073 nx = freearr_x[dir] + op->x; 2012 sint16 nx = freearr_x[dir] + op->x;
2074 ny = freearr_y[dir] + op->y; 2013 sint16 ny = freearr_y[dir] + op->y;
2075 2014
2076 on_battleground = op_on_battleground (op, 0, 0); 2015 on_battleground = op_on_battleground (op, 0, 0);
2016
2017 if (out_of_map (op->map, nx, ny))
2018 return false;
2019
2020 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2021 {
2022 --op->speed_left;
2023 return true;
2024 }
2077 2025
2078 /* If braced, or can't move to the square, and it is not out of the 2026 /* If braced, or can't move to the square, and it is not out of the
2079 * map, attack it. Note order of if statement is important - don't 2027 * map, attack it. Note order of if statement is important - don't
2080 * want to be calling move_ob if braced, because move_ob will move the 2028 * want to be calling move_ob if braced, because move_ob will move the
2081 * player. This is a pretty nasty hack, because if we could 2029 * player. This is a pretty nasty hack, because if we could
2082 * move to some space, it then means that if we are braced, we should 2030 * move to some space, it then means that if we are braced, we should
2083 * do nothing at all. As it is, if we are braced, we go through 2031 * do nothing at all. As it is, if we are braced, we go through
2084 * quite a bit of processing. However, it probably is less than what 2032 * quite a bit of processing. However, it probably is less than what
2085 * move_ob uses. 2033 * move_ob uses.
2086 */ 2034 */
2087 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2035 maptile *m = op->map->xy_find (nx, ny);
2088 {
2089 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2090 {
2091 m = get_map_from_coord (op->map, &nx, &ny);
2092 if (!m)
2093 return; /* Don't think this should happen */
2094 }
2095 else
2096 m = op->map;
2097 2036
2098 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2099 {
2100 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2101 return;
2102 }
2103
2104 mon = 0;
2105 /* Go through all the objects, and find ones of interest. Only stop if 2037 /* Go through all the objects, and find ones of interest. Only stop if
2106 * we find a monster - that is something we know we want to attack. 2038 * we find a monster - that is something we know we want to attack.
2107 * if its a door or barrel (can roll) see if there may be monsters 2039 * if its a door or barrel (can roll) see if there may be monsters
2108 * on the space 2040 * on the space
2109 */ 2041 */
2110 while (tmp) 2042 object *mon;
2111 { 2043 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2112 if (tmp == op) 2044 {
2113 { 2045 if ((mon->flag [FLAG_ALIVE]
2114 tmp = tmp->above; 2046 || mon->type == LOCKED_DOOR
2115 continue; 2047 || mon->flag [FLAG_CAN_ROLL])
2116 }
2117
2118 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2119 {
2120 mon = tmp; 2048 && mon != op)
2121 break; 2049 break;
2122 } 2050 }
2123 2051
2124 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2125 mon = tmp;
2126
2127 tmp = tmp->above;
2128 }
2129
2130 if (!mon) /* This happens anytime the player tries to move */ 2052 if (!mon) /* This happens anytime the player tries to move */
2131 return; /* into a wall */ 2053 return false; /* into a wall */
2132 2054
2133 if (mon->head)
2134 mon = mon->head; 2055 mon = mon->head_ ();
2135 2056
2136 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2057 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2058 if (op->contr->weapon_sp_left > 0.f)
2137 if (player_attack_door (op, mon)) 2059 if (player_attack_door (op, mon))
2060 {
2061 --op->contr->weapon_sp_left;
2138 return; 2062 return true;
2063 }
2139 2064
2140 /* The following deals with possibly attacking peaceful 2065 /* The following deals with possibly attacking peaceful
2141 * or frienddly creatures. Basically, all players are considered 2066 * or friendly creatures. Basically, all players are considered
2142 * unaggressive. If the moving player has peaceful set, then the 2067 * unaggressive. If the moving player has peaceful set, then the
2143 * object should be pushed instead of attacked. It is assumed that 2068 * object should be pushed instead of attacked. It is assumed that
2144 * if you are braced, you will not attack friends accidently, 2069 * if you are braced, you will not attack friends accidently,
2145 * and thus will not push them. 2070 * and thus will not push them.
2146 */ 2071 */
2147 2072
2148 /* If the creature is a pet, push it even if the player is not 2073 /* If the creature is a pet, push it even if the player is not
2149 * peaceful. Our assumption is the creature is a pet if the 2074 * peaceful. Our assumption is the creature is a pet if the
2150 * player owns it and it is either friendly or unagressive. 2075 * player owns it and it is either friendly or unagressive.
2151 */ 2076 */
2152 if ((op->type == PLAYER) 2077 if (op->type == PLAYER
2153#if COZY_SERVER
2154 &&
2155 ((mon->owner && mon->owner->contr 2078 && ((mon->owner && mon->owner->contr
2156 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2079 && same_party (mon->owner->contr->party, op->contr->party))
2157#else
2158 && mon->owner == op 2080 || mon->owner == op)
2159#endif
2160 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2081 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2161 { 2082 {
2162 /* If we're braced, we don't want to switch places with it */ 2083 /* If we're braced, we don't want to switch places with it */
2163 if (op->contr->braced) 2084 if (op->contr->braced)
2164 return; 2085 return false;
2165 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2086
2087 if (op->speed_left > 0.f)
2088 {
2089 --op->speed_left;
2090
2091 op->play_sound (sound_find ("push_player"));
2166 (void) push_ob (mon, dir, op); 2092 push_ob (mon, dir, op);
2093
2167 if (op->contr->tmp_invis || op->hide) 2094 if (op->contr->tmp_invis || op->hide)
2168 make_visible (op); 2095 make_visible (op);
2096
2169 return; 2097 return true;
2170 } 2098 }
2099 else
2100 return false;
2101 }
2171 2102
2172 /* in certain circumstances, you shouldn't attack friendly 2103 /* in certain circumstances, you shouldn't attack friendly
2173 * creatures. Note that if you are braced, you can't push 2104 * creatures. Note that if you are braced, you can't push
2174 * someone, but put it inside this loop so that you won't 2105 * someone, but put it inside this loop so that you won't
2175 * attack them either. 2106 * attack them either.
2176 */ 2107 */
2177 if ((mon->type == PLAYER || mon->enemy != op) && 2108 if ((mon->type == PLAYER || mon->enemy != op)
2178 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2109 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2179#ifdef PROHIBIT_PLAYERKILL
2180 (op->contr->peaceful 2110 && ((op->contr->peaceful
2181 || (mon->type == PLAYER 2111 || (mon->type == PLAYER && mon->contr->peaceful))
2182 && mon->contr->
2183 peaceful)) &&
2184#else
2185 op->contr->peaceful &&
2186#endif
2187 !on_battleground)) 2112 && !on_battleground))
2113 {
2114 if (op->speed_left > 0.f)
2188 { 2115 {
2116 --op->speed_left;
2117
2189 if (!op->contr->braced) 2118 if (!op->contr->braced)
2190 { 2119 {
2191 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2120 op->play_sound (sound_find ("push_player"));
2192 (void) push_ob (mon, dir, op); 2121 push_ob (mon, dir, op);
2193 } 2122 }
2194 else 2123 else
2195 new_draw_info (0, 0, op, "You withhold your attack"); 2124 op->statusmsg ("You withhold your attack");
2196 2125
2197 if (op->contr->tmp_invis || op->hide) 2126 if (op->contr->tmp_invis || op->hide)
2198 make_visible (op); 2127 make_visible (op);
2199 }
2200 2128
2129 return true;
2130 }
2131 }
2201 /* If the object is a boulder or other rollable object, then 2132 /* If the object is a boulder or other rollable object, then
2202 * roll it if not braced. You can't roll it if you are braced. 2133 * roll it if not braced. You can't roll it if you are braced.
2203 */ 2134 */
2204 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2135 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2136 {
2137 if (op->speed_left > 0.f)
2205 { 2138 {
2139 --op->speed_left;
2140
2206 recursive_roll (mon, dir, op); 2141 recursive_roll (mon, dir, op);
2207 if (action_makes_visible (op)) 2142 if (action_makes_visible (op))
2208 make_visible (op); 2143 make_visible (op);
2209 }
2210 2144
2145 return true;
2146 }
2147 }
2211 /* Any generic living creature. Including things like doors. 2148 /* Any generic living creature. Including things like doors.
2212 * Way it works is like this: First, it must have some hit points 2149 * Way it works is like this: First, it must have some hit points
2213 * and be living. Then, it must be one of the following: 2150 * and be living. Then, it must be one of the following:
2214 * 1) Not a player, 2) A player, but of a different party. Note 2151 * 1) Not a player, 2) A player, but of a different party. Note
2215 * that party_number -1 is no party, so attacks can still happen. 2152 * that party_number -1 is no party, so attacks can still happen.
2216 */ 2153 */
2217
2218 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2219 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2155 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2220 { 2156 {
2221 2157 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2222 /* If the player hasn't hit something this tick, and does
2223 * so, give them speed boost based on weapon speed. Doing
2224 * it here is better than process_players2, which basically
2225 * incurred a 1 tick offset.
2226 */
2227 if (!op->contr->has_hit)
2228 { 2158 {
2229 op->speed_left += op->speed / op->contr->weapon_sp; 2159 --op->contr->weapon_sp_left;
2230
2231 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2232 }
2233 2160
2234 skill_attack (mon, op, 0, 0, 0); 2161 skill_attack (mon, op, 0, 0, 0);
2235
2236 /* If attacking another player, that player gets automatic
2237 * hitback, and doesn't loose luck either.
2238 * Disable hitback on the battleground or if the target is
2239 * the wiz.
2240 */
2241 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2242 {
2243 short luck = mon->stats.luck;
2244
2245 mon->contr->has_hit = 1;
2246 skill_attack (op, mon, 0, 0, 0);
2247 mon->stats.luck = luck;
2248 }
2249 2162
2250 if (action_makes_visible (op)) 2163 if (action_makes_visible (op))
2251 make_visible (op); 2164 make_visible (op);
2252 }
2253 } /* if player should attack something */
2254}
2255 2165
2256int 2166 return true;
2167 }
2168 }
2169
2170 return false;
2171}
2172
2173bool
2257move_player (object *op, int dir) 2174move_player (object *op, int dir)
2258{ 2175{
2259 int pick; 2176 int pick;
2260 2177
2261 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2178 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2262 return 0; 2179 return 0;
2263 2180
2264 /* Sanity check: make sure dir is valid */ 2181 /* Sanity check: make sure dir is valid */
2265 if ((dir < 0) || (dir >= 9)) 2182 if ((dir < 0) || (dir >= 9))
2266 { 2183 {
2267 LOG (llevError, "move_player: invalid direction %d\n", dir); 2184 LOG (llevError, "move_player: invalid direction %d\n", dir);
2268 return 0; 2185 return 0;
2269 } 2186 }
2270 2187
2271 /* peterm: added following line */ 2188 /* peterm: added following line */
2272 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2189 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2273 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2190 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2274 2191
2275 op->facing = dir; 2192 op->facing = dir;
2276 2193
2277 if (op->hide) 2194 if (op->hide)
2278 do_hidden_move (op); 2195 do_hidden_move (op);
2279 2196
2197 bool retval;
2198
2280 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2199 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2281 /*nop */ ; 2200 retval = RESULT_INT (0);
2282 else if (op->contr->fire_on) 2201 else if (op->contr->fire_on)
2283 fire (op, dir); 2202 retval = fire (op, dir);
2284 else 2203 else
2285 { 2204 {
2286 move_player_attack (op, dir); 2205 retval = move_player_attack (op, dir);
2287 pick = check_pick (op); 2206 pick = check_pick (op);
2288 } 2207 }
2289 2208
2290 /* Add special check for newcs players and fire on - this way, the 2209 /* Add special check for newcs players and fire on - this way, the
2291 * server can handle repeat firing. 2210 * server can handle repeat firing.
… …
2298 /* Update how the player looks. Use the facing, so direction may 2217 /* Update how the player looks. Use the facing, so direction may
2299 * get reset to zero. This allows for full animation capabilities 2218 * get reset to zero. This allows for full animation capabilities
2300 * for players. 2219 * for players.
2301 */ 2220 */
2302 animate_object (op, op->facing); 2221 animate_object (op, op->facing);
2303 return 0; 2222
2223 return retval;
2304} 2224}
2305 2225
2306/* This is similar to handle_player, below, but is only used by the 2226/* This is similar to handle_player, below, but is only used by the
2307 * new client/server stuff. 2227 * new client/server stuff.
2308 * This is sort of special, in that the new client/server actually uses 2228 * This is sort of special, in that the new client/server actually uses
2309 * the new speed values for commands. 2229 * the new speed values for commands.
2310 * 2230 *
2311 * Returns true if there are more actions we can do. 2231 * Returns true if there are more actions we can do. Should not do
2232 * many actions in a row, as that would be too unfair to other
2233 * players.
2312 */ 2234 */
2313int 2235bool
2314handle_newcs_player (object *op) 2236handle_newcs_player (object *op)
2315{ 2237{
2316 if (op->contr->hidden)
2317 {
2318 op->invisible = 1000;
2319 /* the socket code flashes the player visible/invisible
2320 * depending on the value of invisible, so we need to
2321 * alternate it here for it to work correctly.
2322 */
2323 if (pticks & 2)
2324 op->invisible--;
2325 }
2326 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2327 {
2328 op->invisible--;
2329 if (!op->invisible)
2330 {
2331 make_visible (op);
2332 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2333 }
2334 }
2335
2336 if (QUERY_FLAG (op, FLAG_SCARED)) 2238 if (QUERY_FLAG (op, FLAG_SCARED))
2337 { 2239 {
2338 flee_player (op); 2240 if (op->speed_left > 0.f)
2339 /* If player is still scared, that is his action for this tick */
2340 if (QUERY_FLAG (op, FLAG_SCARED))
2341 { 2241 {
2342 op->speed_left--; 2242 --op->speed_left;
2243 flee_player (op);
2244
2343 return 0; 2245 return true;
2344 } 2246 }
2247 else
2248 return false;
2345 } 2249 }
2346
2347 /* I've been seeing crashes where the golem has been destroyed, but
2348 * the player object still points to the defunct golem. The code that
2349 * destroys the golem looks correct, and it doesn't always happen, so
2350 * put this in a a workaround to clean up the golem pointer.
2351 */
2352 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2353 op->contr->ranges[range_golem] = 0;
2354 2250
2355 /* call this here - we also will call this in do_ericserver, but 2251 /* call this here - we also will call this in do_ericserver, but
2356 * the players time has been increased when doericserver has been 2252 * the players time has been increased when doericserver has been
2357 * called, so we recheck it here. 2253 * called, so we recheck it here.
2358 */ 2254 */
2359 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2255 if (op->contr->ns->handle_command ())
2360 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2361 ;
2362
2363 if (op->speed_left < 0)
2364 return 0; 2256 return true;
2365 2257
2366 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2258 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2367 {
2368 /* All move commands take 1 tick, at least for now */
2369 op->speed_left--;
2370
2371 /* Instead of all the stuff below, let move_player take care
2372 * of it. Also, some of the skill stuff is only put in
2373 * there, as well as the confusion stuff.
2374 */
2375 move_player (op, op->direction); 2259 return move_player (op, op->direction);
2376 if (op->speed_left > 0)
2377 return 1;
2378 else
2379 return 0;
2380 }
2381 2260
2382 return 0; 2261 return false;
2383} 2262}
2384 2263
2385int 2264int
2386save_life (object *op) 2265save_life (object *op)
2387{ 2266{
… …
2389 return 0; 2268 return 0;
2390 2269
2391 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2270 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2392 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2393 { 2272 {
2394 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2273 op->play_sound (sound_find ("ob_evaporate"));
2395 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2274 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2396 2275
2397 if (op->contr) 2276 if (op->contr)
2398 esrv_del_item (op->contr, tmp->count); 2277 esrv_del_item (op->contr, tmp->count);
2399 2278
… …
2419/* This goes throws the inventory and removes unpaid objects, and puts them 2298/* This goes throws the inventory and removes unpaid objects, and puts them
2420 * back in the map (location and map determined by values of env). This 2299 * back in the map (location and map determined by values of env). This
2421 * function will descend into containers. op is the object to start the search 2300 * function will descend into containers. op is the object to start the search
2422 * from. 2301 * from.
2423 */ 2302 */
2424void 2303static void
2425remove_unpaid_objects (object *op, object *env) 2304drop_unpaid_items (object *op, object *env)
2426{ 2305{
2427 object *next;
2428
2429 while (op) 2306 while (op)
2430 { 2307 {
2431 next = op->below; /* Make sure we have a good value, in case 2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2432 * we remove object 'op' 2309
2433 */
2434 if (QUERY_FLAG (op, FLAG_UNPAID)) 2310 if (QUERY_FLAG (op, FLAG_UNPAID))
2435 { 2311 {
2436 op->remove ();
2437 op->x = env->x;
2438 op->y = env->y;
2439 if (env->type == PLAYER) 2312 if (env->type == PLAYER)
2440 esrv_del_item (env->contr, op->count); 2313 esrv_del_item (env->contr, op->count);
2441 insert_ob_in_map (op, env->map, NULL, 0); 2314
2315 op->insert_at (env);
2442 } 2316 }
2443 else if (op->inv) 2317 else if (op->inv)
2444 remove_unpaid_objects (op->inv, env); 2318 drop_unpaid_items (op->inv, env);
2445 2319
2446 op = next; 2320 op = next;
2447 } 2321 }
2322}
2323
2324void
2325object::drop_unpaid_items ()
2326{
2327 if (!flag [FLAG_REMOVED])
2328 ::drop_unpaid_items (inv, this);
2448} 2329}
2449 2330
2450/* 2331/*
2451 * Returns pointer a static string containing gravestone text 2332 * Returns pointer a static string containing gravestone text
2452 * Moved from apply.c to player.c - player.c is what 2333 * Moved from apply.c to player.c - player.c is what
… …
2502 int rate_grace = 2000; 2383 int rate_grace = 2000;
2503 const int max_hp = 1; 2384 const int max_hp = 1;
2504 const int max_sp = 1; 2385 const int max_sp = 1;
2505 const int max_grace = 1; 2386 const int max_grace = 1;
2506 2387
2507 if (op->contr->outputs_sync) 2388 if (op->contr->hidden)
2389 {
2390 op->invisible = 1000;
2391 /* the socket code flashes the player visible/invisible
2392 * depending on the value of invisible, so we need to
2393 * alternate it here for it to work correctly.
2394 */
2395 if (pticks & 2)
2396 op->invisible--;
2508 { 2397 }
2509 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2398 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2510 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2399 {
2511 flush_output_element (op, &op->contr->outputs[i]); 2400 if (!op->invisible--)
2401 {
2402 make_visible (op);
2403 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2404 }
2512 } 2405 }
2513 2406
2514 if (op->contr->ns->state == ST_PLAYING) 2407 if (op->contr->ns->state == ST_PLAYING)
2515 { 2408 {
2516 /* these next three if clauses make it possible to SLOW DOWN 2409 /* these next three if clauses make it possible to SLOW DOWN
… …
2535 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2428 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2536 else 2429 else
2537 { 2430 {
2538 gen_grace = op->stats.maxgrace; 2431 gen_grace = op->stats.maxgrace;
2539 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2432 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2540 }
2541
2542 /* Regenerate Spell Points */
2543 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2544 {
2545 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2546 if (op->stats.sp < op->stats.maxsp)
2547 {
2548 op->stats.sp++;
2549 /* dms do not consume food */
2550 if (!QUERY_FLAG (op, FLAG_WIZ))
2551 {
2552 op->stats.food--;
2553 if (op->contr->digestion < 0)
2554 op->stats.food += op->contr->digestion;
2555 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2556 op->stats.food = last_food;
2557 }
2558 }
2559
2560 if (max_sp > 1)
2561 {
2562 over_sp = (gen_sp + 10) / rate_sp;
2563 if (over_sp > 0)
2564 {
2565 if (op->stats.sp < op->stats.maxsp)
2566 {
2567 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2568
2569 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2570 op->stats.sp--;
2571
2572 if (op->stats.sp > op->stats.maxsp)
2573 op->stats.sp = op->stats.maxsp;
2574 }
2575 op->last_sp = 0;
2576 }
2577 else
2578 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2579 }
2580 else
2581 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2582 } 2433 }
2583 2434
2584 /* Regenerate Grace */ 2435 /* Regenerate Grace */
2585 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2436 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2586 if (--op->last_grace < 0) 2437 if (--op->last_grace < 0)
… …
2607 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2458 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2608 } 2459 }
2609 /* wearing stuff doesn't detract from grace generation. */ 2460 /* wearing stuff doesn't detract from grace generation. */
2610 } 2461 }
2611 2462
2463 if (op->stats.food > 0)
2464 {
2612 /* Regenerate Hit Points */ 2465 /* Regenerate Spell Points */
2613 if (--op->last_heal < 0) 2466 if (!op->contr->golem && --op->last_sp < 0)
2614 {
2615 if (op->stats.hp < op->stats.maxhp)
2616 { 2467 {
2617 op->stats.hp++; 2468 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2618 /* dms do not consume food */ 2469
2619 if (!QUERY_FLAG (op, FLAG_WIZ)) 2470 if (op->stats.sp < op->stats.maxsp)
2620 { 2471 {
2472 op->stats.sp++;
2473
2474 /* dms do not consume food */
2475 if (!QUERY_FLAG (op, FLAG_WIZ))
2476 {
2621 op->stats.food--; 2477 op->stats.food--;
2478
2622 if (op->contr->digestion < 0) 2479 if (op->contr->digestion < 0)
2623 op->stats.food += op->contr->digestion; 2480 op->stats.food += op->contr->digestion;
2624 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2481 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2625 op->stats.food = last_food; 2482 op->stats.food = last_food;
2483 }
2626 } 2484 }
2627 }
2628 2485
2629 if (max_hp > 1) 2486 if (max_sp > 1)
2630 {
2631 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2632 if (over_hp > 0)
2633 { 2487 {
2634 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2488 over_sp = (gen_sp + 10) / rate_sp;
2489 if (over_sp > 0)
2490 {
2491 if (op->stats.sp < op->stats.maxsp)
2492 {
2493 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2494
2495 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2496 op->stats.sp--;
2497
2498 if (op->stats.sp > op->stats.maxsp)
2499 op->stats.sp = op->stats.maxsp;
2500 }
2501
2635 op->last_heal = 0; 2502 op->last_sp = 0;
2503 }
2504 else
2505 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2636 } 2506 }
2637 else 2507 else
2508 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2509 }
2510
2511 /* Regenerate Hit Points */
2512 if (--op->last_heal < 0)
2513 {
2514 if (op->stats.hp < op->stats.maxhp)
2638 { 2515 {
2639 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2516 op->stats.hp++;
2517
2518 /* dms do not consume food */
2519 if (!QUERY_FLAG (op, FLAG_WIZ))
2520 {
2521 op->stats.food--;
2522
2523 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food;
2527 }
2640 } 2528 }
2529
2530 if (max_hp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533
2534 if (over_hp > 0)
2535 {
2536 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2537 op->last_heal = 0;
2538 }
2539 else
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2641 } 2541 }
2642 else 2542 else
2643 {
2644 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2543 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2645 } 2544 }
2646 } 2545 }
2647 2546
2648 /* Digestion */ 2547 /* Digestion */
2649 if (--op->last_eat < 0) 2548 if (--op->last_eat < 0)
2650 { 2549 {
2651#ifdef COZY_SERVER 2550 int bonus = max (0, op->contr->digestion),
2652 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2551 penalty = max (0, -op->contr->digestion);
2653 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2654#else
2655 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2656#endif
2657 2552
2658 if (op->contr->gen_hp > 0)
2659 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2553 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2660 else
2661 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2662 2554
2663 /* dms do not consume food */ 2555 /* dms do not consume food */
2664 if (!QUERY_FLAG (op, FLAG_WIZ)) 2556 if (!QUERY_FLAG (op, FLAG_WIZ))
2665 op->stats.food--; 2557 op->stats.food--;
2666 } 2558 }
… …
2693 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2694 manual_apply (op, flesh, 0); 2586 manual_apply (op, flesh, 0);
2695 } 2587 }
2696 } 2588 }
2697 2589
2698 while (op->stats.food < 0 && op->stats.hp >= 0) 2590 if (op->stats.food < 0)
2699 op->stats.food++, op->stats.hp--; 2591 {
2592 op->stats.hp += op->stats.food;
2593 op->stats.food = 0;
2594 }
2700 2595
2701 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2702 kill_player (op); 2597 kill_player (op);
2703 } 2598 }
2704} 2599}
… …
2709 * file. 2604 * file.
2710 */ 2605 */
2711void 2606void
2712kill_player (object *op) 2607kill_player (object *op)
2713{ 2608{
2609 int x, y;
2714 char buf[MAX_BUF]; 2610 char buf[MAX_BUF];
2715 int x, y;
2716
2717 //int i;
2718 maptile *map; /* this is for resurrection */ 2611 maptile *map; /* this is for resurrection */
2719
2720 /* int z;
2721 int num_stats_lose;
2722 int lost_a_stat;
2723 int lose_this_stat;
2724 int this_stat; */
2725 int will_kill_again; 2612 int will_kill_again;
2726 archetype *at; 2613 archetype *at;
2727 object *tmp; 2614 object *tmp;
2728 2615
2729 if (save_life (op)) 2616 if (save_life (op))
2730 return; 2617 return;
2731
2732 2618
2733 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2619 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2734 * in cities ONLY!!! It is very important that this doesn't get abused. 2620 * in cities ONLY!!! It is very important that this doesn't get abused.
2735 * Look at op_on_battleground() for more info --AndreasV 2621 * Look at op_on_battleground() for more info --AndreasV
2736 */ 2622 */
… …
2739 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2625 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2740 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2626 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2741 2627
2742 /* restore player */ 2628 /* restore player */
2743 at = archetype::find ("poisoning"); 2629 at = archetype::find ("poisoning");
2744 tmp = present_arch_in_ob (at, op); 2630 if (object *tmp = present_arch_in_ob (at, op))
2745 if (tmp)
2746 { 2631 {
2747 tmp->destroy (); 2632 tmp->destroy ();
2748 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2633 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2749 } 2634 }
2750 2635
2751 at = archetype::find ("confusion"); 2636 at = archetype::find ("confusion");
2752 tmp = present_arch_in_ob (at, op); 2637 if (object *tmp = present_arch_in_ob (at, op))
2753 if (tmp)
2754 { 2638 {
2755 tmp->destroy (); 2639 tmp->destroy ();
2756 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2640 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2757 } 2641 }
2758 2642
2759 cure_disease (op, 0); /* remove any disease */ 2643 cure_disease (op, 0, 0); /* remove any disease */
2760 op->stats.hp = op->stats.maxhp; 2644 op->stats.hp = op->stats.maxhp;
2761 if (op->stats.food <= 0) 2645 if (op->stats.food <= 0)
2762 op->stats.food = 999; 2646 op->stats.food = 999;
2763 2647
2764 /* create a bodypart-trophy to make the winner happy */ 2648 /* create a bodypart-trophy to make the winner happy */
2765 tmp = arch_to_object (archetype::find ("finger")); 2649 if (object *tmp = arch_to_object (archetype::find ("finger")))
2766 if (tmp != NULL)
2767 { 2650 {
2768 sprintf (buf, "%s's finger", &op->name); 2651 tmp->name = format ("%s's finger" , &op->name);
2769 tmp->name = buf; 2652 tmp->name_pl = format ("%s's fingers", &op->name);
2770 sprintf (buf, " This finger has been cut off %s\n" 2653 tmp->msg = format (
2771 " the %s, when he was defeated at\n level %d by %s.\n", 2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2772 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2655 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2773 tmp->msg = buf; 2656 );
2774 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2657 tmp->value = 0, tmp->type = 0;
2775 tmp->materialname = NULL; 2658 tmp->materialname = "organics";
2776 tmp->x = op->x, tmp->y = op->y; 2659 tmp->insert_at (op, tmp);
2777 insert_ob_in_map (tmp, op->map, op, 0);
2778 } 2660 }
2779 2661
2780 /* teleport defeated player to new destination */ 2662 /* teleport defeated player to new destination */
2781 transfer_ob (op, x, y, 0, NULL); 2663 transfer_ob (op, x, y, 0, NULL);
2782 op->contr->braced = 0; 2664 op->contr->braced = 0;
… …
2786 INVOKE_PLAYER (DEATH, op->contr); 2668 INVOKE_PLAYER (DEATH, op->contr);
2787 2669
2788 command_kill_pets (op, 0); 2670 command_kill_pets (op, 0);
2789 2671
2790 if (op->stats.food < 0) 2672 if (op->stats.food < 0)
2791 {
2792 if (op->contr->explore)
2793 {
2794 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2795 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2796 op->stats.food = 999;
2797 return;
2798 }
2799 sprintf (buf, "%s starved to death.", &op->name);
2800 strcpy (op->contr->killer, "starvation"); 2673 strcpy (op->contr->killer, "starvation");
2801 } 2674
2802 else 2675 op->contr->play_sound (sound_find ("player_dies"));
2803 {
2804 if (op->contr->explore)
2805 {
2806 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2807 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2808 op->stats.hp = op->stats.maxhp;
2809 return;
2810 }
2811 sprintf (buf, "%s died.", &op->name);
2812 }
2813 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2814 2676
2815 /* save the map location for corpse, gravestone */ 2677 /* save the map location for corpse, gravestone */
2816 x = op->x; 2678 x = op->x;
2817 y = op->y; 2679 y = op->y;
2818 map = op->map; 2680 map = op->map;
2819
2820 2681
2821 /* NOT_PERMADEATH code. This basically brings the character back to 2682 /* NOT_PERMADEATH code. This basically brings the character back to
2822 * life if they are dead - it takes some exp and a random stat. 2683 * life if they are dead - it takes some exp and a random stat.
2823 * See the config.h file for a little more in depth detail about this. 2684 * See the config.h file for a little more in depth detail about this.
2824 */ 2685 */
… …
2841 num_stats_lose = 1; 2702 num_stats_lose = 1;
2842 else 2703 else
2843 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2704 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2844 } 2705 }
2845 else 2706 else
2846 {
2847 num_stats_lose = 1; 2707 num_stats_lose = 1;
2848 } 2708
2849 lost_a_stat = 0; 2709 lost_a_stat = 0;
2850 2710
2851 for (z = 0; z < num_stats_lose; z++) 2711 for (z = 0; z < num_stats_lose; z++)
2852 { 2712 {
2853 i = RANDOM () % NUM_STATS; 2713 i = RANDOM () % NUM_STATS;
… …
2983 { 2843 {
2984 tmp->destroy (); 2844 tmp->destroy ();
2985 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2986 } 2846 }
2987 2847
2988 cure_disease (op, 0); /* remove any disease */ 2848 cure_disease (op, 0, 0); /* remove any disease */
2989 2849
2990 /*add_exp(op, (op->stats.exp * -0.20)); */ 2850 /*add_exp(op, (op->stats.exp * -0.20)); */
2991 apply_death_exp_penalty (op); 2851 apply_death_exp_penalty (op);
2992 if (op->stats.food < 100) 2852 if (op->stats.food < 100)
2993 op->stats.food = 900; 2853 op->stats.food = 900;
2994 op->stats.hp = op->stats.maxhp; 2854 op->stats.hp = op->stats.maxhp;
2995 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2855 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2996 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2856 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2997 2857
2998 /* 2858 /*
2999 * Check to see if the player is in a shop. IF so, then check to see if
3000 * the player has any unpaid items. If so, remove them and put them back 2859 * Check to see if the player has any unpaid items. If so, remove them
3001 * in the map. 2860 * and put them back in the map.
3002 */ 2861 */
3003 2862 op->drop_unpaid_items ();
3004 if (is_in_shop (op))
3005 remove_unpaid_objects (op->inv, op);
3006 2863
3007 /****************************************/ 2864 /****************************************/
3008 /* */ 2865 /* */
3009 /* Move player to his current respawn- */ 2866 /* Move player to his current respawn- */
3010 /* position (usually last savebed) */ 2867 /* position (usually last savebed) */
3011 /* */ 2868 /* */
3012 /****************************************/ 2869 /****************************************/
3013 2870
3014 enter_player_savebed (op); 2871 enter_player_savebed (op);
3015 2872
3016 /* Save the player before inserting the force to reduce
3017 * chance of abuse.
3018 */
3019 op->contr->braced = 0; 2873 op->contr->braced = 0;
3020 op->contr->save ();
3021 2874
3022 /* it is possible that the player has blown something up 2875 /* it is possible that the player has blown something up
3023 * at his savebed location, and that can have long lasting 2876 * at his savebed location, and that can have long lasting
3024 * spell effects. So first see if there is a spell effect 2877 * spell effects. So first see if there is a spell effect
3025 * on the space that might harm the player. 2878 * on the space that might harm the player.
… …
3034 object *force; 2887 object *force;
3035 int at; 2888 int at;
3036 2889
3037 force = get_archetype (FORCE_NAME); 2890 force = get_archetype (FORCE_NAME);
3038 /* 50 ticks should be enough time for the spell to abate */ 2891 /* 50 ticks should be enough time for the spell to abate */
3039 force->speed = 0.1; 2892 force->speed = 0.1f;
3040 force->speed_left = -5.0; 2893 force->speed_left = -5.f;
3041 SET_FLAG (force, FLAG_APPLIED); 2894 SET_FLAG (force, FLAG_APPLIED);
3042 for (at = 0; at < NROFATTACKS; at++) 2895 for (at = 0; at < NROFATTACKS; at++)
3043 if (will_kill_again & (1 << at)) 2896 if (will_kill_again & (1 << at))
3044 force->resist[at] = 100; 2897 force->resist[at] = 100;
3045 2898
… …
3054void 2907void
3055loot_object (object *op) 2908loot_object (object *op)
3056{ /* Grab and destroy some treasure */ 2909{ /* Grab and destroy some treasure */
3057 object *tmp, *tmp2, *next; 2910 object *tmp, *tmp2, *next;
3058 2911
3059 if (op->container) 2912 op->close_container (); /* close open sack first */
3060 esrv_apply_container (op, op->container); /* close open sack first */
3061 2913
3062 for (tmp = op->inv; tmp; tmp = next) 2914 for (tmp = op->inv; tmp; tmp = next)
3063 { 2915 {
3064 next = tmp->below; 2916 next = tmp->below;
3065 2917
3066 if (tmp->invisible) 2918 if (tmp->invisible)
3067 continue; 2919 continue;
3068 2920
3069 tmp->remove (); 2921 tmp->remove ();
3070 tmp->x = op->x, tmp->y = op->y; 2922 tmp->x = op->x, tmp->y = op->y;
2923
3071 if (tmp->type == CONTAINER) 2924 if (tmp->type == CONTAINER)
3072 { /* empty container to ground */ 2925 loot_object (tmp); /* empty container to ground */
3073 loot_object (tmp); 2926
3074 }
3075 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2927 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3076 { 2928 {
3077 if (tmp->nrof > 1) 2929 if (tmp->nrof > 1)
3078 { 2930 {
3079 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2931 tmp->decrease (rndm (1, tmp->nrof - 1));
3080 tmp2->destroy ();
3081 insert_ob_in_map (tmp, op->map, NULL, 0); 2932 insert_ob_in_map (tmp, op->map, NULL, 0);
3082 } 2933 }
3083 else 2934 else
3084 tmp->destroy (); 2935 tmp->destroy ();
3085 } 2936 }
… …
3091/* 2942/*
3092 * fix_weight(): Check recursively the weight of all players, and fix 2943 * fix_weight(): Check recursively the weight of all players, and fix
3093 * 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
3094 * was changed. 2945 * was changed.
3095 */ 2946 */
3096
3097void 2947void
3098fix_weight (void) 2948fix_weight (void)
3099{ 2949{
3100 for (player *pl = first_player; pl; pl = pl->next) 2950 for_all_players (pl)
3101 { 2951 {
3102 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2952 sint32 old = pl->ob->carrying;
3103 2953
3104 if (old == sum) 2954 pl->ob->update_weight ();
3105 continue; 2955
2956 if (old != pl->ob->carrying)
2957 {
3106 pl->ob->update_stats (); 2958 pl->ob->update_stats ();
3107 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2959 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2960 }
3108 } 2961 }
3109} 2962}
3110 2963
3111void 2964void
3112fix_luck (void) 2965fix_luck (void)
3113{ 2966{
3114 for (player *pl = first_player; pl; pl = pl->next) 2967 for_all_players (pl)
3115 if (!pl->ob->contr->ns->state) 2968 if (!pl->ob->contr->ns->state)
3116 pl->ob->change_luck (0); 2969 pl->ob->change_luck (0);
3117} 2970}
3118 2971
3119/* cast_dust() - handles op throwing objects of type 'DUST'. 2972/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3156void 3009void
3157make_visible (object *op) 3010make_visible (object *op)
3158{ 3011{
3159 op->hide = 0; 3012 op->hide = 0;
3160 op->invisible = 0; 3013 op->invisible = 0;
3014
3161 if (op->type == PLAYER) 3015 if (op->type == PLAYER)
3162 { 3016 {
3163 op->contr->tmp_invis = 0; 3017 op->contr->tmp_invis = 0;
3164 op->contr->invis_race = 0; 3018 op->contr->invis_race = 0;
3165 } 3019 }
3020
3166 update_object (op, UP_OBJ_FACE); 3021 update_object (op, UP_OBJ_CHANGE);
3167} 3022}
3168 3023
3169int 3024int
3170is_true_undead (object *op) 3025is_true_undead (object *op)
3171{ 3026{
3172 object *tmp = NULL;
3173
3174 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3027 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3175 return 1; 3028 return 1;
3176 3029
3177 return 0; 3030 return 0;
3178} 3031}
3179 3032
3180/* look at the surrounding terrain to determine 3033/* look at the surrounding terrain to determine
3181 * the hideability of this object. Positive levels 3034 * the hideability of this object. Positive levels
3182 * indicate greater hideability. 3035 * indicate greater hideability.
3183 */ 3036 */
3184
3185int 3037int
3186hideability (object *ob) 3038hideability (object *ob)
3187{ 3039{
3188 int i, level = 0, mflag; 3040 int i, level = 0, mflag;
3189 sint16 x, y; 3041 sint16 x, y;
… …
3199 * as bad as carrying a light on a pitch dark map */ 3051 * as bad as carrying a light on a pitch dark map */
3200 if (has_carried_lights (ob)) 3052 if (has_carried_lights (ob))
3201 level = -(10 + (2 * ob->map->darkness)); 3053 level = -(10 + (2 * ob->map->darkness));
3202 3054
3203 /* scan through all nearby squares for terrain to hide in */ 3055 /* scan through all nearby squares for terrain to hide in */
3204 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3056 for (i = 0, x = ob->x, y = ob->y;
3057 i <= SIZEOFFREE1;
3058 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3205 { 3059 {
3206 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3060 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3207 if (mflag & P_OUT_OF_MAP) 3061 if (mflag & P_OUT_OF_MAP)
3208 {
3209 continue; 3062 continue;
3210 } 3063
3211 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3064 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3212 level += 2; 3065 level += 2;
3213 else /* open terrain! */ 3066 else /* open terrain! */
3214 level -= 1; 3067 level -= 1;
3215 } 3068 }
… …
3223/* For Hidden creatures - a chance of becoming 'unhidden' 3076/* For Hidden creatures - a chance of becoming 'unhidden'
3224 * every time they move - as we subtract off 'invisibility' 3077 * every time they move - as we subtract off 'invisibility'
3225 * AND, for players, if they move into a ridiculously unhideable 3078 * AND, for players, if they move into a ridiculously unhideable
3226 * spot (surrounded by clear terrain in broad daylight). -b.t. 3079 * spot (surrounded by clear terrain in broad daylight). -b.t.
3227 */ 3080 */
3228
3229void 3081void
3230do_hidden_move (object *op) 3082do_hidden_move (object *op)
3231{ 3083{
3232 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3084 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3233 object *skop; 3085 object *skop;
… …
3237 3089
3238 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3090 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3239 3091
3240 /* its *extremely* hard to run and sneak/hide at the same time! */ 3092 /* its *extremely* hard to run and sneak/hide at the same time! */
3241 if (op->type == PLAYER && op->contr->run_on) 3093 if (op->type == PLAYER && op->contr->run_on)
3242 {
3243 if (!skop || num >= skop->level) 3094 if (!skop || num >= skop->level)
3244 { 3095 {
3245 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3096 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3246 make_visible (op); 3097 make_visible (op);
3247 return; 3098 return;
3248 } 3099 }
3249 else 3100 else
3250 num += 20; 3101 num += 20;
3251 } 3102
3252 num += op->map->difficulty; 3103 num += op->map->difficulty;
3253 hide = hideability (op); /* modify by terrain hidden level */ 3104 hide = hideability (op); /* modify by terrain hidden level */
3254 num -= hide; 3105 num -= hide;
3106
3255 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3107 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3256 { 3108 {
3257 make_visible (op); 3109 make_visible (op);
3258 if (op->type == PLAYER) 3110 if (op->type == PLAYER)
3259 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3111 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3260 } 3112 }
3261 else if (op->type == PLAYER && skop) 3113 else if (op->type == PLAYER && skop)
3262 {
3263 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3114 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3264 }
3265} 3115}
3266 3116
3267/* determine if who is standing near a hostile creature. */ 3117/* determine if who is standing near a hostile creature. */
3268 3118
3269int 3119int
… …
3317 * object op. This function works fine for monsters, 3167 * object op. This function works fine for monsters,
3318 * but we dont worry if the object isnt the top one in 3168 * but we dont worry if the object isnt the top one in
3319 * a pile (say a coin under a table would return "viewable" 3169 * a pile (say a coin under a table would return "viewable"
3320 * by this routine). Another question, should we be 3170 * by this routine). Another question, should we be
3321 * concerned with the direction the player is looking 3171 * concerned with the direction the player is looking
3322 * in? Realistically, most of use cant see stuff behind 3172 * in? Realistically, most of us can't see stuff behind
3323 * our backs...on the other hand, does the "facing" direction 3173 * our backs...on the other hand, does the "facing" direction
3324 * imply the way your head, or body is facing? Its possible 3174 * imply the way your head, or body is facing? It's possible
3325 * for them to differ. Sigh, this fctn could get a bit more complex. 3175 * for them to differ. Sigh, this fctn could get a bit more complex.
3326 * -b.t. 3176 * -b.t.
3327 * This function is now map tiling safe. 3177 * This function is now map tiling safe.
3328 */ 3178 */
3329
3330int 3179int
3331player_can_view (object *pl, object *op) 3180player_can_view (object *pl, object *op)
3332{ 3181{
3333 rv_vector rv; 3182 rv_vector rv;
3334 int dx, dy; 3183 int dx, dy;
… …
3336 if (pl->type != PLAYER) 3185 if (pl->type != PLAYER)
3337 { 3186 {
3338 LOG (llevError, "player_can_view() called for non-player object\n"); 3187 LOG (llevError, "player_can_view() called for non-player object\n");
3339 return -1; 3188 return -1;
3340 } 3189 }
3190
3341 if (!pl || !op) 3191 if (!pl || !op)
3342 return 0; 3192 return 0;
3343 3193
3344 if (op->head)
3345 {
3346 op = op->head; 3194 op = op->head_ ();
3347 } 3195
3348 get_rangevector (pl, op, &rv, 0x1); 3196 get_rangevector (pl, op, &rv, 0x1);
3349 3197
3350 /* starting with the 'head' part, lets loop 3198 /* starting with the 'head' part, lets loop
3351 * through the object and find if it has any 3199 * through the object and find if it has any
3352 * part that is in the los array but isnt on 3200 * part that is in the los array but isn't on
3353 * a blocked los square. 3201 * a blocked los square.
3354 * we use the archetype to figure out offsets. 3202 * we use the archetype to figure out offsets.
3355 */ 3203 */
3356 while (op) 3204 while (op)
3357 { 3205 {
3358 dx = rv.distance_x + op->arch->clone.x; 3206 dx = rv.distance_x + op->arch->x;
3359 dy = rv.distance_y + op->arch->clone.y; 3207 dy = rv.distance_y + op->arch->y;
3360 3208
3361 /* only the viewable area the player sees is updated by LOS 3209 /* only the viewable area the player sees is updated by LOS
3362 * code, so we need to restrict ourselves to that range of values 3210 * code, so we need to restrict ourselves to that range of values
3363 * for any meaningful values. 3211 * for any meaningful values.
3364 */ 3212 */
3365 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3213 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3366 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3214 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3367 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3215 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3368 return 1; 3216 return 1;
3217
3369 op = op->more; 3218 op = op->more;
3370 } 3219 }
3220
3371 return 0; 3221 return 0;
3372} 3222}
3373 3223
3374/* routine for both players and monsters. We call this when 3224/* routine for both players and monsters. We call this when
3375 * there is a possibility for our action distrubing our hiding 3225 * there is a possibility for our action distrubing our hiding
… …
3378 * return 0. 3228 * return 0.
3379 */ 3229 */
3380int 3230int
3381action_makes_visible (object *op) 3231action_makes_visible (object *op)
3382{ 3232{
3383
3384 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3233 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3385 { 3234 {
3386 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3235 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3387 return 0; 3236 return 0;
3388 3237
… …
3394 { 3243 {
3395 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3244 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3396 return 1; 3245 return 1;
3397 } 3246 }
3398 } 3247 }
3248
3399 return 0; 3249 return 0;
3400} 3250}
3401 3251
3402/* op_on_battleground - checks if the given object op (usually 3252/* op_on_battleground - checks if the given object op (usually
3403 * a player) is standing on a valid battleground-tile, 3253 * a player) is standing on a valid battleground-tile,
… …
3408 * Default is to do the same as before, so only people wanting to have different points need worry about this 3258 * Default is to do the same as before, so only people wanting to have different points need worry about this
3409 */ 3259 */
3410int 3260int
3411op_on_battleground (object *op, int *x, int *y) 3261op_on_battleground (object *op, int *x, int *y)
3412{ 3262{
3413 object *tmp;
3414
3415 /* A battleground-tile needs the following attributes to be valid: 3263 /* A battleground-tile needs the following attributes to be valid:
3416 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3264 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3417 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3265 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3418 * and the exit-coordinates sp/hp must both be > 0. 3266 * and the exit-coordinates sp/hp must both be > 0.
3419 * => The intention here is to prevent abuse of the battleground- 3267 * => The intention here is to prevent abuse of the battleground-
3420 * feature (like pickable or hidden battleground tiles). */ 3268 * feature (like pickable or hidden battleground tiles). */
3421 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3269 for (object *tmp = op->below; tmp; tmp = tmp->below)
3422 { 3270 {
3423 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3271 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3424 { 3272 {
3425 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3273 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3426 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3274 && tmp->type == BATTLEGROUND
3275 && tmp->name == shstr_battleground
3276 && EXIT_X (tmp) && EXIT_Y (tmp))
3427 { 3277 {
3428 /*before we assign the exit, check if this is a teambattle */ 3278 /* before we assign the exit, check if this is a teambattle */
3429 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3279 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3430 { 3280 {
3431 object *invtmp;
3432
3433 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3281 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3434 { 3282 {
3435 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3283 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3436 { 3284 {
3437 if (x != NULL && y != NULL) 3285 if (x && y)
3438 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3286 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3287
3439 return 1; 3288 return 1;
3440 } 3289 }
3441 } 3290 }
3442 } 3291 }
3292
3443 if (x != NULL && y != NULL) 3293 if (x && y)
3444 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3294 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3295
3445 return 1; 3296 return 1;
3446 } 3297 }
3447 } 3298 }
3448 } 3299 }
3300
3449 /* If we got here, did not find a battleground */ 3301 /* If we got here, did not find a battleground */
3450 return 0; 3302 return 0;
3451} 3303}
3452 3304
3453/* 3305/*
… …
3469 char buf[MAX_BUF]; /* tmp. string buffer */ 3321 char buf[MAX_BUF]; /* tmp. string buffer */
3470 int i = 0, j = 0; 3322 int i = 0, j = 0;
3471 3323
3472 /* get the appropriate treasurelist */ 3324 /* get the appropriate treasurelist */
3473 if (atnr == ATNR_FIRE) 3325 if (atnr == ATNR_FIRE)
3474 trlist = find_treasurelist ("dragon_ability_fire"); 3326 trlist = treasurelist::find (shstr_dragon_ability_fire);
3475 else if (atnr == ATNR_COLD) 3327 else if (atnr == ATNR_COLD)
3476 trlist = find_treasurelist ("dragon_ability_cold"); 3328 trlist = treasurelist::find (shstr_dragon_ability_cold);
3477 else if (atnr == ATNR_ELECTRICITY) 3329 else if (atnr == ATNR_ELECTRICITY)
3478 trlist = find_treasurelist ("dragon_ability_elec"); 3330 trlist = treasurelist::find (shstr_dragon_ability_elec);
3479 else if (atnr == ATNR_POISON) 3331 else if (atnr == ATNR_POISON)
3480 trlist = find_treasurelist ("dragon_ability_poison"); 3332 trlist = treasurelist::find (shstr_dragon_ability_poison);
3481 3333
3482 if (trlist == NULL || who->type != PLAYER) 3334 if (trlist == NULL || who->type != PLAYER)
3483 return; 3335 return;
3484 3336
3485 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3337 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3486 3338
3487 if (tr == NULL || tr->item == NULL) 3339 if (!tr || !tr->item)
3488 { 3340 {
3489 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3341 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3490 return; 3342 return;
3491 } 3343 }
3492 3344
3493 /* everything seems okay - now bring on the gift: */ 3345 /* everything seems okay - now bring on the gift: */
3494 item = &(tr->item->clone); 3346 item = tr->item;
3495 3347
3496 if (item->type == SPELL) 3348 if (item->type == SPELL)
3497 { 3349 {
3498 if (check_spell_known (who, item->name)) 3350 if (check_spell_known (who, item->name))
3499 return; 3351 return;
… …
3558 { 3410 {
3559 /* forces in the treasurelist can alter the player's stats */ 3411 /* forces in the treasurelist can alter the player's stats */
3560 object *skin; 3412 object *skin;
3561 3413
3562 /* first get the dragon skin force */ 3414 /* first get the dragon skin force */
3563 shstr_cmp dragon_skin_force ("dragon_skin_force");
3564 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3415 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3565 ; 3416 ;
3566 3417
3567 if (!skin) 3418 if (!skin)
3568 return; 3419 return;
3569 3420
… …
3617 * not readied. 3468 * not readied.
3618 */ 3469 */
3619void 3470void
3620player_unready_range_ob (player *pl, object *ob) 3471player_unready_range_ob (player *pl, object *ob)
3621{ 3472{
3622 rangetype i; 3473 if (pl->ob->current_weapon == ob)
3474 pl->ob->current_weapon = 0;
3623 3475
3624 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3476 if (pl->combat_ob == ob)
3625 { 3477 pl->combat_ob = 0;
3478
3626 if (pl->ranges[i] == ob) 3479 if (pl->ranged_ob == ob)
3627 { 3480 pl->ranged_ob = 0;
3628 pl->ranges[i] = NULL;
3629 if (pl->shoottype == i)
3630 {
3631 pl->shoottype = range_none;
3632 }
3633 }
3634 }
3635} 3481}
3482
3483sint8
3484player::visibility_at (maptile *map, int x, int y) const
3485{
3486 if (!ns)
3487 return 0;
3488
3489 int dx, dy;
3490 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3491 return 0;
3492
3493 x += dx - ns->current_x + ns->mapx / 2;
3494 y += dy - ns->current_y + ns->mapy / 2;
3495
3496 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3497 return 0;
3498
3499 return 100 - blocked_los [x][y];
3500}
3501
3502void
3503player::infobox (const char *title, const char *msg, int color)
3504{
3505 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3506}
3507
3508void
3509player::statusmsg (const char *msg, int color)
3510{
3511 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3512}
3513
3514void
3515player::failmsg (const char *msg, int color)
3516{
3517 play_sound (sound_find ("generic_failure"));
3518 statusmsg (msg, color);
3519}
3520

Diff Legend

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