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.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.214 by root, Sat Dec 27 02:31:19 2008 UTC

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

Diff Legend

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