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.174 by root, Thu Nov 8 19:43:27 2007 UTC vs.
Revision 1.231 by root, Sat Oct 3 18:46:26 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
122 continue; 122 continue;
123 123
124 if (*buf == '%') 124 if (*buf == '%')
125 { /* send one news */ 125 { /* send one news */
126 if (size > 0) 126 if (size > 0)
127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ 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 */
128 131
129 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
130 strip_endline (subject); 133 strip_endline (subject);
131 size = 0; 134 size = 0;
132 news[0] = '\0'; 135 news[0] = '\0';
… …
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->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->object::name); 228 assign (title, ob->arch->object::name);
226 229
… …
239 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
240 } 243 }
241 244
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243 246
244 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this);
245 248
246 ob->update_stats (); 249 ob->update_stats ();
247 250
248 ns->floorbox_update (); 251 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob); 252 esrv_send_inventory (ob, ob);
… …
291player::set_object (object *op) 294player::set_object (object *op)
292{ 295{
293 ob = observe = op; 296 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */ 297 ob->contr = this; /* this aren't yet in archetype */
295 298
296 ob->speed = 1.0f; 299 ob->speed = 1.0f;
297 ob->speed_left = 0.5f; 300 ob->speed_left = 0.5f;
298 301
299 ob->direction = 5; /* So player faces south */ 302 ob->direction = 5; /* So player faces south */
300 303
301 ob->flag [FLAG_READY_WEAPON] = false; 304 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false; 305 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false; 306 ob->flag [FLAG_READY_BOW] = false;
304 307
… …
321 combat_ob = op; 324 combat_ob = op;
322 break; 325 break;
323 } 326 }
324 327
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
326} 330}
327 331
328void 332void
329player::set_observe (object *op) 333player::set_observe (object *op)
330{ 334{
… …
344 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
345 349
346 gen_sp_armour = 10; 350 gen_sp_armour = 10;
347 bowtype = bow_normal; 351 bowtype = bow_normal;
348 petmode = pet_normal; 352 petmode = pet_normal;
349 listening = 10;
350 usekeys = containers; 353 usekeys = containers;
351 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
352 do_los = 1; 355 do_los = 1;
353 356
354 weapon_sp = 1.0f; 357 weapon_sp = 1.0f;
… …
403 * Note: there MUST be at least one player archetype! 406 * Note: there MUST be at least one player archetype!
404 */ 407 */
405archetype * 408archetype *
406get_player_archetype (archetype *at) 409get_player_archetype (archetype *at)
407{ 410{
411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 417 archvec::iterator i = archetypes.find (nat);
409 418
410 for (;;) 419 for (;;)
411 { 420 {
412 if (++i == archetypes.end ()) 421 if (++i == archetypes.end ())
413 i = archetypes.begin (); 422 i = archetypes.begin ();
… …
631 640
632 return firstdir; 641 return firstdir;
633} 642}
634 643
635void 644void
636give_initial_items (object *pl, treasurelist * items) 645give_initial_items (object *pl, treasurelist *items)
637{ 646{
638 object *op, *next = NULL;
639
640 if (pl->randomitems != NULL) 647 if (pl->randomitems)
641 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 648 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
642 649
643 for (op = pl->inv; op; op = next) 650 for (object *next, *op = pl->inv; op; op = next)
644 { 651 {
645 next = op->below; 652 next = op->below;
646 653
647 /* Forces get applied per default, unless they have the 654 /* Forces get applied per default, unless they have the
648 * 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
… …
653 /* we never give weapons/armour if these cannot be used 660 /* we never give weapons/armour if these cannot be used
654 * by this player due to race restrictions 661 * by this player due to race restrictions
655 */ 662 */
656 if (pl->type == PLAYER) 663 if (pl->type == PLAYER)
657 { 664 {
658 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 665 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
666 &&
659 (op->type == ARMOUR || op->type == BOOTS || 667 (op->type == ARMOUR || op->type == BOOTS
660 op->type == CLOAK || op->type == HELMET || 668 || op->type == CLOAK || op->type == HELMET
661 op->type == SHIELD || op->type == GLOVES || 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE))
662 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))
663 { 672 {
664 op->destroy (); 673 op->destroy ();
665 continue; 674 continue;
666 } 675 }
667 } 676 }
668 677
669 /* This really needs to be better - we should really give 678 /* Here we remove duplicated skills (as duplicated spell objects have
670 * a substitute spellbook. The problem is that we don't really 679 * _very_ confusing effects for players), which could for instance be
671 * have a good idea what to replace it with (need something like 680 * generated by bad treasurelists. - elmex
672 * a first level treasurelist for each skill.)
673 * remove duplicate skills also
674 */ 681 */
675 if (op->type == SPELLBOOK || op->type == SKILL) 682 if (op->type == SKILL)
676 { 683 {
677 object *tmp;
678
679 for (tmp = op->below; tmp; tmp = tmp->below) 684 for (object *tmp = op->below; tmp; tmp = tmp->below)
680 if (tmp->type == op->type && tmp->name == op->name) 685 if (tmp->type == op->type && tmp->name == op->name)
681 break;
682
683 if (tmp)
684 { 686 {
685 op->destroy (); 687 op->destroy ();
688 LOG (llevError,
686 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 689 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
687 continue; 690 break;
688 } 691 }
689 692
690 if (op->nrof > 1) 693 if (op->nrof > 1)
691 op->nrof = 1; 694 op->nrof = 1;
692 } 695 }
693 696
694 if (op->type == SPELLBOOK && op->inv) 697 if (op->type == SPELLBOOK && op->inv)
695 {
696 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 698 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
697 }
698 699
699 /* Give starting characters identified, uncursed, and undamned 700 /* Give starting characters identified, uncursed, and undamned
700 * items. Just don't identify gold or silver, or it won't be 701 * items. Just don't identify gold or silver, or it won't be
701 * merged properly. 702 * merged properly.
702 */ 703 */
703 if (need_identify (op)) 704 if (need_identify (op))
704 { 705 {
705 SET_FLAG (op, FLAG_IDENTIFIED); 706 SET_FLAG (op, FLAG_IDENTIFIED);
706 CLEAR_FLAG (op, FLAG_CURSED); 707 CLEAR_FLAG (op, FLAG_CURSED);
707 CLEAR_FLAG (op, FLAG_DAMNED); 708 CLEAR_FLAG (op, FLAG_DAMNED);
708 } 709 }
710
709 if (op->type == SPELL) 711 if (op->type == SPELL)
710 { 712 {
711 op->destroy (); 713 op->destroy ();
712 continue; 714 continue;
713 } 715 }
… …
715 { 717 {
716 SET_FLAG (op, FLAG_CAN_USE_SKILL); 718 SET_FLAG (op, FLAG_CAN_USE_SKILL);
717 op->stats.exp = 0; 719 op->stats.exp = 0;
718 op->level = 1; 720 op->level = 1;
719 } 721 }
720 /* lock all 'normal items by default */ 722 else /* lock all 'normal items by default */
721 else
722 SET_FLAG (op, FLAG_INV_LOCKED); 723 SET_FLAG (op, FLAG_INV_LOCKED);
723 } /* for loop of objects in player inv */ 724 } /* for loop of objects in player inv */
724 725
725 /* Need to set up the skill pointers */ 726 /* Need to set up the skill pointers */
726 link_player_skills (pl); 727 pl->contr->link_skills ();
727} 728}
728 729
729void 730void
730get_party_password (object *op, partylist *party) 731get_party_password (object *op, partylist *party)
731{ 732{
… …
832static void 833static void
833start_info (object *op) 834start_info (object *op)
834{ 835{
835 char buf[MAX_BUF]; 836 char buf[MAX_BUF];
836 837
837 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 838 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
838 new_draw_info (NDI_UNIQUE, 0, op, buf); 839 new_draw_info (NDI_UNIQUE, 0, op, buf);
839 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
840 //new_draw_info (NDI_UNIQUE, 0, op, " ");
841} 840}
842 841
843/* This function takes the key that is passed, and does the 842/* This function takes the key that is passed, and does the
844 * appropriate action with it (change race, or other things). 843 * appropriate action with it (change race, or other things).
845 * The function name is for historical reasons - now we have 844 * The function name is for historical reasons - now we have
… …
848 */ 847 */
849void 848void
850player::chargen_race_done () 849player::chargen_race_done ()
851{ 850{
852 /* this must before then initial items are given */ 851 /* this must before then initial items are given */
853 esrv_new_player (ob->contr, ob->weight + ob->carrying); 852 esrv_new_player (ob->contr);
854 853
855 treasurelist *tl = treasurelist::find ("starting_wealth"); 854 treasurelist *tl = treasurelist::find ("starting_wealth");
856 if (tl) 855 if (tl)
857 create_treasure (tl, ob, 0, 0, 0); 856 create_treasure (tl, ob, 0, 0, 0);
858 857
… …
862 ob->contr->ns->state = ST_PLAYING; 861 ob->contr->ns->state = ST_PLAYING;
863 862
864 if (ob->msg) 863 if (ob->msg)
865 ob->msg = 0; 864 ob->msg = 0;
866 865
867 /* We create this now because some of the unique maps will need it
868 * to save here.
869 */
870 {
871 char buf[MAX_BUF];
872 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
873 make_path_to_file (buf);
874 }
875
876 start_info (ob); 866 start_info (ob);
877 CLEAR_FLAG (ob, FLAG_WIZ); 867 CLEAR_FLAG (ob, FLAG_WIZ);
878 give_initial_items (ob, ob->randomitems); 868 give_initial_items (ob, ob->randomitems);
879 link_player_skills (ob);
880 esrv_send_inventory (ob, ob); 869 esrv_send_inventory (ob, ob);
881 ob->update_stats (); 870 ob->update_stats ();
882 871
883 /* This moves the player to a different start map, if there 872 /* This moves the player to a different start map, if there
884 * is one for this race 873 * is one for this race
885 */ 874 */
886 if (*first_map_ext_path) 875 if (*first_map_ext_path)
887 { 876 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
888 object *tmp;
889 char mapname[MAX_BUF];
890
891 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
892 tmp = object::create ();
893 EXIT_PATH (tmp) = mapname;
894 EXIT_X (tmp) = ob->x;
895 EXIT_Y (tmp) = ob->y;
896 ob->enter_exit (tmp); /* we don't really care if it succeeded;
897 * if the map isn't there, then stay on the
898 * default initial map */
899 tmp->destroy ();
900 }
901 else 877 else
902 LOG (llevDebug, "first_map_ext_path not set\n"); 878 LOG (llevDebug, "first_map_ext_path not set\n");
903} 879}
904 880
905void 881void
… …
949 LOG (llevDebug, "Fleeing player is dead.\n"); 925 LOG (llevDebug, "Fleeing player is dead.\n");
950 CLEAR_FLAG (op, FLAG_SCARED); 926 CLEAR_FLAG (op, FLAG_SCARED);
951 return; 927 return;
952 } 928 }
953 929
954 if (op->enemy == NULL) 930 if (!op->enemy)
955 { 931 {
956 LOG (llevDebug, "Fleeing player had no enemy.\n"); 932 LOG (llevDebug, "Fleeing player had no enemy.\n");
957 CLEAR_FLAG (op, FLAG_SCARED); 933 CLEAR_FLAG (op, FLAG_SCARED);
958 return; 934 return;
959 } 935 }
960 936
961 /* Seen some crashes here. Since we don't store an
962 * op->enemy_count, it is possible that something destroys the
963 * actual enemy, and the object is recycled.
964 */
965 if (op->enemy->map == NULL)
966 {
967 CLEAR_FLAG (op, FLAG_SCARED);
968 op->enemy = NULL;
969 return;
970 }
971
972 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 937 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
973 { 938 {
974 op->enemy = NULL; 939 op->enemy = NULL;
975 CLEAR_FLAG (op, FLAG_SCARED); 940 CLEAR_FLAG (op, FLAG_SCARED);
976 return; 941 return;
… …
979 get_rangevector (op, op->enemy, &rv, 0); 944 get_rangevector (op, op->enemy, &rv, 0);
980 945
981 dir = absdir (4 + rv.direction); 946 dir = absdir (4 + rv.direction);
982 for (diff = 0; diff < 3; diff++) 947 for (diff = 0; diff < 3; diff++)
983 { 948 {
984 int m = 1 - (RANDOM () & 2); 949 int m = 1 - rndm (2) * 2;
985 950
986 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 951 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
987 return; 952 return;
988 } 953 }
989 954
… …
1000check_pick (object *op) 965check_pick (object *op)
1001{ 966{
1002 object *tmp, *next; 967 object *tmp, *next;
1003 int stop = 0; 968 int stop = 0;
1004 int wvratio; 969 int wvratio;
1005 char putstring[128];
1006 970
1007 /* if you're flying, you cna't pick up anything */ 971 /* if you're flying, you cna't pick up anything */
1008 if (op->move_type & MOVE_FLYING) 972 if (op->move_type & MOVE_FLYING)
1009 return 1; 973 return 1;
1010 974
1011 next = op->below; 975 next = op->below;
1012 976
977 int cnt = MAX_ITEM_PER_DROP;
978#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979
1013 /* loop while there are items on the floor that are not marked as 980 /* loop while there are items on the floor that are not marked as
1014 * destroyed */ 981 * destroyed */
1015 while (next && !next->destroyed ()) 982 while (next && !next->destroyed ())
1016 { 983 {
1017 tmp = next; 984 tmp = next;
1018 next = tmp->below; 985 next = tmp->below;
1019 986
987 if (cnt <= 0)
988 {
989 op->failmsg ("Couldn't pickup all items at once.");
990 return 0;
991 }
992
1020 if (op->destroyed ()) 993 if (op->destroyed ())
1021 return 0; 994 return 0;
1022 995
1023 if (!can_pick (op, tmp)) 996 if (!can_pick (op, tmp))
1024 continue; 997 continue;
1025 998
1026 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 999 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1027 { 1000 {
1028 if (item_matched_string (op, tmp, op->contr->search_str)) 1001 if (item_matched_string (op, tmp, op->contr->search_str))
1029 pick_up (op, tmp); 1002 CHK_PICK_PICKUP;
1003
1030 continue; 1004 continue;
1031 } 1005 }
1032 1006
1033 /* high not bit set? We're using the old autopickup model */ 1007 /* pickup handling */
1008 if (op->contr->mode & PU_DEBUG)
1009 {
1010 /* some debugging code to figure out item information */
1011 const char *str = tmp->name
1012 ? format ("item name: %s item type: %d weight/value: %d",
1013 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1014 : format ("item name: %s item type: %d weight/value: %d",
1015 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1016
1017 new_draw_info (NDI_UNIQUE, 0, op, str);
1018 }
1019
1020 if (op->contr->mode & PU_INHIBIT)
1021 return 1;
1022
1023 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
1024 return 1;
1025
1026 /* philosophy:
1027 * It's easy to grab an item type from a pile, as long as it's
1028 * generic. This takes no game-time. For more detailed pickups
1029 * and selections, select-items should be used. This is a
1030 * grab-as-you-run type mode that's really useful for arrows for
1031 * example.
1032 * The drawback: right now it has no frontend, so you need to
1033 * stick the bits you want into a calculator in hex mode and then
1034 * convert to decimal and then 'pickup <#>
1035 */
1036
1037 /* the first two modes are exclusive: if NOTHING we return, if
1038 * STOP then we stop. All the rest are applied sequentially,
1039 * meaning if any test passes, the item gets picked up. */
1040
1041 /* if mode is set to pick nothing up, return */
1042 if (op->contr->mode == PU_NOTHING)
1043 return 1;
1044
1045 /* if mode is set to stop when encountering objects, return */
1046 /* take STOP before INHIBIT since it doesn't actually pick
1047 * anything up */
1048 if (op->contr->mode & PU_STOP)
1049 return 0;
1050
1051 /* useful for going into stores and not losing your settings... */
1052 /* and for battles wher you don't want to get loaded down while
1053 * fighting */
1054 if (op->contr->mode & PU_INHIBIT)
1055 return 1;
1056
1057 /* prevent us from turning into auto-thieves :) */
1058 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1059 continue;
1060
1061 /* ignore known cursed objects */
1062 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1063 continue;
1064
1065 /* all food and drink if desired */
1066 /* question: don't pick up known-poisonous stuff? */
1034 if (!(op->contr->mode & PU_NEWMODE)) 1067 if (op->contr->mode & PU_FOOD)
1068 if (tmp->type == FOOD)
1035 { 1069 {
1036 switch (op->contr->mode) 1070 CHK_PICK_PICKUP;
1071 continue;
1072 }
1073
1074 if (op->contr->mode & PU_DRINK)
1075 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1076 {
1077 CHK_PICK_PICKUP;
1078 continue;
1079 }
1080
1081 if (op->contr->mode & PU_POTION)
1082 if (tmp->type == POTION)
1083 {
1084 CHK_PICK_PICKUP;
1085 continue;
1086 }
1087
1088 /* spellbooks, skillscrolls and normal books/scrolls */
1089 if (op->contr->mode & PU_SPELLBOOK)
1090 if (tmp->type == SPELLBOOK)
1091 {
1092 CHK_PICK_PICKUP;
1093 continue;
1094 }
1095
1096 if (op->contr->mode & PU_SKILLSCROLL)
1097 if (tmp->type == SKILLSCROLL)
1098 {
1099 CHK_PICK_PICKUP;
1100 continue;
1101 }
1102
1103 if (op->contr->mode & PU_READABLES)
1104 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1105 {
1106 CHK_PICK_PICKUP;
1107 continue;
1108 }
1109
1110 /* wands/staves/rods/horns */
1111 if (op->contr->mode & PU_MAGIC_DEVICE)
1112 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1113 {
1114 CHK_PICK_PICKUP;
1115 continue;
1116 }
1117
1118 /* pick up all magical items */
1119 if (op->contr->mode & PU_MAGICAL)
1120 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1121 {
1122 CHK_PICK_PICKUP;
1123 continue;
1124 }
1125
1126 if (op->contr->mode & PU_VALUABLES)
1127 {
1128 if (tmp->type == MONEY || tmp->type == GEM)
1037 { 1129 {
1038 case 0: 1130 CHK_PICK_PICKUP;
1039 return 1; /* don't pick up */ 1131 continue;
1040 case 1:
1041 pick_up (op, tmp);
1042 return 1;
1043 case 2:
1044 pick_up (op, tmp);
1045 return 0;
1046 case 3:
1047 return 0; /* stop before pickup */
1048 case 4:
1049 pick_up (op, tmp);
1050 break;
1051 case 5:
1052 pick_up (op, tmp);
1053 stop = 1;
1054 break;
1055 case 6:
1056 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1057 pick_up (op, tmp);
1058 break;
1059
1060 case 7:
1061 if (tmp->type == MONEY || tmp->type == GEM)
1062 pick_up (op, tmp);
1063 break;
1064
1065 default:
1066 /* use value density */
1067 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1068 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1069 pick_up (op, tmp);
1070 } 1132 }
1071 } 1133 }
1072 else 1134
1073 { /* old model */ 1135 /* rings & amulets - talismans seems to be typed AMULET */
1074 /* NEW pickup handling */
1075 if (op->contr->mode & PU_DEBUG) 1136 if (op->contr->mode & PU_JEWELS)
1137 if (tmp->type == RING || tmp->type == AMULET)
1076 { 1138 {
1077 /* some debugging code to figure out item information */ 1139 CHK_PICK_PICKUP;
1078 if (tmp->name != NULL)
1079 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1080 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1081 else
1082 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1083 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1084
1085 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1086 }
1087
1088 /* philosophy:
1089 * It's easy to grab an item type from a pile, as long as it's
1090 * generic. This takes no game-time. For more detailed pickups
1091 * and selections, select-items should be used. This is a
1092 * grab-as-you-run type mode that's really useful for arrows for
1093 * example.
1094 * The drawback: right now it has no frontend, so you need to
1095 * stick the bits you want into a calculator in hex mode and then
1096 * convert to decimal and then 'pickup <#>
1097 */
1098
1099 /* the first two modes are exclusive: if NOTHING we return, if
1100 * STOP then we stop. All the rest are applied sequentially,
1101 * meaning if any test passes, the item gets picked up. */
1102
1103 /* if mode is set to pick nothing up, return */
1104
1105 if (op->contr->mode & PU_NOTHING)
1106 return 1;
1107
1108 /* if mode is set to stop when encountering objects, return */
1109 /* take STOP before INHIBIT since it doesn't actually pick
1110 * anything up */
1111
1112 if (op->contr->mode & PU_STOP)
1113 return 0;
1114
1115 /* useful for going into stores and not losing your settings... */
1116 /* and for battles wher you don't want to get loaded down while
1117 * fighting */
1118 if (op->contr->mode & PU_INHIBIT)
1119 return 1;
1120
1121 /* prevent us from turning into auto-thieves :) */
1122 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1123 continue; 1140 continue;
1141 }
1124 1142
1125 /* ignore known cursed objects */ 1143 /* we don't forget dragon food */
1126 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1144 if (op->contr->mode & PU_FLESH)
1145 if (tmp->type == FLESH)
1146 {
1147 CHK_PICK_PICKUP;
1127 continue; 1148 continue;
1149 }
1128 1150
1129 /* all food and drink if desired */ 1151 /* bows and arrows. Bows are good for selling! */
1130 /* question: don't pick up known-poisonous stuff? */ 1152 if (op->contr->mode & PU_BOW)
1153 if (tmp->type == BOW)
1154 {
1155 CHK_PICK_PICKUP;
1156 continue;
1157 }
1158
1159 if (op->contr->mode & PU_ARROW)
1160 if (tmp->type == ARROW)
1161 {
1162 CHK_PICK_PICKUP;
1163 continue;
1164 }
1165
1166 /* all kinds of armor etc. */
1167 if (op->contr->mode & PU_ARMOUR)
1168 if (tmp->type == ARMOUR)
1169 {
1170 CHK_PICK_PICKUP;
1171 continue;
1172 }
1173
1174 if (op->contr->mode & PU_HELMET)
1175 if (tmp->type == HELMET)
1176 {
1177 CHK_PICK_PICKUP;
1178 continue;
1179 }
1180
1181 if (op->contr->mode & PU_SHIELD)
1182 if (tmp->type == SHIELD)
1183 {
1184 CHK_PICK_PICKUP;
1185 continue;
1186 }
1187
1131 if (op->contr->mode & PU_FOOD) 1188 if (op->contr->mode & PU_BOOTS)
1132 if (tmp->type == FOOD) 1189 if (tmp->type == BOOTS)
1190 {
1191 CHK_PICK_PICKUP;
1192 continue;
1193 }
1194
1195 if (op->contr->mode & PU_GLOVES)
1196 if (tmp->type == GLOVES)
1197 {
1198 CHK_PICK_PICKUP;
1199 continue;
1200 }
1201
1202 if (op->contr->mode & PU_CLOAK)
1203 if (tmp->type == CLOAK)
1204 {
1205 CHK_PICK_PICKUP;
1206 continue;
1207 }
1208
1209 /* hoping to catch throwing daggers here */
1210 if (op->contr->mode & PU_MISSILEWEAPON)
1211 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1212 {
1213 CHK_PICK_PICKUP;
1214 continue;
1215 }
1216
1217 /* careful: chairs and tables are weapons! */
1218 if (op->contr->mode & PU_ALLWEAPON)
1219 {
1220 if (tmp->type == WEAPON)
1221 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1133 { 1222 {
1134 pick_up (op, tmp); 1223 CHK_PICK_PICKUP;
1135 continue; 1224 continue;
1136 } 1225 }
1226 }
1137 1227
1228 /* misc stuff that's useful */
1138 if (op->contr->mode & PU_DRINK) 1229 if (op->contr->mode & PU_KEY)
1139 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1230 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1140 { 1231 {
1141 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1142 continue; 1233 continue;
1143 } 1234 }
1144 1235
1236 /* any of the last 4 bits set means we use the ratio for value
1237 * pickups */
1145 if (op->contr->mode & PU_POTION) 1238 if (op->contr->mode & PU_RATIO)
1146 if (tmp->type == POTION) 1239 {
1240 /* use value density to decide what else to grab */
1241 /* >=7 was >= op->contr->mode */
1242 /* >=7 is the old standard setting. Now we take the last 4 bits
1147 { 1243 */
1148 pick_up (op, tmp);
1149 continue;
1150 }
1151
1152 /* spellbooks, skillscrolls and normal books/scrolls */
1153 if (op->contr->mode & PU_SPELLBOOK)
1154 if (tmp->type == SPELLBOOK)
1155 {
1156 pick_up (op, tmp);
1157 continue;
1158 }
1159
1160 if (op->contr->mode & PU_SKILLSCROLL)
1161 if (tmp->type == SKILLSCROLL)
1162 {
1163 pick_up (op, tmp);
1164 continue;
1165 }
1166
1167 if (op->contr->mode & PU_READABLES)
1168 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1169 {
1170 pick_up (op, tmp);
1171 continue;
1172 }
1173
1174 /* wands/staves/rods/horns */
1175 if (op->contr->mode & PU_MAGIC_DEVICE)
1176 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1177 {
1178 pick_up (op, tmp);
1179 continue;
1180 }
1181
1182 /* pick up all magical items */
1183 if (op->contr->mode & PU_MAGICAL) 1244 wvratio = op->contr->mode & PU_RATIO;
1184 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1245 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1185 {
1186 pick_up (op, tmp);
1187 continue;
1188 }
1189
1190 if (op->contr->mode & PU_VALUABLES)
1191 { 1246 {
1192 if (tmp->type == MONEY || tmp->type == GEM) 1247#if 0
1248 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1249 if (tmp->name != NULL)
1193 { 1250 {
1194 pick_up (op, tmp); 1251 fprintf (stderr, "%s", tmp->name);
1195 continue;
1196 } 1252 }
1197 }
1198
1199 /* rings & amulets - talismans seems to be typed AMULET */
1200 if (op->contr->mode & PU_JEWELS)
1201 if (tmp->type == RING || tmp->type == AMULET)
1202 {
1203 pick_up (op, tmp);
1204 continue;
1205 }
1206
1207 /* we don't forget dragon food */
1208 if (op->contr->mode & PU_FLESH)
1209 if (tmp->type == FLESH)
1210 {
1211 pick_up (op, tmp);
1212 continue;
1213 }
1214
1215 /* bows and arrows. Bows are good for selling! */
1216 if (op->contr->mode & PU_BOW)
1217 if (tmp->type == BOW)
1218 {
1219 pick_up (op, tmp);
1220 continue;
1221 }
1222
1223 if (op->contr->mode & PU_ARROW)
1224 if (tmp->type == ARROW)
1225 {
1226 pick_up (op, tmp);
1227 continue;
1228 }
1229
1230 /* all kinds of armor etc. */
1231 if (op->contr->mode & PU_ARMOUR)
1232 if (tmp->type == ARMOUR)
1233 {
1234 pick_up (op, tmp);
1235 continue;
1236 }
1237
1238 if (op->contr->mode & PU_HELMET)
1239 if (tmp->type == HELMET)
1240 {
1241 pick_up (op, tmp);
1242 continue;
1243 }
1244
1245 if (op->contr->mode & PU_SHIELD)
1246 if (tmp->type == SHIELD)
1247 {
1248 pick_up (op, tmp);
1249 continue;
1250 }
1251
1252 if (op->contr->mode & PU_BOOTS)
1253 if (tmp->type == BOOTS)
1254 {
1255 pick_up (op, tmp);
1256 continue;
1257 }
1258
1259 if (op->contr->mode & PU_GLOVES)
1260 if (tmp->type == GLOVES)
1261 {
1262 pick_up (op, tmp);
1263 continue;
1264 }
1265
1266 if (op->contr->mode & PU_CLOAK)
1267 if (tmp->type == CLOAK)
1268 {
1269 pick_up (op, tmp);
1270 continue;
1271 }
1272
1273 /* hoping to catch throwing daggers here */
1274 if (op->contr->mode & PU_MISSILEWEAPON)
1275 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1276 {
1277 pick_up (op, tmp);
1278 continue;
1279 }
1280
1281 /* careful: chairs and tables are weapons! */
1282 if (op->contr->mode & PU_ALLWEAPON)
1283 {
1284 if (tmp->type == WEAPON && tmp->name != NULL)
1285 {
1286 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1287 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1288 {
1289 pick_up (op, tmp);
1290 continue;
1291 }
1292 }
1293
1294 if (tmp->type == WEAPON && tmp->name == NULL)
1295 {
1296 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1297 {
1298 pick_up (op, tmp);
1299 continue;
1300 }
1301 }
1302 }
1303
1304 /* misc stuff that's useful */
1305 if (op->contr->mode & PU_KEY)
1306 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1307 {
1308 pick_up (op, tmp);
1309 continue;
1310 }
1311
1312 /* any of the last 4 bits set means we use the ratio for value
1313 * pickups */
1314 if (op->contr->mode & PU_RATIO)
1315 {
1316 /* use value density to decide what else to grab */
1317 /* >=7 was >= op->contr->mode */
1318 /* >=7 is the old standard setting. Now we take the last 4 bits
1319 * and multiply them by 5, giving 0..15*5== 5..75 */
1320 wvratio = (op->contr->mode & PU_RATIO) * 5;
1321 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1322 {
1323 pick_up (op, tmp);
1324#if 0
1325 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1326 if (tmp->name != NULL)
1327 {
1328 fprintf (stderr, "%s", tmp->name);
1329 }
1330 else 1253 else
1331 fprintf (stderr, "%s", tmp->arch->archname); 1254 fprintf (stderr, "%s", tmp->arch->archname);
1332 fprintf (stderr, ",%d] = ", tmp->type); 1255 fprintf (stderr, ",%d] = ", tmp->type);
1333 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1256 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1334#endif 1257#endif
1258 CHK_PICK_PICKUP;
1335 continue; 1259 continue;
1336 }
1337 } 1260 }
1338 } /* the new pickup model */ 1261 } /* the new pickup model */
1339 } 1262 }
1340 1263
1341 return !stop; 1264 return !stop;
… …
1347 * found object is returned. 1270 * found object is returned.
1348 */ 1271 */
1349object * 1272object *
1350find_arrow (object *op, const char *type) 1273find_arrow (object *op, const char *type)
1351{ 1274{
1352 object *tmp = 0;
1353
1354 for (op = op->inv; op; op = op->below) 1275 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1355 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1356 tmp = find_arrow (splay (op), type);
1357 else if (op->type == ARROW && op->race == type) 1276 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1358 return splay (op); 1277 return splay (tmp);
1359 1278
1279 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1280 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1281 if (object *arrow = find_arrow (tmp, type))
1282 {
1283 splay (tmp);
1284 return arrow;
1285 }
1286
1360 return tmp; 1287 return 0;
1361} 1288}
1362 1289
1363/* 1290/*
1364 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1291 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1365 * against the target. A full test is not performed, simply a basic test 1292 * against the target. A full test is not performed, simply a basic test
1366 * of resistances. The archer is making a quick guess at what he sees down 1293 * of resistances. The archer is making a quick guess at what he sees down
1367 * the hall. Failing that it does it's best to pick the highest plus arrow. 1294 * the hall. Failing that it does it's best to pick the highest plus arrow.
1368 */ 1295 */
1369object * 1296object *
1370find_better_arrow (object *op, object *target, const char *type, int *better) 1297find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1371{ 1298{
1372 object *tmp = NULL, *arrow, *ntmp; 1299 object *tmp = NULL, *arrow, *ntmp;
1373 int attacknum, attacktype, betterby = 0, i; 1300 int attacknum, attacktype, betterby = 0, i;
1374 1301
1375 if (!type) 1302 if (!type)
… …
1379 { 1306 {
1380 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1307 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1381 { 1308 {
1382 i = 0; 1309 i = 0;
1383 ntmp = find_better_arrow (arrow, target, type, &i); 1310 ntmp = find_better_arrow (arrow, target, type, &i);
1311
1384 if (i > betterby) 1312 if (i > betterby)
1385 { 1313 {
1386 tmp = ntmp; 1314 tmp = ntmp;
1387 betterby = i; 1315 betterby = i;
1388 } 1316 }
1389 } 1317 }
1390 else if (arrow->type == ARROW && arrow->race == type) 1318 else if (arrow->type == ARROW && arrow->race == type)
1391 { 1319 {
1392 /* allways prefer assasination/slaying */ 1320 /* allways prefer assasination/slaying */
1393 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1321 if (target->race && arrow->slaying.contains (target->race))
1394 { 1322 {
1395 if (arrow->attacktype & AT_DEATH) 1323 if (arrow->attacktype & AT_DEATH)
1396 { 1324 {
1397 *better = 100; 1325 *better = 100;
1398 return arrow; 1326 return arrow;
… …
1413 { 1341 {
1414 tmp = arrow; 1342 tmp = arrow;
1415 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1343 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1416 } 1344 }
1417 } 1345 }
1346
1418 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1347 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1419 { 1348 {
1420 tmp = arrow; 1349 tmp = arrow;
1421 betterby = 2 + arrow->magic + arrow->stats.dam; 1350 betterby = 2 + arrow->magic + arrow->stats.dam;
1422 } 1351 }
1352
1423 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1353 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1424 { 1354 {
1425 tmp = arrow; 1355 tmp = arrow;
1426 betterby = 1 + arrow->magic + arrow->stats.dam; 1356 betterby = 1 + arrow->magic + arrow->stats.dam;
1427 } 1357 }
1428 } 1358 }
1429 } 1359 }
1430 } 1360 }
1361
1431 if (tmp == NULL && arrow == NULL) 1362 if (tmp == NULL && arrow == NULL)
1432 return find_arrow (op, type); 1363 return find_arrow (op, type);
1433 1364
1434 *better = betterby; 1365 *better = betterby;
1435 return tmp; 1366 return tmp;
… …
1440 * op = the shooter 1371 * op = the shooter
1441 * type = bow->race 1372 * type = bow->race
1442 * dir = fire direction 1373 * dir = fire direction
1443 */ 1374 */
1444object * 1375object *
1445pick_arrow_target (object *op, const char *type, int dir) 1376pick_arrow_target (object *op, shstr_cmp type, int dir)
1446{ 1377{
1447 object *tmp = NULL; 1378 object *tmp = NULL;
1448 maptile *m; 1379 maptile *m;
1449 int i, mflags, found, number; 1380 int i, mflags, found, number;
1450 sint16 x, y; 1381 sint16 x, y;
… …
1465 for (i = 0, found = 0; i < 20; i++) 1396 for (i = 0, found = 0; i < 20; i++)
1466 { 1397 {
1467 x += freearr_x[dir]; 1398 x += freearr_x[dir];
1468 y += freearr_y[dir]; 1399 y += freearr_y[dir];
1469 mflags = get_map_flags (m, &m, x, y, &x, &y); 1400 mflags = get_map_flags (m, &m, x, y, &x, &y);
1401
1470 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1402 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1471 { 1403 {
1472 tmp = NULL; 1404 tmp = 0;
1473 break; 1405 break;
1474 } 1406 }
1475 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1407 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1476 { 1408 {
1477 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1409 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1478 * perhaps a bad assumption. 1410 * perhaps a bad assumption.
1479 */ 1411 */
1480 tmp = NULL; 1412 tmp = 0;
1481 break; 1413 break;
1482 } 1414 }
1415
1483 if (mflags & P_IS_ALIVE) 1416 if (mflags & P_IS_ALIVE)
1484 {
1485 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1417 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1486 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1418 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1487 {
1488 found++;
1489 break;
1490 }
1491 if (found)
1492 break; 1419 break;
1493 }
1494 } 1420 }
1495 if (tmp == NULL) 1421
1422 if (!tmp)
1496 return find_arrow (op, type); 1423 return find_arrow (op, type);
1497 1424
1498 if (tmp->head) 1425 if (tmp->head)
1499 tmp = tmp->head; 1426 tmp = tmp->head;
1500 1427
… …
1540 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1467 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1541 return 0; 1468 return 0;
1542 } 1469 }
1543 1470
1544 // optimisation: move object to top so we will find it quickly again 1471 // optimisation: move object to top so we will find it quickly again
1545 if (bow->below) 1472 splay (bow);
1546 {
1547 bow->remove ();
1548 op->insert (bow);
1549 }
1550
1551 } 1473 }
1552 1474
1553 if (!bow->race || !bow->skill) 1475 if (!bow->race || !bow->skill)
1554 { 1476 {
1555 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1477 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1581 } 1503 }
1582 1504
1583 /* this should not happen, but sometimes does */ 1505 /* this should not happen, but sometimes does */
1584 if (arrow->nrof == 0) 1506 if (arrow->nrof == 0)
1585 { 1507 {
1508 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1586 arrow->destroy (); 1509 arrow->destroy ();
1587 return 0; 1510 return 0;
1588 } 1511 }
1589 1512
1590 left = arrow; /* these are arrows left to the player */ 1513 left = arrow; /* these are arrows left to the player */
1591 arrow = get_split_ob (arrow, 1); 1514 arrow = arrow->split ();
1592 if (!arrow) 1515 if (!arrow)
1593 { 1516 {
1594 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1517 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1595 return 0; 1518 return 0;
1596 } 1519 }
… …
1600 arrow->direction = dir; 1523 arrow->direction = dir;
1601 1524
1602 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1525 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1603 arrow->stats.hp = arrow->stats.dam; 1526 arrow->stats.hp = arrow->stats.dam;
1604 arrow->stats.grace = arrow->attacktype; 1527 arrow->stats.grace = arrow->attacktype;
1605 1528 arrow->custom_name = arrow->slaying;
1606 if (arrow->slaying)
1607 arrow->spellarg = strdup (arrow->slaying);
1608 1529
1609#if 0 1530#if 0
1610 if (player *pl = op->contr) 1531 if (player *pl = op->contr)
1611 { 1532 {
1612 float speed = pl->weapon_sp; 1533 float speed = pl->weapon_sp;
… …
1663 op->play_sound (sound_find ("fire_arrow")); 1584 op->play_sound (sound_find ("fire_arrow"));
1664 m->insert (arrow, sx, sy, op); 1585 m->insert (arrow, sx, sy, op);
1665 1586
1666 if (!arrow->destroyed ()) 1587 if (!arrow->destroyed ())
1667 move_arrow (arrow); 1588 move_arrow (arrow);
1668
1669 if (op->type == PLAYER)
1670 {
1671 if (left->destroyed ())
1672 esrv_del_item (op->contr, left->count);
1673 else
1674 esrv_send_item (op, left);
1675 }
1676 1589
1677 return 1; 1590 return 1;
1678} 1591}
1679 1592
1680/* Special fire code for players - this takes into 1593/* Special fire code for players - this takes into
… …
1685 * hence the function name. 1598 * hence the function name.
1686 */ 1599 */
1687int 1600int
1688player_fire_bow (object *op, int dir) 1601player_fire_bow (object *op, int dir)
1689{ 1602{
1690 int ret = 0, wcmod = 0; 1603 int ret;
1691 1604
1692 if (op->contr->bowtype == bow_bestarrow) 1605 if (op->contr->bowtype == bow_bestarrow)
1693 { 1606 {
1694 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1607 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1695 } 1608 }
1696 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1609 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1697 { 1610 {
1698 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1611 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1699 wcmod = -1;
1700
1701 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1612 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1702 } 1613 }
1703 else if (op->contr->bowtype == bow_threewide) 1614 else if (op->contr->bowtype == bow_threewide)
1704 { 1615 {
1705 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1616 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1706 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1617 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1707 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1618 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1708 } 1619 }
1709 else if (op->contr->bowtype == bow_spreadshot) 1620 else if (op->contr->bowtype == bow_spreadshot)
1710 { 1621 {
1711 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1622 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1712 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1623 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1713 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1624 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1714 } 1625 }
1715 else 1626 else
1716 { 1627 {
… …
1754 return; 1665 return;
1755 } 1666 }
1756 } 1667 }
1757 else if (item->type == ROD || item->type == HORN) 1668 else if (item->type == ROD || item->type == HORN)
1758 { 1669 {
1759 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1670 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1671
1672 // using the maximum of the rods charge allows at least one spell cast
1673 // for a rod or horn, this fixes some broken rods.
1674 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1760 { 1675 {
1761 op->contr->play_sound (sound_find ("wand_poof")); 1676 op->contr->play_sound (sound_find ("wand_poof"));
1762 1677
1763 if (item->type == ROD) 1678 if (item->type == ROD)
1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1679 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1769 } 1684 }
1770 } 1685 }
1771 1686
1772 if (cast_spell (op, item, dir, item->inv, NULL)) 1687 if (cast_spell (op, item, dir, item->inv, NULL))
1773 { 1688 {
1774 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1689 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1690
1775 if (item->type == WAND) 1691 if (item->type == WAND)
1776 { 1692 {
1777 if (!(--item->stats.food)) 1693 if (!(--item->stats.food))
1778 { 1694 {
1779 object *tmp; 1695 object *tmp;
… …
1783 CLEAR_FLAG (item, FLAG_ANIMATE); 1699 CLEAR_FLAG (item, FLAG_ANIMATE);
1784 item->face = item->arch->face; 1700 item->face = item->arch->face;
1785 item->set_speed (0); 1701 item->set_speed (0);
1786 } 1702 }
1787 1703
1788 if ((tmp = item->in_player ())) 1704 if (object *pl = item->visible_to ())
1789 esrv_update_item (UPD_ANIM, tmp, item); 1705 esrv_update_item (UPD_ANIM, pl, item);
1790 } 1706 }
1791 } 1707 }
1792 else if (item->type == ROD || item->type == HORN) 1708 else if (item->type == ROD || item->type == HORN)
1793 drain_rod_charge (item); 1709 drain_rod_charge (item);
1794 } 1710 }
… …
1799bool 1715bool
1800fire (object *op, int dir) 1716fire (object *op, int dir)
1801{ 1717{
1802 int spellcost = 0; 1718 int spellcost = 0;
1803 1719
1804 /* check for loss of invisiblity/hide */
1805 if (action_makes_visible (op))
1806 make_visible (op);
1807
1808 player *pl = op->contr; 1720 player *pl = op->contr;
1809 1721
1810 if (pl->golem) 1722 if (pl->golem)
1811 { 1723 {
1812 control_golem (op->contr->golem, dir); 1724 control_golem (op->contr->golem, dir);
… …
1814 } 1726 }
1815 1727
1816 object *ob = pl->ranged_ob; 1728 object *ob = pl->ranged_ob;
1817 1729
1818 if (!ob) 1730 if (!ob)
1819 return false;
1820
1821 if (!op->change_weapon (ob))
1822 return false; 1731 return false;
1823 1732
1824 if (op->speed_left > 0.f) 1733 if (op->speed_left > 0.f)
1825 --op->speed_left; 1734 --op->speed_left;
1826 else 1735 else
1827 return false; 1736 return false;
1828 1737
1738 if (!op->change_weapon (ob))
1739 return false;
1740
1741 /* check for loss of invisiblity/hide */
1742 if (action_makes_visible (op))
1743 make_visible (op);
1744
1829 switch (ob->type) 1745 switch (ob->type)
1830 { 1746 {
1831 case BOW: 1747 case BOW:
1832 player_fire_bow (op, dir); 1748 player_fire_bow (op, dir);
1833 break; 1749 break;
1834 1750
1835 case SPELL: 1751 case SPELL:
1836 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1752 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1837 break; 1753 break;
1838 1754
1839 case BUILDER: 1755 case BUILDER:
1840 apply_map_builder (op, dir); 1756 apply_map_builder (op, dir);
1841 break; 1757 break;
… …
1925 * Change the color so that the message doesn't disappear with 1841 * Change the color so that the message doesn't disappear with
1926 * all the others. 1842 * all the others.
1927 */ 1843 */
1928 if (pl->contr->usekeys == key_inventory || 1844 if (pl->contr->usekeys == key_inventory ||
1929 !QUERY_FLAG (container, FLAG_APPLIED) || 1845 !QUERY_FLAG (container, FLAG_APPLIED) ||
1930 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1846 (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1931 { 1847 {
1932 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1848 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1933 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1849 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1934 return NULL; 1850 return NULL;
1935 } 1851 }
… …
1970 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN); 1886 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1971 remove_door2 (door); /* remove door without violence ;-) */ 1887 remove_door2 (door); /* remove door without violence ;-) */
1972 } 1888 }
1973 1889
1974 /* Do this after we print the message */ 1890 /* Do this after we print the message */
1975 decrease_ob (key); /* Use up one of the keys */ 1891 key->decrease (); /* Use up one of the keys */
1976 /* Need to update the weight the container the key was in */
1977 if (container != op)
1978 esrv_update_item (UPD_WEIGHT, op, container);
1979 1892
1980 return 1; /* Nothing more to do below */ 1893 return 1; /* Nothing more to do below */
1981 } 1894 }
1982 else if (door->type == LOCKED_DOOR) 1895 else if (door->type == LOCKED_DOOR)
1983 { 1896 {
… …
2080 --op->speed_left; 1993 --op->speed_left;
2081 1994
2082 op->play_sound (sound_find ("push_player")); 1995 op->play_sound (sound_find ("push_player"));
2083 push_ob (mon, dir, op); 1996 push_ob (mon, dir, op);
2084 1997
2085 if (op->contr->tmp_invis || op->hide) 1998 if (action_makes_visible (op))
2086 make_visible (op); 1999 make_visible (op);
2087 2000
2088 return true; 2001 return true;
2089 } 2002 }
2090 else 2003 else
… …
2112 push_ob (mon, dir, op); 2025 push_ob (mon, dir, op);
2113 } 2026 }
2114 else 2027 else
2115 op->statusmsg ("You withhold your attack"); 2028 op->statusmsg ("You withhold your attack");
2116 2029
2117 if (op->contr->tmp_invis || op->hide) 2030 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2118 make_visible (op); 2031 make_visible (op);
2119 2032
2120 return true; 2033 return true;
2121 } 2034 }
2122 } 2035 }
… …
2164bool 2077bool
2165move_player (object *op, int dir) 2078move_player (object *op, int dir)
2166{ 2079{
2167 int pick; 2080 int pick;
2168 2081
2169 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2082 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2170 return 0; 2083 return 0;
2171 2084
2172 /* Sanity check: make sure dir is valid */ 2085 /* Sanity check: make sure dir is valid */
2173 if ((dir < 0) || (dir >= 9)) 2086 if ((dir < 0) || (dir >= 9))
2174 { 2087 {
… …
2180 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2093 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2181 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2094 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2182 2095
2183 op->facing = dir; 2096 op->facing = dir;
2184 2097
2185 if (op->hide) 2098 if (op->flag [FLAG_HIDDEN])
2186 do_hidden_move (op); 2099 do_hidden_move (op);
2187 2100
2188 bool retval; 2101 bool retval;
2189 2102
2190 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2103 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2262 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2175 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2263 { 2176 {
2264 op->play_sound (sound_find ("ob_evaporate")); 2177 op->play_sound (sound_find ("ob_evaporate"));
2265 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2178 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2266 2179
2267 if (op->contr)
2268 esrv_del_item (op->contr, tmp->count);
2269
2270 tmp->destroy (); 2180 tmp->destroy ();
2271 CLEAR_FLAG (op, FLAG_LIFESAVE); 2181 CLEAR_FLAG (op, FLAG_LIFESAVE);
2272 2182
2273 if (op->stats.hp < 0) 2183 if (op->stats.hp < 0)
2274 op->stats.hp = op->stats.maxhp; 2184 op->stats.hp = op->stats.maxhp;
… …
2286 return 0; 2196 return 0;
2287} 2197}
2288 2198
2289/* This goes throws the inventory and removes unpaid objects, and puts them 2199/* This goes throws the inventory and removes unpaid objects, and puts them
2290 * back in the map (location and map determined by values of env). This 2200 * back in the map (location and map determined by values of env). This
2291 * function will descend into containers. op is the object to start the search 2201 * function will descend into containers. op is the object to start the search
2292 * from. 2202 * from.
2293 */ 2203 */
2294static void 2204static void
2295drop_unpaid_items (object *op, object *env) 2205drop_unpaid_items (object *op, object *env)
2296{ 2206{
2297 while (op) 2207 while (op)
2298 { 2208 {
2299 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2209 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2300 2210
2301 if (QUERY_FLAG (op, FLAG_UNPAID)) 2211 if (QUERY_FLAG (op, FLAG_UNPAID))
2302 {
2303 if (env->type == PLAYER)
2304 esrv_del_item (env->contr, op->count);
2305
2306 op->insert_at (env); 2212 op->insert_at (env);
2307 }
2308 else if (op->inv) 2213 else if (op->inv)
2309 drop_unpaid_items (op->inv, env); 2214 drop_unpaid_items (op->inv, env);
2310 2215
2311 op = next; 2216 op = next;
2312 } 2217 }
… …
2324 * Moved from apply.c to player.c - player.c is what 2229 * Moved from apply.c to player.c - player.c is what
2325 * actually uses this function. player.c may not be quite the 2230 * actually uses this function. player.c may not be quite the
2326 * best, a misc file for object actions is probably better, 2231 * best, a misc file for object actions is probably better,
2327 * but there isn't one in the server directory. 2232 * but there isn't one in the server directory.
2328 */ 2233 */
2329char * 2234const char *
2330gravestone_text (object *op) 2235gravestone_text (object *op)
2331{ 2236{
2332 static char buf2[MAX_BUF]; 2237 static dynbuf_text buf;
2333 char buf[MAX_BUF];
2334 time_t now = time (NULL);
2335 2238
2336 strcpy (buf2, " R.I.P.\n\n"); 2239 buf << "---- R.I.P. ----\n\n"
2240 << op->name;
2241
2337 if (op->type == PLAYER) 2242 if (op->type == PLAYER)
2338 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2243 buf << " the " << op->contr->title;
2339 else
2340 sprintf (buf, "%s\n", &op->name);
2341 2244
2342 strncat (buf2, " ", 20 - strlen (buf) / 2); 2245 buf << "\n\n";
2343 strcat (buf2, buf); 2246
2247 buf << "who was level ";
2248 buf << (sint32)op->level << "\n\n" // OO breakdown
2249 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2250
2344 if (op->type == PLAYER) 2251 if (op->type == PLAYER)
2345 sprintf (buf, "who was in level %d when killed\n", op->level); 2252 buf << "by " << op->contr->killer_name () << ".\n\n";
2346 else
2347 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2348 2253
2349 strncat (buf2, " ", 20 - strlen (buf) / 2);
2350 strcat (buf2, buf);
2351 if (op->type == PLAYER)
2352 { 2254 {
2353 sprintf (buf, "by %s.\n\n", op->contr->killer); 2255 static char buf2[128];
2354 strncat (buf2, " ", 21 - strlen (buf) / 2); 2256 time_t now = time (NULL);
2355 strcat (buf2, buf);
2356 }
2357
2358 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2257 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2359 strncat (buf2, " ", 20 - strlen (buf) / 2); 2258 buf << buf2;
2360 strcat (buf2, buf); 2259 }
2361 2260
2362 return buf2; 2261 return buf;
2363} 2262}
2364 2263
2365void 2264void
2366do_some_living (object *op) 2265do_some_living (object *op)
2367{ 2266{
… …
2522 { 2421 {
2523 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2422 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2524 2423
2525 if (over_hp > 0) 2424 if (over_hp > 0)
2526 { 2425 {
2527 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2426 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2528 op->last_heal = 0; 2427 op->last_heal = 0;
2529 } 2428 }
2530 else 2429 else
2531 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2430 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2532 } 2431 }
… …
2548 op->stats.food--; 2447 op->stats.food--;
2549 } 2448 }
2550 2449
2551 if (op->stats.food < 0 && op->stats.hp >= 0) 2450 if (op->stats.food < 0 && op->stats.hp >= 0)
2552 { 2451 {
2553 object *tmp, *flesh = 0; 2452 object *flesh = 0;
2554 2453
2555 for (tmp = op->inv; tmp; tmp = tmp->below) 2454 for_inv_removable (op, tmp)
2556 { 2455 {
2557 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2456 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2457 continue;
2458
2459 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2558 { 2460 {
2559 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2461 op->statusmsg ("You blindly grab for a bite of food. "
2560 { 2462 "H<To prevent you from starving, you ate some random item from your backpack.>");
2561 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2562 manual_apply (op, tmp, 0); 2463 manual_apply (op, tmp, 0);
2464
2563 if (op->stats.food >= 0 || op->stats.hp < 0) 2465 if (op->stats.food >= 0 || op->stats.hp < 0)
2564 break; 2466 break;
2565 } 2467 }
2566 else if (tmp->type == FLESH) 2468 else if (tmp->type == FLESH)
2567 flesh = tmp; 2469 flesh = tmp;
2568 } /* End if paid for object */ 2470 }
2569 } /* end of for loop */
2570 2471
2571 /* If player is still starving, it means they don't have any food, so 2472 /* If player is still starving, it means they don't have any food, so
2572 * eat flesh instead. 2473 * eat flesh instead.
2573 */ 2474 */
2574 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2475 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2575 { 2476 {
2576 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2477 op->statusmsg ("You blindly grab for a bite of food. "
2478 "H<To prevent you from starving, you ate some random item from your backpack.>");
2577 manual_apply (op, flesh, 0); 2479 manual_apply (op, flesh, 0);
2578 } 2480 }
2481
2482 // If player is still starving, alert him!
2483 if (op->stats.food < 0)
2484 op->failmsg ("You are starving! "
2485 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2579 } 2486 }
2580 2487
2581 if (op->stats.food < 0) 2488 if (op->stats.food < 0)
2582 { 2489 {
2583 op->stats.hp += op->stats.food; 2490 op->stats.hp += op->stats.food;
2584 op->stats.food = 0; 2491 op->stats.food = 0;
2492
2493 if (op->stats.hp < 0)
2494 {
2495 op->contr->killer = archetype::get ("killer_starvation");
2496 op->contr->killer->destroy ();
2585 } 2497 }
2498 }
2586 2499
2500 /* killer should be set here already */
2587 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2501 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2588 kill_player (op); 2502 kill_player (op);
2589 } 2503 }
2590} 2504}
2591 2505
… …
2596 */ 2510 */
2597void 2511void
2598kill_player (object *op) 2512kill_player (object *op)
2599{ 2513{
2600 int x, y; 2514 int x, y;
2601 char buf[MAX_BUF];
2602 maptile *map; /* this is for resurrection */ 2515 maptile *map; /* this is for resurrection */
2603 int will_kill_again; 2516 int will_kill_again;
2604 archetype *at; 2517 archetype *at;
2605 object *tmp; 2518 object *tmp;
2606 2519
2607 if (save_life (op)) 2520 if (save_life (op))
2608 return; 2521 return;
2522
2523 dynbuf_text deathtab;
2524
2525 /* restore player */
2526 at = archetype::find ("poisoning");
2527 if (object *tmp = present_arch_in_ob (at, op))
2528 {
2529 tmp->destroy ();
2530 deathtab << "Your body feels cleansed...\r";
2531 }
2532
2533 at = archetype::find ("confusion");
2534 if (object *tmp = present_arch_in_ob (at, op))
2535 {
2536 tmp->destroy ();
2537 deathtab << "Your mind feels clearer...\r";
2538 }
2539
2540 cure_disease (op, 0, 0); /* remove any disease */
2541
2542 max_it (op->stats.hp , op->stats.maxhp);
2543 max_it (op->stats.sp , op->stats.maxsp);
2544 max_it (op->stats.grace, op->stats.maxgrace);
2545
2546 if (op->stats.food <= 0)
2547 op->stats.food = 999;
2548
2549 // remove all spell effects that are active
2550 // to avoid long-term effects such as word-of-recall
2551 for (object *item = op->inv; item; )
2552 {
2553 object *next = item->below;
2554
2555 if (item->type == SPELL_EFFECT && item->active)
2556 item->destroy ();
2557
2558 item = next;
2559 }
2609 2560
2610 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2561 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2611 * in cities ONLY!!! It is very important that this doesn't get abused. 2562 * in cities ONLY!!! It is very important that this doesn't get abused.
2612 * Look at op_on_battleground() for more info --AndreasV 2563 * Look at op_on_battleground() for more info --AndreasV
2613 */ 2564 */
2614 if (op_on_battleground (op, &x, &y)) 2565 if (op_on_battleground (op, &x, &y))
2615 { 2566 {
2616 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2567 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2617 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2618
2619 /* restore player */
2620 at = archetype::find ("poisoning");
2621 if (object *tmp = present_arch_in_ob (at, op))
2622 {
2623 tmp->destroy ();
2624 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2625 }
2626
2627 at = archetype::find ("confusion");
2628 if (object *tmp = present_arch_in_ob (at, op))
2629 {
2630 tmp->destroy ();
2631 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2632 }
2633
2634 cure_disease (op, 0, 0); /* remove any disease */
2635 op->stats.hp = op->stats.maxhp;
2636 if (op->stats.food <= 0)
2637 op->stats.food = 999;
2638 2568
2639 /* create a bodypart-trophy to make the winner happy */ 2569 /* create a bodypart-trophy to make the winner happy */
2640 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2570 if (object *tmp = arch_to_object (archetype::find ("finger")))
2641 { 2571 {
2642 tmp->name = format ("%s's finger" , &op->name); 2572 tmp->name = format ("%s's finger" , &op->name);
2643 tmp->name_pl = format ("%s's fingers", &op->name); 2573 tmp->name_pl = format ("%s's fingers", &op->name);
2644 tmp->msg = format ( 2574 tmp->msg = format (
2645 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2575 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2646 &op->name, op->contr->title, (int) (op->level), op->contr->killer 2576 &op->name, op->contr->title,
2577 (int)op->level,
2578 op->contr->killer_name ()
2647 ); 2579 );
2648 tmp->value = 0, tmp->type = 0; 2580 tmp->value = 0, tmp->type = 0;
2649 tmp->materialname = "organics"; 2581 tmp->materialname = "organics";
2650 tmp->insert_at (op, tmp); 2582 tmp->insert_at (op, tmp);
2651 } 2583 }
2652 2584
2653 /* teleport defeated player to new destination */ 2585 /* teleport defeated player to new destination */
2654 transfer_ob (op, x, y, 0, NULL); 2586 transfer_ob (op, x, y, 0, NULL);
2655 op->contr->braced = 0; 2587 op->contr->braced = 0;
2588
2589 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2656 return; 2590 return;
2657 } 2591 }
2658 2592
2593 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2594 deathtab << "T<YOU HAVE DIED>\n\n";
2595
2659 INVOKE_PLAYER (DEATH, op->contr); 2596 INVOKE_PLAYER (DEATH, op->contr);
2660 2597
2661 command_kill_pets (op, 0); 2598 command_kill_pets (op, 0);
2662
2663 if (op->stats.food < 0)
2664 strcpy (op->contr->killer, "starvation");
2665 2599
2666 op->contr->play_sound (sound_find ("player_dies")); 2600 op->contr->play_sound (sound_find ("player_dies"));
2667 2601
2668 /* save the map location for corpse, gravestone */ 2602 /* save the map location for corpse, gravestone */
2669 x = op->x; 2603 x = op->x;
… …
2699 2633
2700 lost_a_stat = 0; 2634 lost_a_stat = 0;
2701 2635
2702 for (z = 0; z < num_stats_lose; z++) 2636 for (z = 0; z < num_stats_lose; z++)
2703 { 2637 {
2704 i = RANDOM () % NUM_STATS; 2638 i = rndm (NUM_STATS);
2705 2639
2706 if (settings.stat_loss_on_death) 2640 if (settings.stat_loss_on_death)
2707 { 2641 {
2708 /* Pick a random stat and take a point off it. Tell the player 2642 /* Pick a random stat and take a point off it. Tell the player
2709 * what he lost. 2643 * what he lost.
… …
2760 } 2694 }
2761 } 2695 }
2762 2696
2763 if (lose_this_stat) 2697 if (lose_this_stat)
2764 { 2698 {
2765 this_stat = get_attr_value (&(dep->stats), i); 2699 this_stat = get_attr_value (&dep->stats, i);
2766 /* We could try to do something clever like find another 2700 /* We could try to do something clever like find another
2767 * stat to reduce if this fails. But chances are, if 2701 * stat to reduce if this fails. But chances are, if
2768 * stats have been depleted to -50, all are pretty low 2702 * stats have been depleted to -50, all are pretty low
2769 * and should be roughly the same, so it shouldn't make a 2703 * and should be roughly the same, so it shouldn't make a
2770 * difference. 2704 * difference.
… …
2778 lost_a_stat = 1; 2712 lost_a_stat = 1;
2779 } 2713 }
2780 } 2714 }
2781 } 2715 }
2782 } 2716 }
2717
2783 /* If no stat lost, tell the player. */ 2718 /* If no stat lost, tell the player. */
2784 if (!lost_a_stat) 2719 if (!lost_a_stat)
2785 { 2720 {
2786 /* determine_god() seems to not work sometimes... why is this? 2721 /* determine_god() seems to not work sometimes... why is this?
2787 Should I be using something else? GD */ 2722 Should I be using something else? GD */
2788 const char *god = determine_god (op); 2723 shstr_tmp god = determine_god (op);
2789 2724
2790 if (god && (strcmp (god, "none"))) 2725 if (god != shstr_none)
2791 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2726 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2792 else 2727 else
2793 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2728 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2794 } 2729 }
2795#else 2730#else
2796 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2731 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2797#endif 2732#endif
2798 2733
2799 /* Put a gravestone up where the character 'almost' died. List the 2734 /* Put a gravestone up where the character 'almost' died. List the
2800 * exp loss on the stone. 2735 * exp loss on the stone.
2801 */ 2736 */
2802 tmp = arch_to_object (archetype::find ("gravestone")); 2737 tmp = arch_to_object (archetype::find ("gravestone"));
2803 sprintf (buf, "%s's gravestone", &op->name); 2738 tmp->name = format ("%s's gravestone", &op->name);
2804 tmp->name = buf; 2739 tmp->name_pl = format ("%s's gravestones", &op->name);
2805 sprintf (buf, "%s's gravestones", &op->name); 2740 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2806 tmp->name_pl = buf; 2741 &op->name, op->contr->title, op->contr->killer_name ());
2807 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);
2808 tmp->msg = buf;
2809 tmp->x = op->x, tmp->y = op->y; 2742 tmp->x = op->x, tmp->y = op->y;
2810 insert_ob_in_map (tmp, op->map, NULL, 0); 2743 insert_ob_in_map (tmp, op->map, NULL, 0);
2811 2744
2812 /**************************************/ 2745 /**************************************/
2813 /* */ 2746 /* */
2814 /* Subtract the experience points, */ 2747 /* Subtract the experience points, */
2815 /* if we died cause of food, give us */
2816 /* food, and reset HP's... */
2817 /* */ 2748 /* */
2818 /**************************************/ 2749 /**************************************/
2819 2750
2820 /* remove any poisoning and confusion the character may be suffering. */
2821 /* restore player */
2822 at = archetype::find ("poisoning");
2823 tmp = present_arch_in_ob (at, op);
2824
2825 if (tmp)
2826 {
2827 tmp->destroy ();
2828 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2829 }
2830
2831 at = archetype::find ("confusion");
2832 tmp = present_arch_in_ob (at, op);
2833 if (tmp)
2834 {
2835 tmp->destroy ();
2836 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2837 }
2838
2839 cure_disease (op, 0, 0); /* remove any disease */
2840
2841 /*add_exp(op, (op->stats.exp * -0.20)); */ 2751 /*add_exp(op, (op->stats.exp * -0.20)); */
2842 apply_death_exp_penalty (op); 2752 apply_death_exp_penalty (op);
2843 if (op->stats.food < 100)
2844 op->stats.food = 900;
2845 op->stats.hp = op->stats.maxhp;
2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2848 2753
2849 /* 2754 /*
2850 * Check to see if the player has any unpaid items. If so, remove them 2755 * Check to see if the player has any unpaid items. If so, remove them
2851 * and put them back in the map. 2756 * and put them back in the map.
2852 */ 2757 */
… …
2887 if (will_kill_again & (1 << at)) 2792 if (will_kill_again & (1 << at))
2888 force->resist[at] = 100; 2793 force->resist[at] = 100;
2889 2794
2890 insert_ob_in_ob (force, op); 2795 insert_ob_in_ob (force, op);
2891 op->update_stats (); 2796 op->update_stats ();
2892
2893 } 2797 }
2894 2798
2895 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2799 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2896} 2800}
2897 2801
2898void 2802void
2899loot_object (object *op) 2803loot_object (object *op)
2900{ /* Grab and destroy some treasure */ 2804{ /* Grab and destroy some treasure */
… …
2917 2821
2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2822 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2919 { 2823 {
2920 if (tmp->nrof > 1) 2824 if (tmp->nrof > 1)
2921 { 2825 {
2922 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2826 tmp->decrease (rndm (1, tmp->nrof - 1));
2923 tmp2->destroy ();
2924 insert_ob_in_map (tmp, op->map, NULL, 0); 2827 insert_ob_in_map (tmp, op->map, NULL, 0);
2925 } 2828 }
2926 else 2829 else
2927 tmp->destroy (); 2830 tmp->destroy ();
2928 } 2831 }
… …
2939void 2842void
2940fix_weight (void) 2843fix_weight (void)
2941{ 2844{
2942 for_all_players (pl) 2845 for_all_players (pl)
2943 { 2846 {
2944 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2847 sint32 old = pl->ob->carrying;
2945 2848
2946 if (old == sum) 2849 pl->ob->update_weight ();
2947 continue; 2850
2851 if (old != pl->ob->carrying)
2852 {
2948 pl->ob->update_stats (); 2853 pl->ob->update_stats ();
2949 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2854 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2855 }
2950 } 2856 }
2951} 2857}
2952 2858
2953void 2859void
2954fix_luck (void) 2860fix_luck (void)
… …
2996} 2902}
2997 2903
2998void 2904void
2999make_visible (object *op) 2905make_visible (object *op)
3000{ 2906{
3001 op->hide = 0; 2907 op->flag [FLAG_HIDDEN] = 0;
3002 op->invisible = 0; 2908 op->invisible = 0;
3003 2909
3004 if (op->type == PLAYER) 2910 if (op->type == PLAYER)
3005 { 2911 {
3006 op->contr->tmp_invis = 0; 2912 op->contr->tmp_invis = 0;
… …
3031 2937
3032 if (!ob || !ob->map) 2938 if (!ob || !ob->map)
3033 return 0; 2939 return 0;
3034 2940
3035 /* so, on normal lighted maps, its hard to hide */ 2941 /* so, on normal lighted maps, its hard to hide */
3036 level = ob->map->darkness - 2; 2942 level = ob->map->darklevel () - 2;
3037 2943
3038 /* this also picks up whether the object is glowing. 2944 /* this also picks up whether the object is glowing.
3039 * If you carry a light on a non-dark map, its not 2945 * If you carry a light on a non-dark map, its not
3040 * as bad as carrying a light on a pitch dark map */ 2946 * as bad as carrying a light on a pitch dark map */
3041 if (has_carried_lights (ob)) 2947 if (ob->has_carried_lights ())
3042 level = -(10 + (2 * ob->map->darkness)); 2948 level = -(10 + (2 * ob->map->darklevel ()));
3043 2949
3044 /* scan through all nearby squares for terrain to hide in */ 2950 /* scan through all nearby squares for terrain to hide in */
3045 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2951 for (i = 0, x = ob->x, y = ob->y;
2952 i <= SIZEOFFREE1;
2953 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3046 { 2954 {
3047 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2955 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3048 if (mflag & P_OUT_OF_MAP) 2956 if (mflag & P_OUT_OF_MAP)
3049 {
3050 continue; 2957 continue;
3051 } 2958
3052 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2959 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3053 level += 2; 2960 level += 2;
3054 else /* open terrain! */ 2961 else /* open terrain! */
3055 level -= 1; 2962 level -= 1;
3056 } 2963 }
… …
3067 * spot (surrounded by clear terrain in broad daylight). -b.t. 2974 * spot (surrounded by clear terrain in broad daylight). -b.t.
3068 */ 2975 */
3069void 2976void
3070do_hidden_move (object *op) 2977do_hidden_move (object *op)
3071{ 2978{
3072 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2979 int hide = 0;
3073 object *skop;
3074 2980
3075 if (!op || !op->map) 2981 if (!op || !op->map)
3076 return; 2982 return;
3077 2983
3078 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2984 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2985 int num = random_roll (0, 19, op, PREFER_LOW);
3079 2986
3080 /* its *extremely* hard to run and sneak/hide at the same time! */ 2987 /* its *extremely* hard to run and sneak/hide at the same time! */
3081 if (op->type == PLAYER && op->contr->run_on) 2988 if (op->type == PLAYER && op->contr->run_on)
3082 if (!skop || num >= skop->level) 2989 if (!skop || num >= skop->level)
3083 { 2990 {
… …
3093 num -= hide; 3000 num -= hide;
3094 3001
3095 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3002 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3096 { 3003 {
3097 make_visible (op); 3004 make_visible (op);
3005
3098 if (op->type == PLAYER) 3006 if (op->type == PLAYER)
3099 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3007 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3100 } 3008 }
3101 else if (op->type == PLAYER && skop) 3009 else if (op->type == PLAYER && skop)
3102 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3010 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3192 while (op) 3100 while (op)
3193 { 3101 {
3194 dx = rv.distance_x + op->arch->x; 3102 dx = rv.distance_x + op->arch->x;
3195 dy = rv.distance_y + op->arch->y; 3103 dy = rv.distance_y + op->arch->y;
3196 3104
3197 /* only the viewable area the player sees is updated by LOS 3105 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3198 * code, so we need to restrict ourselves to that range of values
3199 * for any meaningful values.
3200 */
3201 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3202 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3203 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3204 return 1; 3106 return 1;
3205 3107
3206 op = op->more; 3108 op = op->more;
3207 } 3109 }
3208 3110
3209 return 0; 3111 return 0;
3210} 3112}
3211 3113
3212/* routine for both players and monsters. We call this when 3114/* routine for both players and monsters. We call this when
3213 * there is a possibility for our action distrubing our hiding 3115 * there is a possibility for our action distrubing our hiding
3214 * place or invisiblity spell. Artefact invisiblity is not 3116 * place or invisiblity spell. Artefact invisiblity causes
3215 * effected by this. If we arent invisible to begin with, we 3117 * "noise" instead. If we arent invisible to begin with, we
3216 * return 0. 3118 * return 0.
3217 */ 3119 */
3218int 3120int
3219action_makes_visible (object *op) 3121action_makes_visible (object *op)
3220{ 3122{
3221 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3123 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3222 { 3124 {
3223 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3125 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3126 {
3127 // artefact invisibility is permanent, but we still make noise
3128 // this is important for game-balance.
3129 if (op->contr)
3130 op->make_noise ();
3131
3224 return 0; 3132 return 0;
3133 }
3225 3134
3226 if (op->contr && op->contr->tmp_invis == 0) 3135 if (op->contr && op->contr->tmp_invis == 0)
3227 return 0; 3136 return 0;
3228 3137
3229 /* If monsters, they should become visible */ 3138 /* If monsters, they should become visible */
3230 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3139 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3231 { 3140 {
3232 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3141 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3233 return 1; 3142 return 1;
3234 } 3143 }
3235 } 3144 }
3236 3145
3237 return 0; 3146 return 0;
… …
3443 else 3352 else
3444 { 3353 {
3445 /* generate misc. treasure */ 3354 /* generate misc. treasure */
3446 tmp = arch_to_object (tr->item); 3355 tmp = arch_to_object (tr->item);
3447 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3356 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3448 tmp = insert_ob_in_ob (tmp, who); 3357 who->insert (tmp);
3449 if (who->type == PLAYER)
3450 esrv_send_item (who, tmp);
3451 } 3358 }
3452} 3359}
3453 3360
3454/** 3361/**
3455 * Unready an object for a player. This function does nothing if the object was 3362 * Unready an object for a player. This function does nothing if the object was
… …
3467 if (pl->ranged_ob == ob) 3374 if (pl->ranged_ob == ob)
3468 pl->ranged_ob = 0; 3375 pl->ranged_ob = 0;
3469} 3376}
3470 3377
3471sint8 3378sint8
3472player::visibility_at (maptile *map, int x, int y) const 3379player::darkness_at (maptile *map, int x, int y) const
3473{ 3380{
3474 if (!ns) 3381 if (!ns)
3475 return 0; 3382 return LOS_BLOCKED;
3476 3383
3477 int dx, dy; 3384 int dx, dy;
3478 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3385 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3479 return 0; 3386 return LOS_BLOCKED;
3480 3387
3481 x += dx - ns->current_x + ns->mapx / 2; 3388 x += dx - ns->current_x;
3482 y += dy - ns->current_y + ns->mapy / 2; 3389 y += dy - ns->current_y;
3483 3390
3484 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3485 return 0;
3486
3487 return 100 - blocked_los [x][y]; 3391 return blocked_los (x, y);
3488} 3392}
3489 3393
3490void 3394void
3491player::infobox (const char *title, const char *msg, int color) 3395player::infobox (const char *title, const char *msg, int color)
3492{ 3396{

Diff Legend

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