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

Make GOLDOBJ unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-14 01:31:22 -05:00
parent 4f59f5c6fd
commit ac108cd365
58 changed files with 8 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/u_init.c
View File

@@ -210,12 +210,10 @@ static struct trobj Wishing[] = {
{ WAN_WISHING, 3, WAND_CLASS, 1, 0 },
{ 0, 0, 0, 0, 0 }
};
#ifdef GOLDOBJ
static struct trobj Money[] = {
{ GOLD_PIECE, 0 , COIN_CLASS, 1, 0 },
{ 0, 0, 0, 0, 0 }
};
#endif
/* race-based substitutions for initial inventory;
the weaker cloak for elven rangers is intentional--they shoot better */
@@ -597,11 +595,7 @@ u_init()
skill_init(Skill_C);
break;
case PM_HEALER:
#ifndef GOLDOBJ
u.ugold = u.ugold0 = rn1(1000, 1001);
#else
u.umoney0 = rn1(1000, 1001);
#endif
ini_inv(Healer);
if(!rn2(25)) ini_inv(Lamp);
knows_object(POT_FULL_HEALING);
@@ -650,11 +644,7 @@ u_init()
break;
case PM_ROGUE:
Rogue[R_DAGGERS].trquan = rn1(10, 6);
#ifndef GOLDOBJ
u.ugold = u.ugold0 = 0;
#else
u.umoney0 = 0;
#endif
ini_inv(Rogue);
if(!rn2(5)) ini_inv(Blindfold);
knows_object(SACK);
@@ -670,11 +660,7 @@ u_init()
break;
case PM_TOURIST:
Tourist[T_DARTS].trquan = rn1(20, 21);
#ifndef GOLDOBJ
u.ugold = u.ugold0 = rnd(1000);
#else
u.umoney0 = rnd(1000);
#endif
ini_inv(Tourist);
if(!rn2(25)) ini_inv(Tinopener);
else if(!rn2(25)) ini_inv(Leash);
@@ -778,12 +764,8 @@ u_init()
if (wizard)
read_wizkit();
#ifndef GOLDOBJ
u.ugold0 += hidden_gold(); /* in case sack has gold in it */
#else
if (u.umoney0) ini_inv(Money);
u.umoney0 += hidden_gold(); /* in case sack has gold in it */
#endif
find_ac(); /* get initial ac value */
init_attr(75); /* init attribute values */
@@ -939,12 +921,10 @@ register struct trobj *trop;
nocreate4 = otyp;
}
#ifdef GOLDOBJ
if (trop->trclass == COIN_CLASS) {
/* no "blessed" or "identified" money */
obj->quan = u.umoney0;
} else {
#endif
if (objects[otyp].oc_uses_known) obj->known = 1;
obj->dknown = obj->bknown = obj->rknown = 1;
if (Is_container(obj) || obj->otyp == STATUE) {
@@ -966,9 +946,7 @@ register struct trobj *trop;
obj->spe = trop->trspe;
if (trop->trbless != UNDEF_BLESS)
obj->blessed = trop->trbless;
#ifdef GOLDOBJ
}
#endif
/* defined after setting otyp+quan + blessedness */
obj->owt = weight(obj);
obj = addinv(obj);