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.148 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.217 by root, Sun Dec 28 08:56:44 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
… …
123 continue; 122 continue;
124 123
125 if (*buf == '%') 124 if (*buf == '%')
126 { /* send one news */ 125 { /* send one news */
127 if (size > 0) 126 if (size > 0)
128 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 */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
129 131
130 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
131 strip_endline (subject); 133 strip_endline (subject);
132 size = 0; 134 size = 0;
133 news[0] = '\0'; 135 news[0] = '\0';
… …
184 186
185 if (ob->map) 187 if (ob->map)
186 maplevel = ob->map->path; 188 maplevel = ob->map->path;
187 189
188 ob->remove (); 190 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 192 ob->map = 0;
190 party = 0; 193 party = 0;
191 194
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 196
… …
207 ob->close_container (); //TODO: client-specific 210 ob->close_container (); //TODO: client-specific
208 211
209 ns->update_look = 0; 212 ns->update_look = 0;
210 ns->look_position = 0; 213 ns->look_position = 0;
211 214
212 clear_los (this); 215 clear_los ();
213 216
214 ns->reset_stats (); 217 ns->reset_stats ();
215 218
216 /* make sure he's a player -- needed because of class change. */ 219 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 220 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->clone.race; 221 ob->race = ob->arch->race;
219 222
220 ob->carrying = sum_weight (ob); 223 ob->update_weight ();
221 link_player_skills (ob); 224 link_skills ();
222 225
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 227
225 assign (title, ob->arch->clone.name); 228 assign (title, ob->arch->object::name);
226 229
227 /* if it's a dragon player, set the correct title here */ 230 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 231 if (is_dragon_pl (ob))
229 { 232 {
230 object *tmp, *abil = 0, *skin = 0; 233 object *tmp, *abil = 0, *skin = 0;
231 234
232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 235 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 236 if (tmp->type == FORCE)
237 if (tmp->arch->archname == dragon_ability_force) 237 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 238 abil = tmp;
239 else if (tmp->arch->archname == dragon_skin_force) 239 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 240 skin = tmp;
241 241
242 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
243 } 243 }
244 244
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246 246
247 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this);
248
249 ob->update_stats ();
250
251 ns->floorbox_update ();
252 esrv_send_inventory (ob, ob);
253 esrv_add_spells (this, 0);
254
255 activate ();
256
257 send_rules (ob);
258 send_news (ob);
259 display_motd (ob);
260
261 INVOKE_PLAYER (CONNECT, this);
262 INVOKE_PLAYER (LOGIN, this);
263}
264
265void
266player::disconnect ()
267{
268 if (ob)
269 {
270 ob->close_container (); //TODO: client-specific
271 ob->drop_unpaid_items ();
272 }
273
274 if (ns)
275 {
276 if (active)
277 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
278
279 INVOKE_PLAYER (DISCONNECT, this);
280
281 ns->reset_stats ();
282 ns->pl = 0;
283 ns = 0;
284 }
285
286 observe = ob;
287
288 deactivate ();
289}
290
291// the need for this function can be explained
292// by load_object not returning the object
293void
294player::set_object (object *op)
295{
296 ob = observe = op;
297 ob->contr = this; /* this aren't yet in archetype */
298
299 ob->speed = 1.0f;
300 ob->speed_left = 0.5f;
301
302 ob->direction = 5; /* So player faces south */
248 303
249 ob->flag [FLAG_READY_WEAPON] = false; 304 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false; 305 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false; 306 ob->flag [FLAG_READY_BOW] = false;
252 307
… …
269 combat_ob = op; 324 combat_ob = op;
270 break; 325 break;
271 } 326 }
272 327
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274 ob->update_stats (); 329 ob->deactivate (); // change_weapon activates, fix this better
275
276 ns->floorbox_update ();
277 esrv_send_inventory (ob, ob);
278 esrv_add_spells (this, 0);
279
280 activate ();
281
282 send_rules (ob);
283 send_news (ob);
284 display_motd (ob);
285
286 INVOKE_PLAYER (CONNECT, this);
287 INVOKE_PLAYER (LOGIN, this);
288}
289
290void
291player::disconnect ()
292{
293 if (ns)
294 {
295 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298 INVOKE_PLAYER (DISCONNECT, this);
299
300 ns->reset_stats ();
301 ns->pl = 0;
302 ns = 0;
303 }
304
305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
308 deactivate ();
309}
310
311// the need for this function can be explained
312// by load_object not returning the object
313void
314player::set_object (object *op)
315{
316 ob = observe = op;
317 ob->contr = this; /* this aren't yet in archetype */
318
319 ob->speed = 1.0f;
320 ob->speed_left = 0.5f;
321
322 ob->direction = 5; /* So player faces south */
323} 330}
324 331
325void 332void
326player::set_observe (object *op) 333player::set_observe (object *op)
327{ 334{
… …
341 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
342 349
343 gen_sp_armour = 10; 350 gen_sp_armour = 10;
344 bowtype = bow_normal; 351 bowtype = bow_normal;
345 petmode = pet_normal; 352 petmode = pet_normal;
346 listening = 10;
347 usekeys = containers; 353 usekeys = containers;
348 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
349 do_los = 1; 355 do_los = 1;
350 356
351 weapon_sp = 1.0f; 357 weapon_sp = 1.0f;
… …
362 if (ob) 368 if (ob)
363 { 369 {
364 ob->destroy_inv (false); 370 ob->destroy_inv (false);
365 ob->destroy (); 371 ob->destroy ();
366 } 372 }
373
374 ob = observe = 0;
367} 375}
368 376
369player::~player () 377player::~player ()
370{ 378{
371 /* Clear item stack */ 379 /* Clear item stack */
… …
398 * Note: there MUST be at least one player archetype! 406 * Note: there MUST be at least one player archetype!
399 */ 407 */
400archetype * 408archetype *
401get_player_archetype (archetype *at) 409get_player_archetype (archetype *at)
402{ 410{
403 archetype *start = at; 411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
417 archvec::iterator i = archetypes.find (nat);
404 418
405 for (;;) 419 for (;;)
406 { 420 {
407 if (at == NULL || at->next == NULL) 421 if (++i == archetypes.end ())
408 at = first_archetype; 422 i = archetypes.begin ();
409 else 423 else if (*i == at)
410 at = at->next; 424 cleanup ("not a single player archetype found");
411 425
412 if (at->clone.type == PLAYER) 426 if ((*i)->type == PLAYER)
413 return at; 427 return *i;
414
415 if (at == start)
416 {
417 LOG (llevError, "No Player archetypes\n");
418 exit (-1);
419 }
420 } 428 }
421} 429}
422 430
423object * 431object *
424get_nearest_player (object *mon) 432get_nearest_player (object *mon)
… …
428 unsigned lastdist; 436 unsigned lastdist;
429 rv_vector rv; 437 rv_vector rv;
430 438
431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 439 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
432 { 440 {
433 /* We should not find free objects on this friendly list, but it
434 * does periodically happen. Given that, lets deal with it.
435 * While unlikely, it is possible the next object on the friendly
436 * list is also free, so encapsulate this in a while loop.
437 */
438 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
439 {
440 object *tmp = ol->ob;
441
442 /* Can't do much more other than log the fact, because the object
443 * itself will have been cleared.
444 */
445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
447 ol = ol->next;
448 remove_friendly_object (tmp);
449 if (!ol)
450 return op;
451 }
452
453 /* Remove special check for player from this. First, it looks to cause
454 * some crashes (ol->ob->contr not set properly?), but secondly, a more
455 * complicated method of state checking would be needed in any case -
456 * as it was, a clever player could type quit, and the function would
457 * skip them over while waiting for confirmation. Remove
458 * on_same_map check, as can_detect_enemy also does this
459 */
460 if (!can_detect_enemy (mon, ol->ob, &rv)) 441 if (!can_detect_enemy (mon, ol->ob, &rv))
461 continue; 442 continue;
462 443
463 if (lastdist > rv.distance) 444 if (lastdist > rv.distance)
464 { 445 {
… …
659 640
660 return firstdir; 641 return firstdir;
661} 642}
662 643
663void 644void
664give_initial_items (object *pl, treasurelist * items) 645give_initial_items (object *pl, treasurelist *items)
665{ 646{
666 object *op, *next = NULL;
667
668 if (pl->randomitems != NULL) 647 if (pl->randomitems)
669 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 648 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
670 649
671 for (op = pl->inv; op; op = next) 650 for (object *next, *op = pl->inv; op; op = next)
672 { 651 {
673 next = op->below; 652 next = op->below;
674 653
675 /* Forces get applied per default, unless they have the 654 /* Forces get applied per default, unless they have the
676 * flag "neutral" set. Sorry but I can't think of a better way 655 * flag "neutral" set. Sorry but I can't think of a better way
… …
681 /* we never give weapons/armour if these cannot be used 660 /* we never give weapons/armour if these cannot be used
682 * by this player due to race restrictions 661 * by this player due to race restrictions
683 */ 662 */
684 if (pl->type == PLAYER) 663 if (pl->type == PLAYER)
685 { 664 {
686 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 665 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
666 &&
687 (op->type == ARMOUR || op->type == BOOTS || 667 (op->type == ARMOUR || op->type == BOOTS
688 op->type == CLOAK || op->type == HELMET || 668 || op->type == CLOAK || op->type == HELMET
689 op->type == SHIELD || op->type == GLOVES || 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE))
690 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
691 { 672 {
692 op->destroy (); 673 op->destroy ();
693 continue; 674 continue;
694 } 675 }
695 } 676 }
… …
718 if (op->nrof > 1) 699 if (op->nrof > 1)
719 op->nrof = 1; 700 op->nrof = 1;
720 } 701 }
721 702
722 if (op->type == SPELLBOOK && op->inv) 703 if (op->type == SPELLBOOK && op->inv)
723 {
724 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 704 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
725 }
726 705
727 /* Give starting characters identified, uncursed, and undamned 706 /* Give starting characters identified, uncursed, and undamned
728 * items. Just don't identify gold or silver, or it won't be 707 * items. Just don't identify gold or silver, or it won't be
729 * merged properly. 708 * merged properly.
730 */ 709 */
731 if (need_identify (op)) 710 if (need_identify (op))
732 { 711 {
733 SET_FLAG (op, FLAG_IDENTIFIED); 712 SET_FLAG (op, FLAG_IDENTIFIED);
734 CLEAR_FLAG (op, FLAG_CURSED); 713 CLEAR_FLAG (op, FLAG_CURSED);
735 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
736 } 715 }
716
737 if (op->type == SPELL) 717 if (op->type == SPELL)
738 { 718 {
739 op->destroy (); 719 op->destroy ();
740 continue; 720 continue;
741 } 721 }
… …
743 { 723 {
744 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
745 op->stats.exp = 0; 725 op->stats.exp = 0;
746 op->level = 1; 726 op->level = 1;
747 } 727 }
748 /* lock all 'normal items by default */ 728 else /* lock all 'normal items by default */
749 else
750 SET_FLAG (op, FLAG_INV_LOCKED); 729 SET_FLAG (op, FLAG_INV_LOCKED);
751 } /* for loop of objects in player inv */ 730 } /* for loop of objects in player inv */
752 731
753 /* Need to set up the skill pointers */ 732 /* Need to set up the skill pointers */
754 link_player_skills (pl); 733 pl->contr->link_skills ();
755} 734}
756 735
757void 736void
758get_party_password (object *op, partylist *party) 737get_party_password (object *op, partylist *party)
759{ 738{
… …
860static void 839static void
861start_info (object *op) 840start_info (object *op)
862{ 841{
863 char buf[MAX_BUF]; 842 char buf[MAX_BUF];
864 843
865 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 844 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
866 new_draw_info (NDI_UNIQUE, 0, op, buf); 845 new_draw_info (NDI_UNIQUE, 0, op, buf);
867 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
868 //new_draw_info (NDI_UNIQUE, 0, op, " ");
869} 846}
870 847
871/* This function takes the key that is passed, and does the 848/* This function takes the key that is passed, and does the
872 * appropriate action with it (change race, or other things). 849 * appropriate action with it (change race, or other things).
873 * The function name is for historical reasons - now we have 850 * The function name is for historical reasons - now we have
… …
876 */ 853 */
877void 854void
878player::chargen_race_done () 855player::chargen_race_done ()
879{ 856{
880 /* this must before then initial items are given */ 857 /* this must before then initial items are given */
881 esrv_new_player (ob->contr, ob->weight + ob->carrying); 858 esrv_new_player (ob->contr);
882 859
883 treasurelist *tl = treasurelist::find ("starting_wealth"); 860 treasurelist *tl = treasurelist::find ("starting_wealth");
884 if (tl) 861 if (tl)
885 create_treasure (tl, ob, 0, 0, 0); 862 create_treasure (tl, ob, 0, 0, 0);
886 863
… …
890 ob->contr->ns->state = ST_PLAYING; 867 ob->contr->ns->state = ST_PLAYING;
891 868
892 if (ob->msg) 869 if (ob->msg)
893 ob->msg = 0; 870 ob->msg = 0;
894 871
895 /* We create this now because some of the unique maps will need it
896 * to save here.
897 */
898 {
899 char buf[MAX_BUF];
900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
901 make_path_to_file (buf);
902 }
903
904 start_info (ob); 872 start_info (ob);
905 CLEAR_FLAG (ob, FLAG_WIZ); 873 CLEAR_FLAG (ob, FLAG_WIZ);
906 give_initial_items (ob, ob->randomitems); 874 give_initial_items (ob, ob->randomitems);
907 link_player_skills (ob);
908 esrv_send_inventory (ob, ob); 875 esrv_send_inventory (ob, ob);
909 ob->update_stats (); 876 ob->update_stats ();
910 877
911 /* This moves the player to a different start map, if there 878 /* This moves the player to a different start map, if there
912 * is one for this race 879 * is one for this race
913 */ 880 */
914 if (*first_map_ext_path) 881 if (*first_map_ext_path)
915 { 882 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
916 object *tmp;
917 char mapname[MAX_BUF];
918
919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920 tmp = object::create ();
921 EXIT_PATH (tmp) = mapname;
922 EXIT_X (tmp) = ob->x;
923 EXIT_Y (tmp) = ob->y;
924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
925 * if the map isn't there, then stay on the
926 * default initial map */
927 tmp->destroy ();
928 }
929 else 883 else
930 LOG (llevDebug, "first_map_ext_path not set\n"); 884 LOG (llevDebug, "first_map_ext_path not set\n");
931} 885}
932 886
933void 887void
… …
943 int x = ob->x, y = ob->y; 897 int x = ob->x, y = ob->y;
944 898
945 ob->remove_statbonus (); 899 ob->remove_statbonus ();
946 ob->remove (); 900 ob->remove ();
947 ob->arch = get_player_archetype (ob->arch); 901 ob->arch = get_player_archetype (ob->arch);
948 ob->arch->clone.copy_to (ob); 902 ob->arch->copy_to (ob);
949 ob->instantiate (); 903 ob->instantiate ();
950 ob->stats = ob->contr->orig_stats; 904 ob->stats = ob->contr->orig_stats;
951 ob->name = ob->name_pl = name; 905 ob->name = ob->name_pl = name;
952 ob->x = x; 906 ob->x = x;
953 ob->y = y; 907 ob->y = y;
954 SET_ANIMATION (ob, 2); /* So player faces south */ 908 SET_ANIMATION (ob, 2); /* So player faces south */
955 insert_ob_in_map (ob, ob->map, ob, 0); 909 insert_ob_in_map (ob, ob->map, ob, 0);
956 assign (ob->contr->title, ob->arch->clone.name); 910 assign (ob->contr->title, ob->arch->object::name);
957 ob->add_statbonus (); 911 ob->add_statbonus ();
958 } 912 }
959 while (!allowed_class (ob)); 913 while (!allowed_class (ob));
960 914
961 update_object (ob, UP_OBJ_FACE); 915 update_object (ob, UP_OBJ_FACE);
… …
977 LOG (llevDebug, "Fleeing player is dead.\n"); 931 LOG (llevDebug, "Fleeing player is dead.\n");
978 CLEAR_FLAG (op, FLAG_SCARED); 932 CLEAR_FLAG (op, FLAG_SCARED);
979 return; 933 return;
980 } 934 }
981 935
982 if (op->enemy == NULL) 936 if (!op->enemy)
983 { 937 {
984 LOG (llevDebug, "Fleeing player had no enemy.\n"); 938 LOG (llevDebug, "Fleeing player had no enemy.\n");
985 CLEAR_FLAG (op, FLAG_SCARED); 939 CLEAR_FLAG (op, FLAG_SCARED);
986 return; 940 return;
987 } 941 }
988 942
989 /* Seen some crashes here. Since we don't store an
990 * op->enemy_count, it is possible that something destroys the
991 * actual enemy, and the object is recycled.
992 */
993 if (op->enemy->map == NULL)
994 {
995 CLEAR_FLAG (op, FLAG_SCARED);
996 op->enemy = NULL;
997 return;
998 }
999
1000 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 943 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1001 { 944 {
1002 op->enemy = NULL; 945 op->enemy = NULL;
1003 CLEAR_FLAG (op, FLAG_SCARED); 946 CLEAR_FLAG (op, FLAG_SCARED);
1004 return; 947 return;
… …
1007 get_rangevector (op, op->enemy, &rv, 0); 950 get_rangevector (op, op->enemy, &rv, 0);
1008 951
1009 dir = absdir (4 + rv.direction); 952 dir = absdir (4 + rv.direction);
1010 for (diff = 0; diff < 3; diff++) 953 for (diff = 0; diff < 3; diff++)
1011 { 954 {
1012 int m = 1 - (RANDOM () & 2); 955 int m = 1 - rndm (2) * 2;
1013 956
1014 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 957 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1015 return; 958 return;
1016 } 959 }
1017 960
… …
1036 if (op->move_type & MOVE_FLYING) 979 if (op->move_type & MOVE_FLYING)
1037 return 1; 980 return 1;
1038 981
1039 next = op->below; 982 next = op->below;
1040 983
984 int cnt = MAX_ITEM_PER_DROP;
985#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
986
1041 /* loop while there are items on the floor that are not marked as 987 /* loop while there are items on the floor that are not marked as
1042 * destroyed */ 988 * destroyed */
1043 while (next && !next->destroyed ()) 989 while (next && !next->destroyed ())
1044 { 990 {
1045 tmp = next; 991 tmp = next;
1046 next = tmp->below; 992 next = tmp->below;
1047 993
994 if (cnt <= 0)
995 {
996 op->failmsg ("Couldn't pickup all items at once.");
997 return 0;
998 }
999
1048 if (op->destroyed ()) 1000 if (op->destroyed ())
1049 return 0; 1001 return 0;
1050 1002
1051 if (!can_pick (op, tmp)) 1003 if (!can_pick (op, tmp))
1052 continue; 1004 continue;
1053 1005
1054 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1006 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1055 { 1007 {
1056 if (item_matched_string (op, tmp, op->contr->search_str)) 1008 if (item_matched_string (op, tmp, op->contr->search_str))
1057 pick_up (op, tmp); 1009 CHK_PICK_PICKUP;
1010
1058 continue; 1011 continue;
1059 } 1012 }
1060 1013
1061 /* high not bit set? We're using the old autopickup model */ 1014 /* high not bit set? We're using the old autopickup model */
1062 if (!(op->contr->mode & PU_NEWMODE)) 1015 if (!(op->contr->mode & PU_NEWMODE))
… …
1064 switch (op->contr->mode) 1017 switch (op->contr->mode)
1065 { 1018 {
1066 case 0: 1019 case 0:
1067 return 1; /* don't pick up */ 1020 return 1; /* don't pick up */
1068 case 1: 1021 case 1:
1069 pick_up (op, tmp); 1022 CHK_PICK_PICKUP;
1070 return 1; 1023 return 1;
1071 case 2: 1024 case 2:
1072 pick_up (op, tmp); 1025 CHK_PICK_PICKUP;
1073 return 0; 1026 return 0;
1074 case 3: 1027 case 3:
1075 return 0; /* stop before pickup */ 1028 return 0; /* stop before pickup */
1076 case 4: 1029 case 4:
1077 pick_up (op, tmp); 1030 CHK_PICK_PICKUP;
1078 break; 1031 break;
1079 case 5: 1032 case 5:
1080 pick_up (op, tmp); 1033 CHK_PICK_PICKUP;
1081 stop = 1; 1034 stop = 1;
1082 break; 1035 break;
1083 case 6: 1036 case 6:
1084 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1037 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1085 pick_up (op, tmp); 1038 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1039 CHK_PICK_PICKUP;
1086 break; 1040 break;
1087 1041
1088 case 7: 1042 case 7:
1089 if (tmp->type == MONEY || tmp->type == GEM) 1043 if (tmp->type == MONEY || tmp->type == GEM)
1090 pick_up (op, tmp); 1044 CHK_PICK_PICKUP;
1091 break; 1045 break;
1092 1046
1093 default: 1047 default:
1094 /* use value density */ 1048 /* use value density */
1095 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1049 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1096 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1050 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1097 pick_up (op, tmp); 1051 CHK_PICK_PICKUP;
1098 } 1052 }
1099 } 1053 }
1100 else 1054 else
1101 { /* old model */ 1055 { /* old model */
1102 /* NEW pickup handling */ 1056 /* NEW pickup handling */
… …
1157 /* all food and drink if desired */ 1111 /* all food and drink if desired */
1158 /* question: don't pick up known-poisonous stuff? */ 1112 /* question: don't pick up known-poisonous stuff? */
1159 if (op->contr->mode & PU_FOOD) 1113 if (op->contr->mode & PU_FOOD)
1160 if (tmp->type == FOOD) 1114 if (tmp->type == FOOD)
1161 { 1115 {
1162 pick_up (op, tmp); 1116 CHK_PICK_PICKUP;
1163 continue; 1117 continue;
1164 } 1118 }
1165 1119
1166 if (op->contr->mode & PU_DRINK) 1120 if (op->contr->mode & PU_DRINK)
1167 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1121 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1168 { 1122 {
1169 pick_up (op, tmp); 1123 CHK_PICK_PICKUP;
1170 continue; 1124 continue;
1171 } 1125 }
1172 1126
1173 if (op->contr->mode & PU_POTION) 1127 if (op->contr->mode & PU_POTION)
1174 if (tmp->type == POTION) 1128 if (tmp->type == POTION)
1175 { 1129 {
1176 pick_up (op, tmp); 1130 CHK_PICK_PICKUP;
1177 continue; 1131 continue;
1178 } 1132 }
1179 1133
1180 /* spellbooks, skillscrolls and normal books/scrolls */ 1134 /* spellbooks, skillscrolls and normal books/scrolls */
1181 if (op->contr->mode & PU_SPELLBOOK) 1135 if (op->contr->mode & PU_SPELLBOOK)
1182 if (tmp->type == SPELLBOOK) 1136 if (tmp->type == SPELLBOOK)
1183 { 1137 {
1184 pick_up (op, tmp); 1138 CHK_PICK_PICKUP;
1185 continue; 1139 continue;
1186 } 1140 }
1187 1141
1188 if (op->contr->mode & PU_SKILLSCROLL) 1142 if (op->contr->mode & PU_SKILLSCROLL)
1189 if (tmp->type == SKILLSCROLL) 1143 if (tmp->type == SKILLSCROLL)
1190 { 1144 {
1191 pick_up (op, tmp); 1145 CHK_PICK_PICKUP;
1192 continue; 1146 continue;
1193 } 1147 }
1194 1148
1195 if (op->contr->mode & PU_READABLES) 1149 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL) 1150 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1197 { 1151 {
1198 pick_up (op, tmp); 1152 CHK_PICK_PICKUP;
1199 continue; 1153 continue;
1200 } 1154 }
1201 1155
1202 /* wands/staves/rods/horns */ 1156 /* wands/staves/rods/horns */
1203 if (op->contr->mode & PU_MAGIC_DEVICE) 1157 if (op->contr->mode & PU_MAGIC_DEVICE)
1204 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1158 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1205 { 1159 {
1206 pick_up (op, tmp); 1160 CHK_PICK_PICKUP;
1207 continue; 1161 continue;
1208 } 1162 }
1209 1163
1210 /* pick up all magical items */ 1164 /* pick up all magical items */
1211 if (op->contr->mode & PU_MAGICAL) 1165 if (op->contr->mode & PU_MAGICAL)
1212 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1166 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1213 { 1167 {
1214 pick_up (op, tmp); 1168 CHK_PICK_PICKUP;
1215 continue; 1169 continue;
1216 } 1170 }
1217 1171
1218 if (op->contr->mode & PU_VALUABLES) 1172 if (op->contr->mode & PU_VALUABLES)
1219 { 1173 {
1220 if (tmp->type == MONEY || tmp->type == GEM) 1174 if (tmp->type == MONEY || tmp->type == GEM)
1221 { 1175 {
1222 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1223 continue; 1177 continue;
1224 } 1178 }
1225 } 1179 }
1226 1180
1227 /* rings & amulets - talismans seems to be typed AMULET */ 1181 /* rings & amulets - talismans seems to be typed AMULET */
1228 if (op->contr->mode & PU_JEWELS) 1182 if (op->contr->mode & PU_JEWELS)
1229 if (tmp->type == RING || tmp->type == AMULET) 1183 if (tmp->type == RING || tmp->type == AMULET)
1230 { 1184 {
1231 pick_up (op, tmp); 1185 CHK_PICK_PICKUP;
1232 continue; 1186 continue;
1233 } 1187 }
1234 1188
1235 /* we don't forget dragon food */ 1189 /* we don't forget dragon food */
1236 if (op->contr->mode & PU_FLESH) 1190 if (op->contr->mode & PU_FLESH)
1237 if (tmp->type == FLESH) 1191 if (tmp->type == FLESH)
1238 { 1192 {
1239 pick_up (op, tmp); 1193 CHK_PICK_PICKUP;
1240 continue; 1194 continue;
1241 } 1195 }
1242 1196
1243 /* bows and arrows. Bows are good for selling! */ 1197 /* bows and arrows. Bows are good for selling! */
1244 if (op->contr->mode & PU_BOW) 1198 if (op->contr->mode & PU_BOW)
1245 if (tmp->type == BOW) 1199 if (tmp->type == BOW)
1246 { 1200 {
1247 pick_up (op, tmp); 1201 CHK_PICK_PICKUP;
1248 continue; 1202 continue;
1249 } 1203 }
1250 1204
1251 if (op->contr->mode & PU_ARROW) 1205 if (op->contr->mode & PU_ARROW)
1252 if (tmp->type == ARROW) 1206 if (tmp->type == ARROW)
1253 { 1207 {
1254 pick_up (op, tmp); 1208 CHK_PICK_PICKUP;
1255 continue; 1209 continue;
1256 } 1210 }
1257 1211
1258 /* all kinds of armor etc. */ 1212 /* all kinds of armor etc. */
1259 if (op->contr->mode & PU_ARMOUR) 1213 if (op->contr->mode & PU_ARMOUR)
1260 if (tmp->type == ARMOUR) 1214 if (tmp->type == ARMOUR)
1261 { 1215 {
1262 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1263 continue; 1217 continue;
1264 } 1218 }
1265 1219
1266 if (op->contr->mode & PU_HELMET) 1220 if (op->contr->mode & PU_HELMET)
1267 if (tmp->type == HELMET) 1221 if (tmp->type == HELMET)
1268 { 1222 {
1269 pick_up (op, tmp); 1223 CHK_PICK_PICKUP;
1270 continue; 1224 continue;
1271 } 1225 }
1272 1226
1273 if (op->contr->mode & PU_SHIELD) 1227 if (op->contr->mode & PU_SHIELD)
1274 if (tmp->type == SHIELD) 1228 if (tmp->type == SHIELD)
1275 { 1229 {
1276 pick_up (op, tmp); 1230 CHK_PICK_PICKUP;
1277 continue; 1231 continue;
1278 } 1232 }
1279 1233
1280 if (op->contr->mode & PU_BOOTS) 1234 if (op->contr->mode & PU_BOOTS)
1281 if (tmp->type == BOOTS) 1235 if (tmp->type == BOOTS)
1282 { 1236 {
1283 pick_up (op, tmp); 1237 CHK_PICK_PICKUP;
1284 continue; 1238 continue;
1285 } 1239 }
1286 1240
1287 if (op->contr->mode & PU_GLOVES) 1241 if (op->contr->mode & PU_GLOVES)
1288 if (tmp->type == GLOVES) 1242 if (tmp->type == GLOVES)
1289 { 1243 {
1290 pick_up (op, tmp); 1244 CHK_PICK_PICKUP;
1291 continue; 1245 continue;
1292 } 1246 }
1293 1247
1294 if (op->contr->mode & PU_CLOAK) 1248 if (op->contr->mode & PU_CLOAK)
1295 if (tmp->type == CLOAK) 1249 if (tmp->type == CLOAK)
1296 { 1250 {
1297 pick_up (op, tmp); 1251 CHK_PICK_PICKUP;
1298 continue; 1252 continue;
1299 } 1253 }
1300 1254
1301 /* hoping to catch throwing daggers here */ 1255 /* hoping to catch throwing daggers here */
1302 if (op->contr->mode & PU_MISSILEWEAPON) 1256 if (op->contr->mode & PU_MISSILEWEAPON)
1303 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1257 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1304 { 1258 {
1305 pick_up (op, tmp); 1259 CHK_PICK_PICKUP;
1306 continue; 1260 continue;
1307 } 1261 }
1308 1262
1309 /* careful: chairs and tables are weapons! */ 1263 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON) 1264 if (op->contr->mode & PU_ALLWEAPON)
… …
1312 if (tmp->type == WEAPON && tmp->name != NULL) 1266 if (tmp->type == WEAPON && tmp->name != NULL)
1313 { 1267 {
1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && 1268 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) 1269 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 { 1270 {
1317 pick_up (op, tmp); 1271 CHK_PICK_PICKUP;
1318 continue; 1272 continue;
1319 } 1273 }
1320 } 1274 }
1321 1275
1322 if (tmp->type == WEAPON && tmp->name == NULL) 1276 if (tmp->type == WEAPON && tmp->name == NULL)
1323 { 1277 {
1324 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) 1278 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325 { 1279 {
1326 pick_up (op, tmp); 1280 CHK_PICK_PICKUP;
1327 continue; 1281 continue;
1328 } 1282 }
1329 } 1283 }
1330 } 1284 }
1331 1285
1332 /* misc stuff that's useful */ 1286 /* misc stuff that's useful */
1333 if (op->contr->mode & PU_KEY) 1287 if (op->contr->mode & PU_KEY)
1334 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1288 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1335 { 1289 {
1336 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1337 continue; 1291 continue;
1338 } 1292 }
1339 1293
1340 /* any of the last 4 bits set means we use the ratio for value 1294 /* any of the last 4 bits set means we use the ratio for value
1341 * pickups */ 1295 * pickups */
1342 if (op->contr->mode & PU_RATIO) 1296 if (op->contr->mode & PU_RATIO)
1343 { 1297 {
1344 /* use value density to decide what else to grab */ 1298 /* use value density to decide what else to grab */
1345 /* >=7 was >= op->contr->mode */ 1299 /* >=7 was >= op->contr->mode */
1346 /* >=7 is the old standard setting. Now we take the last 4 bits 1300 /* >=7 is the old standard setting. Now we take the last 4 bits
1347 * and multiply them by 5, giving 0..15*5== 5..75 */ 1301 */
1348 wvratio = (op->contr->mode & PU_RATIO) * 5; 1302 wvratio = op->contr->mode & PU_RATIO;
1349 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1303 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1350 { 1304 {
1351 pick_up (op, tmp); 1305 CHK_PICK_PICKUP;
1352#if 0 1306#if 0
1353 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1307 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1354 if (tmp->name != NULL) 1308 if (tmp->name != NULL)
1355 { 1309 {
1356 fprintf (stderr, "%s", tmp->name); 1310 fprintf (stderr, "%s", tmp->name);
… …
1375 * found object is returned. 1329 * found object is returned.
1376 */ 1330 */
1377object * 1331object *
1378find_arrow (object *op, const char *type) 1332find_arrow (object *op, const char *type)
1379{ 1333{
1380 object *tmp = 0;
1381
1382 for (op = op->inv; op; op = op->below) 1334 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1335 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1336 return splay (tmp);
1337
1338 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1339 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1340 if (object *arrow = find_arrow (tmp, type))
1341 {
1342 splay (tmp);
1386 return op; 1343 return arrow;
1344 }
1387 1345
1388 return tmp; 1346 return 0;
1389} 1347}
1390 1348
1391/* 1349/*
1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1350 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1393 * against the target. A full test is not performed, simply a basic test 1351 * against the target. A full test is not performed, simply a basic test
… …
1416 } 1374 }
1417 } 1375 }
1418 else if (arrow->type == ARROW && arrow->race == type) 1376 else if (arrow->type == ARROW && arrow->race == type)
1419 { 1377 {
1420 /* allways prefer assasination/slaying */ 1378 /* allways prefer assasination/slaying */
1421 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1379 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1422 { 1380 {
1423 if (arrow->attacktype & AT_DEATH) 1381 if (arrow->attacktype & AT_DEATH)
1424 { 1382 {
1425 *better = 100; 1383 *better = 100;
1426 return arrow; 1384 return arrow;
… …
1434 else 1392 else
1435 { 1393 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1394 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1395 {
1438 attacktype = 1 << attacknum; 1396 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1397 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1398 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441 { 1399 {
1442 tmp = arrow; 1400 tmp = arrow;
1443 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1401 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444 } 1402 }
1445 } 1403 }
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1404 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1405 {
1448 tmp = arrow; 1406 tmp = arrow;
… …
1454 betterby = 1 + arrow->magic + arrow->stats.dam; 1412 betterby = 1 + arrow->magic + arrow->stats.dam;
1455 } 1413 }
1456 } 1414 }
1457 } 1415 }
1458 } 1416 }
1417
1459 if (tmp == NULL && arrow == NULL) 1418 if (tmp == NULL && arrow == NULL)
1460 return find_arrow (op, type); 1419 return find_arrow (op, type);
1461 1420
1462 *better = betterby; 1421 *better = betterby;
1463 return tmp; 1422 return tmp;
… …
1493 for (i = 0, found = 0; i < 20; i++) 1452 for (i = 0, found = 0; i < 20; i++)
1494 { 1453 {
1495 x += freearr_x[dir]; 1454 x += freearr_x[dir];
1496 y += freearr_y[dir]; 1455 y += freearr_y[dir];
1497 mflags = get_map_flags (m, &m, x, y, &x, &y); 1456 mflags = get_map_flags (m, &m, x, y, &x, &y);
1457
1498 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1458 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1499 { 1459 {
1500 tmp = NULL; 1460 tmp = 0;
1501 break; 1461 break;
1502 } 1462 }
1503 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1463 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1504 { 1464 {
1505 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1465 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1506 * perhaps a bad assumption. 1466 * perhaps a bad assumption.
1507 */ 1467 */
1508 tmp = NULL; 1468 tmp = 0;
1509 break; 1469 break;
1510 } 1470 }
1471
1511 if (mflags & P_IS_ALIVE) 1472 if (mflags & P_IS_ALIVE)
1512 {
1513 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1473 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1514 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1474 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1515 {
1516 found++;
1517 break;
1518 }
1519 if (found)
1520 break; 1475 break;
1521 }
1522 } 1476 }
1523 if (tmp == NULL) 1477
1478 if (!tmp)
1524 return find_arrow (op, type); 1479 return find_arrow (op, type);
1525 1480
1526 if (tmp->head) 1481 if (tmp->head)
1527 tmp = tmp->head; 1482 tmp = tmp->head;
1528 1483
… …
1573 if (bow->below) 1528 if (bow->below)
1574 { 1529 {
1575 bow->remove (); 1530 bow->remove ();
1576 op->insert (bow); 1531 op->insert (bow);
1577 } 1532 }
1578
1579 } 1533 }
1580 1534
1581 if (!bow->race || !bow->skill) 1535 if (!bow->race || !bow->skill)
1582 { 1536 {
1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1537 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1609 } 1563 }
1610 1564
1611 /* this should not happen, but sometimes does */ 1565 /* this should not happen, but sometimes does */
1612 if (arrow->nrof == 0) 1566 if (arrow->nrof == 0)
1613 { 1567 {
1568 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1614 arrow->destroy (); 1569 arrow->destroy ();
1615 return 0; 1570 return 0;
1616 } 1571 }
1617 1572
1618 left = arrow; /* these are arrows left to the player */ 1573 left = arrow; /* these are arrows left to the player */
1619 arrow = get_split_ob (arrow, 1); 1574 arrow = arrow->split ();
1620 if (!arrow) 1575 if (!arrow)
1621 { 1576 {
1622 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1577 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1623 return 0; 1578 return 0;
1624 } 1579 }
… …
1686 1641
1687 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1642 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1688 arrow->move_type = MOVE_FLY_LOW; 1643 arrow->move_type = MOVE_FLY_LOW;
1689 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1644 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1690 1645
1691 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1646 op->play_sound (sound_find ("fire_arrow"));
1692 m->insert (arrow, sx, sy, op); 1647 m->insert (arrow, sx, sy, op);
1693 1648
1694 if (!arrow->destroyed ()) 1649 if (!arrow->destroyed ())
1695 move_arrow (arrow); 1650 move_arrow (arrow);
1696
1697 if (op->type == PLAYER)
1698 {
1699 if (left->destroyed ())
1700 esrv_del_item (op->contr, left->count);
1701 else
1702 esrv_send_item (op, left);
1703 }
1704 1651
1705 return 1; 1652 return 1;
1706} 1653}
1707 1654
1708/* Special fire code for players - this takes into 1655/* Special fire code for players - this takes into
… …
1713 * hence the function name. 1660 * hence the function name.
1714 */ 1661 */
1715int 1662int
1716player_fire_bow (object *op, int dir) 1663player_fire_bow (object *op, int dir)
1717{ 1664{
1718 int ret = 0, wcmod = 0; 1665 int ret;
1719 1666
1720 if (op->contr->bowtype == bow_bestarrow) 1667 if (op->contr->bowtype == bow_bestarrow)
1721 { 1668 {
1722 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1669 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1723 } 1670 }
1724 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1671 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1725 { 1672 {
1726 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1673 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1727 wcmod = -1;
1728
1729 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1674 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1730 } 1675 }
1731 else if (op->contr->bowtype == bow_threewide) 1676 else if (op->contr->bowtype == bow_threewide)
1732 { 1677 {
1733 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1678 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1679 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1735 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1680 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1736 } 1681 }
1737 else if (op->contr->bowtype == bow_spreadshot) 1682 else if (op->contr->bowtype == bow_spreadshot)
1738 { 1683 {
1739 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1684 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1685 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1741 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1686 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1742 } 1687 }
1743 else 1688 else
1744 { 1689 {
… …
1774 1719
1775 if (item->type == WAND) 1720 if (item->type == WAND)
1776 { 1721 {
1777 if (item->stats.food <= 0) 1722 if (item->stats.food <= 0)
1778 { 1723 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1724 op->contr->play_sound (sound_find ("wand_poof"));
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1725 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781 1726
1782 return; 1727 return;
1783 } 1728 }
1784 } 1729 }
1785 else if (item->type == ROD || item->type == HORN) 1730 else if (item->type == ROD || item->type == HORN)
1786 { 1731 {
1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1732 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1733
1734 // using the maximum of the rods charge allows at least one spell cast
1735 // for a rod or horn, this fixes some broken rods.
1736 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1788 { 1737 {
1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1738 op->contr->play_sound (sound_find ("wand_poof"));
1790 1739
1791 if (item->type == ROD) 1740 if (item->type == ROD)
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1741 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793 else 1742 else
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1743 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1797 } 1746 }
1798 } 1747 }
1799 1748
1800 if (cast_spell (op, item, dir, item->inv, NULL)) 1749 if (cast_spell (op, item, dir, item->inv, NULL))
1801 { 1750 {
1802 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1751 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1752
1803 if (item->type == WAND) 1753 if (item->type == WAND)
1804 { 1754 {
1805 if (!(--item->stats.food)) 1755 if (!(--item->stats.food))
1806 { 1756 {
1807 object *tmp; 1757 object *tmp;
1808 1758
1809 if (item->arch) 1759 if (item->arch)
1810 { 1760 {
1811 CLEAR_FLAG (item, FLAG_ANIMATE); 1761 CLEAR_FLAG (item, FLAG_ANIMATE);
1812 item->face = item->arch->clone.face; 1762 item->face = item->arch->face;
1813 item->set_speed (0); 1763 item->set_speed (0);
1814 } 1764 }
1815 1765
1816 if ((tmp = item->in_player ())) 1766 if (object *pl = item->visible_to ())
1817 esrv_update_item (UPD_ANIM, tmp, item); 1767 esrv_update_item (UPD_ANIM, pl, item);
1818 } 1768 }
1819 } 1769 }
1820 else if (item->type == ROD || item->type == HORN) 1770 else if (item->type == ROD || item->type == HORN)
1821 drain_rod_charge (item); 1771 drain_rod_charge (item);
1822 } 1772 }
… …
1827bool 1777bool
1828fire (object *op, int dir) 1778fire (object *op, int dir)
1829{ 1779{
1830 int spellcost = 0; 1780 int spellcost = 0;
1831 1781
1832 /* check for loss of invisiblity/hide */
1833 if (action_makes_visible (op))
1834 make_visible (op);
1835
1836 player *pl = op->contr; 1782 player *pl = op->contr;
1837 1783
1838 if (pl->golem) 1784 if (pl->golem)
1839 { 1785 {
1840 control_golem (op->contr->golem, dir); 1786 control_golem (op->contr->golem, dir);
… …
1842 } 1788 }
1843 1789
1844 object *ob = pl->ranged_ob; 1790 object *ob = pl->ranged_ob;
1845 1791
1846 if (!ob) 1792 if (!ob)
1847 return false;
1848
1849 if (!op->change_weapon (ob))
1850 return false; 1793 return false;
1851 1794
1852 if (op->speed_left > 0.f) 1795 if (op->speed_left > 0.f)
1853 --op->speed_left; 1796 --op->speed_left;
1854 else 1797 else
1855 return false; 1798 return false;
1799
1800 if (!op->change_weapon (ob))
1801 return false;
1802
1803 /* check for loss of invisiblity/hide */
1804 if (action_makes_visible (op))
1805 make_visible (op);
1856 1806
1857 switch (ob->type) 1807 switch (ob->type)
1858 { 1808 {
1859 case BOW: 1809 case BOW:
1860 player_fire_bow (op, dir); 1810 player_fire_bow (op, dir);
… …
1983 /* If we found a key, do some extra work */ 1933 /* If we found a key, do some extra work */
1984 if (key) 1934 if (key)
1985 { 1935 {
1986 object *container = key->env; 1936 object *container = key->env;
1987 1937
1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989
1990 if (action_makes_visible (op)) 1938 if (action_makes_visible (op))
1991 make_visible (op); 1939 make_visible (op);
1992 1940
1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1941 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1994 spring_trap (door->inv, op); 1942 spring_trap (door->inv, op);
1995 1943
1996 if (door->type == DOOR) 1944 if (door->type == DOOR)
1997 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1945 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1998 else if (door->type == LOCKED_DOOR) 1946 else if (door->type == LOCKED_DOOR)
1999 { 1947 {
2000 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1948 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2001 remove_door2 (door); /* remove door without violence ;-) */ 1949 remove_door2 (door); /* remove door without violence ;-) */
2002 } 1950 }
2003 1951
2004 /* Do this after we print the message */ 1952 /* Do this after we print the message */
2005 decrease_ob (key); /* Use up one of the keys */ 1953 key->decrease (); /* Use up one of the keys */
2006 /* Need to update the weight the container the key was in */
2007 if (container != op)
2008 esrv_update_item (UPD_WEIGHT, op, container);
2009 1954
2010 return 1; /* Nothing more to do below */ 1955 return 1; /* Nothing more to do below */
2011 } 1956 }
2012 else if (door->type == LOCKED_DOOR) 1957 else if (door->type == LOCKED_DOOR)
2013 { 1958 {
2014 /* Might as well return now - no other way to open this */ 1959 /* Might as well return now - no other way to open this */
2015 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1960 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2016 return 1; 1961 return 1;
2017 } 1962 }
2018 1963
2019 return 0; 1964 return 0;
2020} 1965}
… …
2107 2052
2108 if (op->speed_left > 0.f) 2053 if (op->speed_left > 0.f)
2109 { 2054 {
2110 --op->speed_left; 2055 --op->speed_left;
2111 2056
2112 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2057 op->play_sound (sound_find ("push_player"));
2113 push_ob (mon, dir, op); 2058 push_ob (mon, dir, op);
2114 2059
2115 if (op->contr->tmp_invis || op->hide) 2060 if (action_makes_visible (op))
2116 make_visible (op); 2061 make_visible (op);
2117 2062
2118 return true; 2063 return true;
2119 } 2064 }
2120 else 2065 else
… …
2136 { 2081 {
2137 --op->speed_left; 2082 --op->speed_left;
2138 2083
2139 if (!op->contr->braced) 2084 if (!op->contr->braced)
2140 { 2085 {
2141 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2086 op->play_sound (sound_find ("push_player"));
2142 push_ob (mon, dir, op); 2087 push_ob (mon, dir, op);
2143 } 2088 }
2144 else 2089 else
2145 new_draw_info (0, 0, op, "You withhold your attack"); 2090 op->statusmsg ("You withhold your attack");
2146 2091
2147 if (op->contr->tmp_invis || op->hide) 2092 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2148 make_visible (op); 2093 make_visible (op);
2149 2094
2150 return true; 2095 return true;
2151 } 2096 }
2152 } 2097 }
… …
2194bool 2139bool
2195move_player (object *op, int dir) 2140move_player (object *op, int dir)
2196{ 2141{
2197 int pick; 2142 int pick;
2198 2143
2199 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2144 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2200 return 0; 2145 return 0;
2201 2146
2202 /* Sanity check: make sure dir is valid */ 2147 /* Sanity check: make sure dir is valid */
2203 if ((dir < 0) || (dir >= 9)) 2148 if ((dir < 0) || (dir >= 9))
2204 { 2149 {
… …
2210 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2155 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2211 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2156 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2212 2157
2213 op->facing = dir; 2158 op->facing = dir;
2214 2159
2215 if (op->hide) 2160 if (op->flag [FLAG_HIDDEN])
2216 do_hidden_move (op); 2161 do_hidden_move (op);
2217 2162
2218 bool retval; 2163 bool retval;
2219 2164
2220 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2165 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2289 return 0; 2234 return 0;
2290 2235
2291 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2236 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2292 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2237 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2293 { 2238 {
2294 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2239 op->play_sound (sound_find ("ob_evaporate"));
2295 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2240 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2296
2297 if (op->contr)
2298 esrv_del_item (op->contr, tmp->count);
2299 2241
2300 tmp->destroy (); 2242 tmp->destroy ();
2301 CLEAR_FLAG (op, FLAG_LIFESAVE); 2243 CLEAR_FLAG (op, FLAG_LIFESAVE);
2302 2244
2303 if (op->stats.hp < 0) 2245 if (op->stats.hp < 0)
… …
2316 return 0; 2258 return 0;
2317} 2259}
2318 2260
2319/* This goes throws the inventory and removes unpaid objects, and puts them 2261/* This goes throws the inventory and removes unpaid objects, and puts them
2320 * back in the map (location and map determined by values of env). This 2262 * back in the map (location and map determined by values of env). This
2321 * function will descend into containers. op is the object to start the search 2263 * function will descend into containers. op is the object to start the search
2322 * from. 2264 * from.
2323 */ 2265 */
2266static void
2267drop_unpaid_items (object *op, object *env)
2268{
2269 while (op)
2270 {
2271 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2272
2273 if (QUERY_FLAG (op, FLAG_UNPAID))
2274 op->insert_at (env);
2275 else if (op->inv)
2276 drop_unpaid_items (op->inv, env);
2277
2278 op = next;
2279 }
2280}
2281
2324void 2282void
2325remove_unpaid_objects (object *op, object *env) 2283object::drop_unpaid_items ()
2326{ 2284{
2327 while (op) 2285 if (!flag [FLAG_REMOVED])
2328 { 2286 ::drop_unpaid_items (inv, this);
2329 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2330
2331 if (QUERY_FLAG (op, FLAG_UNPAID))
2332 {
2333 if (env->type == PLAYER)
2334 esrv_del_item (env->contr, op->count);
2335
2336 op->insert_at (env);
2337 }
2338 else if (op->inv)
2339 remove_unpaid_objects (op->inv, env);
2340
2341 op = next;
2342 }
2343} 2287}
2344 2288
2345/* 2289/*
2346 * Returns pointer a static string containing gravestone text 2290 * Returns pointer a static string containing gravestone text
2347 * Moved from apply.c to player.c - player.c is what 2291 * Moved from apply.c to player.c - player.c is what
2348 * actually uses this function. player.c may not be quite the 2292 * actually uses this function. player.c may not be quite the
2349 * best, a misc file for object actions is probably better, 2293 * best, a misc file for object actions is probably better,
2350 * but there isn't one in the server directory. 2294 * but there isn't one in the server directory.
2351 */ 2295 */
2352char * 2296const char *
2353gravestone_text (object *op) 2297gravestone_text (object *op)
2354{ 2298{
2355 static char buf2[MAX_BUF]; 2299 static dynbuf_text buf;
2356 char buf[MAX_BUF];
2357 time_t now = time (NULL);
2358 2300
2359 strcpy (buf2, " R.I.P.\n\n"); 2301 buf << "---- R.I.P. ----\n\n"
2302 << op->name;
2303
2360 if (op->type == PLAYER) 2304 if (op->type == PLAYER)
2361 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2305 buf << " the " << op->contr->title;
2362 else
2363 sprintf (buf, "%s\n", &op->name);
2364 2306
2365 strncat (buf2, " ", 20 - strlen (buf) / 2); 2307 buf << "\n\n";
2366 strcat (buf2, buf); 2308
2309 buf << "who was level ";
2310 buf << (sint32)op->level << "\n\n" // OO breakdown
2311 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2312
2367 if (op->type == PLAYER) 2313 if (op->type == PLAYER)
2368 sprintf (buf, "who was in level %d when killed\n", op->level); 2314 buf << "by " << op->contr->killer_name () << ".\n\n";
2369 else
2370 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2371 2315
2372 strncat (buf2, " ", 20 - strlen (buf) / 2);
2373 strcat (buf2, buf);
2374 if (op->type == PLAYER)
2375 { 2316 {
2376 sprintf (buf, "by %s.\n\n", op->contr->killer); 2317 static char buf2[128];
2377 strncat (buf2, " ", 21 - strlen (buf) / 2); 2318 time_t now = time (NULL);
2378 strcat (buf2, buf);
2379 }
2380
2381 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2319 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2382 strncat (buf2, " ", 20 - strlen (buf) / 2); 2320 buf << buf2;
2383 strcat (buf2, buf); 2321 }
2384 2322
2385 return buf2; 2323 return buf;
2386} 2324}
2387 2325
2388void 2326void
2389do_some_living (object *op) 2327do_some_living (object *op)
2390{ 2328{
… …
2442 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2380 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2443 else 2381 else
2444 { 2382 {
2445 gen_grace = op->stats.maxgrace; 2383 gen_grace = op->stats.maxgrace;
2446 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2384 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2447 }
2448
2449 /* Regenerate Spell Points */
2450 if (!op->contr->golem && --op->last_sp < 0)
2451 {
2452 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2453 if (op->stats.sp < op->stats.maxsp)
2454 {
2455 op->stats.sp++;
2456 /* dms do not consume food */
2457 if (!QUERY_FLAG (op, FLAG_WIZ))
2458 {
2459 op->stats.food--;
2460 if (op->contr->digestion < 0)
2461 op->stats.food += op->contr->digestion;
2462 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2463 op->stats.food = last_food;
2464 }
2465 }
2466
2467 if (max_sp > 1)
2468 {
2469 over_sp = (gen_sp + 10) / rate_sp;
2470 if (over_sp > 0)
2471 {
2472 if (op->stats.sp < op->stats.maxsp)
2473 {
2474 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2475
2476 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2477 op->stats.sp--;
2478
2479 if (op->stats.sp > op->stats.maxsp)
2480 op->stats.sp = op->stats.maxsp;
2481 }
2482 op->last_sp = 0;
2483 }
2484 else
2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486 }
2487 else
2488 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2489 } 2385 }
2490 2386
2491 /* Regenerate Grace */ 2387 /* Regenerate Grace */
2492 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2388 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2493 if (--op->last_grace < 0) 2389 if (--op->last_grace < 0)
… …
2514 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2410 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2515 } 2411 }
2516 /* wearing stuff doesn't detract from grace generation. */ 2412 /* wearing stuff doesn't detract from grace generation. */
2517 } 2413 }
2518 2414
2415 if (op->stats.food > 0)
2416 {
2519 /* Regenerate Hit Points */ 2417 /* Regenerate Spell Points */
2520 if (--op->last_heal < 0) 2418 if (!op->contr->golem && --op->last_sp < 0)
2521 {
2522 if (op->stats.hp < op->stats.maxhp)
2523 { 2419 {
2524 op->stats.hp++; 2420 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2525 /* dms do not consume food */ 2421
2526 if (!QUERY_FLAG (op, FLAG_WIZ)) 2422 if (op->stats.sp < op->stats.maxsp)
2527 { 2423 {
2424 op->stats.sp++;
2425
2426 /* dms do not consume food */
2427 if (!QUERY_FLAG (op, FLAG_WIZ))
2428 {
2528 op->stats.food--; 2429 op->stats.food--;
2430
2529 if (op->contr->digestion < 0) 2431 if (op->contr->digestion < 0)
2530 op->stats.food += op->contr->digestion; 2432 op->stats.food += op->contr->digestion;
2531 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2433 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2532 op->stats.food = last_food; 2434 op->stats.food = last_food;
2435 }
2533 } 2436 }
2534 }
2535 2437
2536 if (max_hp > 1) 2438 if (max_sp > 1)
2537 {
2538 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2539 if (over_hp > 0)
2540 { 2439 {
2541 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2440 over_sp = (gen_sp + 10) / rate_sp;
2441 if (over_sp > 0)
2442 {
2443 if (op->stats.sp < op->stats.maxsp)
2444 {
2445 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2446
2447 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2448 op->stats.sp--;
2449
2450 if (op->stats.sp > op->stats.maxsp)
2451 op->stats.sp = op->stats.maxsp;
2452 }
2453
2542 op->last_heal = 0; 2454 op->last_sp = 0;
2455 }
2456 else
2457 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2543 } 2458 }
2544 else 2459 else
2460 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2461 }
2462
2463 /* Regenerate Hit Points */
2464 if (--op->last_heal < 0)
2465 {
2466 if (op->stats.hp < op->stats.maxhp)
2545 { 2467 {
2546 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2468 op->stats.hp++;
2469
2470 /* dms do not consume food */
2471 if (!QUERY_FLAG (op, FLAG_WIZ))
2472 {
2473 op->stats.food--;
2474
2475 if (op->contr->digestion < 0)
2476 op->stats.food += op->contr->digestion;
2477 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2478 op->stats.food = last_food;
2479 }
2547 } 2480 }
2481
2482 if (max_hp > 1)
2483 {
2484 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2485
2486 if (over_hp > 0)
2487 {
2488 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2489 op->last_heal = 0;
2490 }
2491 else
2492 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2548 } 2493 }
2549 else 2494 else
2550 {
2551 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2495 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2552 } 2496 }
2553 } 2497 }
2554 2498
2555 /* Digestion */ 2499 /* Digestion */
2556 if (--op->last_eat < 0) 2500 if (--op->last_eat < 0)
2557 { 2501 {
2558 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2502 int bonus = max (0, op->contr->digestion),
2503 penalty = max (0, -op->contr->digestion);
2559 2504
2560 if (op->contr->gen_hp > 0)
2561 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2505 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2562 else
2563 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2564 2506
2565 /* dms do not consume food */ 2507 /* dms do not consume food */
2566 if (!QUERY_FLAG (op, FLAG_WIZ)) 2508 if (!QUERY_FLAG (op, FLAG_WIZ))
2567 op->stats.food--; 2509 op->stats.food--;
2568 } 2510 }
2569 2511
2570 if (op->stats.food < 0 && op->stats.hp >= 0) 2512 if (op->stats.food < 0 && op->stats.hp >= 0)
2571 { 2513 {
2572 object *tmp, *flesh = 0; 2514 object *flesh = 0;
2573 2515
2574 for (tmp = op->inv; tmp; tmp = tmp->below) 2516 for_inv_removable (op, tmp)
2575 { 2517 {
2576 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2518 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2519 continue;
2520
2521 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2577 { 2522 {
2578 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2523 op->statusmsg ("You blindly grab for a bite of food. "
2579 { 2524 "H<To prevent you from starving, you ate some random item from your backpack.>");
2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2581 manual_apply (op, tmp, 0); 2525 manual_apply (op, tmp, 0);
2526
2582 if (op->stats.food >= 0 || op->stats.hp < 0) 2527 if (op->stats.food >= 0 || op->stats.hp < 0)
2583 break; 2528 break;
2584 } 2529 }
2585 else if (tmp->type == FLESH) 2530 else if (tmp->type == FLESH)
2586 flesh = tmp; 2531 flesh = tmp;
2587 } /* End if paid for object */ 2532 }
2588 } /* end of for loop */
2589 2533
2590 /* If player is still starving, it means they don't have any food, so 2534 /* If player is still starving, it means they don't have any food, so
2591 * eat flesh instead. 2535 * eat flesh instead.
2592 */ 2536 */
2593 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2537 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2594 { 2538 {
2595 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2539 op->statusmsg ("You blindly grab for a bite of food. "
2540 "H<To prevent you from starving, you ate some random item from your backpack.>");
2596 manual_apply (op, flesh, 0); 2541 manual_apply (op, flesh, 0);
2597 } 2542 }
2543
2544 // If player is still starving, alert him!
2545 if (op->stats.food < 0)
2546 op->failmsg ("You are starving! "
2547 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2548 }
2549
2550 if (op->stats.food < 0)
2598 } 2551 {
2552 op->stats.hp += op->stats.food;
2553 op->stats.food = 0;
2599 2554
2600 while (op->stats.food < 0 && op->stats.hp >= 0) 2555 if (op->stats.hp < 0)
2601 op->stats.food++, op->stats.hp--; 2556 {
2557 op->contr->killer = archetype::get ("killer_starvation");
2558 op->contr->killer->destroy ();
2559 }
2560 }
2602 2561
2562 /* killer should be set here already */
2603 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2563 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604 kill_player (op); 2564 kill_player (op);
2605 } 2565 }
2606} 2566}
2607 2567
… …
2611 * file. 2571 * file.
2612 */ 2572 */
2613void 2573void
2614kill_player (object *op) 2574kill_player (object *op)
2615{ 2575{
2576 int x, y;
2616 char buf[MAX_BUF]; 2577 char buf[MAX_BUF];
2617 int x, y;
2618
2619 //int i;
2620 maptile *map; /* this is for resurrection */ 2578 maptile *map; /* this is for resurrection */
2621
2622 /* int z;
2623 int num_stats_lose;
2624 int lost_a_stat;
2625 int lose_this_stat;
2626 int this_stat; */
2627 int will_kill_again; 2579 int will_kill_again;
2628 archetype *at; 2580 archetype *at;
2629 object *tmp; 2581 object *tmp;
2630 2582
2631 if (save_life (op)) 2583 if (save_life (op))
2632 return; 2584 return;
2633
2634 2585
2635 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2586 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2636 * in cities ONLY!!! It is very important that this doesn't get abused. 2587 * in cities ONLY!!! It is very important that this doesn't get abused.
2637 * Look at op_on_battleground() for more info --AndreasV 2588 * Look at op_on_battleground() for more info --AndreasV
2638 */ 2589 */
… …
2654 { 2605 {
2655 tmp->destroy (); 2606 tmp->destroy ();
2656 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2607 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2657 } 2608 }
2658 2609
2659 cure_disease (op, 0); /* remove any disease */ 2610 cure_disease (op, 0, 0); /* remove any disease */
2660 op->stats.hp = op->stats.maxhp; 2611 op->stats.hp = op->stats.maxhp;
2661 if (op->stats.food <= 0) 2612 if (op->stats.food <= 0)
2662 op->stats.food = 999; 2613 op->stats.food = 999;
2663 2614
2664 /* create a bodypart-trophy to make the winner happy */ 2615 /* create a bodypart-trophy to make the winner happy */
2665 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2616 if (object *tmp = arch_to_object (archetype::find ("finger")))
2666 { 2617 {
2667 sprintf (buf, "%s's finger", &op->name); 2618 tmp->name = format ("%s's finger" , &op->name);
2668 tmp->name = buf; 2619 tmp->name_pl = format ("%s's fingers", &op->name);
2669 sprintf (buf, " This finger has been cut off %s\n"
2670 " the %s, when he was defeated at\n level %d by %s.\n",
2671 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2672 tmp->msg = buf; 2620 tmp->msg = format (
2621 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2622 &op->name, op->contr->title,
2623 (int)op->level,
2624 op->contr->killer_name ()
2625 );
2673 tmp->value = 0, tmp->type = 0; 2626 tmp->value = 0, tmp->type = 0;
2674 tmp->materialname = "organics"; 2627 tmp->materialname = "organics";
2675 tmp->insert_at (op, tmp); 2628 tmp->insert_at (op, tmp);
2676 } 2629 }
2677 2630
… …
2683 2636
2684 INVOKE_PLAYER (DEATH, op->contr); 2637 INVOKE_PLAYER (DEATH, op->contr);
2685 2638
2686 command_kill_pets (op, 0); 2639 command_kill_pets (op, 0);
2687 2640
2688 if (op->stats.food < 0) 2641 op->contr->play_sound (sound_find ("player_dies"));
2689 {
2690 sprintf (buf, "%s starved to death.", &op->name);
2691 strcpy (op->contr->killer, "starvation");
2692 }
2693 else
2694 sprintf (buf, "%s died.", &op->name);
2695
2696 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2697 2642
2698 /* save the map location for corpse, gravestone */ 2643 /* save the map location for corpse, gravestone */
2699 x = op->x; 2644 x = op->x;
2700 y = op->y; 2645 y = op->y;
2701 map = op->map; 2646 map = op->map;
… …
2729 2674
2730 lost_a_stat = 0; 2675 lost_a_stat = 0;
2731 2676
2732 for (z = 0; z < num_stats_lose; z++) 2677 for (z = 0; z < num_stats_lose; z++)
2733 { 2678 {
2734 i = RANDOM () % NUM_STATS; 2679 i = rndm (NUM_STATS);
2735 2680
2736 if (settings.stat_loss_on_death) 2681 if (settings.stat_loss_on_death)
2737 { 2682 {
2738 /* Pick a random stat and take a point off it. Tell the player 2683 /* Pick a random stat and take a point off it. Tell the player
2739 * what he lost. 2684 * what he lost.
… …
2808 lost_a_stat = 1; 2753 lost_a_stat = 1;
2809 } 2754 }
2810 } 2755 }
2811 } 2756 }
2812 } 2757 }
2758
2813 /* If no stat lost, tell the player. */ 2759 /* If no stat lost, tell the player. */
2814 if (!lost_a_stat) 2760 if (!lost_a_stat)
2815 { 2761 {
2816 /* determine_god() seems to not work sometimes... why is this? 2762 /* determine_god() seems to not work sometimes... why is this?
2817 Should I be using something else? GD */ 2763 Should I be using something else? GD */
… …
2821 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2767 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2822 else 2768 else
2823 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2769 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2824 } 2770 }
2825#else 2771#else
2826 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2772 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2827#endif 2773#endif
2828 2774
2829 /* Put a gravestone up where the character 'almost' died. List the 2775 /* Put a gravestone up where the character 'almost' died. List the
2830 * exp loss on the stone. 2776 * exp loss on the stone.
2831 */ 2777 */
2832 tmp = arch_to_object (archetype::find ("gravestone")); 2778 tmp = arch_to_object (archetype::find ("gravestone"));
2833 sprintf (buf, "%s's gravestone", &op->name); 2779 tmp->name = format ("%s's gravestone", &op->name);
2834 tmp->name = buf; 2780 tmp->name_pl = format ("%s's gravestones", &op->name);
2835 sprintf (buf, "%s's gravestones", &op->name); 2781 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2836 tmp->name_pl = buf; 2782 &op->name, op->contr->title, op->contr->killer_name ());
2837 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2838 tmp->msg = buf;
2839 tmp->x = op->x, tmp->y = op->y; 2783 tmp->x = op->x, tmp->y = op->y;
2840 insert_ob_in_map (tmp, op->map, NULL, 0); 2784 insert_ob_in_map (tmp, op->map, NULL, 0);
2841 2785
2842 /**************************************/ 2786 /**************************************/
2843 /* */ 2787 /* */
… …
2864 { 2808 {
2865 tmp->destroy (); 2809 tmp->destroy ();
2866 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2810 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2867 } 2811 }
2868 2812
2869 cure_disease (op, 0); /* remove any disease */ 2813 cure_disease (op, 0, 0); /* remove any disease */
2814
2815 // remove all spell effects that are active
2816 // to avoid long-term effects such as word-of-recall
2817 for (object *item = op->inv; item; )
2818 {
2819 object *next = item->below;
2820
2821 if (item->type == SPELL_EFFECT && item->active)
2822 item->destroy ();
2823
2824 item = next;
2825 }
2870 2826
2871 /*add_exp(op, (op->stats.exp * -0.20)); */ 2827 /*add_exp(op, (op->stats.exp * -0.20)); */
2872 apply_death_exp_penalty (op); 2828 apply_death_exp_penalty (op);
2829
2873 if (op->stats.food < 100) 2830 if (op->stats.food < 100)
2874 op->stats.food = 900; 2831 op->stats.food = 900;
2832
2875 op->stats.hp = op->stats.maxhp; 2833 op->stats.hp = op->stats.maxhp;
2876 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2834 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2877 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2835 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2878 2836
2879 /* 2837 /*
2880 * Check to see if the player has any unpaid items. If so, remove them 2838 * Check to see if the player has any unpaid items. If so, remove them
2881 * and put them back in the map. 2839 * and put them back in the map.
2882 */ 2840 */
2883 remove_unpaid_objects (op->inv, op); 2841 op->drop_unpaid_items ();
2884 2842
2885 /****************************************/ 2843 /****************************************/
2886 /* */ 2844 /* */
2887 /* Move player to his current respawn- */ 2845 /* Move player to his current respawn- */
2888 /* position (usually last savebed) */ 2846 /* position (usually last savebed) */
… …
2917 if (will_kill_again & (1 << at)) 2875 if (will_kill_again & (1 << at))
2918 force->resist[at] = 100; 2876 force->resist[at] = 100;
2919 2877
2920 insert_ob_in_ob (force, op); 2878 insert_ob_in_ob (force, op);
2921 op->update_stats (); 2879 op->update_stats ();
2922
2923 } 2880 }
2924 2881
2925 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2882 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2926} 2883}
2927 2884
… …
2947 2904
2948 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2905 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2949 { 2906 {
2950 if (tmp->nrof > 1) 2907 if (tmp->nrof > 1)
2951 { 2908 {
2952 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2909 tmp->decrease (rndm (1, tmp->nrof - 1));
2953 tmp2->destroy ();
2954 insert_ob_in_map (tmp, op->map, NULL, 0); 2910 insert_ob_in_map (tmp, op->map, NULL, 0);
2955 } 2911 }
2956 else 2912 else
2957 tmp->destroy (); 2913 tmp->destroy ();
2958 } 2914 }
… …
2969void 2925void
2970fix_weight (void) 2926fix_weight (void)
2971{ 2927{
2972 for_all_players (pl) 2928 for_all_players (pl)
2973 { 2929 {
2974 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2930 sint32 old = pl->ob->carrying;
2975 2931
2976 if (old == sum) 2932 pl->ob->update_weight ();
2977 continue; 2933
2934 if (old != pl->ob->carrying)
2935 {
2978 pl->ob->update_stats (); 2936 pl->ob->update_stats ();
2979 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2937 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2938 }
2980 } 2939 }
2981} 2940}
2982 2941
2983void 2942void
2984fix_luck (void) 2943fix_luck (void)
… …
3026} 2985}
3027 2986
3028void 2987void
3029make_visible (object *op) 2988make_visible (object *op)
3030{ 2989{
3031 op->hide = 0; 2990 op->flag [FLAG_HIDDEN] = 0;
3032 op->invisible = 0; 2991 op->invisible = 0;
2992
3033 if (op->type == PLAYER) 2993 if (op->type == PLAYER)
3034 { 2994 {
3035 op->contr->tmp_invis = 0; 2995 op->contr->tmp_invis = 0;
3036 op->contr->invis_race = 0; 2996 op->contr->invis_race = 0;
3037 } 2997 }
… …
3040} 3000}
3041 3001
3042int 3002int
3043is_true_undead (object *op) 3003is_true_undead (object *op)
3044{ 3004{
3045 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3005 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3046 return 1; 3006 return 1;
3047 3007
3048 return 0; 3008 return 0;
3049} 3009}
3050 3010
3051/* look at the surrounding terrain to determine 3011/* look at the surrounding terrain to determine
3052 * the hideability of this object. Positive levels 3012 * the hideability of this object. Positive levels
3053 * indicate greater hideability. 3013 * indicate greater hideability.
3054 */ 3014 */
3055
3056int 3015int
3057hideability (object *ob) 3016hideability (object *ob)
3058{ 3017{
3059 int i, level = 0, mflag; 3018 int i, level = 0, mflag;
3060 sint16 x, y; 3019 sint16 x, y;
3061 3020
3062 if (!ob || !ob->map) 3021 if (!ob || !ob->map)
3063 return 0; 3022 return 0;
3064 3023
3065 /* so, on normal lighted maps, its hard to hide */ 3024 /* so, on normal lighted maps, its hard to hide */
3066 level = ob->map->darkness - 2; 3025 level = ob->map->darklevel () - 2;
3067 3026
3068 /* this also picks up whether the object is glowing. 3027 /* this also picks up whether the object is glowing.
3069 * If you carry a light on a non-dark map, its not 3028 * If you carry a light on a non-dark map, its not
3070 * as bad as carrying a light on a pitch dark map */ 3029 * as bad as carrying a light on a pitch dark map */
3071 if (has_carried_lights (ob)) 3030 if (has_carried_lights (ob))
3072 level = -(10 + (2 * ob->map->darkness)); 3031 level = -(10 + (2 * ob->map->darklevel ()));
3073 3032
3074 /* scan through all nearby squares for terrain to hide in */ 3033 /* scan through all nearby squares for terrain to hide in */
3075 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3034 for (i = 0, x = ob->x, y = ob->y;
3035 i <= SIZEOFFREE1;
3036 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3076 { 3037 {
3077 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3038 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3078 if (mflag & P_OUT_OF_MAP) 3039 if (mflag & P_OUT_OF_MAP)
3079 {
3080 continue; 3040 continue;
3081 } 3041
3082 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3042 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3083 level += 2; 3043 level += 2;
3084 else /* open terrain! */ 3044 else /* open terrain! */
3085 level -= 1; 3045 level -= 1;
3086 } 3046 }
… …
3097 * spot (surrounded by clear terrain in broad daylight). -b.t. 3057 * spot (surrounded by clear terrain in broad daylight). -b.t.
3098 */ 3058 */
3099void 3059void
3100do_hidden_move (object *op) 3060do_hidden_move (object *op)
3101{ 3061{
3102 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3062 int hide = 0;
3103 object *skop;
3104 3063
3105 if (!op || !op->map) 3064 if (!op || !op->map)
3106 return; 3065 return;
3107 3066
3108 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3067 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3068 int num = random_roll (0, 19, op, PREFER_LOW);
3109 3069
3110 /* its *extremely* hard to run and sneak/hide at the same time! */ 3070 /* its *extremely* hard to run and sneak/hide at the same time! */
3111 if (op->type == PLAYER && op->contr->run_on) 3071 if (op->type == PLAYER && op->contr->run_on)
3112 if (!skop || num >= skop->level) 3072 if (!skop || num >= skop->level)
3113 { 3073 {
… …
3123 num -= hide; 3083 num -= hide;
3124 3084
3125 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3085 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3126 { 3086 {
3127 make_visible (op); 3087 make_visible (op);
3088
3128 if (op->type == PLAYER) 3089 if (op->type == PLAYER)
3129 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3090 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3130 } 3091 }
3131 else if (op->type == PLAYER && skop) 3092 else if (op->type == PLAYER && skop)
3132 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3093 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3185 * object op. This function works fine for monsters, 3146 * object op. This function works fine for monsters,
3186 * but we dont worry if the object isnt the top one in 3147 * but we dont worry if the object isnt the top one in
3187 * a pile (say a coin under a table would return "viewable" 3148 * a pile (say a coin under a table would return "viewable"
3188 * by this routine). Another question, should we be 3149 * by this routine). Another question, should we be
3189 * concerned with the direction the player is looking 3150 * concerned with the direction the player is looking
3190 * in? Realistically, most of use cant see stuff behind 3151 * in? Realistically, most of us can't see stuff behind
3191 * our backs...on the other hand, does the "facing" direction 3152 * our backs...on the other hand, does the "facing" direction
3192 * imply the way your head, or body is facing? Its possible 3153 * imply the way your head, or body is facing? It's possible
3193 * for them to differ. Sigh, this fctn could get a bit more complex. 3154 * for them to differ. Sigh, this fctn could get a bit more complex.
3194 * -b.t. 3155 * -b.t.
3195 * This function is now map tiling safe. 3156 * This function is now map tiling safe.
3196 */ 3157 */
3197
3198int 3158int
3199player_can_view (object *pl, object *op) 3159player_can_view (object *pl, object *op)
3200{ 3160{
3201 rv_vector rv; 3161 rv_vector rv;
3202 int dx, dy; 3162 int dx, dy;
… …
3214 3174
3215 get_rangevector (pl, op, &rv, 0x1); 3175 get_rangevector (pl, op, &rv, 0x1);
3216 3176
3217 /* starting with the 'head' part, lets loop 3177 /* starting with the 'head' part, lets loop
3218 * through the object and find if it has any 3178 * through the object and find if it has any
3219 * part that is in the los array but isnt on 3179 * part that is in the los array but isn't on
3220 * a blocked los square. 3180 * a blocked los square.
3221 * we use the archetype to figure out offsets. 3181 * we use the archetype to figure out offsets.
3222 */ 3182 */
3223 while (op) 3183 while (op)
3224 { 3184 {
3225 dx = rv.distance_x + op->arch->clone.x; 3185 dx = rv.distance_x + op->arch->x;
3226 dy = rv.distance_y + op->arch->clone.y; 3186 dy = rv.distance_y + op->arch->y;
3227 3187
3228 /* only the viewable area the player sees is updated by LOS 3188 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3229 * code, so we need to restrict ourselves to that range of values
3230 * for any meaningful values.
3231 */
3232 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3233 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3234 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3235 return 1; 3189 return 1;
3190
3236 op = op->more; 3191 op = op->more;
3237 } 3192 }
3193
3238 return 0; 3194 return 0;
3239} 3195}
3240 3196
3241/* routine for both players and monsters. We call this when 3197/* routine for both players and monsters. We call this when
3242 * there is a possibility for our action distrubing our hiding 3198 * there is a possibility for our action distrubing our hiding
3243 * place or invisiblity spell. Artefact invisiblity is not 3199 * place or invisiblity spell. Artefact invisiblity causes
3244 * effected by this. If we arent invisible to begin with, we 3200 * "noise" instead. If we arent invisible to begin with, we
3245 * return 0. 3201 * return 0.
3246 */ 3202 */
3247int 3203int
3248action_makes_visible (object *op) 3204action_makes_visible (object *op)
3249{ 3205{
3250
3251 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3206 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3252 { 3207 {
3253 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3208 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3209 {
3210 // artefact invisibility is permanent, but we still make noise
3211 // this is important for game-balance.
3212 if (op->contr)
3213 op->make_noise ();
3214
3254 return 0; 3215 return 0;
3216 }
3255 3217
3256 if (op->contr && op->contr->tmp_invis == 0) 3218 if (op->contr && op->contr->tmp_invis == 0)
3257 return 0; 3219 return 0;
3258 3220
3259 /* If monsters, they should become visible */ 3221 /* If monsters, they should become visible */
3260 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3222 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3261 { 3223 {
3262 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3224 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3263 return 1; 3225 return 1;
3264 } 3226 }
3265 } 3227 }
3228
3266 return 0; 3229 return 0;
3267} 3230}
3268 3231
3269/* op_on_battleground - checks if the given object op (usually 3232/* op_on_battleground - checks if the given object op (usually
3270 * a player) is standing on a valid battleground-tile, 3233 * a player) is standing on a valid battleground-tile,
… …
3275 * Default is to do the same as before, so only people wanting to have different points need worry about this 3238 * Default is to do the same as before, so only people wanting to have different points need worry about this
3276 */ 3239 */
3277int 3240int
3278op_on_battleground (object *op, int *x, int *y) 3241op_on_battleground (object *op, int *x, int *y)
3279{ 3242{
3280 object *tmp;
3281
3282 /* A battleground-tile needs the following attributes to be valid: 3243 /* A battleground-tile needs the following attributes to be valid:
3283 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3244 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3284 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3245 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3285 * and the exit-coordinates sp/hp must both be > 0. 3246 * and the exit-coordinates sp/hp must both be > 0.
3286 * => The intention here is to prevent abuse of the battleground- 3247 * => The intention here is to prevent abuse of the battleground-
3287 * feature (like pickable or hidden battleground tiles). */ 3248 * feature (like pickable or hidden battleground tiles). */
3288 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3249 for (object *tmp = op->below; tmp; tmp = tmp->below)
3289 { 3250 {
3290 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3251 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3291 { 3252 {
3292 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3253 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3293 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3254 && tmp->type == BATTLEGROUND
3255 && tmp->name == shstr_battleground
3256 && EXIT_X (tmp) && EXIT_Y (tmp))
3294 { 3257 {
3295 /*before we assign the exit, check if this is a teambattle */ 3258 /* before we assign the exit, check if this is a teambattle */
3296 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3259 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3297 { 3260 {
3298 object *invtmp;
3299
3300 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3261 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3301 { 3262 {
3302 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3263 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3303 { 3264 {
3304 if (x != NULL && y != NULL) 3265 if (x && y)
3305 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3266 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3267
3306 return 1; 3268 return 1;
3307 } 3269 }
3308 } 3270 }
3309 } 3271 }
3272
3310 if (x != NULL && y != NULL) 3273 if (x && y)
3311 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3274 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3275
3312 return 1; 3276 return 1;
3313 } 3277 }
3314 } 3278 }
3315 } 3279 }
3280
3316 /* If we got here, did not find a battleground */ 3281 /* If we got here, did not find a battleground */
3317 return 0; 3282 return 0;
3318} 3283}
3319 3284
3320/* 3285/*
… …
3336 char buf[MAX_BUF]; /* tmp. string buffer */ 3301 char buf[MAX_BUF]; /* tmp. string buffer */
3337 int i = 0, j = 0; 3302 int i = 0, j = 0;
3338 3303
3339 /* get the appropriate treasurelist */ 3304 /* get the appropriate treasurelist */
3340 if (atnr == ATNR_FIRE) 3305 if (atnr == ATNR_FIRE)
3341 trlist = treasurelist::find ("dragon_ability_fire"); 3306 trlist = treasurelist::find (shstr_dragon_ability_fire);
3342 else if (atnr == ATNR_COLD) 3307 else if (atnr == ATNR_COLD)
3343 trlist = treasurelist::find ("dragon_ability_cold"); 3308 trlist = treasurelist::find (shstr_dragon_ability_cold);
3344 else if (atnr == ATNR_ELECTRICITY) 3309 else if (atnr == ATNR_ELECTRICITY)
3345 trlist = treasurelist::find ("dragon_ability_elec"); 3310 trlist = treasurelist::find (shstr_dragon_ability_elec);
3346 else if (atnr == ATNR_POISON) 3311 else if (atnr == ATNR_POISON)
3347 trlist = treasurelist::find ("dragon_ability_poison"); 3312 trlist = treasurelist::find (shstr_dragon_ability_poison);
3348 3313
3349 if (trlist == NULL || who->type != PLAYER) 3314 if (trlist == NULL || who->type != PLAYER)
3350 return; 3315 return;
3351 3316
3352 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3317 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3356 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3321 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3357 return; 3322 return;
3358 } 3323 }
3359 3324
3360 /* everything seems okay - now bring on the gift: */ 3325 /* everything seems okay - now bring on the gift: */
3361 item = &(tr->item->clone); 3326 item = tr->item;
3362 3327
3363 if (item->type == SPELL) 3328 if (item->type == SPELL)
3364 { 3329 {
3365 if (check_spell_known (who, item->name)) 3330 if (check_spell_known (who, item->name))
3366 return; 3331 return;
… …
3425 { 3390 {
3426 /* forces in the treasurelist can alter the player's stats */ 3391 /* forces in the treasurelist can alter the player's stats */
3427 object *skin; 3392 object *skin;
3428 3393
3429 /* first get the dragon skin force */ 3394 /* first get the dragon skin force */
3430 shstr_cmp dragon_skin_force ("dragon_skin_force");
3431 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3395 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3432 ; 3396 ;
3433 3397
3434 if (!skin) 3398 if (!skin)
3435 return; 3399 return;
3436 3400
… …
3471 else 3435 else
3472 { 3436 {
3473 /* generate misc. treasure */ 3437 /* generate misc. treasure */
3474 tmp = arch_to_object (tr->item); 3438 tmp = arch_to_object (tr->item);
3475 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3439 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3476 tmp = insert_ob_in_ob (tmp, who); 3440 who->insert (tmp);
3477 if (who->type == PLAYER)
3478 esrv_send_item (who, tmp);
3479 } 3441 }
3480} 3442}
3481 3443
3482/** 3444/**
3483 * Unready an object for a player. This function does nothing if the object was 3445 * Unready an object for a player. This function does nothing if the object was
… …
3495 if (pl->ranged_ob == ob) 3457 if (pl->ranged_ob == ob)
3496 pl->ranged_ob = 0; 3458 pl->ranged_ob = 0;
3497} 3459}
3498 3460
3499sint8 3461sint8
3500player::visibility_at (maptile *map, int x, int y) const 3462player::darkness_at (maptile *map, int x, int y) const
3501{ 3463{
3502 if (!ns) 3464 if (!ns)
3503 return 0; 3465 return LOS_BLOCKED;
3504 3466
3505 int dx, dy; 3467 int dx, dy;
3506 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3468 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3507 return 0; 3469 return LOS_BLOCKED;
3508 3470
3509 x += dx - ns->current_x + ns->mapx / 2; 3471 x += dx - ns->current_x;
3510 y += dy - ns->current_y + ns->mapy / 2; 3472 y += dy - ns->current_y;
3511 3473
3512 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3513 return 0;
3514
3515 return 100 - blocked_los [x][y]; 3474 return blocked_los (x, y);
3516} 3475}
3476
3477void
3478player::infobox (const char *title, const char *msg, int color)
3479{
3480 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3481}
3482
3483void
3484player::statusmsg (const char *msg, int color)
3485{
3486 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3487}
3488
3489void
3490player::failmsg (const char *msg, int color)
3491{
3492 play_sound (sound_find ("generic_failure"));
3493 statusmsg (msg, color);
3494}
3495

Diff Legend

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