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.178 by root, Sun Dec 28 15:28:47 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
53 * subtype 5: arch or race 53 * subtype 5: arch or race
54 * subtype 7: all three 54 * subtype 7: all three
55 */ 55 */
56 if (op->subtype) 56 if (op->subtype)
57 { 57 {
58 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
61 } 61 }
62 else 62 else
63 { 63 {
64 arch_flag = 1; 64 arch_flag = 1;
65 name_flag = 1; 65 name_flag = 1;
… …
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
… …
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 134 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 136 buf << "The item has a story:\r" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 if (shstr yield = tmp->kv (shstr_on_use_yield))
166 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167 yield = get_ob_key_value (tmp, "on_use_yield");
168 if (yield != NULL)
169 {
170 object *drop = get_archetype (yield);
171
172 if (tmp->env)
173 {
174 drop = insert_ob_in_ob (drop, tmp->env);
175 if (tmp->env->type == PLAYER)
176 esrv_send_item (tmp->env, drop);
177 }
178 else
179 {
180 drop->x = tmp->x;
181 drop->y = tmp->y;
182 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
183 }
184 }
185} 167}
186 168
187/** 169/**
188 * Handles applying a potion. 170 * Handles applying a potion.
189 */ 171 */
… …
217 199
218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 200 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
219 { 201 {
220 op->drain_stat (); 202 op->drain_stat ();
221 op->update_stats (); 203 op->update_stats ();
222 decrease_ob (tmp); 204 tmp->decrease ();
223 return 1; 205 return 1;
224 } 206 }
225 207
226 if (!(at = archetype::find (ARCH_DEPLETION))) 208 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 209 {
228 LOG (llevError, "Could not find archetype depletion\n"); 210 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 211 return 0;
230 } 212 }
213
231 depl = present_arch_in_ob (at, op); 214 depl = present_arch_in_ob (at, op);
232 215
233 if (depl) 216 if (depl)
234 { 217 {
235 for (i = 0; i < NUM_STATS; i++) 218 for (i = 0; i < NUM_STATS; i++)
… …
240 op->update_stats (); 223 op->update_stats ();
241 } 224 }
242 else 225 else
243 op->statusmsg ("Your potion had no effect."); 226 op->statusmsg ("Your potion had no effect.");
244 227
245 decrease_ob (tmp); 228 tmp->decrease ();
246 return 1; 229 return 1;
247 } 230 }
248 231
249 /* improvement potion - only for players */ 232 /* improvement potion - only for players */
250 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
… …
318 } 301 }
319 else 302 else
320 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE); 303 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
321 } 304 }
322 305
323 decrease_ob (tmp); 306 tmp->decrease ();
324 return 1; 307 return 1;
325 } 308 }
326 309
327 310
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 311 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
347 insert_ob_in_map (fball, op->map, NULL, 0); 330 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 331 }
349 else 332 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 333 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 334
352 decrease_ob (tmp); 335 tmp->decrease ();
353 336
354 /* if youre dead, no point in doing this... */ 337 /* if youre dead, no point in doing this... */
355 if (!QUERY_FLAG (op, FLAG_REMOVED)) 338 if (!QUERY_FLAG (op, FLAG_REMOVED))
356 op->update_stats (); 339 op->update_stats ();
357 340
… …
388 force->speed_left = -1; 371 force->speed_left = -1;
389 force = insert_ob_in_ob (force, op); 372 force = insert_ob_in_ob (force, op);
390 CLEAR_FLAG (tmp, FLAG_APPLIED); 373 CLEAR_FLAG (tmp, FLAG_APPLIED);
391 SET_FLAG (force, FLAG_APPLIED); 374 SET_FLAG (force, FLAG_APPLIED);
392 change_abil (op, force); 375 change_abil (op, force);
393 decrease_ob (tmp); 376 tmp->decrease ();
394 return 1; 377 return 1;
395 } 378 }
396 379
397 /* Only thing left are the stat potions */ 380 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 381 if (op->type == PLAYER)
… …
411 * stat will not be raised by them. fix_player just clears 394 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 395 * up all the stats.
413 */ 396 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 397 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 398 op->update_stats ();
416 decrease_ob (tmp); 399 tmp->decrease ();
417 return 1; 400 return 1;
418} 401}
419 402
420/**************************************************************************** 403/****************************************************************************
421 * Weapon improvement code follows 404 * Weapon improvement code follows
… …
468 { 451 {
469 if (strcmp (op->arch->archname, item) == 0) 452 if (strcmp (op->arch->archname, item) == 0)
470 { 453 {
471 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
472 { 455 {
473 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
474 return; 457 return;
475 } 458 }
476 else 459 else
477 { 460 {
478 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
479 nrof -= op->nrof; 462 nrof -= op->nrof;
480 } 463 }
481 464
482 op = prev; 465 op = prev;
483 } 466 }
… …
568static int 551static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 552improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 553{
571 stat += sacrifice_count; 554 stat += sacrifice_count;
572 weapon->last_eat++; 555 weapon->last_eat++;
573 decrease_ob (improver); 556 improver->decrease ();
574 557
575 /* So it updates the players stats and the window */ 558 /* So it updates the players stats and the window */
576 op->update_stats (); 559 op->update_stats ();
577 560
578 op->statusmsg (format ( 561 op->statusmsg (format (
… …
625 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
627 { 610 {
628 op->failmsg ("You cannot prepare magic weapons. " 611 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, " 612 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>"); 613 "speed or ac, or has other protections.>");
631 return 0; 614 return 0;
632 } 615 }
633 616
634 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
646 629
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 633 slot at once! */
651 decrease_ob (improver); 634 improver->decrease ();
652 weapon->last_eat = 0; 635 weapon->last_eat = 0;
653 return 1; 636 return 1;
654} 637}
655
656 638
657/** 639/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 640 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 641 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 642 * Returns 0 if it was not able to work for some reason.
… …
704 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 687 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 688 weapon->last_eat++;
707 689
708 weapon->item_power++; 690 weapon->item_power++;
709 decrease_ob (improver); 691 improver->decrease ();
710 return 1; 692 return 1;
711 } 693 }
712 694
713 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 696 {
… …
718 weapon->weight = 1; 700 weapon->weight = 1;
719 701
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 702 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 703 weapon->last_eat++;
722 weapon->item_power++; 704 weapon->item_power++;
723 decrease_ob (improver); 705 improver->decrease ();
724 return 1; 706 return 1;
725 } 707 }
708
726 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 710 {
728 weapon->magic++; 711 weapon->magic++;
729 weapon->last_eat++; 712 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 714 improver->decrease ();
732 weapon->item_power++; 715 weapon->item_power++;
733 return 1; 716 return 1;
734 } 717 }
735 718
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 769 return 0;
787 } 770 }
788 771
789 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
790 if (!otmp) 774 if (!otmp)
791 { 775 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 776 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 777 return 0;
794 } 778 }
… …
851 } 835 }
852 836
853 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
854 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
855 */ 839 */
856 if (armour->nrof > 1) 840 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 841
861 armour->magic++; 842 armour->magic++;
862 843
863 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
864 { 845 {
… …
901 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 882 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
902 883
903 if (op->type == PLAYER) 884 if (op->type == PLAYER)
904 { 885 {
905 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
906 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
907 op->update_stats (); 889 op->update_stats ();
908 } 890 }
909 891
910 decrease_ob (improver); 892 improver->decrease ();
911 893
912 if (tmp) 894 if (tmp)
913 { 895 op->insert (tmp);
914 insert_ob_in_ob (tmp, op);
915 esrv_send_item (op, tmp);
916 }
917 896
918 return 1; 897 return 1;
919} 898}
920 899
921/* 900/*
… …
955 934
956 converter->play_sound (sound_find ("shop_buy")); 935 converter->play_sound (sound_find ("shop_buy"));
957 936
958 sint64 cost = (nr * need + item->value - 1) / item->value; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
959 938
960 decrease_ob_nr (item, cost); 939 item->decrease (cost);
961 940
962 price_in = cost * item->value; 941 price_in = cost * item->value;
963 } 942 }
964 else 943 else
965 { 944 {
… …
971 converter->play_sound (sound_find ("convert_item")); 950 converter->play_sound (sound_find ("convert_item"));
972 951
973 if (need) 952 if (need)
974 { 953 {
975 nr = sint64 (item->nrof) / need; 954 nr = sint64 (item->nrof) / need;
976 decrease_ob_nr (item, nr * need); 955 item->decrease (nr * need);
977 price_in = nr * need * item->value; 956 price_in = nr * need * item->value;
978 } 957 }
979 else 958 else
980 { 959 {
981 price_in = item->value; 960 price_in = item->value;
… …
993 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
994 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 973 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
995 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
996 ob_to_copy = ob; 975 ob_to_copy = ob;
997 976
998 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
999 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
1000 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1001 } 980 }
1002 else 981 else
1003 { 982 {
… …
1016 item->nrof = give; 995 item->nrof = give;
1017 996
1018 if (nr) 997 if (nr)
1019 item->nrof *= nr; 998 item->nrof *= nr;
1020 999
1021 if (is_in_shop (converter)) 1000 if (converter->flag [FLAG_PRECIOUS])
1022 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1002
1003 if (is_in_shop (converter))
1004 {
1005 // converters on shop floors don't work anymore, bug lets check for it
1006 // and report in case someone still does it.
1007 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
1008 converter->debug_desc ());
1009 SET_FLAG (item, FLAG_UNPAID);
1010 }
1023 else if (price_in < sint64 (item->nrof) * item->value) 1011 else if (price_in < sint64 (item->nrof) * item->value)
1024 { 1012 {
1025 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1013 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); 1014 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1027 /** 1015 /**
1028 * elmex: we are going to let the game continue, as the mapcreator 1016 * elmex: we are going to let the game continue, as the mapcreator
1029 * hopefully had something in mind when doing this. 1017 * hopefully had something in mind when doing this.
1030 */ 1018 */
1031 } 1019 }
1032 1020
1033 SET_FLAG (item, FLAG_IDENTIFIED); 1021 // elmex: only identify if we need to, for example so that generated money doesn't
1022 // get an 'identified' flag so easily.
1023 if (need_identify (item))
1024 identify (item);
1025
1034 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1026 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1035 return 1; 1027 return 1;
1036} 1028}
1037 1029
1038/** 1030/**
… …
1170 { 1162 {
1171 has_unpaid = true; 1163 has_unpaid = true;
1172 break; 1164 break;
1173 } 1165 }
1174 1166
1175 if (op->type != PLAYER) 1167 if (!op->is_player ())
1176 { 1168 {
1177 /* Remove all the unpaid objects that may be carried here. 1169 /* Remove all the unpaid objects that may be carried here.
1178 * This could be pets or monsters that are somehow in 1170 * This could be pets or monsters that are somehow in
1179 * the shop. 1171 * the shop.
1180 */ 1172 */
… …
1184 1176
1185 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1177 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1186 { 1178 {
1187 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1179 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1188 1180
1181 if (i >= 0)
1189 tmp->remove (); 1182 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 } 1183 }
1199 } 1184 }
1200 1185
1201 /* Don't teleport things like spell effects */ 1186 /* Don't teleport things like spell effects */
1202 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1187 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1213 if (i != -1) 1198 if (i != -1)
1214 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1199 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1215 1200
1216 return 0; 1201 return 0;
1217 } 1202 }
1203
1218 /* Removed code that checked for multipart objects - it appears that 1204 /* Removed code that checked for multipart objects - it appears that
1219 * the teleport function should be able to handle this just fine. 1205 * the teleport function should be able to handle this just fine.
1220 */ 1206 */
1221 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1222 } 1208 }
… …
1277 * Handles applying a sign. 1263 * Handles applying a sign.
1278 */ 1264 */
1279static void 1265static void
1280apply_sign (object *op, object *sign, int autoapply) 1266apply_sign (object *op, object *sign, int autoapply)
1281{ 1267{
1282 readable_message_type *msgType; 1268 if (sign->has_dialogue ())
1269 {
1270 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1271 return;
1272 }
1283 1273
1284 if (!sign->msg) 1274 if (!sign->msg)
1285 { 1275 {
1286 op->statusmsg ("Nothing is written on it."); 1276 op->contr->infobox (MSG_CHANNEL ("examine"),
1277 format ("T<%s>\n\n Nothing %sis written on it.",
1278 &sign->name,
1279 sign->name == sign->arch->name ? "" : "else "));
1287 return; 1280 return;
1288 } 1281 }
1289 1282
1290 if (sign->stats.food) 1283 if (sign->stats.food)
1291 { 1284 {
1292 if (sign->last_eat >= sign->stats.food) 1285 if (sign->last_eat >= sign->stats.food)
1293 { 1286 {
1294 if (!sign->move_on) 1287 if (!sign->move_on)
1295 op->statusmsg ("You cannot read it anymore."); 1288 op->failmsg ("You cannot read it anymore.");
1296 1289
1297 return; 1290 return;
1298 } 1291 }
1299 1292
1300 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1293 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1318 if (sign->sound) 1311 if (sign->sound)
1319 ns->play_sound (sign->sound); 1312 ns->play_sound (sign->sound);
1320 else if (autoapply) 1313 else if (autoapply)
1321 ns->play_sound (sound_find ("msg_voice")); 1314 ns->play_sound (sound_find ("msg_voice"));
1322 1315
1323 if (ns->can_msg)
1324 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1316 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 } 1317 }
1318}
1319
1320static void
1321move_apply_hole (object *trap, object *victim)
1322{
1323 /* Hole not open? */
1324 if (trap->stats.wc > 0)
1325 return;
1326
1327 /* Is this a multipart monster and not the head? If so, return.
1328 * Processing will happen if the head runs into the pit
1329 */
1330 if (victim->head)
1331 return;
1332
1333 // now find all possible locations and randomly pick one
1334 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1335 trap->range >= 3 ? SIZEOFFREE3 + 1
1336 : trap->range >= 2 ? SIZEOFFREE2 + 1
1337 : trap->range >= 1 ? SIZEOFFREE1 + 1
1338 : SIZEOFFREE0 + 1);
1339
1340 if (dir < 0)
1341 return;
1342
1343 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1344 victim->statusmsg ("You fall through the hole!", NDI_RED);
1345
1346 transfer_ob (victim,
1347 EXIT_X (trap) + freearr_x[dir],
1348 EXIT_Y (trap) + freearr_y[dir],
1349 0, victim);
1332} 1350}
1333 1351
1334/** 1352/**
1335 * 'victim' moves onto 'trap' 1353 * 'victim' moves onto 'trap'
1336 * 'victim' leaves 'trap' 1354 * 'victim' leaves 'trap'
… …
1448 1466
1449 if (!trap->value) 1467 if (!trap->value)
1450 { 1468 {
1451 int tot; 1469 int tot;
1452 1470
1453 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1471 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1454 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1472 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1455 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1473 tot += ab->head_ ()->total_weight ();
1456 1474
1457 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1475 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1458 goto leave; 1476 goto leave;
1459 1477
1460 SET_ANIMATION (trap, trap->value); 1478 SET_ANIMATION (trap, trap->value);
… …
1485 1503
1486 case CONVERTER: 1504 case CONVERTER:
1487 if (convert_item (victim, trap) < 0) 1505 if (convert_item (victim, trap) < 0)
1488 { 1506 {
1489 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1507 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1490 get_archetype ("burnout")->insert_at (trap, trap); 1508 archetype::get (shstr_burnout)->insert_at (trap, trap);
1491 } 1509 }
1492 1510
1493 goto leave; 1511 goto leave;
1494 1512
1495 case TRIGGER_BUTTON: 1513 case TRIGGER_BUTTON:
… …
1505 case CHECK_INV: 1523 case CHECK_INV:
1506 check_inv (victim, trap); 1524 check_inv (victim, trap);
1507 goto leave; 1525 goto leave;
1508 1526
1509 case HOLE: 1527 case HOLE:
1510 /* Hole not open? */ 1528 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; 1529 goto leave;
1524 1530
1525 case EXIT: 1531 case EXIT:
1526 if (victim->type == PLAYER && EXIT_PATH (trap)) 1532 if (victim->type == PLAYER && EXIT_PATH (trap))
1527 { 1533 {
… …
1619 1625
1620 readable_message_type *msgType = get_readable_message_type (tmp); 1626 readable_message_type *msgType = get_readable_message_type (tmp);
1621 1627
1622 if (player *pl = op->contr) 1628 if (player *pl = op->contr)
1623 if (client *ns = pl->ns) 1629 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)); 1630 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 1631
1632 /* gain xp from reading */ 1632 /* gain xp from reading */
1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1634 { /* only if not read before */ 1634 { /* only if not read before */
1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1638 { 1638 {
1639 /*exp_gain *= 2; because they just identified it too */ 1639 /*exp_gain *= 2; because they just identified it too */
1640 SET_FLAG (tmp, FLAG_IDENTIFIED); 1640 SET_FLAG (tmp, FLAG_IDENTIFIED);
1641 1641
1642 /* If in a container, update how it looks */ 1642 if (object *pl = tmp->visible_to ())
1643 if (tmp->env)
1644 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1643 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1645 else
1646 op->contr->ns->floorbox_update ();
1647 } 1644 }
1648 1645
1649 change_exp (op, exp_gain, skill_ob->skill, 0); 1646 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 */ 1647 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1651 } 1648 }
… …
1664 op->play_sound (sound_find ("generic_fail")); 1661 op->play_sound (sound_find ("generic_fail"));
1665 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1662 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1666 break; 1663 break;
1667 1664
1668 case 1: 1665 case 1:
1669 decrease_ob (tmp); 1666 tmp->decrease ();
1670 op->play_sound (sound_find ("skill_learn")); 1667 op->play_sound (sound_find ("skill_learn"));
1671 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1668 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1672 break; 1669 break;
1673 1670
1674 default: 1671 default:
1675 decrease_ob (tmp); 1672 tmp->decrease ();
1676 op->play_sound (sound_find ("generic_fail")); 1673 op->play_sound (sound_find ("generic_fail"));
1677 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1674 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1678 break; 1675 break;
1679 } 1676 }
1680} 1677}
… …
1801 } 1798 }
1802 1799
1803 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1804 1801
1805 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1802 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1806 {
1807 identify (tmp); 1803 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 1804
1815 /* I removed the check for special_prayer_mark here - it didn't make 1805 /* 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 1806 * 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 1807 * if the player doesn't know the spell, doesn't make a lot of sense that
1818 * they would have a special prayer mark. 1808 * they would have a special prayer mark.
… …
1871 { 1861 {
1872 op->contr->play_sound (sound_find ("fumble_spell")); 1862 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"); 1863 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 } 1864 }
1875 1865
1876 decrease_ob (tmp); 1866 tmp->decrease ();
1877} 1867}
1878 1868
1879/** 1869/**
1880 * Handles applying a spell scroll. 1870 * Handles applying a spell scroll.
1881 */ 1871 */
… …
1920 identify (tmp); 1910 identify (tmp);
1921 1911
1922 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1912 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1923 1913
1924 cast_spell (op, tmp, dir, tmp->inv, NULL); 1914 cast_spell (op, tmp, dir, tmp->inv, NULL);
1925 decrease_ob (tmp); 1915 tmp->decrease ();
1926} 1916}
1927 1917
1928/** 1918/**
1929 * Applies a treasure object - by default, chest. op 1919 * Applies a treasure object - by default, chest. op
1930 * is the person doing the applying, tmp is the treasure 1920 * is the person doing the applying, tmp is the treasure
… …
1942 object *treas = tmp->inv; 1932 object *treas = tmp->inv;
1943 1933
1944 if (!treas) 1934 if (!treas)
1945 { 1935 {
1946 op->statusmsg ("The chest was empty."); 1936 op->statusmsg ("The chest was empty.");
1947 decrease_ob (tmp); 1937 tmp->decrease ();
1948 return; 1938 return;
1949 } 1939 }
1950 1940
1951 while (tmp->inv) 1941 while (tmp->inv)
1952 { 1942 {
… …
1968 if (op->destroyed () || tmp->destroyed ()) 1958 if (op->destroyed () || tmp->destroyed ())
1969 break; 1959 break;
1970 } 1960 }
1971 1961
1972 if (!tmp->destroyed () && !tmp->inv) 1962 if (!tmp->destroyed () && !tmp->inv)
1973 decrease_ob (tmp); 1963 tmp->decrease (true);
1974} 1964}
1975 1965
1976/** 1966/**
1977 * op eats food. 1967 * op eats food.
1978 * If player, takes care of messages and dragon special food. 1968 * If player, takes care of messages and dragon special food.
… …
2044 eat_special_food (op, tmp); 2034 eat_special_food (op, tmp);
2045 } 2035 }
2046 } 2036 }
2047 2037
2048 handle_apply_yield (tmp); 2038 handle_apply_yield (tmp);
2049 decrease_ob (tmp); 2039 tmp->decrease ();
2050} 2040}
2051 2041
2052/** 2042/**
2053 * A dragon is eating some flesh. If the flesh contains resistances, 2043 * A dragon is eating some flesh. If the flesh contains resistances,
2054 * there is a chance for the dragon's skin to get improved. 2044 * there is a chance for the dragon's skin to get improved.
… …
2173 op->statusmsg (buf); 2163 op->statusmsg (buf);
2174 2164
2175 /* now choose a winner if we have any */ 2165 /* now choose a winner if we have any */
2176 i = -1; 2166 i = -1;
2177 if (winners > 0) 2167 if (winners > 0)
2178 i = atnr_winner[RANDOM () % winners]; 2168 i = atnr_winner [rndm (winners)];
2179 2169
2180 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2170 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2181 { 2171 {
2182 /* resistance increased! */ 2172 /* resistance increased! */
2183 skin->resist[i]++; 2173 skin->resist[i]++;
… …
2242 2232
2243 op->statusmsg ("Applying armour enchantment."); 2233 op->statusmsg ("Applying armour enchantment.");
2244 improve_armour (op, tmp, armor); 2234 improve_armour (op, tmp, armor);
2245} 2235}
2246 2236
2247extern void 2237void
2248apply_poison (object *op, object *tmp) 2238apply_poison (object *op, object *tmp)
2249{ 2239{
2240 // need to do it now when it is still on the map
2241 handle_apply_yield (tmp);
2242
2243 object *poison = tmp->split (1);
2244
2250 if (op->type == PLAYER) 2245 if (op->type == PLAYER)
2251 { 2246 {
2252 op->contr->play_sound (sound_find ("drink_poison")); 2247 op->contr->play_sound (sound_find ("drink_poison"));
2253 op->failmsg ("Yech! That tasted poisonous!"); 2248 op->failmsg ("Yech! That tasted poisonous!");
2254 strcpy (op->contr->killer, "poisonous booze"); 2249 op->contr->killer = poison;
2255 } 2250 }
2256 2251
2257 if (tmp->stats.hp > 0) 2252 if (poison->stats.hp > 0)
2258 { 2253 {
2259 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2254 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); 2255 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2261 } 2256 }
2262 2257
2263 op->stats.food -= op->stats.food / 4; 2258 op->stats.food -= op->stats.food / 4;
2264 handle_apply_yield (tmp); 2259 poison->destroy ();
2265 decrease_ob (tmp);
2266} 2260}
2267 2261
2268/** 2262/**
2269 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2263 * 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: 2264 * A valid 2 way exit means:
… …
2372 * them in this function - they are passed to apply_special 2366 * them in this function - they are passed to apply_special
2373 */ 2367 */
2374int 2368int
2375manual_apply (object *op, object *tmp, int aflag) 2369manual_apply (object *op, object *tmp, int aflag)
2376{ 2370{
2377 if (tmp->head)
2378 tmp = tmp->head; 2371 tmp = tmp->head_ ();
2379 2372
2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2381 { 2374 {
2382 if (op->type == PLAYER) 2375 if (op->type == PLAYER)
2383 { 2376 {
… …
2591 default: 2584 default:
2592 return 0; 2585 return 0;
2593 } 2586 }
2594} 2587}
2595 2588
2596
2597/* quiet suppresses the "don't know how to apply" and "you must get it first" 2589/* 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 2590 * messages as needed by player_apply_below(). But there can still be
2599 * "but you are floating high above the ground" messages. 2591 * "but you are floating high above the ground" messages.
2600 * 2592 *
2601 * Same return value as apply() function. 2593 * Same return value as apply() function.
2602 */ 2594 */
2603int 2595int
2604player_apply (object *pl, object *op, int aflag, int quiet) 2596player_apply (object *pl, object *op, int aflag, int quiet)
2605{ 2597{
2606 int tmp;
2607
2608 if (op->env && (pl->move_type & MOVE_FLYING)) 2598 if (!op->env && (pl->move_type & MOVE_FLYING))
2609 { 2599 {
2610 /* player is flying and applying object not in inventory */ 2600 /* player is flying and applying object not in inventory */
2611 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2601 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2612 { 2602 {
2613 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2603 pl->failmsg ("But you are floating high above the ground! "
2604 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2605 "or waiting till the levitation effect wears off.>");
2614 return 0; 2606 return 0;
2615 } 2607 }
2616 } 2608 }
2617 2609
2618 pl->contr->last_used = op; 2610 pl->contr->last_used = op;
2619 2611
2620 tmp = manual_apply (pl, op, aflag); 2612 int tmp = manual_apply (pl, op, aflag);
2613
2621 if (!quiet) 2614 if (!quiet)
2622 { 2615 {
2623 if (tmp == 0) 2616 if (tmp == 0)
2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2617 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2625 else if (tmp == 2) 2618 else if (tmp == 2)
… …
2660 * person moving on it, also activate. Added code to make it 2653 * person moving on it, also activate. Added code to make it
2661 * so that at least one of players movement types be that which 2654 * so that at least one of players movement types be that which
2662 * the item needs. 2655 * the item needs.
2663 */ 2656 */
2664 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2657 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665 {
2666 if (player_apply (pl, tmp, 0, 1) == 1) 2658 if (player_apply (pl, tmp, 0, 1) == 1)
2667 return; 2659 return;
2668 } 2660
2669 if (floors >= 2) 2661 if (floors >= 2)
2670 return; /* process at most two floor objects */ 2662 return; /* process at most two floor objects */
2671 } 2663 }
2672} 2664}
2673 2665
… …
2717 break; 2709 break;
2718 2710
2719 case SKILL: 2711 case SKILL:
2720 if (who->contr) 2712 if (who->contr)
2721 { 2713 {
2714 if (IS_COMBAT_SKILL (op->subtype))
2715 who->change_weapon (who->contr->combat_ob = 0);
2716 else if (IS_RANGED_SKILL (op->subtype))
2717 who->change_weapon (who->contr->ranged_ob = 0);
2718
2722 if (!op->invisible) 2719 if (op->invisible)
2720 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2721 else
2723 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2722 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 } 2723 }
2727 2724
2728 change_abil (who, op); 2725 change_abil (who, op);
2729 CLEAR_FLAG (who, FLAG_READY_SKILL); 2726 CLEAR_FLAG (who, FLAG_READY_SKILL);
2730 break; 2727 break;
… …
2757 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2754 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2758 2755
2759 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2760 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2761 2758
2759 op->destroy ();
2760 who->insert (tmp2);
2761 who->update_stats ();
2762
2762 if (who->contr) 2763 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)) 2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2770 {
2771 if (who->contr)
2772 { 2765 {
2773 who->failmsg ("Oops, it feels deadly cold!"); 2766 who->failmsg ("Oops, it feels deadly cold!");
2774 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2775 } 2768 }
2776 }
2777
2778 if (who->contr)
2779 esrv_send_item (who, tmp2);
2780 } 2769 }
2781 2770
2782 return 1; /* otherwise, an attempt to drop causes problems */ 2771 return 1; /* otherwise, an attempt to drop causes problems */
2783 2772
2784 case BOW: 2773 case BOW:
… …
2815 default: 2804 default:
2816 who->statusmsg (format ("You unapply %s.", query_name (op))); 2805 who->statusmsg (format ("You unapply %s.", query_name (op)));
2817 break; 2806 break;
2818 } 2807 }
2819 2808
2809 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2810 if (object *pl = op->visible_to ())
2811 esrv_send_item (pl, op);
2812
2820 who->update_stats (); 2813 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 2814
2838 return 0; 2815 return 0;
2839} 2816}
2840 2817
2841/** 2818/**
… …
3139 return 1; 3116 return 1;
3140 } 3117 }
3141 3118
3142 return unapply_special (who, op, aflags); 3119 return unapply_special (who, op, aflags);
3143 } 3120 }
3144
3145 if (basic_flag == AP_UNAPPLY) 3121 else if (basic_flag == AP_UNAPPLY)
3146 return 0; 3122 return 0;
3147 3123
3148 // if the item is combat/ranged, wield the relevant slot first 3124 // if the item is combat/ranged, wield the relevant slot first
3149 // to resolve conflicts. 3125 // to resolve conflicts.
3150 if (player *pl = who->contr) 3126 if (player *pl = who->contr)
… …
3220 3196
3221 /* Ok. We are now at the state where we can apply the new object. 3197 /* 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_... 3198 * Note that we don't have the checks for can_use_...
3223 * below - that is already taken care of by can_apply_object. 3199 * below - that is already taken care of by can_apply_object.
3224 */ 3200 */
3225 if (op->nrof > 1) 3201 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 3202
3230 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3203 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3231 return RESULT_INT (0); 3204 return RESULT_INT (0);
3232 3205
3233 switch (op->type) 3206 switch (op->type)
3234 { 3207 {
3235 case WEAPON: 3208 case WEAPON:
3236 if (!check_weapon_power (who, op->last_eat)) 3209 if (!check_weapon_power (who, op->last_eat))
3237 { 3210 {
3238 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3211 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3239 3212
3240 if (tmp) 3213 if (tmp)
3241 insert_ob_in_ob (tmp, who); 3214 insert_ob_in_ob (tmp, who);
3242 3215
3243 return 1; 3216 return 1;
… …
3308 SET_FLAG (tmp2, FLAG_APPLIED); 3281 SET_FLAG (tmp2, FLAG_APPLIED);
3309 3282
3310 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3283 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3311 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3284 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3312 3285
3313 insert_ob_in_ob (tmp2, who); 3286 who->insert (tmp2);
3314 3287
3315 /* Remove the old lantern */ 3288 /* Remove the old lantern */
3316 if (who->type == PLAYER)
3317 esrv_del_item (who->contr, op->count);
3318
3319 op->destroy (); 3289 op->destroy ();
3320 3290
3321 /* insert the portion that was split off */ 3291 /* insert the portion that was split off */
3322 if (tmp) 3292 if (tmp)
3323 { 3293 who->insert (tmp);
3324 insert_ob_in_ob (tmp, who);
3325 if (who->type == PLAYER)
3326 esrv_send_item (who, tmp);
3327 }
3328 3294
3329 who->update_stats (); 3295 who->update_stats ();
3330 3296
3331 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3332 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3333 { 3299 {
3334 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3300 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); 3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3336 } 3302 }
3337
3338 if (who->type == PLAYER)
3339 esrv_send_item (who, tmp2);
3340 3303
3341 return 0; 3304 return 0;
3342 3305
3343 case SKILL_TOOL: 3306 case SKILL_TOOL:
3344 // applying a skill tool also readies the skill 3307 // applying a skill tool also readies the skill
… …
3504 } 3467 }
3505 3468
3506 SET_FLAG (op, FLAG_APPLIED); 3469 SET_FLAG (op, FLAG_APPLIED);
3507 3470
3508 if (tmp) 3471 if (tmp)
3509 tmp = insert_ob_in_ob (tmp, who); 3472 who->insert (tmp);
3510 3473
3511 who->update_stats (); 3474 who->update_stats ();
3512 3475
3513 /* We exclude spell casting objects. The fire code will set the 3476 /* We exclude spell casting objects. The fire code will set the
3514 * been applied flag when they are used - until that point, 3477 * been applied flag when they are used - until that point,
… …
3520 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3483 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3521 if (who->type == PLAYER) 3484 if (who->type == PLAYER)
3522 { 3485 {
3523 who->failmsg ( 3486 who->failmsg (
3524 "Oops, it feels deadly cold! " 3487 "Oops, it feels deadly cold! "
3525 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3488 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3526 ); 3489 );
3527 SET_FLAG (op, FLAG_KNOWN_CURSED); 3490 SET_FLAG (op, FLAG_KNOWN_CURSED);
3528 } 3491 }
3529 3492
3530 if (who->type == PLAYER) 3493 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); 3494 esrv_send_item (pl, op);
3537 }
3538 3495
3539 return 0; 3496 return 0;
3540} 3497}
3541 3498
3542int 3499int
… …
3556int 3513int
3557auto_apply (object *op) 3514auto_apply (object *op)
3558{ 3515{
3559 object *tmp = NULL, *tmp2; 3516 object *tmp = NULL, *tmp2;
3560 int i; 3517 int i;
3518
3519 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3561 3520
3562 switch (op->type) 3521 switch (op->type)
3563 { 3522 {
3564 case SHOP_FLOOR: 3523 case SHOP_FLOOR:
3565 if (!op->has_random_items ()) 3524 if (!op->has_random_items ())
… …
3567 3526
3568 do 3527 do
3569 { 3528 {
3570 i = 10; /* let's give it 10 tries */ 3529 i = 10; /* let's give it 10 tries */
3571 while ((tmp = generate_treasure (op->randomitems, 3530 while ((tmp = generate_treasure (op->randomitems,
3572 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3531 op->stats.exp
3532 ? (int) op->stats.exp
3533 : max (op->map->difficulty, 5)))
3534 == NULL && --i);
3535
3573 if (tmp == NULL) 3536 if (tmp == NULL)
3574 return 0; 3537 return 0;
3538
3575 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3539 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3576 { 3540 {
3577 tmp->destroy (); 3541 tmp->destroy ();
3578 tmp = NULL; 3542 tmp = NULL;
3579 } 3543 }
… …
3582 3546
3583 tmp->x = op->x; 3547 tmp->x = op->x;
3584 tmp->y = op->y; 3548 tmp->y = op->y;
3585 SET_FLAG (tmp, FLAG_UNPAID); 3549 SET_FLAG (tmp, FLAG_UNPAID);
3586 insert_ob_in_map (tmp, op->map, NULL, 0); 3550 insert_ob_in_map (tmp, op->map, NULL, 0);
3587 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3588 identify (tmp); 3551 identify (tmp);
3589 break; 3552 break;
3590 3553
3591 case TREASURE: 3554 case TREASURE:
3592 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3555 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3599 /* If we generated an object and put it in this object inventory, 3562 /* 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 3563 * move it to the parent object as the current object is about
3601 * to disappear. An example of this item is the random_* stuff 3564 * to disappear. An example of this item is the random_* stuff
3602 * that is put inside other objects. 3565 * that is put inside other objects.
3603 */ 3566 */
3604 for (tmp = op->inv; tmp; tmp = tmp2)
3605 {
3606 tmp2 = tmp->below;
3607 tmp->remove ();
3608
3609 if (op->env) 3567 if (op->env)
3610 insert_ob_in_ob (tmp, op->env); 3568 while (op->inv)
3611 else 3569 op->env->insert (op->inv);
3612 tmp->destroy ();
3613 }
3614 3570
3615 op->destroy (); 3571 op->destroy ();
3616 break; 3572 break;
3617 } 3573 }
3618 return tmp ? 1 : 0; 3574
3575 return !!tmp;
3619} 3576}
3620 3577
3621/** 3578/**
3622 * fix_auto_apply goes through the entire map every time a map 3579 * fix_auto_apply goes through the entire map every time a map
3623 * is loaded or swapped in and performs special actions for 3580 * is loaded or swapped in and performs special actions for
… …
3637 3594
3638 if (tmp->inv) 3595 if (tmp->inv)
3639 { 3596 {
3640 object *invtmp, *invnext; 3597 object *invtmp, *invnext;
3641 3598
3642 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3599 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3643 { 3600 {
3644 invnext = invtmp->below; 3601 invnext = invtmp->below;
3645 3602
3646 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3603 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3647 auto_apply (invtmp); 3604 auto_apply (invtmp);
3648 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3605 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3649 { 3606 {
3650 while ((invtmp->stats.hp--) > 0) 3607 while (invtmp->stats.hp-- > 0)
3651 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3608 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3652 3609
3653 invtmp->randomitems = NULL; 3610 invtmp->randomitems = NULL;
3654 } 3611 }
3655 else if (invtmp && invtmp->arch 3612 else if (invtmp && invtmp->arch
… …
3767 /* check for hp, sp change */ 3724 /* check for hp, sp change */
3768 if (food->stats.hp != 0) 3725 if (food->stats.hp != 0)
3769 { 3726 {
3770 if (QUERY_FLAG (food, FLAG_CURSED)) 3727 if (QUERY_FLAG (food, FLAG_CURSED))
3771 { 3728 {
3772 assign (who->contr->killer, food->name); 3729 who->contr->killer = food;
3773 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3730 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3774 who->failmsg ("Eck!...that was poisonous!"); 3731 who->failmsg ("Eck!...that was poisonous!");
3775 } 3732 }
3776 else 3733 else
3777 { 3734 {
… …
3781 who->failmsg ("Eck!...that was poisonous!"); 3738 who->failmsg ("Eck!...that was poisonous!");
3782 3739
3783 who->stats.hp += food->stats.hp; 3740 who->stats.hp += food->stats.hp;
3784 } 3741 }
3785 } 3742 }
3743
3786 if (food->stats.sp != 0) 3744 if (food->stats.sp != 0)
3787 { 3745 {
3788 if (QUERY_FLAG (food, FLAG_CURSED)) 3746 if (QUERY_FLAG (food, FLAG_CURSED))
3789 { 3747 {
3790 who->failmsg ("You are drained of mana!"); 3748 who->failmsg ("You are drained of mana!");
… …
3817 item = find_marked_object (who); 3775 item = find_marked_object (who);
3818 if (item) 3776 if (item)
3819 { 3777 {
3820 if (lighter->last_eat && lighter->stats.food) 3778 if (lighter->last_eat && lighter->stats.food)
3821 { /* lighter gets used up */ 3779 { /* 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 (); 3780 object *oneLighter = lighter->split ();
3827
3828 lighter->nrof -= 1;
3829 oneLighter->nrof = 1;
3830 oneLighter->stats.food--; 3781 oneLighter->stats.food--;
3831 esrv_send_item (who, lighter); 3782 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 } 3783 }
3838 else if (lighter->last_eat) 3784 else if (lighter->last_eat)
3839 { 3785 {
3840 /* no charges left in lighter */ 3786 /* no charges left in lighter */
3841 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3787 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3988 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3989 flag_change_face = 0; 3935 flag_change_face = 0;
3990 3936
3991 if (flag_change_face) 3937 if (flag_change_face)
3992 { 3938 {
3993 pl->animation_id = GET_ANIM_ID (change);
3994 pl->face = change->face; 3939 pl->face = change->face;
3995 3940 pl->animation_id = change->animation_id;
3996 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3997 SET_FLAG (pl, FLAG_ANIMATE);
3998 else
3999 CLEAR_FLAG (pl, FLAG_ANIMATE);
4000 } 3942 }
4001 3943
4002 /* check the special case of can't use weapons */ 3944 /* check the special case of can't use weapons */
4003 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3945 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4004 if (!strcmp (change->name, "monk")) 3946 if (!strcmp (change->name, "monk"))
… …
4098 4040
4099 new_item->nrof = yield; 4041 new_item->nrof = yield;
4100 4042
4101 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4043 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4102 4044
4103 insert_ob_in_ob (new_item, pl); 4045 pl->insert (new_item);
4104 esrv_send_inventory (pl, pl);
4105 /* Eat up one item */ 4046 /* Eat up one item */
4106 decrease_ob_nr (marked, 1); 4047 marked->decrease ();
4107 4048
4108 /* Eat one transformer if needed */ 4049 /* Eat one transformer if needed */
4109 if (transformer->stats.food) 4050 if (transformer->stats.food)
4110 if (--transformer->stats.food == 0) 4051 if (--transformer->stats.food == 0)
4111 decrease_ob_nr (transformer, 1); 4052 transformer->decrease ();
4112} 4053}
4113 4054

Diff Legend

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