nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

mplayer.c formatting

Browse Source 
Some formatting cleanup for file that escaped the umpteen earlier
rounds of such.
This commit is contained in:
PatR
2016-03-25 16:45:26 -07:00
parent cd674b5cf3
commit 36464df379
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mplayer.c
+31 -29
View File
@@ -1,5 +1,5 @@
/* NetHack 3.6 mplayer.c $NHDT-Date: 1432512774 2015/05/25 00:12:54 $ $NHDT-Branch: master $:$NHDT-Revision: 1.19 $ */ /* NetHack 3.6 mplayer.c $NHDT-Date: 1458949461 2016/03/25 23:44:21 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.21 $ */
/* Copyright (c) Izchak Miller, 1992. */ /* Copyright (c) Izchak Miller, 1992. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
@@ -134,23 +134,13 @@ register boolean special;
special = FALSE; special = FALSE;
if ((mtmp = makemon(ptr, x, y, NO_MM_FLAGS)) != 0) { if ((mtmp = makemon(ptr, x, y, NO_MM_FLAGS)) != 0) {
short weapon = rn2(2) ? LONG_SWORD : rnd_class(SPEAR, BULLWHIP); short weapon, armor, cloak, helm, shield;
short armor =
rnd_class(GRAY_DRAGON_SCALE_MAIL, YELLOW_DRAGON_SCALE_MAIL);
short cloak = !rn2(8)
? STRANGE_OBJECT
: rnd_class(OILSKIN_CLOAK, CLOAK_OF_DISPLACEMENT);
short helm = !rn2(8) ? STRANGE_OBJECT : rnd_class(ELVEN_LEATHER_HELM,
HELM_OF_TELEPATHY);
short shield = !rn2(8)
? STRANGE_OBJECT
: rnd_class(ELVEN_SHIELD, SHIELD_OF_REFLECTION);
int quan; int quan;
struct obj *otmp; struct obj *otmp;
mtmp->m_lev = (special ? rn1(16, 15) : rnd(16)); mtmp->m_lev = (special ? rn1(16, 15) : rnd(16));
mtmp->mhp = mtmp->mhpmax = mtmp->mhp = mtmp->mhpmax = d((int) mtmp->m_lev, 10)
d((int) mtmp->m_lev, 10) + (special ? (30 + rnd(30)) : 30); + (special ? (30 + rnd(30)) : 30);
if (special) { if (special) {
get_mplname(mtmp, nam); get_mplname(mtmp, nam);
mtmp = christen_monst(mtmp, nam); mtmp = christen_monst(mtmp, nam);
@@ -160,6 +150,16 @@ register boolean special;
mtmp->mpeaceful = 0; mtmp->mpeaceful = 0;
set_malign(mtmp); /* peaceful may have changed again */ set_malign(mtmp); /* peaceful may have changed again */
/* default equipment; much of it will be overridden below */
weapon = !rn2(2) ? LONG_SWORD : rnd_class(SPEAR, BULLWHIP);
armor = rnd_class(GRAY_DRAGON_SCALE_MAIL, YELLOW_DRAGON_SCALE_MAIL);
cloak = !rn2(8) ? STRANGE_OBJECT
: rnd_class(OILSKIN_CLOAK, CLOAK_OF_DISPLACEMENT);
helm = !rn2(8) ? STRANGE_OBJECT
: rnd_class(ELVEN_LEATHER_HELM, HELM_OF_TELEPATHY);
shield = !rn2(8) ? STRANGE_OBJECT
: rnd_class(ELVEN_SHIELD, SHIELD_OF_REFLECTION);
switch (monsndx(ptr)) { switch (monsndx(ptr)) {
case PM_ARCHEOLOGIST: case PM_ARCHEOLOGIST:
if (rn2(2)) if (rn2(2))
@@ -285,18 +285,18 @@ register boolean special;
mk_mplayer_armor(mtmp, helm); mk_mplayer_armor(mtmp, helm);
mk_mplayer_armor(mtmp, shield); mk_mplayer_armor(mtmp, shield);
if (rn2(8)) if (rn2(8))
mk_mplayer_armor( mk_mplayer_armor(mtmp, rnd_class(LEATHER_GLOVES,
mtmp, rnd_class(LEATHER_GLOVES, GAUNTLETS_OF_DEXTERITY)); GAUNTLETS_OF_DEXTERITY));
if (rn2(8)) if (rn2(8))
mk_mplayer_armor(mtmp, mk_mplayer_armor(mtmp, rnd_class(LOW_BOOTS,
rnd_class(LOW_BOOTS, LEVITATION_BOOTS)); LEVITATION_BOOTS));
m_dowear(mtmp, TRUE); m_dowear(mtmp, TRUE);
quan = rn2(3) ? rn2(3) : rn2(16); quan = rn2(3) ? rn2(3) : rn2(16);
while (quan--) while (quan--)
(void) mongets(mtmp, rnd_class(DILITHIUM_CRYSTAL, JADE)); (void) mongets(mtmp, rnd_class(DILITHIUM_CRYSTAL, JADE));
/* To get the gold "right" would mean a player can double his */ /* To get the gold "right" would mean a player can double his
/* gold supply by killing one mplayer. Not good. */ gold supply by killing one mplayer. Not good. */
mkmonmoney(mtmp, rn2(1000)); mkmonmoney(mtmp, rn2(1000));
quan = rn2(10); quan = rn2(10);
while (quan--) while (quan--)
@@ -357,15 +357,17 @@ void
mplayer_talk(mtmp) mplayer_talk(mtmp)
register struct monst *mtmp; register struct monst *mtmp;
{ {
static const char *same_class_msg[3] = static const char
{ *same_class_msg[3] = {
"I can't win, and neither will you!", "You don't deserve to win!", "I can't win, and neither will you!",
"Mine should be the honor, not yours!", "You don't deserve to win!",
"Mine should be the honor, not yours!",
}, },
*other_class_msg[3] = { *other_class_msg[3] = {
"The low-life wants to talk, eh?", "Fight, scum!", "The low-life wants to talk, eh?",
"Here is what I have to say!", "Fight, scum!",
}; "Here is what I have to say!",
};
if (mtmp->mpeaceful) if (mtmp->mpeaceful)
return; /* will drop to humanoid talk */ return; /* will drop to humanoid talk */