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.127 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.163 by elmex, Mon Jul 14 10:26:43 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 (©) 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 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
26#include <global.h> 26#include <global.h>
… …
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.", long_desc (marked, pl)); 118 buf.printf ("You have %s.\n\n", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n" << marked->msg; 120 buf << "The item has a story:\n\n" << 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.", long_desc (id, pl)); 134 buf.printf ("You have %s.\n\n", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n" << id->msg; 136 buf << "The item has a story:\n\n" << 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 }
… …
146 } 146 }
147 } 147 }
148 } 148 }
149 149
150 if (buf.empty ()) 150 if (buf.empty ())
151 buf << ("You have nothing that needs identifying"); 151 pl->failmsg ("You have nothing that needs identifying");
152 152 else
153 pl->contr->infobox ("Identify", buf); 153 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
154 154
155 return !money; 155 return !money;
156} 156}
157 157
158/** 158/**
… …
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 (
… …
623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 606 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 607 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
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. "
612 "H<A weapon is considered magical if it changes regeneration, "
613 "speed or ac, or has other protections.>");
629 return 0; 614 return 0;
630 } 615 }
631 616
632 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
633 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
644 629
645 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
646 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
647 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
648 slot at once! */ 633 slot at once! */
649 decrease_ob (improver); 634 improver->decrease ();
650 weapon->last_eat = 0; 635 weapon->last_eat = 0;
651 return 1; 636 return 1;
652} 637}
653
654 638
655/** 639/**
656 * 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.
657 * This is the new improve weapon code. 641 * This is the new improve weapon code.
658 * 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.
… …
702 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
703 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));
704 weapon->last_eat++; 688 weapon->last_eat++;
705 689
706 weapon->item_power++; 690 weapon->item_power++;
707 decrease_ob (improver); 691 improver->decrease ();
708 return 1; 692 return 1;
709 } 693 }
710 694
711 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
712 { 696 {
… …
716 weapon->weight = 1; 700 weapon->weight = 1;
717 701
718 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));
719 weapon->last_eat++; 703 weapon->last_eat++;
720 weapon->item_power++; 704 weapon->item_power++;
721 decrease_ob (improver); 705 improver->decrease ();
722 return 1; 706 return 1;
723 } 707 }
708
724 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
725 { 710 {
726 weapon->magic++; 711 weapon->magic++;
727 weapon->last_eat++; 712 weapon->last_eat++;
728 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
729 decrease_ob (improver); 714 improver->decrease ();
730 weapon->item_power++; 715 weapon->item_power++;
731 return 1; 716 return 1;
732 } 717 }
733 718
734 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
783 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
784 return 0; 769 return 0;
785 } 770 }
786 771
787 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
788 if (!otmp) 774 if (!otmp)
789 { 775 {
790 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.>");
791 return 0; 777 return 0;
792 } 778 }
… …
834 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
835 { 821 {
836 op->failmsg ("This armour can not be enchanted any further!"); 822 op->failmsg ("This armour can not be enchanted any further!");
837 return 0; 823 return 0;
838 } 824 }
825
839 /* 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,
840 * 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.
841 * 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
842 * of gnarg and what not?) 829 * of gnarg and what not?)
843 */ 830 */
… …
845 { 832 {
846 op->failmsg ("This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
847 return 0; 834 return 0;
848 } 835 }
849 836
850 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
851 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
852 */ 839 */
853 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
854 tmp = get_split_ob (armour, armour->nrof - 1);
855 else
856 tmp = NULL;
857 841
858 armour->magic++; 842 armour->magic++;
859 843
860 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
861 { 845 {
… …
898 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);
899 883
900 if (op->type == PLAYER) 884 if (op->type == PLAYER)
901 { 885 {
902 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
903 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
904 op->update_stats (); 889 op->update_stats ();
905 } 890 }
906 891
907 decrease_ob (improver); 892 improver->decrease ();
908 893
909 if (tmp) 894 if (tmp)
910 { 895 op->insert (tmp);
911 insert_ob_in_ob (tmp, op);
912 esrv_send_item (op, tmp);
913 }
914 896
915 return 1; 897 return 1;
916} 898}
917 899
918/* 900/*
919 * 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
920 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
921 */ 903 *
922#define CONV_FROM(xyz) xyz->slaying
923#define CONV_TO(xyz) xyz->other_arch
924#define CONV_NR(xyz) xyz->stats.sp
925#define CONV_NEED(xyz) xyz->stats.food
926
927/* Takes one items and makes another. 904 * Takes one type of items and makes another.
928 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
929 * 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
930 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
931 */ 908 */
932int 909static int
933convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
934{ 911{
935 int nr = 0;
936 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;
937 921
938 /* 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,
939 * 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
940 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
941 */ 925 */
942 if (CONV_FROM (converter) == shstr_money) 926 if (conv_from == shstr_money)
943 { 927 {
944 if (item->type != MONEY) 928 if (item->type != MONEY)
945 return 0; 929 return 0;
946 930
947 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
948 if (!nr) 932 if (!nr)
949 return 0; 933 return 0;
950 934
951 converter->play_sound (sound_find ("shop_buy")); 935 converter->play_sound (sound_find ("shop_buy"));
952 936
953 int cost = nr * CONV_NEED (converter) / item->value; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
954 /* take into account rounding errors */
955 if (nr * CONV_NEED (converter) % item->value)
956 cost++;
957 938
958 decrease_ob_nr (item, cost); 939 item->decrease (cost);
959 940
960 price_in = cost * item->value; 941 price_in = cost * item->value;
961 } 942 }
962 else 943 else
963 { 944 {
964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
966 return 0; 948 return 0;
967 949
968 converter->play_sound (sound_find ("convert_item")); 950 converter->play_sound (sound_find ("convert_item"));
969 951
970 if (CONV_NEED (converter)) 952 if (need)
971 { 953 {
972 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
973 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
974 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
975 } 957 }
976 else 958 else
977 { 959 {
978 price_in = item->value; 960 price_in = item->value;
979 item->destroy (); 961 item->destroy ();
… …
990 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
991 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++)
992 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
993 ob_to_copy = ob; 975 ob_to_copy = ob;
994 976
995 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 980 }
999 else 981 else
1000 { 982 {
1001 if (converter->other_arch == NULL) 983 if (!conv_to)
1002 { 984 {
1003 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",
1004 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
1005 return -1; 987 return -1;
1006 } 988 }
1007 989
1008 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1010 } 992 }
1011 993
1012 if (CONV_NR (converter)) 994 if (give)
1013 item->nrof = CONV_NR (converter); 995 item->nrof = give;
1014 996
1015 if (nr) 997 if (nr)
1016 item->nrof *= nr; 998 item->nrof *= nr;
1017 999
1018 if (is_in_shop (converter)) 1000 if (is_in_shop (converter))
1019 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1020 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 1003 {
1022 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",
1023 &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);
1024 /** 1006 /**
1025 * 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
1026 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1027 */ 1009 */
1028 } 1010 }
1029 1011
1030 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
1031 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);
1032 return 1; 1018 return 1;
1033} 1019}
1034 1020
1035/** 1021/**
… …
1310 } 1296 }
1311 1297
1312 if (op->contr) 1298 if (op->contr)
1313 if (client *ns = op->contr->ns) 1299 if (client *ns = op->contr->ns)
1314 { 1300 {
1301 if (sign->sound)
1315 ns->play_sound (sign->sound); 1302 ns->play_sound (sign->sound);
1316 msgType = get_readable_message_type (sign); 1303 else if (autoapply)
1304 ns->play_sound (sound_find ("msg_voice"));
1317 1305
1318 if (ns->can_msg) 1306 if (ns->can_msg)
1319 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg); 1307 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1320 else 1308 else
1321 { 1309 {
1322 char newbuf[HUGE_BUF]; 1310 msgType = get_readable_message_type (sign);
1323 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg); 1311 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1324 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1312 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1325 } 1313 }
1326 } 1314 }
1327} 1315}
1328 1316
1329/** 1317/**
… …
1443 1431
1444 if (!trap->value) 1432 if (!trap->value)
1445 { 1433 {
1446 int tot; 1434 int tot;
1447 1435
1448 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1436 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1449 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1437 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1450 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1438 tot += ab->head_ ()->total_weight ();
1451 1439
1452 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1440 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1453 goto leave; 1441 goto leave;
1454 1442
1455 SET_ANIMATION (trap, trap->value); 1443 SET_ANIMATION (trap, trap->value);
… …
1480 1468
1481 case CONVERTER: 1469 case CONVERTER:
1482 if (convert_item (victim, trap) < 0) 1470 if (convert_item (victim, trap) < 0)
1483 { 1471 {
1484 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1472 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1485 get_archetype ("burnout")->insert_at (trap, trap); 1473 archetype::get (shstr_burnout)->insert_at (trap, trap);
1486 } 1474 }
1487 1475
1488 goto leave; 1476 goto leave;
1489 1477
1490 case TRIGGER_BUTTON: 1478 case TRIGGER_BUTTON:
… …
1524 * players output. 1512 * players output.
1525 */ 1513 */
1526 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1514 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1527 victim->statusmsg (trap->msg, NDI_NAVY); 1515 victim->statusmsg (trap->msg, NDI_NAVY);
1528 1516
1517 trap->play_sound (trap->sound);
1529 victim->enter_exit (trap); 1518 victim->enter_exit (trap);
1530 } 1519 }
1531 goto leave; 1520 goto leave;
1532 1521
1533 case ENCOUNTER: 1522 case ENCOUNTER:
… …
1600 } 1589 }
1601 1590
1602 lev_diff = tmp->level - (skill_ob->level + 5); 1591 lev_diff = tmp->level - (skill_ob->level + 5);
1603 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1592 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1604 { 1593 {
1605 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1594 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1606 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1595 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1607 : lev_diff < 5 ? "This book is beyond your comprehension." 1596 : lev_diff < 5 ? "This book is beyond your comprehension."
1608 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1597 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1609 : lev_diff < 15 ? "This book is way beyond your comprehension." 1598 : lev_diff < 15 ? "This book is way beyond your comprehension."
1610 : "This book is totally beyond your comprehension."); 1599 : "This book is totally beyond your comprehension.");
… …
1614 readable_message_type *msgType = get_readable_message_type (tmp); 1603 readable_message_type *msgType = get_readable_message_type (tmp);
1615 1604
1616 if (player *pl = op->contr) 1605 if (player *pl = op->contr)
1617 if (client *ns = pl->ns) 1606 if (client *ns = pl->ns)
1618 if (ns->can_msg) 1607 if (ns->can_msg)
1619 { 1608 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1620 dynbuf_text buf;
1621 buf << long_desc (tmp, op)
1622 << "\n\n"
1623 << tmp->msg
1624 << '\0';
1625 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1626 }
1627 else 1609 else
1628 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1610 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1629 msgType->message_type, msgType->message_subtype, 1611 msgType->message_type, msgType->message_subtype,
1630 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1612 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1631 long_desc (tmp, op), &tmp->msg); 1613 long_desc (tmp, op), &tmp->msg);
… …
1638 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1620 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1639 { 1621 {
1640 /*exp_gain *= 2; because they just identified it too */ 1622 /*exp_gain *= 2; because they just identified it too */
1641 SET_FLAG (tmp, FLAG_IDENTIFIED); 1623 SET_FLAG (tmp, FLAG_IDENTIFIED);
1642 1624
1643 /* If in a container, update how it looks */ 1625 if (object *pl = tmp->visible_to ())
1644 if (tmp->env)
1645 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1626 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1646 else
1647 op->contr->ns->floorbox_update ();
1648 } 1627 }
1649 1628
1650 change_exp (op, exp_gain, skill_ob->skill, 0); 1629 change_exp (op, exp_gain, skill_ob->skill, 0);
1651 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1630 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1652 } 1631 }
… …
1665 op->play_sound (sound_find ("generic_fail")); 1644 op->play_sound (sound_find ("generic_fail"));
1666 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1645 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1667 break; 1646 break;
1668 1647
1669 case 1: 1648 case 1:
1670 decrease_ob (tmp); 1649 tmp->decrease ();
1671 op->play_sound (sound_find ("skill_learn")); 1650 op->play_sound (sound_find ("skill_learn"));
1672 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1651 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1673 break; 1652 break;
1674 1653
1675 default: 1654 default:
1676 decrease_ob (tmp); 1655 tmp->decrease ();
1677 op->play_sound (sound_find ("generic_fail")); 1656 op->play_sound (sound_find ("generic_fail"));
1678 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1657 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1679 break; 1658 break;
1680 } 1659 }
1681} 1660}
… …
1802 } 1781 }
1803 1782
1804 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1783 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1805 1784
1806 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1785 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1807 {
1808 identify (tmp); 1786 identify (tmp);
1809
1810 if (tmp->env)
1811 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1812 else
1813 op->contr->ns->floorbox_update ();
1814 }
1815 1787
1816 /* I removed the check for special_prayer_mark here - it didn't make 1788 /* I removed the check for special_prayer_mark here - it didn't make
1817 * a lot of sense - special prayers are not found in spellbooks, and 1789 * a lot of sense - special prayers are not found in spellbooks, and
1818 * if the player doesn't know the spell, doesn't make a lot of sense that 1790 * if the player doesn't know the spell, doesn't make a lot of sense that
1819 * they would have a special prayer mark. 1791 * they would have a special prayer mark.
… …
1872 { 1844 {
1873 op->contr->play_sound (sound_find ("fumble_spell")); 1845 op->contr->play_sound (sound_find ("fumble_spell"));
1874 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1846 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1875 } 1847 }
1876 1848
1877 decrease_ob (tmp); 1849 tmp->decrease ();
1878} 1850}
1879 1851
1880/** 1852/**
1881 * Handles applying a spell scroll. 1853 * Handles applying a spell scroll.
1882 */ 1854 */
… …
1921 identify (tmp); 1893 identify (tmp);
1922 1894
1923 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1895 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1924 1896
1925 cast_spell (op, tmp, dir, tmp->inv, NULL); 1897 cast_spell (op, tmp, dir, tmp->inv, NULL);
1926 decrease_ob (tmp); 1898 tmp->decrease ();
1927} 1899}
1928 1900
1929/** 1901/**
1930 * Applies a treasure object - by default, chest. op 1902 * Applies a treasure object - by default, chest. op
1931 * is the person doing the applying, tmp is the treasure 1903 * is the person doing the applying, tmp is the treasure
… …
1943 object *treas = tmp->inv; 1915 object *treas = tmp->inv;
1944 1916
1945 if (!treas) 1917 if (!treas)
1946 { 1918 {
1947 op->statusmsg ("The chest was empty."); 1919 op->statusmsg ("The chest was empty.");
1948 decrease_ob (tmp); 1920 tmp->decrease ();
1949 return; 1921 return;
1950 } 1922 }
1951 1923
1952 while (tmp->inv) 1924 while (tmp->inv)
1953 { 1925 {
… …
1969 if (op->destroyed () || tmp->destroyed ()) 1941 if (op->destroyed () || tmp->destroyed ())
1970 break; 1942 break;
1971 } 1943 }
1972 1944
1973 if (!tmp->destroyed () && !tmp->inv) 1945 if (!tmp->destroyed () && !tmp->inv)
1974 decrease_ob (tmp); 1946 tmp->decrease ();
1975} 1947}
1976 1948
1977/** 1949/**
1978 * op eats food. 1950 * op eats food.
1979 * If player, takes care of messages and dragon special food. 1951 * If player, takes care of messages and dragon special food.
… …
1998 if (tmp->type == FOOD || tmp->type == FLESH) 1970 if (tmp->type == FOOD || tmp->type == FLESH)
1999 op->failmsg ("You feel full, but what a waste of food!"); 1971 op->failmsg ("You feel full, but what a waste of food!");
2000 else 1972 else
2001 op->statusmsg ("Most of the drink goes down your face not your throat!"); 1973 op->statusmsg ("Most of the drink goes down your face not your throat!");
2002 } 1974 }
1975
1976 tmp->play_sound (
1977 tmp->sound
1978 ? tmp->sound
1979 : tmp->type == DRINK
1980 ? sound_find ("eat_drink")
1981 : sound_find ("eat_food")
1982 );
2003 1983
2004 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1984 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2005 { 1985 {
2006 const char *buf; 1986 const char *buf;
2007 1987
… …
2037 eat_special_food (op, tmp); 2017 eat_special_food (op, tmp);
2038 } 2018 }
2039 } 2019 }
2040 2020
2041 handle_apply_yield (tmp); 2021 handle_apply_yield (tmp);
2042 decrease_ob (tmp); 2022 tmp->decrease ();
2043} 2023}
2044 2024
2045/** 2025/**
2046 * A dragon is eating some flesh. If the flesh contains resistances, 2026 * A dragon is eating some flesh. If the flesh contains resistances,
2047 * there is a chance for the dragon's skin to get improved. 2027 * there is a chance for the dragon's skin to get improved.
… …
2235 2215
2236 op->statusmsg ("Applying armour enchantment."); 2216 op->statusmsg ("Applying armour enchantment.");
2237 improve_armour (op, tmp, armor); 2217 improve_armour (op, tmp, armor);
2238} 2218}
2239 2219
2240extern void 2220void
2241apply_poison (object *op, object *tmp) 2221apply_poison (object *op, object *tmp)
2242{ 2222{
2223 // need to do it now when it is still on the map
2224 handle_apply_yield (tmp);
2225
2226 object *poison = tmp->split (1);
2227
2243 if (op->type == PLAYER) 2228 if (op->type == PLAYER)
2244 { 2229 {
2245 op->contr->play_sound (sound_find ("drink_poison")); 2230 op->contr->play_sound (sound_find ("drink_poison"));
2246 op->failmsg ("Yech! That tasted poisonous!"); 2231 op->failmsg ("Yech! That tasted poisonous!");
2247 strcpy (op->contr->killer, "poisonous booze"); 2232 op->contr->killer = poison;
2248 } 2233 }
2249 2234
2250 if (tmp->stats.hp > 0) 2235 if (poison->stats.hp > 0)
2251 { 2236 {
2252 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2237 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2253 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2238 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2254 } 2239 }
2255 2240
2256 op->stats.food -= op->stats.food / 4; 2241 op->stats.food -= op->stats.food / 4;
2257 handle_apply_yield (tmp); 2242 poison->destroy ();
2258 decrease_ob (tmp);
2259} 2243}
2260 2244
2261/** 2245/**
2262 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2246 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2263 * A valid 2 way exit means: 2247 * A valid 2 way exit means:
… …
2278 2262
2279#if 0 //TODO 2263#if 0 //TODO
2280 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2264 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2281 return 0; /* This is a reset town portal */ 2265 return 0; /* This is a reset town portal */
2282#endif 2266#endif
2267
2268 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2283 2269
2284 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2270 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2285 2271
2286 if (exitmap) 2272 if (exitmap)
2287 { 2273 {
… …
2363 * them in this function - they are passed to apply_special 2349 * them in this function - they are passed to apply_special
2364 */ 2350 */
2365int 2351int
2366manual_apply (object *op, object *tmp, int aflag) 2352manual_apply (object *op, object *tmp, int aflag)
2367{ 2353{
2368 if (tmp->head)
2369 tmp = tmp->head; 2354 tmp = tmp->head_ ();
2370 2355
2371 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2356 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2372 { 2357 {
2373 if (op->type == PLAYER) 2358 if (op->type == PLAYER)
2374 { 2359 {
… …
2582 default: 2567 default:
2583 return 0; 2568 return 0;
2584 } 2569 }
2585} 2570}
2586 2571
2587
2588/* quiet suppresses the "don't know how to apply" and "you must get it first" 2572/* quiet suppresses the "don't know how to apply" and "you must get it first"
2589 * messages as needed by player_apply_below(). But there can still be 2573 * messages as needed by player_apply_below(). But there can still be
2590 * "but you are floating high above the ground" messages. 2574 * "but you are floating high above the ground" messages.
2591 * 2575 *
2592 * Same return value as apply() function. 2576 * Same return value as apply() function.
2593 */ 2577 */
2594int 2578int
2595player_apply (object *pl, object *op, int aflag, int quiet) 2579player_apply (object *pl, object *op, int aflag, int quiet)
2596{ 2580{
2597 int tmp;
2598
2599 if (op->env && (pl->move_type & MOVE_FLYING)) 2581 if (!op->env && (pl->move_type & MOVE_FLYING))
2600 { 2582 {
2601 /* player is flying and applying object not in inventory */ 2583 /* player is flying and applying object not in inventory */
2602 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2584 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2603 { 2585 {
2604 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2586 pl->failmsg ("But you are floating high above the ground! "
2587 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2588 "or waiting till the levitation effect wears off.>");
2605 return 0; 2589 return 0;
2606 } 2590 }
2607 } 2591 }
2608 2592
2609 pl->contr->last_used = op; 2593 pl->contr->last_used = op;
2610 2594
2611 tmp = manual_apply (pl, op, aflag); 2595 int tmp = manual_apply (pl, op, aflag);
2596
2612 if (!quiet) 2597 if (!quiet)
2613 { 2598 {
2614 if (tmp == 0) 2599 if (tmp == 0)
2615 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2600 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2616 else if (tmp == 2) 2601 else if (tmp == 2)
2617 op->failmsg ("You must get it first!\n"); 2602 pl->failmsg ("You must get it first!\n");
2618 } 2603 }
2619 2604
2620 return tmp; 2605 return tmp;
2621} 2606}
2622 2607
… …
2708 break; 2693 break;
2709 2694
2710 case SKILL: 2695 case SKILL:
2711 if (who->contr) 2696 if (who->contr)
2712 { 2697 {
2698 if (IS_COMBAT_SKILL (op->subtype))
2699 who->change_weapon (who->contr->combat_ob = 0);
2700 else if (IS_RANGED_SKILL (op->subtype))
2701 who->change_weapon (who->contr->ranged_ob = 0);
2702
2713 if (!op->invisible) 2703 if (op->invisible)
2704 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2705 else
2714 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2706 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2715 else
2716 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2717 } 2707 }
2718 2708
2719 change_abil (who, op); 2709 change_abil (who, op);
2720 CLEAR_FLAG (who, FLAG_READY_SKILL); 2710 CLEAR_FLAG (who, FLAG_READY_SKILL);
2721 break; 2711 break;
… …
2748 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2738 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2749 2739
2750 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2740 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2751 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2741 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2752 2742
2743 op->destroy ();
2744 who->insert (tmp2);
2745 who->update_stats ();
2746
2753 if (who->contr) 2747 if (who->contr)
2754 esrv_del_item (who->contr, op->count);
2755
2756 op->destroy ();
2757 insert_ob_in_ob (tmp2, who);
2758 who->update_stats ();
2759
2760 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2761 { 2748 {
2762 if (who->contr) 2749 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2763 { 2750 {
2764 who->failmsg ("Oops, it feels deadly cold!"); 2751 who->failmsg ("Oops, it feels deadly cold!");
2765 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2752 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2766 } 2753 }
2767 } 2754 }
2768
2769 if (who->contr)
2770 esrv_send_item (who, tmp2);
2771 } 2755 }
2772 2756
2773 return 1; /* otherwise, an attempt to drop causes problems */ 2757 return 1; /* otherwise, an attempt to drop causes problems */
2774 2758
2775 case BOW: 2759 case BOW:
… …
2806 default: 2790 default:
2807 who->statusmsg (format ("You unapply %s.", query_name (op))); 2791 who->statusmsg (format ("You unapply %s.", query_name (op)));
2808 break; 2792 break;
2809 } 2793 }
2810 2794
2795 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2796 if (object *pl = op->visible_to ())
2797 esrv_send_item (pl, op);
2798
2811 who->update_stats (); 2799 who->update_stats ();
2812
2813 if (!(aflags & AP_NO_MERGE))
2814 {
2815 object *tmp = merge_ob (op, 0);
2816
2817 if (who->contr)
2818 {
2819 if (tmp)
2820 { /* it was merged */
2821 esrv_del_item (who->contr, op->count);
2822 op = tmp;
2823 }
2824
2825 esrv_send_item (who, op);
2826 }
2827 }
2828 2800
2829 return 0; 2801 return 0;
2830} 2802}
2831 2803
2832/** 2804/**
… …
3130 return 1; 3102 return 1;
3131 } 3103 }
3132 3104
3133 return unapply_special (who, op, aflags); 3105 return unapply_special (who, op, aflags);
3134 } 3106 }
3135
3136 if (basic_flag == AP_UNAPPLY) 3107 else if (basic_flag == AP_UNAPPLY)
3137 return 0; 3108 return 0;
3138 3109
3139 // if the item is combat/ranged, wield the relevant slot first 3110 // if the item is combat/ranged, wield the relevant slot first
3140 // to resolve conflicts. 3111 // to resolve conflicts.
3141 if (player *pl = who->contr) 3112 if (player *pl = who->contr)
… …
3211 3182
3212 /* Ok. We are now at the state where we can apply the new object. 3183 /* Ok. We are now at the state where we can apply the new object.
3213 * Note that we don't have the checks for can_use_... 3184 * Note that we don't have the checks for can_use_...
3214 * below - that is already taken care of by can_apply_object. 3185 * below - that is already taken care of by can_apply_object.
3215 */ 3186 */
3216 if (op->nrof > 1) 3187 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3217 tmp = get_split_ob (op, op->nrof - 1);
3218 else
3219 tmp = 0;
3220 3188
3221 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3189 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3222 return RESULT_INT (0); 3190 return RESULT_INT (0);
3223 3191
3224 switch (op->type) 3192 switch (op->type)
3225 { 3193 {
3226 case WEAPON: 3194 case WEAPON:
3227 if (!check_weapon_power (who, op->last_eat)) 3195 if (!check_weapon_power (who, op->last_eat))
3228 { 3196 {
3229 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3197 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3230 3198
3231 if (tmp) 3199 if (tmp)
3232 insert_ob_in_ob (tmp, who); 3200 insert_ob_in_ob (tmp, who);
3233 3201
3234 return 1; 3202 return 1;
… …
3299 SET_FLAG (tmp2, FLAG_APPLIED); 3267 SET_FLAG (tmp2, FLAG_APPLIED);
3300 3268
3301 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3269 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3302 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3270 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3303 3271
3304 insert_ob_in_ob (tmp2, who); 3272 who->insert (tmp2);
3305 3273
3306 /* Remove the old lantern */ 3274 /* Remove the old lantern */
3307 if (who->type == PLAYER)
3308 esrv_del_item (who->contr, op->count);
3309
3310 op->destroy (); 3275 op->destroy ();
3311 3276
3312 /* insert the portion that was split off */ 3277 /* insert the portion that was split off */
3313 if (tmp) 3278 if (tmp)
3314 { 3279 who->insert (tmp);
3315 insert_ob_in_ob (tmp, who);
3316 if (who->type == PLAYER)
3317 esrv_send_item (who, tmp);
3318 }
3319 3280
3320 who->update_stats (); 3281 who->update_stats ();
3321 3282
3322 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3283 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3323 if (who->type == PLAYER) 3284 if (who->type == PLAYER)
3324 { 3285 {
3325 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3286 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3326 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3287 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3327 } 3288 }
3328
3329 if (who->type == PLAYER)
3330 esrv_send_item (who, tmp2);
3331 3289
3332 return 0; 3290 return 0;
3333 3291
3334 case SKILL_TOOL: 3292 case SKILL_TOOL:
3335 // applying a skill tool also readies the skill 3293 // applying a skill tool also readies the skill
… …
3495 } 3453 }
3496 3454
3497 SET_FLAG (op, FLAG_APPLIED); 3455 SET_FLAG (op, FLAG_APPLIED);
3498 3456
3499 if (tmp) 3457 if (tmp)
3500 tmp = insert_ob_in_ob (tmp, who); 3458 who->insert (tmp);
3501 3459
3502 who->update_stats (); 3460 who->update_stats ();
3503 3461
3504 /* We exclude spell casting objects. The fire code will set the 3462 /* We exclude spell casting objects. The fire code will set the
3505 * been applied flag when they are used - until that point, 3463 * been applied flag when they are used - until that point,
… …
3516 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3474 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3517 ); 3475 );
3518 SET_FLAG (op, FLAG_KNOWN_CURSED); 3476 SET_FLAG (op, FLAG_KNOWN_CURSED);
3519 } 3477 }
3520 3478
3521 if (who->type == PLAYER) 3479 if (object *pl = op->visible_to ())
3522 {
3523 /* if multiple objects were applied, update both slots */
3524 if (tmp)
3525 esrv_send_item (who, tmp);
3526
3527 esrv_send_item (who, op); 3480 esrv_send_item (pl, op);
3528 }
3529 3481
3530 return 0; 3482 return 0;
3531} 3483}
3532 3484
3533int 3485int
… …
3547int 3499int
3548auto_apply (object *op) 3500auto_apply (object *op)
3549{ 3501{
3550 object *tmp = NULL, *tmp2; 3502 object *tmp = NULL, *tmp2;
3551 int i; 3503 int i;
3504
3505 if (INVOKE_OBJECT (AUTO_APPLY, op))
3506 return RESULT_INT (0);
3552 3507
3553 switch (op->type) 3508 switch (op->type)
3554 { 3509 {
3555 case SHOP_FLOOR: 3510 case SHOP_FLOOR:
3556 if (!op->has_random_items ()) 3511 if (!op->has_random_items ())
… …
3758 /* check for hp, sp change */ 3713 /* check for hp, sp change */
3759 if (food->stats.hp != 0) 3714 if (food->stats.hp != 0)
3760 { 3715 {
3761 if (QUERY_FLAG (food, FLAG_CURSED)) 3716 if (QUERY_FLAG (food, FLAG_CURSED))
3762 { 3717 {
3763 assign (who->contr->killer, food->name); 3718 who->contr->killer = food;
3764 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3719 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3765 who->failmsg ("Eck!...that was poisonous!"); 3720 who->failmsg ("Eck!...that was poisonous!");
3766 } 3721 }
3767 else 3722 else
3768 { 3723 {
… …
3772 who->failmsg ("Eck!...that was poisonous!"); 3727 who->failmsg ("Eck!...that was poisonous!");
3773 3728
3774 who->stats.hp += food->stats.hp; 3729 who->stats.hp += food->stats.hp;
3775 } 3730 }
3776 } 3731 }
3732
3777 if (food->stats.sp != 0) 3733 if (food->stats.sp != 0)
3778 { 3734 {
3779 if (QUERY_FLAG (food, FLAG_CURSED)) 3735 if (QUERY_FLAG (food, FLAG_CURSED))
3780 { 3736 {
3781 who->failmsg ("You are drained of mana!"); 3737 who->failmsg ("You are drained of mana!");
… …
3808 item = find_marked_object (who); 3764 item = find_marked_object (who);
3809 if (item) 3765 if (item)
3810 { 3766 {
3811 if (lighter->last_eat && lighter->stats.food) 3767 if (lighter->last_eat && lighter->stats.food)
3812 { /* lighter gets used up */ 3768 { /* lighter gets used up */
3813 /* Split multiple lighters if they're being used up. Otherwise *
3814 * one charge from each would be used up. --DAMN */
3815 if (lighter->nrof > 1)
3816 {
3817 object *oneLighter = lighter->clone (); 3769 object *oneLighter = lighter->split ();
3818
3819 lighter->nrof -= 1;
3820 oneLighter->nrof = 1;
3821 oneLighter->stats.food--; 3770 oneLighter->stats.food--;
3822 esrv_send_item (who, lighter); 3771 who->insert (oneLighter);
3823 oneLighter = insert_ob_in_ob (oneLighter, who);
3824 esrv_send_item (who, oneLighter);
3825 }
3826 else
3827 lighter->stats.food--;
3828 } 3772 }
3829 else if (lighter->last_eat) 3773 else if (lighter->last_eat)
3830 { 3774 {
3831 /* no charges left in lighter */ 3775 /* no charges left in lighter */
3832 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3776 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3979 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3923 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3980 flag_change_face = 0; 3924 flag_change_face = 0;
3981 3925
3982 if (flag_change_face) 3926 if (flag_change_face)
3983 { 3927 {
3984 pl->animation_id = GET_ANIM_ID (change);
3985 pl->face = change->face; 3928 pl->face = change->face;
3986 3929 pl->animation_id = change->animation_id;
3987 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3930 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3988 SET_FLAG (pl, FLAG_ANIMATE);
3989 else
3990 CLEAR_FLAG (pl, FLAG_ANIMATE);
3991 } 3931 }
3992 3932
3993 /* check the special case of can't use weapons */ 3933 /* check the special case of can't use weapons */
3994 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3934 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3995 if (!strcmp (change->name, "monk")) 3935 if (!strcmp (change->name, "monk"))
… …
4089 4029
4090 new_item->nrof = yield; 4030 new_item->nrof = yield;
4091 4031
4092 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4032 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4093 4033
4094 insert_ob_in_ob (new_item, pl); 4034 pl->insert (new_item);
4095 esrv_send_inventory (pl, pl);
4096 /* Eat up one item */ 4035 /* Eat up one item */
4097 decrease_ob_nr (marked, 1); 4036 marked->decrease ();
4098 4037
4099 /* Eat one transformer if needed */ 4038 /* Eat one transformer if needed */
4100 if (transformer->stats.food) 4039 if (transformer->stats.food)
4101 if (--transformer->stats.food == 0) 4040 if (--transformer->stats.food == 0)
4102 decrease_ob_nr (transformer, 1); 4041 transformer->decrease ();
4103} 4042}
4104 4043

Diff Legend

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