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.208 by root, Fri Nov 6 12:27:06 2009 UTC vs.
Revision 1.240 by root, Mon Apr 5 20:33:13 2010 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
30#include <skills.h> 30#include <skills.h>
31#include <tod.h> 31#include <tod.h>
32 32
33#include <sproto.h> 33#include <sproto.h>
34 34
35/* Want this regardless of rplay. */
36#include <sounds.h>
37
38/** 35/**
39 * Check if op should abort moving victim because of it's race or slaying. 36 * Check if op should abort moving victim because of it's race or slaying.
40 * Returns 1 if it should abort, returns 0 if it should continue. 37 * Returns 1 if it should abort, returns 0 if it should continue.
41 */ 38 */
42int 39int
… …
172 */ 169 */
173int 170int
174apply_potion (object *op, object *tmp) 171apply_potion (object *op, object *tmp)
175{ 172{
176 int got_one = 0, i; 173 int got_one = 0, i;
177 object *force = 0, *floor = 0; 174 object *force = 0;
178 175
179 floor = GET_MAP_OB (op->map, op->x, op->y); 176 object *floor = GET_MAP_OB (op->map, op->x, op->y);
180 177
181 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 178 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
182 { 179 {
183 op->failmsg ("Gods prevent you from using this here, it's sacred ground!"); 180 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
184 181
… …
204 op->update_stats (); 201 op->update_stats ();
205 tmp->decrease (); 202 tmp->decrease ();
206 return 1; 203 return 1;
207 } 204 }
208 205
209 if (!(at = archetype::find (ARCH_DEPLETION))) 206 if (!(at = archetype::find (shstr_depletion)))
210 { 207 {
211 LOG (llevError, "Could not find archetype depletion\n"); 208 LOG (llevError, "Could not find archetype depletion\n");
212 return 0; 209 return 0;
213 } 210 }
214 211
… …
231 } 228 }
232 229
233 /* improvement potion - only for players */ 230 /* improvement potion - only for players */
234 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 231 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
235 { 232 {
236 for (i = 1; i < MIN (11, op->level); i++) 233 for (i = 1; i < min (11, op->level); i++)
237 { 234 {
238 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 235 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
239 { 236 {
240 if (op->contr->levhp[i] != 1) 237 if (op->contr->levhp[i] != 1)
241 { 238 {
… …
276 } 273 }
277 } 274 }
278 } 275 }
279 276
280 /* Just makes checking easier */ 277 /* Just makes checking easier */
281 if (i < MIN (11, op->level)) 278 if (i < min (11, op->level))
282 got_one = 1; 279 got_one = 1;
283 280
284 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 281 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
285 { 282 {
286 if (got_one) 283 if (got_one)
… …
400 397
401/** 398/**
402 * This function just checks whether who can handle equipping an item 399 * This function just checks whether who can handle equipping an item
403 * with item_power. 400 * with item_power.
404 */ 401 */
405 402static bool
406bool
407check_item_power (object *who, int item_power) 403check_item_power (object *who, int item_power)
408{ 404{
409 if (who->type == PLAYER 405 if (who->type == PLAYER
410 && item_power 406 && item_power
411 && item_power + who->contr->item_power > settings.item_power_factor * who->level) 407 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
… …
532 528
533/** 529/**
534 * This does the prepare weapon scroll. 530 * This does the prepare weapon scroll.
535 * Checks for sacrifice, and so on. 531 * Checks for sacrifice, and so on.
536 */ 532 */
537int 533static int
538prepare_weapon (object *op, object *improver, object *weapon) 534prepare_weapon (object *op, object *improver, object *weapon)
539{ 535{
540 int sacrifice_count, i; 536 int sacrifice_count, i;
541 char buf[MAX_BUF]; 537 char buf[MAX_BUF];
542 538
… …
595 * 591 *
596 * We are hiding extra information about the weapon in the level and 592 * We are hiding extra information about the weapon in the level and
597 * last_eat numbers for an object. Hopefully this won't break anything ?? 593 * last_eat numbers for an object. Hopefully this won't break anything ??
598 * level == max improve last_eat == current improve 594 * level == max improve last_eat == current improve
599 */ 595 */
600int 596static int
601improve_weapon (object *op, object *improver, object *weapon) 597improve_weapon (object *op, object *improver, object *weapon)
602{ 598{
603 int sacrifice_count, sacrifice_needed = 0; 599 int sacrifice_count, sacrifice_needed = 0;
604 600
605 if (improver->stats.sp == IMPROVE_PREPARE) 601 if (improver->stats.sp == IMPROVE_PREPARE)
… …
707/** 703/**
708 * Handles the applying of improve/prepare/enchant weapon scroll. 704 * Handles the applying of improve/prepare/enchant weapon scroll.
709 * Checks a few things (not on a non-magic square, marked weapon, ...), 705 * Checks a few things (not on a non-magic square, marked weapon, ...),
710 * then calls improve_weapon to do the dirty work. 706 * then calls improve_weapon to do the dirty work.
711 */ 707 */
712int 708static int
713check_improve_weapon (object *op, object *tmp) 709check_improve_weapon (object *op, object *tmp)
714{ 710{
715 object *otmp; 711 object *otmp;
716 712
717 if (op->type != PLAYER) 713 if (op->type != PLAYER)
… …
764 * the armour value of the piece of equipment exceed either 760 * the armour value of the piece of equipment exceed either
765 * the users level or 90) 761 * the users level or 90)
766 * Modified by MSW for partial resistance. Only support 762 * Modified by MSW for partial resistance. Only support
767 * changing of physical area right now. 763 * changing of physical area right now.
768 */ 764 */
769int 765static int
770improve_armour (object *op, object *improver, object *armour) 766improve_armour (object *op, object *improver, object *armour)
771{ 767{
772 object *tmp; 768 object *tmp;
773 769
774 if (armour->magic >= settings.armor_max_enchant) 770 if (armour->magic >= settings.armor_max_enchant)
… …
861 * what the converter wants, this will not do anything. 857 * what the converter wants, this will not do anything.
862 */ 858 */
863int 859int
864convert_item (object *item, object *converter) 860convert_item (object *item, object *converter)
865{ 861{
866 sint64 nr, price_in; 862 sint64 nr = 0, price_in;
867 863
868 if (item->flag [FLAG_UNPAID]) 864 if (item->flag [FLAG_UNPAID])
869 return 0; 865 return 0;
870 866
871 shstr conv_from = converter->slaying; 867 shstr conv_from = converter->slaying;
872 archetype *conv_to = converter->other_arch; 868 archetype *conv_to = converter->other_arch;
873 sint64 need = converter->stats.food; 869 sint64 need = converter->stats.food;
874 sint64 give = converter->stats.sp; 870 sint64 give = converter->stats.sp;
875 871
… …
952 item->nrof *= nr; 948 item->nrof *= nr;
953 949
954 if (converter->flag [FLAG_PRECIOUS]) 950 if (converter->flag [FLAG_PRECIOUS])
955 SET_FLAG (item, FLAG_UNPAID); 951 SET_FLAG (item, FLAG_UNPAID);
956 952
957 if (is_in_shop (converter)) 953 if (converter->is_in_shop ())
958 { 954 {
959 // converters on shop floors don't work anymore, bug lets check for it 955 // converters on shop floors don't work anymore, bug lets check for it
960 // and report in case someone still does it. 956 // and report in case someone still does it.
961 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n", 957 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
962 converter->debug_desc ()); 958 converter->debug_desc ());
… …
985 * Handle apply on containers. 981 * Handle apply on containers.
986 * By Eneq(@csd.uu.se). 982 * By Eneq(@csd.uu.se).
987 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 983 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
988 * added the alchemical cauldron to the code -b.t. 984 * added the alchemical cauldron to the code -b.t.
989 */ 985 */
990int 986static int
991apply_container (object *op, object *sack) 987apply_container (object *op, object *sack)
992{ 988{
993 if (op->type != PLAYER || !op->contr->ns) 989 if (op->type != PLAYER || !op->contr->ns)
994 return 0; /* This might change */ 990 return 0; /* This might change */
995 991
… …
1165 /* this is only used for players */ 1161 /* this is only used for players */
1166 rv = teleport (shop_mat, SHOP_MAT, op); 1162 rv = teleport (shop_mat, SHOP_MAT, op);
1167 1163
1168 if (has_unpaid) 1164 if (has_unpaid)
1169 op->contr->play_sound (sound_find ("shop_buy")); 1165 op->contr->play_sound (sound_find ("shop_buy"));
1170 else if (is_in_shop (op)) 1166 else if (op->is_in_shop ())
1171 op->contr->play_sound (sound_find ("shop_enter")); 1167 op->contr->play_sound (sound_find ("shop_enter"));
1172 else 1168 else
1173 op->contr->play_sound (sound_find ("shop_leave")); 1169 op->contr->play_sound (sound_find ("shop_leave"));
1174 1170
1175 if (shop_mat->msg) 1171 if (shop_mat->msg)
1176 op->statusmsg (shop_mat->msg); 1172 op->statusmsg (shop_mat->msg);
1177 /* This check below is a bit simplistic - generally it should be correct, 1173 /* This check below is a bit simplistic - generally it should be correct,
1178 * but there is never a guarantee that the bottom space on the map is 1174 * but there is never a guarantee that the bottom space on the map is
1179 * actually the shop floor. 1175 * actually the shop floor.
1180 */ 1176 */
1181 else if (!rv && !is_in_shop (op)) 1177 else if (!rv && !op->is_in_shop ())
1182 { 1178 {
1183 opinion = shopkeeper_approval (op->map, op); 1179 opinion = shopkeeper_approval (op->map, op);
1184 1180
1185 op->statusmsg ( 1181 op->statusmsg (
1186 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave." 1182 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
… …
1354 trap->stats.maxsp = 2; 1350 trap->stats.maxsp = 2;
1355 1351
1356 /* Is this correct? From the docs, it doesn't look like it 1352 /* Is this correct? From the docs, it doesn't look like it
1357 * should be divided by trap->speed 1353 * should be divided by trap->speed
1358 */ 1354 */
1359 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1355 victim->speed_left = -trap->stats.maxsp * victim->speed / trap->speed;
1360 1356
1361 /* Just put in some sanity check. I think there is a bug in the 1357 /* Just put in some sanity check. I think there is a bug in the
1362 * above with some objects have zero speed, and thus the player 1358 * above with some objects have zero speed, and thus the player
1363 * getting permanently paralyzed. 1359 * getting permanently paralyzed.
1364 */ 1360 */
… …
1405 * trigger this here and get hit by own missile - and will be own enemy. 1401 * trigger this here and get hit by own missile - and will be own enemy.
1406 * Victim then is his own enemy and will start to kill herself (this is 1402 * Victim then is his own enemy and will start to kill herself (this is
1407 * removed) but we have not synced victim and his missile. To avoid senseless 1403 * removed) but we have not synced victim and his missile. To avoid senseless
1408 * action, we avoid hits here 1404 * action, we avoid hits here
1409 */ 1405 */
1410 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim) 1406 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->has_active_speed ())
1407 && trap->owner != victim)
1411 hit_with_arrow (trap, victim); 1408 hit_with_arrow (trap, victim);
1412 break; 1409 break;
1413 1410
1414 case SPELL_EFFECT: 1411 case SPELL_EFFECT:
1415 apply_spell_effect (trap, victim); 1412 apply_spell_effect (trap, victim);
… …
1488 if (victim->type == PLAYER && EXIT_PATH (trap)) 1485 if (victim->type == PLAYER && EXIT_PATH (trap))
1489 { 1486 {
1490 /* Basically, don't show exits leading to random maps the 1487 /* Basically, don't show exits leading to random maps the
1491 * players output. 1488 * players output.
1492 */ 1489 */
1493 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!")) 1490 if (trap->msg && EXIT_PATH (trap) != shstr_random_map_exit)
1494 victim->statusmsg (trap->msg, NDI_NAVY); 1491 victim->statusmsg (trap->msg, NDI_NAVY);
1495 1492
1496 trap->play_sound (trap->sound); 1493 trap->play_sound (trap->sound);
1497 victim->enter_exit (trap); 1494 victim->enter_exit (trap);
1498 } 1495 }
… …
1576 : lev_diff < 15 ? "This book is way beyond your comprehension." 1573 : lev_diff < 15 ? "This book is way beyond your comprehension."
1577 : "This book is totally beyond your comprehension."); 1574 : "This book is totally beyond your comprehension.");
1578 return; 1575 return;
1579 } 1576 }
1580 1577
1578 // we currently don't use the message types for anything.
1581 readable_message_type *msgType = get_readable_message_type (tmp); 1579 // readable_message_type *msgType = get_readable_message_type (tmp);
1580
1581 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("apply_book"));
1582 1582
1583 if (player *pl = op->contr) 1583 if (player *pl = op->contr)
1584 if (client *ns = pl->ns) 1584 if (client *ns = pl->ns)
1585 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1585 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1586 1586
… …
1739 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1739 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1740 return; 1740 return;
1741 } 1741 }
1742 1742
1743 op->failmsg (format ("You lose knowledge of %s.", spell)); 1743 op->failmsg (format ("You lose knowledge of %s.", spell));
1744 player_unready_range_ob (op->contr, spob);
1745 esrv_remove_spell (op->contr, spob); 1744 esrv_remove_spell (op->contr, spob);
1746 spob->destroy (); 1745 spob->destroy ();
1747} 1746}
1748 1747
1749/** 1748/**
… …
1766 * instead of having their spell stored in stats.sp. These are 1765 * instead of having their spell stored in stats.sp. These are
1767 * legacy spellbooks 1766 * legacy spellbooks
1768 */ 1767 */
1769 if (tmp->slaying) 1768 if (tmp->slaying)
1770 { 1769 {
1771 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1770 spell = find_archetype_by_object_name (tmp->slaying)->instance ();
1771
1772 if (!spell) 1772 if (!spell)
1773 { 1773 {
1774 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying)); 1774 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1775 return; 1775 return;
1776 } 1776 }
… …
1805 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>", 1805 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1806 &tmp->skill, learn_level)); 1806 &tmp->skill, learn_level));
1807 return; 1807 return;
1808 } 1808 }
1809 1809
1810 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1810 op->statusmsg (format ("The spellbook contains the %s level spell %s.", ordinal (spell->level), &spell->name));
1811 1811
1812 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1812 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1813 identify (tmp); 1813 identify (tmp);
1814 1814
1815 /* I removed the check for special_prayer_mark here - it didn't make 1815 /* I removed the check for special_prayer_mark here - it didn't make
… …
1827 { 1827 {
1828 spell_skill = find_skill_by_name (op, spell->skill); 1828 spell_skill = find_skill_by_name (op, spell->skill);
1829 1829
1830 if (!spell_skill) 1830 if (!spell_skill)
1831 { 1831 {
1832 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill)); 1832 op->failmsg (format ("You lack the %s skill to use this spell.", &spell->skill));
1833 return; 1833 return;
1834 } 1834 }
1835 1835
1836 if (spell_skill->level < spell->level) 1836 if (spell_skill->level < spell->level)
1837 { 1837 {
… …
1853 * literacy rate very useful! -b.t. 1853 * literacy rate very useful! -b.t.
1854 */ 1854 */
1855 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1855 if (QUERY_FLAG (op, FLAG_CONFUSED))
1856 { 1856 {
1857 op->failmsg ("In your confused state you flub the wording of the text!"); 1857 op->failmsg ("In your confused state you flub the wording of the text!");
1858 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1858 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
1859 } 1859 }
1860 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1860 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1861 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1861 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1862 { 1862 {
1863 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN); 1863 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
… …
1997 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 1997 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
1998 int winners = 0; /* number of winners */ 1998 int winners = 0; /* number of winners */
1999 int i; /* index */ 1999 int i; /* index */
2000 2000
2001 /* let's make sure and doublecheck the parameters */ 2001 /* let's make sure and doublecheck the parameters */
2002 if (meal->type != FLESH || !is_dragon_pl (op)) 2002 if (meal->type != FLESH || !op->is_dragon ())
2003 return 0; 2003 return 0;
2004 2004
2005 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2005 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2006 from the player's inventory */ 2006 from the player's inventory */
2007 for (tmp = op->inv; tmp; tmp = tmp->below) 2007 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
2015 which is not to be considered a dragon -> bail out */ 2015 which is not to be considered a dragon -> bail out */
2016 if (skin == NULL || abil == NULL) 2016 if (skin == NULL || abil == NULL)
2017 return 0; 2017 return 0;
2018 2018
2019 /* now start by filling stomache and health, according to food-value */ 2019 /* now start by filling stomache and health, according to food-value */
2020 if ((999 - op->stats.food) < meal->stats.food) 2020 if ((MAX_FOOD - op->stats.food) < meal->stats.food)
2021 op->stats.hp += (999 - op->stats.food) / 50; 2021 op->stats.hp += (MAX_FOOD - op->stats.food) / 50;
2022 else 2022 else
2023 op->stats.hp += meal->stats.food / 50; 2023 op->stats.hp += meal->stats.food / 50;
2024 2024
2025 if (op->stats.hp > op->stats.maxhp) 2025 min_it (op->stats.hp, op->stats.maxhp);
2026 op->stats.hp = op->stats.maxhp;
2027
2028 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2026 op->stats.food = min (MAX_FOOD, op->stats.food + meal->stats.food);
2029 2027
2030 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */ 2028 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
2031 2029
2032 /* on to the interesting part: chances for adding resistance */ 2030 /* on to the interesting part: chances for adding resistance */
2033 for (i = 0; i < NROFATTACKS; i++) 2031 for (i = 0; i < NROFATTACKS; i++)
… …
2043 2041
2044 /* monster bonus increases with level, because high-level 2042 /* monster bonus increases with level, because high-level
2045 flesh is too rare */ 2043 flesh is too rare */
2046 mbonus = op->level * 20. / ((double) settings.max_level); 2044 mbonus = op->level * 20. / ((double) settings.max_level);
2047 2045
2048 chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. / 2046 chance = (((double)min (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
2049 ((double) settings.max_level)) - skin->resist[i]; 2047 ((double)settings.max_level)) - skin->resist[i];
2050 2048
2051 if (chance >= 0.) 2049 if (chance >= 0.)
2052 chance += 1.; 2050 chance += 1.;
2053 else 2051 else
2054 chance = (chance < -12) ? 0. : 1. / pow (2., -chance); 2052 chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
2055 2053
2056 /* chance is proportional to amount of resistance (max. 50) */ 2054 /* chance is proportional to amount of resistance (max. 50) */
2057 chance *= ((double) (MIN (meal->resist[i], 50))) / 50.; 2055 chance *= ((double)(min (meal->resist[i], 50))) / 50.;
2058 2056
2059 /* doubled chance for resistance of ability-focus */ 2057 /* doubled chance for resistance of ability-focus */
2060 if (i == abil->stats.exp) 2058 if (i == abil->stats.exp)
2061 chance = MIN (100., chance * 2.); 2059 chance = min (100., chance * 2.);
2062 2060
2063 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2061 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2064 if (rndm (10000) < (unsigned int) (chance * 100)) 2062 if (rndm (10000) < (unsigned int)(chance * 100))
2065 { 2063 {
2066 atnr_winner[winners] = i; 2064 atnr_winner[winners] = i;
2067 winners++; 2065 winners++;
2068 } 2066 }
2069 2067
… …
2145 if (op->type != PLAYER) 2143 if (op->type != PLAYER)
2146 op->stats.hp = op->stats.maxhp; 2144 op->stats.hp = op->stats.maxhp;
2147 else 2145 else
2148 { 2146 {
2149 /* check if this is a dragon (player), eating some flesh */ 2147 /* check if this is a dragon (player), eating some flesh */
2150 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp)) 2148 if (tmp->type == FLESH && op->is_dragon () && dragon_eat_flesh (op, tmp))
2151 ; 2149 ;
2152 else 2150 else
2153 { 2151 {
2154 /* usual case - no dragon meal: */ 2152 /* usual case - no dragon meal: */
2155 if (op->stats.food + tmp->stats.food > 999) 2153 if (op->stats.food + tmp->stats.food > MAX_FOOD)
2156 { 2154 {
2157 if (tmp->type == FOOD || tmp->type == FLESH) 2155 if (tmp->type == FOOD || tmp->type == FLESH)
2158 op->failmsg ("You feel full, but what a waste of food!"); 2156 op->failmsg ("You feel full, but what a waste of food!");
2159 else 2157 else
2160 op->statusmsg ("Most of the drink goes down your face not your throat!"); 2158 op->statusmsg ("Most of the drink goes down your face not your throat!");
… …
2170 2168
2171 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2169 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2172 { 2170 {
2173 const char *buf; 2171 const char *buf;
2174 2172
2175 if (!is_dragon_pl (op)) 2173 if (!op->is_dragon ())
2176 { 2174 {
2177 /* eating message for normal players */ 2175 /* eating message for normal players */
2178 if (tmp->type == DRINK) 2176 if (tmp->type == DRINK)
2179 buf = format ("Ahhh...that %s tasted good.", &tmp->name); 2177 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2180 else 2178 else
… …
2184 /* eating message for dragon players */ 2182 /* eating message for dragon players */
2185 buf = format ("The %s tasted terrible!", &tmp->name); 2183 buf = format ("The %s tasted terrible!", &tmp->name);
2186 2184
2187 op->statusmsg (buf); 2185 op->statusmsg (buf);
2188 2186
2189 capacity_remaining = 999 - op->stats.food; 2187 capacity_remaining = MAX_FOOD - op->stats.food;
2190 op->stats.food += tmp->stats.food; 2188 op->stats.food += tmp->stats.food;
2191 if (capacity_remaining < tmp->stats.food) 2189 if (capacity_remaining < tmp->stats.food)
2192 op->stats.hp += capacity_remaining / 50; 2190 op->stats.hp += capacity_remaining / 50;
2193 else 2191 else
2194 op->stats.hp += tmp->stats.food / 50; 2192 op->stats.hp += tmp->stats.food / 50;
2195 2193
2196 if (op->stats.hp > op->stats.maxhp) 2194 min_it (op->stats.hp, op->stats.maxhp);
2197 op->stats.hp = op->stats.maxhp; 2195 min_it (op->stats.food, MAX_FOOD);
2198 if (op->stats.food > 999)
2199 op->stats.food = 999;
2200 } 2196 }
2201 2197
2202 /* special food hack -b.t. */ 2198 /* special food hack -b.t. */
2203 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2199 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2204 eat_special_food (op, tmp); 2200 eat_special_food (op, tmp);
… …
2265 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1); 2261 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2266 } 2262 }
2267 2263
2268 op->stats.food -= op->stats.food / 4; 2264 op->stats.food -= op->stats.food / 4;
2269 poison->destroy (); 2265 poison->destroy ();
2270}
2271
2272/**
2273 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2274 * A valid 2 way exit means:
2275 * -You can come back (there is another exit at the other side)
2276 * -You are
2277 * ° the owner of the exit
2278 * ° or in the same party as the owner
2279 *
2280 * Note: a owner in a 2 way exit is saved as the owner's name
2281 * in the field exit->name cause the field exit->owner doesn't
2282 * survive in the swapping (in fact the whole exit doesn't survive).
2283 */
2284int
2285is_legal_2ways_exit (object *op, object *exit)
2286{
2287 if (exit->stats.exp != 1)
2288 return 1; /*This is not a 2 way, so it is legal */
2289
2290#if 0 //TODO
2291 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2292 return 0; /* This is a reset town portal */
2293#endif
2294
2295 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2296
2297 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2298
2299 if (exitmap)
2300 {
2301 exitmap->load_sync ();
2302
2303 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2304
2305 if (!tmp)
2306 return 0;
2307
2308 for (; tmp; tmp = tmp->above)
2309 {
2310 if (tmp->type != EXIT)
2311 continue; /*Not an exit */
2312
2313 if (!EXIT_PATH (tmp))
2314 continue; /*Not a valid exit */
2315
2316 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2317 continue; /*Not in the same place */
2318
2319 if (exit->map->path != EXIT_PATH (tmp))
2320 continue; /*Not in the same map */
2321
2322 /* From here we have found the exit is valid. However we do
2323 * here the check of the exit owner. It is important for the
2324 * town portals to prevent strangers from visiting your appartments
2325 */
2326 if (!exit->race)
2327 return 1; /*No owner, free for all! */
2328
2329 object *exit_owner = 0;
2330
2331 for_all_players (pp)
2332 {
2333 if (!pp->ob)
2334 continue;
2335
2336 if (pp->ob->name != exit->race)
2337 continue;
2338
2339 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2340 break;
2341 }
2342
2343 if (!exit_owner)
2344 return 0; /* No more owner */
2345
2346 if (exit_owner->contr == op->contr)
2347 return 1; /*It is your exit */
2348
2349 if (exit_owner && /*There is a owner */
2350 (op->contr) && /*A player tries to pass */
2351 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2352 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2353 return 0;
2354
2355 return 1;
2356 }
2357 }
2358
2359 return 0;
2360} 2266}
2361 2267
2362/** 2268/**
2363 * This function will try to apply a lighter and in case no lighter 2269 * This function will try to apply a lighter and in case no lighter
2364 * is specified it will try to find a lighter in the players inventory, 2270 * is specified it will try to find a lighter in the players inventory,
… …
2415/** 2321/**
2416 * Designed primarily to light torches/lanterns/etc. 2322 * Designed primarily to light torches/lanterns/etc.
2417 * Also burns up burnable material too. First object in the inventory is 2323 * Also burns up burnable material too. First object in the inventory is
2418 * the selected object to "burn". -b.t. 2324 * the selected object to "burn". -b.t.
2419 */ 2325 */
2420void 2326static void
2421apply_lighter (object *who, object *lighter) 2327apply_lighter (object *who, object *lighter)
2422{ 2328{
2423 object *item; 2329 object *item;
2424 int is_player_env = 0; 2330 int is_player_env = 0;
2425 2331
… …
2452} 2358}
2453 2359
2454/** 2360/**
2455 * This function generates a cursed effect for cursed lamps and torches. 2361 * This function generates a cursed effect for cursed lamps and torches.
2456 */ 2362 */
2363static void
2457void player_apply_lamp_cursed_effect (object *who, object *op) 2364player_apply_lamp_cursed_effect (object *who, object *op)
2458{ 2365{
2459 if (op->level) 2366 if (op->level)
2460 { 2367 {
2461 who->failmsg (format ( 2368 who->failmsg (format (
2462 "The %s was cursed, it explodes in a big fireball!", 2369 "The %s was cursed, it explodes in a big fireball!",
… …
2477 * Apply for players and lamps 2384 * Apply for players and lamps
2478 * 2385 *
2479 * who - the player 2386 * who - the player
2480 * op - the lamp 2387 * op - the lamp
2481 */ 2388 */
2389static void
2482void player_apply_lamp (object *who, object *op) 2390player_apply_lamp (object *who, object *op)
2483{ 2391{
2484 bool switch_on = op->glow_radius ? false : true; 2392 bool switch_on = op->glow_radius ? false : true;
2485 2393
2486 if (switch_on) 2394 if (switch_on)
2487 { 2395 {
… …
2617static void 2525static void
2618apply_item_transformer (object *pl, object *transformer) 2526apply_item_transformer (object *pl, object *transformer)
2619{ 2527{
2620 object *marked; 2528 object *marked;
2621 object *new_item; 2529 object *new_item;
2622 char *find; 2530 const char *find;
2623 char *separator; 2531 char *separator;
2624 int yield; 2532 int yield;
2625 char got[MAX_BUF]; 2533 char got[MAX_BUF];
2626 int len; 2534 int len;
2627 2535
… …
2670 while (*find == ' ') 2578 while (*find == ' ')
2671 find++; 2579 find++;
2672 2580
2673 memset (got, 0, MAX_BUF); 2581 memset (got, 0, MAX_BUF);
2674 2582
2675 if ((separator = strchr (find, ';')) != NULL) 2583 if ((separator = (char *) strchr (find, ';')))
2676 len = separator - find; 2584 len = separator - find;
2677 else 2585 else
2678 len = strlen (find); 2586 len = strlen (find);
2679 2587
2680 if (len > MAX_BUF - 1) 2588 min_it (len, MAX_BUF - 1);
2681 len = MAX_BUF - 1;
2682 2589
2683 strcpy (got, find); 2590 strcpy (got, find);
2684 got[len] = '\0'; 2591 got[len] = '\0';
2685 2592
2686 /* Now create new item, remove used ones when required. */ 2593 /* Now create new item, remove used ones when required. */
… …
2719 * being applied. 2626 * being applied.
2720 * 2627 *
2721 * aflag is special (always apply/unapply) flags. Nothing is done with 2628 * aflag is special (always apply/unapply) flags. Nothing is done with
2722 * them in this function - they are passed to apply_special 2629 * them in this function - they are passed to apply_special
2723 */ 2630 */
2724int 2631static int
2725manual_apply (object *who, object *op, int aflag) 2632manual_apply (object *who, object *op, int aflag)
2726{ 2633{
2727 op = op->head_ (); 2634 op = op->head_ ();
2728 2635
2729 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 2636 if (op->flag [FLAG_UNPAID] && !op->flag [FLAG_APPLIED])
2730 { 2637 {
2731 if (who->type == PLAYER) 2638 if (who->type == PLAYER)
2732 { 2639 {
2733 examine (who, op); 2640 examine (who, op);
2734 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove 2641 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
… …
2765 2672
2766 case EXIT: 2673 case EXIT:
2767 if (who->type != PLAYER) 2674 if (who->type != PLAYER)
2768 return 0; 2675 return 0;
2769 2676
2770 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op)) 2677 if (!EXIT_PATH (op))
2771 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op))); 2678 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2772 else 2679 else
2773 { 2680 {
2774 /* Don't display messages for random maps. */ 2681 /* Don't display messages for random maps. */
2775 if (op->msg && !EXIT_PATH (op).starts_with ("/!")) 2682 if (op->msg && EXIT_PATH (op) != shstr_random_map_exit)
2776 who->statusmsg (op->msg, NDI_NAVY); 2683 who->statusmsg (op->msg, NDI_NAVY);
2777 2684
2778 who->enter_exit (op); 2685 who->enter_exit (op);
2779 } 2686 }
2780 2687
… …
2861 case CLOAK: 2768 case CLOAK:
2862 case WAND: 2769 case WAND:
2863 case ROD: 2770 case ROD:
2864 case HORN: 2771 case HORN:
2865 case SKILL: 2772 case SKILL:
2773 case SPELL:
2866 case BOW: 2774 case BOW:
2775 case RANGED:
2867 case BUILDER: 2776 case BUILDER:
2868 case SKILL_TOOL: 2777 case SKILL_TOOL:
2869 if (op->env != who) 2778 if (op->env != who)
2870 return 2; /* not in inventory */ 2779 who->failmsg (format ("You must get it first! H<You can only apply the %s if it is in your inventory.>\n", query_name (op)));
2871 2780 else
2872 apply_special (who, op, aflag); 2781 apply_special (who, op, aflag);
2782
2873 return 1; 2783 return 1;
2874 2784
2875 case DRINK: 2785 case DRINK:
2876 case FOOD: 2786 case FOOD:
2877 case FLESH: 2787 case FLESH:
… …
2941 case ITEM_TRANSFORMER: 2851 case ITEM_TRANSFORMER:
2942 apply_item_transformer (who, op); 2852 apply_item_transformer (who, op);
2943 return 1; 2853 return 1;
2944 2854
2945 default: 2855 default:
2856 who->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2946 return 0; 2857 return 0;
2947 } 2858 }
2948} 2859}
2949 2860
2950/* quiet suppresses the "don't know how to apply" and "you must get it first" 2861/*
2951 * messages as needed by player_apply_below(). But there can still be
2952 * "but you are floating high above the ground" messages.
2953 *
2954 * Same return value as apply() function. 2862 * Same return value as apply() function.
2955 */ 2863 */
2956int 2864bool
2957player_apply (object *pl, object *op, int aflag, int quiet) 2865player_apply (object *pl, object *op, int aflag)
2958{ 2866{
2959 if (!op->env && (pl->move_type & MOVE_FLYING)) 2867 if (!op->env && (pl->move_type & MOVE_FLYING))
2960 { 2868 {
2961 /* player is flying and applying object not in inventory */ 2869 /* player is flying and applying object not in inventory */
2962 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2870 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
… …
2968 } 2876 }
2969 } 2877 }
2970 2878
2971 pl->contr->last_used = op; 2879 pl->contr->last_used = op;
2972 2880
2973 int tmp = manual_apply (pl, op, aflag); 2881 return pl->apply (op, aflag);
2974
2975 if (!quiet)
2976 {
2977 if (tmp == 0)
2978 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2979 else if (tmp == 2)
2980 pl->failmsg ("You must get it first!\n");
2981 }
2982
2983 return tmp;
2984} 2882}
2985 2883
2986/** 2884/**
2987 * player_apply_below attempts to apply the object 'below' the player. 2885 * player_apply_below attempts to apply the object 'below' the player.
2988 * If the player has an open container, we use that for below, otherwise 2886 * If the player has an open container, we use that for below, otherwise
… …
2999 * we don't use a corrupt pointer for the next object, so we get the 2897 * we don't use a corrupt pointer for the next object, so we get the
3000 * next object in the stack before applying. This is can only be a 2898 * next object in the stack before applying. This is can only be a
3001 * problem if player_apply() has a bug in that it uses the object but does 2899 * problem if player_apply() has a bug in that it uses the object but does
3002 * not return a proper value. 2900 * not return a proper value.
3003 */ 2901 */
2902 //TODO: currently looks only at the topmost objetc, no longer at multiple floors
2903 // and also not on move_on floors. what was this for, anyways?
3004 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next) 2904 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
3005 { 2905 {
3006 next = tmp->below; 2906 next = tmp->below;
3007 2907
3008 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3009 floors++;
3010 else if (floors > 0)
3011 return; /* process only floor objects after first floor object */
3012
3013 /* If it is visible, player can apply it. If it is applied by 2908 /* If it is visible, player can apply it.
3014 * person moving on it, also activate. Added code to make it
3015 * so that at least one of players movement types be that which
3016 * the item needs.
3017 */ 2909 */
3018 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2910 if (!tmp->invisible)
3019 if (player_apply (pl, tmp, 0, 1) == 1) 2911 if (player_apply (pl, tmp, 0))
3020 return; 2912 break;
3021 2913
3022 if (floors >= 2) 2914 break;
3023 return; /* process at most two floor objects */
3024 } 2915 }
3025} 2916}
3026 2917
3027/** 2918/**
3028 * Unapplies specified item. 2919 * Unapplies specified item.
… …
3035{ 2926{
3036 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) 2927 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
3037 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2928 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
3038 return RESULT_INT (0); 2929 return RESULT_INT (0);
3039 2930
3040 CLEAR_FLAG (op, FLAG_APPLIED); 2931 if (who->current_weapon == op)
2932 who->current_weapon = 0;
2933
2934 op->flag [FLAG_APPLIED] = false;
3041 2935
3042 switch (op->type) 2936 switch (op->type)
3043 { 2937 {
3044 case SKILL_TOOL: 2938 case SKILL:
2939 if (player *pl = who->contr)
2940 if (op->invisible)
2941 pl->statusmsg (format ("You can no longer use the %s skill.", &op->skill));
2942 else
2943 pl->statusmsg (format ("You stop using the %s.", query_name (op)));
2944
2945 change_abil (who, op);
2946 who->flag [FLAG_READY_SKILL] = false;
2947 break;
2948
2949 case WEAPON:
2950 who->statusmsg (format ("You unwield %s.", query_name (op)));
2951 change_abil (who, op);
2952 who->flag [FLAG_READY_WEAPON] = false;
2953
3045 // unapplying a skill tool should also unapply the skill it governs 2954 // unapplying a weapon or skill tool should also unapply the skill it governs
3046 // but this is hard, as it shouldn't do so when the skill can 2955 // but this is hard, as it shouldn't do so when the skill can
3047 // be used for other reasons 2956 // be used for other reasons
3048 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2957 if (who->chosen_skill)
3049 if (tmp->skill == op->skill 2958 if (!who->chosen_skill->flag [FLAG_CAN_USE_SKILL])
3050 && tmp->type == SKILL
3051 && tmp->flag [FLAG_APPLIED]
3052 && !tmp->flag [FLAG_CAN_USE_SKILL])
3053 unapply_special (who, tmp, 0); 2959 unapply_special (who, op, 0);
3054 2960
3055 change_abil (who, op);
3056 break; 2961 break;
3057 2962
2963 case BOW:
3058 case WEAPON: 2964 case WAND:
2965 case ROD:
2966 case HORN:
2967 case RANGED:
3059 if (player *pl = who->contr) 2968 if (player *pl = who->contr)
3060 if (op == pl->combat_ob)
3061 {
3062 pl->combat_ob = 0;
3063 who->change_weapon (pl->ranged_ob);
3064 }
3065
3066 who->statusmsg (format ("You unwield %s.", query_name (op)));
3067
3068 change_abil (who, op);
3069 CLEAR_FLAG (who, FLAG_READY_WEAPON);
3070 break;
3071
3072 case SKILL:
3073 if (who->contr)
3074 { 2969 {
3075 if (IS_COMBAT_SKILL (op->subtype)) 2970 who->statusmsg (format ("You unready %s.", query_name (op)));
3076 who->change_weapon (who->contr->combat_ob = 0); 2971 change_abil (who, op);
3077 else if (IS_RANGED_SKILL (op->subtype)) 2972 }
3078 who->change_weapon (who->contr->ranged_ob = 0); 2973 else
2974 {
2975 who->change_skill (0);
3079 2976
3080 if (op->invisible) 2977 if (op->type == BOW)
3081 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill)); 2978 op->flag [FLAG_READY_BOW ] = false;
3082 else 2979 else
3083 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2980 op->flag [FLAG_READY_RANGE] = false;
3084 } 2981 }
3085 2982
3086 change_abil (who, op);
3087 CLEAR_FLAG (who, FLAG_READY_SKILL);
3088 break; 2983 break;
3089 2984
3090 case ARMOUR: 2985 case ARMOUR:
3091 case HELMET: 2986 case HELMET:
3092 case SHIELD: 2987 case SHIELD:
… …
3099 case CLOAK: 2994 case CLOAK:
3100 who->statusmsg (format ("You unwear %s.", query_name (op))); 2995 who->statusmsg (format ("You unwear %s.", query_name (op)));
3101 change_abil (who, op); 2996 change_abil (who, op);
3102 break; 2997 break;
3103 2998
2999 case SPELL:
3104 case BOW: 3000 case BUILDER:
3105 case WAND:
3106 case ROD:
3107 case HORN:
3108 if (player *pl = who->contr)
3109 {
3110 if (op == pl->ranged_ob)
3111 {
3112 pl->ranged_ob = 0;
3113 who->change_weapon (pl->combat_ob);
3114 }
3115
3116 who->statusmsg (format ("You unready %s.", query_name (op))); 3001 who->statusmsg (format ("You unready %s.", query_name (op)));
3117 }
3118 else
3119 {
3120 who->change_skill (0);
3121
3122 if (op->type == BOW)
3123 CLEAR_FLAG (who, FLAG_READY_BOW);
3124 else
3125 CLEAR_FLAG (who, FLAG_READY_RANGE);
3126 }
3127
3128 break; 3002 break;
3129 3003
3130 case BUILDER: 3004 //case SKILL_TOOL://TODO
3131 if (who->contr)
3132 who->statusmsg (format ("You unready %s.", query_name (op)));
3133 break;
3134
3135 default: 3005 default:
3136 who->statusmsg (format ("You unapply %s.", query_name (op))); 3006 who->statusmsg (format ("You unapply %s.", query_name (op)));
3137 break; 3007 break;
3138 } 3008 }
3139 3009
… …
3163static object * 3033static object *
3164get_next_item_from_body_location (int loc, object *start) 3034get_next_item_from_body_location (int loc, object *start)
3165{ 3035{
3166 for (object *tmp = start; tmp; tmp = tmp->below) 3036 for (object *tmp = start; tmp; tmp = tmp->below)
3167 if (tmp->flag [FLAG_APPLIED] 3037 if (tmp->flag [FLAG_APPLIED]
3168 && tmp->slot[loc].info 3038 && tmp->slot [loc].info
3169 && (!tmp->invisible || tmp->type == SKILL)) 3039 && (!tmp->invisible || tmp->type == SKILL || tmp->type == SPELL))
3170 return tmp; 3040 return tmp;
3171 3041
3172 return 0; 3042 return 0;
3173} 3043}
3174 3044
… …
3187#define CANNOT_REMOVE_CURSED \ 3057#define CANNOT_REMOVE_CURSED \
3188 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \ 3058 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
3189 "Praying over an altar, scrolls of remove curse/damnation, " \ 3059 "Praying over an altar, scrolls of remove curse/damnation, " \
3190 "priests or even other players might help.>" 3060 "priests or even other players might help.>"
3191 3061
3192int 3062static int
3193unapply_for_ob (object *who, object *op, int aflags) 3063unapply_for_ob (object *who, object *op, int aflags)
3194{ 3064{
3195 if (op->is_range ()) 3065 if (op->is_range ())
3196 for (object *tmp = who->inv; tmp; tmp = tmp->below) 3066 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3197 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 3067 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
… …
3319 continue; 3189 continue;
3320 } 3190 }
3321 3191
3322 object *tmp1 = get_next_item_from_body_location (i, who->inv); 3192 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3323 if (!tmp1) 3193 if (!tmp1)
3324 {
3325#if 0
3326 /* This is sort of an error, but happens a lot when old players
3327 * join in with more stuff equipped than they are now allowed.
3328 */
3329 LOG (llevError, "Can't find object using location %d on %s\n", i, who->name);
3330#endif
3331 retval |= CAN_APPLY_NEVER; 3194 retval |= CAN_APPLY_NEVER;
3332 }
3333 else 3195 else
3334 { 3196 {
3335 /* need to unapply something. However, if this something 3197 /* need to unapply something. However, if this something
3336 * is different than we had found before, it means they need 3198 * is different than we had found before, it means they need
3337 * to apply multiple objects 3199 * to apply multiple objects
… …
3388 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3250 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3389 retval |= CAN_APPLY_RESTRICTION; 3251 retval |= CAN_APPLY_RESTRICTION;
3390 } 3252 }
3391 3253
3392 return retval; 3254 return retval;
3255}
3256
3257// saner interface, returns successful status
3258bool
3259object::apply (object *ob, int aflags)
3260{
3261 if (!ob) // simplifies a lot of callers
3262 return true;
3263
3264 bool want_apply =
3265 aflags & AP_APPLY ? true
3266 : aflags & AP_UNAPPLY ? false
3267 : !ob->flag [FLAG_APPLIED]; // AP_TOGGLE
3268
3269 object_ptr *slot = 0;
3270
3271 // detect the slot, if this is a player
3272 if (contr && !(aflags & AP_NO_SLOT))
3273 {
3274 object *oslot;
3275
3276 switch (ob->type)
3277 {
3278 case WEAPON:
3279 slot = &contr->combat_ob;
3280 oslot = contr->ranged_ob;
3281 break;
3282
3283 case BOW:
3284 case RANGED:
3285 case SPELL:
3286 case WAND:
3287 case ROD:
3288 case HORN:
3289 case BUILDER:
3290 slot = &contr->ranged_ob;
3291 oslot = contr->combat_ob;
3292 break;
3293
3294 // oh, the humanity
3295 case SKILL:
3296 if (aflags & AP_NO_SLOT)
3297 break;
3298
3299 if (skill_flags [ob->subtype] & SF_NEED_ITEM)
3300 break;
3301
3302 if (skill_flags [ob->subtype] & SF_COMBAT)
3303 {
3304 slot = &contr->combat_ob;
3305 oslot = contr->ranged_ob;
3306 }
3307 else if (skill_flags [ob->subtype] & SF_RANGED)
3308 {
3309 slot = &contr->ranged_ob;
3310 oslot = contr->combat_ob;
3311 }
3312
3313 break;
3314 }
3315
3316 // now handle slot exclusions
3317 if (slot)
3318 {
3319 // only one slot can be active
3320 if (want_apply)
3321 apply (oslot, AP_UNAPPLY);
3322
3323 // clear item from slot if applied
3324 if (!want_apply && *slot == ob)
3325 {
3326 *slot = 0;
3327
3328 if (current_weapon == ob)
3329 current_weapon = 0;
3330 }
3331 }
3332 }
3333
3334 if (ob->flag [FLAG_APPLIED] != want_apply)
3335 manual_apply (this, ob, aflags);
3336
3337 if (ob->flag [FLAG_APPLIED] != want_apply)
3338 return false;
3339
3340 if (slot)
3341 current_weapon = *slot = ob;
3342
3343 return true;
3393} 3344}
3394 3345
3395/** 3346/**
3396 * who is the object using the object. It can be a monster. 3347 * who is the object using the object. It can be a monster.
3397 * op is the object they are using. op is an equipment type item, 3348 * op is the object they are using. op is an equipment type item,
… …
3420 " H<You lack enough unused item power to use this weapon, see the skills command.>" 3371 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3421 3372
3422int 3373int
3423apply_special (object *who, object *op, int aflags) 3374apply_special (object *who, object *op, int aflags)
3424{ 3375{
3425 int basic_flag = aflags & AP_BASIC_FLAGS; 3376 int basic_flag = aflags & AP_MODE;
3426 object *tmp, *tmp2, *skop = NULL; 3377 object *tmp, *tmp2, *skop = NULL;
3427 3378
3428 if (who == NULL) 3379 if (who == NULL)
3429 { 3380 {
3430 LOG (llevError, "apply_special() from object without environment.\n"); 3381 LOG (llevError, "apply_special() from object without environment.\n");
… …
3449 3400
3450 return unapply_special (who, op, aflags); 3401 return unapply_special (who, op, aflags);
3451 } 3402 }
3452 else if (basic_flag == AP_UNAPPLY) 3403 else if (basic_flag == AP_UNAPPLY)
3453 return 0; 3404 return 0;
3454
3455 // if the item is combat/ranged, wield the relevant slot first
3456 // to resolve conflicts.
3457 if (player *pl = who->contr)
3458 switch (op->slottype ())
3459 {
3460 case slot_combat: who->change_weapon (pl->combat_ob); break;
3461 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3462 }
3463 3405
3464 splay (op); 3406 splay (op);
3465 3407
3466 /* Can't just apply this object. Lets see what not and what to do */ 3408 /* Can't just apply this object. Lets see what not and what to do */
3467 if (int i = can_apply_object (who, op)) 3409 if (int i = can_apply_object (who, op))
… …
3501 } 3443 }
3502 } 3444 }
3503 3445
3504 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3446 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3505 { 3447 {
3448 // try to ready attached skill first
3506 skop = find_skill_by_name (who, op->skill); 3449 skop = find_skill_by_name (who, op->skill);
3507 3450
3508 if (!skop) 3451 if (!skop)
3509 { 3452 {
3510 who->failmsg (format ("You need the %s skill to use this item!", &op->skill)); 3453 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3511 return 1; 3454 return 1;
3512 } 3455 }
3513 else 3456 else if (!who->apply (skop, AP_APPLY | AP_NO_SLOT))
3514 /* While experience will be credited properly, we want to change the
3515 * skill so that the dam and wc get updated
3516 */ 3457 {
3517 who->change_skill (skop); 3458 who->failmsg (format ("You can't use the required %s skill!", &op->skill));
3459 return 1;
3460 }
3518 } 3461 }
3519 3462
3520 if (!check_item_power (who, op->item_power)) 3463 if (!check_item_power (who, op->item_power))
3521 { 3464 {
3522 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3465 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
… …
3525 3468
3526 /* Ok. We are now at the state where we can apply the new object. 3469 /* Ok. We are now at the state where we can apply the new object.
3527 * Note that we don't have the checks for can_use_... 3470 * Note that we don't have the checks for can_use_...
3528 * below - that is already taken care of by can_apply_object. 3471 * below - that is already taken care of by can_apply_object.
3529 */ 3472 */
3473
3474 // split away all the other items from the stack, so only one item is left
3530 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0; 3475 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3531 3476
3532 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3477 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3533 return RESULT_INT (0); 3478 return RESULT_INT (0);
3534 3479
3535 switch (op->type) 3480 switch (op->type)
3536 { 3481 {
3537 case WEAPON: 3482 case WEAPON:
3538 //TODO: this obviously fails for players using a shorter prefix 3483 if (op->level && (!op->name.starts_with (who->name) || op->name [who->name.length ()] != '\''))
3539 // i.e. "R" can use Ragnarok's sword.
3540 if (op->level && !op->name.starts_with (who->name))
3541 { 3484 {
3542 /* if the weapon does not have the name as the character, can't use it. */ 3485 /* if the weapon does not have the name as the character, can't use it. */
3543 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3486 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3544 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3487 who->failmsg ("The weapon does not recognize you as its owner. "
3545 3488 "H<Its name indicates that it belongs to somebody else.>");
3546 if (tmp) 3489 if (tmp) who->insert (tmp);
3547 insert_ob_in_ob (tmp, who);
3548
3549 return 1; 3490 return 1;
3550 } 3491 }
3551 3492
3552 if (!skop) 3493 op->flag [FLAG_APPLIED] = true;
3494
3495 if (player *pl = who->contr)
3553 { 3496 {
3554 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO 3497 who->statusmsg (format ("You wield %s.", query_name (op)));
3555 return 1; 3498 change_abil (who, op);
3556 } 3499 }
3557 3500 else
3558 SET_FLAG (op, FLAG_APPLIED);
3559 who->change_skill (skop); 3501 who->change_skill (skop);
3560 3502
3561 if (who->contr) 3503 op->flag [FLAG_READY_WEAPON] = true;
3562 who->change_weapon (who->contr->combat_ob = op);
3563
3564 who->statusmsg (format ("You wield %s.", query_name (op)));
3565
3566 SET_FLAG (who, FLAG_READY_WEAPON);
3567 change_abil (who, op);
3568 break; 3504 break;
3569 3505
3570 case ARMOUR: 3506 case ARMOUR:
3571 case HELMET: 3507 case HELMET:
3572 case SHIELD: 3508 case SHIELD:
… …
3581 who->statusmsg (format ("You wear %s.", query_name (op))); 3517 who->statusmsg (format ("You wear %s.", query_name (op)));
3582 change_abil (who, op); 3518 change_abil (who, op);
3583 break; 3519 break;
3584 3520
3585 case SKILL_TOOL: 3521 case SKILL_TOOL:
3586 // applying a skill tool also readies the skill 3522 // applying a skill tool does not ready the skill
3523 // if something needs the skill, it has to ready it itself
3524 //TODO: unapplying should unapply the skill, though
3587 SET_FLAG (op, FLAG_APPLIED); 3525 SET_FLAG (op, FLAG_APPLIED);
3526 break;
3588 3527
3528 case SKILL:
3589 if (!(aflags & AP_NO_READY)) 3529 if (!(aflags & AP_NO_SLOT))
3590 { 3530 {
3591 skop = find_skill_by_name (who, op->skill); 3531 // skill is used on it's own, as opposed to being a chosen_skill
3592 if (!skop->flag [FLAG_APPLIED])
3593 apply_special (who, skop, AP_APPLY);
3594 }
3595 break;
3596 3532
3597 case SKILL: 3533 if (skill_flags [op->subtype] & (SF_NEED_ITEM | SF_MANA))
3598 if (player *pl = who->contr)
3599 {
3600 if (IS_COMBAT_SKILL (op->subtype))
3601 { 3534 {
3602 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3603 {
3604 for (object *item = who->inv; item; item = item->below)
3605 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3606 {
3607 if (item->skill == op->skill)
3608 {
3609 who->change_weapon (pl->combat_ob = item);
3610 goto found_weapon;
3611 }
3612 }
3613
3614 who->failmsg (format ( 3535 who->failmsg (format (
3615 "You need to apply a '%s' melee weapon before readying this skill. " 3536 "You feel as if you wanted to do something funny, but you can't remember what. "
3616 "H<Some skills need an item, in this case a melee weapon, to function.>", 3537 "H<The %s skill needs something else to function, for example a tool, weapon, rod, or spell. "
3617 &op->skill 3538 "It cannot be used on its own.>",
3618 ));
3619 return 1;
3620
3621 found_weapon:;
3622 }
3623 else
3624 who->change_weapon (pl->combat_ob = op);
3625 }
3626 else if (IS_RANGED_SKILL (op->subtype))
3627 {
3628 if (skill_flags [op->subtype] & SF_NEED_BOW)
3629 {
3630 for (object *item = who->inv; item; item = item->below)
3631 if (item->type == BOW && item->flag [FLAG_APPLIED])
3632 {
3633 //TODO: bows should/must all have skill missile weapon right now
3634 who->change_weapon (pl->ranged_ob = item);
3635 goto found_bow;
3636 }
3637
3638 who->failmsg (
3639 "You need to apply a missile weapon before readying this skill. "
3640 "H<Some skills need an item, in this case a missile weapon, to function.>"
3641 );
3642 return 1;
3643
3644 found_bow:;
3645 }
3646 else
3647 who->change_weapon (pl->ranged_ob = op);
3648 }
3649
3650 if (!op->invisible)
3651 {
3652 who->statusmsg (format (
3653 "You ready %s."
3654 "You can now use the skill: %s.",
3655 query_name (op),
3656 &op->skill 3539 &op->skill
3657 )); 3540 ));
3541 if (tmp) who->insert (tmp);
3542 return 1;
3658 } 3543 }
3544
3545 if (skill_flags [op->subtype] & SF_AUTARK
3546 || !(skill_flags [op->subtype] & (SF_COMBAT | SF_RANGED)))
3547 {
3548 if (skill_flags [op->subtype] & SF_USE)
3549 who->failmsg (format (
3550 "You feel as if you wanted to do something funny, but you can't remember what. "
3551 "H<The %s skill cannot be readied, instead, try C<use_skill %s>.>",
3552 &op->skill, &op->skill
3553 ));
3659 else 3554 else
3660 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name)); 3555 who->failmsg (format (
3556 "You feel as if you wanted to do something funny, but you can't remember what. "
3557 "H<The %s skill cannot be readied or used, it is always active.>",
3558 &op->skill, &op->skill
3559 ));
3560
3561 if (tmp) who->insert (tmp);
3562 return 1;
3563 }
3564
3565 if (who->contr)
3566 who->statusmsg (format (
3567 op->invisible ? "You can now use the %s skill." : "You ready %s.",
3568 query_name (op),
3569 &op->skill
3570 ));
3661 } 3571 }
3662 else 3572
3663 {
3664 SET_FLAG (op, FLAG_APPLIED);
3665 change_abil (who, op);
3666 who->chosen_skill = op;
3667 SET_FLAG (who, FLAG_READY_SKILL); 3573 SET_FLAG (who, FLAG_READY_SKILL);
3668 } 3574 SET_FLAG (op, FLAG_APPLIED);
3669 3575 change_abil (who, op);
3670 break; 3576 break;
3671 3577
3672 case BOW: 3578 case BOW:
3673 if (op->level && !op->name.starts_with (who->name)) 3579 if (op->level && (!op->name.starts_with (who->name) || op->name [who->name.length ()] != '\''))
3674 { 3580 {
3675 who->failmsg ("The weapon does not recognize you as its owner. " 3581 who->failmsg ("The weapon does not recognize you as its owner. "
3676 "H<Its name indicates that it belongs to somebody else.>"); 3582 "H<Its name indicates that it belongs to somebody else.>");
3677 if (tmp) 3583 if (tmp) who->insert (tmp);
3678 insert_ob_in_ob (tmp, who);
3679
3680 return 1; 3584 return 1;
3681 } 3585 }
3586
3587 if (player *pl = who->contr)
3588 {
3589 op->flag [FLAG_APPLIED] = true;
3590 who->statusmsg (format ("You wield the %s.", query_name (op)));
3591 change_abil (who, op);
3592 }
3593 break;
3594
3595 case RANGED:
3596 if (player *pl = who->contr)
3597 {
3598 op->flag [FLAG_APPLIED] = true;
3599 who->statusmsg (format ("You applied the %s.", query_name (op)));
3600 }
3601 break;
3602
3603 case SPELL:
3604 if (player *pl = who->contr)
3605 {
3606 op->flag [FLAG_APPLIED] = true;
3607 who->statusmsg (format ("You ready the spell %s.", query_name (op)));
3608 }
3609 break;
3682 3610
3683 /*FALLTHROUGH*/ 3611 /*FALLTHROUGH*/
3684 case WAND: 3612 case WAND:
3685 case ROD: 3613 case ROD:
3686 case HORN: 3614 case HORN:
3687 /* check for skill, alter player status */ 3615 /* check for skill, alter player status */
3688 3616
3689 if (!skop) 3617 if (!skop)
3690 { 3618 {
3691 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO 3619 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3620 if (tmp) who->insert (tmp);
3692 return 1; 3621 return 1;
3693 } 3622 }
3694 3623
3695 SET_FLAG (op, FLAG_APPLIED); 3624 op->flag [FLAG_APPLIED] = true;
3696 who->change_skill (skop);
3697 3625
3698 if (who->contr) 3626 if (player *pl = who->contr)
3699 { 3627 {
3700 who->contr->ranged_ob = op;
3701
3702 who->statusmsg (format ("You ready %s.", query_name (op))); 3628 who->statusmsg (format ("You ready %s.", query_name (op)));
3703 3629
3704 if (op->type == BOW) 3630 if (op->type == BOW)
3705 {
3706 who->current_weapon = op;
3707 change_abil (who, op);
3708 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op))); 3631 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3709 } 3632
3633 change_abil (who, op);
3710 } 3634 }
3711 else 3635 else
3712 { 3636 {
3637 who->change_skill (skop);
3638
3713 if (op->type == BOW) 3639 if (op->type == BOW)
3714 SET_FLAG (who, FLAG_READY_BOW); 3640 op->flag [FLAG_READY_BOW ] = true;
3715 else 3641 else
3716 SET_FLAG (who, FLAG_READY_RANGE); 3642 op->flag [FLAG_READY_RANGE] = true;
3717 } 3643 }
3718 3644
3719 break; 3645 break;
3720 3646
3721 case BUILDER: 3647 case BUILDER:
3722 if (who->type == PLAYER) 3648 if (player *pl = who->contr)
3723 { 3649 {
3724 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3725 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3726 unapply_special (who, who->contr->ranged_ob, 0);
3727
3728 who->statusmsg (format ("You ready your %s.", query_name (op))); 3650 who->statusmsg (format ("You ready your %s.", query_name (op)));
3729 3651 //TODO: change_abil?
3730 who->contr->ranged_ob = op;
3731 } 3652 }
3732 break; 3653 break;
3733 3654
3734 default: 3655 default:
3735 who->statusmsg (format ("You apply %s.", query_name (op))); 3656 who->statusmsg (format ("You apply %s.", query_name (op)));
3736 } 3657 }
3737 3658
3738 SET_FLAG (op, FLAG_APPLIED); 3659 SET_FLAG (op, FLAG_APPLIED);
3739 3660
3740 if (tmp)
3741 who->insert (tmp); 3661 if (tmp) who->insert (tmp);
3742 3662
3743 who->update_stats (); 3663 who->update_stats ();
3744 3664
3745 /* We exclude spell casting objects. The fire code will set the 3665 /* We exclude spell casting objects. The fire code will set the
3746 * been applied flag when they are used - until that point, 3666 * been applied flag when they are used - until that point,
… …
3761 3681
3762 if (object *pl = op->visible_to ()) 3682 if (object *pl = op->visible_to ())
3763 esrv_send_item (pl, op); 3683 esrv_send_item (pl, op);
3764 3684
3765 return 0; 3685 return 0;
3766}
3767
3768int
3769monster_apply_special (object *who, object *op, int aflags)
3770{
3771 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3772 return 1;
3773
3774 return apply_special (who, op, aflags);
3775} 3686}
3776 3687
3777/** 3688/**
3778 * Map was just loaded, handle op's initialisation. 3689 * Map was just loaded, handle op's initialisation.
3779 * 3690 *
… …
3886 * treasure again for this object 3797 * treasure again for this object
3887 */ 3798 */
3888 invtmp->randomitems = NULL; 3799 invtmp->randomitems = NULL;
3889 } 3800 }
3890 } 3801 }
3802
3891 /* This is really temporary - the code at the bottom will 3803 /* This is really temporary - the code at the bottom will
3892 * also set randomitems to null. The problem is there are bunches 3804 * also set randomitems to null. The problem is there are bunches
3893 * of maps/players already out there with items that have spells 3805 * of maps/players already out there with items that have spells
3894 * which haven't had the randomitems set to null yet. 3806 * which haven't had the randomitems set to null yet.
3895 * MSW 2004-05-13 3807 * MSW 2004-05-13
… …
3899 * Ryo 2004-08-16 3811 * Ryo 2004-08-16
3900 */ 3812 */
3901 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3813 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3902 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3814 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3903 tmp->randomitems = NULL; 3815 tmp->randomitems = NULL;
3904
3905 } 3816 }
3906 3817
3907 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY)) 3818 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3908 auto_apply (tmp); 3819 auto_apply (tmp);
3909 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ()) 3820 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
… …
3966 /* bigger morsel of food = longer effect time */ 3877 /* bigger morsel of food = longer effect time */
3967 int duration = TIME2TICK (food->stats.food); 3878 int duration = TIME2TICK (food->stats.food);
3968 3879
3969 if (force = who->force_find (key)) 3880 if (force = who->force_find (key))
3970 { 3881 {
3971 if (duration > abs (force->speed_left / force->speed)) 3882 if (duration > fabs (force->speed_left / force->speed))
3972 { 3883 {
3973 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration)); 3884 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3974 force->force_set_timer (duration); 3885 force->force_set_timer (duration);
3975 } 3886 }
3976 else 3887 else

Diff Legend

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