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.142 by root, Sun Apr 13 20:21:50 2008 UTC vs.
Revision 1.183 by root, Thu Jan 8 04:35:04 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
53 * subtype 5: arch or race 53 * subtype 5: arch or race
54 * subtype 7: all three 54 * subtype 7: all three
55 */ 55 */
56 if (op->subtype) 56 if (op->subtype)
57 { 57 {
58 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
61 } 61 }
62 else 62 else
63 { 63 {
64 arch_flag = 1; 64 arch_flag = 1;
65 name_flag = 1; 65 name_flag = 1;
… …
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
… …
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 134 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 136 buf << "The item has a story:\r" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 if (shstr_tmp 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
… …
423 406
424/** 407/**
425 * This returns the sum of nrof of item (arch name). 408 * This returns the sum of nrof of item (arch name).
426 */ 409 */
427static int 410static int
428check_item (object *op, const char *item) 411check_item (object *op, shstr_cmp item)
429{ 412{
430 int count = 0; 413 int count = 0;
431 414
432 if (!item) 415 if (!item)
433 return 0; 416 return 0;
434 417
435 for (op = op->below; op; op = op->below) 418 for (op = op->below; op; op = op->below)
436 {
437 if (strcmp (op->arch->archname, item) == 0) 419 if (op->arch->archname == item)
438 {
439 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 420 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
440 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 421 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
441 {
442 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
443 count++;
444 else
445 count += op->nrof; 422 count += op->number_of ();
446 }
447 }
448 }
449 423
450 return count; 424 return count;
451} 425}
452 426
453/** 427/**
… …
455 * op is typically the player, which is only 429 * op is typically the player, which is only
456 * really used to determine what space to look at. 430 * really used to determine what space to look at.
457 * Modified to only eat 'nrof' of objects. 431 * Modified to only eat 'nrof' of objects.
458 */ 432 */
459static void 433static void
460eat_item (object *op, const char *item, uint32 nrof) 434eat_item (object *op, shstr_cmp item, uint32 nrof)
461{ 435{
462 object *prev; 436 object *prev;
463 437
464 prev = op; 438 prev = op;
465 op = op->below; 439 op = op->below;
466 440
467 while (op) 441 while (op)
468 { 442 {
469 if (strcmp (op->arch->archname, item) == 0) 443 if (op->arch->archname == item)
470 { 444 {
471 if (op->nrof >= nrof) 445 if (op->nrof >= nrof)
472 { 446 {
473 decrease_ob_nr (op, nrof); 447 op->decrease (nrof);
474 return; 448 return;
475 } 449 }
476 else 450 else
477 { 451 {
478 decrease_ob_nr (op, op->nrof); 452 op->decrease (nrof);
479 nrof -= op->nrof; 453 nrof -= op->nrof;
480 } 454 }
481 455
482 op = prev; 456 op = prev;
483 } 457 }
… …
568static int 542static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 543improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 544{
571 stat += sacrifice_count; 545 stat += sacrifice_count;
572 weapon->last_eat++; 546 weapon->last_eat++;
573 decrease_ob (improver); 547 improver->decrease ();
574 548
575 /* So it updates the players stats and the window */ 549 /* So it updates the players stats and the window */
576 op->update_stats (); 550 op->update_stats ();
577 551
578 op->statusmsg (format ( 552 op->statusmsg (format (
… …
625 weapon->stats.exp || /* speed */ 599 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 600 weapon->stats.ac) /* AC - only taifu's I think */
627 { 601 {
628 op->failmsg ("You cannot prepare magic weapons. " 602 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, " 603 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>"); 604 "speed or ac, or has other protections.>");
631 return 0; 605 return 0;
632 } 606 }
633 607
634 sacrifice_count = check_sacrifice (op, improver); 608 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 609 if (sacrifice_count <= 0)
… …
646 620
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 621 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 622 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 623 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 624 slot at once! */
651 decrease_ob (improver); 625 improver->decrease ();
652 weapon->last_eat = 0; 626 weapon->last_eat = 0;
653 return 1; 627 return 1;
654} 628}
655
656 629
657/** 630/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 631 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 632 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 633 * Returns 0 if it was not able to work for some reason.
… …
704 weapon->weight += 5000; /* 5 KG's */ 677 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 678 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 679 weapon->last_eat++;
707 680
708 weapon->item_power++; 681 weapon->item_power++;
709 decrease_ob (improver); 682 improver->decrease ();
710 return 1; 683 return 1;
711 } 684 }
712 685
713 if (improver->stats.sp == IMPROVE_WEIGHT) 686 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 687 {
… …
718 weapon->weight = 1; 691 weapon->weight = 1;
719 692
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 693 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 694 weapon->last_eat++;
722 weapon->item_power++; 695 weapon->item_power++;
723 decrease_ob (improver); 696 improver->decrease ();
724 return 1; 697 return 1;
725 } 698 }
699
726 if (improver->stats.sp == IMPROVE_ENCHANT) 700 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 701 {
728 weapon->magic++; 702 weapon->magic++;
729 weapon->last_eat++; 703 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 704 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 705 improver->decrease ();
732 weapon->item_power++; 706 weapon->item_power++;
733 return 1; 707 return 1;
734 } 708 }
735 709
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 710 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 759 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 760 return 0;
787 } 761 }
788 762
789 otmp = find_marked_object (op); 763 otmp = find_marked_object (op);
764
790 if (!otmp) 765 if (!otmp)
791 { 766 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 767 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 768 return 0;
794 } 769 }
… …
851 } 826 }
852 827
853 /* Split objects if needed. Can't insert tmp until the 828 /* Split objects if needed. Can't insert tmp until the
854 * end of this function - otherwise it will just re-merge. 829 * end of this function - otherwise it will just re-merge.
855 */ 830 */
856 if (armour->nrof > 1) 831 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
857 tmp = get_split_ob (armour, armour->nrof - 1);
858 else
859 tmp = NULL;
860 832
861 armour->magic++; 833 armour->magic++;
862 834
863 if (!settings.armor_speed_linear) 835 if (!settings.armor_speed_linear)
864 { 836 {
… …
901 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 873 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
902 874
903 if (op->type == PLAYER) 875 if (op->type == PLAYER)
904 { 876 {
905 esrv_send_item (op, armour); 877 esrv_send_item (op, armour);
878
906 if (QUERY_FLAG (armour, FLAG_APPLIED)) 879 if (QUERY_FLAG (armour, FLAG_APPLIED))
907 op->update_stats (); 880 op->update_stats ();
908 } 881 }
909 882
910 decrease_ob (improver); 883 improver->decrease ();
911 884
912 if (tmp) 885 if (tmp)
913 { 886 op->insert (tmp);
914 insert_ob_in_ob (tmp, op);
915 esrv_send_item (op, tmp);
916 }
917 887
918 return 1; 888 return 1;
919} 889}
920 890
921/* 891/*
… …
955 925
956 converter->play_sound (sound_find ("shop_buy")); 926 converter->play_sound (sound_find ("shop_buy"));
957 927
958 sint64 cost = (nr * need + item->value - 1) / item->value; 928 sint64 cost = (nr * need + item->value - 1) / item->value;
959 929
960 decrease_ob_nr (item, cost); 930 item->decrease (cost);
961 931
962 price_in = cost * item->value; 932 price_in = cost * item->value;
963 } 933 }
964 else 934 else
965 { 935 {
… …
971 converter->play_sound (sound_find ("convert_item")); 941 converter->play_sound (sound_find ("convert_item"));
972 942
973 if (need) 943 if (need)
974 { 944 {
975 nr = sint64 (item->nrof) / need; 945 nr = sint64 (item->nrof) / need;
976 decrease_ob_nr (item, nr * need); 946 item->decrease (nr * need);
977 price_in = nr * need * item->value; 947 price_in = nr * need * item->value;
978 } 948 }
979 else 949 else
980 { 950 {
981 price_in = item->value; 951 price_in = item->value;
… …
993 ob_to_copy = converter->inv; 963 ob_to_copy = converter->inv;
994 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 964 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
995 if (rndm (0, i) == 0) 965 if (rndm (0, i) == 0)
996 ob_to_copy = ob; 966 ob_to_copy = ob;
997 967
998 item = object_create_clone (ob_to_copy); 968 item = ob_to_copy->deep_clone ();
999 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 969 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
1000 unflag_inv (item, FLAG_IS_A_TEMPLATE); 970 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1001 } 971 }
1002 else 972 else
1003 { 973 {
… …
1016 item->nrof = give; 986 item->nrof = give;
1017 987
1018 if (nr) 988 if (nr)
1019 item->nrof *= nr; 989 item->nrof *= nr;
1020 990
1021 if (is_in_shop (converter)) 991 if (converter->flag [FLAG_PRECIOUS])
1022 SET_FLAG (item, FLAG_UNPAID); 992 SET_FLAG (item, FLAG_UNPAID);
993
994 if (is_in_shop (converter))
995 {
996 // converters on shop floors don't work anymore, bug lets check for it
997 // and report in case someone still does it.
998 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
999 converter->debug_desc ());
1000 SET_FLAG (item, FLAG_UNPAID);
1001 }
1023 else if (price_in < sint64 (item->nrof) * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1024 { 1003 {
1025 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",
1026 &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);
1027 /** 1006 /**
1028 * 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
1029 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1030 */ 1009 */
1031 } 1010 }
1032 1011
1033 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
1034 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);
1035 return 1; 1018 return 1;
1036} 1019}
1037 1020
1038/** 1021/**
… …
1134/* push_button (altar);*/ 1117/* push_button (altar);*/
1135 } 1118 }
1136 else 1119 else
1137 { 1120 {
1138 altar->value = 1; /* works only once */ 1121 altar->value = 1; /* works only once */
1139 push_button (altar); 1122 push_button (altar, originator);
1140 } 1123 }
1141 1124
1142 return !sacrifice; 1125 return !sacrifice;
1143 } 1126 }
1144 else 1127 else
… …
1170 { 1153 {
1171 has_unpaid = true; 1154 has_unpaid = true;
1172 break; 1155 break;
1173 } 1156 }
1174 1157
1175 if (op->type != PLAYER) 1158 if (!op->is_player ())
1176 { 1159 {
1177 /* Remove all the unpaid objects that may be carried here. 1160 /* Remove all the unpaid objects that may be carried here.
1178 * This could be pets or monsters that are somehow in 1161 * This could be pets or monsters that are somehow in
1179 * the shop. 1162 * the shop.
1180 */ 1163 */
… …
1184 1167
1185 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1168 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1186 { 1169 {
1187 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1170 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1188 1171
1172 if (i >= 0)
1189 tmp->remove (); 1173 tmp->move (i);
1190
1191 if (i == -1)
1192 i = 0;
1193
1194 tmp->map = op->map;
1195 tmp->x = op->x + freearr_x[i];
1196 tmp->y = op->y + freearr_y[i];
1197 insert_ob_in_map (tmp, op->map, op, 0);
1198 } 1174 }
1199 } 1175 }
1200 1176
1201 /* Don't teleport things like spell effects */ 1177 /* Don't teleport things like spell effects */
1202 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1178 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1213 if (i != -1) 1189 if (i != -1)
1214 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1190 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1215 1191
1216 return 0; 1192 return 0;
1217 } 1193 }
1194
1218 /* Removed code that checked for multipart objects - it appears that 1195 /* Removed code that checked for multipart objects - it appears that
1219 * the teleport function should be able to handle this just fine. 1196 * the teleport function should be able to handle this just fine.
1220 */ 1197 */
1221 rv = teleport (shop_mat, SHOP_MAT, op); 1198 rv = teleport (shop_mat, SHOP_MAT, op);
1222 } 1199 }
… …
1277 * Handles applying a sign. 1254 * Handles applying a sign.
1278 */ 1255 */
1279static void 1256static void
1280apply_sign (object *op, object *sign, int autoapply) 1257apply_sign (object *op, object *sign, int autoapply)
1281{ 1258{
1282 readable_message_type *msgType; 1259 if (!op->is_player())
1260 return;
1261
1262 if (sign->has_dialogue ())
1263 {
1264 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1265 return;
1266 }
1283 1267
1284 if (!sign->msg) 1268 if (!sign->msg)
1285 { 1269 {
1286 op->statusmsg ("Nothing is written on it."); 1270 op->contr->infobox (MSG_CHANNEL ("examine"),
1271 format ("T<%s>\n\n Nothing %sis written on it.",
1272 &sign->name,
1273 sign->name == sign->arch->name ? "" : "else "));
1287 return; 1274 return;
1288 } 1275 }
1289 1276
1290 if (sign->stats.food) 1277 if (sign->stats.food)
1291 { 1278 {
1292 if (sign->last_eat >= sign->stats.food) 1279 if (sign->last_eat >= sign->stats.food)
1293 { 1280 {
1294 if (!sign->move_on) 1281 if (!sign->move_on)
1295 op->statusmsg ("You cannot read it anymore."); 1282 op->failmsg ("You cannot read it anymore.");
1296 1283
1297 return; 1284 return;
1298 } 1285 }
1299 1286
1300 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1287 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1318 if (sign->sound) 1305 if (sign->sound)
1319 ns->play_sound (sign->sound); 1306 ns->play_sound (sign->sound);
1320 else if (autoapply) 1307 else if (autoapply)
1321 ns->play_sound (sound_find ("msg_voice")); 1308 ns->play_sound (sound_find ("msg_voice"));
1322 1309
1323 if (ns->can_msg)
1324 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1310 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1325 else
1326 {
1327 msgType = get_readable_message_type (sign);
1328 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1329 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1330 }
1331 } 1311 }
1312}
1313
1314static void
1315move_apply_hole (object *trap, object *victim)
1316{
1317 /* Hole not open? */
1318 if (trap->stats.wc > 0)
1319 return;
1320
1321 /* Is this a multipart monster and not the head? If so, return.
1322 * Processing will happen if the head runs into the pit
1323 */
1324 if (victim->head)
1325 return;
1326
1327 // now find all possible locations and randomly pick one
1328 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1329 trap->range >= 3 ? SIZEOFFREE3 + 1
1330 : trap->range >= 2 ? SIZEOFFREE2 + 1
1331 : trap->range >= 1 ? SIZEOFFREE1 + 1
1332 : SIZEOFFREE0 + 1);
1333
1334 if (dir < 0)
1335 return;
1336
1337 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1338 victim->statusmsg ("You fall through the hole!", NDI_RED);
1339
1340 transfer_ob (victim,
1341 EXIT_X (trap) + freearr_x[dir],
1342 EXIT_Y (trap) + freearr_y[dir],
1343 0, victim);
1332} 1344}
1333 1345
1334/** 1346/**
1335 * 'victim' moves onto 'trap' 1347 * 'victim' moves onto 'trap'
1336 * 'victim' leaves 'trap' 1348 * 'victim' leaves 'trap'
… …
1411 } 1423 }
1412 goto leave; 1424 goto leave;
1413 1425
1414 case BUTTON: 1426 case BUTTON:
1415 case PEDESTAL: 1427 case PEDESTAL:
1416 update_button (trap); 1428 update_button (trap, originator);
1417 goto leave; 1429 goto leave;
1418 1430
1419 case ALTAR: 1431 case ALTAR:
1420 /* sacrifice victim on trap */ 1432 /* sacrifice victim on trap */
1421 apply_altar (trap, victim, originator); 1433 apply_altar (trap, victim, originator);
… …
1448 1460
1449 if (!trap->value) 1461 if (!trap->value)
1450 { 1462 {
1451 int tot; 1463 int tot;
1452 1464
1453 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1465 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1454 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1466 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1455 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1467 tot += ab->head_ ()->total_weight ();
1456 1468
1457 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1469 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1458 goto leave; 1470 goto leave;
1459 1471
1460 SET_ANIMATION (trap, trap->value); 1472 SET_ANIMATION (trap, trap->value);
… …
1485 1497
1486 case CONVERTER: 1498 case CONVERTER:
1487 if (convert_item (victim, trap) < 0) 1499 if (convert_item (victim, trap) < 0)
1488 { 1500 {
1489 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1501 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1490 get_archetype ("burnout")->insert_at (trap, trap); 1502 archetype::get (shstr_burnout)->insert_at (trap, trap);
1491 } 1503 }
1492 1504
1493 goto leave; 1505 goto leave;
1494 1506
1495 case TRIGGER_BUTTON: 1507 case TRIGGER_BUTTON:
… …
1505 case CHECK_INV: 1517 case CHECK_INV:
1506 check_inv (victim, trap); 1518 check_inv (victim, trap);
1507 goto leave; 1519 goto leave;
1508 1520
1509 case HOLE: 1521 case HOLE:
1510 /* Hole not open? */ 1522 move_apply_hole (trap, victim);
1511 if (trap->stats.wc > 0)
1512 goto leave;
1513
1514 /* Is this a multipart monster and not the head? If so, return.
1515 * Processing will happen if the head runs into the pit
1516 */
1517 if (victim->head)
1518 goto leave;
1519
1520 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1521 victim->statusmsg ("You fall through the hole!", NDI_RED);
1522 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1523 goto leave; 1523 goto leave;
1524 1524
1525 case EXIT: 1525 case EXIT:
1526 if (victim->type == PLAYER && EXIT_PATH (trap)) 1526 if (victim->type == PLAYER && EXIT_PATH (trap))
1527 { 1527 {
1528 /* Basically, don't show exits leading to random maps the 1528 /* Basically, don't show exits leading to random maps the
1529 * players output. 1529 * players output.
1530 */ 1530 */
1531 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1531 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1532 victim->statusmsg (trap->msg, NDI_NAVY); 1532 victim->statusmsg (trap->msg, NDI_NAVY);
1533 1533
1534 trap->play_sound (trap->sound); 1534 trap->play_sound (trap->sound);
1535 victim->enter_exit (trap); 1535 victim->enter_exit (trap);
1536 } 1536 }
… …
1619 1619
1620 readable_message_type *msgType = get_readable_message_type (tmp); 1620 readable_message_type *msgType = get_readable_message_type (tmp);
1621 1621
1622 if (player *pl = op->contr) 1622 if (player *pl = op->contr)
1623 if (client *ns = pl->ns) 1623 if (client *ns = pl->ns)
1624 if (ns->can_msg)
1625 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1624 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1626 else
1627 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1628 msgType->message_type, msgType->message_subtype,
1629 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1630 long_desc (tmp, op), &tmp->msg);
1631 1625
1632 /* gain xp from reading */ 1626 /* gain xp from reading */
1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1627 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1634 { /* only if not read before */ 1628 { /* only if not read before */
1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1629 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1631 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1638 { 1632 {
1639 /*exp_gain *= 2; because they just identified it too */ 1633 /*exp_gain *= 2; because they just identified it too */
1640 SET_FLAG (tmp, FLAG_IDENTIFIED); 1634 SET_FLAG (tmp, FLAG_IDENTIFIED);
1641 1635
1642 /* If in a container, update how it looks */ 1636 if (object *pl = tmp->visible_to ())
1643 if (tmp->env)
1644 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1637 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1645 else
1646 op->contr->ns->floorbox_update ();
1647 } 1638 }
1648 1639
1649 change_exp (op, exp_gain, skill_ob->skill, 0); 1640 change_exp (op, exp_gain, skill_ob->skill, 0);
1650 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1641 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1651 } 1642 }
… …
1664 op->play_sound (sound_find ("generic_fail")); 1655 op->play_sound (sound_find ("generic_fail"));
1665 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1656 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1666 break; 1657 break;
1667 1658
1668 case 1: 1659 case 1:
1669 decrease_ob (tmp); 1660 tmp->decrease ();
1670 op->play_sound (sound_find ("skill_learn")); 1661 op->play_sound (sound_find ("skill_learn"));
1671 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1662 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1672 break; 1663 break;
1673 1664
1674 default: 1665 default:
1675 decrease_ob (tmp); 1666 tmp->decrease ();
1676 op->play_sound (sound_find ("generic_fail")); 1667 op->play_sound (sound_find ("generic_fail"));
1677 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1668 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1678 break; 1669 break;
1679 } 1670 }
1680} 1671}
… …
1801 } 1792 }
1802 1793
1803 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1794 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1804 1795
1805 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1796 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1806 {
1807 identify (tmp); 1797 identify (tmp);
1808
1809 if (tmp->env)
1810 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1811 else
1812 op->contr->ns->floorbox_update ();
1813 }
1814 1798
1815 /* I removed the check for special_prayer_mark here - it didn't make 1799 /* I removed the check for special_prayer_mark here - it didn't make
1816 * a lot of sense - special prayers are not found in spellbooks, and 1800 * a lot of sense - special prayers are not found in spellbooks, and
1817 * if the player doesn't know the spell, doesn't make a lot of sense that 1801 * if the player doesn't know the spell, doesn't make a lot of sense that
1818 * they would have a special prayer mark. 1802 * they would have a special prayer mark.
… …
1871 { 1855 {
1872 op->contr->play_sound (sound_find ("fumble_spell")); 1856 op->contr->play_sound (sound_find ("fumble_spell"));
1873 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1857 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1874 } 1858 }
1875 1859
1876 decrease_ob (tmp); 1860 tmp->decrease ();
1877} 1861}
1878 1862
1879/** 1863/**
1880 * Handles applying a spell scroll. 1864 * Handles applying a spell scroll.
1881 */ 1865 */
… …
1920 identify (tmp); 1904 identify (tmp);
1921 1905
1922 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1906 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1923 1907
1924 cast_spell (op, tmp, dir, tmp->inv, NULL); 1908 cast_spell (op, tmp, dir, tmp->inv, NULL);
1925 decrease_ob (tmp); 1909 tmp->decrease ();
1926} 1910}
1927 1911
1928/** 1912/**
1929 * Applies a treasure object - by default, chest. op 1913 * Applies a treasure object - by default, chest. op
1930 * is the person doing the applying, tmp is the treasure 1914 * is the person doing the applying, tmp is the treasure
… …
1942 object *treas = tmp->inv; 1926 object *treas = tmp->inv;
1943 1927
1944 if (!treas) 1928 if (!treas)
1945 { 1929 {
1946 op->statusmsg ("The chest was empty."); 1930 op->statusmsg ("The chest was empty.");
1947 decrease_ob (tmp); 1931 tmp->decrease ();
1948 return; 1932 return;
1949 } 1933 }
1950 1934
1951 while (tmp->inv) 1935 while (tmp->inv)
1952 { 1936 {
… …
1968 if (op->destroyed () || tmp->destroyed ()) 1952 if (op->destroyed () || tmp->destroyed ())
1969 break; 1953 break;
1970 } 1954 }
1971 1955
1972 if (!tmp->destroyed () && !tmp->inv) 1956 if (!tmp->destroyed () && !tmp->inv)
1973 decrease_ob (tmp); 1957 tmp->decrease (true);
1974} 1958}
1975 1959
1976/** 1960/**
1977 * op eats food. 1961 * op eats food.
1978 * If player, takes care of messages and dragon special food. 1962 * If player, takes care of messages and dragon special food.
… …
2044 eat_special_food (op, tmp); 2028 eat_special_food (op, tmp);
2045 } 2029 }
2046 } 2030 }
2047 2031
2048 handle_apply_yield (tmp); 2032 handle_apply_yield (tmp);
2049 decrease_ob (tmp); 2033 tmp->decrease ();
2050} 2034}
2051 2035
2052/** 2036/**
2053 * A dragon is eating some flesh. If the flesh contains resistances, 2037 * A dragon is eating some flesh. If the flesh contains resistances,
2054 * there is a chance for the dragon's skin to get improved. 2038 * there is a chance for the dragon's skin to get improved.
… …
2173 op->statusmsg (buf); 2157 op->statusmsg (buf);
2174 2158
2175 /* now choose a winner if we have any */ 2159 /* now choose a winner if we have any */
2176 i = -1; 2160 i = -1;
2177 if (winners > 0) 2161 if (winners > 0)
2178 i = atnr_winner[RANDOM () % winners]; 2162 i = atnr_winner [rndm (winners)];
2179 2163
2180 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2164 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2181 { 2165 {
2182 /* resistance increased! */ 2166 /* resistance increased! */
2183 skin->resist[i]++; 2167 skin->resist[i]++;
… …
2242 2226
2243 op->statusmsg ("Applying armour enchantment."); 2227 op->statusmsg ("Applying armour enchantment.");
2244 improve_armour (op, tmp, armor); 2228 improve_armour (op, tmp, armor);
2245} 2229}
2246 2230
2247extern void 2231void
2248apply_poison (object *op, object *tmp) 2232apply_poison (object *op, object *tmp)
2249{ 2233{
2234 // need to do it now when it is still on the map
2235 handle_apply_yield (tmp);
2236
2237 object *poison = tmp->split (1);
2238
2250 if (op->type == PLAYER) 2239 if (op->type == PLAYER)
2251 { 2240 {
2252 op->contr->play_sound (sound_find ("drink_poison")); 2241 op->contr->play_sound (sound_find ("drink_poison"));
2253 op->failmsg ("Yech! That tasted poisonous!"); 2242 op->failmsg ("Yech! That tasted poisonous!");
2254 strcpy (op->contr->killer, "poisonous booze"); 2243 op->contr->killer = poison;
2255 } 2244 }
2256 2245
2257 if (tmp->stats.hp > 0) 2246 if (poison->stats.hp > 0)
2258 { 2247 {
2259 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2248 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2260 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2249 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2261 } 2250 }
2262 2251
2263 op->stats.food -= op->stats.food / 4; 2252 op->stats.food -= op->stats.food / 4;
2264 handle_apply_yield (tmp); 2253 poison->destroy ();
2265 decrease_ob (tmp);
2266} 2254}
2267 2255
2268/** 2256/**
2269 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2257 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2270 * A valid 2 way exit means: 2258 * A valid 2 way exit means:
… …
2372 * them in this function - they are passed to apply_special 2360 * them in this function - they are passed to apply_special
2373 */ 2361 */
2374int 2362int
2375manual_apply (object *op, object *tmp, int aflag) 2363manual_apply (object *op, object *tmp, int aflag)
2376{ 2364{
2377 if (tmp->head)
2378 tmp = tmp->head; 2365 tmp = tmp->head_ ();
2379 2366
2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2367 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2381 { 2368 {
2382 if (op->type == PLAYER) 2369 if (op->type == PLAYER)
2383 { 2370 {
… …
2397 op->play_sound (sound_find ("turn_handle")); 2384 op->play_sound (sound_find ("turn_handle"));
2398 op->statusmsg ("You turn the handle."); 2385 op->statusmsg ("You turn the handle.");
2399 tmp->value = tmp->value ? 0 : 1; 2386 tmp->value = tmp->value ? 0 : 1;
2400 SET_ANIMATION (tmp, tmp->value); 2387 SET_ANIMATION (tmp, tmp->value);
2401 update_object (tmp, UP_OBJ_FACE); 2388 update_object (tmp, UP_OBJ_FACE);
2402 push_button (tmp); 2389 push_button (tmp, op);
2403 return 1; 2390 return 1;
2404 2391
2405 case TRIGGER: 2392 case TRIGGER:
2406 if (check_trigger (tmp, op)) 2393 if (check_trigger (tmp, op))
2407 { 2394 {
… …
2420 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2407 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2421 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2408 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2422 else 2409 else
2423 { 2410 {
2424 /* Don't display messages for random maps. */ 2411 /* Don't display messages for random maps. */
2425 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2412 if (tmp->msg && !EXIT_PATH (tmp).starts_with ("/!"))
2426 op->statusmsg (tmp->msg, NDI_NAVY); 2413 op->statusmsg (tmp->msg, NDI_NAVY);
2427 2414
2428 op->enter_exit (tmp); 2415 op->enter_exit (tmp);
2429 } 2416 }
2430 2417
… …
2591 default: 2578 default:
2592 return 0; 2579 return 0;
2593 } 2580 }
2594} 2581}
2595 2582
2596
2597/* quiet suppresses the "don't know how to apply" and "you must get it first" 2583/* quiet suppresses the "don't know how to apply" and "you must get it first"
2598 * messages as needed by player_apply_below(). But there can still be 2584 * messages as needed by player_apply_below(). But there can still be
2599 * "but you are floating high above the ground" messages. 2585 * "but you are floating high above the ground" messages.
2600 * 2586 *
2601 * Same return value as apply() function. 2587 * Same return value as apply() function.
2602 */ 2588 */
2603int 2589int
2604player_apply (object *pl, object *op, int aflag, int quiet) 2590player_apply (object *pl, object *op, int aflag, int quiet)
2605{ 2591{
2606 int tmp;
2607
2608 if (op->env && (pl->move_type & MOVE_FLYING)) 2592 if (!op->env && (pl->move_type & MOVE_FLYING))
2609 { 2593 {
2610 /* player is flying and applying object not in inventory */ 2594 /* player is flying and applying object not in inventory */
2611 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2595 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2612 { 2596 {
2613 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2597 pl->failmsg ("But you are floating high above the ground! "
2598 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2599 "or waiting till the levitation effect wears off.>");
2614 return 0; 2600 return 0;
2615 } 2601 }
2616 } 2602 }
2617 2603
2618 pl->contr->last_used = op; 2604 pl->contr->last_used = op;
2619 2605
2620 tmp = manual_apply (pl, op, aflag); 2606 int tmp = manual_apply (pl, op, aflag);
2607
2621 if (!quiet) 2608 if (!quiet)
2622 { 2609 {
2623 if (tmp == 0) 2610 if (tmp == 0)
2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2611 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2625 else if (tmp == 2) 2612 else if (tmp == 2)
… …
2660 * person moving on it, also activate. Added code to make it 2647 * person moving on it, also activate. Added code to make it
2661 * so that at least one of players movement types be that which 2648 * so that at least one of players movement types be that which
2662 * the item needs. 2649 * the item needs.
2663 */ 2650 */
2664 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2651 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665 {
2666 if (player_apply (pl, tmp, 0, 1) == 1) 2652 if (player_apply (pl, tmp, 0, 1) == 1)
2667 return; 2653 return;
2668 } 2654
2669 if (floors >= 2) 2655 if (floors >= 2)
2670 return; /* process at most two floor objects */ 2656 return; /* process at most two floor objects */
2671 } 2657 }
2672} 2658}
2673 2659
… …
2717 break; 2703 break;
2718 2704
2719 case SKILL: 2705 case SKILL:
2720 if (who->contr) 2706 if (who->contr)
2721 { 2707 {
2708 if (IS_COMBAT_SKILL (op->subtype))
2709 who->change_weapon (who->contr->combat_ob = 0);
2710 else if (IS_RANGED_SKILL (op->subtype))
2711 who->change_weapon (who->contr->ranged_ob = 0);
2712
2722 if (!op->invisible) 2713 if (op->invisible)
2714 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2715 else
2723 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2716 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2724 else
2725 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2726 } 2717 }
2727 2718
2728 change_abil (who, op); 2719 change_abil (who, op);
2729 CLEAR_FLAG (who, FLAG_READY_SKILL); 2720 CLEAR_FLAG (who, FLAG_READY_SKILL);
2730 break; 2721 break;
… …
2757 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2748 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2758 2749
2759 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2750 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2760 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2751 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2761 2752
2753 op->destroy ();
2754 who->insert (tmp2);
2755 who->update_stats ();
2756
2762 if (who->contr) 2757 if (who->contr)
2763 esrv_del_item (who->contr, op->count);
2764
2765 op->destroy ();
2766 insert_ob_in_ob (tmp2, who);
2767 who->update_stats ();
2768
2769 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2758 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2770 {
2771 if (who->contr)
2772 { 2759 {
2773 who->failmsg ("Oops, it feels deadly cold!"); 2760 who->failmsg ("Oops, it feels deadly cold!");
2774 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2761 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2775 } 2762 }
2776 }
2777
2778 if (who->contr)
2779 esrv_send_item (who, tmp2);
2780 } 2763 }
2781 2764
2782 return 1; /* otherwise, an attempt to drop causes problems */ 2765 return 1; /* otherwise, an attempt to drop causes problems */
2783 2766
2784 case BOW: 2767 case BOW:
… …
2815 default: 2798 default:
2816 who->statusmsg (format ("You unapply %s.", query_name (op))); 2799 who->statusmsg (format ("You unapply %s.", query_name (op)));
2817 break; 2800 break;
2818 } 2801 }
2819 2802
2803 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2804 if (object *pl = op->visible_to ())
2805 esrv_send_item (pl, op);
2806
2820 who->update_stats (); 2807 who->update_stats ();
2821
2822 if (!(aflags & AP_NO_MERGE))
2823 {
2824 object *tmp = merge_ob (op, 0);
2825
2826 if (who->contr)
2827 {
2828 if (tmp)
2829 { /* it was merged */
2830 esrv_del_item (who->contr, op->count);
2831 op = tmp;
2832 }
2833
2834 esrv_send_item (who, op);
2835 }
2836 }
2837 2808
2838 return 0; 2809 return 0;
2839} 2810}
2840 2811
2841/** 2812/**
… …
3139 return 1; 3110 return 1;
3140 } 3111 }
3141 3112
3142 return unapply_special (who, op, aflags); 3113 return unapply_special (who, op, aflags);
3143 } 3114 }
3144
3145 if (basic_flag == AP_UNAPPLY) 3115 else if (basic_flag == AP_UNAPPLY)
3146 return 0; 3116 return 0;
3147 3117
3148 // if the item is combat/ranged, wield the relevant slot first 3118 // if the item is combat/ranged, wield the relevant slot first
3149 // to resolve conflicts. 3119 // to resolve conflicts.
3150 if (player *pl = who->contr) 3120 if (player *pl = who->contr)
… …
3220 3190
3221 /* Ok. We are now at the state where we can apply the new object. 3191 /* Ok. We are now at the state where we can apply the new object.
3222 * Note that we don't have the checks for can_use_... 3192 * Note that we don't have the checks for can_use_...
3223 * below - that is already taken care of by can_apply_object. 3193 * below - that is already taken care of by can_apply_object.
3224 */ 3194 */
3225 if (op->nrof > 1) 3195 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3226 tmp = get_split_ob (op, op->nrof - 1);
3227 else
3228 tmp = 0;
3229 3196
3230 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3197 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3231 return RESULT_INT (0); 3198 return RESULT_INT (0);
3232 3199
3233 switch (op->type) 3200 switch (op->type)
3234 { 3201 {
3235 case WEAPON: 3202 case WEAPON:
3236 if (!check_weapon_power (who, op->last_eat)) 3203 if (!check_weapon_power (who, op->last_eat))
3237 { 3204 {
3238 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3205 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3239 3206
3240 if (tmp) 3207 if (tmp)
3241 insert_ob_in_ob (tmp, who); 3208 insert_ob_in_ob (tmp, who);
3242 3209
3243 return 1; 3210 return 1;
3244 } 3211 }
3245 3212
3246 //TODO: this obviously fails for players using a shorter prefix 3213 //TODO: this obviously fails for players using a shorter prefix
3247 // i.e. "R" can use Ragnarok's sword. 3214 // i.e. "R" can use Ragnarok's sword.
3248 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3215 if (op->level && !op->name.starts_with (who->name))
3249 { 3216 {
3250 /* if the weapon does not have the name as the character, can't use it. */ 3217 /* if the weapon does not have the name as the character, can't use it. */
3251 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3218 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3252 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3219 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3253 3220
… …
3308 SET_FLAG (tmp2, FLAG_APPLIED); 3275 SET_FLAG (tmp2, FLAG_APPLIED);
3309 3276
3310 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3277 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3311 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3278 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3312 3279
3313 insert_ob_in_ob (tmp2, who); 3280 who->insert (tmp2);
3314 3281
3315 /* Remove the old lantern */ 3282 /* Remove the old lantern */
3316 if (who->type == PLAYER)
3317 esrv_del_item (who->contr, op->count);
3318
3319 op->destroy (); 3283 op->destroy ();
3320 3284
3321 /* insert the portion that was split off */ 3285 /* insert the portion that was split off */
3322 if (tmp) 3286 if (tmp)
3323 { 3287 who->insert (tmp);
3324 insert_ob_in_ob (tmp, who);
3325 if (who->type == PLAYER)
3326 esrv_send_item (who, tmp);
3327 }
3328 3288
3329 who->update_stats (); 3289 who->update_stats ();
3330 3290
3331 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3291 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3332 if (who->type == PLAYER) 3292 if (who->type == PLAYER)
3333 { 3293 {
3334 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3294 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3335 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3295 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3336 } 3296 }
3337
3338 if (who->type == PLAYER)
3339 esrv_send_item (who, tmp2);
3340 3297
3341 return 0; 3298 return 0;
3342 3299
3343 case SKILL_TOOL: 3300 case SKILL_TOOL:
3344 // applying a skill tool also readies the skill 3301 // applying a skill tool also readies the skill
… …
3436 insert_ob_in_ob (tmp, who); 3393 insert_ob_in_ob (tmp, who);
3437 3394
3438 return 1; 3395 return 1;
3439 } 3396 }
3440 3397
3441 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3398 if (op->level && !op->name.starts_with (who->name))
3442 { 3399 {
3443 who->failmsg ("The weapon does not recognize you as its owner. " 3400 who->failmsg ("The weapon does not recognize you as its owner. "
3444 "H<Its name indicates that it belongs to somebody else.>"); 3401 "H<Its name indicates that it belongs to somebody else.>");
3445 if (tmp) 3402 if (tmp)
3446 insert_ob_in_ob (tmp, who); 3403 insert_ob_in_ob (tmp, who);
… …
3504 } 3461 }
3505 3462
3506 SET_FLAG (op, FLAG_APPLIED); 3463 SET_FLAG (op, FLAG_APPLIED);
3507 3464
3508 if (tmp) 3465 if (tmp)
3509 tmp = insert_ob_in_ob (tmp, who); 3466 who->insert (tmp);
3510 3467
3511 who->update_stats (); 3468 who->update_stats ();
3512 3469
3513 /* We exclude spell casting objects. The fire code will set the 3470 /* We exclude spell casting objects. The fire code will set the
3514 * been applied flag when they are used - until that point, 3471 * been applied flag when they are used - until that point,
… …
3520 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3477 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3521 if (who->type == PLAYER) 3478 if (who->type == PLAYER)
3522 { 3479 {
3523 who->failmsg ( 3480 who->failmsg (
3524 "Oops, it feels deadly cold! " 3481 "Oops, it feels deadly cold! "
3525 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3482 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3526 ); 3483 );
3527 SET_FLAG (op, FLAG_KNOWN_CURSED); 3484 SET_FLAG (op, FLAG_KNOWN_CURSED);
3528 } 3485 }
3529 3486
3530 if (who->type == PLAYER) 3487 if (object *pl = op->visible_to ())
3531 {
3532 /* if multiple objects were applied, update both slots */
3533 if (tmp)
3534 esrv_send_item (who, tmp);
3535
3536 esrv_send_item (who, op); 3488 esrv_send_item (pl, op);
3537 }
3538 3489
3539 return 0; 3490 return 0;
3540} 3491}
3541 3492
3542int 3493int
… …
3556int 3507int
3557auto_apply (object *op) 3508auto_apply (object *op)
3558{ 3509{
3559 object *tmp = NULL, *tmp2; 3510 object *tmp = NULL, *tmp2;
3560 int i; 3511 int i;
3512
3513 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3561 3514
3562 switch (op->type) 3515 switch (op->type)
3563 { 3516 {
3564 case SHOP_FLOOR: 3517 case SHOP_FLOOR:
3565 if (!op->has_random_items ()) 3518 if (!op->has_random_items ())
… …
3567 3520
3568 do 3521 do
3569 { 3522 {
3570 i = 10; /* let's give it 10 tries */ 3523 i = 10; /* let's give it 10 tries */
3571 while ((tmp = generate_treasure (op->randomitems, 3524 while ((tmp = generate_treasure (op->randomitems,
3572 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3525 op->stats.exp
3526 ? (int) op->stats.exp
3527 : max (op->map->difficulty, 5)))
3528 == NULL && --i);
3529
3573 if (tmp == NULL) 3530 if (tmp == NULL)
3574 return 0; 3531 return 0;
3532
3575 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3533 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3576 { 3534 {
3577 tmp->destroy (); 3535 tmp->destroy ();
3578 tmp = NULL; 3536 tmp = NULL;
3579 } 3537 }
… …
3582 3540
3583 tmp->x = op->x; 3541 tmp->x = op->x;
3584 tmp->y = op->y; 3542 tmp->y = op->y;
3585 SET_FLAG (tmp, FLAG_UNPAID); 3543 SET_FLAG (tmp, FLAG_UNPAID);
3586 insert_ob_in_map (tmp, op->map, NULL, 0); 3544 insert_ob_in_map (tmp, op->map, NULL, 0);
3587 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3588 identify (tmp); 3545 identify (tmp);
3589 break; 3546 break;
3590 3547
3591 case TREASURE: 3548 case TREASURE:
3592 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3549 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3599 /* If we generated an object and put it in this object inventory, 3556 /* If we generated an object and put it in this object inventory,
3600 * move it to the parent object as the current object is about 3557 * move it to the parent object as the current object is about
3601 * to disappear. An example of this item is the random_* stuff 3558 * to disappear. An example of this item is the random_* stuff
3602 * that is put inside other objects. 3559 * that is put inside other objects.
3603 */ 3560 */
3604 for (tmp = op->inv; tmp; tmp = tmp2)
3605 {
3606 tmp2 = tmp->below;
3607 tmp->remove ();
3608
3609 if (op->env) 3561 if (op->env)
3610 insert_ob_in_ob (tmp, op->env); 3562 while (op->inv)
3611 else 3563 op->env->insert (op->inv);
3612 tmp->destroy ();
3613 }
3614 3564
3615 op->destroy (); 3565 op->destroy ();
3616 break; 3566 break;
3617 } 3567 }
3618 return tmp ? 1 : 0; 3568
3569 return !!tmp;
3619} 3570}
3620 3571
3621/** 3572/**
3622 * fix_auto_apply goes through the entire map every time a map 3573 * fix_auto_apply goes through the entire map every time a map
3623 * is loaded or swapped in and performs special actions for 3574 * is loaded or swapped in and performs special actions for
… …
3637 3588
3638 if (tmp->inv) 3589 if (tmp->inv)
3639 { 3590 {
3640 object *invtmp, *invnext; 3591 object *invtmp, *invnext;
3641 3592
3642 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3593 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3643 { 3594 {
3644 invnext = invtmp->below; 3595 invnext = invtmp->below;
3645 3596
3646 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3597 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3647 auto_apply (invtmp); 3598 auto_apply (invtmp);
3648 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3599 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3649 { 3600 {
3650 while ((invtmp->stats.hp--) > 0) 3601 while (invtmp->stats.hp-- > 0)
3651 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3602 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3652 3603
3653 invtmp->randomitems = NULL; 3604 invtmp->randomitems = NULL;
3654 } 3605 }
3655 else if (invtmp && invtmp->arch 3606 else if (invtmp && invtmp->arch
… …
3767 /* check for hp, sp change */ 3718 /* check for hp, sp change */
3768 if (food->stats.hp != 0) 3719 if (food->stats.hp != 0)
3769 { 3720 {
3770 if (QUERY_FLAG (food, FLAG_CURSED)) 3721 if (QUERY_FLAG (food, FLAG_CURSED))
3771 { 3722 {
3772 assign (who->contr->killer, food->name); 3723 who->contr->killer = food;
3773 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3724 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3774 who->failmsg ("Eck!...that was poisonous!"); 3725 who->failmsg ("Eck!...that was poisonous!");
3775 } 3726 }
3776 else 3727 else
3777 { 3728 {
… …
3781 who->failmsg ("Eck!...that was poisonous!"); 3732 who->failmsg ("Eck!...that was poisonous!");
3782 3733
3783 who->stats.hp += food->stats.hp; 3734 who->stats.hp += food->stats.hp;
3784 } 3735 }
3785 } 3736 }
3737
3786 if (food->stats.sp != 0) 3738 if (food->stats.sp != 0)
3787 { 3739 {
3788 if (QUERY_FLAG (food, FLAG_CURSED)) 3740 if (QUERY_FLAG (food, FLAG_CURSED))
3789 { 3741 {
3790 who->failmsg ("You are drained of mana!"); 3742 who->failmsg ("You are drained of mana!");
… …
3817 item = find_marked_object (who); 3769 item = find_marked_object (who);
3818 if (item) 3770 if (item)
3819 { 3771 {
3820 if (lighter->last_eat && lighter->stats.food) 3772 if (lighter->last_eat && lighter->stats.food)
3821 { /* lighter gets used up */ 3773 { /* lighter gets used up */
3822 /* Split multiple lighters if they're being used up. Otherwise *
3823 * one charge from each would be used up. --DAMN */
3824 if (lighter->nrof > 1)
3825 {
3826 object *oneLighter = lighter->clone (); 3774 object *oneLighter = lighter->split ();
3827
3828 lighter->nrof -= 1;
3829 oneLighter->nrof = 1;
3830 oneLighter->stats.food--; 3775 oneLighter->stats.food--;
3831 esrv_send_item (who, lighter); 3776 who->insert (oneLighter);
3832 oneLighter = insert_ob_in_ob (oneLighter, who);
3833 esrv_send_item (who, oneLighter);
3834 }
3835 else
3836 lighter->stats.food--;
3837 } 3777 }
3838 else if (lighter->last_eat) 3778 else if (lighter->last_eat)
3839 { 3779 {
3840 /* no charges left in lighter */ 3780 /* no charges left in lighter */
3841 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3781 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3974 } 3914 }
3975 3915
3976 /* insert the randomitems from the change's treasurelist into 3916 /* insert the randomitems from the change's treasurelist into
3977 * the player ref: player.c 3917 * the player ref: player.c
3978 */ 3918 */
3979 if (change->randomitems != NULL) 3919 if (change->randomitems)
3980 give_initial_items (pl, change->randomitems); 3920 give_initial_items (pl, change->randomitems);
3981 3921
3982 /* set up the face, for some races. */ 3922 /* set up the face, for some races. */
3983 3923
3984 /* first, look for the force object banning 3924 /* first, look for the force object banning
3985 * changing the face. Certain races never change face with class. 3925 * changing the face. Certain races never change face with class.
3986 */ 3926 */
3987 for (walk = pl->inv; walk != NULL; walk = walk->below) 3927 for (walk = pl->inv; walk; walk = walk->below)
3988 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3928 if (walk->name == shstr_NOCLASSFACECHANGE)
3989 flag_change_face = 0; 3929 flag_change_face = 0;
3990 3930
3991 if (flag_change_face) 3931 if (flag_change_face)
3992 { 3932 {
3993 pl->animation_id = GET_ANIM_ID (change);
3994 pl->face = change->face; 3933 pl->face = change->face;
3995 3934 pl->animation_id = change->animation_id;
3996 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3935 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3997 SET_FLAG (pl, FLAG_ANIMATE);
3998 else
3999 CLEAR_FLAG (pl, FLAG_ANIMATE);
4000 } 3936 }
4001 3937
4002 /* check the special case of can't use weapons */ 3938 /* check the special case of can't use weapons */
4003 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3939 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4004 if (!strcmp (change->name, "monk")) 3940 if (change->name == shstr_monk)
4005 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 3941 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4006 3942
4007 break; 3943 break;
4008 } 3944 }
4009 } 3945 }
… …
4046 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 3982 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4047 return; 3983 return;
4048 } 3984 }
4049 3985
4050 /* check whether they are compatible or not */ 3986 /* check whether they are compatible or not */
4051 find = strstr (marked->slaying, transformer->arch->archname); 3987 find = strstr (&marked->slaying, transformer->arch->archname);
4052 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 3988 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4053 { 3989 {
4054 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 3990 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4055 return; 3991 return;
4056 } 3992 }
… …
4098 4034
4099 new_item->nrof = yield; 4035 new_item->nrof = yield;
4100 4036
4101 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4037 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4102 4038
4103 insert_ob_in_ob (new_item, pl); 4039 pl->insert (new_item);
4104 esrv_send_inventory (pl, pl);
4105 /* Eat up one item */ 4040 /* Eat up one item */
4106 decrease_ob_nr (marked, 1); 4041 marked->decrease ();
4107 4042
4108 /* Eat one transformer if needed */ 4043 /* Eat one transformer if needed */
4109 if (transformer->stats.food) 4044 if (transformer->stats.food)
4110 if (--transformer->stats.food == 0) 4045 if (--transformer->stats.food == 0)
4111 decrease_ob_nr (transformer, 1); 4046 transformer->decrease ();
4112} 4047}
4113 4048

Diff Legend

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