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.151 by root, Wed Apr 30 06:40:28 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/**
… …
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 const char *yield;
166 166
167 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
168
168 if (yield != NULL) 169 if (yield)
169 { 170 get_archetype (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
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} 171}
186 172
187/** 173/**
188 * Handles applying a potion. 174 * Handles applying a potion.
189 */ 175 */
… …
217 203
218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 204 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
219 { 205 {
220 op->drain_stat (); 206 op->drain_stat ();
221 op->update_stats (); 207 op->update_stats ();
222 decrease_ob (tmp); 208 tmp->decrease ();
223 return 1; 209 return 1;
224 } 210 }
225 211
226 if (!(at = archetype::find (ARCH_DEPLETION))) 212 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 213 {
228 LOG (llevError, "Could not find archetype depletion\n"); 214 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 215 return 0;
230 } 216 }
217
231 depl = present_arch_in_ob (at, op); 218 depl = present_arch_in_ob (at, op);
232 219
233 if (depl) 220 if (depl)
234 { 221 {
235 for (i = 0; i < NUM_STATS; i++) 222 for (i = 0; i < NUM_STATS; i++)
… …
240 op->update_stats (); 227 op->update_stats ();
241 } 228 }
242 else 229 else
243 op->statusmsg ("Your potion had no effect."); 230 op->statusmsg ("Your potion had no effect.");
244 231
245 decrease_ob (tmp); 232 tmp->decrease ();
246 return 1; 233 return 1;
247 } 234 }
248 235
249 /* improvement potion - only for players */ 236 /* improvement potion - only for players */
250 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 237 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
… …
318 } 305 }
319 else 306 else
320 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE); 307 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
321 } 308 }
322 309
323 decrease_ob (tmp); 310 tmp->decrease ();
324 return 1; 311 return 1;
325 } 312 }
326 313
327 314
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 315 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
347 insert_ob_in_map (fball, op->map, NULL, 0); 334 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 335 }
349 else 336 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 337 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 338
352 decrease_ob (tmp); 339 tmp->decrease ();
353 340
354 /* if youre dead, no point in doing this... */ 341 /* if youre dead, no point in doing this... */
355 if (!QUERY_FLAG (op, FLAG_REMOVED)) 342 if (!QUERY_FLAG (op, FLAG_REMOVED))
356 op->update_stats (); 343 op->update_stats ();
357 344
… …
388 force->speed_left = -1; 375 force->speed_left = -1;
389 force = insert_ob_in_ob (force, op); 376 force = insert_ob_in_ob (force, op);
390 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
391 SET_FLAG (force, FLAG_APPLIED); 378 SET_FLAG (force, FLAG_APPLIED);
392 change_abil (op, force); 379 change_abil (op, force);
393 decrease_ob (tmp); 380 tmp->decrease ();
394 return 1; 381 return 1;
395 } 382 }
396 383
397 /* Only thing left are the stat potions */ 384 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 385 if (op->type == PLAYER)
… …
411 * stat will not be raised by them. fix_player just clears 398 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 399 * up all the stats.
413 */ 400 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 401 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 402 op->update_stats ();
416 decrease_ob (tmp); 403 tmp->decrease ();
417 return 1; 404 return 1;
418} 405}
419 406
420/**************************************************************************** 407/****************************************************************************
421 * Weapon improvement code follows 408 * Weapon improvement code follows
… …
468 { 455 {
469 if (strcmp (op->arch->archname, item) == 0) 456 if (strcmp (op->arch->archname, item) == 0)
470 { 457 {
471 if (op->nrof >= nrof) 458 if (op->nrof >= nrof)
472 { 459 {
473 decrease_ob_nr (op, nrof); 460 op->decrease (nrof);
474 return; 461 return;
475 } 462 }
476 else 463 else
477 { 464 {
478 decrease_ob_nr (op, op->nrof); 465 op->decrease (nrof);
479 nrof -= op->nrof; 466 nrof -= op->nrof;
480 } 467 }
481 468
482 op = prev; 469 op = prev;
483 } 470 }
… …
568static int 555static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 556improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 557{
571 stat += sacrifice_count; 558 stat += sacrifice_count;
572 weapon->last_eat++; 559 weapon->last_eat++;
573 decrease_ob (improver); 560 improver->decrease ();
574 561
575 /* So it updates the players stats and the window */ 562 /* So it updates the players stats and the window */
576 op->update_stats (); 563 op->update_stats ();
577 564
578 op->statusmsg (format ( 565 op->statusmsg (format (
… …
623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 610 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 611 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
625 weapon->stats.exp || /* speed */ 612 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 613 weapon->stats.ac) /* AC - only taifu's I think */
627 { 614 {
628 op->failmsg ("You cannot prepare magic weapons."); 615 op->failmsg ("You cannot prepare magic weapons. "
616 "H<A weapon is considered magical if it changes regeneration, "
617 "speed or ac.>");
629 return 0; 618 return 0;
630 } 619 }
631 620
632 sacrifice_count = check_sacrifice (op, improver); 621 sacrifice_count = check_sacrifice (op, improver);
633 if (sacrifice_count <= 0) 622 if (sacrifice_count <= 0)
… …
644 633
645 sprintf (buf, "%s's %s", &op->name, &weapon->name); 634 sprintf (buf, "%s's %s", &op->name, &weapon->name);
646 weapon->name = weapon->name_pl = buf; 635 weapon->name = weapon->name_pl = buf;
647 weapon->nrof = 0; /* prevents preparing n weapons in the same 636 weapon->nrof = 0; /* prevents preparing n weapons in the same
648 slot at once! */ 637 slot at once! */
649 decrease_ob (improver); 638 improver->decrease ();
650 weapon->last_eat = 0; 639 weapon->last_eat = 0;
651 return 1; 640 return 1;
652} 641}
653
654 642
655/** 643/**
656 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 644 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
657 * This is the new improve weapon code. 645 * This is the new improve weapon code.
658 * Returns 0 if it was not able to work for some reason. 646 * Returns 0 if it was not able to work for some reason.
… …
702 weapon->weight += 5000; /* 5 KG's */ 690 weapon->weight += 5000; /* 5 KG's */
703 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 691 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
704 weapon->last_eat++; 692 weapon->last_eat++;
705 693
706 weapon->item_power++; 694 weapon->item_power++;
707 decrease_ob (improver); 695 improver->decrease ();
708 return 1; 696 return 1;
709 } 697 }
710 698
711 if (improver->stats.sp == IMPROVE_WEIGHT) 699 if (improver->stats.sp == IMPROVE_WEIGHT)
712 { 700 {
… …
716 weapon->weight = 1; 704 weapon->weight = 1;
717 705
718 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 706 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
719 weapon->last_eat++; 707 weapon->last_eat++;
720 weapon->item_power++; 708 weapon->item_power++;
721 decrease_ob (improver); 709 improver->decrease ();
722 return 1; 710 return 1;
723 } 711 }
724 if (improver->stats.sp == IMPROVE_ENCHANT) 712 if (improver->stats.sp == IMPROVE_ENCHANT)
725 { 713 {
726 weapon->magic++; 714 weapon->magic++;
727 weapon->last_eat++; 715 weapon->last_eat++;
728 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 716 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
729 decrease_ob (improver); 717 improver->decrease ();
730 weapon->item_power++; 718 weapon->item_power++;
731 return 1; 719 return 1;
732 } 720 }
733 721
734 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 722 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
834 if (armour->magic >= settings.armor_max_enchant) 822 if (armour->magic >= settings.armor_max_enchant)
835 { 823 {
836 op->failmsg ("This armour can not be enchanted any further!"); 824 op->failmsg ("This armour can not be enchanted any further!");
837 return 0; 825 return 0;
838 } 826 }
827
839 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 828 /* 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. 829 * 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 830 * Note - maybe add scrolls which make the random artifact versions (eg, armour
842 * of gnarg and what not?) 831 * of gnarg and what not?)
843 */ 832 */
… …
845 { 834 {
846 op->failmsg ("This armour will not accept further enchantment."); 835 op->failmsg ("This armour will not accept further enchantment.");
847 return 0; 836 return 0;
848 } 837 }
849 838
850 /* Split objects if needed. Can't insert tmp until the 839 /* Split objects if needed. Can't insert tmp until the
851 * end of this function - otherwise it will just re-merge. 840 * end of this function - otherwise it will just re-merge.
852 */ 841 */
853 if (armour->nrof > 1) 842 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 843
858 armour->magic++; 844 armour->magic++;
859 845
860 if (!settings.armor_speed_linear) 846 if (!settings.armor_speed_linear)
861 { 847 {
… …
898 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 884 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
899 885
900 if (op->type == PLAYER) 886 if (op->type == PLAYER)
901 { 887 {
902 esrv_send_item (op, armour); 888 esrv_send_item (op, armour);
889
903 if (QUERY_FLAG (armour, FLAG_APPLIED)) 890 if (QUERY_FLAG (armour, FLAG_APPLIED))
904 op->update_stats (); 891 op->update_stats ();
905 } 892 }
906 893
907 decrease_ob (improver); 894 improver->decrease ();
908 895
909 if (tmp) 896 if (tmp)
910 { 897 op->insert (tmp);
911 insert_ob_in_ob (tmp, op);
912 esrv_send_item (op, tmp);
913 }
914 898
915 return 1; 899 return 1;
916} 900}
917 901
918/* 902/*
919 * convert_item() returns 1 if anything was converted, 0 if the item was not 903 * 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. 904 * what the converter wants, -1 if the converter is broken.
921 */ 905 *
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. 906 * Takes one type of items and makes another.
928 * converter is the object that is doing the conversion. 907 * converter is the object that is doing the conversion.
929 * item is the object that triggered the converter - if it is not 908 * item is the object that triggered the converter - if it is not
930 * what the converter wants, this will not do anything. 909 * what the converter wants, this will not do anything.
931 */ 910 */
932int 911static int
933convert_item (object *item, object *converter) 912convert_item (object *item, object *converter)
934{ 913{
935 int nr = 0;
936 uint32 price_in; 914 sint64 nr, price_in;
915
916 if (item->flag [FLAG_UNPAID])
917 return 0;
918
919 shstr conv_from = converter->slaying;
920 archetype *conv_to = converter->other_arch;
921 sint64 need = converter->stats.food;
922 sint64 give = converter->stats.sp;
937 923
938 /* We make some assumptions - we assume if it takes money as it type, 924 /* 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 925 * it wants some amount. We don't make change (ie, if something costs
940 * 3 gp and player drops a platinum, tough luck) 926 * 3 gp and player drops a platinum, tough luck)
941 */ 927 */
942 if (CONV_FROM (converter) == shstr_money) 928 if (conv_from == shstr_money)
943 { 929 {
944 if (item->type != MONEY) 930 if (item->type != MONEY)
945 return 0; 931 return 0;
946 932
947 nr = (item->nrof * item->value) / CONV_NEED (converter); 933 nr = sint64 (item->nrof) * item->value / need;
948 if (!nr) 934 if (!nr)
949 return 0; 935 return 0;
950 936
951 converter->play_sound (sound_find ("shop_buy")); 937 converter->play_sound (sound_find ("shop_buy"));
952 938
953 int cost = nr * CONV_NEED (converter) / item->value; 939 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 940
958 decrease_ob_nr (item, cost); 941 item->decrease (cost);
959 942
960 price_in = cost * item->value; 943 price_in = cost * item->value;
961 } 944 }
962 else 945 else
963 { 946 {
964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 947 if (item->type == PLAYER
965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 948 || conv_from != item->arch->archname
949 || (need && need > (uint16) item->nrof))
966 return 0; 950 return 0;
967 951
968 converter->play_sound (sound_find ("convert_item")); 952 converter->play_sound (sound_find ("convert_item"));
969 953
970 if (CONV_NEED (converter)) 954 if (need)
971 { 955 {
972 nr = item->nrof / CONV_NEED (converter); 956 nr = sint64 (item->nrof) / need;
973 decrease_ob_nr (item, nr * CONV_NEED (converter)); 957 item->decrease (nr * need);
974 price_in = nr * CONV_NEED (converter) * item->value; 958 price_in = nr * need * item->value;
975 } 959 }
976 else 960 else
977 { 961 {
978 price_in = item->value; 962 price_in = item->value;
979 item->destroy (); 963 item->destroy ();
… …
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 980 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 981 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 982 }
999 else 983 else
1000 { 984 {
1001 if (converter->other_arch == NULL) 985 if (!conv_to)
1002 { 986 {
1003 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 987 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); 988 &converter->name, &converter->map->path, converter->x, converter->y);
1005 return -1; 989 return -1;
1006 } 990 }
1007 991
1008 item = object_create_arch (converter->other_arch); 992 item = object_create_arch (conv_to);
1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 993 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1010 } 994 }
1011 995
1012 if (CONV_NR (converter)) 996 if (give)
1013 item->nrof = CONV_NR (converter); 997 item->nrof = give;
1014 998
1015 if (nr) 999 if (nr)
1016 item->nrof *= nr; 1000 item->nrof *= nr;
1017 1001
1018 if (is_in_shop (converter)) 1002 if (is_in_shop (converter))
1019 SET_FLAG (item, FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
1020 else if (price_in < item->nrof * item->value) 1004 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 1005 {
1022 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 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); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1024 /** 1008 /**
1025 * elmex: we are going to let the game continue, as the mapcreator 1009 * elmex: we are going to let the game continue, as the mapcreator
… …
1310 } 1294 }
1311 1295
1312 if (op->contr) 1296 if (op->contr)
1313 if (client *ns = op->contr->ns) 1297 if (client *ns = op->contr->ns)
1314 { 1298 {
1299 if (sign->sound)
1315 ns->play_sound (sign->sound); 1300 ns->play_sound (sign->sound);
1316 msgType = get_readable_message_type (sign); 1301 else if (autoapply)
1302 ns->play_sound (sound_find ("msg_voice"));
1317 1303
1318 if (ns->can_msg) 1304 if (ns->can_msg)
1319 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg); 1305 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1320 else 1306 else
1321 { 1307 {
1322 char newbuf[HUGE_BUF]; 1308 msgType = get_readable_message_type (sign);
1323 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg); 1309 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); 1310 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1325 } 1311 }
1326 } 1312 }
1327} 1313}
1328 1314
1329/** 1315/**
… …
1443 1429
1444 if (!trap->value) 1430 if (!trap->value)
1445 { 1431 {
1446 int tot; 1432 int tot;
1447 1433
1448 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1434 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1449 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1435 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1450 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1436 tot += ab->head_ ()->total_weight ();
1451 1437
1452 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1438 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1453 goto leave; 1439 goto leave;
1454 1440
1455 SET_ANIMATION (trap, trap->value); 1441 SET_ANIMATION (trap, trap->value);
… …
1524 * players output. 1510 * players output.
1525 */ 1511 */
1526 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1512 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1527 victim->statusmsg (trap->msg, NDI_NAVY); 1513 victim->statusmsg (trap->msg, NDI_NAVY);
1528 1514
1515 trap->play_sound (trap->sound);
1529 victim->enter_exit (trap); 1516 victim->enter_exit (trap);
1530 } 1517 }
1531 goto leave; 1518 goto leave;
1532 1519
1533 case ENCOUNTER: 1520 case ENCOUNTER:
… …
1600 } 1587 }
1601 1588
1602 lev_diff = tmp->level - (skill_ob->level + 5); 1589 lev_diff = tmp->level - (skill_ob->level + 5);
1603 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1590 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1604 { 1591 {
1605 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1592 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1606 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1593 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1607 : lev_diff < 5 ? "This book is beyond your comprehension." 1594 : lev_diff < 5 ? "This book is beyond your comprehension."
1608 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1595 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1609 : lev_diff < 15 ? "This book is way beyond your comprehension." 1596 : lev_diff < 15 ? "This book is way beyond your comprehension."
1610 : "This book is totally beyond your comprehension."); 1597 : "This book is totally beyond your comprehension.");
… …
1614 readable_message_type *msgType = get_readable_message_type (tmp); 1601 readable_message_type *msgType = get_readable_message_type (tmp);
1615 1602
1616 if (player *pl = op->contr) 1603 if (player *pl = op->contr)
1617 if (client *ns = pl->ns) 1604 if (client *ns = pl->ns)
1618 if (ns->can_msg) 1605 if (ns->can_msg)
1619 { 1606 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 1607 else
1628 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1608 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1629 msgType->message_type, msgType->message_subtype, 1609 msgType->message_type, msgType->message_subtype,
1630 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1610 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1631 long_desc (tmp, op), &tmp->msg); 1611 long_desc (tmp, op), &tmp->msg);
… …
1638 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1618 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1639 { 1619 {
1640 /*exp_gain *= 2; because they just identified it too */ 1620 /*exp_gain *= 2; because they just identified it too */
1641 SET_FLAG (tmp, FLAG_IDENTIFIED); 1621 SET_FLAG (tmp, FLAG_IDENTIFIED);
1642 1622
1643 /* If in a container, update how it looks */ 1623 if (object *pl = tmp->visible_to ())
1644 if (tmp->env)
1645 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1624 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1646 else
1647 op->contr->ns->floorbox_update ();
1648 } 1625 }
1649 1626
1650 change_exp (op, exp_gain, skill_ob->skill, 0); 1627 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 */ 1628 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1652 } 1629 }
… …
1665 op->play_sound (sound_find ("generic_fail")); 1642 op->play_sound (sound_find ("generic_fail"));
1666 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1643 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1667 break; 1644 break;
1668 1645
1669 case 1: 1646 case 1:
1670 decrease_ob (tmp); 1647 tmp->decrease ();
1671 op->play_sound (sound_find ("skill_learn")); 1648 op->play_sound (sound_find ("skill_learn"));
1672 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1649 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1673 break; 1650 break;
1674 1651
1675 default: 1652 default:
1676 decrease_ob (tmp); 1653 tmp->decrease ();
1677 op->play_sound (sound_find ("generic_fail")); 1654 op->play_sound (sound_find ("generic_fail"));
1678 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1655 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1679 break; 1656 break;
1680 } 1657 }
1681} 1658}
… …
1802 } 1779 }
1803 1780
1804 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1781 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1805 1782
1806 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1783 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1807 {
1808 identify (tmp); 1784 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 1785
1816 /* I removed the check for special_prayer_mark here - it didn't make 1786 /* 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 1787 * 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 1788 * if the player doesn't know the spell, doesn't make a lot of sense that
1819 * they would have a special prayer mark. 1789 * they would have a special prayer mark.
… …
1872 { 1842 {
1873 op->contr->play_sound (sound_find ("fumble_spell")); 1843 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"); 1844 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 } 1845 }
1876 1846
1877 decrease_ob (tmp); 1847 tmp->decrease ();
1878} 1848}
1879 1849
1880/** 1850/**
1881 * Handles applying a spell scroll. 1851 * Handles applying a spell scroll.
1882 */ 1852 */
… …
1921 identify (tmp); 1891 identify (tmp);
1922 1892
1923 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1893 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1924 1894
1925 cast_spell (op, tmp, dir, tmp->inv, NULL); 1895 cast_spell (op, tmp, dir, tmp->inv, NULL);
1926 decrease_ob (tmp); 1896 tmp->decrease ();
1927} 1897}
1928 1898
1929/** 1899/**
1930 * Applies a treasure object - by default, chest. op 1900 * Applies a treasure object - by default, chest. op
1931 * is the person doing the applying, tmp is the treasure 1901 * is the person doing the applying, tmp is the treasure
… …
1943 object *treas = tmp->inv; 1913 object *treas = tmp->inv;
1944 1914
1945 if (!treas) 1915 if (!treas)
1946 { 1916 {
1947 op->statusmsg ("The chest was empty."); 1917 op->statusmsg ("The chest was empty.");
1948 decrease_ob (tmp); 1918 tmp->decrease ();
1949 return; 1919 return;
1950 } 1920 }
1951 1921
1952 while (tmp->inv) 1922 while (tmp->inv)
1953 { 1923 {
… …
1969 if (op->destroyed () || tmp->destroyed ()) 1939 if (op->destroyed () || tmp->destroyed ())
1970 break; 1940 break;
1971 } 1941 }
1972 1942
1973 if (!tmp->destroyed () && !tmp->inv) 1943 if (!tmp->destroyed () && !tmp->inv)
1974 decrease_ob (tmp); 1944 tmp->decrease ();
1975} 1945}
1976 1946
1977/** 1947/**
1978 * op eats food. 1948 * op eats food.
1979 * If player, takes care of messages and dragon special food. 1949 * If player, takes care of messages and dragon special food.
… …
1998 if (tmp->type == FOOD || tmp->type == FLESH) 1968 if (tmp->type == FOOD || tmp->type == FLESH)
1999 op->failmsg ("You feel full, but what a waste of food!"); 1969 op->failmsg ("You feel full, but what a waste of food!");
2000 else 1970 else
2001 op->statusmsg ("Most of the drink goes down your face not your throat!"); 1971 op->statusmsg ("Most of the drink goes down your face not your throat!");
2002 } 1972 }
1973
1974 tmp->play_sound (
1975 tmp->sound
1976 ? tmp->sound
1977 : tmp->type == DRINK
1978 ? sound_find ("eat_drink")
1979 : sound_find ("eat_food")
1980 );
2003 1981
2004 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1982 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2005 { 1983 {
2006 const char *buf; 1984 const char *buf;
2007 1985
… …
2037 eat_special_food (op, tmp); 2015 eat_special_food (op, tmp);
2038 } 2016 }
2039 } 2017 }
2040 2018
2041 handle_apply_yield (tmp); 2019 handle_apply_yield (tmp);
2042 decrease_ob (tmp); 2020 tmp->decrease ();
2043} 2021}
2044 2022
2045/** 2023/**
2046 * A dragon is eating some flesh. If the flesh contains resistances, 2024 * A dragon is eating some flesh. If the flesh contains resistances,
2047 * there is a chance for the dragon's skin to get improved. 2025 * there is a chance for the dragon's skin to get improved.
… …
2235 2213
2236 op->statusmsg ("Applying armour enchantment."); 2214 op->statusmsg ("Applying armour enchantment.");
2237 improve_armour (op, tmp, armor); 2215 improve_armour (op, tmp, armor);
2238} 2216}
2239 2217
2240extern void 2218void
2241apply_poison (object *op, object *tmp) 2219apply_poison (object *op, object *tmp)
2242{ 2220{
2221 object *poison = tmp->split (1);
2222
2243 if (op->type == PLAYER) 2223 if (op->type == PLAYER)
2244 { 2224 {
2245 op->contr->play_sound (sound_find ("drink_poison")); 2225 op->contr->play_sound (sound_find ("drink_poison"));
2246 op->failmsg ("Yech! That tasted poisonous!"); 2226 op->failmsg ("Yech! That tasted poisonous!");
2247 strcpy (op->contr->killer, "poisonous booze"); 2227 op->contr->killer = poison;
2248 } 2228 }
2249 2229
2250 if (tmp->stats.hp > 0) 2230 if (poison->stats.hp > 0)
2251 { 2231 {
2252 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2232 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); 2233 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2254 } 2234 }
2255 2235
2256 op->stats.food -= op->stats.food / 4; 2236 op->stats.food -= op->stats.food / 4;
2257 handle_apply_yield (tmp); 2237 handle_apply_yield (poison);
2258 decrease_ob (tmp); 2238 poison->destroy ();
2259} 2239}
2260 2240
2261/** 2241/**
2262 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2242 * 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: 2243 * A valid 2 way exit means:
… …
2278 2258
2279#if 0 //TODO 2259#if 0 //TODO
2280 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2260 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2281 return 0; /* This is a reset town portal */ 2261 return 0; /* This is a reset town portal */
2282#endif 2262#endif
2263
2264 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2283 2265
2284 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2266 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2285 2267
2286 if (exitmap) 2268 if (exitmap)
2287 { 2269 {
… …
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! H<You have to stop levitating first, if you can.>");
2605 return 0; 2587 return 0;
2606 } 2588 }
2607 } 2589 }
2608 2590
2609 pl->contr->last_used = op; 2591 pl->contr->last_used = op;
2610 2592
2611 tmp = manual_apply (pl, op, aflag); 2593 tmp = manual_apply (pl, op, aflag);
2612 if (!quiet) 2594 if (!quiet)
2613 { 2595 {
2614 if (tmp == 0) 2596 if (tmp == 0)
2615 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2597 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2616 else if (tmp == 2) 2598 else if (tmp == 2)
2617 op->failmsg ("You must get it first!\n"); 2599 pl->failmsg ("You must get it first!\n");
2618 } 2600 }
2619 2601
2620 return tmp; 2602 return tmp;
2621} 2603}
2622 2604
… …
2748 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2730 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2749 2731
2750 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2732 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2751 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2733 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2752 2734
2735 op->destroy ();
2736 who->insert (tmp2);
2737 who->update_stats ();
2738
2753 if (who->contr) 2739 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 { 2740 {
2762 if (who->contr) 2741 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2763 { 2742 {
2764 who->failmsg ("Oops, it feels deadly cold!"); 2743 who->failmsg ("Oops, it feels deadly cold!");
2765 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2744 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2766 } 2745 }
2767 } 2746 }
2768
2769 if (who->contr)
2770 esrv_send_item (who, tmp2);
2771 } 2747 }
2772 2748
2773 return 1; /* otherwise, an attempt to drop causes problems */ 2749 return 1; /* otherwise, an attempt to drop causes problems */
2774 2750
2775 case BOW: 2751 case BOW:
… …
2806 default: 2782 default:
2807 who->statusmsg (format ("You unapply %s.", query_name (op))); 2783 who->statusmsg (format ("You unapply %s.", query_name (op)));
2808 break; 2784 break;
2809 } 2785 }
2810 2786
2787 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2788 if (object *pl = op->visible_to ())
2789 esrv_send_item (pl, op);
2790
2811 who->update_stats (); 2791 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 2792
2829 return 0; 2793 return 0;
2830} 2794}
2831 2795
2832/** 2796/**
… …
3211 3175
3212 /* Ok. We are now at the state where we can apply the new object. 3176 /* 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_... 3177 * Note that we don't have the checks for can_use_...
3214 * below - that is already taken care of by can_apply_object. 3178 * below - that is already taken care of by can_apply_object.
3215 */ 3179 */
3216 if (op->nrof > 1) 3180 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 3181
3221 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3222 return RESULT_INT (0); 3183 return RESULT_INT (0);
3223 3184
3224 switch (op->type) 3185 switch (op->type)
… …
3299 SET_FLAG (tmp2, FLAG_APPLIED); 3260 SET_FLAG (tmp2, FLAG_APPLIED);
3300 3261
3301 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3262 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3302 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3263 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3303 3264
3304 insert_ob_in_ob (tmp2, who); 3265 who->insert (tmp2);
3305 3266
3306 /* Remove the old lantern */ 3267 /* Remove the old lantern */
3307 if (who->type == PLAYER)
3308 esrv_del_item (who->contr, op->count);
3309
3310 op->destroy (); 3268 op->destroy ();
3311 3269
3312 /* insert the portion that was split off */ 3270 /* insert the portion that was split off */
3313 if (tmp) 3271 if (tmp)
3314 { 3272 who->insert (tmp);
3315 insert_ob_in_ob (tmp, who);
3316 if (who->type == PLAYER)
3317 esrv_send_item (who, tmp);
3318 }
3319 3273
3320 who->update_stats (); 3274 who->update_stats ();
3321 3275
3322 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3276 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3323 if (who->type == PLAYER) 3277 if (who->type == PLAYER)
3324 { 3278 {
3325 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3279 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); 3280 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3327 } 3281 }
3328
3329 if (who->type == PLAYER)
3330 esrv_send_item (who, tmp2);
3331 3282
3332 return 0; 3283 return 0;
3333 3284
3334 case SKILL_TOOL: 3285 case SKILL_TOOL:
3335 // applying a skill tool also readies the skill 3286 // applying a skill tool also readies the skill
… …
3495 } 3446 }
3496 3447
3497 SET_FLAG (op, FLAG_APPLIED); 3448 SET_FLAG (op, FLAG_APPLIED);
3498 3449
3499 if (tmp) 3450 if (tmp)
3500 tmp = insert_ob_in_ob (tmp, who); 3451 who->insert (tmp);
3501 3452
3502 who->update_stats (); 3453 who->update_stats ();
3503 3454
3504 /* We exclude spell casting objects. The fire code will set the 3455 /* We exclude spell casting objects. The fire code will set the
3505 * been applied flag when they are used - until that point, 3456 * 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.>" 3467 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3517 ); 3468 );
3518 SET_FLAG (op, FLAG_KNOWN_CURSED); 3469 SET_FLAG (op, FLAG_KNOWN_CURSED);
3519 } 3470 }
3520 3471
3521 if (who->type == PLAYER) 3472 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); 3473 esrv_send_item (pl, op);
3528 }
3529 3474
3530 return 0; 3475 return 0;
3531} 3476}
3532 3477
3533int 3478int
… …
3758 /* check for hp, sp change */ 3703 /* check for hp, sp change */
3759 if (food->stats.hp != 0) 3704 if (food->stats.hp != 0)
3760 { 3705 {
3761 if (QUERY_FLAG (food, FLAG_CURSED)) 3706 if (QUERY_FLAG (food, FLAG_CURSED))
3762 { 3707 {
3763 assign (who->contr->killer, food->name); 3708 who->contr->killer = food;
3764 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3709 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3765 who->failmsg ("Eck!...that was poisonous!"); 3710 who->failmsg ("Eck!...that was poisonous!");
3766 } 3711 }
3767 else 3712 else
3768 { 3713 {
… …
3772 who->failmsg ("Eck!...that was poisonous!"); 3717 who->failmsg ("Eck!...that was poisonous!");
3773 3718
3774 who->stats.hp += food->stats.hp; 3719 who->stats.hp += food->stats.hp;
3775 } 3720 }
3776 } 3721 }
3722
3777 if (food->stats.sp != 0) 3723 if (food->stats.sp != 0)
3778 { 3724 {
3779 if (QUERY_FLAG (food, FLAG_CURSED)) 3725 if (QUERY_FLAG (food, FLAG_CURSED))
3780 { 3726 {
3781 who->failmsg ("You are drained of mana!"); 3727 who->failmsg ("You are drained of mana!");
… …
3808 item = find_marked_object (who); 3754 item = find_marked_object (who);
3809 if (item) 3755 if (item)
3810 { 3756 {
3811 if (lighter->last_eat && lighter->stats.food) 3757 if (lighter->last_eat && lighter->stats.food)
3812 { /* lighter gets used up */ 3758 { /* 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 (); 3759 object *oneLighter = lighter->split ();
3818
3819 lighter->nrof -= 1;
3820 oneLighter->nrof = 1;
3821 oneLighter->stats.food--; 3760 oneLighter->stats.food--;
3822 esrv_send_item (who, lighter); 3761 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 } 3762 }
3829 else if (lighter->last_eat) 3763 else if (lighter->last_eat)
3830 { 3764 {
3831 /* no charges left in lighter */ 3765 /* no charges left in lighter */
3832 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3766 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
4089 4023
4090 new_item->nrof = yield; 4024 new_item->nrof = yield;
4091 4025
4092 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4026 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4093 4027
4094 insert_ob_in_ob (new_item, pl); 4028 pl->insert (new_item);
4095 esrv_send_inventory (pl, pl);
4096 /* Eat up one item */ 4029 /* Eat up one item */
4097 decrease_ob_nr (marked, 1); 4030 marked->decrease ();
4098 4031
4099 /* Eat one transformer if needed */ 4032 /* Eat one transformer if needed */
4100 if (transformer->stats.food) 4033 if (transformer->stats.food)
4101 if (--transformer->stats.food == 0) 4034 if (--transformer->stats.food == 0)
4102 decrease_ob_nr (transformer, 1); 4035 transformer->decrease ();
4103} 4036}
4104 4037

Diff Legend

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