Remove the sound-strength #defines because they're not used anymore (except for SL_SPLASH, which has been replaced by its value.) Change some #defines to const variables.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9087 c06c8d41-db1a-0410-9941-cceddc491573
QW73U22SVPKFZ367CURWGZCUJZIG73MRKWE2EBRG535N4UUYKMNAC
NSD5WBHUIEBY3ERXRDKEROHS33XIPC5DREFWKXZZXVIA2T2ROBOAC
RWE2ZO5R66RPRHSXALZHJT5OXQDS4KV6VWNX53YGUVNX67JZH2JQC
JHQBA4WL7U3O43X2F32M25SXA5W6HAY72JRNMHJZRD2MBIUXPSOAC
JACNKPAASGQQSCVYO4KZN3O53TDDQ3SVRUPP5RDYSBKUUP4DN54AC
UEUVGV3LWIOMPT3PIQ5EHZ7V6QNXOJOSHY4GX5HRQFTPRQRGYDXQC
4DEV3DAZXCHIAC3JX6J6KON35QUOSRZBOECNAIPT5QLC3QNSSJXQC
E3D6MYCPSZJ64PQY4QLRJ2XCMKHHF3AOXM6I7JUEI5T2HMXCI7HQC
FSTBAOUY3VI4WOJUMMKNOQHIEM2ZDA5ZYOQVIM5UNNN3KWTIL3AQC
ACF63NLUBFZXHPKR37ZVQ6M7GMIHHHTFC2W5XSXT3OOLUUIDRMPQC
M7ZFG56FN7JSTREHU75K333KVVR75JZDZMIQGN44BLNXEKQXCX4AC
XIFYDIU5T2G26USZADZT65QLXEBQ5TCND4CWKCH664BJX2UCMY3QC
JMRV4P4X6OCLRDXDYRYOT7VTTQXZ6XWW56SO6YQGIUC4VNXGR72AC
HB27XKFYVYIEQZGBCEZ6LKPUBMXLIPDAAS636GJ5TULIQ7KND5KQC
LVCBY444HPB4RRFMUAZPHVZ67IC3L6DB27AEMCW3DEXHLBF73TMQC
HIPFIMUOA7DFOFV3DQ55YZJVGNU2GNDYFUCB4MRPUR5DTYDO5YMAC
SVY2PTCLXR3KNPQAWXVXTTGCC5DR334HOAKHYO3VDDRWM2BWMALAC
FY7SUVHPQO6D6EXYPZAZCNSBP53AOE32EL7HQHPN2J2CM3GDZ26QC
LUH6GAJODIQXNPBEHMSUTKH3KA3DYVRCKZ6GJJ4HHNHOIMMUEP6QC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
5FHWTG7M6FW4B3I33YI7QSM3OZIB6ZGC6TI6JISSLY5Y43HI56VAC
QFHQNEJ7B5RNTY4QRCDWBD2GVHUVN2URKFSZ2VCL4HKYB62ECIBQC
7YUGK5Q64KG5O7GJGTUBRRLHAHBCJ5YOE23YUPT6UBKUSB67CYAQC
SIDH2P7NBIG5KEOE27XHD3ZT2NQ2OJZFN6VZXWNWYFFY5YVXSSVQC
XHA6B4P5FAI5OTUQOA6J4VS2SBBR2MAFL2KMEBGD54O55WNSOGTQC
S5CIJLSFFXV445G6CH2AQ3YDU3P7RLSIHWV7GBJ4MZ4C26BWCY6AC
B4YYKEZVHLGRFAHEP5ATEV4MYRPGXQPWTUXGGG7ITZH3ZGV3VMBQC
DL4ZORRUZ3X4OCAGW5GVSIXLNK72KFHQOVA5QXU5QHT4YPRLFS2QC
4UMQENTWRICELVKGZI6ZR22VPH7Q6LOM7YDMAS4MXTAP7VI52YHAC
IIUK3DT26O7F4IBKB6QFTPLO4EVKBH55SAEXLNQEQRLDGJ37NDGAC
RRTDASQXZVA6WHTD22SITD7RUF7VNGLZUP2MCZ2VRL36OOEWOK5AC
L5YS6SNTQW7YRR5LGCDSLHLNFJ73IWHU4A7S3MY6KYLG67N2KPGAC
OX7LFYRMNGDX5ZMN3ZYOISDS2IPAVNBHPAKIF2UPGI4UYDDD35WQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
TGJZXTUIAKCFZQJ54ZQEBGFBVZSJCAX6AWDRSH3TP7UJRLGUM5SAC
JWJGOMVBPZRSP2VSHLFFFDIF2CS6UPBA6AHL7DAJWGBCHAV3PJDQC
LCDK2CK4O2RBLF2MAX75S2Q6ZKAX46WD6GOQDVIXUGHHXXZXMHRQC
N7KLZSYDHJYZ6UYV6YSXCO53NLWOFWJF43IOKZHDLFLR67B2USPAC
VQZEJTCSRZ5RVLCCKUCIS3IVZPFYRC26I74X4WIJAPEY7NYID2UQC
NVSFIV2ZKP44XHCSCXG6OZVGL67OIFINC34J2EMKTA4KULCERUEAC
AYU5OVG2HZO46KDAPKUWAVHS5HTYFKUWIMIRMTHAXVVFEDJE7YPAC
6ZBNP5FQRPWMZYXUO6N7RW5ZN7TJCYYLBNMHYYVSPXCYRQFCQ6YAC
YKVVFNKT2M5WG2KBURRTOJG23BJVI6WUBP5JOGYPHQBS4RNGFGWQC
HFZQADL3R7ITWM3VPW5G3NCB2AHRMAMKYZOI3STW5LWUCTV4FFFQC
SXUKGEXMGRRN6UO2GJW4HSVU5TSUNUHIHBMMF7CAG7QMLKZYWTKQC
2E4RV454MTTCKYLKMSHEEAFPNAFVUXXPBZV3XP6V7QMF4BBWE7TAC
6TEISZD7HYSSL24EOKIBNURU66KGSQX7B7SNAHBP4DQSAOTGH2MQC
WZTIVJJVK7CAHU5D2IYPH7TWGTLBBYPJZJYPGWKCDGM3JQ6Z6VKAC
IA6EPF5ZQE6276Q4JSUKBSXHX5ODRY5I5UK7LXH4MQEDG36P6PZAC
ONH7AQ3AEA243UATI74P3TIWSS772XK3TA2JOZQZN6I5GO4Q5IZAC
V5SYTPXSEUOCYVBE3KRNZSOJMDIVOOLSOGJKQNHGZO26SHICPNCQC
XZTGZ7MOPX7ZOHQ4IQPXOHGUH5WPRNOYAQ6IQOMZDZYNVSAYFTNAC
MIMW5CBZXQEGL6BFKK2LK322VRSBADFF7AXMC24F3OBCDUYKQTGQC
W424WG7JEQN344GQAXTTPLLNYVQJZQJ5X4MLA4ACEVJYV6ECR45AC
2UQXBHFFMTZG5M6NPB7KS7WNIH6VPBPVJFO4AN3YPCMZBT637ICAC
GDMMLW5HKFUFEVA7BKREZGIAHV3KAXN2I7DY55RQFHXS5NVAAZZQC
CDFS7Z74W5HKPQIHQICOG442KQFXUSBGGLDDQLE3MG74T44YU6AQC
DS2GZKISEP2DM2VU6EJ525Q7W3WVOKJXG5PY2OY4VNFCLBHVVOTAC
SFWCESFCUEVKJ6ZQQX3Y5YTIQD5BC6MCVSLVZFRGRTU46BFLKKWAC
CGYTZT5QWIEGYKUOLOK7MFXSLJKLYRZONER5ZCDZO5XYWSLG475QC
P5TRGRH7XMQSPCZKM5IEEO34TY6WMLGHHX7BU6Y453JFRXLUR2VQC
PM65H4V4GNPVIJFUQW57DC3VDB7TRUUNXKVZONQKEFZSK3AXX5GQC
KAOE5HB3THUKVGFZRO5EZESHEB3Q34WUO5DFMLWIKOBF47LZTIYAC
WDEFQ6YABDQIGJXW5KT3OGR3EO6FZHXZELIRVIXQ4XDYTVOV5V6AC
GPEJOT73KMACP33IPAKFR5ROGHCOIP22VXZMQNYTGLEA2OSZUM2AC
5DIBLX3RXK752JKG2BQQM76GYEOMQ5E2YKTLROH3QQGHCVLAGRJQC
R2DQBWKIW7YUJB5SOQ7J274JIYRVX4H3ISFRPAL5RG2RVVP4G2KAC
IE3INS4WUXZOBVXB5VWRBYPVPXADD2U2W5H3TBTOYNWJ3EGRSGQQC
HUMRQOA7Y32XBXQNR5LUIWM2ZB57XDW4ZQHMZ4RDGDZATY6K73SQC
JINXDPUZLMFAVRZRQHYEHB4E64NNBECNZN3RLPZ5VL2XRGHY67ZAC
2PZXX7DNNOL5X3TF2ID22AGDHLHUHBPSAXQJR6EWG5YAXRJCAYWAC
MHI3OM6VJY6LZUD577O22XREHPOPMWDVR3UT2JWGFDAKD7SO6Y3QC
22MF6OUN62WDBJR5QFNJTKU7Q5TIQ76XWCEIRBFWAZDMZUSKJGCAC
MV5USMLTBKVRWBAD67UFJ2BS4Y5HEOMYASRSB44DS24BBMRP75RQC
7KWDC7XFNMBLSUO2HISIROBINZBX5T67LJEEXTAORXW2YZ7VWFGAC
SHSIZVHSB4RPTLGMFJXUDVHF3FTEZZYCRIH4CBZP4MXOBR3HC4QAC
CHUJFZ7HBTS6IC46OJQEMWSQV5QLF7LCPBYW5NPSEM4L6OT3PJVQC
E3X5HVN5UN75OMTJA6JFQBNZ54P37NDZLZZF7EFBZZC45KR73YGAC
IP4A3VRYFYIVLRUAU4DF4KDNP6E4UISWJX3LI2F4EGSSMIJYRJXAC
H5BVKRORNXTCJKFXQPTFWDURKSUFW24CGSJXBGZCJUP4DHMSVDBQC
P3BAFR6LTI7HANQCRLZWJ7LRJYFPFYIG7OVZV4RZM5EAMODRJKZAC
ASLW3Z5PAVZSWJEMMMVZT226P44EKSAD47QS72JIFJESAI3RPN3AC
SDLKLUNFGVKDS55DDJZCBAVIB7NL3RRYPTACAY65SCUQKV6APFSAC
5XNQ3SSNBFXFNWA6DPM74W6FH65NX665P3DMH6YCWVFOPZTJSYCQC
TPZWAV3USKO7RX4IGHLZKVPRN36K33PJPSZYL6FZMX4XBHTYOQYAC
25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC
KFWX5LI235XQYQOSUSSAKKQUNB2OCN3NOYP6E7D3HSM2UOSBGYHQC
ILOED4VB4I6VPAUTR75ZWX6MXDYXB5DO2EDK2UH67O3HNKWV23RQC
JK3HFJG76OOQHJMXJUSZRTR5CX5ZMS52LRVBLOR7E2NBI6PRSHHAC
JZTWTPXIUEVACX5B6FYQRVRJD3KQN653C4G4GXT2VSMX4EP7WS3AC
JZCODQCOUBBBPPR4TLOAPIB4BQLDY3ORTJXTWEQSUJVJ7DMK7FVAC
6ZZO2QBB46RZM6OXVS7OIKC5M3SEAULSSJFXW5PJG556JDKKUHWAC
QEEJFAETO6B2J4IWDIDCJ5UNIFNNHHG22IWF2CUJRTJJBNE47CWQC
7AMQN7MITMXBNVDAK5VOXTQ4TZIAOD6ZLOFJG7GQMBTY23Y2BKSAC
OP6CTAKWCAU64JXQ3USQYR5E5IFHQHNCACII5UMVRXUTZXJQOAZAC
W6IY6LF3MREPXC23AAKA2BJNUCJYCSOWY55DIWJWFLUEE2Y3LGNQC
X5WLJCJVW55SXZVP7IKP7ADCJIGNKN4PKAXFECVR6TNK7XSMZR7QC
WBAFNYODKTL3YSG3UOJITBJSTFYGJLIWKRNK6NMGIIP5TPC2BDGQC
HJV7BZBM752K5I47ILBQJJXSPODBBLGKDX5DWJTRDXPJ3V7AEVWAC
3YBQGKQ22WFXA5RXDSKLFWMABLJ6KHBVWEIA3WIDHWM25OECNTYAC
FUEEIUKGHHFPIRZCN3N753GONWAZTWQ2ZWR53IBJAAZ6FZUNGOMAC
EHCZCD3WGKXB4KDQKZXE7FZQHJ6E4IHHCM7GZJBRMDEQSDC223YAC
45CWQUPQHKUFUJ4MVL5K3KCVCCKLY2Z7RZWZ53UT723RV5STPSRAC
KFULGQQOHWUTXOM3BXCCYPGGVGGY4Z6265XUFRCBPNLTZAEHJZSQC
R5JKQLY5QE6UBG3RH3Y5ZRSX6H35CHYI2HYNDZF6ZHVRULUORXBQC
DOZORMA366M4HB5JKSS27BMCR6ET7QNZNND2B7KV3NVEEPR5H7EAC
{
if (mgrd(*ai) == NON_MONSTER
&& parent->can_pass_through(*ai)
&& (*ai != you.pos()))
{
if (actor_at(*ai) == NULL && parent->can_pass_through(*ai))
if (!invalid_monster_index(targmonster)
&& mons_aligned(thismonster, targmonster)
&& !_mons_can_displace(monster, &menv[targmonster]))
if (mons_aligned(monster->mindex(), targmonster->mindex())
&& !_mons_can_displace(monster, targmonster))
if (!check_warning_inscriptions(you.inv[you.equip[EQ_AMULET]],
OPER_REMOVE)
|| !remove_ring( you.equip[EQ_AMULET], true ))
// Remove the previous one.
if (!check_warning_inscriptions(*amulet, OPER_REMOVE)
|| !remove_ring(you.equip[EQ_AMULET], true))
// First ring goes on left hand if we're choosing automatically.
int hand_used = 0;
if (you.equip[EQ_LEFT_RING] != -1)
hand_used = 1;
if (you.equip[EQ_RIGHT_RING] != -1)
hand_used = 0;
equipment_type hand_used;
if (keyin == 'l')
hand_used = 0;
else if (keyin == 'r')
hand_used = 1;
else if (keyin == ESCAPE)
return (false);
else
if (lring && !rring)
hand_used = EQ_RIGHT_RING;
else if (rring && !lring)
hand_used = EQ_LEFT_RING;
else if (prompt_finger) // both free; both busy has been handled
mpr("You don't have such a hand!");
return (false);
mpr("Put on which hand (l or r)?", MSGCH_PROMPT);
int keyin = get_ch();
switch (keyin)
{
case 'l': hand_used = EQ_LEFT_RING; break;
case 'r': hand_used = EQ_RIGHT_RING; break;
case ESCAPE: return (false);
default:
mpr("You don't have such a hand!");
return (false);
}
if (grd(you.pos()) >= DNGN_FOUNTAIN_BLUE
&& grd(you.pos()) <= DNGN_FOUNTAIN_BLOOD)
{
const dungeon_feature_type feat = grd(you.pos());
if (feat >= DNGN_FOUNTAIN_BLUE && feat <= DNGN_FOUNTAIN_BLOOD)
const potion_type effects[] =
{ POT_WATER, POT_DECAY,
POT_MUTATION, POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED, POT_MIGHT,
POT_DEGENERATION,
POT_LEVITATION, POT_POISON, POT_SLOWING,
POT_PARALYSIS, POT_CONFUSION, POT_INVISIBILITY,
POT_MAGIC, POT_RESTORE_ABILITIES, POT_RESISTANCE,
POT_STRONG_POISON, POT_BERSERK_RAGE,
POT_GAIN_STRENGTH, POT_GAIN_INTELLIGENCE, POT_GAIN_DEXTERITY };
const int weights[] = { 467, 48,
40, 40, 40, 40, 40,
32,
27, 27, 27,
27, 27, 27,
20, 20, 20,
20, 20,
4, 4, 4 };
COMPILE_CHECK(ARRAYSZ(weights) == ARRAYSZ(effects), c1);
fountain_effect =
effects[choose_random_weighted(weights,
weights + ARRAYSZ(weights))];
fountain_effect = static_cast<potion_type>(
random_choose_weighted(467, POT_WATER,
48, POT_DECAY,
40, POT_MUTATION,
40, POT_HEALING,
40, POT_HEAL_WOUNDS,
40, POT_SPEED,
40, POT_MIGHT,
32, POT_DEGENERATION,
27, POT_LEVITATION,
27, POT_POISON,
27, POT_SLOWING,
27, POT_PARALYSIS,
27, POT_CONFUSION,
27, POT_INVISIBILITY,
20, POT_MAGIC,
20, POT_RESTORE_ABILITIES,
20, POT_RESISTANCE,
20, POT_STRONG_POISON,
20, POT_BERSERK_RAGE,
4, POT_GAIN_STRENGTH,
4, POT_GAIN_INTELLIGENCE,
4, POT_GAIN_DEXTERITY,
0));
const int x_middle = MAX(beam.target.x, you.pos().x) - (x_distance / 2);
const int y_middle = MAX(beam.target.y, you.pos().y) - (y_distance / 2);
const int x_middle = std::max(beam.target.x, you.pos().x)
- (x_distance / 2);
const int y_middle = std::max(beam.target.y, you.pos().y)
- (y_distance / 2);
const coord_def middle(x_middle, y_middle);
// most items allowed in a shop
#define MAX_SHOP_ITEMS 16
// sound level standards
// mininum is the base, we add mult * radius to it:
#define SL_EXPLODE_MIN 10
#define SL_EXPLODE_MULT 10
// #define SL_BOW 3
#define SL_TRAP_CLICK 3
#define SL_HISS 6
#define SL_BUZZ 6
#define SL_GROWL 8
#define SL_MOAN 8
#define SL_SPLASH 8
#define SL_CREAK 8
#define SL_CROAK 8
#define SL_BARK 10
#define SL_YELL 10
#define SL_TRAP_JAM 12
#define SL_SHRIEK 12
#define SL_ROAR 15
#define SL_DIG 15
#define SL_NOISY_WEAPON 20
#define SL_HORN 25
#define SL_NOISE_SCROLL 30
#define SL_THUNDER 30
#define SL_PROJECTED_NOISE 30
#define SL_EARTHQUAKE 30
#define SL_TRAP_ZOT 30