ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.137 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.169 by root, Sun Sep 7 21:31:23 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
53 * subtype 5: arch or race 53 * subtype 5: arch or race
54 * subtype 7: all three 54 * subtype 7: all three
55 */ 55 */
56 if (op->subtype) 56 if (op->subtype)
57 { 57 {
58 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
61 } 61 }
62 else 62 else
63 { 63 {
64 arch_flag = 1; 64 arch_flag = 1;
65 name_flag = 1; 65 name_flag = 1;
… …
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
… …
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 134 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 136 buf << "The item has a story:\r" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 if (shstr yield = tmp->kv (shstr_on_use_yield))
166 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167 yield = get_ob_key_value (tmp, "on_use_yield");
168 if (yield != NULL)
169 {
170 object *drop = get_archetype (yield);
171
172 if (tmp->env)
173 {
174 drop = insert_ob_in_ob (drop, tmp->env);
175 if (tmp->env->type == PLAYER)
176 esrv_send_item (tmp->env, drop);
177 }
178 else
179 {
180 drop->x = tmp->x;
181 drop->y = tmp->y;
182 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
183 }
184 }
185} 167}
186 168
187/** 169/**
188 * Handles applying a potion. 170 * Handles applying a potion.
189 */ 171 */
… …
217 199
218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 200 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
219 { 201 {
220 op->drain_stat (); 202 op->drain_stat ();
221 op->update_stats (); 203 op->update_stats ();
222 decrease_ob (tmp); 204 tmp->decrease ();
223 return 1; 205 return 1;
224 } 206 }
225 207
226 if (!(at = archetype::find (ARCH_DEPLETION))) 208 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 209 {
228 LOG (llevError, "Could not find archetype depletion\n"); 210 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 211 return 0;
230 } 212 }
213
231 depl = present_arch_in_ob (at, op); 214 depl = present_arch_in_ob (at, op);
232 215
233 if (depl) 216 if (depl)
234 { 217 {
235 for (i = 0; i < NUM_STATS; i++) 218 for (i = 0; i < NUM_STATS; i++)
… …
240 op->update_stats (); 223 op->update_stats ();
241 } 224 }
242 else 225 else
243 op->statusmsg ("Your potion had no effect."); 226 op->statusmsg ("Your potion had no effect.");
244 227
245 decrease_ob (tmp); 228 tmp->decrease ();
246 return 1; 229 return 1;
247 } 230 }
248 231
249 /* improvement potion - only for players */ 232 /* improvement potion - only for players */
250 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
… …
318 } 301 }
319 else 302 else
320 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE); 303 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
321 } 304 }
322 305
323 decrease_ob (tmp); 306 tmp->decrease ();
324 return 1; 307 return 1;
325 } 308 }
326 309
327 310
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 311 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
347 insert_ob_in_map (fball, op->map, NULL, 0); 330 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 331 }
349 else 332 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 333 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 334
352 decrease_ob (tmp); 335 tmp->decrease ();
353 336
354 /* if youre dead, no point in doing this... */ 337 /* if youre dead, no point in doing this... */
355 if (!QUERY_FLAG (op, FLAG_REMOVED)) 338 if (!QUERY_FLAG (op, FLAG_REMOVED))
356 op->update_stats (); 339 op->update_stats ();
357 340
… …
388 force->speed_left = -1; 371 force->speed_left = -1;
389 force = insert_ob_in_ob (force, op); 372 force = insert_ob_in_ob (force, op);
390 CLEAR_FLAG (tmp, FLAG_APPLIED); 373 CLEAR_FLAG (tmp, FLAG_APPLIED);
391 SET_FLAG (force, FLAG_APPLIED); 374 SET_FLAG (force, FLAG_APPLIED);
392 change_abil (op, force); 375 change_abil (op, force);
393 decrease_ob (tmp); 376 tmp->decrease ();
394 return 1; 377 return 1;
395 } 378 }
396 379
397 /* Only thing left are the stat potions */ 380 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 381 if (op->type == PLAYER)
… …
411 * stat will not be raised by them. fix_player just clears 394 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 395 * up all the stats.
413 */ 396 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 397 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 398 op->update_stats ();
416 decrease_ob (tmp); 399 tmp->decrease ();
417 return 1; 400 return 1;
418} 401}
419 402
420/**************************************************************************** 403/****************************************************************************
421 * Weapon improvement code follows 404 * Weapon improvement code follows
… …
468 { 451 {
469 if (strcmp (op->arch->archname, item) == 0) 452 if (strcmp (op->arch->archname, item) == 0)
470 { 453 {
471 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
472 { 455 {
473 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
474 return; 457 return;
475 } 458 }
476 else 459 else
477 { 460 {
478 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
479 nrof -= op->nrof; 462 nrof -= op->nrof;
480 } 463 }
481 464
482 op = prev; 465 op = prev;
483 } 466 }
… …
568static int 551static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 552improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 553{
571 stat += sacrifice_count; 554 stat += sacrifice_count;
572 weapon->last_eat++; 555 weapon->last_eat++;
573 decrease_ob (improver); 556 improver->decrease ();
574 557
575 /* So it updates the players stats and the window */ 558 /* So it updates the players stats and the window */
576 op->update_stats (); 559 op->update_stats ();
577 560
578 op->statusmsg (format ( 561 op->statusmsg (format (
… …
625 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
627 { 610 {
628 op->failmsg ("You cannot prepare magic weapons. " 611 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, " 612 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>"); 613 "speed or ac, or has other protections.>");
631 return 0; 614 return 0;
632 } 615 }
633 616
634 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
646 629
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 633 slot at once! */
651 decrease_ob (improver); 634 improver->decrease ();
652 weapon->last_eat = 0; 635 weapon->last_eat = 0;
653 return 1; 636 return 1;
654} 637}
655
656 638
657/** 639/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 640 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 641 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 642 * Returns 0 if it was not able to work for some reason.
… …
704 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 687 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 688 weapon->last_eat++;
707 689
708 weapon->item_power++; 690 weapon->item_power++;
709 decrease_ob (improver); 691 improver->decrease ();
710 return 1; 692 return 1;
711 } 693 }
712 694
713 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 696 {
… …
718 weapon->weight = 1; 700 weapon->weight = 1;
719 701
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 702 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 703 weapon->last_eat++;
722 weapon->item_power++; 704 weapon->item_power++;
723 decrease_ob (improver); 705 improver->decrease ();
724 return 1; 706 return 1;
725 } 707 }
708
726 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 710 {
728 weapon->magic++; 711 weapon->magic++;
729 weapon->last_eat++; 712 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 714 improver->decrease ();
732 weapon->item_power++; 715 weapon->item_power++;
733 return 1; 716 return 1;
734 } 717 }
735 718
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 769 return 0;
787 } 770 }
788 771
789 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
790 if (!otmp) 774 if (!otmp)
791 { 775 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 776 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 777 return 0;
794 } 778 }
… …
836 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
837 { 821 {
838 op->failmsg ("This armour can not be enchanted any further!"); 822 op->failmsg ("This armour can not be enchanted any further!");
839 return 0; 823 return 0;
840 } 824 }
825
841 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 826 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
842 * etc), so take the easy way out and don't worry about it. 827 * etc), so take the easy way out and don't worry about it.
843 * Note - maybe add scrolls which make the random artifact versions (eg, armour 828 * Note - maybe add scrolls which make the random artifact versions (eg, armour
844 * of gnarg and what not?) 829 * of gnarg and what not?)
845 */ 830 */
… …
847 { 832 {
848 op->failmsg ("This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
849 return 0; 834 return 0;
850 } 835 }
851 836
852 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
853 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
854 */ 839 */
855 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
856 tmp = get_split_ob (armour, armour->nrof - 1);
857 else
858 tmp = NULL;
859 841
860 armour->magic++; 842 armour->magic++;
861 843
862 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
863 { 845 {
… …
900 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 882 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
901 883
902 if (op->type == PLAYER) 884 if (op->type == PLAYER)
903 { 885 {
904 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
905 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
906 op->update_stats (); 889 op->update_stats ();
907 } 890 }
908 891
909 decrease_ob (improver); 892 improver->decrease ();
910 893
911 if (tmp) 894 if (tmp)
912 { 895 op->insert (tmp);
913 insert_ob_in_ob (tmp, op);
914 esrv_send_item (op, tmp);
915 }
916 896
917 return 1; 897 return 1;
918} 898}
919 899
920/* 900/*
921 * convert_item() returns 1 if anything was converted, 0 if the item was not 901 * convert_item() returns 1 if anything was converted, 0 if the item was not
922 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
923 */ 903 *
924#define CONV_FROM(xyz) xyz->slaying
925#define CONV_TO(xyz) xyz->other_arch
926#define CONV_NR(xyz) xyz->stats.sp
927#define CONV_NEED(xyz) xyz->stats.food
928
929/* Takes one items and makes another. 904 * Takes one type of items and makes another.
930 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
931 * item is the object that triggered the converter - if it is not 906 * item is the object that triggered the converter - if it is not
932 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
933 */ 908 */
934int 909static int
935convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
936{ 911{
937 int nr = 0;
938 uint32 price_in; 912 sint64 nr, price_in;
913
914 if (item->flag [FLAG_UNPAID])
915 return 0;
916
917 shstr conv_from = converter->slaying;
918 archetype *conv_to = converter->other_arch;
919 sint64 need = converter->stats.food;
920 sint64 give = converter->stats.sp;
939 921
940 /* We make some assumptions - we assume if it takes money as it type, 922 /* We make some assumptions - we assume if it takes money as it type,
941 * it wants some amount. We don't make change (ie, if something costs 923 * it wants some amount. We don't make change (ie, if something costs
942 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
943 */ 925 */
944 if (CONV_FROM (converter) == shstr_money) 926 if (conv_from == shstr_money)
945 { 927 {
946 if (item->type != MONEY) 928 if (item->type != MONEY)
947 return 0; 929 return 0;
948 930
949 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
950 if (!nr) 932 if (!nr)
951 return 0; 933 return 0;
952 934
953 converter->play_sound (sound_find ("shop_buy")); 935 converter->play_sound (sound_find ("shop_buy"));
954 936
955 int cost = nr * CONV_NEED (converter) / item->value; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
956 /* take into account rounding errors */
957 if (nr * CONV_NEED (converter) % item->value)
958 cost++;
959 938
960 decrease_ob_nr (item, cost); 939 item->decrease (cost);
961 940
962 price_in = cost * item->value; 941 price_in = cost * item->value;
963 } 942 }
964 else 943 else
965 { 944 {
966 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
967 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
968 return 0; 948 return 0;
969 949
970 converter->play_sound (sound_find ("convert_item")); 950 converter->play_sound (sound_find ("convert_item"));
971 951
972 if (CONV_NEED (converter)) 952 if (need)
973 { 953 {
974 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
975 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
976 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
977 } 957 }
978 else 958 else
979 { 959 {
980 price_in = item->value; 960 price_in = item->value;
981 item->destroy (); 961 item->destroy ();
… …
992 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
993 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 973 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
994 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
995 ob_to_copy = ob; 975 ob_to_copy = ob;
996 976
997 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
998 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
999 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1000 } 980 }
1001 else 981 else
1002 { 982 {
1003 if (converter->other_arch == NULL) 983 if (!conv_to)
1004 { 984 {
1005 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
1006 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
1007 return -1; 987 return -1;
1008 } 988 }
1009 989
1010 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
1011 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1012 } 992 }
1013 993
1014 if (CONV_NR (converter)) 994 if (give)
1015 item->nrof = CONV_NR (converter); 995 item->nrof = give;
1016 996
1017 if (nr) 997 if (nr)
1018 item->nrof *= nr; 998 item->nrof *= nr;
1019 999
1020 if (is_in_shop (converter)) 1000 if (is_in_shop (converter))
1021 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1022 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1023 { 1003 {
1024 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1025 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1026 /** 1006 /**
1027 * elmex: we are going to let the game continue, as the mapcreator 1007 * elmex: we are going to let the game continue, as the mapcreator
1028 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1029 */ 1009 */
1030 } 1010 }
1031 1011
1032 SET_FLAG (item, FLAG_IDENTIFIED); 1012 // elmex: only identify if we need to, for example so that generated money doesn't
1013 // get an 'identified' flag so easily.
1014 if (need_identify (item))
1015 identify (item);
1016
1033 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1017 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1034 return 1; 1018 return 1;
1035} 1019}
1036 1020
1037/** 1021/**
… …
1276 * Handles applying a sign. 1260 * Handles applying a sign.
1277 */ 1261 */
1278static void 1262static void
1279apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1280{ 1264{
1281 readable_message_type *msgType; 1265 if (sign->has_dialogue ())
1266 {
1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268 return;
1269 }
1282 1270
1283 if (!sign->msg) 1271 if (!sign->msg)
1284 { 1272 {
1285 op->statusmsg ("Nothing is written on it."); 1273 op->statusmsg ("Nothing is written on it.");
1286 return; 1274 return;
… …
1321 1309
1322 if (ns->can_msg) 1310 if (ns->can_msg)
1323 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1324 else 1312 else
1325 { 1313 {
1326 msgType = get_readable_message_type (sign); 1314 readable_message_type *msgType = get_readable_message_type (sign);
1327 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); 1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1328 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg); 1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1329 } 1317 }
1330 } 1318 }
1319}
1320
1321static void
1322move_apply_hole (object *trap, object *victim)
1323{
1324 /* Hole not open? */
1325 if (trap->stats.wc > 0)
1326 return;
1327
1328 /* Is this a multipart monster and not the head? If so, return.
1329 * Processing will happen if the head runs into the pit
1330 */
1331 if (victim->head)
1332 return;
1333
1334 // now find all possible locations and randomly pick one
1335 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1336 trap->range >= 3 ? SIZEOFFREE3 + 1
1337 : trap->range >= 2 ? SIZEOFFREE2 + 1
1338 : trap->range >= 1 ? SIZEOFFREE1 + 1
1339 : SIZEOFFREE0 + 1);
1340
1341 if (dir < 0)
1342 return;
1343
1344 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1345 victim->statusmsg ("You fall through the hole!", NDI_RED);
1346
1347 transfer_ob (victim,
1348 EXIT_X (trap) + freearr_x[dir],
1349 EXIT_Y (trap) + freearr_y[dir],
1350 0, victim);
1331} 1351}
1332 1352
1333/** 1353/**
1334 * 'victim' moves onto 'trap' 1354 * 'victim' moves onto 'trap'
1335 * 'victim' leaves 'trap' 1355 * 'victim' leaves 'trap'
… …
1447 1467
1448 if (!trap->value) 1468 if (!trap->value)
1449 { 1469 {
1450 int tot; 1470 int tot;
1451 1471
1452 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1472 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1453 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1473 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1454 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1474 tot += ab->head_ ()->total_weight ();
1455 1475
1456 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1476 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1457 goto leave; 1477 goto leave;
1458 1478
1459 SET_ANIMATION (trap, trap->value); 1479 SET_ANIMATION (trap, trap->value);
… …
1484 1504
1485 case CONVERTER: 1505 case CONVERTER:
1486 if (convert_item (victim, trap) < 0) 1506 if (convert_item (victim, trap) < 0)
1487 { 1507 {
1488 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1508 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1489 get_archetype ("burnout")->insert_at (trap, trap); 1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1490 } 1510 }
1491 1511
1492 goto leave; 1512 goto leave;
1493 1513
1494 case TRIGGER_BUTTON: 1514 case TRIGGER_BUTTON:
… …
1504 case CHECK_INV: 1524 case CHECK_INV:
1505 check_inv (victim, trap); 1525 check_inv (victim, trap);
1506 goto leave; 1526 goto leave;
1507 1527
1508 case HOLE: 1528 case HOLE:
1509 /* Hole not open? */ 1529 move_apply_hole (trap, victim);
1510 if (trap->stats.wc > 0)
1511 goto leave;
1512
1513 /* Is this a multipart monster and not the head? If so, return.
1514 * Processing will happen if the head runs into the pit
1515 */
1516 if (victim->head)
1517 goto leave;
1518
1519 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1520 victim->statusmsg ("You fall through the hole!", NDI_RED);
1521 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1522 goto leave; 1530 goto leave;
1523 1531
1524 case EXIT: 1532 case EXIT:
1525 if (victim->type == PLAYER && EXIT_PATH (trap)) 1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1526 { 1534 {
… …
1636 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1644 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1637 { 1645 {
1638 /*exp_gain *= 2; because they just identified it too */ 1646 /*exp_gain *= 2; because they just identified it too */
1639 SET_FLAG (tmp, FLAG_IDENTIFIED); 1647 SET_FLAG (tmp, FLAG_IDENTIFIED);
1640 1648
1641 /* If in a container, update how it looks */ 1649 if (object *pl = tmp->visible_to ())
1642 if (tmp->env)
1643 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1644 else
1645 op->contr->ns->floorbox_update ();
1646 } 1651 }
1647 1652
1648 change_exp (op, exp_gain, skill_ob->skill, 0); 1653 change_exp (op, exp_gain, skill_ob->skill, 0);
1649 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1654 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1650 } 1655 }
… …
1663 op->play_sound (sound_find ("generic_fail")); 1668 op->play_sound (sound_find ("generic_fail"));
1664 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1669 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1665 break; 1670 break;
1666 1671
1667 case 1: 1672 case 1:
1668 decrease_ob (tmp); 1673 tmp->decrease ();
1669 op->play_sound (sound_find ("skill_learn")); 1674 op->play_sound (sound_find ("skill_learn"));
1670 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1675 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1671 break; 1676 break;
1672 1677
1673 default: 1678 default:
1674 decrease_ob (tmp); 1679 tmp->decrease ();
1675 op->play_sound (sound_find ("generic_fail")); 1680 op->play_sound (sound_find ("generic_fail"));
1676 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1681 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1677 break; 1682 break;
1678 } 1683 }
1679} 1684}
… …
1800 } 1805 }
1801 1806
1802 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1807 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1803 1808
1804 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1809 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1805 {
1806 identify (tmp); 1810 identify (tmp);
1807
1808 if (tmp->env)
1809 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1810 else
1811 op->contr->ns->floorbox_update ();
1812 }
1813 1811
1814 /* I removed the check for special_prayer_mark here - it didn't make 1812 /* I removed the check for special_prayer_mark here - it didn't make
1815 * a lot of sense - special prayers are not found in spellbooks, and 1813 * a lot of sense - special prayers are not found in spellbooks, and
1816 * if the player doesn't know the spell, doesn't make a lot of sense that 1814 * if the player doesn't know the spell, doesn't make a lot of sense that
1817 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
… …
1870 { 1868 {
1871 op->contr->play_sound (sound_find ("fumble_spell")); 1869 op->contr->play_sound (sound_find ("fumble_spell"));
1872 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1870 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1873 } 1871 }
1874 1872
1875 decrease_ob (tmp); 1873 tmp->decrease ();
1876} 1874}
1877 1875
1878/** 1876/**
1879 * Handles applying a spell scroll. 1877 * Handles applying a spell scroll.
1880 */ 1878 */
… …
1919 identify (tmp); 1917 identify (tmp);
1920 1918
1921 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1919 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1922 1920
1923 cast_spell (op, tmp, dir, tmp->inv, NULL); 1921 cast_spell (op, tmp, dir, tmp->inv, NULL);
1924 decrease_ob (tmp); 1922 tmp->decrease ();
1925} 1923}
1926 1924
1927/** 1925/**
1928 * Applies a treasure object - by default, chest. op 1926 * Applies a treasure object - by default, chest. op
1929 * is the person doing the applying, tmp is the treasure 1927 * is the person doing the applying, tmp is the treasure
… …
1941 object *treas = tmp->inv; 1939 object *treas = tmp->inv;
1942 1940
1943 if (!treas) 1941 if (!treas)
1944 { 1942 {
1945 op->statusmsg ("The chest was empty."); 1943 op->statusmsg ("The chest was empty.");
1946 decrease_ob (tmp); 1944 tmp->decrease ();
1947 return; 1945 return;
1948 } 1946 }
1949 1947
1950 while (tmp->inv) 1948 while (tmp->inv)
1951 { 1949 {
… …
1967 if (op->destroyed () || tmp->destroyed ()) 1965 if (op->destroyed () || tmp->destroyed ())
1968 break; 1966 break;
1969 } 1967 }
1970 1968
1971 if (!tmp->destroyed () && !tmp->inv) 1969 if (!tmp->destroyed () && !tmp->inv)
1972 decrease_ob (tmp); 1970 tmp->decrease ();
1973} 1971}
1974 1972
1975/** 1973/**
1976 * op eats food. 1974 * op eats food.
1977 * If player, takes care of messages and dragon special food. 1975 * If player, takes care of messages and dragon special food.
… …
2043 eat_special_food (op, tmp); 2041 eat_special_food (op, tmp);
2044 } 2042 }
2045 } 2043 }
2046 2044
2047 handle_apply_yield (tmp); 2045 handle_apply_yield (tmp);
2048 decrease_ob (tmp); 2046 tmp->decrease ();
2049} 2047}
2050 2048
2051/** 2049/**
2052 * A dragon is eating some flesh. If the flesh contains resistances, 2050 * A dragon is eating some flesh. If the flesh contains resistances,
2053 * there is a chance for the dragon's skin to get improved. 2051 * there is a chance for the dragon's skin to get improved.
… …
2241 2239
2242 op->statusmsg ("Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2243 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2244} 2242}
2245 2243
2246extern void 2244void
2247apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2248{ 2246{
2247 // need to do it now when it is still on the map
2248 handle_apply_yield (tmp);
2249
2250 object *poison = tmp->split (1);
2251
2249 if (op->type == PLAYER) 2252 if (op->type == PLAYER)
2250 { 2253 {
2251 op->contr->play_sound (sound_find ("drink_poison")); 2254 op->contr->play_sound (sound_find ("drink_poison"));
2252 op->failmsg ("Yech! That tasted poisonous!"); 2255 op->failmsg ("Yech! That tasted poisonous!");
2253 strcpy (op->contr->killer, "poisonous booze"); 2256 op->contr->killer = poison;
2254 } 2257 }
2255 2258
2256 if (tmp->stats.hp > 0) 2259 if (poison->stats.hp > 0)
2257 { 2260 {
2258 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2261 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2259 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2262 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2260 } 2263 }
2261 2264
2262 op->stats.food -= op->stats.food / 4; 2265 op->stats.food -= op->stats.food / 4;
2263 handle_apply_yield (tmp); 2266 poison->destroy ();
2264 decrease_ob (tmp);
2265} 2267}
2266 2268
2267/** 2269/**
2268 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2270 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2269 * A valid 2 way exit means: 2271 * A valid 2 way exit means:
… …
2371 * them in this function - they are passed to apply_special 2373 * them in this function - they are passed to apply_special
2372 */ 2374 */
2373int 2375int
2374manual_apply (object *op, object *tmp, int aflag) 2376manual_apply (object *op, object *tmp, int aflag)
2375{ 2377{
2376 if (tmp->head)
2377 tmp = tmp->head; 2378 tmp = tmp->head_ ();
2378 2379
2379 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2380 { 2381 {
2381 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2382 { 2383 {
… …
2590 default: 2591 default:
2591 return 0; 2592 return 0;
2592 } 2593 }
2593} 2594}
2594 2595
2595
2596/* quiet suppresses the "don't know how to apply" and "you must get it first" 2596/* quiet suppresses the "don't know how to apply" and "you must get it first"
2597 * messages as needed by player_apply_below(). But there can still be 2597 * messages as needed by player_apply_below(). But there can still be
2598 * "but you are floating high above the ground" messages. 2598 * "but you are floating high above the ground" messages.
2599 * 2599 *
2600 * Same return value as apply() function. 2600 * Same return value as apply() function.
2601 */ 2601 */
2602int 2602int
2603player_apply (object *pl, object *op, int aflag, int quiet) 2603player_apply (object *pl, object *op, int aflag, int quiet)
2604{ 2604{
2605 int tmp;
2606
2607 if (op->env && (pl->move_type & MOVE_FLYING)) 2605 if (!op->env && (pl->move_type & MOVE_FLYING))
2608 { 2606 {
2609 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2610 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2611 { 2609 {
2612 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2610 pl->failmsg ("But you are floating high above the ground! "
2611 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2612 "or waiting till the levitation effect wears off.>");
2613 return 0; 2613 return 0;
2614 } 2614 }
2615 } 2615 }
2616 2616
2617 pl->contr->last_used = op; 2617 pl->contr->last_used = op;
2618 2618
2619 tmp = manual_apply (pl, op, aflag); 2619 int tmp = manual_apply (pl, op, aflag);
2620
2620 if (!quiet) 2621 if (!quiet)
2621 { 2622 {
2622 if (tmp == 0) 2623 if (tmp == 0)
2623 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2624 else if (tmp == 2) 2625 else if (tmp == 2)
2625 op->failmsg ("You must get it first!\n"); 2626 pl->failmsg ("You must get it first!\n");
2626 } 2627 }
2627 2628
2628 return tmp; 2629 return tmp;
2629} 2630}
2630 2631
… …
2716 break; 2717 break;
2717 2718
2718 case SKILL: 2719 case SKILL:
2719 if (who->contr) 2720 if (who->contr)
2720 { 2721 {
2722 if (IS_COMBAT_SKILL (op->subtype))
2723 who->change_weapon (who->contr->combat_ob = 0);
2724 else if (IS_RANGED_SKILL (op->subtype))
2725 who->change_weapon (who->contr->ranged_ob = 0);
2726
2721 if (!op->invisible) 2727 if (op->invisible)
2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2729 else
2722 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2730 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2723 else
2724 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2725 } 2731 }
2726 2732
2727 change_abil (who, op); 2733 change_abil (who, op);
2728 CLEAR_FLAG (who, FLAG_READY_SKILL); 2734 CLEAR_FLAG (who, FLAG_READY_SKILL);
2729 break; 2735 break;
… …
2756 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2757 2763
2758 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2759 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2760 2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2761 if (who->contr) 2771 if (who->contr)
2762 esrv_del_item (who->contr, op->count);
2763
2764 op->destroy ();
2765 insert_ob_in_ob (tmp2, who);
2766 who->update_stats ();
2767
2768 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2769 { 2772 {
2770 if (who->contr) 2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2771 { 2774 {
2772 who->failmsg ("Oops, it feels deadly cold!"); 2775 who->failmsg ("Oops, it feels deadly cold!");
2773 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2774 } 2777 }
2775 } 2778 }
2776
2777 if (who->contr)
2778 esrv_send_item (who, tmp2);
2779 } 2779 }
2780 2780
2781 return 1; /* otherwise, an attempt to drop causes problems */ 2781 return 1; /* otherwise, an attempt to drop causes problems */
2782 2782
2783 case BOW: 2783 case BOW:
… …
2814 default: 2814 default:
2815 who->statusmsg (format ("You unapply %s.", query_name (op))); 2815 who->statusmsg (format ("You unapply %s.", query_name (op)));
2816 break; 2816 break;
2817 } 2817 }
2818 2818
2819 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2820 if (object *pl = op->visible_to ())
2821 esrv_send_item (pl, op);
2822
2819 who->update_stats (); 2823 who->update_stats ();
2820
2821 if (!(aflags & AP_NO_MERGE))
2822 {
2823 object *tmp = merge_ob (op, 0);
2824
2825 if (who->contr)
2826 {
2827 if (tmp)
2828 { /* it was merged */
2829 esrv_del_item (who->contr, op->count);
2830 op = tmp;
2831 }
2832
2833 esrv_send_item (who, op);
2834 }
2835 }
2836 2824
2837 return 0; 2825 return 0;
2838} 2826}
2839 2827
2840/** 2828/**
… …
3138 return 1; 3126 return 1;
3139 } 3127 }
3140 3128
3141 return unapply_special (who, op, aflags); 3129 return unapply_special (who, op, aflags);
3142 } 3130 }
3143
3144 if (basic_flag == AP_UNAPPLY) 3131 else if (basic_flag == AP_UNAPPLY)
3145 return 0; 3132 return 0;
3146 3133
3147 // if the item is combat/ranged, wield the relevant slot first 3134 // if the item is combat/ranged, wield the relevant slot first
3148 // to resolve conflicts. 3135 // to resolve conflicts.
3149 if (player *pl = who->contr) 3136 if (player *pl = who->contr)
… …
3219 3206
3220 /* Ok. We are now at the state where we can apply the new object. 3207 /* Ok. We are now at the state where we can apply the new object.
3221 * Note that we don't have the checks for can_use_... 3208 * Note that we don't have the checks for can_use_...
3222 * below - that is already taken care of by can_apply_object. 3209 * below - that is already taken care of by can_apply_object.
3223 */ 3210 */
3224 if (op->nrof > 1) 3211 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3225 tmp = get_split_ob (op, op->nrof - 1);
3226 else
3227 tmp = 0;
3228 3212
3229 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3213 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3230 return RESULT_INT (0); 3214 return RESULT_INT (0);
3231 3215
3232 switch (op->type) 3216 switch (op->type)
3233 { 3217 {
3234 case WEAPON: 3218 case WEAPON:
3235 if (!check_weapon_power (who, op->last_eat)) 3219 if (!check_weapon_power (who, op->last_eat))
3236 { 3220 {
3237 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3221 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3238 3222
3239 if (tmp) 3223 if (tmp)
3240 insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3241 3225
3242 return 1; 3226 return 1;
… …
3307 SET_FLAG (tmp2, FLAG_APPLIED); 3291 SET_FLAG (tmp2, FLAG_APPLIED);
3308 3292
3309 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3310 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3311 3295
3312 insert_ob_in_ob (tmp2, who); 3296 who->insert (tmp2);
3313 3297
3314 /* Remove the old lantern */ 3298 /* Remove the old lantern */
3315 if (who->type == PLAYER)
3316 esrv_del_item (who->contr, op->count);
3317
3318 op->destroy (); 3299 op->destroy ();
3319 3300
3320 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3321 if (tmp) 3302 if (tmp)
3322 { 3303 who->insert (tmp);
3323 insert_ob_in_ob (tmp, who);
3324 if (who->type == PLAYER)
3325 esrv_send_item (who, tmp);
3326 }
3327 3304
3328 who->update_stats (); 3305 who->update_stats ();
3329 3306
3330 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3331 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3332 { 3309 {
3333 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3310 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3334 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3335 } 3312 }
3336
3337 if (who->type == PLAYER)
3338 esrv_send_item (who, tmp2);
3339 3313
3340 return 0; 3314 return 0;
3341 3315
3342 case SKILL_TOOL: 3316 case SKILL_TOOL:
3343 // applying a skill tool also readies the skill 3317 // applying a skill tool also readies the skill
… …
3503 } 3477 }
3504 3478
3505 SET_FLAG (op, FLAG_APPLIED); 3479 SET_FLAG (op, FLAG_APPLIED);
3506 3480
3507 if (tmp) 3481 if (tmp)
3508 tmp = insert_ob_in_ob (tmp, who); 3482 who->insert (tmp);
3509 3483
3510 who->update_stats (); 3484 who->update_stats ();
3511 3485
3512 /* We exclude spell casting objects. The fire code will set the 3486 /* We exclude spell casting objects. The fire code will set the
3513 * been applied flag when they are used - until that point, 3487 * been applied flag when they are used - until that point,
… …
3524 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3525 ); 3499 );
3526 SET_FLAG (op, FLAG_KNOWN_CURSED); 3500 SET_FLAG (op, FLAG_KNOWN_CURSED);
3527 } 3501 }
3528 3502
3529 if (who->type == PLAYER) 3503 if (object *pl = op->visible_to ())
3530 {
3531 /* if multiple objects were applied, update both slots */
3532 if (tmp)
3533 esrv_send_item (who, tmp);
3534
3535 esrv_send_item (who, op); 3504 esrv_send_item (pl, op);
3536 }
3537 3505
3538 return 0; 3506 return 0;
3539} 3507}
3540 3508
3541int 3509int
… …
3555int 3523int
3556auto_apply (object *op) 3524auto_apply (object *op)
3557{ 3525{
3558 object *tmp = NULL, *tmp2; 3526 object *tmp = NULL, *tmp2;
3559 int i; 3527 int i;
3528
3529 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3560 3530
3561 switch (op->type) 3531 switch (op->type)
3562 { 3532 {
3563 case SHOP_FLOOR: 3533 case SHOP_FLOOR:
3564 if (!op->has_random_items ()) 3534 if (!op->has_random_items ())
… …
3566 3536
3567 do 3537 do
3568 { 3538 {
3569 i = 10; /* let's give it 10 tries */ 3539 i = 10; /* let's give it 10 tries */
3570 while ((tmp = generate_treasure (op->randomitems, 3540 while ((tmp = generate_treasure (op->randomitems,
3571 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3541 op->stats.exp
3542 ? (int) op->stats.exp
3543 : max (op->map->difficulty, 5)))
3544 == NULL && --i);
3545
3572 if (tmp == NULL) 3546 if (tmp == NULL)
3573 return 0; 3547 return 0;
3548
3574 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3549 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3575 { 3550 {
3576 tmp->destroy (); 3551 tmp->destroy ();
3577 tmp = NULL; 3552 tmp = NULL;
3578 } 3553 }
… …
3581 3556
3582 tmp->x = op->x; 3557 tmp->x = op->x;
3583 tmp->y = op->y; 3558 tmp->y = op->y;
3584 SET_FLAG (tmp, FLAG_UNPAID); 3559 SET_FLAG (tmp, FLAG_UNPAID);
3585 insert_ob_in_map (tmp, op->map, NULL, 0); 3560 insert_ob_in_map (tmp, op->map, NULL, 0);
3586 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3587 identify (tmp); 3561 identify (tmp);
3588 break; 3562 break;
3589 3563
3590 case TREASURE: 3564 case TREASURE:
3591 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3565 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3612 } 3586 }
3613 3587
3614 op->destroy (); 3588 op->destroy ();
3615 break; 3589 break;
3616 } 3590 }
3617 return tmp ? 1 : 0; 3591
3592 return !!tmp;
3618} 3593}
3619 3594
3620/** 3595/**
3621 * fix_auto_apply goes through the entire map every time a map 3596 * fix_auto_apply goes through the entire map every time a map
3622 * is loaded or swapped in and performs special actions for 3597 * is loaded or swapped in and performs special actions for
… …
3636 3611
3637 if (tmp->inv) 3612 if (tmp->inv)
3638 { 3613 {
3639 object *invtmp, *invnext; 3614 object *invtmp, *invnext;
3640 3615
3641 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3616 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3642 { 3617 {
3643 invnext = invtmp->below; 3618 invnext = invtmp->below;
3644 3619
3645 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3620 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3646 auto_apply (invtmp); 3621 auto_apply (invtmp);
3647 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3622 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3648 { 3623 {
3649 while ((invtmp->stats.hp--) > 0) 3624 while (invtmp->stats.hp-- > 0)
3650 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3625 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3651 3626
3652 invtmp->randomitems = NULL; 3627 invtmp->randomitems = NULL;
3653 } 3628 }
3654 else if (invtmp && invtmp->arch 3629 else if (invtmp && invtmp->arch
… …
3766 /* check for hp, sp change */ 3741 /* check for hp, sp change */
3767 if (food->stats.hp != 0) 3742 if (food->stats.hp != 0)
3768 { 3743 {
3769 if (QUERY_FLAG (food, FLAG_CURSED)) 3744 if (QUERY_FLAG (food, FLAG_CURSED))
3770 { 3745 {
3771 assign (who->contr->killer, food->name); 3746 who->contr->killer = food;
3772 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3747 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3773 who->failmsg ("Eck!...that was poisonous!"); 3748 who->failmsg ("Eck!...that was poisonous!");
3774 } 3749 }
3775 else 3750 else
3776 { 3751 {
… …
3780 who->failmsg ("Eck!...that was poisonous!"); 3755 who->failmsg ("Eck!...that was poisonous!");
3781 3756
3782 who->stats.hp += food->stats.hp; 3757 who->stats.hp += food->stats.hp;
3783 } 3758 }
3784 } 3759 }
3760
3785 if (food->stats.sp != 0) 3761 if (food->stats.sp != 0)
3786 { 3762 {
3787 if (QUERY_FLAG (food, FLAG_CURSED)) 3763 if (QUERY_FLAG (food, FLAG_CURSED))
3788 { 3764 {
3789 who->failmsg ("You are drained of mana!"); 3765 who->failmsg ("You are drained of mana!");
… …
3816 item = find_marked_object (who); 3792 item = find_marked_object (who);
3817 if (item) 3793 if (item)
3818 { 3794 {
3819 if (lighter->last_eat && lighter->stats.food) 3795 if (lighter->last_eat && lighter->stats.food)
3820 { /* lighter gets used up */ 3796 { /* lighter gets used up */
3821 /* Split multiple lighters if they're being used up. Otherwise *
3822 * one charge from each would be used up. --DAMN */
3823 if (lighter->nrof > 1)
3824 {
3825 object *oneLighter = lighter->clone (); 3797 object *oneLighter = lighter->split ();
3826
3827 lighter->nrof -= 1;
3828 oneLighter->nrof = 1;
3829 oneLighter->stats.food--; 3798 oneLighter->stats.food--;
3830 esrv_send_item (who, lighter); 3799 who->insert (oneLighter);
3831 oneLighter = insert_ob_in_ob (oneLighter, who);
3832 esrv_send_item (who, oneLighter);
3833 }
3834 else
3835 lighter->stats.food--;
3836 } 3800 }
3837 else if (lighter->last_eat) 3801 else if (lighter->last_eat)
3838 { 3802 {
3839 /* no charges left in lighter */ 3803 /* no charges left in lighter */
3840 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3804 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3987 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3988 flag_change_face = 0; 3952 flag_change_face = 0;
3989 3953
3990 if (flag_change_face) 3954 if (flag_change_face)
3991 { 3955 {
3992 pl->animation_id = GET_ANIM_ID (change);
3993 pl->face = change->face; 3956 pl->face = change->face;
3994 3957 pl->animation_id = change->animation_id;
3995 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3996 SET_FLAG (pl, FLAG_ANIMATE);
3997 else
3998 CLEAR_FLAG (pl, FLAG_ANIMATE);
3999 } 3959 }
4000 3960
4001 /* check the special case of can't use weapons */ 3961 /* check the special case of can't use weapons */
4002 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3962 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4003 if (!strcmp (change->name, "monk")) 3963 if (!strcmp (change->name, "monk"))
… …
4097 4057
4098 new_item->nrof = yield; 4058 new_item->nrof = yield;
4099 4059
4100 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4060 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4101 4061
4102 insert_ob_in_ob (new_item, pl); 4062 pl->insert (new_item);
4103 esrv_send_inventory (pl, pl);
4104 /* Eat up one item */ 4063 /* Eat up one item */
4105 decrease_ob_nr (marked, 1); 4064 marked->decrease ();
4106 4065
4107 /* Eat one transformer if needed */ 4066 /* Eat one transformer if needed */
4108 if (transformer->stats.food) 4067 if (transformer->stats.food)
4109 if (--transformer->stats.food == 0) 4068 if (--transformer->stats.food == 0)
4110 decrease_ob_nr (transformer, 1); 4069 transformer->decrease ();
4111} 4070}
4112 4071

Diff Legend

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