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.219 by root, Sun Dec 28 10:20:29 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
… …
1021check_pick (object *op) 971check_pick (object *op)
1022{ 972{
1023 object *tmp, *next; 973 object *tmp, *next;
1024 int stop = 0; 974 int stop = 0;
1025 int wvratio; 975 int wvratio;
1026 char putstring[128];
1027 976
1028 /* if you're flying, you cna't pick up anything */ 977 /* if you're flying, you cna't pick up anything */
1029 if (op->move_type & MOVE_FLYING) 978 if (op->move_type & MOVE_FLYING)
1030 return 1; 979 return 1;
1031 980
1032 next = op->below; 981 next = op->below;
1033 982
983 int cnt = MAX_ITEM_PER_DROP;
984#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
985
1034 /* loop while there are items on the floor that are not marked as 986 /* loop while there are items on the floor that are not marked as
1035 * destroyed */ 987 * destroyed */
1036 while (next && !next->destroyed ()) 988 while (next && !next->destroyed ())
1037 { 989 {
1038 tmp = next; 990 tmp = next;
1039 next = tmp->below; 991 next = tmp->below;
1040 992
993 if (cnt <= 0)
994 {
995 op->failmsg ("Couldn't pickup all items at once.");
996 return 0;
997 }
998
1041 if (op->destroyed ()) 999 if (op->destroyed ())
1042 return 0; 1000 return 0;
1043 1001
1044 if (!can_pick (op, tmp)) 1002 if (!can_pick (op, tmp))
1045 continue; 1003 continue;
1046 1004
1047 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1005 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1048 { 1006 {
1049 if (item_matched_string (op, tmp, op->contr->search_str)) 1007 if (item_matched_string (op, tmp, op->contr->search_str))
1050 pick_up (op, tmp); 1008 CHK_PICK_PICKUP;
1009
1051 continue; 1010 continue;
1052 } 1011 }
1053 1012
1054 /* high not bit set? We're using the old autopickup model */ 1013 /* NEW pickup handling */
1014 if (op->contr->mode & PU_DEBUG)
1015 {
1016 /* some debugging code to figure out item information */
1017 const char *str = tmp->name
1018 ? format ("item name: %s item type: %d weight/value: %d",
1019 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1020 : format ("item name: %s item type: %d weight/value: %d",
1021 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1022
1023 new_draw_info (NDI_UNIQUE, 0, op, str);
1024 }
1025
1026 /* philosophy:
1027 * It's easy to grab an item type from a pile, as long as it's
1028 * generic. This takes no game-time. For more detailed pickups
1029 * and selections, select-items should be used. This is a
1030 * grab-as-you-run type mode that's really useful for arrows for
1031 * example.
1032 * The drawback: right now it has no frontend, so you need to
1033 * stick the bits you want into a calculator in hex mode and then
1034 * convert to decimal and then 'pickup <#>
1035 */
1036
1037 /* the first two modes are exclusive: if NOTHING we return, if
1038 * STOP then we stop. All the rest are applied sequentially,
1039 * meaning if any test passes, the item gets picked up. */
1040
1041 /* if mode is set to pick nothing up, return */
1042 if (op->contr->mode & PU_NOTHING)
1043 return 1;
1044
1045 /* if mode is set to stop when encountering objects, return */
1046 /* take STOP before INHIBIT since it doesn't actually pick
1047 * anything up */
1048 if (op->contr->mode & PU_STOP)
1049 return 0;
1050
1051 /* useful for going into stores and not losing your settings... */
1052 /* and for battles wher you don't want to get loaded down while
1053 * fighting */
1054 if (op->contr->mode & PU_INHIBIT)
1055 return 1;
1056
1057 /* prevent us from turning into auto-thieves :) */
1058 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1059 continue;
1060
1061 /* ignore known cursed objects */
1062 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1063 continue;
1064
1065 /* all food and drink if desired */
1066 /* question: don't pick up known-poisonous stuff? */
1055 if (!(op->contr->mode & PU_NEWMODE)) 1067 if (op->contr->mode & PU_FOOD)
1068 if (tmp->type == FOOD)
1056 { 1069 {
1057 switch (op->contr->mode) 1070 CHK_PICK_PICKUP;
1071 continue;
1072 }
1073
1074 if (op->contr->mode & PU_DRINK)
1075 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1076 {
1077 CHK_PICK_PICKUP;
1078 continue;
1079 }
1080
1081 if (op->contr->mode & PU_POTION)
1082 if (tmp->type == POTION)
1083 {
1084 CHK_PICK_PICKUP;
1085 continue;
1086 }
1087
1088 /* spellbooks, skillscrolls and normal books/scrolls */
1089 if (op->contr->mode & PU_SPELLBOOK)
1090 if (tmp->type == SPELLBOOK)
1091 {
1092 CHK_PICK_PICKUP;
1093 continue;
1094 }
1095
1096 if (op->contr->mode & PU_SKILLSCROLL)
1097 if (tmp->type == SKILLSCROLL)
1098 {
1099 CHK_PICK_PICKUP;
1100 continue;
1101 }
1102
1103 if (op->contr->mode & PU_READABLES)
1104 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1105 {
1106 CHK_PICK_PICKUP;
1107 continue;
1108 }
1109
1110 /* wands/staves/rods/horns */
1111 if (op->contr->mode & PU_MAGIC_DEVICE)
1112 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1113 {
1114 CHK_PICK_PICKUP;
1115 continue;
1116 }
1117
1118 /* pick up all magical items */
1119 if (op->contr->mode & PU_MAGICAL)
1120 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1121 {
1122 CHK_PICK_PICKUP;
1123 continue;
1124 }
1125
1126 if (op->contr->mode & PU_VALUABLES)
1127 {
1128 if (tmp->type == MONEY || tmp->type == GEM)
1058 { 1129 {
1059 case 0: 1130 CHK_PICK_PICKUP;
1060 return 1; /* don't pick up */ 1131 continue;
1061 case 1:
1062 pick_up (op, tmp);
1063 return 1;
1064 case 2:
1065 pick_up (op, tmp);
1066 return 0;
1067 case 3:
1068 return 0; /* stop before pickup */
1069 case 4:
1070 pick_up (op, tmp);
1071 break;
1072 case 5:
1073 pick_up (op, tmp);
1074 stop = 1;
1075 break;
1076 case 6:
1077 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1078 pick_up (op, tmp);
1079 break;
1080
1081 case 7:
1082 if (tmp->type == MONEY || tmp->type == GEM)
1083 pick_up (op, tmp);
1084 break;
1085
1086 default:
1087 /* use value density */
1088 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1089 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1090 pick_up (op, tmp);
1091 } 1132 }
1092 } 1133 }
1093 else 1134
1094 { /* old model */ 1135 /* rings & amulets - talismans seems to be typed AMULET */
1095 /* NEW pickup handling */ 1136 if (op->contr->mode & PU_JEWELS)
1137 if (tmp->type == RING || tmp->type == AMULET)
1138 {
1139 CHK_PICK_PICKUP;
1140 continue;
1141 }
1142
1143 /* we don't forget dragon food */
1144 if (op->contr->mode & PU_FLESH)
1145 if (tmp->type == FLESH)
1146 {
1147 CHK_PICK_PICKUP;
1148 continue;
1149 }
1150
1151 /* bows and arrows. Bows are good for selling! */
1096 if (op->contr->mode & PU_DEBUG) 1152 if (op->contr->mode & PU_BOW)
1153 if (tmp->type == BOW)
1154 {
1155 CHK_PICK_PICKUP;
1156 continue;
1157 }
1158
1159 if (op->contr->mode & PU_ARROW)
1160 if (tmp->type == ARROW)
1161 {
1162 CHK_PICK_PICKUP;
1163 continue;
1164 }
1165
1166 /* all kinds of armor etc. */
1167 if (op->contr->mode & PU_ARMOUR)
1168 if (tmp->type == ARMOUR)
1169 {
1170 CHK_PICK_PICKUP;
1171 continue;
1172 }
1173
1174 if (op->contr->mode & PU_HELMET)
1175 if (tmp->type == HELMET)
1176 {
1177 CHK_PICK_PICKUP;
1178 continue;
1179 }
1180
1181 if (op->contr->mode & PU_SHIELD)
1182 if (tmp->type == SHIELD)
1183 {
1184 CHK_PICK_PICKUP;
1185 continue;
1186 }
1187
1188 if (op->contr->mode & PU_BOOTS)
1189 if (tmp->type == BOOTS)
1190 {
1191 CHK_PICK_PICKUP;
1192 continue;
1193 }
1194
1195 if (op->contr->mode & PU_GLOVES)
1196 if (tmp->type == GLOVES)
1197 {
1198 CHK_PICK_PICKUP;
1199 continue;
1200 }
1201
1202 if (op->contr->mode & PU_CLOAK)
1203 if (tmp->type == CLOAK)
1204 {
1205 CHK_PICK_PICKUP;
1206 continue;
1207 }
1208
1209 /* hoping to catch throwing daggers here */
1210 if (op->contr->mode & PU_MISSILEWEAPON)
1211 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1212 {
1213 CHK_PICK_PICKUP;
1214 continue;
1215 }
1216
1217 /* careful: chairs and tables are weapons! */
1218 if (op->contr->mode & PU_ALLWEAPON)
1219 {
1220 if (tmp->type == WEAPON && tmp->name != NULL)
1097 { 1221 {
1098 /* some debugging code to figure out item information */ 1222 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1099 if (tmp->name != NULL) 1223 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1100 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))));
1102 else
1103 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))));
1105
1106 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1107 }
1108
1109 /* philosophy:
1110 * It's easy to grab an item type from a pile, as long as it's
1111 * generic. This takes no game-time. For more detailed pickups
1112 * and selections, select-items should be used. This is a
1113 * grab-as-you-run type mode that's really useful for arrows for
1114 * example.
1115 * The drawback: right now it has no frontend, so you need to
1116 * stick the bits you want into a calculator in hex mode and then
1117 * convert to decimal and then 'pickup <#>
1118 */
1119
1120 /* the first two modes are exclusive: if NOTHING we return, if
1121 * STOP then we stop. All the rest are applied sequentially,
1122 * meaning if any test passes, the item gets picked up. */
1123
1124 /* if mode is set to pick nothing up, return */
1125
1126 if (op->contr->mode & PU_NOTHING)
1127 return 1;
1128
1129 /* if mode is set to stop when encountering objects, return */
1130 /* take STOP before INHIBIT since it doesn't actually pick
1131 * anything up */
1132
1133 if (op->contr->mode & PU_STOP)
1134 return 0;
1135
1136 /* useful for going into stores and not losing your settings... */
1137 /* and for battles wher you don't want to get loaded down while
1138 * fighting */
1139 if (op->contr->mode & PU_INHIBIT)
1140 return 1;
1141
1142 /* prevent us from turning into auto-thieves :) */
1143 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1144 continue;
1145
1146 /* ignore known cursed objects */
1147 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1148 continue;
1149
1150 /* all food and drink if desired */
1151 /* question: don't pick up known-poisonous stuff? */
1152 if (op->contr->mode & PU_FOOD)
1153 if (tmp->type == FOOD)
1154 {
1155 pick_up (op, tmp);
1156 continue;
1157 }
1158
1159 if (op->contr->mode & PU_DRINK)
1160 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1161 {
1162 pick_up (op, tmp);
1163 continue;
1164 }
1165
1166 if (op->contr->mode & PU_POTION)
1167 if (tmp->type == POTION)
1168 {
1169 pick_up (op, tmp);
1170 continue;
1171 }
1172
1173 /* spellbooks, skillscrolls and normal books/scrolls */
1174 if (op->contr->mode & PU_SPELLBOOK)
1175 if (tmp->type == SPELLBOOK)
1176 {
1177 pick_up (op, tmp);
1178 continue;
1179 }
1180
1181 if (op->contr->mode & PU_SKILLSCROLL)
1182 if (tmp->type == SKILLSCROLL)
1183 {
1184 pick_up (op, tmp);
1185 continue;
1186 }
1187
1188 if (op->contr->mode & PU_READABLES)
1189 if (tmp->type == BOOK || tmp->type == SCROLL)
1190 {
1191 pick_up (op, tmp);
1192 continue;
1193 }
1194
1195 /* wands/staves/rods/horns */
1196 if (op->contr->mode & PU_MAGIC_DEVICE)
1197 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1198 {
1199 pick_up (op, tmp);
1200 continue;
1201 }
1202
1203 /* pick up all magical items */
1204 if (op->contr->mode & PU_MAGICAL)
1205 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1206 {
1207 pick_up (op, tmp);
1208 continue;
1209 }
1210
1211 if (op->contr->mode & PU_VALUABLES)
1212 {
1213 if (tmp->type == MONEY || tmp->type == GEM)
1214 { 1224 {
1215 pick_up (op, tmp); 1225 CHK_PICK_PICKUP;
1216 continue; 1226 continue;
1217 } 1227 }
1218 } 1228 }
1219 1229
1220 /* rings & amulets - talismans seems to be typed AMULET */
1221 if (op->contr->mode & PU_JEWELS)
1222 if (tmp->type == RING || tmp->type == AMULET) 1230 if (tmp->type == WEAPON && tmp->name == NULL)
1223 {
1224 pick_up (op, tmp);
1225 continue;
1226 }
1227
1228 /* we don't forget dragon food */
1229 if (op->contr->mode & PU_FLESH)
1230 if (tmp->type == FLESH)
1231 {
1232 pick_up (op, tmp);
1233 continue;
1234 }
1235
1236 /* bows and arrows. Bows are good for selling! */
1237 if (op->contr->mode & PU_BOW)
1238 if (tmp->type == BOW)
1239 {
1240 pick_up (op, tmp);
1241 continue;
1242 }
1243
1244 if (op->contr->mode & PU_ARROW)
1245 if (tmp->type == ARROW)
1246 {
1247 pick_up (op, tmp);
1248 continue;
1249 }
1250
1251 /* all kinds of armor etc. */
1252 if (op->contr->mode & PU_ARMOUR)
1253 if (tmp->type == ARMOUR)
1254 {
1255 pick_up (op, tmp);
1256 continue;
1257 }
1258
1259 if (op->contr->mode & PU_HELMET)
1260 if (tmp->type == HELMET)
1261 {
1262 pick_up (op, tmp);
1263 continue;
1264 }
1265
1266 if (op->contr->mode & PU_SHIELD)
1267 if (tmp->type == SHIELD)
1268 {
1269 pick_up (op, tmp);
1270 continue;
1271 }
1272
1273 if (op->contr->mode & PU_BOOTS)
1274 if (tmp->type == BOOTS)
1275 {
1276 pick_up (op, tmp);
1277 continue;
1278 }
1279
1280 if (op->contr->mode & PU_GLOVES)
1281 if (tmp->type == GLOVES)
1282 {
1283 pick_up (op, tmp);
1284 continue;
1285 }
1286
1287 if (op->contr->mode & PU_CLOAK)
1288 if (tmp->type == CLOAK)
1289 {
1290 pick_up (op, tmp);
1291 continue;
1292 }
1293
1294 /* hoping to catch throwing daggers here */
1295 if (op->contr->mode & PU_MISSILEWEAPON)
1296 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1297 {
1298 pick_up (op, tmp);
1299 continue;
1300 }
1301
1302 /* careful: chairs and tables are weapons! */
1303 if (op->contr->mode & PU_ALLWEAPON)
1304 { 1231 {
1305 if (tmp->type == WEAPON && tmp->name != NULL) 1232 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1306 { 1233 {
1307 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1234 CHK_PICK_PICKUP;
1308 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1309 {
1310 pick_up (op, tmp);
1311 continue; 1235 continue;
1312 }
1313 }
1314
1315 if (tmp->type == WEAPON && tmp->name == NULL)
1316 {
1317 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1318 {
1319 pick_up (op, tmp);
1320 continue;
1321 }
1322 } 1236 }
1323 } 1237 }
1238 }
1324 1239
1325 /* misc stuff that's useful */ 1240 /* misc stuff that's useful */
1326 if (op->contr->mode & PU_KEY) 1241 if (op->contr->mode & PU_KEY)
1327 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1242 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1328 { 1243 {
1329 pick_up (op, tmp); 1244 CHK_PICK_PICKUP;
1330 continue; 1245 continue;
1331 } 1246 }
1332 1247
1333 /* any of the last 4 bits set means we use the ratio for value 1248 /* any of the last 4 bits set means we use the ratio for value
1334 * pickups */ 1249 * pickups */
1335 if (op->contr->mode & PU_RATIO) 1250 if (op->contr->mode & PU_RATIO)
1251 {
1252 /* use value density to decide what else to grab */
1253 /* >=7 was >= op->contr->mode */
1254 /* >=7 is the old standard setting. Now we take the last 4 bits
1255 */
1256 wvratio = op->contr->mode & PU_RATIO;
1257 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1336 { 1258 {
1337 /* use value density to decide what else to grab */ 1259#if 0
1338 /* >=7 was >= op->contr->mode */ 1260 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1339 /* >=7 is the old standard setting. Now we take the last 4 bits 1261 if (tmp->name != NULL)
1340 * and multiply them by 5, giving 0..15*5== 5..75 */
1341 wvratio = (op->contr->mode & PU_RATIO) * 5;
1342 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1343 { 1262 {
1344 pick_up (op, tmp);
1345#if 0
1346 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1347 if (tmp->name != NULL)
1348 {
1349 fprintf (stderr, "%s", tmp->name); 1263 fprintf (stderr, "%s", tmp->name);
1350 } 1264 }
1351 else 1265 else
1352 fprintf (stderr, "%s", tmp->arch->name); 1266 fprintf (stderr, "%s", tmp->arch->archname);
1353 fprintf (stderr, ",%d] = ", tmp->type); 1267 fprintf (stderr, ",%d] = ", tmp->type);
1354 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1268 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1355#endif 1269#endif
1270 CHK_PICK_PICKUP;
1356 continue; 1271 continue;
1357 }
1358 } 1272 }
1359 } /* the new pickup model */ 1273 } /* the new pickup model */
1360 } 1274 }
1361 1275
1362 return !stop; 1276 return !stop;
… …
1368 * found object is returned. 1282 * found object is returned.
1369 */ 1283 */
1370object * 1284object *
1371find_arrow (object *op, const char *type) 1285find_arrow (object *op, const char *type)
1372{ 1286{
1373 object *tmp = 0;
1374
1375 for (op = op->inv; op; op = op->below) 1287 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) 1288 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1289 return splay (tmp);
1290
1291 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1292 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1293 if (object *arrow = find_arrow (tmp, type))
1294 {
1295 splay (tmp);
1379 return op; 1296 return arrow;
1297 }
1380 1298
1381 return tmp; 1299 return 0;
1382} 1300}
1383 1301
1384/* 1302/*
1385 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1303 * 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 1304 * against the target. A full test is not performed, simply a basic test
… …
1409 } 1327 }
1410 } 1328 }
1411 else if (arrow->type == ARROW && arrow->race == type) 1329 else if (arrow->type == ARROW && arrow->race == type)
1412 { 1330 {
1413 /* allways prefer assasination/slaying */ 1331 /* allways prefer assasination/slaying */
1414 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1332 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1415 { 1333 {
1416 if (arrow->attacktype & AT_DEATH) 1334 if (arrow->attacktype & AT_DEATH)
1417 { 1335 {
1418 *better = 100; 1336 *better = 100;
1419 return arrow; 1337 return arrow;
… …
1427 else 1345 else
1428 { 1346 {
1429 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1347 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1430 { 1348 {
1431 attacktype = 1 << attacknum; 1349 attacktype = 1 << attacknum;
1432 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1350 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1433 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1351 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1434 { 1352 {
1435 tmp = arrow; 1353 tmp = arrow;
1436 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1354 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1437 } 1355 }
1438 } 1356 }
1439 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1357 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1440 { 1358 {
1441 tmp = arrow; 1359 tmp = arrow;
… …
1447 betterby = 1 + arrow->magic + arrow->stats.dam; 1365 betterby = 1 + arrow->magic + arrow->stats.dam;
1448 } 1366 }
1449 } 1367 }
1450 } 1368 }
1451 } 1369 }
1370
1452 if (tmp == NULL && arrow == NULL) 1371 if (tmp == NULL && arrow == NULL)
1453 return find_arrow (op, type); 1372 return find_arrow (op, type);
1454 1373
1455 *better = betterby; 1374 *better = betterby;
1456 return tmp; 1375 return tmp;
… …
1486 for (i = 0, found = 0; i < 20; i++) 1405 for (i = 0, found = 0; i < 20; i++)
1487 { 1406 {
1488 x += freearr_x[dir]; 1407 x += freearr_x[dir];
1489 y += freearr_y[dir]; 1408 y += freearr_y[dir];
1490 mflags = get_map_flags (m, &m, x, y, &x, &y); 1409 mflags = get_map_flags (m, &m, x, y, &x, &y);
1410
1491 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1411 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1492 { 1412 {
1493 tmp = NULL; 1413 tmp = 0;
1494 break; 1414 break;
1495 } 1415 }
1496 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1416 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1497 { 1417 {
1498 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1418 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1499 * perhaps a bad assumption. 1419 * perhaps a bad assumption.
1500 */ 1420 */
1501 tmp = NULL; 1421 tmp = 0;
1502 break; 1422 break;
1503 } 1423 }
1424
1504 if (mflags & P_IS_ALIVE) 1425 if (mflags & P_IS_ALIVE)
1505 {
1506 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1426 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1507 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1427 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1508 {
1509 found++;
1510 break;
1511 }
1512 if (found)
1513 break; 1428 break;
1514 }
1515 } 1429 }
1516 if (tmp == NULL) 1430
1431 if (!tmp)
1517 return find_arrow (op, type); 1432 return find_arrow (op, type);
1518 1433
1519 if (tmp->head) 1434 if (tmp->head)
1520 tmp = tmp->head; 1435 tmp = tmp->head;
1521 1436
… …
1566 if (bow->below) 1481 if (bow->below)
1567 { 1482 {
1568 bow->remove (); 1483 bow->remove ();
1569 op->insert (bow); 1484 op->insert (bow);
1570 } 1485 }
1571
1572 } 1486 }
1573 1487
1574 if (!bow->race || !bow->skill) 1488 if (!bow->race || !bow->skill)
1575 { 1489 {
1576 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1490 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1602 } 1516 }
1603 1517
1604 /* this should not happen, but sometimes does */ 1518 /* this should not happen, but sometimes does */
1605 if (arrow->nrof == 0) 1519 if (arrow->nrof == 0)
1606 { 1520 {
1521 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1607 arrow->destroy (); 1522 arrow->destroy ();
1608 return 0; 1523 return 0;
1609 } 1524 }
1610 1525
1611 left = arrow; /* these are arrows left to the player */ 1526 left = arrow; /* these are arrows left to the player */
1612 arrow = get_split_ob (arrow, 1); 1527 arrow = arrow->split ();
1613 if (!arrow) 1528 if (!arrow)
1614 { 1529 {
1615 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1530 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1616 return 0; 1531 return 0;
1617 } 1532 }
… …
1679 1594
1680 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1595 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1681 arrow->move_type = MOVE_FLY_LOW; 1596 arrow->move_type = MOVE_FLY_LOW;
1682 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1597 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1683 1598
1684 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1599 op->play_sound (sound_find ("fire_arrow"));
1685 m->insert (arrow, sx, sy, op); 1600 m->insert (arrow, sx, sy, op);
1686 1601
1687 if (!arrow->destroyed ()) 1602 if (!arrow->destroyed ())
1688 move_arrow (arrow); 1603 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 1604
1698 return 1; 1605 return 1;
1699} 1606}
1700 1607
1701/* Special fire code for players - this takes into 1608/* Special fire code for players - this takes into
… …
1706 * hence the function name. 1613 * hence the function name.
1707 */ 1614 */
1708int 1615int
1709player_fire_bow (object *op, int dir) 1616player_fire_bow (object *op, int dir)
1710{ 1617{
1711 int ret = 0, wcmod = 0; 1618 int ret;
1712 1619
1713 if (op->contr->bowtype == bow_bestarrow) 1620 if (op->contr->bowtype == bow_bestarrow)
1714 { 1621 {
1715 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1622 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1716 } 1623 }
1717 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1624 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1718 { 1625 {
1719 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1626 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); 1627 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1723 } 1628 }
1724 else if (op->contr->bowtype == bow_threewide) 1629 else if (op->contr->bowtype == bow_threewide)
1725 { 1630 {
1726 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1631 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)]); 1632 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)]); 1633 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1729 } 1634 }
1730 else if (op->contr->bowtype == bow_spreadshot) 1635 else if (op->contr->bowtype == bow_spreadshot)
1731 { 1636 {
1732 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1637 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); 1638 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); 1639 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1735 } 1640 }
1736 else 1641 else
1737 { 1642 {
… …
1767 1672
1768 if (item->type == WAND) 1673 if (item->type == WAND)
1769 { 1674 {
1770 if (item->stats.food <= 0) 1675 if (item->stats.food <= 0)
1771 { 1676 {
1772 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1677 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)); 1678 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774 1679
1775 return; 1680 return;
1776 } 1681 }
1777 } 1682 }
1778 else if (item->type == ROD || item->type == HORN) 1683 else if (item->type == ROD || item->type == HORN)
1779 { 1684 {
1780 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1685 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1686
1687 // using the maximum of the rods charge allows at least one spell cast
1688 // for a rod or horn, this fixes some broken rods.
1689 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1781 { 1690 {
1782 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1691 op->contr->play_sound (sound_find ("wand_poof"));
1783 1692
1784 if (item->type == ROD) 1693 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)); 1694 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1786 else 1695 else
1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1696 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1790 } 1699 }
1791 } 1700 }
1792 1701
1793 if (cast_spell (op, item, dir, item->inv, NULL)) 1702 if (cast_spell (op, item, dir, item->inv, NULL))
1794 { 1703 {
1795 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1704 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1705
1796 if (item->type == WAND) 1706 if (item->type == WAND)
1797 { 1707 {
1798 if (!(--item->stats.food)) 1708 if (!(--item->stats.food))
1799 { 1709 {
1800 object *tmp; 1710 object *tmp;
1801 1711
1802 if (item->arch) 1712 if (item->arch)
1803 { 1713 {
1804 CLEAR_FLAG (item, FLAG_ANIMATE); 1714 CLEAR_FLAG (item, FLAG_ANIMATE);
1805 item->face = item->arch->clone.face; 1715 item->face = item->arch->face;
1806 item->set_speed (0); 1716 item->set_speed (0);
1807 } 1717 }
1808 1718
1809 if ((tmp = item->in_player ())) 1719 if (object *pl = item->visible_to ())
1810 esrv_update_item (UPD_ANIM, tmp, item); 1720 esrv_update_item (UPD_ANIM, pl, item);
1811 } 1721 }
1812 } 1722 }
1813 else if (item->type == ROD || item->type == HORN) 1723 else if (item->type == ROD || item->type == HORN)
1814 drain_rod_charge (item); 1724 drain_rod_charge (item);
1815 } 1725 }
… …
1820bool 1730bool
1821fire (object *op, int dir) 1731fire (object *op, int dir)
1822{ 1732{
1823 int spellcost = 0; 1733 int spellcost = 0;
1824 1734
1825 /* check for loss of invisiblity/hide */
1826 if (action_makes_visible (op))
1827 make_visible (op);
1828
1829 player *pl = op->contr; 1735 player *pl = op->contr;
1830 1736
1831 if (pl->golem) 1737 if (pl->golem)
1832 { 1738 {
1833 control_golem (op->contr->golem, dir); 1739 control_golem (op->contr->golem, dir);
… …
1835 } 1741 }
1836 1742
1837 object *ob = pl->ranged_ob; 1743 object *ob = pl->ranged_ob;
1838 1744
1839 if (!ob) 1745 if (!ob)
1840 return false;
1841
1842 if (!op->change_weapon (ob))
1843 return false; 1746 return false;
1844 1747
1845 if (op->speed_left > 0.f) 1748 if (op->speed_left > 0.f)
1846 --op->speed_left; 1749 --op->speed_left;
1847 else 1750 else
1848 return false; 1751 return false;
1752
1753 if (!op->change_weapon (ob))
1754 return false;
1755
1756 /* check for loss of invisiblity/hide */
1757 if (action_makes_visible (op))
1758 make_visible (op);
1849 1759
1850 switch (ob->type) 1760 switch (ob->type)
1851 { 1761 {
1852 case BOW: 1762 case BOW:
1853 player_fire_bow (op, dir); 1763 player_fire_bow (op, dir);
… …
1976 /* If we found a key, do some extra work */ 1886 /* If we found a key, do some extra work */
1977 if (key) 1887 if (key)
1978 { 1888 {
1979 object *container = key->env; 1889 object *container = key->env;
1980 1890
1981 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982
1983 if (action_makes_visible (op)) 1891 if (action_makes_visible (op))
1984 make_visible (op); 1892 make_visible (op);
1985 1893
1986 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1894 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1987 spring_trap (door->inv, op); 1895 spring_trap (door->inv, op);
1988 1896
1989 if (door->type == DOOR) 1897 if (door->type == DOOR)
1990 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1898 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1991 else if (door->type == LOCKED_DOOR) 1899 else if (door->type == LOCKED_DOOR)
1992 { 1900 {
1993 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1901 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1994 remove_door2 (door); /* remove door without violence ;-) */ 1902 remove_door2 (door); /* remove door without violence ;-) */
1995 } 1903 }
1996 1904
1997 /* Do this after we print the message */ 1905 /* Do this after we print the message */
1998 decrease_ob (key); /* Use up one of the keys */ 1906 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 1907
2003 return 1; /* Nothing more to do below */ 1908 return 1; /* Nothing more to do below */
2004 } 1909 }
2005 else if (door->type == LOCKED_DOOR) 1910 else if (door->type == LOCKED_DOOR)
2006 { 1911 {
2007 /* Might as well return now - no other way to open this */ 1912 /* Might as well return now - no other way to open this */
2008 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1913 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2009 return 1; 1914 return 1;
2010 } 1915 }
2011 1916
2012 return 0; 1917 return 0;
2013} 1918}
… …
2100 2005
2101 if (op->speed_left > 0.f) 2006 if (op->speed_left > 0.f)
2102 { 2007 {
2103 --op->speed_left; 2008 --op->speed_left;
2104 2009
2105 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2010 op->play_sound (sound_find ("push_player"));
2106 push_ob (mon, dir, op); 2011 push_ob (mon, dir, op);
2107 2012
2108 if (op->contr->tmp_invis || op->hide) 2013 if (action_makes_visible (op))
2109 make_visible (op); 2014 make_visible (op);
2110 2015
2111 return true; 2016 return true;
2112 } 2017 }
2113 else 2018 else
… …
2129 { 2034 {
2130 --op->speed_left; 2035 --op->speed_left;
2131 2036
2132 if (!op->contr->braced) 2037 if (!op->contr->braced)
2133 { 2038 {
2134 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2039 op->play_sound (sound_find ("push_player"));
2135 push_ob (mon, dir, op); 2040 push_ob (mon, dir, op);
2136 } 2041 }
2137 else 2042 else
2138 new_draw_info (0, 0, op, "You withhold your attack"); 2043 op->statusmsg ("You withhold your attack");
2139 2044
2140 if (op->contr->tmp_invis || op->hide) 2045 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2141 make_visible (op); 2046 make_visible (op);
2142 2047
2143 return true; 2048 return true;
2144 } 2049 }
2145 } 2050 }
… …
2187bool 2092bool
2188move_player (object *op, int dir) 2093move_player (object *op, int dir)
2189{ 2094{
2190 int pick; 2095 int pick;
2191 2096
2192 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2097 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2193 return 0; 2098 return 0;
2194 2099
2195 /* Sanity check: make sure dir is valid */ 2100 /* Sanity check: make sure dir is valid */
2196 if ((dir < 0) || (dir >= 9)) 2101 if ((dir < 0) || (dir >= 9))
2197 { 2102 {
… …
2203 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2108 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2204 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2109 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2205 2110
2206 op->facing = dir; 2111 op->facing = dir;
2207 2112
2208 if (op->hide) 2113 if (op->flag [FLAG_HIDDEN])
2209 do_hidden_move (op); 2114 do_hidden_move (op);
2210 2115
2211 bool retval; 2116 bool retval;
2212 2117
2213 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2118 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2282 return 0; 2187 return 0;
2283 2188
2284 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2189 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2285 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2190 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2286 { 2191 {
2287 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2192 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)); 2193 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 2194
2293 tmp->destroy (); 2195 tmp->destroy ();
2294 CLEAR_FLAG (op, FLAG_LIFESAVE); 2196 CLEAR_FLAG (op, FLAG_LIFESAVE);
2295 2197
2296 if (op->stats.hp < 0) 2198 if (op->stats.hp < 0)
… …
2309 return 0; 2211 return 0;
2310} 2212}
2311 2213
2312/* This goes throws the inventory and removes unpaid objects, and puts them 2214/* 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 2215 * 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 2216 * function will descend into containers. op is the object to start the search
2315 * from. 2217 * from.
2316 */ 2218 */
2219static void
2220drop_unpaid_items (object *op, object *env)
2221{
2222 while (op)
2223 {
2224 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2225
2226 if (QUERY_FLAG (op, FLAG_UNPAID))
2227 op->insert_at (env);
2228 else if (op->inv)
2229 drop_unpaid_items (op->inv, env);
2230
2231 op = next;
2232 }
2233}
2234
2317void 2235void
2318remove_unpaid_objects (object *op, object *env) 2236object::drop_unpaid_items ()
2319{ 2237{
2320 while (op) 2238 if (!flag [FLAG_REMOVED])
2321 { 2239 ::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} 2240}
2337 2241
2338/* 2242/*
2339 * Returns pointer a static string containing gravestone text 2243 * Returns pointer a static string containing gravestone text
2340 * Moved from apply.c to player.c - player.c is what 2244 * Moved from apply.c to player.c - player.c is what
2341 * actually uses this function. player.c may not be quite the 2245 * actually uses this function. player.c may not be quite the
2342 * best, a misc file for object actions is probably better, 2246 * best, a misc file for object actions is probably better,
2343 * but there isn't one in the server directory. 2247 * but there isn't one in the server directory.
2344 */ 2248 */
2345char * 2249const char *
2346gravestone_text (object *op) 2250gravestone_text (object *op)
2347{ 2251{
2348 static char buf2[MAX_BUF]; 2252 static dynbuf_text buf;
2349 char buf[MAX_BUF];
2350 time_t now = time (NULL);
2351 2253
2352 strcpy (buf2, " R.I.P.\n\n"); 2254 buf << "---- R.I.P. ----\n\n"
2255 << op->name;
2256
2353 if (op->type == PLAYER) 2257 if (op->type == PLAYER)
2354 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2258 buf << " the " << op->contr->title;
2355 else
2356 sprintf (buf, "%s\n", &op->name);
2357 2259
2358 strncat (buf2, " ", 20 - strlen (buf) / 2); 2260 buf << "\n\n";
2359 strcat (buf2, buf); 2261
2262 buf << "who was level ";
2263 buf << (sint32)op->level << "\n\n" // OO breakdown
2264 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2265
2360 if (op->type == PLAYER) 2266 if (op->type == PLAYER)
2361 sprintf (buf, "who was in level %d when killed\n", op->level); 2267 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 2268
2365 strncat (buf2, " ", 20 - strlen (buf) / 2);
2366 strcat (buf2, buf);
2367 if (op->type == PLAYER)
2368 { 2269 {
2369 sprintf (buf, "by %s.\n\n", op->contr->killer); 2270 static char buf2[128];
2370 strncat (buf2, " ", 21 - strlen (buf) / 2); 2271 time_t now = time (NULL);
2371 strcat (buf2, buf);
2372 }
2373
2374 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2272 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2375 strncat (buf2, " ", 20 - strlen (buf) / 2); 2273 buf << buf2;
2376 strcat (buf2, buf); 2274 }
2377 2275
2378 return buf2; 2276 return buf;
2379} 2277}
2380 2278
2381void 2279void
2382do_some_living (object *op) 2280do_some_living (object *op)
2383{ 2281{
… …
2435 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2333 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2436 else 2334 else
2437 { 2335 {
2438 gen_grace = op->stats.maxgrace; 2336 gen_grace = op->stats.maxgrace;
2439 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2337 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 } 2338 }
2483 2339
2484 /* Regenerate Grace */ 2340 /* Regenerate Grace */
2485 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2341 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2486 if (--op->last_grace < 0) 2342 if (--op->last_grace < 0)
… …
2507 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2363 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2508 } 2364 }
2509 /* wearing stuff doesn't detract from grace generation. */ 2365 /* wearing stuff doesn't detract from grace generation. */
2510 } 2366 }
2511 2367
2368 if (op->stats.food > 0)
2369 {
2512 /* Regenerate Hit Points */ 2370 /* Regenerate Spell Points */
2513 if (--op->last_heal < 0) 2371 if (!op->contr->golem && --op->last_sp < 0)
2514 {
2515 if (op->stats.hp < op->stats.maxhp)
2516 { 2372 {
2517 op->stats.hp++; 2373 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2518 /* dms do not consume food */ 2374
2519 if (!QUERY_FLAG (op, FLAG_WIZ)) 2375 if (op->stats.sp < op->stats.maxsp)
2520 { 2376 {
2377 op->stats.sp++;
2378
2379 /* dms do not consume food */
2380 if (!QUERY_FLAG (op, FLAG_WIZ))
2381 {
2521 op->stats.food--; 2382 op->stats.food--;
2383
2522 if (op->contr->digestion < 0) 2384 if (op->contr->digestion < 0)
2523 op->stats.food += op->contr->digestion; 2385 op->stats.food += op->contr->digestion;
2524 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2386 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2525 op->stats.food = last_food; 2387 op->stats.food = last_food;
2388 }
2526 } 2389 }
2527 }
2528 2390
2529 if (max_hp > 1) 2391 if (max_sp > 1)
2530 {
2531 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2532 if (over_hp > 0)
2533 { 2392 {
2534 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2393 over_sp = (gen_sp + 10) / rate_sp;
2394 if (over_sp > 0)
2395 {
2396 if (op->stats.sp < op->stats.maxsp)
2397 {
2398 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2399
2400 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2401 op->stats.sp--;
2402
2403 if (op->stats.sp > op->stats.maxsp)
2404 op->stats.sp = op->stats.maxsp;
2405 }
2406
2535 op->last_heal = 0; 2407 op->last_sp = 0;
2408 }
2409 else
2410 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2536 } 2411 }
2537 else 2412 else
2413 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2414 }
2415
2416 /* Regenerate Hit Points */
2417 if (--op->last_heal < 0)
2418 {
2419 if (op->stats.hp < op->stats.maxhp)
2538 { 2420 {
2539 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2421 op->stats.hp++;
2422
2423 /* dms do not consume food */
2424 if (!QUERY_FLAG (op, FLAG_WIZ))
2425 {
2426 op->stats.food--;
2427
2428 if (op->contr->digestion < 0)
2429 op->stats.food += op->contr->digestion;
2430 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2431 op->stats.food = last_food;
2432 }
2540 } 2433 }
2434
2435 if (max_hp > 1)
2436 {
2437 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2438
2439 if (over_hp > 0)
2440 {
2441 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2442 op->last_heal = 0;
2443 }
2444 else
2445 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2541 } 2446 }
2542 else 2447 else
2543 {
2544 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2448 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545 } 2449 }
2546 } 2450 }
2547 2451
2548 /* Digestion */ 2452 /* Digestion */
2549 if (--op->last_eat < 0) 2453 if (--op->last_eat < 0)
2550 { 2454 {
2551 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2455 int bonus = max (0, op->contr->digestion),
2456 penalty = max (0, -op->contr->digestion);
2552 2457
2553 if (op->contr->gen_hp > 0)
2554 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2458 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 2459
2558 /* dms do not consume food */ 2460 /* dms do not consume food */
2559 if (!QUERY_FLAG (op, FLAG_WIZ)) 2461 if (!QUERY_FLAG (op, FLAG_WIZ))
2560 op->stats.food--; 2462 op->stats.food--;
2561 } 2463 }
2562 2464
2563 if (op->stats.food < 0 && op->stats.hp >= 0) 2465 if (op->stats.food < 0 && op->stats.hp >= 0)
2564 { 2466 {
2565 object *tmp, *flesh = 0; 2467 object *flesh = 0;
2566 2468
2567 for (tmp = op->inv; tmp; tmp = tmp->below) 2469 for_inv_removable (op, tmp)
2568 { 2470 {
2569 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2471 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2472 continue;
2473
2474 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2570 { 2475 {
2571 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2476 op->statusmsg ("You blindly grab for a bite of food. "
2572 { 2477 "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); 2478 manual_apply (op, tmp, 0);
2479
2575 if (op->stats.food >= 0 || op->stats.hp < 0) 2480 if (op->stats.food >= 0 || op->stats.hp < 0)
2576 break; 2481 break;
2577 } 2482 }
2578 else if (tmp->type == FLESH) 2483 else if (tmp->type == FLESH)
2579 flesh = tmp; 2484 flesh = tmp;
2580 } /* End if paid for object */ 2485 }
2581 } /* end of for loop */
2582 2486
2583 /* If player is still starving, it means they don't have any food, so 2487 /* If player is still starving, it means they don't have any food, so
2584 * eat flesh instead. 2488 * eat flesh instead.
2585 */ 2489 */
2586 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2490 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2587 { 2491 {
2588 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2492 op->statusmsg ("You blindly grab for a bite of food. "
2493 "H<To prevent you from starving, you ate some random item from your backpack.>");
2589 manual_apply (op, flesh, 0); 2494 manual_apply (op, flesh, 0);
2590 } 2495 }
2496
2497 // If player is still starving, alert him!
2498 if (op->stats.food < 0)
2499 op->failmsg ("You are starving! "
2500 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2501 }
2502
2503 if (op->stats.food < 0)
2591 } 2504 {
2505 op->stats.hp += op->stats.food;
2506 op->stats.food = 0;
2592 2507
2593 while (op->stats.food < 0 && op->stats.hp >= 0) 2508 if (op->stats.hp < 0)
2594 op->stats.food++, op->stats.hp--; 2509 {
2510 op->contr->killer = archetype::get ("killer_starvation");
2511 op->contr->killer->destroy ();
2512 }
2513 }
2595 2514
2515 /* killer should be set here already */
2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2516 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597 kill_player (op); 2517 kill_player (op);
2598 } 2518 }
2599} 2519}
2600 2520
… …
2604 * file. 2524 * file.
2605 */ 2525 */
2606void 2526void
2607kill_player (object *op) 2527kill_player (object *op)
2608{ 2528{
2529 int x, y;
2609 char buf[MAX_BUF]; 2530 char buf[MAX_BUF];
2610 int x, y;
2611
2612 //int i;
2613 maptile *map; /* this is for resurrection */ 2531 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; 2532 int will_kill_again;
2621 archetype *at; 2533 archetype *at;
2622 object *tmp; 2534 object *tmp;
2623 2535
2624 if (save_life (op)) 2536 if (save_life (op))
2625 return; 2537 return;
2626
2627 2538
2628 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2539 /* 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. 2540 * in cities ONLY!!! It is very important that this doesn't get abused.
2630 * Look at op_on_battleground() for more info --AndreasV 2541 * Look at op_on_battleground() for more info --AndreasV
2631 */ 2542 */
… …
2647 { 2558 {
2648 tmp->destroy (); 2559 tmp->destroy ();
2649 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2560 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2650 } 2561 }
2651 2562
2652 cure_disease (op, 0); /* remove any disease */ 2563 cure_disease (op, 0, 0); /* remove any disease */
2653 op->stats.hp = op->stats.maxhp; 2564 op->stats.hp = op->stats.maxhp;
2654 if (op->stats.food <= 0) 2565 if (op->stats.food <= 0)
2655 op->stats.food = 999; 2566 op->stats.food = 999;
2656 2567
2657 /* create a bodypart-trophy to make the winner happy */ 2568 /* create a bodypart-trophy to make the winner happy */
2658 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2569 if (object *tmp = arch_to_object (archetype::find ("finger")))
2659 { 2570 {
2660 sprintf (buf, "%s's finger", &op->name); 2571 tmp->name = format ("%s's finger" , &op->name);
2661 tmp->name = buf; 2572 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; 2573 tmp->msg = format (
2574 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2575 &op->name, op->contr->title,
2576 (int)op->level,
2577 op->contr->killer_name ()
2578 );
2666 tmp->value = 0, tmp->type = 0; 2579 tmp->value = 0, tmp->type = 0;
2667 tmp->materialname = "organics"; 2580 tmp->materialname = "organics";
2668 tmp->insert_at (op, tmp); 2581 tmp->insert_at (op, tmp);
2669 } 2582 }
2670 2583
… …
2676 2589
2677 INVOKE_PLAYER (DEATH, op->contr); 2590 INVOKE_PLAYER (DEATH, op->contr);
2678 2591
2679 command_kill_pets (op, 0); 2592 command_kill_pets (op, 0);
2680 2593
2681 if (op->stats.food < 0) 2594 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 2595
2691 /* save the map location for corpse, gravestone */ 2596 /* save the map location for corpse, gravestone */
2692 x = op->x; 2597 x = op->x;
2693 y = op->y; 2598 y = op->y;
2694 map = op->map; 2599 map = op->map;
… …
2722 2627
2723 lost_a_stat = 0; 2628 lost_a_stat = 0;
2724 2629
2725 for (z = 0; z < num_stats_lose; z++) 2630 for (z = 0; z < num_stats_lose; z++)
2726 { 2631 {
2727 i = RANDOM () % NUM_STATS; 2632 i = rndm (NUM_STATS);
2728 2633
2729 if (settings.stat_loss_on_death) 2634 if (settings.stat_loss_on_death)
2730 { 2635 {
2731 /* Pick a random stat and take a point off it. Tell the player 2636 /* Pick a random stat and take a point off it. Tell the player
2732 * what he lost. 2637 * what he lost.
… …
2801 lost_a_stat = 1; 2706 lost_a_stat = 1;
2802 } 2707 }
2803 } 2708 }
2804 } 2709 }
2805 } 2710 }
2711
2806 /* If no stat lost, tell the player. */ 2712 /* If no stat lost, tell the player. */
2807 if (!lost_a_stat) 2713 if (!lost_a_stat)
2808 { 2714 {
2809 /* determine_god() seems to not work sometimes... why is this? 2715 /* determine_god() seems to not work sometimes... why is this?
2810 Should I be using something else? GD */ 2716 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); 2720 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2815 else 2721 else
2816 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2722 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2817 } 2723 }
2818#else 2724#else
2819 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2725 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2820#endif 2726#endif
2821 2727
2822 /* Put a gravestone up where the character 'almost' died. List the 2728 /* Put a gravestone up where the character 'almost' died. List the
2823 * exp loss on the stone. 2729 * exp loss on the stone.
2824 */ 2730 */
2825 tmp = arch_to_object (archetype::find ("gravestone")); 2731 tmp = arch_to_object (archetype::find ("gravestone"));
2826 sprintf (buf, "%s's gravestone", &op->name); 2732 tmp->name = format ("%s's gravestone", &op->name);
2827 tmp->name = buf; 2733 tmp->name_pl = format ("%s's gravestones", &op->name);
2828 sprintf (buf, "%s's gravestones", &op->name); 2734 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2829 tmp->name_pl = buf; 2735 &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; 2736 tmp->x = op->x, tmp->y = op->y;
2833 insert_ob_in_map (tmp, op->map, NULL, 0); 2737 insert_ob_in_map (tmp, op->map, NULL, 0);
2834 2738
2835 /**************************************/ 2739 /**************************************/
2836 /* */ 2740 /* */
… …
2857 { 2761 {
2858 tmp->destroy (); 2762 tmp->destroy ();
2859 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2763 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2860 } 2764 }
2861 2765
2862 cure_disease (op, 0); /* remove any disease */ 2766 cure_disease (op, 0, 0); /* remove any disease */
2767
2768 // remove all spell effects that are active
2769 // to avoid long-term effects such as word-of-recall
2770 for (object *item = op->inv; item; )
2771 {
2772 object *next = item->below;
2773
2774 if (item->type == SPELL_EFFECT && item->active)
2775 item->destroy ();
2776
2777 item = next;
2778 }
2863 2779
2864 /*add_exp(op, (op->stats.exp * -0.20)); */ 2780 /*add_exp(op, (op->stats.exp * -0.20)); */
2865 apply_death_exp_penalty (op); 2781 apply_death_exp_penalty (op);
2782
2866 if (op->stats.food < 100) 2783 if (op->stats.food < 100)
2867 op->stats.food = 900; 2784 op->stats.food = 900;
2785
2868 op->stats.hp = op->stats.maxhp; 2786 op->stats.hp = op->stats.maxhp;
2869 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2787 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2870 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2788 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2871 2789
2872 /* 2790 /*
2873 * Check to see if the player has any unpaid items. If so, remove them 2791 * Check to see if the player has any unpaid items. If so, remove them
2874 * and put them back in the map. 2792 * and put them back in the map.
2875 */ 2793 */
2876 remove_unpaid_objects (op->inv, op); 2794 op->drop_unpaid_items ();
2877 2795
2878 /****************************************/ 2796 /****************************************/
2879 /* */ 2797 /* */
2880 /* Move player to his current respawn- */ 2798 /* Move player to his current respawn- */
2881 /* position (usually last savebed) */ 2799 /* position (usually last savebed) */
… …
2910 if (will_kill_again & (1 << at)) 2828 if (will_kill_again & (1 << at))
2911 force->resist[at] = 100; 2829 force->resist[at] = 100;
2912 2830
2913 insert_ob_in_ob (force, op); 2831 insert_ob_in_ob (force, op);
2914 op->update_stats (); 2832 op->update_stats ();
2915
2916 } 2833 }
2917 2834
2918 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2835 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2919} 2836}
2920 2837
… …
2940 2857
2941 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2858 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2942 { 2859 {
2943 if (tmp->nrof > 1) 2860 if (tmp->nrof > 1)
2944 { 2861 {
2945 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2862 tmp->decrease (rndm (1, tmp->nrof - 1));
2946 tmp2->destroy ();
2947 insert_ob_in_map (tmp, op->map, NULL, 0); 2863 insert_ob_in_map (tmp, op->map, NULL, 0);
2948 } 2864 }
2949 else 2865 else
2950 tmp->destroy (); 2866 tmp->destroy ();
2951 } 2867 }
… …
2962void 2878void
2963fix_weight (void) 2879fix_weight (void)
2964{ 2880{
2965 for_all_players (pl) 2881 for_all_players (pl)
2966 { 2882 {
2967 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2883 sint32 old = pl->ob->carrying;
2968 2884
2969 if (old == sum) 2885 pl->ob->update_weight ();
2970 continue; 2886
2887 if (old != pl->ob->carrying)
2888 {
2971 pl->ob->update_stats (); 2889 pl->ob->update_stats ();
2972 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2890 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2891 }
2973 } 2892 }
2974} 2893}
2975 2894
2976void 2895void
2977fix_luck (void) 2896fix_luck (void)
… …
3019} 2938}
3020 2939
3021void 2940void
3022make_visible (object *op) 2941make_visible (object *op)
3023{ 2942{
3024 op->hide = 0; 2943 op->flag [FLAG_HIDDEN] = 0;
3025 op->invisible = 0; 2944 op->invisible = 0;
2945
3026 if (op->type == PLAYER) 2946 if (op->type == PLAYER)
3027 { 2947 {
3028 op->contr->tmp_invis = 0; 2948 op->contr->tmp_invis = 0;
3029 op->contr->invis_race = 0; 2949 op->contr->invis_race = 0;
3030 } 2950 }
… …
3033} 2953}
3034 2954
3035int 2955int
3036is_true_undead (object *op) 2956is_true_undead (object *op)
3037{ 2957{
3038 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 2958 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3039 return 1; 2959 return 1;
3040 2960
3041 return 0; 2961 return 0;
3042} 2962}
3043 2963
3044/* look at the surrounding terrain to determine 2964/* look at the surrounding terrain to determine
3045 * the hideability of this object. Positive levels 2965 * the hideability of this object. Positive levels
3046 * indicate greater hideability. 2966 * indicate greater hideability.
3047 */ 2967 */
3048
3049int 2968int
3050hideability (object *ob) 2969hideability (object *ob)
3051{ 2970{
3052 int i, level = 0, mflag; 2971 int i, level = 0, mflag;
3053 sint16 x, y; 2972 sint16 x, y;
3054 2973
3055 if (!ob || !ob->map) 2974 if (!ob || !ob->map)
3056 return 0; 2975 return 0;
3057 2976
3058 /* so, on normal lighted maps, its hard to hide */ 2977 /* so, on normal lighted maps, its hard to hide */
3059 level = ob->map->darkness - 2; 2978 level = ob->map->darklevel () - 2;
3060 2979
3061 /* this also picks up whether the object is glowing. 2980 /* this also picks up whether the object is glowing.
3062 * If you carry a light on a non-dark map, its not 2981 * If you carry a light on a non-dark map, its not
3063 * as bad as carrying a light on a pitch dark map */ 2982 * as bad as carrying a light on a pitch dark map */
3064 if (has_carried_lights (ob)) 2983 if (has_carried_lights (ob))
3065 level = -(10 + (2 * ob->map->darkness)); 2984 level = -(10 + (2 * ob->map->darklevel ()));
3066 2985
3067 /* scan through all nearby squares for terrain to hide in */ 2986 /* 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]) 2987 for (i = 0, x = ob->x, y = ob->y;
2988 i <= SIZEOFFREE1;
2989 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3069 { 2990 {
3070 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2991 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3071 if (mflag & P_OUT_OF_MAP) 2992 if (mflag & P_OUT_OF_MAP)
3072 {
3073 continue; 2993 continue;
3074 } 2994
3075 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2995 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3076 level += 2; 2996 level += 2;
3077 else /* open terrain! */ 2997 else /* open terrain! */
3078 level -= 1; 2998 level -= 1;
3079 } 2999 }
… …
3090 * spot (surrounded by clear terrain in broad daylight). -b.t. 3010 * spot (surrounded by clear terrain in broad daylight). -b.t.
3091 */ 3011 */
3092void 3012void
3093do_hidden_move (object *op) 3013do_hidden_move (object *op)
3094{ 3014{
3095 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3015 int hide = 0;
3096 object *skop;
3097 3016
3098 if (!op || !op->map) 3017 if (!op || !op->map)
3099 return; 3018 return;
3100 3019
3101 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3020 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3021 int num = random_roll (0, 19, op, PREFER_LOW);
3102 3022
3103 /* its *extremely* hard to run and sneak/hide at the same time! */ 3023 /* its *extremely* hard to run and sneak/hide at the same time! */
3104 if (op->type == PLAYER && op->contr->run_on) 3024 if (op->type == PLAYER && op->contr->run_on)
3105 if (!skop || num >= skop->level) 3025 if (!skop || num >= skop->level)
3106 { 3026 {
… …
3116 num -= hide; 3036 num -= hide;
3117 3037
3118 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3038 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3119 { 3039 {
3120 make_visible (op); 3040 make_visible (op);
3041
3121 if (op->type == PLAYER) 3042 if (op->type == PLAYER)
3122 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3043 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3123 } 3044 }
3124 else if (op->type == PLAYER && skop) 3045 else if (op->type == PLAYER && skop)
3125 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3046 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3178 * object op. This function works fine for monsters, 3099 * object op. This function works fine for monsters,
3179 * but we dont worry if the object isnt the top one in 3100 * but we dont worry if the object isnt the top one in
3180 * a pile (say a coin under a table would return "viewable" 3101 * a pile (say a coin under a table would return "viewable"
3181 * by this routine). Another question, should we be 3102 * by this routine). Another question, should we be
3182 * concerned with the direction the player is looking 3103 * concerned with the direction the player is looking
3183 * in? Realistically, most of use cant see stuff behind 3104 * in? Realistically, most of us can't see stuff behind
3184 * our backs...on the other hand, does the "facing" direction 3105 * our backs...on the other hand, does the "facing" direction
3185 * imply the way your head, or body is facing? Its possible 3106 * 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. 3107 * for them to differ. Sigh, this fctn could get a bit more complex.
3187 * -b.t. 3108 * -b.t.
3188 * This function is now map tiling safe. 3109 * This function is now map tiling safe.
3189 */ 3110 */
3190
3191int 3111int
3192player_can_view (object *pl, object *op) 3112player_can_view (object *pl, object *op)
3193{ 3113{
3194 rv_vector rv; 3114 rv_vector rv;
3195 int dx, dy; 3115 int dx, dy;
… …
3207 3127
3208 get_rangevector (pl, op, &rv, 0x1); 3128 get_rangevector (pl, op, &rv, 0x1);
3209 3129
3210 /* starting with the 'head' part, lets loop 3130 /* starting with the 'head' part, lets loop
3211 * through the object and find if it has any 3131 * through the object and find if it has any
3212 * part that is in the los array but isnt on 3132 * part that is in the los array but isn't on
3213 * a blocked los square. 3133 * a blocked los square.
3214 * we use the archetype to figure out offsets. 3134 * we use the archetype to figure out offsets.
3215 */ 3135 */
3216 while (op) 3136 while (op)
3217 { 3137 {
3218 dx = rv.distance_x + op->arch->clone.x; 3138 dx = rv.distance_x + op->arch->x;
3219 dy = rv.distance_y + op->arch->clone.y; 3139 dy = rv.distance_y + op->arch->y;
3220 3140
3221 /* only the viewable area the player sees is updated by LOS 3141 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3222 * code, so we need to restrict ourselves to that range of values
3223 * for any meaningful values.
3224 */
3225 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
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; 3142 return 1;
3143
3229 op = op->more; 3144 op = op->more;
3230 } 3145 }
3146
3231 return 0; 3147 return 0;
3232} 3148}
3233 3149
3234/* routine for both players and monsters. We call this when 3150/* routine for both players and monsters. We call this when
3235 * there is a possibility for our action distrubing our hiding 3151 * there is a possibility for our action distrubing our hiding
3236 * place or invisiblity spell. Artefact invisiblity is not 3152 * place or invisiblity spell. Artefact invisiblity causes
3237 * effected by this. If we arent invisible to begin with, we 3153 * "noise" instead. If we arent invisible to begin with, we
3238 * return 0. 3154 * return 0.
3239 */ 3155 */
3240int 3156int
3241action_makes_visible (object *op) 3157action_makes_visible (object *op)
3242{ 3158{
3243
3244 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3159 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3245 { 3160 {
3246 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3161 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3162 {
3163 // artefact invisibility is permanent, but we still make noise
3164 // this is important for game-balance.
3165 if (op->contr)
3166 op->make_noise ();
3167
3247 return 0; 3168 return 0;
3169 }
3248 3170
3249 if (op->contr && op->contr->tmp_invis == 0) 3171 if (op->contr && op->contr->tmp_invis == 0)
3250 return 0; 3172 return 0;
3251 3173
3252 /* If monsters, they should become visible */ 3174 /* If monsters, they should become visible */
3253 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3175 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3254 { 3176 {
3255 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3177 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3256 return 1; 3178 return 1;
3257 } 3179 }
3258 } 3180 }
3181
3259 return 0; 3182 return 0;
3260} 3183}
3261 3184
3262/* op_on_battleground - checks if the given object op (usually 3185/* op_on_battleground - checks if the given object op (usually
3263 * a player) is standing on a valid battleground-tile, 3186 * 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 3191 * Default is to do the same as before, so only people wanting to have different points need worry about this
3269 */ 3192 */
3270int 3193int
3271op_on_battleground (object *op, int *x, int *y) 3194op_on_battleground (object *op, int *x, int *y)
3272{ 3195{
3273 object *tmp;
3274
3275 /* A battleground-tile needs the following attributes to be valid: 3196 /* 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), 3197 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3277 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3198 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3278 * and the exit-coordinates sp/hp must both be > 0. 3199 * and the exit-coordinates sp/hp must both be > 0.
3279 * => The intention here is to prevent abuse of the battleground- 3200 * => The intention here is to prevent abuse of the battleground-
3280 * feature (like pickable or hidden battleground tiles). */ 3201 * feature (like pickable or hidden battleground tiles). */
3281 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3202 for (object *tmp = op->below; tmp; tmp = tmp->below)
3282 { 3203 {
3283 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3204 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3284 { 3205 {
3285 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3206 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3286 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3207 && tmp->type == BATTLEGROUND
3208 && tmp->name == shstr_battleground
3209 && EXIT_X (tmp) && EXIT_Y (tmp))
3287 { 3210 {
3288 /*before we assign the exit, check if this is a teambattle */ 3211 /* before we assign the exit, check if this is a teambattle */
3289 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3212 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3290 { 3213 {
3291 object *invtmp;
3292
3293 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3214 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3294 { 3215 {
3295 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3216 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3296 { 3217 {
3297 if (x != NULL && y != NULL) 3218 if (x && y)
3298 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3219 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3220
3299 return 1; 3221 return 1;
3300 } 3222 }
3301 } 3223 }
3302 } 3224 }
3225
3303 if (x != NULL && y != NULL) 3226 if (x && y)
3304 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3227 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3228
3305 return 1; 3229 return 1;
3306 } 3230 }
3307 } 3231 }
3308 } 3232 }
3233
3309 /* If we got here, did not find a battleground */ 3234 /* If we got here, did not find a battleground */
3310 return 0; 3235 return 0;
3311} 3236}
3312 3237
3313/* 3238/*
… …
3329 char buf[MAX_BUF]; /* tmp. string buffer */ 3254 char buf[MAX_BUF]; /* tmp. string buffer */
3330 int i = 0, j = 0; 3255 int i = 0, j = 0;
3331 3256
3332 /* get the appropriate treasurelist */ 3257 /* get the appropriate treasurelist */
3333 if (atnr == ATNR_FIRE) 3258 if (atnr == ATNR_FIRE)
3334 trlist = treasurelist::find ("dragon_ability_fire"); 3259 trlist = treasurelist::find (shstr_dragon_ability_fire);
3335 else if (atnr == ATNR_COLD) 3260 else if (atnr == ATNR_COLD)
3336 trlist = treasurelist::find ("dragon_ability_cold"); 3261 trlist = treasurelist::find (shstr_dragon_ability_cold);
3337 else if (atnr == ATNR_ELECTRICITY) 3262 else if (atnr == ATNR_ELECTRICITY)
3338 trlist = treasurelist::find ("dragon_ability_elec"); 3263 trlist = treasurelist::find (shstr_dragon_ability_elec);
3339 else if (atnr == ATNR_POISON) 3264 else if (atnr == ATNR_POISON)
3340 trlist = treasurelist::find ("dragon_ability_poison"); 3265 trlist = treasurelist::find (shstr_dragon_ability_poison);
3341 3266
3342 if (trlist == NULL || who->type != PLAYER) 3267 if (trlist == NULL || who->type != PLAYER)
3343 return; 3268 return;
3344 3269
3345 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3270 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]); */ 3274 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3350 return; 3275 return;
3351 } 3276 }
3352 3277
3353 /* everything seems okay - now bring on the gift: */ 3278 /* everything seems okay - now bring on the gift: */
3354 item = &(tr->item->clone); 3279 item = tr->item;
3355 3280
3356 if (item->type == SPELL) 3281 if (item->type == SPELL)
3357 { 3282 {
3358 if (check_spell_known (who, item->name)) 3283 if (check_spell_known (who, item->name))
3359 return; 3284 return;
… …
3418 { 3343 {
3419 /* forces in the treasurelist can alter the player's stats */ 3344 /* forces in the treasurelist can alter the player's stats */
3420 object *skin; 3345 object *skin;
3421 3346
3422 /* first get the dragon skin force */ 3347 /* 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) 3348 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3425 ; 3349 ;
3426 3350
3427 if (!skin) 3351 if (!skin)
3428 return; 3352 return;
3429 3353
… …
3464 else 3388 else
3465 { 3389 {
3466 /* generate misc. treasure */ 3390 /* generate misc. treasure */
3467 tmp = arch_to_object (tr->item); 3391 tmp = arch_to_object (tr->item);
3468 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3392 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); 3393 who->insert (tmp);
3470 if (who->type == PLAYER)
3471 esrv_send_item (who, tmp);
3472 } 3394 }
3473} 3395}
3474 3396
3475/** 3397/**
3476 * Unready an object for a player. This function does nothing if the object was 3398 * Unready an object for a player. This function does nothing if the object was
… …
3488 if (pl->ranged_ob == ob) 3410 if (pl->ranged_ob == ob)
3489 pl->ranged_ob = 0; 3411 pl->ranged_ob = 0;
3490} 3412}
3491 3413
3492sint8 3414sint8
3493player::visibility_at (maptile *map, int x, int y) const 3415player::darkness_at (maptile *map, int x, int y) const
3494{ 3416{
3495 if (!ns) 3417 if (!ns)
3496 return 0; 3418 return LOS_BLOCKED;
3497 3419
3498 int dx, dy; 3420 int dx, dy;
3499 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3421 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3500 return 0; 3422 return LOS_BLOCKED;
3501 3423
3502 x += dx - ns->current_x + ns->mapx / 2; 3424 x += dx - ns->current_x;
3503 y += dy - ns->current_y + ns->mapy / 2; 3425 y += dy - ns->current_y;
3504 3426
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]; 3427 return blocked_los (x, y);
3509} 3428}
3429
3430void
3431player::infobox (const char *title, const char *msg, int color)
3432{
3433 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3434}
3435
3436void
3437player::statusmsg (const char *msg, int color)
3438{
3439 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3440}
3441
3442void
3443player::failmsg (const char *msg, int color)
3444{
3445 play_sound (sound_find ("generic_failure"));
3446 statusmsg (msg, color);
3447}
3448

Diff Legend

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