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.132 by root, Sat Sep 8 09:46:59 2007 UTC vs.
Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
26#include <global.h> 26#include <global.h>
… …
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)
… …
332 */ 315 */
333 if (tmp->inv) 316 if (tmp->inv)
334 { 317 {
335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
336 { 319 {
337 object *fball;
338
339 op->failmsg ("Yech! Your lungs are on fire!"); 320 op->failmsg ("Yech! Your lungs are on fire!");
340 321 create_exploding_ball_at (op, op->level);
341 /* Explodes a fireball centered at player */
342 fball = get_archetype (EXPLODING_FIREBALL);
343 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
344 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
345 fball->x = op->x;
346 fball->y = op->y;
347 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 322 }
349 else 323 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 324 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 325
352 decrease_ob (tmp); 326 tmp->decrease ();
353 327
354 /* if youre dead, no point in doing this... */ 328 /* if youre dead, no point in doing this... */
355 if (!QUERY_FLAG (op, FLAG_REMOVED)) 329 if (!QUERY_FLAG (op, FLAG_REMOVED))
356 op->update_stats (); 330 op->update_stats ();
357 331
… …
388 force->speed_left = -1; 362 force->speed_left = -1;
389 force = insert_ob_in_ob (force, op); 363 force = insert_ob_in_ob (force, op);
390 CLEAR_FLAG (tmp, FLAG_APPLIED); 364 CLEAR_FLAG (tmp, FLAG_APPLIED);
391 SET_FLAG (force, FLAG_APPLIED); 365 SET_FLAG (force, FLAG_APPLIED);
392 change_abil (op, force); 366 change_abil (op, force);
393 decrease_ob (tmp); 367 tmp->decrease ();
394 return 1; 368 return 1;
395 } 369 }
396 370
397 /* Only thing left are the stat potions */ 371 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 372 if (op->type == PLAYER)
399 { /* only for players */ 373 { /* only for players */
400 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 374 if ((QUERY_FLAG (tmp, FLAG_CURSED)
375 || QUERY_FLAG (tmp, FLAG_DAMNED))
376 && tmp->value != 0)
401 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
402 else 378 else
403 SET_FLAG (tmp, FLAG_APPLIED); 379 SET_FLAG (tmp, FLAG_APPLIED);
404 380
405 if (!change_abil (op, tmp)) 381 if (!change_abil (op, tmp))
… …
411 * stat will not be raised by them. fix_player just clears 387 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 388 * up all the stats.
413 */ 389 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 390 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 391 op->update_stats ();
416 decrease_ob (tmp); 392 tmp->decrease ();
417 return 1; 393 return 1;
418} 394}
419 395
420/**************************************************************************** 396/****************************************************************************
421 * Weapon improvement code follows 397 * Weapon improvement code follows
… …
423 399
424/** 400/**
425 * This returns the sum of nrof of item (arch name). 401 * This returns the sum of nrof of item (arch name).
426 */ 402 */
427static int 403static int
428check_item (object *op, const char *item) 404check_item (object *op, shstr_cmp item)
429{ 405{
430 int count = 0; 406 int count = 0;
431 407
432 if (!item) 408 if (!item)
433 return 0; 409 return 0;
434 410
435 for (op = op->below; op; op = op->below) 411 for (op = op->below; op; op = op->below)
436 {
437 if (strcmp (op->arch->archname, item) == 0) 412 if (op->arch->archname == item)
438 {
439 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 413 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
440 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 414 && /* 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; 415 count += op->number_of ();
446 }
447 }
448 }
449 416
450 return count; 417 return count;
451} 418}
452 419
453/** 420/**
… …
455 * op is typically the player, which is only 422 * op is typically the player, which is only
456 * really used to determine what space to look at. 423 * really used to determine what space to look at.
457 * Modified to only eat 'nrof' of objects. 424 * Modified to only eat 'nrof' of objects.
458 */ 425 */
459static void 426static void
460eat_item (object *op, const char *item, uint32 nrof) 427eat_item (object *op, shstr_cmp item, uint32 nrof)
461{ 428{
462 object *prev; 429 object *prev;
463 430
464 prev = op; 431 prev = op;
465 op = op->below; 432 op = op->below;
466 433
467 while (op) 434 while (op)
468 { 435 {
469 if (strcmp (op->arch->archname, item) == 0) 436 if (op->arch->archname == item)
470 { 437 {
471 if (op->nrof >= nrof) 438 if (op->nrof >= nrof)
472 { 439 {
473 decrease_ob_nr (op, nrof); 440 op->decrease (nrof);
474 return; 441 return;
475 } 442 }
476 else 443 else
477 { 444 {
478 decrease_ob_nr (op, op->nrof); 445 op->decrease (nrof);
479 nrof -= op->nrof; 446 nrof -= op->nrof;
480 } 447 }
481 448
482 op = prev; 449 op = prev;
483 } 450 }
… …
568static int 535static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 536improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 537{
571 stat += sacrifice_count; 538 stat += sacrifice_count;
572 weapon->last_eat++; 539 weapon->last_eat++;
573 decrease_ob (improver); 540 improver->decrease ();
574 541
575 /* So it updates the players stats and the window */ 542 /* So it updates the players stats and the window */
576 op->update_stats (); 543 op->update_stats ();
577 544
578 op->statusmsg (format ( 545 op->statusmsg (format (
… …
623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 590 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 591 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
625 weapon->stats.exp || /* speed */ 592 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 593 weapon->stats.ac) /* AC - only taifu's I think */
627 { 594 {
628 op->failmsg ("You cannot prepare magic weapons."); 595 op->failmsg ("You cannot prepare magic weapons. "
596 "H<A weapon is considered magical if it changes regeneration, "
597 "speed or ac, or has other protections.>");
629 return 0; 598 return 0;
630 } 599 }
631 600
632 sacrifice_count = check_sacrifice (op, improver); 601 sacrifice_count = check_sacrifice (op, improver);
633 if (sacrifice_count <= 0) 602 if (sacrifice_count <= 0)
… …
644 613
645 sprintf (buf, "%s's %s", &op->name, &weapon->name); 614 sprintf (buf, "%s's %s", &op->name, &weapon->name);
646 weapon->name = weapon->name_pl = buf; 615 weapon->name = weapon->name_pl = buf;
647 weapon->nrof = 0; /* prevents preparing n weapons in the same 616 weapon->nrof = 0; /* prevents preparing n weapons in the same
648 slot at once! */ 617 slot at once! */
649 decrease_ob (improver); 618 improver->decrease ();
650 weapon->last_eat = 0; 619 weapon->last_eat = 0;
651 return 1; 620 return 1;
652} 621}
653
654 622
655/** 623/**
656 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 624 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
657 * This is the new improve weapon code. 625 * This is the new improve weapon code.
658 * Returns 0 if it was not able to work for some reason. 626 * Returns 0 if it was not able to work for some reason.
… …
702 weapon->weight += 5000; /* 5 KG's */ 670 weapon->weight += 5000; /* 5 KG's */
703 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 671 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
704 weapon->last_eat++; 672 weapon->last_eat++;
705 673
706 weapon->item_power++; 674 weapon->item_power++;
707 decrease_ob (improver); 675 improver->decrease ();
708 return 1; 676 return 1;
709 } 677 }
710 678
711 if (improver->stats.sp == IMPROVE_WEIGHT) 679 if (improver->stats.sp == IMPROVE_WEIGHT)
712 { 680 {
… …
716 weapon->weight = 1; 684 weapon->weight = 1;
717 685
718 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 686 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
719 weapon->last_eat++; 687 weapon->last_eat++;
720 weapon->item_power++; 688 weapon->item_power++;
721 decrease_ob (improver); 689 improver->decrease ();
722 return 1; 690 return 1;
723 } 691 }
692
724 if (improver->stats.sp == IMPROVE_ENCHANT) 693 if (improver->stats.sp == IMPROVE_ENCHANT)
725 { 694 {
726 weapon->magic++; 695 weapon->magic++;
727 weapon->last_eat++; 696 weapon->last_eat++;
728 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 697 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
729 decrease_ob (improver); 698 improver->decrease ();
730 weapon->item_power++; 699 weapon->item_power++;
731 return 1; 700 return 1;
732 } 701 }
733 702
734 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 703 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
783 op->failmsg ("Something blocks the magic of the scroll!"); 752 op->failmsg ("Something blocks the magic of the scroll!");
784 return 0; 753 return 0;
785 } 754 }
786 755
787 otmp = find_marked_object (op); 756 otmp = find_marked_object (op);
757
788 if (!otmp) 758 if (!otmp)
789 { 759 {
790 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 760 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
791 return 0; 761 return 0;
792 } 762 }
… …
834 if (armour->magic >= settings.armor_max_enchant) 804 if (armour->magic >= settings.armor_max_enchant)
835 { 805 {
836 op->failmsg ("This armour can not be enchanted any further!"); 806 op->failmsg ("This armour can not be enchanted any further!");
837 return 0; 807 return 0;
838 } 808 }
809
839 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 810 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
840 * etc), so take the easy way out and don't worry about it. 811 * etc), so take the easy way out and don't worry about it.
841 * Note - maybe add scrolls which make the random artifact versions (eg, armour 812 * Note - maybe add scrolls which make the random artifact versions (eg, armour
842 * of gnarg and what not?) 813 * of gnarg and what not?)
843 */ 814 */
… …
845 { 816 {
846 op->failmsg ("This armour will not accept further enchantment."); 817 op->failmsg ("This armour will not accept further enchantment.");
847 return 0; 818 return 0;
848 } 819 }
849 820
850 /* Split objects if needed. Can't insert tmp until the 821 /* Split objects if needed. Can't insert tmp until the
851 * end of this function - otherwise it will just re-merge. 822 * end of this function - otherwise it will just re-merge.
852 */ 823 */
853 if (armour->nrof > 1) 824 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
854 tmp = get_split_ob (armour, armour->nrof - 1);
855 else
856 tmp = NULL;
857 825
858 armour->magic++; 826 armour->magic++;
859 827
860 if (!settings.armor_speed_linear) 828 if (!settings.armor_speed_linear)
861 { 829 {
… …
898 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 866 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
899 867
900 if (op->type == PLAYER) 868 if (op->type == PLAYER)
901 { 869 {
902 esrv_send_item (op, armour); 870 esrv_send_item (op, armour);
871
903 if (QUERY_FLAG (armour, FLAG_APPLIED)) 872 if (QUERY_FLAG (armour, FLAG_APPLIED))
904 op->update_stats (); 873 op->update_stats ();
905 } 874 }
906 875
907 decrease_ob (improver); 876 improver->decrease ();
908 877
909 if (tmp) 878 if (tmp)
910 { 879 op->insert (tmp);
911 insert_ob_in_ob (tmp, op);
912 esrv_send_item (op, tmp);
913 }
914 880
915 return 1; 881 return 1;
916} 882}
917 883
918/* 884/*
919 * convert_item() returns 1 if anything was converted, 0 if the item was not 885 * convert_item() returns 1 if anything was converted, 0 if the item was not
920 * what the converter wants, -1 if the converter is broken. 886 * what the converter wants, -1 if the converter is broken.
921 */ 887 *
922#define CONV_FROM(xyz) xyz->slaying
923#define CONV_TO(xyz) xyz->other_arch
924#define CONV_NR(xyz) xyz->stats.sp
925#define CONV_NEED(xyz) xyz->stats.food
926
927/* Takes one items and makes another. 888 * Takes one type of items and makes another.
928 * converter is the object that is doing the conversion. 889 * converter is the object that is doing the conversion.
929 * item is the object that triggered the converter - if it is not 890 * item is the object that triggered the converter - if it is not
930 * what the converter wants, this will not do anything. 891 * what the converter wants, this will not do anything.
931 */ 892 */
932int 893static int
933convert_item (object *item, object *converter) 894convert_item (object *item, object *converter)
934{ 895{
935 int nr = 0;
936 uint32 price_in; 896 sint64 nr, price_in;
897
898 if (item->flag [FLAG_UNPAID])
899 return 0;
900
901 shstr conv_from = converter->slaying;
902 archetype *conv_to = converter->other_arch;
903 sint64 need = converter->stats.food;
904 sint64 give = converter->stats.sp;
937 905
938 /* We make some assumptions - we assume if it takes money as it type, 906 /* We make some assumptions - we assume if it takes money as it type,
939 * it wants some amount. We don't make change (ie, if something costs 907 * it wants some amount. We don't make change (ie, if something costs
940 * 3 gp and player drops a platinum, tough luck) 908 * 3 gp and player drops a platinum, tough luck)
941 */ 909 */
942 if (CONV_FROM (converter) == shstr_money) 910 if (conv_from == shstr_money)
943 { 911 {
944 if (item->type != MONEY) 912 if (item->type != MONEY)
945 return 0; 913 return 0;
946 914
947 nr = (item->nrof * item->value) / CONV_NEED (converter); 915 nr = sint64 (item->nrof) * item->value / need;
948 if (!nr) 916 if (!nr)
949 return 0; 917 return 0;
950 918
951 converter->play_sound (sound_find ("shop_buy")); 919 converter->play_sound (sound_find ("shop_buy"));
952 920
953 int cost = nr * CONV_NEED (converter) / item->value; 921 sint64 cost = (nr * need + item->value - 1) / item->value;
954 /* take into account rounding errors */
955 if (nr * CONV_NEED (converter) % item->value)
956 cost++;
957 922
958 decrease_ob_nr (item, cost); 923 item->decrease (cost);
959 924
960 price_in = cost * item->value; 925 price_in = cost * item->value;
961 } 926 }
962 else 927 else
963 { 928 {
964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 929 if (item->type == PLAYER
965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 930 || conv_from != item->arch->archname
931 || (need && need > (uint16) item->nrof))
966 return 0; 932 return 0;
967 933
968 converter->play_sound (sound_find ("convert_item")); 934 converter->play_sound (sound_find ("convert_item"));
969 935
970 if (CONV_NEED (converter)) 936 if (need)
971 { 937 {
972 nr = item->nrof / CONV_NEED (converter); 938 nr = sint64 (item->nrof) / need;
973 decrease_ob_nr (item, nr * CONV_NEED (converter)); 939 item->decrease (nr * need);
974 price_in = nr * CONV_NEED (converter) * item->value; 940 price_in = nr * need * item->value;
975 } 941 }
976 else 942 else
977 { 943 {
978 price_in = item->value; 944 price_in = item->value;
979 item->destroy (); 945 item->destroy ();
… …
990 ob_to_copy = converter->inv; 956 ob_to_copy = converter->inv;
991 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 957 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
992 if (rndm (0, i) == 0) 958 if (rndm (0, i) == 0)
993 ob_to_copy = ob; 959 ob_to_copy = ob;
994 960
995 item = object_create_clone (ob_to_copy); 961 item = ob_to_copy->deep_clone ();
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 962 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 963 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 964 }
999 else 965 else
1000 { 966 {
1001 if (converter->other_arch == NULL) 967 if (!conv_to)
1002 { 968 {
1003 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 969 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
1004 &converter->name, &converter->map->path, converter->x, converter->y); 970 &converter->name, &converter->map->path, converter->x, converter->y);
1005 return -1; 971 return -1;
1006 } 972 }
1007 973
1008 item = object_create_arch (converter->other_arch); 974 item = object_create_arch (conv_to);
1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 975 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1010 } 976 }
1011 977
1012 if (CONV_NR (converter)) 978 if (give)
1013 item->nrof = CONV_NR (converter); 979 item->nrof = give;
1014 980
1015 if (nr) 981 if (nr)
1016 item->nrof *= nr; 982 item->nrof *= nr;
1017 983
1018 if (is_in_shop (converter)) 984 if (converter->flag [FLAG_PRECIOUS])
1019 SET_FLAG (item, FLAG_UNPAID); 985 SET_FLAG (item, FLAG_UNPAID);
986
987 if (is_in_shop (converter))
988 {
989 // converters on shop floors don't work anymore, bug lets check for it
990 // and report in case someone still does it.
991 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
992 converter->debug_desc ());
993 SET_FLAG (item, FLAG_UNPAID);
994 }
1020 else if (price_in < item->nrof * item->value) 995 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 996 {
1022 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 997 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1023 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 998 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1024 /** 999 /**
1025 * elmex: we are going to let the game continue, as the mapcreator 1000 * elmex: we are going to let the game continue, as the mapcreator
1026 * hopefully had something in mind when doing this. 1001 * hopefully had something in mind when doing this.
1027 */ 1002 */
1028 } 1003 }
1029 1004
1030 SET_FLAG (item, FLAG_IDENTIFIED); 1005 // elmex: only identify if we need to, for example so that generated money doesn't
1006 // get an 'identified' flag so easily.
1007 if (need_identify (item))
1008 identify (item);
1009
1031 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1032 return 1; 1011 return 1;
1033} 1012}
1034 1013
1035/** 1014/**
… …
1131/* push_button (altar);*/ 1110/* push_button (altar);*/
1132 } 1111 }
1133 else 1112 else
1134 { 1113 {
1135 altar->value = 1; /* works only once */ 1114 altar->value = 1; /* works only once */
1136 push_button (altar); 1115 push_button (altar, originator);
1137 } 1116 }
1138 1117
1139 return !sacrifice; 1118 return !sacrifice;
1140 } 1119 }
1141 else 1120 else
… …
1167 { 1146 {
1168 has_unpaid = true; 1147 has_unpaid = true;
1169 break; 1148 break;
1170 } 1149 }
1171 1150
1172 if (op->type != PLAYER) 1151 if (!op->is_player ())
1173 { 1152 {
1174 /* Remove all the unpaid objects that may be carried here. 1153 /* Remove all the unpaid objects that may be carried here.
1175 * This could be pets or monsters that are somehow in 1154 * This could be pets or monsters that are somehow in
1176 * the shop. 1155 * the shop.
1177 */ 1156 */
… …
1181 1160
1182 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1161 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1183 { 1162 {
1184 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1163 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1185 1164
1165 if (i >= 0)
1186 tmp->remove (); 1166 tmp->move (i);
1187
1188 if (i == -1)
1189 i = 0;
1190
1191 tmp->map = op->map;
1192 tmp->x = op->x + freearr_x[i];
1193 tmp->y = op->y + freearr_y[i];
1194 insert_ob_in_map (tmp, op->map, op, 0);
1195 } 1167 }
1196 } 1168 }
1197 1169
1198 /* Don't teleport things like spell effects */ 1170 /* Don't teleport things like spell effects */
1199 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1171 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1210 if (i != -1) 1182 if (i != -1)
1211 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1183 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1212 1184
1213 return 0; 1185 return 0;
1214 } 1186 }
1187
1215 /* Removed code that checked for multipart objects - it appears that 1188 /* Removed code that checked for multipart objects - it appears that
1216 * the teleport function should be able to handle this just fine. 1189 * the teleport function should be able to handle this just fine.
1217 */ 1190 */
1218 rv = teleport (shop_mat, SHOP_MAT, op); 1191 rv = teleport (shop_mat, SHOP_MAT, op);
1219 } 1192 }
… …
1274 * Handles applying a sign. 1247 * Handles applying a sign.
1275 */ 1248 */
1276static void 1249static void
1277apply_sign (object *op, object *sign, int autoapply) 1250apply_sign (object *op, object *sign, int autoapply)
1278{ 1251{
1279 readable_message_type *msgType; 1252 if (!op->is_player())
1253 return;
1254
1255 if (sign->has_dialogue ())
1256 {
1257 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1258 return;
1259 }
1280 1260
1281 if (!sign->msg) 1261 if (!sign->msg)
1282 { 1262 {
1283 op->statusmsg ("Nothing is written on it."); 1263 op->contr->infobox (MSG_CHANNEL ("examine"),
1264 format ("T<%s>\n\n Nothing %sis written on it.",
1265 &sign->name,
1266 sign->name == sign->arch->name ? "" : "else "));
1284 return; 1267 return;
1285 } 1268 }
1286 1269
1287 if (sign->stats.food) 1270 if (sign->stats.food)
1288 { 1271 {
1289 if (sign->last_eat >= sign->stats.food) 1272 if (sign->last_eat >= sign->stats.food)
1290 { 1273 {
1291 if (!sign->move_on) 1274 if (!sign->move_on)
1292 op->statusmsg ("You cannot read it anymore."); 1275 op->failmsg ("You cannot read it anymore.");
1293 1276
1294 return; 1277 return;
1295 } 1278 }
1296 1279
1297 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1280 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1310 } 1293 }
1311 1294
1312 if (op->contr) 1295 if (op->contr)
1313 if (client *ns = op->contr->ns) 1296 if (client *ns = op->contr->ns)
1314 { 1297 {
1298 if (sign->sound)
1315 ns->play_sound (sign->sound); 1299 ns->play_sound (sign->sound);
1300 else if (autoapply)
1301 ns->play_sound (sound_find ("msg_voice"));
1316 1302
1317 if (ns->can_msg)
1318 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1303 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1319 else
1320 {
1321 msgType = get_readable_message_type (sign);
1322 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1323 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1324 }
1325 } 1304 }
1305}
1306
1307static void
1308move_apply_hole (object *trap, object *victim)
1309{
1310 /* Hole not open? */
1311 if (trap->stats.wc > 0)
1312 return;
1313
1314 /* Is this a multipart monster and not the head? If so, return.
1315 * Processing will happen if the head runs into the pit
1316 */
1317 if (victim->head)
1318 return;
1319
1320 // now find all possible locations and randomly pick one
1321 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1322 trap->range >= 3 ? SIZEOFFREE3 + 1
1323 : trap->range >= 2 ? SIZEOFFREE2 + 1
1324 : trap->range >= 1 ? SIZEOFFREE1 + 1
1325 : SIZEOFFREE0 + 1);
1326
1327 if (dir < 0)
1328 return;
1329
1330 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1331 victim->statusmsg ("You fall through the hole!", NDI_RED);
1332
1333 transfer_ob (victim,
1334 EXIT_X (trap) + freearr_x[dir],
1335 EXIT_Y (trap) + freearr_y[dir],
1336 0, victim);
1326} 1337}
1327 1338
1328/** 1339/**
1329 * 'victim' moves onto 'trap' 1340 * 'victim' moves onto 'trap'
1330 * 'victim' leaves 'trap' 1341 * 'victim' leaves 'trap'
… …
1405 } 1416 }
1406 goto leave; 1417 goto leave;
1407 1418
1408 case BUTTON: 1419 case BUTTON:
1409 case PEDESTAL: 1420 case PEDESTAL:
1410 update_button (trap); 1421 update_button (trap, originator);
1411 goto leave; 1422 goto leave;
1412 1423
1413 case ALTAR: 1424 case ALTAR:
1414 /* sacrifice victim on trap */ 1425 /* sacrifice victim on trap */
1415 apply_altar (trap, victim, originator); 1426 apply_altar (trap, victim, originator);
… …
1442 1453
1443 if (!trap->value) 1454 if (!trap->value)
1444 { 1455 {
1445 int tot; 1456 int tot;
1446 1457
1447 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1458 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1448 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1459 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1449 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1460 tot += ab->head_ ()->total_weight ();
1450 1461
1451 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1462 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1452 goto leave; 1463 goto leave;
1453 1464
1454 SET_ANIMATION (trap, trap->value); 1465 SET_ANIMATION (trap, trap->value);
… …
1479 1490
1480 case CONVERTER: 1491 case CONVERTER:
1481 if (convert_item (victim, trap) < 0) 1492 if (convert_item (victim, trap) < 0)
1482 { 1493 {
1483 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1494 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1484 get_archetype ("burnout")->insert_at (trap, trap); 1495 archetype::get (shstr_burnout)->insert_at (trap, trap);
1485 } 1496 }
1486 1497
1487 goto leave; 1498 goto leave;
1488 1499
1489 case TRIGGER_BUTTON: 1500 case TRIGGER_BUTTON:
… …
1499 case CHECK_INV: 1510 case CHECK_INV:
1500 check_inv (victim, trap); 1511 check_inv (victim, trap);
1501 goto leave; 1512 goto leave;
1502 1513
1503 case HOLE: 1514 case HOLE:
1504 /* Hole not open? */ 1515 move_apply_hole (trap, victim);
1505 if (trap->stats.wc > 0)
1506 goto leave;
1507
1508 /* Is this a multipart monster and not the head? If so, return.
1509 * Processing will happen if the head runs into the pit
1510 */
1511 if (victim->head)
1512 goto leave;
1513
1514 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1515 victim->statusmsg ("You fall through the hole!", NDI_RED);
1516 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1517 goto leave; 1516 goto leave;
1518 1517
1519 case EXIT: 1518 case EXIT:
1520 if (victim->type == PLAYER && EXIT_PATH (trap)) 1519 if (victim->type == PLAYER && EXIT_PATH (trap))
1521 { 1520 {
1522 /* Basically, don't show exits leading to random maps the 1521 /* Basically, don't show exits leading to random maps the
1523 * players output. 1522 * players output.
1524 */ 1523 */
1525 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1524 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1526 victim->statusmsg (trap->msg, NDI_NAVY); 1525 victim->statusmsg (trap->msg, NDI_NAVY);
1527 1526
1528 trap->play_sound (trap->sound); 1527 trap->play_sound (trap->sound);
1529 victim->enter_exit (trap); 1528 victim->enter_exit (trap);
1530 } 1529 }
… …
1600 } 1599 }
1601 1600
1602 lev_diff = tmp->level - (skill_ob->level + 5); 1601 lev_diff = tmp->level - (skill_ob->level + 5);
1603 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1602 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1604 { 1603 {
1605 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1604 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1606 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1605 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1607 : lev_diff < 5 ? "This book is beyond your comprehension." 1606 : lev_diff < 5 ? "This book is beyond your comprehension."
1608 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1607 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1609 : lev_diff < 15 ? "This book is way beyond your comprehension." 1608 : lev_diff < 15 ? "This book is way beyond your comprehension."
1610 : "This book is totally beyond your comprehension."); 1609 : "This book is totally beyond your comprehension.");
… …
1613 1612
1614 readable_message_type *msgType = get_readable_message_type (tmp); 1613 readable_message_type *msgType = get_readable_message_type (tmp);
1615 1614
1616 if (player *pl = op->contr) 1615 if (player *pl = op->contr)
1617 if (client *ns = pl->ns) 1616 if (client *ns = pl->ns)
1618 if (ns->can_msg) 1617 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1619 {
1620 dynbuf_text buf;
1621 buf << long_desc (tmp, op)
1622 << "\n\n"
1623 << tmp->msg
1624 << '\0';
1625 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1626 }
1627 else
1628 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1629 msgType->message_type, msgType->message_subtype,
1630 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1631 long_desc (tmp, op), &tmp->msg);
1632 1618
1633 /* gain xp from reading */ 1619 /* gain xp from reading */
1634 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1620 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1635 { /* only if not read before */ 1621 { /* only if not read before */
1636 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1622 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1638 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1624 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1639 { 1625 {
1640 /*exp_gain *= 2; because they just identified it too */ 1626 /*exp_gain *= 2; because they just identified it too */
1641 SET_FLAG (tmp, FLAG_IDENTIFIED); 1627 SET_FLAG (tmp, FLAG_IDENTIFIED);
1642 1628
1643 /* If in a container, update how it looks */ 1629 if (object *pl = tmp->visible_to ())
1644 if (tmp->env)
1645 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1630 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1646 else
1647 op->contr->ns->floorbox_update ();
1648 } 1631 }
1649 1632
1650 change_exp (op, exp_gain, skill_ob->skill, 0); 1633 change_exp (op, exp_gain, skill_ob->skill, 0);
1651 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1634 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1652 } 1635 }
… …
1665 op->play_sound (sound_find ("generic_fail")); 1648 op->play_sound (sound_find ("generic_fail"));
1666 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1649 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1667 break; 1650 break;
1668 1651
1669 case 1: 1652 case 1:
1670 decrease_ob (tmp); 1653 tmp->decrease ();
1671 op->play_sound (sound_find ("skill_learn")); 1654 op->play_sound (sound_find ("skill_learn"));
1672 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1655 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1673 break; 1656 break;
1674 1657
1675 default: 1658 default:
1676 decrease_ob (tmp); 1659 tmp->decrease ();
1677 op->play_sound (sound_find ("generic_fail")); 1660 op->play_sound (sound_find ("generic_fail"));
1678 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1661 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1679 break; 1662 break;
1680 } 1663 }
1681} 1664}
… …
1802 } 1785 }
1803 1786
1804 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1787 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1805 1788
1806 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1789 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1807 {
1808 identify (tmp); 1790 identify (tmp);
1809
1810 if (tmp->env)
1811 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1812 else
1813 op->contr->ns->floorbox_update ();
1814 }
1815 1791
1816 /* I removed the check for special_prayer_mark here - it didn't make 1792 /* I removed the check for special_prayer_mark here - it didn't make
1817 * a lot of sense - special prayers are not found in spellbooks, and 1793 * a lot of sense - special prayers are not found in spellbooks, and
1818 * if the player doesn't know the spell, doesn't make a lot of sense that 1794 * if the player doesn't know the spell, doesn't make a lot of sense that
1819 * they would have a special prayer mark. 1795 * they would have a special prayer mark.
… …
1872 { 1848 {
1873 op->contr->play_sound (sound_find ("fumble_spell")); 1849 op->contr->play_sound (sound_find ("fumble_spell"));
1874 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1850 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1875 } 1851 }
1876 1852
1877 decrease_ob (tmp); 1853 tmp->decrease ();
1878} 1854}
1879 1855
1880/** 1856/**
1881 * Handles applying a spell scroll. 1857 * Handles applying a spell scroll.
1882 */ 1858 */
… …
1921 identify (tmp); 1897 identify (tmp);
1922 1898
1923 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1899 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1924 1900
1925 cast_spell (op, tmp, dir, tmp->inv, NULL); 1901 cast_spell (op, tmp, dir, tmp->inv, NULL);
1926 decrease_ob (tmp); 1902 tmp->decrease ();
1927} 1903}
1928 1904
1929/** 1905/**
1930 * Applies a treasure object - by default, chest. op 1906 * Applies a treasure object - by default, chest. op
1931 * is the person doing the applying, tmp is the treasure 1907 * is the person doing the applying, tmp is the treasure
… …
1943 object *treas = tmp->inv; 1919 object *treas = tmp->inv;
1944 1920
1945 if (!treas) 1921 if (!treas)
1946 { 1922 {
1947 op->statusmsg ("The chest was empty."); 1923 op->statusmsg ("The chest was empty.");
1948 decrease_ob (tmp); 1924 tmp->decrease ();
1949 return; 1925 return;
1950 } 1926 }
1951 1927
1952 while (tmp->inv) 1928 while (tmp->inv)
1953 { 1929 {
… …
1969 if (op->destroyed () || tmp->destroyed ()) 1945 if (op->destroyed () || tmp->destroyed ())
1970 break; 1946 break;
1971 } 1947 }
1972 1948
1973 if (!tmp->destroyed () && !tmp->inv) 1949 if (!tmp->destroyed () && !tmp->inv)
1974 decrease_ob (tmp); 1950 tmp->decrease (true);
1975} 1951}
1976 1952
1977/** 1953/**
1978 * op eats food. 1954 * op eats food.
1979 * If player, takes care of messages and dragon special food. 1955 * If player, takes care of messages and dragon special food.
… …
2045 eat_special_food (op, tmp); 2021 eat_special_food (op, tmp);
2046 } 2022 }
2047 } 2023 }
2048 2024
2049 handle_apply_yield (tmp); 2025 handle_apply_yield (tmp);
2050 decrease_ob (tmp); 2026 tmp->decrease ();
2051} 2027}
2052 2028
2053/** 2029/**
2054 * A dragon is eating some flesh. If the flesh contains resistances, 2030 * A dragon is eating some flesh. If the flesh contains resistances,
2055 * there is a chance for the dragon's skin to get improved. 2031 * there is a chance for the dragon's skin to get improved.
… …
2174 op->statusmsg (buf); 2150 op->statusmsg (buf);
2175 2151
2176 /* now choose a winner if we have any */ 2152 /* now choose a winner if we have any */
2177 i = -1; 2153 i = -1;
2178 if (winners > 0) 2154 if (winners > 0)
2179 i = atnr_winner[RANDOM () % winners]; 2155 i = atnr_winner [rndm (winners)];
2180 2156
2181 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2157 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2182 { 2158 {
2183 /* resistance increased! */ 2159 /* resistance increased! */
2184 skin->resist[i]++; 2160 skin->resist[i]++;
… …
2243 2219
2244 op->statusmsg ("Applying armour enchantment."); 2220 op->statusmsg ("Applying armour enchantment.");
2245 improve_armour (op, tmp, armor); 2221 improve_armour (op, tmp, armor);
2246} 2222}
2247 2223
2248extern void 2224void
2249apply_poison (object *op, object *tmp) 2225apply_poison (object *op, object *tmp)
2250{ 2226{
2227 // need to do it now when it is still on the map
2228 handle_apply_yield (tmp);
2229
2230 object *poison = tmp->split (1);
2231
2251 if (op->type == PLAYER) 2232 if (op->type == PLAYER)
2252 { 2233 {
2253 op->contr->play_sound (sound_find ("drink_poison")); 2234 op->contr->play_sound (sound_find ("drink_poison"));
2254 op->failmsg ("Yech! That tasted poisonous!"); 2235 op->failmsg ("Yech! That tasted poisonous!");
2255 strcpy (op->contr->killer, "poisonous booze"); 2236 op->contr->killer = poison;
2256 } 2237 }
2257 2238
2258 if (tmp->stats.hp > 0) 2239 if (poison->stats.hp > 0)
2259 { 2240 {
2260 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2241 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2261 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2242 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2262 } 2243 }
2263 2244
2264 op->stats.food -= op->stats.food / 4; 2245 op->stats.food -= op->stats.food / 4;
2265 handle_apply_yield (tmp); 2246 poison->destroy ();
2266 decrease_ob (tmp);
2267} 2247}
2268 2248
2269/** 2249/**
2270 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2250 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2271 * A valid 2 way exit means: 2251 * A valid 2 way exit means:
… …
2355 2335
2356 return 0; 2336 return 0;
2357} 2337}
2358 2338
2359/** 2339/**
2340 * This function will try to apply a lighter and in case no lighter
2341 * is specified it will try to find a lighter in the players inventory,
2342 * and inform him about this requirement.
2343 *
2344 * who - the player
2345 * op - the item we want to light
2346 * ligher - the lighter or 0 if a lighter has yet to be found
2347 */
2348object *auto_apply_lighter (object *who, object *op, object *lighter)
2349{
2350 if (lighter == 0)
2351 {
2352 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2353 {
2354 if (tmp->type == LIGHTER)
2355 {
2356 lighter = tmp;
2357 break;
2358 }
2359 }
2360
2361 if (!lighter)
2362 {
2363 who->failmsg (format (
2364 "You can't light up the %s with your bare hands! "
2365 "H<You need a lighter in your inventory, for example a flint and steel.>",
2366 &op->name));
2367 return 0;
2368 }
2369 }
2370
2371 // last_eat == 0 means the lighter is not being used up!
2372 if (lighter->last_eat && lighter->stats.food)
2373 {
2374 /* lighter gets used up */
2375 lighter = lighter->split ();
2376 lighter->stats.food--;
2377 who->insert (lighter);
2378 }
2379 else if (lighter->last_eat)
2380 {
2381 /* no charges left in lighter */
2382 who->failmsg (format (
2383 "You attempt to light the %s with a used up %s.",
2384 &op->name, &lighter->name));
2385 return 0;
2386 }
2387
2388 return lighter;
2389}
2390
2391/**
2392 * Designed primarily to light torches/lanterns/etc.
2393 * Also burns up burnable material too. First object in the inventory is
2394 * the selected object to "burn". -b.t.
2395 */
2396void
2397apply_lighter (object *who, object *lighter)
2398{
2399 object *item;
2400 int is_player_env = 0;
2401
2402 item = find_marked_object (who);
2403 if (item)
2404 {
2405 if (!auto_apply_lighter (who, 0, lighter))
2406 return;
2407
2408 /* Perhaps we should split what we are trying to light on fire?
2409 * I can't see many times when you would want to light multiple
2410 * objects at once.
2411 */
2412
2413 save_throw_object (item, AT_FIRE, who);
2414
2415 if (item->destroyed ()
2416 || ((item->type == LAMP || item->type == TORCH)
2417 && item->glow_radius > 0))
2418 who->statusmsg (format (
2419 "You light the %s with the %s.",
2420 &item->name, &lighter->name));
2421 else
2422 who->failmsg (format (
2423 "You attempt to light the %s with the %s and fail.",
2424 &item->name, &lighter->name));
2425 }
2426 else
2427 who->failmsg ("You need to mark a lightable object.");
2428}
2429
2430/**
2431 * This function generates a cursed effect for cursed lamps and torches.
2432 */
2433void player_apply_lamp_cursed_effect (object *who, object *op)
2434{
2435 if (op->level)
2436 {
2437 who->failmsg (format (
2438 "The %s was cursed, it explodes in a big fireball!",
2439 &op->name));
2440 create_exploding_ball_at (who, op->level);
2441 }
2442 else
2443 {
2444 who->failmsg (format (
2445 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2446 &op->name));
2447 }
2448
2449 op->destroy ();
2450}
2451
2452/**
2453 * Apply for players and lamps
2454 *
2455 * who - the player
2456 * op - the lamp
2457 */
2458void player_apply_lamp (object *who, object *op)
2459{
2460 bool switch_on = op->glow_radius ? false : true;
2461
2462 if (switch_on)
2463 {
2464 object *lighter = 0;
2465
2466 if (op->flag [FLAG_IS_LIGHTABLE]
2467 && !(lighter = auto_apply_lighter (who, op, 0)))
2468 return;
2469
2470 if (op->stats.food < 1)
2471 {
2472 if (op->type == LAMP)
2473 who->failmsg (format (
2474 "The %s is out of fuel! "
2475 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2476 &op->name));
2477 else
2478 who->failmsg (format (
2479 "The %s is burnt out! "
2480 "H<Torches and similar items burn out and become worthless.>",
2481 &op->name));
2482 return;
2483 }
2484
2485 if (op->flag [FLAG_CURSED])
2486 {
2487 player_apply_lamp_cursed_effect (who, op);
2488 return;
2489 }
2490
2491 if (lighter)
2492 who->statusmsg (format (
2493 "You light up the %s with the %s.", &op->name, &lighter->name));
2494 else
2495 who->statusmsg (format ("You light up the %s.", &op->name));
2496 }
2497 else
2498 {
2499 if (op->flag [FLAG_CURSED])
2500 {
2501 player_apply_lamp_cursed_effect (who, op);
2502 return;
2503 }
2504
2505 if (op->type == TORCH)
2506 {
2507 if (!op->flag [FLAG_IS_LIGHTABLE])
2508 {
2509 who->statusmsg (format (
2510 "You put out the %s. "
2511 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2512 &op->name, &op->name));
2513 }
2514 else
2515 who->statusmsg (format (
2516 "You put out the %s."
2517 "H<Torches wear out if you put them out.>",
2518 &op->name));
2519 }
2520 else
2521 who->statusmsg (format ("You turn off the %s.", &op->name));
2522 }
2523
2524 apply_lamp (op, switch_on);
2525}
2526
2527void get_animation_from_arch (object *op, arch_ptr a)
2528{
2529 op->animation_id = a->animation_id;
2530 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2531 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2532 op->anim_speed = a->anim_speed;
2533 op->last_anim = 0;
2534 op->state = 0;
2535 op->face = a->face;
2536
2537 if (NUM_ANIMATIONS(op) > 1)
2538 {
2539 SET_ANIMATION(op, 0);
2540 animate_object (op, op->direction);
2541 }
2542 else
2543 update_object (op, UP_OBJ_FACE);
2544}
2545
2546/**
2547 * Apply for LAMPs and TORCHes.
2548 *
2549 * op - the lamp
2550 * switch_on - a flag which says whether the lamp should be switched on or off
2551 */
2552void apply_lamp (object *op, bool switch_on)
2553{
2554 op->set_glow_radius (switch_on ? op->range : 0);
2555 op->set_speed (switch_on ? op->arch->speed : 0);
2556
2557 // torches wear out if you put them out
2558 if (op->type == TORCH && !switch_on)
2559 {
2560 if (op->flag [FLAG_IS_LIGHTABLE])
2561 {
2562 op->stats.food -= (double) op->arch->stats.food / 15;
2563 if (op->stats.food < 0)
2564 op->stats.food = 0;
2565 }
2566 else
2567 op->stats.food = 0;
2568 }
2569
2570 // lamps and torched get worthless when used up
2571 if (op->stats.food <= 0)
2572 op->value = 0;
2573
2574 // FIXME: This is a hack to make the more sane torches and lamps
2575 // still animated ;-/
2576 if (op->other_arch)
2577 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2578
2579 if (object *pl = op->visible_to ())
2580 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2581}
2582
2583/**
2360 * Main apply handler. 2584 * Main apply handler.
2361 * 2585 *
2362 * Checks for unpaid items before applying. 2586 * Checks for unpaid items before applying.
2363 * 2587 *
2364 * Return value: 2588 * Return value:
2365 * 0: player or monster can't apply objects of that type 2589 * 0: player or monster can't apply objects of that type
2366 * 1: has been applied, or there was an error applying the object 2590 * 1: has been applied, or there was an error applying the object
2367 * 2: objects of that type can't be applied if not in inventory 2591 * 2: objects of that type can't be applied if not in inventory
2368 * 2592 *
2369 * op is the object that is causing object to be applied, tmp is the object 2593 * who is the object that is causing object to be applied, op is the object
2370 * being applied. 2594 * being applied.
2371 * 2595 *
2372 * aflag is special (always apply/unapply) flags. Nothing is done with 2596 * aflag is special (always apply/unapply) flags. Nothing is done with
2373 * them in this function - they are passed to apply_special 2597 * them in this function - they are passed to apply_special
2374 */ 2598 */
2375int 2599int
2376manual_apply (object *op, object *tmp, int aflag) 2600manual_apply (object *who, object *op, int aflag)
2377{ 2601{
2378 if (tmp->head) 2602 op = op->head_ ();
2379 tmp = tmp->head;
2380 2603
2381 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2604 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2382 { 2605 {
2383 if (op->type == PLAYER) 2606 if (who->type == PLAYER)
2384 { 2607 {
2608 examine (who, op);
2385 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2609 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2386 return 1; 2610 return 1;
2387 } 2611 }
2388 else 2612 else
2389 return 0; /* monsters just skip unpaid items */ 2613 return 0; /* monsters just skip unpaid items */
2390 } 2614 }
2391 2615
2392 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2616 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2393 return RESULT_INT (0); 2617 return RESULT_INT (0);
2394 2618
2395 switch (tmp->type) 2619 switch (op->type)
2396 { 2620 {
2397 case CF_HANDLE: 2621 case CF_HANDLE:
2398 op->play_sound (sound_find ("turn_handle")); 2622 who->play_sound (sound_find ("turn_handle"));
2399 op->statusmsg ("You turn the handle."); 2623 who->statusmsg ("You turn the handle.");
2400 tmp->value = tmp->value ? 0 : 1; 2624 op->value = op->value ? 0 : 1;
2401 SET_ANIMATION (tmp, tmp->value); 2625 SET_ANIMATION (op, op->value);
2402 update_object (tmp, UP_OBJ_FACE); 2626 update_object (op, UP_OBJ_FACE);
2403 push_button (tmp); 2627 push_button (op, who);
2404 return 1; 2628 return 1;
2405 2629
2406 case TRIGGER: 2630 case TRIGGER:
2407 if (check_trigger (tmp, op)) 2631 if (check_trigger (op, who))
2408 { 2632 {
2409 op->statusmsg ("You turn the handle."); 2633 who->statusmsg ("You turn the handle.");
2410 op->play_sound (sound_find ("turn_handle")); 2634 who->play_sound (sound_find ("turn_handle"));
2411 } 2635 }
2412 else 2636 else
2413 op->failmsg ("The handle doesn't move."); 2637 who->failmsg ("The handle doesn't move.");
2414 2638
2415 return 1; 2639 return 1;
2416 2640
2417 case EXIT: 2641 case EXIT:
2418 if (op->type != PLAYER) 2642 if (who->type != PLAYER)
2419 return 0; 2643 return 0;
2420 2644
2421 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2645 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2422 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2646 who->failmsg (format ("The %s is closed.", query_name (op)));
2423 else 2647 else
2424 { 2648 {
2425 /* Don't display messages for random maps. */ 2649 /* Don't display messages for random maps. */
2426 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2650 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2427 op->statusmsg (tmp->msg, NDI_NAVY); 2651 who->statusmsg (op->msg, NDI_NAVY);
2428 2652
2429 op->enter_exit (tmp); 2653 who->enter_exit (op);
2430 } 2654 }
2431 2655
2432 return 1; 2656 return 1;
2433 2657
2434 case INSCRIBABLE: 2658 case INSCRIBABLE:
2435 op->statusmsg (tmp->msg); 2659 who->statusmsg (op->msg);
2436 // maybe show a spell menu to chose from or something like that 2660 // maybe show a spell menu to chose from or something like that
2437 return 1; 2661 return 1;
2438 2662
2439 case SIGN: 2663 case SIGN:
2440 apply_sign (op, tmp, 0); 2664 apply_sign (who, op, 0);
2441 return 1; 2665 return 1;
2442 2666
2443 case BOOK: 2667 case BOOK:
2444 if (op->type == PLAYER) 2668 if (who->type == PLAYER)
2445 { 2669 {
2446 apply_book (op, tmp); 2670 apply_book (who, op);
2447 return 1; 2671 return 1;
2448 } 2672 }
2449 else 2673 else
2450 return 0; 2674 return 0;
2451 2675
2452 case SKILLSCROLL: 2676 case SKILLSCROLL:
2453 if (op->type == PLAYER) 2677 if (who->type == PLAYER)
2454 { 2678 {
2455 apply_skillscroll (op, tmp); 2679 apply_skillscroll (who, op);
2456 return 1; 2680 return 1;
2457 } 2681 }
2458 else 2682 else
2459 return 0; 2683 return 0;
2460 2684
2461 case SPELLBOOK: 2685 case SPELLBOOK:
2462 if (op->type == PLAYER) 2686 if (who->type == PLAYER)
2463 { 2687 {
2464 apply_spellbook (op, tmp); 2688 apply_spellbook (who, op);
2465 return 1; 2689 return 1;
2466 } 2690 }
2467 else 2691 else
2468 return 0; 2692 return 0;
2469 2693
2470 case SCROLL: 2694 case SCROLL:
2471 apply_scroll (op, tmp, 0); 2695 apply_scroll (who, op, 0);
2472 return 1; 2696 return 1;
2473 2697
2474 case POTION: 2698 case POTION:
2475 apply_potion (op, tmp); 2699 apply_potion (who, op);
2476 return 1; 2700 return 1;
2477 2701
2478 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2702 /* Eneq(@csd.uu.se): Handle apply on containers. */
2479 //TODO: remove, as it is unsed? 2703 //TODO: remove, as it is unsed?
2480 case CLOSE_CON: 2704 case CLOSE_CON:
2481 apply_container (op, tmp->env); 2705 apply_container (who, op->env);
2482 return 1; 2706 return 1;
2483 2707
2484 case CONTAINER: 2708 case CONTAINER:
2485 apply_container (op, tmp); 2709 apply_container (who, op);
2486 return 1; 2710 return 1;
2487 2711
2488 case TREASURE: 2712 case TREASURE:
2489 if (op->type == PLAYER) 2713 if (who->type == PLAYER)
2490 { 2714 {
2491 apply_treasure (op, tmp); 2715 apply_treasure (who, op);
2492 return 1; 2716 return 1;
2493 } 2717 }
2494 else 2718 else
2495 return 0; 2719 return 0;
2720
2721 case LAMP:
2722 case TORCH:
2723 player_apply_lamp (who, op);
2724 return 1;
2496 2725
2497 case WEAPON: 2726 case WEAPON:
2498 case ARMOUR: 2727 case ARMOUR:
2499 case BOOTS: 2728 case BOOTS:
2500 case GLOVES: 2729 case GLOVES:
… …
2508 case WAND: 2737 case WAND:
2509 case ROD: 2738 case ROD:
2510 case HORN: 2739 case HORN:
2511 case SKILL: 2740 case SKILL:
2512 case BOW: 2741 case BOW:
2513 case LAMP:
2514 case BUILDER: 2742 case BUILDER:
2515 case SKILL_TOOL: 2743 case SKILL_TOOL:
2516 if (tmp->env != op) 2744 if (op->env != who)
2517 return 2; /* not in inventory */ 2745 return 2; /* not in inventory */
2518 2746
2519 apply_special (op, tmp, aflag); 2747 apply_special (who, op, aflag);
2520 return 1; 2748 return 1;
2521 2749
2522 case DRINK: 2750 case DRINK:
2523 case FOOD: 2751 case FOOD:
2524 case FLESH: 2752 case FLESH:
2525 apply_food (op, tmp); 2753 apply_food (who, op);
2526 return 1; 2754 return 1;
2527 2755
2528 case POISON: 2756 case POISON:
2529 apply_poison (op, tmp); 2757 apply_poison (who, op);
2530 return 1; 2758 return 1;
2531 2759
2532 case SAVEBED: 2760 case SAVEBED:
2533 return 1; 2761 return 1;
2534 2762
2535 case ARMOUR_IMPROVER: 2763 case ARMOUR_IMPROVER:
2536 if (op->type == PLAYER) 2764 if (who->type == PLAYER)
2537 { 2765 {
2538 apply_armour_improver (op, tmp); 2766 apply_armour_improver (who, op);
2539 return 1; 2767 return 1;
2540 } 2768 }
2541 else 2769 else
2542 return 0; 2770 return 0;
2543 2771
2544 case WEAPON_IMPROVER: 2772 case WEAPON_IMPROVER:
2545 check_improve_weapon (op, tmp); 2773 check_improve_weapon (who, op);
2546 return 1; 2774 return 1;
2547 2775
2548 case CLOCK: 2776 case CLOCK:
2549 if (op->type == PLAYER) 2777 if (who->type == PLAYER)
2550 { 2778 {
2551 char buf[MAX_BUF]; 2779 char buf[MAX_BUF];
2552 timeofday_t tod; 2780 timeofday_t tod;
2553 2781
2554 get_tod (&tod); 2782 get_tod (&tod);
2555 op->play_sound (sound_find ("sound_clock")); 2783 who->play_sound (sound_find ("sound_clock"));
2556 op->statusmsg (format ( 2784 who->statusmsg (format (
2557 "It is %d minute%s past %d o'clock %s", 2785 "It is %d minute%s past %d o'clock %s",
2558 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2786 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2559 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2787 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2560 )); 2788 ));
2561 return 1; 2789 return 1;
2562 } 2790 }
2563 else 2791 else
2564 return 0; 2792 return 0;
2565 2793
2566 case MENU: 2794 case MENU:
2567 if (op->type == PLAYER) 2795 if (who->type == PLAYER)
2568 { 2796 {
2569 shop_listing (tmp, op); 2797 shop_listing (op, who);
2570 return 1; 2798 return 1;
2571 } 2799 }
2572 else 2800 else
2573 return 0; 2801 return 0;
2574 2802
2575 case POWER_CRYSTAL: 2803 case POWER_CRYSTAL:
2576 apply_power_crystal (op, tmp); /* see egoitem.c */ 2804 apply_power_crystal (who, op); /* see egoitem.c */
2577 return 1; 2805 return 1;
2578 2806
2579 case LIGHTER: /* for lighting torches/lanterns/etc */ 2807 case LIGHTER: /* for lighting torches/lanterns/etc */
2580 if (op->type == PLAYER) 2808 if (who->type == PLAYER)
2581 { 2809 {
2582 apply_lighter (op, tmp); 2810 apply_lighter (who, op);
2583 return 1; 2811 return 1;
2584 } 2812 }
2585 else 2813 else
2586 return 0; 2814 return 0;
2587 2815
2588 case ITEM_TRANSFORMER: 2816 case ITEM_TRANSFORMER:
2589 apply_item_transformer (op, tmp); 2817 apply_item_transformer (who, op);
2590 return 1; 2818 return 1;
2591 2819
2592 default: 2820 default:
2593 return 0; 2821 return 0;
2594 } 2822 }
2595} 2823}
2596
2597 2824
2598/* quiet suppresses the "don't know how to apply" and "you must get it first" 2825/* quiet suppresses the "don't know how to apply" and "you must get it first"
2599 * messages as needed by player_apply_below(). But there can still be 2826 * messages as needed by player_apply_below(). But there can still be
2600 * "but you are floating high above the ground" messages. 2827 * "but you are floating high above the ground" messages.
2601 * 2828 *
2602 * Same return value as apply() function. 2829 * Same return value as apply() function.
2603 */ 2830 */
2604int 2831int
2605player_apply (object *pl, object *op, int aflag, int quiet) 2832player_apply (object *pl, object *op, int aflag, int quiet)
2606{ 2833{
2607 int tmp;
2608
2609 if (op->env && (pl->move_type & MOVE_FLYING)) 2834 if (!op->env && (pl->move_type & MOVE_FLYING))
2610 { 2835 {
2611 /* player is flying and applying object not in inventory */ 2836 /* player is flying and applying object not in inventory */
2612 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2837 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2613 { 2838 {
2614 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2839 pl->failmsg ("But you are floating high above the ground! "
2840 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2841 "or waiting till the levitation effect wears off.>");
2615 return 0; 2842 return 0;
2616 } 2843 }
2617 } 2844 }
2618 2845
2619 pl->contr->last_used = op; 2846 pl->contr->last_used = op;
2620 2847
2621 tmp = manual_apply (pl, op, aflag); 2848 int tmp = manual_apply (pl, op, aflag);
2849
2622 if (!quiet) 2850 if (!quiet)
2623 { 2851 {
2624 if (tmp == 0) 2852 if (tmp == 0)
2625 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2853 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2626 else if (tmp == 2) 2854 else if (tmp == 2)
2627 op->failmsg ("You must get it first!\n"); 2855 pl->failmsg ("You must get it first!\n");
2628 } 2856 }
2629 2857
2630 return tmp; 2858 return tmp;
2631} 2859}
2632 2860
… …
2661 * person moving on it, also activate. Added code to make it 2889 * person moving on it, also activate. Added code to make it
2662 * so that at least one of players movement types be that which 2890 * so that at least one of players movement types be that which
2663 * the item needs. 2891 * the item needs.
2664 */ 2892 */
2665 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2893 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2666 {
2667 if (player_apply (pl, tmp, 0, 1) == 1) 2894 if (player_apply (pl, tmp, 0, 1) == 1)
2668 return; 2895 return;
2669 } 2896
2670 if (floors >= 2) 2897 if (floors >= 2)
2671 return; /* process at most two floor objects */ 2898 return; /* process at most two floor objects */
2672 } 2899 }
2673} 2900}
2674 2901
… …
2718 break; 2945 break;
2719 2946
2720 case SKILL: 2947 case SKILL:
2721 if (who->contr) 2948 if (who->contr)
2722 { 2949 {
2950 if (IS_COMBAT_SKILL (op->subtype))
2951 who->change_weapon (who->contr->combat_ob = 0);
2952 else if (IS_RANGED_SKILL (op->subtype))
2953 who->change_weapon (who->contr->ranged_ob = 0);
2954
2723 if (!op->invisible) 2955 if (op->invisible)
2956 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2957 else
2724 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2958 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2725 else
2726 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2727 } 2959 }
2728 2960
2729 change_abil (who, op); 2961 change_abil (who, op);
2730 CLEAR_FLAG (who, FLAG_READY_SKILL); 2962 CLEAR_FLAG (who, FLAG_READY_SKILL);
2731 break; 2963 break;
… …
2742 case CLOAK: 2974 case CLOAK:
2743 who->statusmsg (format ("You unwear %s.", query_name (op))); 2975 who->statusmsg (format ("You unwear %s.", query_name (op)));
2744 change_abil (who, op); 2976 change_abil (who, op);
2745 break; 2977 break;
2746 2978
2747 case LAMP:
2748 {
2749 who->statusmsg (format ("You turn off your %s.", &op->name));
2750
2751 object *tmp2 = arch_to_object (op->other_arch);
2752 tmp2->x = op->x;
2753 tmp2->y = op->y;
2754 tmp2->map = op->map;
2755 tmp2->below = op->below;
2756 tmp2->above = op->above;
2757 tmp2->stats.food = op->stats.food;
2758 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2759
2760 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2761 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2762
2763 if (who->contr)
2764 esrv_del_item (who->contr, op->count);
2765
2766 op->destroy ();
2767 insert_ob_in_ob (tmp2, who);
2768 who->update_stats ();
2769
2770 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2771 {
2772 if (who->contr)
2773 {
2774 who->failmsg ("Oops, it feels deadly cold!");
2775 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2776 }
2777 }
2778
2779 if (who->contr)
2780 esrv_send_item (who, tmp2);
2781 }
2782
2783 return 1; /* otherwise, an attempt to drop causes problems */
2784
2785 case BOW: 2979 case BOW:
2786 case WAND: 2980 case WAND:
2787 case ROD: 2981 case ROD:
2788 case HORN: 2982 case HORN:
2789 if (player *pl = who->contr) 2983 if (player *pl = who->contr)
… …
2816 default: 3010 default:
2817 who->statusmsg (format ("You unapply %s.", query_name (op))); 3011 who->statusmsg (format ("You unapply %s.", query_name (op)));
2818 break; 3012 break;
2819 } 3013 }
2820 3014
3015 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
3016 if (object *pl = op->visible_to ())
3017 esrv_send_item (pl, op);
3018
2821 who->update_stats (); 3019 who->update_stats ();
2822
2823 if (!(aflags & AP_NO_MERGE))
2824 {
2825 object *tmp = merge_ob (op, 0);
2826
2827 if (who->contr)
2828 {
2829 if (tmp)
2830 { /* it was merged */
2831 esrv_del_item (who->contr, op->count);
2832 op = tmp;
2833 }
2834
2835 esrv_send_item (who, op);
2836 }
2837 }
2838 3020
2839 return 0; 3021 return 0;
2840} 3022}
2841 3023
2842/** 3024/**
… …
3140 return 1; 3322 return 1;
3141 } 3323 }
3142 3324
3143 return unapply_special (who, op, aflags); 3325 return unapply_special (who, op, aflags);
3144 } 3326 }
3145
3146 if (basic_flag == AP_UNAPPLY) 3327 else if (basic_flag == AP_UNAPPLY)
3147 return 0; 3328 return 0;
3148 3329
3149 // if the item is combat/ranged, wield the relevant slot first 3330 // if the item is combat/ranged, wield the relevant slot first
3150 // to resolve conflicts. 3331 // to resolve conflicts.
3151 if (player *pl = who->contr) 3332 if (player *pl = who->contr)
… …
3221 3402
3222 /* Ok. We are now at the state where we can apply the new object. 3403 /* Ok. We are now at the state where we can apply the new object.
3223 * Note that we don't have the checks for can_use_... 3404 * Note that we don't have the checks for can_use_...
3224 * below - that is already taken care of by can_apply_object. 3405 * below - that is already taken care of by can_apply_object.
3225 */ 3406 */
3226 if (op->nrof > 1) 3407 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3227 tmp = get_split_ob (op, op->nrof - 1);
3228 else
3229 tmp = 0;
3230 3408
3231 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3409 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3232 return RESULT_INT (0); 3410 return RESULT_INT (0);
3233 3411
3234 switch (op->type) 3412 switch (op->type)
3235 { 3413 {
3236 case WEAPON: 3414 case WEAPON:
3237 if (!check_weapon_power (who, op->last_eat)) 3415 if (!check_weapon_power (who, op->last_eat))
3238 { 3416 {
3239 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3417 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3240 3418
3241 if (tmp) 3419 if (tmp)
3242 insert_ob_in_ob (tmp, who); 3420 insert_ob_in_ob (tmp, who);
3243 3421
3244 return 1; 3422 return 1;
3245 } 3423 }
3246 3424
3247 //TODO: this obviously fails for players using a shorter prefix 3425 //TODO: this obviously fails for players using a shorter prefix
3248 // i.e. "R" can use Ragnarok's sword. 3426 // i.e. "R" can use Ragnarok's sword.
3249 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3427 if (op->level && !op->name.starts_with (who->name))
3250 { 3428 {
3251 /* if the weapon does not have the name as the character, can't use it. */ 3429 /* if the weapon does not have the name as the character, can't use it. */
3252 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3430 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3253 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3431 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3254 3432
… …
3288 case AMULET: 3466 case AMULET:
3289 SET_FLAG (op, FLAG_APPLIED); 3467 SET_FLAG (op, FLAG_APPLIED);
3290 who->statusmsg (format ("You wear %s.", query_name (op))); 3468 who->statusmsg (format ("You wear %s.", query_name (op)));
3291 change_abil (who, op); 3469 change_abil (who, op);
3292 break; 3470 break;
3293
3294 case LAMP:
3295 if (op->stats.food < 1)
3296 {
3297 who->failmsg (format (
3298 "Your %s is out of fuel! "
3299 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3300 &op->name
3301 ));
3302 return 1;
3303 }
3304
3305 who->statusmsg (format ("You turn on your %s.", &op->name));
3306
3307 tmp2 = arch_to_object (op->other_arch);
3308 tmp2->stats.food = op->stats.food;
3309 SET_FLAG (tmp2, FLAG_APPLIED);
3310
3311 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3312 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3313
3314 insert_ob_in_ob (tmp2, who);
3315
3316 /* Remove the old lantern */
3317 if (who->type == PLAYER)
3318 esrv_del_item (who->contr, op->count);
3319
3320 op->destroy ();
3321
3322 /* insert the portion that was split off */
3323 if (tmp)
3324 {
3325 insert_ob_in_ob (tmp, who);
3326 if (who->type == PLAYER)
3327 esrv_send_item (who, tmp);
3328 }
3329
3330 who->update_stats ();
3331
3332 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3333 if (who->type == PLAYER)
3334 {
3335 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3336 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3337 }
3338
3339 if (who->type == PLAYER)
3340 esrv_send_item (who, tmp2);
3341
3342 return 0;
3343 3471
3344 case SKILL_TOOL: 3472 case SKILL_TOOL:
3345 // applying a skill tool also readies the skill 3473 // applying a skill tool also readies the skill
3346 SET_FLAG (op, FLAG_APPLIED); 3474 SET_FLAG (op, FLAG_APPLIED);
3347 3475
… …
3437 insert_ob_in_ob (tmp, who); 3565 insert_ob_in_ob (tmp, who);
3438 3566
3439 return 1; 3567 return 1;
3440 } 3568 }
3441 3569
3442 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3570 if (op->level && !op->name.starts_with (who->name))
3443 { 3571 {
3444 who->failmsg ("The weapon does not recognize you as its owner. " 3572 who->failmsg ("The weapon does not recognize you as its owner. "
3445 "H<Its name indicates that it belongs to somebody else.>"); 3573 "H<Its name indicates that it belongs to somebody else.>");
3446 if (tmp) 3574 if (tmp)
3447 insert_ob_in_ob (tmp, who); 3575 insert_ob_in_ob (tmp, who);
… …
3505 } 3633 }
3506 3634
3507 SET_FLAG (op, FLAG_APPLIED); 3635 SET_FLAG (op, FLAG_APPLIED);
3508 3636
3509 if (tmp) 3637 if (tmp)
3510 tmp = insert_ob_in_ob (tmp, who); 3638 who->insert (tmp);
3511 3639
3512 who->update_stats (); 3640 who->update_stats ();
3513 3641
3514 /* We exclude spell casting objects. The fire code will set the 3642 /* We exclude spell casting objects. The fire code will set the
3515 * been applied flag when they are used - until that point, 3643 * been applied flag when they are used - until that point,
… …
3521 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3649 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3522 if (who->type == PLAYER) 3650 if (who->type == PLAYER)
3523 { 3651 {
3524 who->failmsg ( 3652 who->failmsg (
3525 "Oops, it feels deadly cold! " 3653 "Oops, it feels deadly cold! "
3526 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3654 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3527 ); 3655 );
3528 SET_FLAG (op, FLAG_KNOWN_CURSED); 3656 SET_FLAG (op, FLAG_KNOWN_CURSED);
3529 } 3657 }
3530 3658
3531 if (who->type == PLAYER) 3659 if (object *pl = op->visible_to ())
3532 {
3533 /* if multiple objects were applied, update both slots */
3534 if (tmp)
3535 esrv_send_item (who, tmp);
3536
3537 esrv_send_item (who, op); 3660 esrv_send_item (pl, op);
3538 }
3539 3661
3540 return 0; 3662 return 0;
3541} 3663}
3542 3664
3543int 3665int
… …
3557int 3679int
3558auto_apply (object *op) 3680auto_apply (object *op)
3559{ 3681{
3560 object *tmp = NULL, *tmp2; 3682 object *tmp = NULL, *tmp2;
3561 int i; 3683 int i;
3684
3685 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3562 3686
3563 switch (op->type) 3687 switch (op->type)
3564 { 3688 {
3565 case SHOP_FLOOR: 3689 case SHOP_FLOOR:
3566 if (!op->has_random_items ()) 3690 if (!op->has_random_items ())
… …
3568 3692
3569 do 3693 do
3570 { 3694 {
3571 i = 10; /* let's give it 10 tries */ 3695 i = 10; /* let's give it 10 tries */
3572 while ((tmp = generate_treasure (op->randomitems, 3696 while ((tmp = generate_treasure (op->randomitems,
3573 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3697 op->stats.exp
3698 ? (int) op->stats.exp
3699 : max (op->map->difficulty, 5)))
3700 == NULL && --i);
3701
3574 if (tmp == NULL) 3702 if (tmp == NULL)
3575 return 0; 3703 return 0;
3704
3576 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3705 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3577 { 3706 {
3578 tmp->destroy (); 3707 tmp->destroy ();
3579 tmp = NULL; 3708 tmp = NULL;
3580 } 3709 }
… …
3583 3712
3584 tmp->x = op->x; 3713 tmp->x = op->x;
3585 tmp->y = op->y; 3714 tmp->y = op->y;
3586 SET_FLAG (tmp, FLAG_UNPAID); 3715 SET_FLAG (tmp, FLAG_UNPAID);
3587 insert_ob_in_map (tmp, op->map, NULL, 0); 3716 insert_ob_in_map (tmp, op->map, NULL, 0);
3588 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3589 identify (tmp); 3717 identify (tmp);
3590 break; 3718 break;
3591 3719
3592 case TREASURE: 3720 case TREASURE:
3593 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3721 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3600 /* If we generated an object and put it in this object inventory, 3728 /* If we generated an object and put it in this object inventory,
3601 * move it to the parent object as the current object is about 3729 * move it to the parent object as the current object is about
3602 * to disappear. An example of this item is the random_* stuff 3730 * to disappear. An example of this item is the random_* stuff
3603 * that is put inside other objects. 3731 * that is put inside other objects.
3604 */ 3732 */
3605 for (tmp = op->inv; tmp; tmp = tmp2)
3606 {
3607 tmp2 = tmp->below;
3608 tmp->remove ();
3609
3610 if (op->env) 3733 if (op->env)
3611 insert_ob_in_ob (tmp, op->env); 3734 while (op->inv)
3612 else 3735 op->env->insert (op->inv);
3613 tmp->destroy ();
3614 }
3615 3736
3616 op->destroy (); 3737 op->destroy ();
3617 break; 3738 break;
3618 } 3739 }
3619 return tmp ? 1 : 0; 3740
3741 return !!tmp;
3620} 3742}
3621 3743
3622/** 3744/**
3623 * fix_auto_apply goes through the entire map every time a map 3745 * fix_auto_apply goes through the entire map every time a map
3624 * is loaded or swapped in and performs special actions for 3746 * is loaded or swapped in and performs special actions for
… …
3638 3760
3639 if (tmp->inv) 3761 if (tmp->inv)
3640 { 3762 {
3641 object *invtmp, *invnext; 3763 object *invtmp, *invnext;
3642 3764
3643 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3765 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3644 { 3766 {
3645 invnext = invtmp->below; 3767 invnext = invtmp->below;
3646 3768
3647 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3769 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3648 auto_apply (invtmp); 3770 auto_apply (invtmp);
3649 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3771 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3650 { 3772 {
3651 while ((invtmp->stats.hp--) > 0) 3773 while (invtmp->stats.hp-- > 0)
3652 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3774 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3653 3775
3654 invtmp->randomitems = NULL; 3776 invtmp->randomitems = NULL;
3655 } 3777 }
3656 else if (invtmp && invtmp->arch 3778 else if (invtmp && invtmp->arch
… …
3768 /* check for hp, sp change */ 3890 /* check for hp, sp change */
3769 if (food->stats.hp != 0) 3891 if (food->stats.hp != 0)
3770 { 3892 {
3771 if (QUERY_FLAG (food, FLAG_CURSED)) 3893 if (QUERY_FLAG (food, FLAG_CURSED))
3772 { 3894 {
3773 assign (who->contr->killer, food->name); 3895 who->contr->killer = food;
3774 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3896 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3775 who->failmsg ("Eck!...that was poisonous!"); 3897 who->failmsg ("Eck!...that was poisonous!");
3776 } 3898 }
3777 else 3899 else
3778 { 3900 {
… …
3782 who->failmsg ("Eck!...that was poisonous!"); 3904 who->failmsg ("Eck!...that was poisonous!");
3783 3905
3784 who->stats.hp += food->stats.hp; 3906 who->stats.hp += food->stats.hp;
3785 } 3907 }
3786 } 3908 }
3909
3787 if (food->stats.sp != 0) 3910 if (food->stats.sp != 0)
3788 { 3911 {
3789 if (QUERY_FLAG (food, FLAG_CURSED)) 3912 if (QUERY_FLAG (food, FLAG_CURSED))
3790 { 3913 {
3791 who->failmsg ("You are drained of mana!"); 3914 who->failmsg ("You are drained of mana!");
… …
3802 } 3925 }
3803 3926
3804 who->update_stats (); 3927 who->update_stats ();
3805} 3928}
3806 3929
3807/**
3808 * Designed primarily to light torches/lanterns/etc.
3809 * Also burns up burnable material too. First object in the inventory is
3810 * the selected object to "burn". -b.t.
3811 */
3812void
3813apply_lighter (object *who, object *lighter)
3814{
3815 object *item;
3816 int is_player_env = 0;
3817
3818 item = find_marked_object (who);
3819 if (item)
3820 {
3821 if (lighter->last_eat && lighter->stats.food)
3822 { /* lighter gets used up */
3823 /* Split multiple lighters if they're being used up. Otherwise *
3824 * one charge from each would be used up. --DAMN */
3825 if (lighter->nrof > 1)
3826 {
3827 object *oneLighter = lighter->clone ();
3828
3829 lighter->nrof -= 1;
3830 oneLighter->nrof = 1;
3831 oneLighter->stats.food--;
3832 esrv_send_item (who, lighter);
3833 oneLighter = insert_ob_in_ob (oneLighter, who);
3834 esrv_send_item (who, oneLighter);
3835 }
3836 else
3837 lighter->stats.food--;
3838 }
3839 else if (lighter->last_eat)
3840 {
3841 /* no charges left in lighter */
3842 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3843 return;
3844 }
3845
3846 /* Perhaps we should split what we are trying to light on fire?
3847 * I can't see many times when you would want to light multiple
3848 * objects at once.
3849 */
3850
3851 if (who == item->in_player ())
3852 is_player_env = 1;
3853
3854 save_throw_object (item, AT_FIRE, who);
3855
3856 if (item->destroyed ())
3857 {
3858 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3859 /* Need to update the player so that the players glow radius
3860 * gets changed.
3861 */
3862 if (is_player_env)
3863 who->update_stats ();
3864 }
3865 else
3866 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3867 }
3868 else
3869 who->failmsg ("You need to mark a lightable object.");
3870}
3871 3930
3872/** 3931/**
3873 * op made some mistake with a scroll, this takes care of punishment. 3932 * op made some mistake with a scroll, this takes care of punishment.
3874 * scroll_failure()- hacked directly from spell_failure 3933 * scroll_failure()- hacked directly from spell_failure
3875 */ 3934 */
… …
3975 } 4034 }
3976 4035
3977 /* insert the randomitems from the change's treasurelist into 4036 /* insert the randomitems from the change's treasurelist into
3978 * the player ref: player.c 4037 * the player ref: player.c
3979 */ 4038 */
3980 if (change->randomitems != NULL) 4039 if (change->randomitems)
3981 give_initial_items (pl, change->randomitems); 4040 give_initial_items (pl, change->randomitems);
3982 4041
3983 /* set up the face, for some races. */ 4042 /* set up the face, for some races. */
3984 4043
3985 /* first, look for the force object banning 4044 /* first, look for the force object banning
3986 * changing the face. Certain races never change face with class. 4045 * changing the face. Certain races never change face with class.
3987 */ 4046 */
3988 for (walk = pl->inv; walk != NULL; walk = walk->below) 4047 for (walk = pl->inv; walk; walk = walk->below)
3989 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4048 if (walk->name == shstr_NOCLASSFACECHANGE)
3990 flag_change_face = 0; 4049 flag_change_face = 0;
3991 4050
3992 if (flag_change_face) 4051 if (flag_change_face)
3993 { 4052 {
3994 pl->animation_id = GET_ANIM_ID (change);
3995 pl->face = change->face; 4053 pl->face = change->face;
3996 4054 pl->animation_id = change->animation_id;
3997 if (QUERY_FLAG (change, FLAG_ANIMATE)) 4055 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3998 SET_FLAG (pl, FLAG_ANIMATE);
3999 else
4000 CLEAR_FLAG (pl, FLAG_ANIMATE);
4001 } 4056 }
4002 4057
4003 /* check the special case of can't use weapons */ 4058 /* check the special case of can't use weapons */
4004 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4059 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4005 if (!strcmp (change->name, "monk")) 4060 if (change->name == shstr_monk)
4006 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4061 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4007 4062
4008 break; 4063 break;
4009 } 4064 }
4010 } 4065 }
… …
4047 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4102 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4048 return; 4103 return;
4049 } 4104 }
4050 4105
4051 /* check whether they are compatible or not */ 4106 /* check whether they are compatible or not */
4052 find = strstr (marked->slaying, transformer->arch->archname); 4107 find = strstr (&marked->slaying, transformer->arch->archname);
4053 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4108 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4054 { 4109 {
4055 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4110 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4056 return; 4111 return;
4057 } 4112 }
… …
4099 4154
4100 new_item->nrof = yield; 4155 new_item->nrof = yield;
4101 4156
4102 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4157 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4103 4158
4104 insert_ob_in_ob (new_item, pl); 4159 pl->insert (new_item);
4105 esrv_send_inventory (pl, pl);
4106 /* Eat up one item */ 4160 /* Eat up one item */
4107 decrease_ob_nr (marked, 1); 4161 marked->decrease ();
4108 4162
4109 /* Eat one transformer if needed */ 4163 /* Eat one transformer if needed */
4110 if (transformer->stats.food) 4164 if (transformer->stats.food)
4111 if (--transformer->stats.food == 0) 4165 if (--transformer->stats.food == 0)
4112 decrease_ob_nr (transformer, 1); 4166 transformer->decrease ();
4113} 4167}
4114 4168

Diff Legend

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