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

Diff Legend

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