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.147 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.202 by root, Fri Aug 29 02:07:09 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
… …
123 continue; 122 continue;
124 123
125 if (*buf == '%') 124 if (*buf == '%')
126 { /* send one news */ 125 { /* send one news */
127 if (size > 0) 126 if (size > 0)
128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
129 131
130 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
131 strip_endline (subject); 133 strip_endline (subject);
132 size = 0; 134 size = 0;
133 news[0] = '\0'; 135 news[0] = '\0';
… …
184 186
185 if (ob->map) 187 if (ob->map)
186 maplevel = ob->map->path; 188 maplevel = ob->map->path;
187 189
188 ob->remove (); 190 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 192 ob->map = 0;
190 party = 0; 193 party = 0;
191 194
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 196
… …
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_player_skills (ob);
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}
289
290void
291player::disconnect ()
292{
293 if (ns)
294 {
295 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298 INVOKE_PLAYER (DISCONNECT, this);
299
300 ns->reset_stats ();
301 ns->pl = 0;
302 ns = 0;
303 }
304
305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
308 deactivate ();
309}
310
311// the need for this function can be explained
312// by load_object not returning the object
313void
314player::set_object (object *op)
315{
316 ob = observe = op;
317 ob->contr = this; /* this aren't yet in archetype */
318
319 ob->speed = 1.0f;
320 ob->speed_left = 0.5f;
321
322 ob->direction = 5; /* So player faces south */
323} 330}
324 331
325void 332void
326player::set_observe (object *op) 333player::set_observe (object *op)
327{ 334{
… …
341 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
342 349
343 gen_sp_armour = 10; 350 gen_sp_armour = 10;
344 bowtype = bow_normal; 351 bowtype = bow_normal;
345 petmode = pet_normal; 352 petmode = pet_normal;
346 listening = 10;
347 usekeys = containers; 353 usekeys = containers;
348 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
349 do_los = 1; 355 do_los = 1;
350 356
351 weapon_sp = 1.0f; 357 weapon_sp = 1.0f;
… …
362 if (ob) 368 if (ob)
363 { 369 {
364 ob->destroy_inv (false); 370 ob->destroy_inv (false);
365 ob->destroy (); 371 ob->destroy ();
366 } 372 }
373
374 ob = observe = 0;
367} 375}
368 376
369player::~player () 377player::~player ()
370{ 378{
371 /* Clear item stack */ 379 /* Clear item stack */
… …
398 * Note: there MUST be at least one player archetype! 406 * Note: there MUST be at least one player archetype!
399 */ 407 */
400archetype * 408archetype *
401get_player_archetype (archetype *at) 409get_player_archetype (archetype *at)
402{ 410{
403 archetype *start = at; 411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
417 archvec::iterator i = archetypes.find (nat);
404 418
405 for (;;) 419 for (;;)
406 { 420 {
407 if (at == NULL || at->next == NULL) 421 if (++i == archetypes.end ())
408 at = first_archetype; 422 i = archetypes.begin ();
409 else 423 else if (*i == at)
410 at = at->next; 424 cleanup ("not a single player archetype found");
411 425
412 if (at->clone.type == PLAYER) 426 if ((*i)->type == PLAYER)
413 return at; 427 return *i;
414
415 if (at == start)
416 {
417 LOG (llevError, "No Player archetypes\n");
418 exit (-1);
419 }
420 } 428 }
421} 429}
422 430
423object * 431object *
424get_nearest_player (object *mon) 432get_nearest_player (object *mon)
… …
428 unsigned lastdist; 436 unsigned lastdist;
429 rv_vector rv; 437 rv_vector rv;
430 438
431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 439 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
432 { 440 {
433 /* We should not find free objects on this friendly list, but it
434 * does periodically happen. Given that, lets deal with it.
435 * While unlikely, it is possible the next object on the friendly
436 * list is also free, so encapsulate this in a while loop.
437 */
438 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
439 {
440 object *tmp = ol->ob;
441
442 /* Can't do much more other than log the fact, because the object
443 * itself will have been cleared.
444 */
445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
447 ol = ol->next;
448 remove_friendly_object (tmp);
449 if (!ol)
450 return op;
451 }
452
453 /* Remove special check for player from this. First, it looks to cause
454 * some crashes (ol->ob->contr not set properly?), but secondly, a more
455 * complicated method of state checking would be needed in any case -
456 * as it was, a clever player could type quit, and the function would
457 * skip them over while waiting for confirmation. Remove
458 * on_same_map check, as can_detect_enemy also does this
459 */
460 if (!can_detect_enemy (mon, ol->ob, &rv)) 441 if (!can_detect_enemy (mon, ol->ob, &rv))
461 continue; 442 continue;
462 443
463 if (lastdist > rv.distance) 444 if (lastdist > rv.distance)
464 { 445 {
… …
659 640
660 return firstdir; 641 return firstdir;
661} 642}
662 643
663void 644void
664give_initial_items (object *pl, treasurelist * items) 645give_initial_items (object *pl, treasurelist *items)
665{ 646{
666 object *op, *next = NULL;
667
668 if (pl->randomitems != NULL) 647 if (pl->randomitems)
669 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 648 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
670 649
671 for (op = pl->inv; op; op = next) 650 for (object *next, *op = pl->inv; op; op = next)
672 { 651 {
673 next = op->below; 652 next = op->below;
674 653
675 /* Forces get applied per default, unless they have the 654 /* Forces get applied per default, unless they have the
676 * flag "neutral" set. Sorry but I can't think of a better way 655 * flag "neutral" set. Sorry but I can't think of a better way
… …
681 /* we never give weapons/armour if these cannot be used 660 /* we never give weapons/armour if these cannot be used
682 * by this player due to race restrictions 661 * by this player due to race restrictions
683 */ 662 */
684 if (pl->type == PLAYER) 663 if (pl->type == PLAYER)
685 { 664 {
686 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 665 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
666 &&
687 (op->type == ARMOUR || op->type == BOOTS || 667 (op->type == ARMOUR || op->type == BOOTS
688 op->type == CLOAK || op->type == HELMET || 668 || op->type == CLOAK || op->type == HELMET
689 op->type == SHIELD || op->type == GLOVES || 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE))
690 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
691 { 672 {
692 op->destroy (); 673 op->destroy ();
693 continue; 674 continue;
694 } 675 }
695 } 676 }
… …
718 if (op->nrof > 1) 699 if (op->nrof > 1)
719 op->nrof = 1; 700 op->nrof = 1;
720 } 701 }
721 702
722 if (op->type == SPELLBOOK && op->inv) 703 if (op->type == SPELLBOOK && op->inv)
723 {
724 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 704 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
725 }
726 705
727 /* Give starting characters identified, uncursed, and undamned 706 /* Give starting characters identified, uncursed, and undamned
728 * items. Just don't identify gold or silver, or it won't be 707 * items. Just don't identify gold or silver, or it won't be
729 * merged properly. 708 * merged properly.
730 */ 709 */
731 if (need_identify (op)) 710 if (need_identify (op))
732 { 711 {
733 SET_FLAG (op, FLAG_IDENTIFIED); 712 SET_FLAG (op, FLAG_IDENTIFIED);
734 CLEAR_FLAG (op, FLAG_CURSED); 713 CLEAR_FLAG (op, FLAG_CURSED);
735 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
736 } 715 }
716
737 if (op->type == SPELL) 717 if (op->type == SPELL)
738 { 718 {
739 op->destroy (); 719 op->destroy ();
740 continue; 720 continue;
741 } 721 }
… …
743 { 723 {
744 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
745 op->stats.exp = 0; 725 op->stats.exp = 0;
746 op->level = 1; 726 op->level = 1;
747 } 727 }
748 /* lock all 'normal items by default */ 728 else /* lock all 'normal items by default */
749 else
750 SET_FLAG (op, FLAG_INV_LOCKED); 729 SET_FLAG (op, FLAG_INV_LOCKED);
751 } /* for loop of objects in player inv */ 730 } /* for loop of objects in player inv */
752 731
753 /* Need to set up the skill pointers */ 732 /* Need to set up the skill pointers */
754 link_player_skills (pl); 733 link_player_skills (pl);
… …
860static void 839static void
861start_info (object *op) 840start_info (object *op)
862{ 841{
863 char buf[MAX_BUF]; 842 char buf[MAX_BUF];
864 843
865 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 844 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
866 new_draw_info (NDI_UNIQUE, 0, op, buf); 845 new_draw_info (NDI_UNIQUE, 0, op, buf);
867 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
868 //new_draw_info (NDI_UNIQUE, 0, op, " ");
869} 846}
870 847
871/* This function takes the key that is passed, and does the 848/* This function takes the key that is passed, and does the
872 * appropriate action with it (change race, or other things). 849 * appropriate action with it (change race, or other things).
873 * The function name is for historical reasons - now we have 850 * The function name is for historical reasons - now we have
… …
876 */ 853 */
877void 854void
878player::chargen_race_done () 855player::chargen_race_done ()
879{ 856{
880 /* this must before then initial items are given */ 857 /* this must before then initial items are given */
881 esrv_new_player (ob->contr, ob->weight + ob->carrying); 858 esrv_new_player (ob->contr);
882 859
883 treasurelist *tl = treasurelist::find ("starting_wealth"); 860 treasurelist *tl = treasurelist::find ("starting_wealth");
884 if (tl) 861 if (tl)
885 create_treasure (tl, ob, 0, 0, 0); 862 create_treasure (tl, ob, 0, 0, 0);
886 863
… …
889 866
890 ob->contr->ns->state = ST_PLAYING; 867 ob->contr->ns->state = ST_PLAYING;
891 868
892 if (ob->msg) 869 if (ob->msg)
893 ob->msg = 0; 870 ob->msg = 0;
894
895 /* We create this now because some of the unique maps will need it
896 * to save here.
897 */
898 {
899 char buf[MAX_BUF];
900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
901 make_path_to_file (buf);
902 }
903 871
904 start_info (ob); 872 start_info (ob);
905 CLEAR_FLAG (ob, FLAG_WIZ); 873 CLEAR_FLAG (ob, FLAG_WIZ);
906 give_initial_items (ob, ob->randomitems); 874 give_initial_items (ob, ob->randomitems);
907 link_player_skills (ob); 875 link_player_skills (ob);
… …
910 878
911 /* This moves the player to a different start map, if there 879 /* This moves the player to a different start map, if there
912 * is one for this race 880 * is one for this race
913 */ 881 */
914 if (*first_map_ext_path) 882 if (*first_map_ext_path)
915 { 883 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
916 object *tmp;
917 char mapname[MAX_BUF];
918
919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
920 tmp = object::create ();
921 EXIT_PATH (tmp) = mapname;
922 EXIT_X (tmp) = ob->x;
923 EXIT_Y (tmp) = ob->y;
924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
925 * if the map isn't there, then stay on the
926 * default initial map */
927 tmp->destroy ();
928 }
929 else 884 else
930 LOG (llevDebug, "first_map_ext_path not set\n"); 885 LOG (llevDebug, "first_map_ext_path not set\n");
931} 886}
932 887
933void 888void
… …
943 int x = ob->x, y = ob->y; 898 int x = ob->x, y = ob->y;
944 899
945 ob->remove_statbonus (); 900 ob->remove_statbonus ();
946 ob->remove (); 901 ob->remove ();
947 ob->arch = get_player_archetype (ob->arch); 902 ob->arch = get_player_archetype (ob->arch);
948 ob->arch->clone.copy_to (ob); 903 ob->arch->copy_to (ob);
949 ob->instantiate (); 904 ob->instantiate ();
950 ob->stats = ob->contr->orig_stats; 905 ob->stats = ob->contr->orig_stats;
951 ob->name = ob->name_pl = name; 906 ob->name = ob->name_pl = name;
952 ob->x = x; 907 ob->x = x;
953 ob->y = y; 908 ob->y = y;
954 SET_ANIMATION (ob, 2); /* So player faces south */ 909 SET_ANIMATION (ob, 2); /* So player faces south */
955 insert_ob_in_map (ob, ob->map, ob, 0); 910 insert_ob_in_map (ob, ob->map, ob, 0);
956 assign (ob->contr->title, ob->arch->clone.name); 911 assign (ob->contr->title, ob->arch->object::name);
957 ob->add_statbonus (); 912 ob->add_statbonus ();
958 } 913 }
959 while (!allowed_class (ob)); 914 while (!allowed_class (ob));
960 915
961 update_object (ob, UP_OBJ_FACE); 916 update_object (ob, UP_OBJ_FACE);
… …
1036 if (op->move_type & MOVE_FLYING) 991 if (op->move_type & MOVE_FLYING)
1037 return 1; 992 return 1;
1038 993
1039 next = op->below; 994 next = op->below;
1040 995
996 int cnt = MAX_ITEM_PER_DROP;
997#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
998
1041 /* loop while there are items on the floor that are not marked as 999 /* loop while there are items on the floor that are not marked as
1042 * destroyed */ 1000 * destroyed */
1043 while (next && !next->destroyed ()) 1001 while (next && !next->destroyed ())
1044 { 1002 {
1045 tmp = next; 1003 tmp = next;
1046 next = tmp->below; 1004 next = tmp->below;
1047 1005
1006 if (cnt <= 0)
1007 {
1008 op->failmsg ("Couldn't pickup all items at once.");
1009 return 0;
1010 }
1011
1048 if (op->destroyed ()) 1012 if (op->destroyed ())
1049 return 0; 1013 return 0;
1050 1014
1051 if (!can_pick (op, tmp)) 1015 if (!can_pick (op, tmp))
1052 continue; 1016 continue;
1053 1017
1054 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1018 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1055 { 1019 {
1056 if (item_matched_string (op, tmp, op->contr->search_str)) 1020 if (item_matched_string (op, tmp, op->contr->search_str))
1057 pick_up (op, tmp); 1021 CHK_PICK_PICKUP;
1058 continue; 1022 continue;
1059 } 1023 }
1060 1024
1061 /* high not bit set? We're using the old autopickup model */ 1025 /* high not bit set? We're using the old autopickup model */
1062 if (!(op->contr->mode & PU_NEWMODE)) 1026 if (!(op->contr->mode & PU_NEWMODE))
… …
1064 switch (op->contr->mode) 1028 switch (op->contr->mode)
1065 { 1029 {
1066 case 0: 1030 case 0:
1067 return 1; /* don't pick up */ 1031 return 1; /* don't pick up */
1068 case 1: 1032 case 1:
1069 pick_up (op, tmp); 1033 CHK_PICK_PICKUP;
1070 return 1; 1034 return 1;
1071 case 2: 1035 case 2:
1072 pick_up (op, tmp); 1036 CHK_PICK_PICKUP;
1073 return 0; 1037 return 0;
1074 case 3: 1038 case 3:
1075 return 0; /* stop before pickup */ 1039 return 0; /* stop before pickup */
1076 case 4: 1040 case 4:
1077 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1078 break; 1042 break;
1079 case 5: 1043 case 5:
1080 pick_up (op, tmp); 1044 CHK_PICK_PICKUP;
1081 stop = 1; 1045 stop = 1;
1082 break; 1046 break;
1083 case 6: 1047 case 6:
1084 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1048 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1085 pick_up (op, tmp); 1049 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1050 CHK_PICK_PICKUP;
1086 break; 1051 break;
1087 1052
1088 case 7: 1053 case 7:
1089 if (tmp->type == MONEY || tmp->type == GEM) 1054 if (tmp->type == MONEY || tmp->type == GEM)
1090 pick_up (op, tmp); 1055 CHK_PICK_PICKUP;
1091 break; 1056 break;
1092 1057
1093 default: 1058 default:
1094 /* use value density */ 1059 /* use value density */
1095 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1060 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1096 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1061 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1097 pick_up (op, tmp); 1062 CHK_PICK_PICKUP;
1098 } 1063 }
1099 } 1064 }
1100 else 1065 else
1101 { /* old model */ 1066 { /* old model */
1102 /* NEW pickup handling */ 1067 /* NEW pickup handling */
… …
1106 if (tmp->name != NULL) 1071 if (tmp->name != NULL)
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1072 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1073 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 else 1074 else
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1075 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1076 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112 1077
1113 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1078 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114 } 1079 }
1115 1080
1116 /* philosophy: 1081 /* philosophy:
… …
1157 /* all food and drink if desired */ 1122 /* all food and drink if desired */
1158 /* question: don't pick up known-poisonous stuff? */ 1123 /* question: don't pick up known-poisonous stuff? */
1159 if (op->contr->mode & PU_FOOD) 1124 if (op->contr->mode & PU_FOOD)
1160 if (tmp->type == FOOD) 1125 if (tmp->type == FOOD)
1161 { 1126 {
1162 pick_up (op, tmp); 1127 CHK_PICK_PICKUP;
1163 continue; 1128 continue;
1164 } 1129 }
1165 1130
1166 if (op->contr->mode & PU_DRINK) 1131 if (op->contr->mode & PU_DRINK)
1167 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1132 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1168 { 1133 {
1169 pick_up (op, tmp); 1134 CHK_PICK_PICKUP;
1170 continue; 1135 continue;
1171 } 1136 }
1172 1137
1173 if (op->contr->mode & PU_POTION) 1138 if (op->contr->mode & PU_POTION)
1174 if (tmp->type == POTION) 1139 if (tmp->type == POTION)
1175 { 1140 {
1176 pick_up (op, tmp); 1141 CHK_PICK_PICKUP;
1177 continue; 1142 continue;
1178 } 1143 }
1179 1144
1180 /* spellbooks, skillscrolls and normal books/scrolls */ 1145 /* spellbooks, skillscrolls and normal books/scrolls */
1181 if (op->contr->mode & PU_SPELLBOOK) 1146 if (op->contr->mode & PU_SPELLBOOK)
1182 if (tmp->type == SPELLBOOK) 1147 if (tmp->type == SPELLBOOK)
1183 { 1148 {
1184 pick_up (op, tmp); 1149 CHK_PICK_PICKUP;
1185 continue; 1150 continue;
1186 } 1151 }
1187 1152
1188 if (op->contr->mode & PU_SKILLSCROLL) 1153 if (op->contr->mode & PU_SKILLSCROLL)
1189 if (tmp->type == SKILLSCROLL) 1154 if (tmp->type == SKILLSCROLL)
1190 { 1155 {
1191 pick_up (op, tmp); 1156 CHK_PICK_PICKUP;
1192 continue; 1157 continue;
1193 } 1158 }
1194 1159
1195 if (op->contr->mode & PU_READABLES) 1160 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL) 1161 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1197 { 1162 {
1198 pick_up (op, tmp); 1163 CHK_PICK_PICKUP;
1199 continue; 1164 continue;
1200 } 1165 }
1201 1166
1202 /* wands/staves/rods/horns */ 1167 /* wands/staves/rods/horns */
1203 if (op->contr->mode & PU_MAGIC_DEVICE) 1168 if (op->contr->mode & PU_MAGIC_DEVICE)
1204 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1169 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1205 { 1170 {
1206 pick_up (op, tmp); 1171 CHK_PICK_PICKUP;
1207 continue; 1172 continue;
1208 } 1173 }
1209 1174
1210 /* pick up all magical items */ 1175 /* pick up all magical items */
1211 if (op->contr->mode & PU_MAGICAL) 1176 if (op->contr->mode & PU_MAGICAL)
1212 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1177 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1213 { 1178 {
1214 pick_up (op, tmp); 1179 CHK_PICK_PICKUP;
1215 continue; 1180 continue;
1216 } 1181 }
1217 1182
1218 if (op->contr->mode & PU_VALUABLES) 1183 if (op->contr->mode & PU_VALUABLES)
1219 { 1184 {
1220 if (tmp->type == MONEY || tmp->type == GEM) 1185 if (tmp->type == MONEY || tmp->type == GEM)
1221 { 1186 {
1222 pick_up (op, tmp); 1187 CHK_PICK_PICKUP;
1223 continue; 1188 continue;
1224 } 1189 }
1225 } 1190 }
1226 1191
1227 /* rings & amulets - talismans seems to be typed AMULET */ 1192 /* rings & amulets - talismans seems to be typed AMULET */
1228 if (op->contr->mode & PU_JEWELS) 1193 if (op->contr->mode & PU_JEWELS)
1229 if (tmp->type == RING || tmp->type == AMULET) 1194 if (tmp->type == RING || tmp->type == AMULET)
1230 { 1195 {
1231 pick_up (op, tmp); 1196 CHK_PICK_PICKUP;
1232 continue; 1197 continue;
1233 } 1198 }
1234 1199
1235 /* we don't forget dragon food */ 1200 /* we don't forget dragon food */
1236 if (op->contr->mode & PU_FLESH) 1201 if (op->contr->mode & PU_FLESH)
1237 if (tmp->type == FLESH) 1202 if (tmp->type == FLESH)
1238 { 1203 {
1239 pick_up (op, tmp); 1204 CHK_PICK_PICKUP;
1240 continue; 1205 continue;
1241 } 1206 }
1242 1207
1243 /* bows and arrows. Bows are good for selling! */ 1208 /* bows and arrows. Bows are good for selling! */
1244 if (op->contr->mode & PU_BOW) 1209 if (op->contr->mode & PU_BOW)
1245 if (tmp->type == BOW) 1210 if (tmp->type == BOW)
1246 { 1211 {
1247 pick_up (op, tmp); 1212 CHK_PICK_PICKUP;
1248 continue; 1213 continue;
1249 } 1214 }
1250 1215
1251 if (op->contr->mode & PU_ARROW) 1216 if (op->contr->mode & PU_ARROW)
1252 if (tmp->type == ARROW) 1217 if (tmp->type == ARROW)
1253 { 1218 {
1254 pick_up (op, tmp); 1219 CHK_PICK_PICKUP;
1255 continue; 1220 continue;
1256 } 1221 }
1257 1222
1258 /* all kinds of armor etc. */ 1223 /* all kinds of armor etc. */
1259 if (op->contr->mode & PU_ARMOUR) 1224 if (op->contr->mode & PU_ARMOUR)
1260 if (tmp->type == ARMOUR) 1225 if (tmp->type == ARMOUR)
1261 { 1226 {
1262 pick_up (op, tmp); 1227 CHK_PICK_PICKUP;
1263 continue; 1228 continue;
1264 } 1229 }
1265 1230
1266 if (op->contr->mode & PU_HELMET) 1231 if (op->contr->mode & PU_HELMET)
1267 if (tmp->type == HELMET) 1232 if (tmp->type == HELMET)
1268 { 1233 {
1269 pick_up (op, tmp); 1234 CHK_PICK_PICKUP;
1270 continue; 1235 continue;
1271 } 1236 }
1272 1237
1273 if (op->contr->mode & PU_SHIELD) 1238 if (op->contr->mode & PU_SHIELD)
1274 if (tmp->type == SHIELD) 1239 if (tmp->type == SHIELD)
1275 { 1240 {
1276 pick_up (op, tmp); 1241 CHK_PICK_PICKUP;
1277 continue; 1242 continue;
1278 } 1243 }
1279 1244
1280 if (op->contr->mode & PU_BOOTS) 1245 if (op->contr->mode & PU_BOOTS)
1281 if (tmp->type == BOOTS) 1246 if (tmp->type == BOOTS)
1282 { 1247 {
1283 pick_up (op, tmp); 1248 CHK_PICK_PICKUP;
1284 continue; 1249 continue;
1285 } 1250 }
1286 1251
1287 if (op->contr->mode & PU_GLOVES) 1252 if (op->contr->mode & PU_GLOVES)
1288 if (tmp->type == GLOVES) 1253 if (tmp->type == GLOVES)
1289 { 1254 {
1290 pick_up (op, tmp); 1255 CHK_PICK_PICKUP;
1291 continue; 1256 continue;
1292 } 1257 }
1293 1258
1294 if (op->contr->mode & PU_CLOAK) 1259 if (op->contr->mode & PU_CLOAK)
1295 if (tmp->type == CLOAK) 1260 if (tmp->type == CLOAK)
1296 { 1261 {
1297 pick_up (op, tmp); 1262 CHK_PICK_PICKUP;
1298 continue; 1263 continue;
1299 } 1264 }
1300 1265
1301 /* hoping to catch throwing daggers here */ 1266 /* hoping to catch throwing daggers here */
1302 if (op->contr->mode & PU_MISSILEWEAPON) 1267 if (op->contr->mode & PU_MISSILEWEAPON)
1303 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1268 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1304 { 1269 {
1305 pick_up (op, tmp); 1270 CHK_PICK_PICKUP;
1306 continue; 1271 continue;
1307 } 1272 }
1308 1273
1309 /* careful: chairs and tables are weapons! */ 1274 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON) 1275 if (op->contr->mode & PU_ALLWEAPON)
1311 { 1276 {
1312 if (tmp->type == WEAPON && tmp->name != NULL) 1277 if (tmp->type == WEAPON && tmp->name != NULL)
1313 { 1278 {
1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1279 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1280 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 { 1281 {
1317 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1318 continue; 1283 continue;
1319 } 1284 }
1320 } 1285 }
1321 1286
1322 if (tmp->type == WEAPON && tmp->name == NULL) 1287 if (tmp->type == WEAPON && tmp->name == NULL)
1323 { 1288 {
1324 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1289 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325 { 1290 {
1326 pick_up (op, tmp); 1291 CHK_PICK_PICKUP;
1327 continue; 1292 continue;
1328 } 1293 }
1329 } 1294 }
1330 } 1295 }
1331 1296
1332 /* misc stuff that's useful */ 1297 /* misc stuff that's useful */
1333 if (op->contr->mode & PU_KEY) 1298 if (op->contr->mode & PU_KEY)
1334 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1299 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1335 { 1300 {
1336 pick_up (op, tmp); 1301 CHK_PICK_PICKUP;
1337 continue; 1302 continue;
1338 } 1303 }
1339 1304
1340 /* any of the last 4 bits set means we use the ratio for value 1305 /* any of the last 4 bits set means we use the ratio for value
1341 * pickups */ 1306 * pickups */
1342 if (op->contr->mode & PU_RATIO) 1307 if (op->contr->mode & PU_RATIO)
1343 { 1308 {
1344 /* use value density to decide what else to grab */ 1309 /* use value density to decide what else to grab */
1345 /* >=7 was >= op->contr->mode */ 1310 /* >=7 was >= op->contr->mode */
1346 /* >=7 is the old standard setting. Now we take the last 4 bits 1311 /* >=7 is the old standard setting. Now we take the last 4 bits
1347 * and multiply them by 5, giving 0..15*5== 5..75 */ 1312 */
1348 wvratio = (op->contr->mode & PU_RATIO) * 5; 1313 wvratio = op->contr->mode & PU_RATIO;
1349 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1314 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1350 { 1315 {
1351 pick_up (op, tmp); 1316 CHK_PICK_PICKUP;
1352#if 0 1317#if 0
1353 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1318 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1354 if (tmp->name != NULL) 1319 if (tmp->name != NULL)
1355 { 1320 {
1356 fprintf (stderr, "%s", tmp->name); 1321 fprintf (stderr, "%s", tmp->name);
1357 } 1322 }
1358 else 1323 else
1359 fprintf (stderr, "%s", tmp->arch->name); 1324 fprintf (stderr, "%s", tmp->arch->archname);
1360 fprintf (stderr, ",%d] = ", tmp->type); 1325 fprintf (stderr, ",%d] = ", tmp->type);
1361 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1326 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362#endif 1327#endif
1363 continue; 1328 continue;
1364 } 1329 }
… …
1375 * found object is returned. 1340 * found object is returned.
1376 */ 1341 */
1377object * 1342object *
1378find_arrow (object *op, const char *type) 1343find_arrow (object *op, const char *type)
1379{ 1344{
1380 object *tmp = 0;
1381
1382 for (op = op->inv; op; op = op->below) 1345 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1346 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1347 return splay (tmp);
1348
1349 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1350 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1351 if (object *arrow = find_arrow (tmp, type))
1352 {
1353 splay (tmp);
1386 return op; 1354 return arrow;
1355 }
1387 1356
1388 return tmp; 1357 return 0;
1389} 1358}
1390 1359
1391/* 1360/*
1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1361 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1393 * against the target. A full test is not performed, simply a basic test 1362 * against the target. A full test is not performed, simply a basic test
… …
1416 } 1385 }
1417 } 1386 }
1418 else if (arrow->type == ARROW && arrow->race == type) 1387 else if (arrow->type == ARROW && arrow->race == type)
1419 { 1388 {
1420 /* allways prefer assasination/slaying */ 1389 /* allways prefer assasination/slaying */
1421 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1390 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1422 { 1391 {
1423 if (arrow->attacktype & AT_DEATH) 1392 if (arrow->attacktype & AT_DEATH)
1424 { 1393 {
1425 *better = 100; 1394 *better = 100;
1426 return arrow; 1395 return arrow;
… …
1434 else 1403 else
1435 { 1404 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1405 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1406 {
1438 attacktype = 1 << attacknum; 1407 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1408 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1409 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441 { 1410 {
1442 tmp = arrow; 1411 tmp = arrow;
1443 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1412 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444 } 1413 }
1445 } 1414 }
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1415 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1416 {
1448 tmp = arrow; 1417 tmp = arrow;
… …
1454 betterby = 1 + arrow->magic + arrow->stats.dam; 1423 betterby = 1 + arrow->magic + arrow->stats.dam;
1455 } 1424 }
1456 } 1425 }
1457 } 1426 }
1458 } 1427 }
1428
1459 if (tmp == NULL && arrow == NULL) 1429 if (tmp == NULL && arrow == NULL)
1460 return find_arrow (op, type); 1430 return find_arrow (op, type);
1461 1431
1462 *better = betterby; 1432 *better = betterby;
1463 return tmp; 1433 return tmp;
… …
1614 arrow->destroy (); 1584 arrow->destroy ();
1615 return 0; 1585 return 0;
1616 } 1586 }
1617 1587
1618 left = arrow; /* these are arrows left to the player */ 1588 left = arrow; /* these are arrows left to the player */
1619 arrow = get_split_ob (arrow, 1); 1589 arrow = arrow->split ();
1620 if (!arrow) 1590 if (!arrow)
1621 { 1591 {
1622 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1592 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1623 return 0; 1593 return 0;
1624 } 1594 }
… …
1686 1656
1687 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1688 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1689 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1690 1660
1691 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1692 m->insert (arrow, sx, sy, op); 1662 m->insert (arrow, sx, sy, op);
1693 1663
1694 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1695 move_arrow (arrow); 1665 move_arrow (arrow);
1696
1697 if (op->type == PLAYER)
1698 {
1699 if (left->destroyed ())
1700 esrv_del_item (op->contr, left->count);
1701 else
1702 esrv_send_item (op, left);
1703 }
1704 1666
1705 return 1; 1667 return 1;
1706} 1668}
1707 1669
1708/* Special fire code for players - this takes into 1670/* Special fire code for players - this takes into
… …
1774 1736
1775 if (item->type == WAND) 1737 if (item->type == WAND)
1776 { 1738 {
1777 if (item->stats.food <= 0) 1739 if (item->stats.food <= 0)
1778 { 1740 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1741 op->contr->play_sound (sound_find ("wand_poof"));
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1742 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781 1743
1782 return; 1744 return;
1783 } 1745 }
1784 } 1746 }
1785 else if (item->type == ROD || item->type == HORN) 1747 else if (item->type == ROD || item->type == HORN)
1786 { 1748 {
1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1749 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1750
1751 // using the maximum of the rods charge allows at least one spell cast
1752 // for a rod or horn, this fixes some broken rods.
1753 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1788 { 1754 {
1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1755 op->contr->play_sound (sound_find ("wand_poof"));
1790 1756
1791 if (item->type == ROD) 1757 if (item->type == ROD)
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1758 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793 else 1759 else
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1760 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1807 object *tmp; 1773 object *tmp;
1808 1774
1809 if (item->arch) 1775 if (item->arch)
1810 { 1776 {
1811 CLEAR_FLAG (item, FLAG_ANIMATE); 1777 CLEAR_FLAG (item, FLAG_ANIMATE);
1812 item->face = item->arch->clone.face; 1778 item->face = item->arch->face;
1813 item->set_speed (0); 1779 item->set_speed (0);
1814 } 1780 }
1815 1781
1816 if ((tmp = item->in_player ())) 1782 if (object *pl = item->visible_to ())
1817 esrv_update_item (UPD_ANIM, tmp, item); 1783 esrv_update_item (UPD_ANIM, pl, item);
1818 } 1784 }
1819 } 1785 }
1820 else if (item->type == ROD || item->type == HORN) 1786 else if (item->type == ROD || item->type == HORN)
1821 drain_rod_charge (item); 1787 drain_rod_charge (item);
1822 } 1788 }
… …
1983 /* If we found a key, do some extra work */ 1949 /* If we found a key, do some extra work */
1984 if (key) 1950 if (key)
1985 { 1951 {
1986 object *container = key->env; 1952 object *container = key->env;
1987 1953
1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989
1990 if (action_makes_visible (op)) 1954 if (action_makes_visible (op))
1991 make_visible (op); 1955 make_visible (op);
1992 1956
1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1957 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1994 spring_trap (door->inv, op); 1958 spring_trap (door->inv, op);
1995 1959
1996 if (door->type == DOOR) 1960 if (door->type == DOOR)
1997 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1961 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1998 else if (door->type == LOCKED_DOOR) 1962 else if (door->type == LOCKED_DOOR)
1999 { 1963 {
2000 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1964 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2001 remove_door2 (door); /* remove door without violence ;-) */ 1965 remove_door2 (door); /* remove door without violence ;-) */
2002 } 1966 }
2003 1967
2004 /* Do this after we print the message */ 1968 /* Do this after we print the message */
2005 decrease_ob (key); /* Use up one of the keys */ 1969 key->decrease (); /* Use up one of the keys */
2006 /* Need to update the weight the container the key was in */
2007 if (container != op)
2008 esrv_update_item (UPD_WEIGHT, op, container);
2009 1970
2010 return 1; /* Nothing more to do below */ 1971 return 1; /* Nothing more to do below */
2011 } 1972 }
2012 else if (door->type == LOCKED_DOOR) 1973 else if (door->type == LOCKED_DOOR)
2013 { 1974 {
2014 /* Might as well return now - no other way to open this */ 1975 /* Might as well return now - no other way to open this */
2015 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1976 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2016 return 1; 1977 return 1;
2017 } 1978 }
2018 1979
2019 return 0; 1980 return 0;
2020} 1981}
… …
2107 2068
2108 if (op->speed_left > 0.f) 2069 if (op->speed_left > 0.f)
2109 { 2070 {
2110 --op->speed_left; 2071 --op->speed_left;
2111 2072
2112 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2073 op->play_sound (sound_find ("push_player"));
2113 push_ob (mon, dir, op); 2074 push_ob (mon, dir, op);
2114 2075
2115 if (op->contr->tmp_invis || op->hide) 2076 if (op->contr->tmp_invis || op->hide)
2116 make_visible (op); 2077 make_visible (op);
2117 2078
… …
2136 { 2097 {
2137 --op->speed_left; 2098 --op->speed_left;
2138 2099
2139 if (!op->contr->braced) 2100 if (!op->contr->braced)
2140 { 2101 {
2141 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2102 op->play_sound (sound_find ("push_player"));
2142 push_ob (mon, dir, op); 2103 push_ob (mon, dir, op);
2143 } 2104 }
2144 else 2105 else
2145 new_draw_info (0, 0, op, "You withhold your attack"); 2106 op->statusmsg ("You withhold your attack");
2146 2107
2147 if (op->contr->tmp_invis || op->hide) 2108 if (op->contr->tmp_invis || op->hide)
2148 make_visible (op); 2109 make_visible (op);
2149 2110
2150 return true; 2111 return true;
… …
2194bool 2155bool
2195move_player (object *op, int dir) 2156move_player (object *op, int dir)
2196{ 2157{
2197 int pick; 2158 int pick;
2198 2159
2199 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2160 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2200 return 0; 2161 return 0;
2201 2162
2202 /* Sanity check: make sure dir is valid */ 2163 /* Sanity check: make sure dir is valid */
2203 if ((dir < 0) || (dir >= 9)) 2164 if ((dir < 0) || (dir >= 9))
2204 { 2165 {
… …
2289 return 0; 2250 return 0;
2290 2251
2291 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2252 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2292 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2253 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2293 { 2254 {
2294 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2255 op->play_sound (sound_find ("ob_evaporate"));
2295 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2256 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2296
2297 if (op->contr)
2298 esrv_del_item (op->contr, tmp->count);
2299 2257
2300 tmp->destroy (); 2258 tmp->destroy ();
2301 CLEAR_FLAG (op, FLAG_LIFESAVE); 2259 CLEAR_FLAG (op, FLAG_LIFESAVE);
2302 2260
2303 if (op->stats.hp < 0) 2261 if (op->stats.hp < 0)
… …
2316 return 0; 2274 return 0;
2317} 2275}
2318 2276
2319/* This goes throws the inventory and removes unpaid objects, and puts them 2277/* This goes throws the inventory and removes unpaid objects, and puts them
2320 * back in the map (location and map determined by values of env). This 2278 * back in the map (location and map determined by values of env). This
2321 * function will descend into containers. op is the object to start the search 2279 * function will descend into containers. op is the object to start the search
2322 * from. 2280 * from.
2323 */ 2281 */
2282static void
2283drop_unpaid_items (object *op, object *env)
2284{
2285 while (op)
2286 {
2287 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2288
2289 if (QUERY_FLAG (op, FLAG_UNPAID))
2290 op->insert_at (env);
2291 else if (op->inv)
2292 drop_unpaid_items (op->inv, env);
2293
2294 op = next;
2295 }
2296}
2297
2324void 2298void
2325remove_unpaid_objects (object *op, object *env) 2299object::drop_unpaid_items ()
2326{ 2300{
2327 while (op) 2301 if (!flag [FLAG_REMOVED])
2328 { 2302 ::drop_unpaid_items (inv, this);
2329 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2330
2331 if (QUERY_FLAG (op, FLAG_UNPAID))
2332 {
2333 if (env->type == PLAYER)
2334 esrv_del_item (env->contr, op->count);
2335
2336 op->insert_at (env);
2337 }
2338 else if (op->inv)
2339 remove_unpaid_objects (op->inv, env);
2340
2341 op = next;
2342 }
2343} 2303}
2344 2304
2345/* 2305/*
2346 * Returns pointer a static string containing gravestone text 2306 * Returns pointer a static string containing gravestone text
2347 * Moved from apply.c to player.c - player.c is what 2307 * Moved from apply.c to player.c - player.c is what
2348 * actually uses this function. player.c may not be quite the 2308 * actually uses this function. player.c may not be quite the
2349 * best, a misc file for object actions is probably better, 2309 * best, a misc file for object actions is probably better,
2350 * but there isn't one in the server directory. 2310 * but there isn't one in the server directory.
2351 */ 2311 */
2352char * 2312const char *
2353gravestone_text (object *op) 2313gravestone_text (object *op)
2354{ 2314{
2355 static char buf2[MAX_BUF]; 2315 static dynbuf_text buf;
2356 char buf[MAX_BUF];
2357 time_t now = time (NULL);
2358 2316
2359 strcpy (buf2, " R.I.P.\n\n"); 2317 buf << "---- R.I.P. ----\n\n";
2318 op->name;
2319
2360 if (op->type == PLAYER) 2320 if (op->type == PLAYER)
2361 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2321 buf << " the " << op->contr->title;
2362 else
2363 sprintf (buf, "%s\n", &op->name);
2364 2322
2365 strncat (buf2, " ", 20 - strlen (buf) / 2); 2323 buf << "\n\n";
2366 strcat (buf2, buf); 2324
2325 buf << "who was level ";
2326 buf << (sint32)op->level << "\n\n" // OO breakdown
2327 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2328
2367 if (op->type == PLAYER) 2329 if (op->type == PLAYER)
2368 sprintf (buf, "who was in level %d when killed\n", op->level); 2330 buf << "by " << op->contr->killer_name () << ".\n\n";
2369 else
2370 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2371 2331
2372 strncat (buf2, " ", 20 - strlen (buf) / 2);
2373 strcat (buf2, buf);
2374 if (op->type == PLAYER)
2375 { 2332 {
2376 sprintf (buf, "by %s.\n\n", op->contr->killer); 2333 static char buf2[128];
2377 strncat (buf2, " ", 21 - strlen (buf) / 2); 2334 time_t now = time (NULL);
2378 strcat (buf2, buf);
2379 }
2380
2381 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2335 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2382 strncat (buf2, " ", 20 - strlen (buf) / 2); 2336 buf << buf2;
2383 strcat (buf2, buf); 2337 }
2384 2338
2385 return buf2; 2339 return buf;
2386} 2340}
2387 2341
2388void 2342void
2389do_some_living (object *op) 2343do_some_living (object *op)
2390{ 2344{
… …
2442 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2396 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2443 else 2397 else
2444 { 2398 {
2445 gen_grace = op->stats.maxgrace; 2399 gen_grace = op->stats.maxgrace;
2446 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2400 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2447 }
2448
2449 /* Regenerate Spell Points */
2450 if (!op->contr->golem && --op->last_sp < 0)
2451 {
2452 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2453 if (op->stats.sp < op->stats.maxsp)
2454 {
2455 op->stats.sp++;
2456 /* dms do not consume food */
2457 if (!QUERY_FLAG (op, FLAG_WIZ))
2458 {
2459 op->stats.food--;
2460 if (op->contr->digestion < 0)
2461 op->stats.food += op->contr->digestion;
2462 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2463 op->stats.food = last_food;
2464 }
2465 }
2466
2467 if (max_sp > 1)
2468 {
2469 over_sp = (gen_sp + 10) / rate_sp;
2470 if (over_sp > 0)
2471 {
2472 if (op->stats.sp < op->stats.maxsp)
2473 {
2474 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2475
2476 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2477 op->stats.sp--;
2478
2479 if (op->stats.sp > op->stats.maxsp)
2480 op->stats.sp = op->stats.maxsp;
2481 }
2482 op->last_sp = 0;
2483 }
2484 else
2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486 }
2487 else
2488 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2489 } 2401 }
2490 2402
2491 /* Regenerate Grace */ 2403 /* Regenerate Grace */
2492 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2404 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2493 if (--op->last_grace < 0) 2405 if (--op->last_grace < 0)
… …
2514 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2426 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2515 } 2427 }
2516 /* wearing stuff doesn't detract from grace generation. */ 2428 /* wearing stuff doesn't detract from grace generation. */
2517 } 2429 }
2518 2430
2431 if (op->stats.food > 0)
2432 {
2519 /* Regenerate Hit Points */ 2433 /* Regenerate Spell Points */
2520 if (--op->last_heal < 0) 2434 if (!op->contr->golem && --op->last_sp < 0)
2521 {
2522 if (op->stats.hp < op->stats.maxhp)
2523 { 2435 {
2524 op->stats.hp++; 2436 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2525 /* dms do not consume food */ 2437
2526 if (!QUERY_FLAG (op, FLAG_WIZ)) 2438 if (op->stats.sp < op->stats.maxsp)
2527 { 2439 {
2440 op->stats.sp++;
2441
2442 /* dms do not consume food */
2443 if (!QUERY_FLAG (op, FLAG_WIZ))
2444 {
2528 op->stats.food--; 2445 op->stats.food--;
2446
2529 if (op->contr->digestion < 0) 2447 if (op->contr->digestion < 0)
2530 op->stats.food += op->contr->digestion; 2448 op->stats.food += op->contr->digestion;
2531 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2449 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2532 op->stats.food = last_food; 2450 op->stats.food = last_food;
2451 }
2533 } 2452 }
2534 }
2535 2453
2536 if (max_hp > 1) 2454 if (max_sp > 1)
2537 {
2538 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2539 if (over_hp > 0)
2540 { 2455 {
2541 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2456 over_sp = (gen_sp + 10) / rate_sp;
2457 if (over_sp > 0)
2458 {
2459 if (op->stats.sp < op->stats.maxsp)
2460 {
2461 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2462
2463 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2464 op->stats.sp--;
2465
2466 if (op->stats.sp > op->stats.maxsp)
2467 op->stats.sp = op->stats.maxsp;
2468 }
2469
2542 op->last_heal = 0; 2470 op->last_sp = 0;
2471 }
2472 else
2473 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2543 } 2474 }
2544 else 2475 else
2476 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2477 }
2478
2479 /* Regenerate Hit Points */
2480 if (--op->last_heal < 0)
2481 {
2482 if (op->stats.hp < op->stats.maxhp)
2545 { 2483 {
2546 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2484 op->stats.hp++;
2485
2486 /* dms do not consume food */
2487 if (!QUERY_FLAG (op, FLAG_WIZ))
2488 {
2489 op->stats.food--;
2490
2491 if (op->contr->digestion < 0)
2492 op->stats.food += op->contr->digestion;
2493 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2494 op->stats.food = last_food;
2495 }
2547 } 2496 }
2497
2498 if (max_hp > 1)
2499 {
2500 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501
2502 if (over_hp > 0)
2503 {
2504 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505 op->last_heal = 0;
2506 }
2507 else
2508 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2548 } 2509 }
2549 else 2510 else
2550 {
2551 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2511 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2552 } 2512 }
2553 } 2513 }
2554 2514
2555 /* Digestion */ 2515 /* Digestion */
2556 if (--op->last_eat < 0) 2516 if (--op->last_eat < 0)
2557 { 2517 {
2558 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2518 int bonus = max (0, op->contr->digestion),
2519 penalty = max (0, -op->contr->digestion);
2559 2520
2560 if (op->contr->gen_hp > 0)
2561 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2521 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2562 else
2563 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2564 2522
2565 /* dms do not consume food */ 2523 /* dms do not consume food */
2566 if (!QUERY_FLAG (op, FLAG_WIZ)) 2524 if (!QUERY_FLAG (op, FLAG_WIZ))
2567 op->stats.food--; 2525 op->stats.food--;
2568 } 2526 }
2569 2527
2570 if (op->stats.food < 0 && op->stats.hp >= 0) 2528 if (op->stats.food < 0 && op->stats.hp >= 0)
2571 { 2529 {
2572 object *tmp, *flesh = 0; 2530 object *flesh = 0;
2573 2531
2574 for (tmp = op->inv; tmp; tmp = tmp->below) 2532 for_inv_removable (op, tmp)
2575 { 2533 {
2576 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2534 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2535 continue;
2536
2537 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2577 { 2538 {
2578 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2539 op->statusmsg ("You blindly grab for a bite of food. "
2579 { 2540 "H<To prevent you from starving, you ate some random item from your backpack.>");
2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2581 manual_apply (op, tmp, 0); 2541 manual_apply (op, tmp, 0);
2542
2582 if (op->stats.food >= 0 || op->stats.hp < 0) 2543 if (op->stats.food >= 0 || op->stats.hp < 0)
2583 break; 2544 break;
2584 } 2545 }
2585 else if (tmp->type == FLESH) 2546 else if (tmp->type == FLESH)
2586 flesh = tmp; 2547 flesh = tmp;
2587 } /* End if paid for object */ 2548 }
2588 } /* end of for loop */
2589 2549
2590 /* If player is still starving, it means they don't have any food, so 2550 /* If player is still starving, it means they don't have any food, so
2591 * eat flesh instead. 2551 * eat flesh instead.
2592 */ 2552 */
2593 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2553 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2594 { 2554 {
2595 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2555 op->statusmsg ("You blindly grab for a bite of food. "
2556 "H<To prevent you from starving, you ate some random item from your backpack.>");
2596 manual_apply (op, flesh, 0); 2557 manual_apply (op, flesh, 0);
2597 } 2558 }
2559
2560 // If player is still starving, alert him!
2561 if (op->stats.food < 0)
2562 op->failmsg ("You are starving! "
2563 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2564 }
2565
2566 if (op->stats.food < 0)
2598 } 2567 {
2568 op->stats.hp += op->stats.food;
2569 op->stats.food = 0;
2599 2570
2600 while (op->stats.food < 0 && op->stats.hp >= 0) 2571 if (op->stats.hp < 0)
2601 op->stats.food++, op->stats.hp--; 2572 {
2573 op->contr->killer = archetype::get ("killer_starvation");
2574 op->contr->killer->destroy ();
2575 }
2576 }
2602 2577
2578 /* killer should be set here already */
2603 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2579 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604 kill_player (op); 2580 kill_player (op);
2605 } 2581 }
2606} 2582}
2607 2583
… …
2611 * file. 2587 * file.
2612 */ 2588 */
2613void 2589void
2614kill_player (object *op) 2590kill_player (object *op)
2615{ 2591{
2592 int x, y;
2616 char buf[MAX_BUF]; 2593 char buf[MAX_BUF];
2617 int x, y;
2618
2619 //int i;
2620 maptile *map; /* this is for resurrection */ 2594 maptile *map; /* this is for resurrection */
2621
2622 /* int z;
2623 int num_stats_lose;
2624 int lost_a_stat;
2625 int lose_this_stat;
2626 int this_stat; */
2627 int will_kill_again; 2595 int will_kill_again;
2628 archetype *at; 2596 archetype *at;
2629 object *tmp; 2597 object *tmp;
2630 2598
2631 if (save_life (op)) 2599 if (save_life (op))
2632 return; 2600 return;
2633
2634 2601
2635 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2602 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2636 * in cities ONLY!!! It is very important that this doesn't get abused. 2603 * in cities ONLY!!! It is very important that this doesn't get abused.
2637 * Look at op_on_battleground() for more info --AndreasV 2604 * Look at op_on_battleground() for more info --AndreasV
2638 */ 2605 */
… …
2654 { 2621 {
2655 tmp->destroy (); 2622 tmp->destroy ();
2656 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2623 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2657 } 2624 }
2658 2625
2659 cure_disease (op, 0); /* remove any disease */ 2626 cure_disease (op, 0, 0); /* remove any disease */
2660 op->stats.hp = op->stats.maxhp; 2627 op->stats.hp = op->stats.maxhp;
2661 if (op->stats.food <= 0) 2628 if (op->stats.food <= 0)
2662 op->stats.food = 999; 2629 op->stats.food = 999;
2663 2630
2664 /* create a bodypart-trophy to make the winner happy */ 2631 /* create a bodypart-trophy to make the winner happy */
2665 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2632 if (object *tmp = arch_to_object (archetype::find ("finger")))
2666 { 2633 {
2667 sprintf (buf, "%s's finger", &op->name); 2634 tmp->name = format ("%s's finger" , &op->name);
2668 tmp->name = buf; 2635 tmp->name_pl = format ("%s's fingers", &op->name);
2669 sprintf (buf, " This finger has been cut off %s\n"
2670 " the %s, when he was defeated at\n level %d by %s.\n",
2671 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2672 tmp->msg = buf; 2636 tmp->msg = format (
2637 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2638 &op->name, op->contr->title,
2639 (int)op->level,
2640 op->contr->killer_name ()
2641 );
2673 tmp->value = 0, tmp->type = 0; 2642 tmp->value = 0, tmp->type = 0;
2674 tmp->materialname = "organics"; 2643 tmp->materialname = "organics";
2675 tmp->insert_at (op, tmp); 2644 tmp->insert_at (op, tmp);
2676 } 2645 }
2677 2646
… …
2683 2652
2684 INVOKE_PLAYER (DEATH, op->contr); 2653 INVOKE_PLAYER (DEATH, op->contr);
2685 2654
2686 command_kill_pets (op, 0); 2655 command_kill_pets (op, 0);
2687 2656
2688 if (op->stats.food < 0) 2657 op->contr->play_sound (sound_find ("player_dies"));
2689 {
2690 sprintf (buf, "%s starved to death.", &op->name);
2691 strcpy (op->contr->killer, "starvation");
2692 }
2693 else
2694 sprintf (buf, "%s died.", &op->name);
2695
2696 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2697 2658
2698 /* save the map location for corpse, gravestone */ 2659 /* save the map location for corpse, gravestone */
2699 x = op->x; 2660 x = op->x;
2700 y = op->y; 2661 y = op->y;
2701 map = op->map; 2662 map = op->map;
… …
2808 lost_a_stat = 1; 2769 lost_a_stat = 1;
2809 } 2770 }
2810 } 2771 }
2811 } 2772 }
2812 } 2773 }
2774
2813 /* If no stat lost, tell the player. */ 2775 /* If no stat lost, tell the player. */
2814 if (!lost_a_stat) 2776 if (!lost_a_stat)
2815 { 2777 {
2816 /* determine_god() seems to not work sometimes... why is this? 2778 /* determine_god() seems to not work sometimes... why is this?
2817 Should I be using something else? GD */ 2779 Should I be using something else? GD */
… …
2821 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2783 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2822 else 2784 else
2823 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2824 } 2786 }
2825#else 2787#else
2826 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2788 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2827#endif 2789#endif
2828 2790
2829 /* Put a gravestone up where the character 'almost' died. List the 2791 /* Put a gravestone up where the character 'almost' died. List the
2830 * exp loss on the stone. 2792 * exp loss on the stone.
2831 */ 2793 */
2832 tmp = arch_to_object (archetype::find ("gravestone")); 2794 tmp = arch_to_object (archetype::find ("gravestone"));
2833 sprintf (buf, "%s's gravestone", &op->name); 2795 tmp->name = format ("%s's gravestone", &op->name);
2834 tmp->name = buf; 2796 tmp->name_pl = format ("%s's gravestones", &op->name);
2835 sprintf (buf, "%s's gravestones", &op->name);
2836 tmp->name_pl = buf;
2837 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2797 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2838 tmp->msg = buf;
2839 tmp->x = op->x, tmp->y = op->y; 2798 tmp->x = op->x, tmp->y = op->y;
2840 insert_ob_in_map (tmp, op->map, NULL, 0); 2799 insert_ob_in_map (tmp, op->map, NULL, 0);
2841 2800
2842 /**************************************/ 2801 /**************************************/
2843 /* */ 2802 /* */
… …
2864 { 2823 {
2865 tmp->destroy (); 2824 tmp->destroy ();
2866 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2825 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2867 } 2826 }
2868 2827
2869 cure_disease (op, 0); /* remove any disease */ 2828 cure_disease (op, 0, 0); /* remove any disease */
2829
2830 // remove all spell effects that are active
2831 // to avoid long-term effects such as word-of-recall
2832 for (object *item = op->inv; item; )
2833 {
2834 object *next = item->below;
2835
2836 if (item->type == SPELL_EFFECT && item->active)
2837 item->destroy ();
2838
2839 item = next;
2840 }
2870 2841
2871 /*add_exp(op, (op->stats.exp * -0.20)); */ 2842 /*add_exp(op, (op->stats.exp * -0.20)); */
2872 apply_death_exp_penalty (op); 2843 apply_death_exp_penalty (op);
2844
2873 if (op->stats.food < 100) 2845 if (op->stats.food < 100)
2874 op->stats.food = 900; 2846 op->stats.food = 900;
2847
2875 op->stats.hp = op->stats.maxhp; 2848 op->stats.hp = op->stats.maxhp;
2876 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2849 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2877 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2850 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2878 2851
2879 /* 2852 /*
2880 * Check to see if the player has any unpaid items. If so, remove them 2853 * Check to see if the player has any unpaid items. If so, remove them
2881 * and put them back in the map. 2854 * and put them back in the map.
2882 */ 2855 */
2883 remove_unpaid_objects (op->inv, op); 2856 op->drop_unpaid_items ();
2884 2857
2885 /****************************************/ 2858 /****************************************/
2886 /* */ 2859 /* */
2887 /* Move player to his current respawn- */ 2860 /* Move player to his current respawn- */
2888 /* position (usually last savebed) */ 2861 /* position (usually last savebed) */
… …
2947 2920
2948 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2921 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2949 { 2922 {
2950 if (tmp->nrof > 1) 2923 if (tmp->nrof > 1)
2951 { 2924 {
2952 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2925 tmp->decrease (rndm (1, tmp->nrof - 1));
2953 tmp2->destroy ();
2954 insert_ob_in_map (tmp, op->map, NULL, 0); 2926 insert_ob_in_map (tmp, op->map, NULL, 0);
2955 } 2927 }
2956 else 2928 else
2957 tmp->destroy (); 2929 tmp->destroy ();
2958 } 2930 }
… …
2969void 2941void
2970fix_weight (void) 2942fix_weight (void)
2971{ 2943{
2972 for_all_players (pl) 2944 for_all_players (pl)
2973 { 2945 {
2974 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2946 sint32 old = pl->ob->carrying;
2975 2947
2976 if (old == sum) 2948 pl->ob->update_weight ();
2977 continue; 2949
2950 if (old != pl->ob->carrying)
2951 {
2978 pl->ob->update_stats (); 2952 pl->ob->update_stats ();
2979 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2953 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2954 }
2980 } 2955 }
2981} 2956}
2982 2957
2983void 2958void
2984fix_luck (void) 2959fix_luck (void)
… …
3028void 3003void
3029make_visible (object *op) 3004make_visible (object *op)
3030{ 3005{
3031 op->hide = 0; 3006 op->hide = 0;
3032 op->invisible = 0; 3007 op->invisible = 0;
3008
3033 if (op->type == PLAYER) 3009 if (op->type == PLAYER)
3034 { 3010 {
3035 op->contr->tmp_invis = 0; 3011 op->contr->tmp_invis = 0;
3036 op->contr->invis_race = 0; 3012 op->contr->invis_race = 0;
3037 } 3013 }
… …
3040} 3016}
3041 3017
3042int 3018int
3043is_true_undead (object *op) 3019is_true_undead (object *op)
3044{ 3020{
3045 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3021 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3046 return 1; 3022 return 1;
3047 3023
3048 return 0; 3024 return 0;
3049} 3025}
3050 3026
3051/* look at the surrounding terrain to determine 3027/* look at the surrounding terrain to determine
3052 * the hideability of this object. Positive levels 3028 * the hideability of this object. Positive levels
3053 * indicate greater hideability. 3029 * indicate greater hideability.
3054 */ 3030 */
3055
3056int 3031int
3057hideability (object *ob) 3032hideability (object *ob)
3058{ 3033{
3059 int i, level = 0, mflag; 3034 int i, level = 0, mflag;
3060 sint16 x, y; 3035 sint16 x, y;
… …
3070 * as bad as carrying a light on a pitch dark map */ 3045 * as bad as carrying a light on a pitch dark map */
3071 if (has_carried_lights (ob)) 3046 if (has_carried_lights (ob))
3072 level = -(10 + (2 * ob->map->darkness)); 3047 level = -(10 + (2 * ob->map->darkness));
3073 3048
3074 /* scan through all nearby squares for terrain to hide in */ 3049 /* scan through all nearby squares for terrain to hide in */
3075 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3050 for (i = 0, x = ob->x, y = ob->y;
3051 i <= SIZEOFFREE1;
3052 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3076 { 3053 {
3077 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3054 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3078 if (mflag & P_OUT_OF_MAP) 3055 if (mflag & P_OUT_OF_MAP)
3079 {
3080 continue; 3056 continue;
3081 } 3057
3082 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3058 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3083 level += 2; 3059 level += 2;
3084 else /* open terrain! */ 3060 else /* open terrain! */
3085 level -= 1; 3061 level -= 1;
3086 } 3062 }
… …
3097 * spot (surrounded by clear terrain in broad daylight). -b.t. 3073 * spot (surrounded by clear terrain in broad daylight). -b.t.
3098 */ 3074 */
3099void 3075void
3100do_hidden_move (object *op) 3076do_hidden_move (object *op)
3101{ 3077{
3102 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3078 int hide = 0;
3103 object *skop;
3104 3079
3105 if (!op || !op->map) 3080 if (!op || !op->map)
3106 return; 3081 return;
3107 3082
3108 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3083 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3084 int num = random_roll (0, 19, op, PREFER_LOW);
3109 3085
3110 /* its *extremely* hard to run and sneak/hide at the same time! */ 3086 /* its *extremely* hard to run and sneak/hide at the same time! */
3111 if (op->type == PLAYER && op->contr->run_on) 3087 if (op->type == PLAYER && op->contr->run_on)
3112 if (!skop || num >= skop->level) 3088 if (!skop || num >= skop->level)
3113 { 3089 {
… …
3123 num -= hide; 3099 num -= hide;
3124 3100
3125 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3101 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3126 { 3102 {
3127 make_visible (op); 3103 make_visible (op);
3104
3128 if (op->type == PLAYER) 3105 if (op->type == PLAYER)
3129 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3106 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3130 } 3107 }
3131 else if (op->type == PLAYER && skop) 3108 else if (op->type == PLAYER && skop)
3132 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3109 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3185 * object op. This function works fine for monsters, 3162 * object op. This function works fine for monsters,
3186 * but we dont worry if the object isnt the top one in 3163 * but we dont worry if the object isnt the top one in
3187 * a pile (say a coin under a table would return "viewable" 3164 * a pile (say a coin under a table would return "viewable"
3188 * by this routine). Another question, should we be 3165 * by this routine). Another question, should we be
3189 * concerned with the direction the player is looking 3166 * concerned with the direction the player is looking
3190 * in? Realistically, most of use cant see stuff behind 3167 * in? Realistically, most of us can't see stuff behind
3191 * our backs...on the other hand, does the "facing" direction 3168 * our backs...on the other hand, does the "facing" direction
3192 * imply the way your head, or body is facing? Its possible 3169 * imply the way your head, or body is facing? It's possible
3193 * for them to differ. Sigh, this fctn could get a bit more complex. 3170 * for them to differ. Sigh, this fctn could get a bit more complex.
3194 * -b.t. 3171 * -b.t.
3195 * This function is now map tiling safe. 3172 * This function is now map tiling safe.
3196 */ 3173 */
3197
3198int 3174int
3199player_can_view (object *pl, object *op) 3175player_can_view (object *pl, object *op)
3200{ 3176{
3201 rv_vector rv; 3177 rv_vector rv;
3202 int dx, dy; 3178 int dx, dy;
… …
3214 3190
3215 get_rangevector (pl, op, &rv, 0x1); 3191 get_rangevector (pl, op, &rv, 0x1);
3216 3192
3217 /* starting with the 'head' part, lets loop 3193 /* starting with the 'head' part, lets loop
3218 * through the object and find if it has any 3194 * through the object and find if it has any
3219 * part that is in the los array but isnt on 3195 * part that is in the los array but isn't on
3220 * a blocked los square. 3196 * a blocked los square.
3221 * we use the archetype to figure out offsets. 3197 * we use the archetype to figure out offsets.
3222 */ 3198 */
3223 while (op) 3199 while (op)
3224 { 3200 {
3225 dx = rv.distance_x + op->arch->clone.x; 3201 dx = rv.distance_x + op->arch->x;
3226 dy = rv.distance_y + op->arch->clone.y; 3202 dy = rv.distance_y + op->arch->y;
3227 3203
3228 /* only the viewable area the player sees is updated by LOS 3204 /* only the viewable area the player sees is updated by LOS
3229 * code, so we need to restrict ourselves to that range of values 3205 * code, so we need to restrict ourselves to that range of values
3230 * for any meaningful values. 3206 * for any meaningful values.
3231 */ 3207 */
3232 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3208 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3233 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3209 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3234 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3210 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3235 return 1; 3211 return 1;
3212
3236 op = op->more; 3213 op = op->more;
3237 } 3214 }
3215
3238 return 0; 3216 return 0;
3239} 3217}
3240 3218
3241/* routine for both players and monsters. We call this when 3219/* routine for both players and monsters. We call this when
3242 * there is a possibility for our action distrubing our hiding 3220 * there is a possibility for our action distrubing our hiding
… …
3245 * return 0. 3223 * return 0.
3246 */ 3224 */
3247int 3225int
3248action_makes_visible (object *op) 3226action_makes_visible (object *op)
3249{ 3227{
3250
3251 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3228 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3252 { 3229 {
3253 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3230 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3254 return 0; 3231 return 0;
3255 3232
… …
3261 { 3238 {
3262 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3239 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3263 return 1; 3240 return 1;
3264 } 3241 }
3265 } 3242 }
3243
3266 return 0; 3244 return 0;
3267} 3245}
3268 3246
3269/* op_on_battleground - checks if the given object op (usually 3247/* op_on_battleground - checks if the given object op (usually
3270 * a player) is standing on a valid battleground-tile, 3248 * a player) is standing on a valid battleground-tile,
… …
3275 * Default is to do the same as before, so only people wanting to have different points need worry about this 3253 * Default is to do the same as before, so only people wanting to have different points need worry about this
3276 */ 3254 */
3277int 3255int
3278op_on_battleground (object *op, int *x, int *y) 3256op_on_battleground (object *op, int *x, int *y)
3279{ 3257{
3280 object *tmp;
3281
3282 /* A battleground-tile needs the following attributes to be valid: 3258 /* A battleground-tile needs the following attributes to be valid:
3283 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3259 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3284 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3260 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3285 * and the exit-coordinates sp/hp must both be > 0. 3261 * and the exit-coordinates sp/hp must both be > 0.
3286 * => The intention here is to prevent abuse of the battleground- 3262 * => The intention here is to prevent abuse of the battleground-
3287 * feature (like pickable or hidden battleground tiles). */ 3263 * feature (like pickable or hidden battleground tiles). */
3288 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3264 for (object *tmp = op->below; tmp; tmp = tmp->below)
3289 { 3265 {
3290 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3266 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3291 { 3267 {
3292 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3268 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3293 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3269 && tmp->type == BATTLEGROUND
3270 && tmp->name == shstr_battleground
3271 && EXIT_X (tmp) && EXIT_Y (tmp))
3294 { 3272 {
3295 /*before we assign the exit, check if this is a teambattle */ 3273 /* before we assign the exit, check if this is a teambattle */
3296 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3274 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3297 { 3275 {
3298 object *invtmp;
3299
3300 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3276 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3301 { 3277 {
3302 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3278 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3303 { 3279 {
3304 if (x != NULL && y != NULL) 3280 if (x && y)
3305 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3281 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3282
3306 return 1; 3283 return 1;
3307 } 3284 }
3308 } 3285 }
3309 } 3286 }
3287
3310 if (x != NULL && y != NULL) 3288 if (x && y)
3311 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3289 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3290
3312 return 1; 3291 return 1;
3313 } 3292 }
3314 } 3293 }
3315 } 3294 }
3295
3316 /* If we got here, did not find a battleground */ 3296 /* If we got here, did not find a battleground */
3317 return 0; 3297 return 0;
3318} 3298}
3319 3299
3320/* 3300/*
… …
3336 char buf[MAX_BUF]; /* tmp. string buffer */ 3316 char buf[MAX_BUF]; /* tmp. string buffer */
3337 int i = 0, j = 0; 3317 int i = 0, j = 0;
3338 3318
3339 /* get the appropriate treasurelist */ 3319 /* get the appropriate treasurelist */
3340 if (atnr == ATNR_FIRE) 3320 if (atnr == ATNR_FIRE)
3341 trlist = treasurelist::find ("dragon_ability_fire"); 3321 trlist = treasurelist::find (shstr_dragon_ability_fire);
3342 else if (atnr == ATNR_COLD) 3322 else if (atnr == ATNR_COLD)
3343 trlist = treasurelist::find ("dragon_ability_cold"); 3323 trlist = treasurelist::find (shstr_dragon_ability_cold);
3344 else if (atnr == ATNR_ELECTRICITY) 3324 else if (atnr == ATNR_ELECTRICITY)
3345 trlist = treasurelist::find ("dragon_ability_elec"); 3325 trlist = treasurelist::find (shstr_dragon_ability_elec);
3346 else if (atnr == ATNR_POISON) 3326 else if (atnr == ATNR_POISON)
3347 trlist = treasurelist::find ("dragon_ability_poison"); 3327 trlist = treasurelist::find (shstr_dragon_ability_poison);
3348 3328
3349 if (trlist == NULL || who->type != PLAYER) 3329 if (trlist == NULL || who->type != PLAYER)
3350 return; 3330 return;
3351 3331
3352 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3332 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3356 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3336 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3357 return; 3337 return;
3358 } 3338 }
3359 3339
3360 /* everything seems okay - now bring on the gift: */ 3340 /* everything seems okay - now bring on the gift: */
3361 item = &(tr->item->clone); 3341 item = tr->item;
3362 3342
3363 if (item->type == SPELL) 3343 if (item->type == SPELL)
3364 { 3344 {
3365 if (check_spell_known (who, item->name)) 3345 if (check_spell_known (who, item->name))
3366 return; 3346 return;
… …
3425 { 3405 {
3426 /* forces in the treasurelist can alter the player's stats */ 3406 /* forces in the treasurelist can alter the player's stats */
3427 object *skin; 3407 object *skin;
3428 3408
3429 /* first get the dragon skin force */ 3409 /* first get the dragon skin force */
3430 shstr_cmp dragon_skin_force ("dragon_skin_force");
3431 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3410 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3432 ; 3411 ;
3433 3412
3434 if (!skin) 3413 if (!skin)
3435 return; 3414 return;
3436 3415
… …
3471 else 3450 else
3472 { 3451 {
3473 /* generate misc. treasure */ 3452 /* generate misc. treasure */
3474 tmp = arch_to_object (tr->item); 3453 tmp = arch_to_object (tr->item);
3475 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3454 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3476 tmp = insert_ob_in_ob (tmp, who); 3455 who->insert (tmp);
3477 if (who->type == PLAYER)
3478 esrv_send_item (who, tmp);
3479 } 3456 }
3480} 3457}
3481 3458
3482/** 3459/**
3483 * Unready an object for a player. This function does nothing if the object was 3460 * Unready an object for a player. This function does nothing if the object was
… …
3512 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3489 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3513 return 0; 3490 return 0;
3514 3491
3515 return 100 - blocked_los [x][y]; 3492 return 100 - blocked_los [x][y];
3516} 3493}
3494
3495void
3496player::infobox (const char *title, const char *msg, int color)
3497{
3498 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3499}
3500
3501void
3502player::statusmsg (const char *msg, int color)
3503{
3504 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3505}
3506
3507void
3508player::failmsg (const char *msg, int color)
3509{
3510 play_sound (sound_find ("generic_failure"));
3511 statusmsg (msg, color);
3512}
3513

Diff Legend

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