diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/artilist.h nethack-base/include/artilist.h --- nethack-3.4.3/include/artilist.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/artilist.h 2006-06-15 14:45:32.000000000 +1000 @@ -212,13 +212,11 @@ A("The Tsurugi of Muramasa", TSURUGI, PHYS(0,8), NO_DFNS, NO_CARY, 0, A_LAWFUL, PM_SAMURAI, NON_PM, 4500L ), -#ifdef TOURIST A("The Platinum Yendorian Express Card", CREDIT_CARD, (SPFX_NOGEN|SPFX_RESTR|SPFX_INTEL|SPFX_DEFN), (SPFX_ESP|SPFX_HSPDAM), 0, NO_ATTK, NO_DFNS, CARY(AD_MAGM), CHARGE_OBJ, A_NEUTRAL, PM_TOURIST, NON_PM, 7000L ), -#endif A("The Orb of Fate", CRYSTAL_BALL, (SPFX_NOGEN|SPFX_RESTR|SPFX_INTEL|SPFX_LUCK), diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/config.h nethack-base/include/config.h --- nethack-3.4.3/include/config.h 2004-03-16 17:31:08.000000000 +1100 +++ nethack-base/include/config.h 2006-06-15 14:45:32.000000000 +1000 @@ -323,8 +323,6 @@ typedef unsigned char uchar; /* monsters & objects */ #define KOPS /* Keystone Kops by Scott R. Turner */ #define SEDUCE /* Succubi/incubi seduction, by KAA, suggested by IM */ -#define STEED /* Riding steeds */ -#define TOURIST /* Tourist players with cameras and Hawaiian shirts */ /* difficulty */ #define ELBERETH /* Engraving the E-word repels monsters */ /* I/O */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/decl.h nethack-base/include/decl.h --- nethack-3.4.3/include/decl.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/decl.h 2006-06-15 14:45:32.000000000 +1000 @@ -239,9 +239,7 @@ E uchar monsyms[MAXMCLASSES]; /* curren #include "obj.h" E NEARDATA struct obj *invent, *uarm, *uarmc, *uarmh, *uarms, *uarmg, *uarmf, -#ifdef TOURIST *uarmu, /* under-wear, so to speak */ -#endif *uskin, *uamul, *uleft, *uright, *ublindf, *uwep, *uswapwep, *uquiver; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/display.h nethack-base/include/display.h --- nethack-3.4.3/include/display.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/display.h 2006-06-15 14:45:32.000000000 +1000 @@ -192,12 +192,8 @@ * Display the hero. It is assumed that all checks necessary to determine * _if_ the hero can be seen have already been done. */ -#ifdef STEED #define maybe_display_usteed (u.usteed && mon_visible(u.usteed)) ? \ ridden_mon_to_glyph(u.usteed) : -#else -#define maybe_display_usteed /* empty */ -#endif #define display_self() \ show_glyph(u.ux, u.uy, \ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/extern.h nethack-base/include/extern.h --- nethack-3.4.3/include/extern.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/extern.h 2006-06-15 14:45:32.000000000 +1000 @@ -369,9 +369,7 @@ E int NDECL(Gloves_off); E int NDECL(Boots_off); E int NDECL(Cloak_off); E int NDECL(Shield_off); -#ifdef TOURIST E int NDECL(Shirt_off); -#endif E void NDECL(Amulet_off); E void FDECL(Ring_on, (struct obj *)); E void FDECL(Ring_off, (struct obj *)); @@ -1913,7 +1911,6 @@ E struct obj *FDECL(findgold, (struct ob /* ### steed.c ### */ -#ifdef STEED E void NDECL(rider_cant_reach); E boolean FDECL(can_saddle, (struct monst *)); E int FDECL(use_saddle, (struct obj *)); @@ -1924,7 +1921,6 @@ E void NDECL(exercise_steed); E void NDECL(kick_steed); E void FDECL(dismount_steed, (int)); E void FDECL(place_monster, (struct monst *,int,int)); -#endif /* ### teleport.c ### */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/hack.h nethack-base/include/hack.h --- nethack-3.4.3/include/hack.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/hack.h 2006-06-15 14:45:32.000000000 +1000 @@ -36,7 +36,6 @@ #define BY_PAPER 2 #define BY_OTHER 9 -#ifdef STEED /* Macros for why you are no longer riding */ #define DISMOUNT_GENERIC 0 #define DISMOUNT_FELL 1 @@ -45,7 +44,6 @@ #define DISMOUNT_ENGULFED 4 #define DISMOUNT_BONES 5 #define DISMOUNT_BYCHOICE 6 -#endif /* Special returns from mapglyph() */ #define MG_CORPSE 0x01 diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/prop.h nethack-base/include/prop.h --- nethack-3.4.3/include/prop.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/prop.h 2006-06-15 14:45:32.000000000 +1000 @@ -87,12 +87,8 @@ struct prop { # define W_ARMS 0x00000008L /* Shield */ # define W_ARMG 0x00000010L /* Gloves/gauntlets */ # define W_ARMF 0x00000020L /* Footwear */ -#ifdef TOURIST # define W_ARMU 0x00000040L /* Undershirt */ # define W_ARMOR (W_ARM | W_ARMC | W_ARMH | W_ARMS | W_ARMG | W_ARMF | W_ARMU) -#else -# define W_ARMOR (W_ARM | W_ARMC | W_ARMH | W_ARMS | W_ARMG | W_ARMF) -#endif /* Weapons and artifacts */ # define W_WEP 0x00000100L /* Wielded weapon */ # define W_QUIVER 0x00000200L /* Quiver for (f)iring ammo */ @@ -105,9 +101,7 @@ struct prop { # define W_RINGR 0x00040000L /* Right ring */ # define W_RING (W_RINGL | W_RINGR) # define W_TOOL 0x00080000L /* Eyewear */ -#ifdef STEED # define W_SADDLE 0x00100000L /* KMH -- For riding monsters */ -#endif # define W_BALL 0x00200000L /* Punishment ball */ # define W_CHAIN 0x00400000L /* Punishment chain */ @@ -141,8 +135,6 @@ struct prop { #define WORN_BOOTS W_ARMF #define WORN_AMUL W_AMUL #define WORN_BLINDF W_TOOL -#ifdef TOURIST #define WORN_SHIRT W_ARMU -#endif #endif /* PROP_H */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/rm.h nethack-base/include/rm.h --- nethack-3.4.3/include/rm.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/rm.h 2006-06-15 14:45:32.000000000 +1000 @@ -512,10 +512,6 @@ extern dlevel_t level; /* structure desc !(level.monsters[x][y])->mburied) #define MON_BURIED_AT(x,y) (level.monsters[x][y] != (struct monst *)0 && \ (level.monsters[x][y])->mburied) -#ifndef STEED -#define place_monster(m,x,y) ((m)->mx=(x),(m)->my=(y),\ - level.monsters[(m)->mx][(m)->my]=(m)) -#endif #define place_worm_seg(m,x,y) level.monsters[x][y] = m #define remove_monster(x,y) level.monsters[x][y] = (struct monst *)0 #define m_at(x,y) (MON_AT(x,y) ? level.monsters[x][y] : \ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/skills.h nethack-base/include/skills.h --- nethack-3.4.3/include/skills.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/skills.h 2006-06-15 14:47:05.000000000 +1000 @@ -67,15 +67,12 @@ #define P_BARE_HANDED_COMBAT 37 #define P_MARTIAL_ARTS P_BARE_HANDED_COMBAT /* Role distinguishes */ #define P_TWO_WEAPON_COMBAT 38 /* Finally implemented */ -#ifdef STEED -#define P_RIDING 39 /* How well you control your steed */ -#define P_LAST_H_TO_H P_RIDING -#else -#define P_LAST_H_TO_H P_TWO_WEAPON_COMBAT -#endif #define P_FIRST_H_TO_H P_BARE_HANDED_COMBAT - -#define P_NUM_SKILLS (P_LAST_H_TO_H+1) +#define P_LAST_H_TO_H P_TWO_WEAPON_COMBAT +#define P_RIDING 39 /* How well you control your steed */ +#define P_FIRST_NON_COMBAT P_RIDING +#define P_LAST_NON_COMBAT P_RIDING +#define P_NUM_SKILLS (P_LAST_NON_COMBAT+1) /* These roles qualify for a martial arts bonus */ #define martial_bonus() (Role_if(PM_SAMURAI) || Role_if(PM_MONK)) diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/you.h nethack-base/include/you.h --- nethack-3.4.3/include/you.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/you.h 2006-06-15 14:45:32.000000000 +1000 @@ -346,11 +346,9 @@ struct you { long usleep; /* sleeping; monstermove you last started */ int uinvault; struct monst *ustuck; -#ifdef STEED struct monst *usteed; long ugallop; int urideturns; -#endif int umortality; /* how many times you died */ int ugrave_arise; /* you die and become something aside from a ghost */ time_t ubirthday; /* real world time when game began */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/include/youprop.h nethack-base/include/youprop.h --- nethack-3.4.3/include/youprop.h 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/include/youprop.h 2006-06-15 14:45:32.000000000 +1000 @@ -232,12 +232,8 @@ !is_floater(youmonst.data)) #define EFlying u.uprops[FLYING].extrinsic -#ifdef STEED # define Flying (EFlying || is_flyer(youmonst.data) || \ (u.usteed && is_flyer(u.usteed->data))) -#else -# define Flying (EFlying || is_flyer(youmonst.data)) -#endif /* May touch surface; does not override any others */ #define Wwalking (u.uprops[WWALKING].extrinsic && \ @@ -247,14 +243,9 @@ #define HSwimming u.uprops[SWIMMING].intrinsic #define ESwimming u.uprops[SWIMMING].extrinsic /* [Tom] */ -#ifdef STEED # define Swimming (HSwimming || ESwimming || \ is_swimmer(youmonst.data) || \ (u.usteed && is_swimmer(u.usteed->data))) -#else -# define Swimming (HSwimming || ESwimming || \ - is_swimmer(youmonst.data)) -#endif /* Get wet, don't go under water unless if amphibious */ #define HMagical_breathing u.uprops[MAGICAL_BREATHING].intrinsic diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/allmain.c nethack-base/src/allmain.c --- nethack-3.4.3/src/allmain.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/allmain.c 2006-06-15 14:45:32.000000000 +1000 @@ -96,12 +96,10 @@ moveloop() (void) makemon((struct permonst *)0, 0, 0, NO_MM_FLAGS); /* calculate how much time passed. */ -#ifdef STEED if (u.usteed && u.umoved) { /* your speed doesn't augment steed's speed */ moveamt = mcalcmove(u.usteed); } else -#endif { moveamt = youmonst.data->mmove; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/apply.c nethack-base/src/apply.c --- nethack-3.4.3/src/apply.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/apply.c 2006-06-15 14:45:32.000000000 +1000 @@ -11,9 +11,7 @@ static const char tools[] = { TOOL_CLASS static const char tools_too[] = { ALL_CLASSES, TOOL_CLASS, POTION_CLASS, WEAPON_CLASS, WAND_CLASS, GEM_CLASS, 0 }; -#ifdef TOURIST STATIC_DCL int FDECL(use_camera, (struct obj *)); -#endif STATIC_DCL int FDECL(use_towel, (struct obj *)); STATIC_DCL boolean FDECL(its_dead, (int,int,int *)); STATIC_DCL int FDECL(use_stethoscope, (struct obj *)); @@ -48,7 +46,6 @@ void FDECL( amii_speaker, ( struct obj * static const char no_elbow_room[] = "don't have enough elbow-room to maneuver."; -#ifdef TOURIST STATIC_OVL int use_camera(obj) struct obj *obj; @@ -86,7 +83,6 @@ use_camera(obj) } return 1; } -#endif STATIC_OVL int use_towel(obj) @@ -226,7 +222,6 @@ use_stethoscope(obj) last_used_move = moves; last_used_movement = youmonst.movement; -#ifdef STEED if (u.usteed && u.dz > 0) { if (interference) { pline("%s interferes.", Monnam(u.ustuck)); @@ -235,7 +230,6 @@ use_stethoscope(obj) mstatusline(u.usteed); return res; } else -#endif if (u.uswallow && (u.dx || u.dy || u.dz)) { mstatusline(u.ustuck); return res; @@ -428,13 +422,11 @@ struct obj *obj; if(!get_adjacent_loc((char *)0, (char *)0, u.ux, u.uy, &cc)) return; if((cc.x == u.ux) && (cc.y == u.uy)) { -#ifdef STEED if (u.usteed && u.dz > 0) { mtmp = u.usteed; spotmon = 1; goto got_target; } -#endif pline("Leash yourself? Very funny..."); return; } @@ -445,10 +437,7 @@ struct obj *obj; } spotmon = canspotmon(mtmp); -#ifdef STEED got_target: -#endif - if(!mtmp->mtame) { if(!spotmon) There("is no creature there."); @@ -528,10 +517,8 @@ next_to_u() } } } -#ifdef STEED /* no pack mules for the Amulet */ if (u.usteed && mon_has_amulet(u.usteed)) return FALSE; -#endif return(TRUE); } @@ -1266,23 +1253,19 @@ int magic; /* 0=Physical, otherwise skil const char *bp = body_part(LEG); if (wl == BOTH_SIDES) bp = makeplural(bp); -#ifdef STEED if (u.usteed) pline("%s is in no shape for jumping.", Monnam(u.usteed)); else -#endif Your("%s%s %s in no shape for jumping.", (wl == LEFT_SIDE) ? "left " : (wl == RIGHT_SIDE) ? "right " : "", bp, (wl == BOTH_SIDES) ? "are" : "is"); return 0; } -#ifdef STEED else if (u.usteed && u.utrap) { pline("%s is stuck in a trap.", Monnam(u.usteed)); return (0); } -#endif pline("Where do you want to jump?"); cc.x = u.ux; @@ -1783,7 +1766,6 @@ struct obj *obj; You(need_to_remove_outer_armor, buf, xname(otmp)); return; } -#ifdef TOURIST if ((otmp->owornmask & WORN_SHIRT) && (uarmc || uarm)) { Strcpy(buf, uarmc ? xname(uarmc) : ""); if (uarmc && uarm) Strcat(buf, " and "); @@ -1791,7 +1773,6 @@ struct obj *obj; You(need_to_remove_outer_armor, buf, xname(otmp)); return; } -#endif consume_obj_charge(obj, TRUE); if (otmp != &zeroobj) { @@ -2027,7 +2008,6 @@ struct obj *otmp; trapinfo.time_needed += (tmp > 12) ? 1 : (tmp > 7) ? 2 : 4; /*[fumbling and/or confusion and/or cursed object check(s) should be incorporated here instead of in set_trap]*/ -#ifdef STEED if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) { boolean chance; @@ -2057,7 +2037,6 @@ struct obj *otmp; return; } } -#endif You("begin setting %s %s.", shk_your(buf, otmp), defsyms[trap_to_defsym(what_trap(ttyp))].explanation); @@ -2149,19 +2128,13 @@ struct obj *obj; } else if ((!u.dx && !u.dy) || (u.dz > 0)) { int dam; -#ifdef STEED /* Sometimes you hit your steed by mistake */ if (u.usteed && !rn2(proficient + 2)) { You("whip %s!", mon_nam(u.usteed)); kick_steed(); return 1; } -#endif - if (Levitation -#ifdef STEED - || u.usteed -#endif - ) { + if (Levitation || u.usteed) { /* Have a shot at snaring something on the floor */ otmp = level.objects[u.ux][u.uy]; if (otmp && otmp->otyp == CORPSE && otmp->corpsenm == PM_HORSE) { @@ -2838,9 +2811,7 @@ doapply() use_grease(obj); break; case LOCK_PICK: -#ifdef TOURIST case CREDIT_CARD: -#endif case SKELETON_KEY: (void) pick_lock(obj); break; @@ -2854,11 +2825,9 @@ doapply() case LEASH: use_leash(obj); break; -#ifdef STEED case SADDLE: res = use_saddle(obj); break; -#endif case MAGIC_WHISTLE: use_magic_whistle(obj); break; @@ -2911,11 +2880,9 @@ doapply() case POT_OIL: light_cocktail(obj); break; -#ifdef TOURIST case EXPENSIVE_CAMERA: res = use_camera(obj); break; -#endif case TOWEL: res = use_towel(obj); break; @@ -3031,11 +2998,7 @@ unfixable_trouble_count(is_horn) if (Stoned) unfixable_trbl++; if (Strangled) unfixable_trbl++; - if (Wounded_legs -#ifdef STEED - && !u.usteed -#endif - ) unfixable_trbl++; + if (Wounded_legs && !u.usteed) unfixable_trbl++; if (Slimed) unfixable_trbl++; /* lycanthropy is not desirable, but it doesn't actually make you feel bad */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/attrib.c nethack-base/src/attrib.c --- nethack-3.4.3/src/attrib.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/attrib.c 2006-06-15 14:45:32.000000000 +1000 @@ -350,16 +350,16 @@ exerper() pline("exerper: Status checks"); #endif if ((HClairvoyant & (INTRINSIC|TIMEOUT)) && - !BClairvoyant) exercise(A_WIS, TRUE); - if (HRegeneration) exercise(A_STR, TRUE); - - if(Sick || Vomiting) exercise(A_CON, FALSE); - if(Confusion || Hallucination) exercise(A_WIS, FALSE); - if((Wounded_legs -#ifdef STEED - && !u.usteed -#endif - ) || Fumbling || HStun) exercise(A_DEX, FALSE); + !BClairvoyant) + exercise(A_WIS, TRUE); + if (HRegeneration) + exercise(A_STR, TRUE); + if(Sick || Vomiting) + exercise(A_CON, FALSE); + if(Confusion || Hallucination) + exercise(A_WIS, FALSE); + if((Wounded_legs && !u.usteed) || Fumbling || HStun) + exercise(A_DEX, FALSE); } } @@ -551,9 +551,7 @@ int oldlevel, newlevel; case PM_RANGER: abil = ran_abil; break; case PM_ROGUE: abil = rog_abil; break; case PM_SAMURAI: abil = sam_abil; break; -#ifdef TOURIST case PM_TOURIST: abil = tou_abil; break; -#endif case PM_VALKYRIE: abil = val_abil; break; case PM_WIZARD: abil = wiz_abil; break; default: abil = 0; break; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/ball.c nethack-base/src/ball.c --- nethack-3.4.3/src/ball.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/ball.c 2006-06-15 14:45:32.000000000 +1000 @@ -670,10 +670,7 @@ xchar x, y; register long side = rn2(3) ? LEFT_SIDE : RIGHT_SIDE; pline(pullmsg, "bear trap"); set_wounded_legs(side, rn1(1000, 500)); -#ifdef STEED - if (!u.usteed) -#endif - { + if (!u.usteed) { Your("%s %s is severely damaged.", (side == LEFT_SIDE) ? "left" : "right", body_part(LEG)); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/bones.c nethack-base/src/bones.c --- nethack-3.4.3/src/bones.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/bones.c 2006-06-15 14:45:32.000000000 +1000 @@ -232,9 +232,7 @@ struct obj *corpse; mptr == &mons[PM_VLAD_THE_IMPALER]) mongone(mtmp); } -#ifdef STEED if (u.usteed) dismount_steed(DISMOUNT_BONES); -#endif dmonsfree(); /* discard dead or gone monsters */ /* mark all fruits as nonexistent; when we come to them we'll mark diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/cmd.c nethack-base/src/cmd.c --- nethack-3.4.3/src/cmd.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/cmd.c 2006-06-15 14:45:32.000000000 +1000 @@ -905,15 +905,11 @@ int final; /* 0 => still in progress; 1 you_have(buf); } if (Fumbling) enl_msg("You fumble", "", "d", ""); - if (Wounded_legs -#ifdef STEED - && !u.usteed -#endif - ) { + if (Wounded_legs && !u.usteed) { Sprintf(buf, "wounded %s", makeplural(body_part(LEG))); you_have(buf); } -#if defined(WIZARD) && defined(STEED) +#if defined(WIZARD) if (Wounded_legs && u.usteed && wizard) { Strcpy(buf, x_monnam(u.usteed, ARTICLE_YOUR, (char *)0, SUPPRESS_SADDLE | SUPPRESS_HALLUCINATION, FALSE)); @@ -976,7 +972,7 @@ int final; /* 0 => still in progress; 1 if (Breathless) you_can("survive without air"); else if (Amphibious) you_can("breathe water"); if (Passes_walls) you_can("walk through walls"); -#ifdef STEED + /* If you die while dismounting, u.usteed is still set. Since several * places in the done() sequence depend on u.usteed, just detect this * special case. */ @@ -984,7 +980,7 @@ int final; /* 0 => still in progress; 1 Sprintf(buf, "riding %s", y_monnam(u.usteed)); you_are(buf); } -#endif + if (u.uswallow) { Sprintf(buf, "swallowed by %s", a_monnam(u.ustuck)); #ifdef WIZARD @@ -1490,9 +1486,7 @@ struct ext_func_tab extcmdlist[] = { {"offer", "offer a sacrifice to the gods", dosacrifice, FALSE}, {"pray", "pray to the gods for help", dopray, TRUE}, {"quit", "exit without saving current game", done2, TRUE}, -#ifdef STEED {"ride", "ride (or stop riding) a monster", doride, FALSE}, -#endif {"rub", "rub a lamp or a stone", dorub, FALSE}, {"sit", "sit down", dosit, FALSE}, {"turn", "turn undead", doturn, TRUE}, diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/decl.c nethack-base/src/decl.c --- nethack-3.4.3/src/decl.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/decl.c 2006-06-15 14:45:32.000000000 +1000 @@ -148,9 +148,7 @@ NEARDATA struct obj *invent = (struct ob *uwep = (struct obj *)0, *uarm = (struct obj *)0, *uswapwep = (struct obj *)0, *uquiver = (struct obj *)0, /* quiver */ -#ifdef TOURIST *uarmu = (struct obj *)0, /* under-wear, so to speak */ -#endif *uskin = (struct obj *)0, /* dragon armor, if a dragon */ *uarmc = (struct obj *)0, *uarmh = (struct obj *)0, *uarms = (struct obj *)0, *uarmg = (struct obj *)0, diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dig.c nethack-base/src/dig.c --- nethack-3.4.3/src/dig.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dig.c 2006-06-15 14:45:32.000000000 +1000 @@ -245,14 +245,12 @@ dig() You("fumble and drop your %s.", xname(uwep)); dropx(uwep); } else { -#ifdef STEED if (u.usteed) Your("%s %s and %s %s!", xname(uwep), otense(uwep, "bounce"), otense(uwep, "hit"), mon_nam(u.usteed)); else -#endif pline("Ouch! Your %s %s and %s you!", xname(uwep), otense(uwep, "bounce"), otense(uwep, "hit")); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/display.c nethack-base/src/display.c --- nethack-3.4.3/src/display.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/display.c 2006-06-15 14:45:32.000000000 +1000 @@ -1071,10 +1071,8 @@ see_monsters() newsym(mon->mx,mon->my); if (mon->wormno) see_wsegs(mon); } -#ifdef STEED /* when mounted, hero's location gets caught by monster loop */ if (!u.usteed) -#endif newsym(u.ux, u.uy); } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/do.c nethack-base/src/do.c --- nethack-3.4.3/src/do.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/do.c 2006-06-15 14:45:32.000000000 +1000 @@ -441,14 +441,12 @@ register const char *word; body_part(HAND)); return(FALSE); } -#ifdef STEED if (obj->owornmask & W_SADDLE) { if (*word) You("cannot %s %s you are sitting on.", word, something); return (FALSE); } -#endif return(TRUE); } @@ -755,7 +753,6 @@ dodown() (u.ux == sstairs.sx && u.uy == sstairs.sy && !sstairs.up)), ladder_down = (u.ux == xdnladder && u.uy == ydnladder); -#ifdef STEED if (u.usteed && !u.usteed->mcanmove) { pline("%s won't move!", Monnam(u.usteed)); return(0); @@ -763,7 +760,6 @@ dodown() pline("%s is still eating.", Monnam(u.usteed)); return(0); } else -#endif if (Levitation) { if ((HLevitation & I_SPECIAL) || (ELevitation & W_ARTI)) { /* end controlled levitation */ @@ -846,7 +842,6 @@ doup() You_cant("go up here."); return(0); } -#ifdef STEED if (u.usteed && !u.usteed->mcanmove) { pline("%s won't move!", Monnam(u.usteed)); return(0); @@ -854,7 +849,6 @@ doup() pline("%s is still eating.", Monnam(u.usteed)); return(0); } else -#endif if(u.ustuck) { You("are %s, and cannot go up.", !u.uswallow ? "being held" : is_animal(u.ustuck->data) ? @@ -1176,12 +1170,10 @@ boolean at_stairs, falling, portal; freeinv(uball); } } -#ifdef STEED /* falling off steed has its own losehp() call */ if (u.usteed) dismount_steed(DISMOUNT_FELL); else -#endif losehp(rnd(3), "falling downstairs", KILLED_BY); selftouch("Falling, you"); } else if (u.dz && at_ladder) @@ -1226,10 +1218,7 @@ boolean at_stairs, falling, portal; initrack(); if ((mtmp = m_at(u.ux, u.uy)) != 0 -#ifdef STEED - && mtmp != u.usteed -#endif - ) { + && mtmp != u.usteed) { /* There's a monster at your target destination; it might be one which accompanied you--see mon_arrive(dogmove.c)--or perhaps it was already here. Randomly move you to an adjacent spot @@ -1664,10 +1653,7 @@ heal_legs() flags.botl = 1; } -#ifdef STEED - if (!u.usteed) -#endif - { + if (!u.usteed) { /* KMH, intrinsics patch */ if((EWounded_legs & BOTH_SIDES) == BOTH_SIDES) { Your("%s feel somewhat better.", diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/do_name.c nethack-base/src/do_name.c --- nethack-3.4.3/src/do_name.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/do_name.c 2006-06-15 14:45:32.000000000 +1000 @@ -242,20 +242,16 @@ do_mname() cy = cc.y; if (cx == u.ux && cy == u.uy) { -#ifdef STEED if (u.usteed && canspotmon(u.usteed)) mtmp = u.usteed; else { -#endif pline("This %s creature is called %s and cannot be renamed.", ACURR(A_CHA) > 14 ? (flags.female ? "beautiful" : "handsome") : "ugly", plname); return(0); -#ifdef STEED } -#endif } else mtmp = m_at(cx, cy); @@ -604,9 +600,7 @@ boolean called; do_it = !canspotmon(mtmp) && article != ARTICLE_YOUR && !program_state.gameover && -#ifdef STEED mtmp != u.usteed && -#endif !(u.uswallow && mtmp == u.ustuck) && !(suppress & SUPPRESS_IT); do_saddle = !(suppress & SUPPRESS_SADDLE); @@ -666,11 +660,9 @@ boolean called; Strcat(strcat(buf, adjective), " "); if (do_invis) Strcat(buf, "invisible "); -#ifdef STEED if (do_saddle && (mtmp->misc_worn_check & W_SADDLE) && !Blind && !Hallucination) Strcat(buf, "saddled "); -#endif if (buf[0] != 0) has_adjectives = TRUE; else @@ -822,10 +814,8 @@ struct monst *mtmp; prefix = mtmp->mtame ? ARTICLE_YOUR : ARTICLE_THE; suppression_flag = (mtmp->mnamelth -#ifdef STEED /* "saddled" is redundant when mounted */ || mtmp == u.usteed -#endif ) ? SUPPRESS_SADDLE : 0; return x_monnam(mtmp, prefix, (char *)0, suppression_flag, FALSE); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/do_wear.c nethack-base/src/do_wear.c --- nethack-3.4.3/src/do_wear.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/do_wear.c 2006-06-15 14:45:32.000000000 +1000 @@ -20,9 +20,7 @@ static NEARDATA const char see_yourself[ static NEARDATA const char unknown_type[] = "Unknown type of %s (%d)"; static NEARDATA const char c_armor[] = "armor", c_suit[] = "suit", -#ifdef TOURIST c_shirt[] = "shirt", -#endif c_cloak[] = "cloak", c_gloves[] = "gloves", c_boots[] = "boots", @@ -35,10 +33,7 @@ static NEARDATA const char c_armor[] = static NEARDATA const long takeoff_order[] = { WORN_BLINDF, W_WEP, WORN_SHIELD, WORN_GLOVES, LEFT_RING, RIGHT_RING, WORN_CLOAK, - WORN_HELMET, WORN_AMUL, WORN_ARMOR, -#ifdef TOURIST - WORN_SHIRT, -#endif + WORN_HELMET, WORN_AMUL, WORN_ARMOR, WORN_SHIRT, WORN_BOOTS, W_SWAPWEP, W_QUIVER, 0L }; STATIC_DCL void FDECL(on_msg, (struct obj *)); @@ -48,9 +43,7 @@ STATIC_DCL int NDECL(Cloak_on); STATIC_PTR int NDECL(Helmet_on); STATIC_PTR int NDECL(Gloves_on); STATIC_PTR int NDECL(Shield_on); -#ifdef TOURIST STATIC_PTR int NDECL(Shirt_on); -#endif STATIC_DCL void NDECL(Amulet_on); STATIC_DCL void FDECL(Ring_off_or_gone, (struct obj *, BOOLEAN_P)); STATIC_PTR int FDECL(select_off, (struct obj *)); @@ -510,7 +503,6 @@ Shield_off() return 0; } -#ifdef TOURIST STATIC_OVL int Shirt_on() { @@ -540,7 +532,6 @@ Shirt_off() setworn((struct obj *)0, W_ARMU); return 0; } -#endif /*TOURIST*/ /* This must be done in worn.c, because one of the possible intrinsics conferred * is fire resistance, and we have to immediately set HFire_resistance in worn.c @@ -976,9 +967,7 @@ register struct obj *otmp; void set_wear() { -#ifdef TOURIST if (uarmu) (void) Shirt_on(); -#endif if (uarm) (void) Armor_on(); if (uarmc) (void) Cloak_on(); if (uarmf) (void) Boots_on(); @@ -999,11 +988,9 @@ register struct obj *otmp; if (otmp == uarm) result = (afternmv == Armor_on || afternmv == Armor_off || what == WORN_ARMOR); -#ifdef TOURIST else if (otmp == uarmu) result = (afternmv == Shirt_on || afternmv == Shirt_off || what == WORN_SHIRT); -#endif else if (otmp == uarmc) result = (afternmv == Cloak_on || afternmv == Cloak_off || what == WORN_CLOAK); @@ -1060,11 +1047,9 @@ dotakeoff() } else if (uarm) { armorpieces++; otmp = uarm; -#ifdef TOURIST } else if (uarmu) { armorpieces++; otmp = uarmu; -#endif } if (!armorpieces) { /* assert( GRAY_DRAGON_SCALES > YELLOW_DRAGON_SCALE_MAIL ); */ @@ -1088,9 +1073,7 @@ dotakeoff() /* note: the `uskin' case shouldn't be able to happen here; dragons can't wear any armor so will end up with `armorpieces == 0' above */ if (otmp == uskin || ((otmp == uarm) && uarmc) -#ifdef TOURIST || ((otmp == uarmu) && (uarmc || uarm)) -#endif ) { You_cant("take that off."); return 0; @@ -1121,9 +1104,7 @@ doremring() if(!Accessories) { pline("Not wearing any accessories.%s", (iflags.cmdassist && (uarm || uarmc || -#ifdef TOURIST uarmu || -#endif uarms || uarmh || uarmg || uarmf)) ? " Use 'T' command to take off armor." : ""); return(0); @@ -1259,9 +1240,7 @@ boolean noisy; const char *which; which = is_cloak(otmp) ? c_cloak : -#ifdef TOURIST is_shirt(otmp) ? c_shirt : -#endif is_suit(otmp) ? c_suit : 0; if (which && cantweararm(youmonst.data) && /* same exception for cloaks as used in m_dowear() */ @@ -1275,11 +1254,7 @@ boolean noisy; } if (welded(uwep) && bimanual(uwep) && - (is_suit(otmp) -#ifdef TOURIST - || is_shirt(otmp) -#endif - )) { + (is_suit(otmp) || is_shirt(otmp))) { if (noisy) You("cannot do that while holding your %s.", is_sword(uwep) ? c_sword : c_weapon); @@ -1350,7 +1325,6 @@ boolean noisy; err++; } else *mask = W_ARMG; -#ifdef TOURIST } else if (is_shirt(otmp)) { if (uarm || uarmc || uarmu) { if (uarmu) { @@ -1362,7 +1336,6 @@ boolean noisy; err++; } else *mask = W_ARMU; -#endif } else if (is_cloak(otmp)) { if (uarmc) { if (noisy) already_wearing(an(cloak_simple_name(uarmc))); @@ -1450,9 +1423,7 @@ dowear() } else { if(is_cloak(otmp)) (void) Cloak_on(); if (is_shield(otmp)) (void) Shield_on(); -#ifdef TOURIST if (is_shirt(otmp)) (void) Shirt_on(); -#endif on_msg(otmp); } takeoff_mask = taking_off = 0L; @@ -1602,9 +1573,7 @@ find_ac() if(uarmf) uac -= ARM_BONUS(uarmf); if(uarms) uac -= ARM_BONUS(uarms); if(uarmg) uac -= ARM_BONUS(uarmg); -#ifdef TOURIST if(uarmu) uac -= ARM_BONUS(uarmu); -#endif if(uleft && uleft->otyp == RIN_PROTECTION) uac -= uleft->spe; if(uright && uright->otyp == RIN_PROTECTION) uac -= uright->spe; if (HProtection & INTRINSIC) uac -= u.ublessed; @@ -1691,11 +1660,8 @@ struct monst *victim; otmph = (victim == &youmonst) ? uarmc : which_armor(victim, W_ARMC); if (!otmph) otmph = (victim == &youmonst) ? uarm : which_armor(victim, W_ARM); -#ifdef TOURIST if (!otmph) otmph = (victim == &youmonst) ? uarmu : which_armor(victim, W_ARMU); -#endif - otmp = (victim == &youmonst) ? uarmh : which_armor(victim, W_ARMH); if(otmp && (!otmph || !rn2(4))) otmph = otmp; otmp = (victim == &youmonst) ? uarmg : which_armor(victim, W_ARMG); @@ -1812,20 +1778,14 @@ register struct obj *otmp; } } /* special suit and shirt checks */ - if (otmp == uarm -#ifdef TOURIST - || otmp == uarmu -#endif - ) { + if (otmp == uarm || otmp == uarmu) { why = 0; /* the item which prevents disrobing */ if (uarmc && uarmc->cursed) { Sprintf(buf, "remove your %s", cloak_simple_name(uarmc)); why = uarmc; -#ifdef TOURIST } else if (otmp == uarmu && uarm && uarm->cursed) { Sprintf(buf, "remove your %s", c_suit); why = uarm; -#endif } else if (welded(uwep) && bimanual(uwep)) { Sprintf(buf, "release your %s", is_sword(uwep) ? c_sword : @@ -1852,9 +1812,7 @@ register struct obj *otmp; else if(otmp == uarmg) takeoff_mask |= WORN_GLOVES; else if(otmp == uarmh) takeoff_mask |= WORN_HELMET; else if(otmp == uarms) takeoff_mask |= WORN_SHIELD; -#ifdef TOURIST else if(otmp == uarmu) takeoff_mask |= WORN_SHIRT; -#endif else if(otmp == uleft) takeoff_mask |= LEFT_RING; else if(otmp == uright) takeoff_mask |= RIGHT_RING; else if(otmp == uamul) takeoff_mask |= WORN_AMUL; @@ -1904,11 +1862,9 @@ do_takeoff() } else if (taking_off == WORN_SHIELD) { otmp = uarms; if(!cursed(otmp)) (void) Shield_off(); -#ifdef TOURIST } else if (taking_off == WORN_SHIRT) { otmp = uarmu; if (!cursed(otmp)) (void) Shirt_off(); -#endif } else if (taking_off == WORN_AMUL) { otmp = uamul; if(!cursed(otmp)) Amulet_off(); @@ -1980,13 +1936,11 @@ take_off() otmp = uarmh; } else if (taking_off == WORN_SHIELD) { otmp = uarms; -#ifdef TOURIST } else if (taking_off == WORN_SHIRT) { otmp = uarmu; /* add the time to take off and put back on armor and/or cloak */ if (uarm) todelay += 2 * objects[uarm->otyp].oc_delay; if (uarmc) todelay += 2 * objects[uarmc->otyp].oc_delay + 1; -#endif } else if (taking_off == WORN_AMUL) { todelay = 1; } else if (taking_off == LEFT_RING) { @@ -2121,13 +2075,11 @@ register struct obj *atmp; surface(u.ux,u.uy)); (void) Armor_gone(); useup(otmp); -#ifdef TOURIST } else if (DESTROY_ARM(uarmu)) { if (donning(otmp)) cancel_don(); Your("shirt crumbles into tiny threads and falls apart!"); (void) Shirt_off(); useup(otmp); -#endif } else if (DESTROY_ARM(uarmh)) { if (donning(otmp)) cancel_don(); Your("helmet turns to dust and is blown away!"); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dog.c nethack-base/src/dog.c --- nethack-3.4.3/src/dog.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dog.c 2006-06-15 14:45:32.000000000 +1000 @@ -128,9 +128,7 @@ struct monst * makedog() { register struct monst *mtmp; -#ifdef STEED register struct obj *otmp; -#endif const char *petname; int pettype; static int petname_used = 0; @@ -158,7 +156,6 @@ makedog() if(!mtmp) return((struct monst *) 0); /* pets were genocided */ -#ifdef STEED /* Horses already wear a saddle */ if (pettype == PM_PONY && !!(otmp = mksobj(SADDLE, TRUE, FALSE))) { if (mpickobj(mtmp, otmp)) @@ -169,7 +166,6 @@ makedog() otmp->leashmon = mtmp->m_id; update_mon_intrinsics(mtmp, otmp, TRUE, TRUE); } -#endif if (!petname_used++ && *petname) mtmp = christen_monst(mtmp, petname); @@ -255,10 +251,8 @@ boolean with_you; mtmp->mtrack[0].x = mtmp->mtrack[0].y = 0; mtmp->mtrack[1].x = mtmp->mtrack[1].y = 0; -#ifdef STEED if (mtmp == u.usteed) return; /* don't place steed on the map */ -#endif if (with_you) { /* When a monster accompanies you, sometimes it will arrive at your intended destination and you'll end up next to @@ -494,20 +488,15 @@ boolean pets_only; /* true for ascension if (DEADMONSTER(mtmp)) continue; if (pets_only && !mtmp->mtame) continue; if (((monnear(mtmp, u.ux, u.uy) && levl_follower(mtmp)) || -#ifdef STEED (mtmp == u.usteed) || -#endif /* the wiz will level t-port from anywhere to chase the amulet; if you don't have it, will chase you only if in range. -3. */ (u.uhave.amulet && mtmp->iswiz)) && ((!mtmp->msleeping && mtmp->mcanmove) -#ifdef STEED /* eg if level teleport or new trap, steed has no control to avoid following */ - || (mtmp == u.usteed) -#endif - ) + || (mtmp == u.usteed)) /* monster won't follow if it hasn't noticed you yet */ && !(mtmp->mstrategy & STRAT_WAITFORU)) { stay_behind = FALSE; @@ -525,9 +514,7 @@ boolean pets_only; /* true for ascension pline("%s is still trapped.", Monnam(mtmp)); stay_behind = TRUE; } -#ifdef STEED if (mtmp == u.usteed) stay_behind = FALSE; -#endif if (stay_behind) { if (mtmp->mleashed) { pline("%s leash suddenly comes loose.", diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dogmove.c nethack-base/src/dogmove.c --- nethack-3.4.3/src/dogmove.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dogmove.c 2006-06-15 14:45:32.000000000 +1000 @@ -236,11 +236,7 @@ register struct edog *edog; stop_occupation(); } else if (monstermoves > edog->hungrytime + 750 || mtmp->mhp < 1) { dog_died: - if (mtmp->mleashed -#ifdef STEED - && mtmp != u.usteed -#endif - ) + if (mtmp->mleashed && mtmp != u.usteed) Your("leash goes slack."); else if (cansee(mtmp->mx, mtmp->my)) pline("%s starves.", Monnam(mtmp)); @@ -339,11 +335,9 @@ int after, udist, whappr; xchar otyp; int appr; -#ifdef STEED /* Steeds don't move on their own will */ if (mtmp == u.usteed) return (-2); -#endif omx = mtmp->mx; omy = mtmp->my; @@ -509,7 +503,7 @@ register int after; /* this is extra fas if (has_edog && dog_hunger(mtmp, edog)) return(2); /* starved */ udist = distu(omx,omy); -#ifdef STEED + /* Let steeds eat and maybe throw rider during Conflict */ if (mtmp == u.usteed) { if (Conflict && !resist(mtmp, RING_CLASS, 0, 0)) { @@ -518,7 +512,6 @@ register int after; /* this is extra fas } udist = 1; } else -#endif /* maybe we tamed him while being swallowed --jgm */ if (!udist) return(0); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dokick.c nethack-base/src/dokick.c --- nethack-3.4.3/src/dokick.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dokick.c 2006-06-15 14:45:32.000000000 +1000 @@ -633,7 +633,6 @@ dokick() } else if (verysmall(youmonst.data)) { You("are too small to do any kicking."); no_kick = TRUE; -#ifdef STEED } else if (u.usteed) { if (yn_function("Kick your steed?", ynchars, 'y') == 'y') { You("kick %s.", mon_nam(u.usteed)); @@ -642,7 +641,6 @@ dokick() } else { return 0; } -#endif } else if (Wounded_legs) { /* note: jump() has similar code */ long wl = (EWounded_legs & BOTH_SIDES); @@ -1345,10 +1343,7 @@ boolean shop_floor_obj; const char *result; if (objects[otmp->otyp].oc_material == GLASS -#ifdef TOURIST - || otmp->otyp == EXPENSIVE_CAMERA -#endif - ) { + || otmp->otyp == EXPENSIVE_CAMERA) { if (otmp->otyp == MIRROR) change_luck(-2); result = "crash"; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dothrow.c nethack-base/src/dothrow.c --- nethack-3.4.3/src/dothrow.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dothrow.c 2006-06-15 14:45:32.000000000 +1000 @@ -1631,9 +1631,7 @@ struct obj *obj; obj->oclass != GEM_CLASS) return 1; switch (obj->oclass == POTION_CLASS ? POT_WATER : obj->otyp) { -#ifdef TOURIST case EXPENSIVE_CAMERA: -#endif case POT_WATER: /* really, all potions */ case EGG: case CREAM_PIE: @@ -1662,9 +1660,7 @@ boolean in_view; case LENSES: case MIRROR: case CRYSTAL_BALL: -#ifdef TOURIST case EXPENSIVE_CAMERA: -#endif to_pieces = " into a thousand pieces"; /*FALLTHRU*/ case POT_WATER: /* really, all potions */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/dungeon.c nethack-base/src/dungeon.c --- nethack-3.4.3/src/dungeon.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/dungeon.c 2006-06-15 14:45:32.000000000 +1000 @@ -1097,10 +1097,8 @@ int x, y; #ifdef CLIPPING cliparound(u.ux, u.uy); #endif -#ifdef STEED /* ridden steed always shares hero's location */ if (u.usteed) u.usteed->mx = u.ux, u.usteed->my = u.uy; -#endif } void diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/eat.c nethack-base/src/eat.c --- nethack-3.4.3/src/eat.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/eat.c 2006-06-15 14:45:32.000000000 +1000 @@ -858,10 +858,8 @@ register int pm; char buf[BUFSZ]; You_cant("resist the temptation to mimic %s.", Hallucination ? "an orange" : "a pile of gold"); -#ifdef STEED /* A pile of gold can't ride. */ if (u.usteed) dismount_steed(DISMOUNT_FELL); -#endif nomul(-tmp); Sprintf(buf, Hallucination ? "You suddenly dread being peeled and mimic %s again!" : @@ -1218,9 +1216,7 @@ struct obj *obj; what = "you lose control of", where = "yourself"; else what = "you slap against the", where = -#ifdef STEED (u.usteed) ? "saddle" : -#endif surface(u.ux,u.uy); pline_The("world spins and %s %s.", what, where); flags.soundok = 0; @@ -1896,11 +1892,8 @@ doeat() /* generic "eat" command funtio if (!is_edible(otmp)) { You("cannot eat that!"); return 0; - } else if ((otmp->owornmask & (W_ARMOR|W_TOOL|W_AMUL -#ifdef STEED - |W_SADDLE -#endif - )) != 0) { + } else if ((otmp->owornmask & + (W_ARMOR|W_TOOL|W_AMUL|W_SADDLE)) != 0) { /* let them eat rings */ You_cant("eat %s you're wearing.", something); return 0; @@ -2409,9 +2402,7 @@ floorfood(verb,corpsecheck) /* get food /* if we can't touch floor objects then use invent food only */ if (!can_reach_floor() || -#ifdef STEED (feeding && u.usteed) || /* can't eat off floor while riding */ -#endif ((is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy)) && (Wwalking || is_clinger(youmonst.data) || (Flying && !Breathless)))) diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/engrave.c nethack-base/src/engrave.c --- nethack-3.4.3/src/engrave.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/engrave.c 2006-06-15 14:45:32.000000000 +1000 @@ -134,10 +134,8 @@ boolean can_reach_floor() { return (boolean)(!u.uswallow && -#ifdef STEED /* Restricted/unskilled riders can't reach the floor */ !(u.usteed && P_SKILL(P_RIDING) < P_BASIC) && -#endif (!Levitation || Is_airlevel(&u.uz) || Is_waterlevel(&u.uz))); } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/explode.c nethack-base/src/explode.c --- nethack-3.4.3/src/explode.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/explode.c 2006-06-15 14:45:32.000000000 +1000 @@ -130,10 +130,8 @@ int expltype; } /* can be both you and mtmp if you're swallowed */ mtmp = m_at(i+x-1, j+y-1); -#ifdef STEED if (!mtmp && i+x-1 == u.ux && j+y-1 == u.uy) mtmp = u.usteed; -#endif if (mtmp) { if (mtmp->mhp < 1) explmask[i][j] = 2; else switch(adtyp) { @@ -236,10 +234,8 @@ int expltype; type, &shopdamage); mtmp = m_at(i+x-1, j+y-1); -#ifdef STEED if (!mtmp && i+x-1 == u.ux && j+y-1 == u.uy) mtmp = u.usteed; -#endif if (!mtmp) continue; if (u.uswallow && mtmp == u.ustuck) { if (is_animal(u.ustuck->data)) diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/hack.c nethack-base/src/hack.c --- nethack-3.4.3/src/hack.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/hack.c 2006-06-15 14:45:32.000000000 +1000 @@ -79,11 +79,7 @@ moverock() /* Give them a chance to climb over it? */ return -1; } - if (verysmall(youmonst.data) -#ifdef STEED - && !u.usteed -#endif - ) { + if (verysmall(youmonst.data) && !u.usteed) { if (Blind) feel_location(sx, sy); pline("You're too small to push that %s.", xname(otmp)); goto cannot_push; @@ -123,9 +119,7 @@ moverock() } if (flags.verbose) pline("Perhaps that's why %s cannot move it.", -#ifdef STEED u.usteed ? y_monnam(u.usteed) : -#endif "you"); goto cannot_push; } @@ -180,12 +174,10 @@ moverock() continue; case LEVEL_TELEP: case TELEP_TRAP: -#ifdef STEED if (u.usteed) pline("%s pushes %s and suddenly it disappears!", upstart(y_monnam(u.usteed)), the(xname(otmp))); else -#endif You("push %s and suddenly it disappears!", the(xname(otmp))); if (ttmp->ttyp == TELEP_TRAP) @@ -227,19 +219,15 @@ moverock() /* note: reset to zero after save/restore cycle */ static NEARDATA long lastmovetime; #endif -#ifdef STEED if (!u.usteed) { -#endif if (moves > lastmovetime+2 || moves < lastmovetime) pline("With %s effort you move %s.", throws_rocks(youmonst.data) ? "little" : "great", the(xname(otmp))); exercise(A_STR, TRUE); -#ifdef STEED } else pline("%s moves %s.", upstart(y_monnam(u.usteed)), the(xname(otmp))); -#endif lastmovetime = moves; } @@ -255,24 +243,20 @@ moverock() } } else { nopushmsg: -#ifdef STEED if (u.usteed) pline("%s tries to move %s, but cannot.", upstart(y_monnam(u.usteed)), the(xname(otmp))); else -#endif You("try to move %s, but in vain.", the(xname(otmp))); if (Blind) feel_location(sx, sy); cannot_push: if (throws_rocks(youmonst.data)) { -#ifdef STEED if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) { You("aren't skilled enough to %s %s from %s.", (flags.pickup && !In_sokoban(&u.uz)) ? "pick up" : "push aside", the(xname(otmp)), y_monnam(u.usteed)); } else -#endif { pline("However, you can easily %s.", (flags.pickup && !In_sokoban(&u.uz)) @@ -284,11 +268,7 @@ moverock() break; } - if ( -#ifdef STEED - !u.usteed && -#endif - (((!invent || inv_weight() <= -850) && + if (!u.usteed && (((!invent || inv_weight() <= -850) && (!u.dx || !u.dy || (IS_ROCK(levl[u.ux][sy].typ) && IS_ROCK(levl[sx][u.uy].typ)))) || verysmall(youmonst.data))) { @@ -597,12 +577,10 @@ int mode; You("try to ooze under the door, but can't squeeze your possessions through."); else if (x == ux || y == uy) { if (Blind || Stunned || ACURR(A_DEX) < 10 || Fumbling) { -#ifdef STEED if (u.usteed) { You_cant("lead %s through that closed door.", y_monnam(u.usteed)); } else -#endif { pline("Ouch! You bump into a door."); exercise(A_DEX, FALSE); @@ -1120,13 +1098,11 @@ domove() newsym(x, y); } /* not attacking an animal, so we try to move */ -#ifdef STEED if (u.usteed && !u.usteed->mcanmove && (u.dx || u.dy)) { pline("%s won't move!", upstart(y_monnam(u.usteed))); nomul(0); return; } else -#endif if(!youmonst.data->mmove) { You("are rooted %s.", Levitation || Is_airlevel(&u.uz) || Is_waterlevel(&u.uz) ? @@ -1145,19 +1121,15 @@ domove() You("%s to the edge of the pit.", (In_sokoban(&u.uz) && Levitation) ? "struggle against the air currents and float" : -#ifdef STEED u.usteed ? "ride" : -#endif "crawl"); fill_pit(u.ux, u.uy); vision_full_recalc = 1; /* vision limits change */ } else if (flags.verbose) { -#ifdef STEED if (u.usteed) Norep("%s is still in a pit.", upstart(y_monnam(u.usteed))); else -#endif Norep( (Hallucination && !rn2(5)) ? "You've fallen, and you can't get up." : "You are still in a pit." ); @@ -1165,23 +1137,19 @@ domove() } else if (u.utraptype == TT_LAVA) { if(flags.verbose) { predicament = "stuck in the lava"; -#ifdef STEED if (u.usteed) Norep("%s is %s.", upstart(y_monnam(u.usteed)), predicament); else -#endif Norep("You are %s.", predicament); } if(!is_lava(x,y)) { u.utrap--; if((u.utrap & 0xff) == 0) { -#ifdef STEED if (u.usteed) You("lead %s to the edge of the lava.", y_monnam(u.usteed)); else -#endif You("pull yourself to the edge of the lava."); u.utrap = 0; } @@ -1196,55 +1164,45 @@ domove() if(--u.utrap) { if(flags.verbose) { predicament = "stuck to the web"; -#ifdef STEED if (u.usteed) Norep("%s is %s.", upstart(y_monnam(u.usteed)), predicament); else -#endif Norep("You are %s.", predicament); } } else { -#ifdef STEED if (u.usteed) pline("%s breaks out of the web.", upstart(y_monnam(u.usteed))); else -#endif You("disentangle yourself."); } } else if (u.utraptype == TT_INFLOOR) { if(--u.utrap) { if(flags.verbose) { predicament = "stuck in the"; -#ifdef STEED if (u.usteed) Norep("%s is %s %s.", upstart(y_monnam(u.usteed)), predicament, surface(u.ux, u.uy)); else -#endif Norep("You are %s %s.", predicament, surface(u.ux, u.uy)); } } else { -#ifdef STEED if (u.usteed) pline("%s finally wiggles free.", upstart(y_monnam(u.usteed))); else -#endif You("finally wiggle free."); } } else { if(flags.verbose) { predicament = "caught in a bear trap"; -#ifdef STEED if (u.usteed) Norep("%s is %s.", upstart(y_monnam(u.usteed)), predicament); else -#endif Norep("You are %s.", predicament); } if((u.dx && u.dy) || !rn2(5)) u.utrap--; @@ -1272,14 +1230,12 @@ domove() mtmp = m_at(x, y); u.ux += u.dx; u.uy += u.dy; -#ifdef STEED /* Move your steed, too */ if (u.usteed) { u.usteed->mx = u.ux; u.usteed->my = u.uy; exercise_steed(); } -#endif /* * If safepet at destination then move the pet to the hero's @@ -1437,10 +1393,8 @@ invocation_message() struct obj *otmp = carrying(CANDELABRUM_OF_INVOCATION); nomul(0); /* stop running or travelling */ -#ifdef STEED if (u.usteed) Sprintf(buf, "beneath %s", y_monnam(u.usteed)); else -#endif if (Levitation || Flying) Strcpy(buf, "beneath you"); else Sprintf(buf, "under your %s", makeplural(body_part(FOOT))); @@ -1493,7 +1447,6 @@ stillinwater:; if (!Levitation && !u.ustuck && !Flying) { /* limit recursive calls through teleds() */ if (is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy)) { -#ifdef STEED if (u.usteed && !is_flyer(u.usteed->data) && !is_floater(u.usteed->data) && !is_clinger(u.usteed->data)) { @@ -1503,7 +1456,6 @@ stillinwater:; if (!Is_airlevel(&u.uz) && !Is_waterlevel(&u.uz)) pick = FALSE; } else -#endif if (is_lava(u.ux, u.uy)) { if (lava_effects()) return; } else if (!Wwalking && drown()) @@ -1881,12 +1833,10 @@ dopickup() return(0); } if (!can_reach_floor()) { -#ifdef STEED if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) You("aren't skilled enough to reach from %s.", y_monnam(u.usteed)); else -#endif You("cannot reach the %s.", surface(u.ux,u.uy)); return(0); } @@ -2172,9 +2122,7 @@ weight_cap() } if (Levitation || Is_airlevel(&u.uz) /* pugh@cornell */ -#ifdef STEED || (u.usteed && strongmonst(u.usteed->data)) -#endif ) carrcap = MAX_CARR_CAP; else { diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/invent.c nethack-base/src/invent.c --- nethack-3.4.3/src/invent.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/invent.c 2006-06-15 14:45:32.000000000 +1000 @@ -833,10 +833,7 @@ register const char *let,*word; if ((taking_off(word) && (!(otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL)) || (otmp==uarm && uarmc) -#ifdef TOURIST - || (otmp==uarmu && (uarm || uarmc)) -#endif - )) + || (otmp==uarmu && (uarm || uarmc)))) || (putting_on(word) && (otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL))) /* already worn */ @@ -916,10 +913,7 @@ register const char *let,*word; /* "ugly check" for reading fortune cookies, part 2 */ if ((!strcmp(word, "read") && (otmp->otyp == FORTUNE_COOKIE -#ifdef TOURIST - || otmp->otyp == T_SHIRT -#endif - ))) + || otmp->otyp == T_SHIRT))) allowall = TRUE; } @@ -1148,11 +1142,8 @@ register struct obj *otmp; boolean wearing_armor() { - return((boolean)(uarm || uarmc || uarmf || uarmg || uarmh || uarms -#ifdef TOURIST - || uarmu -#endif - )); + return((boolean)(uarm || uarmc || uarmf || + uarmg || uarmh || uarms || uarmu)); } boolean @@ -1160,10 +1151,7 @@ is_worn(otmp) register struct obj *otmp; { return((boolean)(!!(otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL | -#ifdef STEED - W_SADDLE | -#endif - W_WEP | W_SWAPWEP | W_QUIVER)))); + W_SADDLE | W_WEP | W_SWAPWEP | W_QUIVER)))); } static NEARDATA const char removeables[] = @@ -2436,16 +2424,10 @@ doprarm() if(!wearing_armor()) You("are not wearing any armor."); else { -#ifdef TOURIST char lets[8]; -#else - char lets[7]; -#endif register int ct = 0; -#ifdef TOURIST if(uarmu) lets[ct++] = obj_to_let(uarmu); -#endif if(uarm) lets[ct++] = obj_to_let(uarm); if(uarmc) lets[ct++] = obj_to_let(uarmc); if(uarmh) lets[ct++] = obj_to_let(uarmh); @@ -2489,11 +2471,7 @@ STATIC_OVL boolean tool_in_use(obj) struct obj *obj; { - if ((obj->owornmask & (W_TOOL -#ifdef STEED - | W_SADDLE -#endif - )) != 0L) return TRUE; + if ((obj->owornmask & (W_TOOL | W_SADDLE)) != 0L) return TRUE; if (obj->oclass != TOOL_CLASS) return FALSE; return (boolean)(obj == uwep || obj->lamplit || (obj->otyp == LEASH && obj->leashmon)); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/lock.c nethack-base/src/lock.c --- nethack-3.4.3/src/lock.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/lock.c 2006-06-15 14:45:32.000000000 +1000 @@ -61,10 +61,8 @@ lock_action() /* otherwise we're trying to unlock it */ else if (xlock.picktyp == LOCK_PICK) return actions[3]; /* "picking the lock" */ -#ifdef TOURIST else if (xlock.picktyp == CREDIT_CARD) return actions[3]; /* same as lock_pick */ -#endif else if (xlock.door) return actions[0]; /* "unlocking the door" */ else @@ -240,9 +238,7 @@ pick_lock(pick) /* pick a lock with a gi if (nohands(youmonst.data)) { const char *what = (picktyp == LOCK_PICK) ? "pick" : "key"; -#ifdef TOURIST if (picktyp == CREDIT_CARD) what = "card"; -#endif pline(no_longer, "hold the", what); reset_pick(); return 0; @@ -264,9 +260,7 @@ pick_lock(pick) /* pick a lock with a gi } if((picktyp != LOCK_PICK && -#ifdef TOURIST picktyp != CREDIT_CARD && -#endif picktyp != SKELETON_KEY)) { impossible("picking lock with object %d?", picktyp); return(0); @@ -319,19 +313,15 @@ pick_lock(pick) /* pick a lock with a gi You_cant("fix its broken lock with %s.", doname(pick)); return 0; } -#ifdef TOURIST else if (picktyp == CREDIT_CARD && !otmp->olocked) { /* credit cards are only good for unlocking */ You_cant("do that with %s.", doname(pick)); return 0; } -#endif switch(picktyp) { -#ifdef TOURIST case CREDIT_CARD: ch = ACURR(A_DEX) + 20*Role_if(PM_ROGUE); break; -#endif case LOCK_PICK: ch = 4*ACURR(A_DEX) + 25*Role_if(PM_ROGUE); break; @@ -364,12 +354,10 @@ pick_lock(pick) /* pick a lock with a gi if ((mtmp = m_at(cc.x, cc.y)) && canseemon(mtmp) && mtmp->m_ap_type != M_AP_FURNITURE && mtmp->m_ap_type != M_AP_OBJECT) { -#ifdef TOURIST if (picktyp == CREDIT_CARD && (mtmp->isshk || mtmp->data == &mons[PM_ORACLE])) verbalize("No checks, no credit, no problem."); else -#endif pline("I don't think %s would appreciate that.", mon_nam(mtmp)); return(0); } @@ -393,13 +381,12 @@ pick_lock(pick) /* pick a lock with a gi pline("This door is broken."); return(0); default: -#ifdef TOURIST /* credit cards are only good for unlocking */ - if(picktyp == CREDIT_CARD && !(door->doormask & D_LOCKED)) { + if(picktyp == CREDIT_CARD + && !(door->doormask & D_LOCKED)) { You_cant("lock a door with a credit card."); return(0); } -#endif Sprintf(qbuf,"%sock it?", (door->doormask & D_LOCKED) ? "Unl" : "L" ); @@ -408,11 +395,9 @@ pick_lock(pick) /* pick a lock with a gi if(c == 'n') return(0); switch(picktyp) { -#ifdef TOURIST case CREDIT_CARD: ch = 2*ACURR(A_DEX) + 20*Role_if(PM_ROGUE); break; -#endif case LOCK_PICK: ch = 3*ACURR(A_DEX) + 30*Role_if(PM_ROGUE); break; @@ -667,18 +652,11 @@ doclose() /* try to close a door */ } if(door->doormask == D_ISOPEN) { - if(verysmall(youmonst.data) -#ifdef STEED - && !u.usteed -#endif - ) { + if(verysmall(youmonst.data) && !u.usteed) { pline("You're too small to push the door closed."); return(0); } - if ( -#ifdef STEED - u.usteed || -#endif + if (u.usteed || rn2(25) < (ACURRSTR+ACURR(A_DEX)+ACURR(A_CON))/3) { pline_The("door closes."); door->doormask = D_CLOSED; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mhitm.c nethack-base/src/mhitm.c --- nethack-3.4.3/src/mhitm.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mhitm.c 2006-06-15 14:45:32.000000000 +1000 @@ -331,12 +331,10 @@ mattackm(magr, mdef) break; case AT_ENGL: -#ifdef STEED if (u.usteed && (mdef == u.usteed)) { strike = 0; break; } -#endif /* Engulfing attacks are directed at the hero if * possible. -dlc */ @@ -857,10 +855,7 @@ mdamagem(magr, mdef, mattk) mdef->mstrategy &= ~STRAT_WAITFORU; (void) rloc(mdef, FALSE); if (vis && !canspotmon(mdef) -#ifdef STEED - && mdef != u.usteed -#endif - ) + && mdef != u.usteed) pline("%s suddenly disappears!", mdef_Monnam); } break; @@ -1019,12 +1014,10 @@ mdamagem(magr, mdef, mattk) Strcpy(mdefnambuf, x_monnam(mdef, ARTICLE_THE, (char *)0, 0, FALSE)); otmp = obj; -#ifdef STEED if (u.usteed == mdef && otmp == which_armor(mdef, W_SADDLE)) /* "You can no longer ride ." */ dismount_steed(DISMOUNT_POLY); -#endif obj_extract_self(otmp); if (otmp->owornmask) { mdef->misc_worn_check &= ~otmp->owornmask; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mhitu.c nethack-base/src/mhitu.c --- nethack-3.4.3/src/mhitu.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mhitu.c 2006-06-15 14:45:32.000000000 +1000 @@ -331,8 +331,6 @@ mattacku(mtmp) foundyou = 1; if(u.uinvulnerable) return (0); /* stomachs can't hurt you! */ } - -#ifdef STEED else if (u.usteed) { if (mtmp == u.usteed) /* Your steed won't attack you */ @@ -350,7 +348,6 @@ mattacku(mtmp) return (!!(mattackm(u.usteed, mtmp) & MM_DEF_DIED)); } } -#endif if (u.uundetected && !range2 && foundyou && !u.uswallow) { u.uundetected = 0; @@ -737,10 +734,8 @@ int attk; */ if (uarm) (void)rust_dmg(uarm, xname(uarm), hurt, TRUE, &youmonst); -#ifdef TOURIST else if (uarmu) (void)rust_dmg(uarmu, xname(uarmu), hurt, TRUE, &youmonst); -#endif break; case 2: if (!uarms || !rust_dmg(uarms, xname(uarms), hurt, FALSE, &youmonst)) @@ -784,9 +779,7 @@ struct attack *mattk; { struct obj *obj = (uarmc ? uarmc : uarm); -#ifdef TOURIST if (!obj) obj = uarmu; -#endif if (mattk->adtyp == AD_DRIN) obj = uarmh; /* if your cloak/armor is greased, monster slips off; this @@ -833,11 +826,9 @@ struct monst *mon; /* armor types for shirt, gloves, shoes, and shield don't currently provide any magic cancellation but we might as well be complete */ -#ifdef TOURIST armor = (mon == &youmonst) ? uarmu : which_armor(mon, W_ARMU); if (armor && armpro < objects[armor->otyp].a_can) armpro = objects[armor->otyp].a_can; -#endif armor = (mon == &youmonst) ? uarmg : which_armor(mon, W_ARMG); if (armor && armpro < objects[armor->otyp].a_can) armpro = objects[armor->otyp].a_can; @@ -848,12 +839,10 @@ struct monst *mon; if (armor && armpro < objects[armor->otyp].a_can) armpro = objects[armor->otyp].a_can; -#ifdef STEED /* this one is really a stretch... */ armor = (mon == &youmonst) ? 0 : which_armor(mon, W_SADDLE); if (armor && armpro < objects[armor->otyp].a_can) armpro = objects[armor->otyp].a_can; -#endif return armpro; } @@ -1142,11 +1131,7 @@ dopois: * still _can_ attack you when you're flying or mounted. * [FIXME: why can't a flying attacker overcome this?] */ - if ( -#ifdef STEED - u.usteed || -#endif - Levitation || Flying) { + if (u.usteed || Levitation || Flying) { pline("%s tries to reach your %s %s!", Monnam(mtmp), sidestr, body_part(LEG)); dmg = 0; @@ -1377,11 +1362,8 @@ dopois: hitmsg(mtmp, mattk); break; } - if(!uwep -#ifdef TOURIST - && !uarmu -#endif - && !uarm && !uarmh && !uarms && !uarmg && !uarmc && !uarmf) { + if(!uwep && !uarmu && !uarm && !uarmh + && !uarms && !uarmg && !uarmc && !uarmf) { boolean goaway = FALSE; pline("%s hits! (I hope you don't mind.)", Monnam(mtmp)); if (Upolyd) { @@ -1642,7 +1624,6 @@ gulpmu(mtmp, mattk) /* monster swallows place_monster(mtmp, u.ux, u.uy); u.ustuck = mtmp; newsym(mtmp->mx,mtmp->my); -#ifdef STEED if (is_animal(mtmp->data) && u.usteed) { char buf[BUFSZ]; /* Too many quirks presently if hero and steed @@ -1654,7 +1635,6 @@ gulpmu(mtmp, mattk) /* monster swallows Monnam(mtmp), buf); dismount_steed(DISMOUNT_ENGULFED); } else -#endif pline("%s engulfs you!", Monnam(mtmp)); stop_occupation(); reset_occupations(); /* behave as if you had moved */ @@ -2244,11 +2224,7 @@ register struct monst *mon; } } - if (!uarmc && !uarmf && !uarmg && !uarms && !uarmh -#ifdef TOURIST - && !uarmu -#endif - ) + if (!uarmc && !uarmf && !uarmg && !uarms && !uarmh && !uarmu) pline("%s murmurs sweet nothings into your ear.", Blind ? (fem ? "She" : "He") : Monnam(mon)); else @@ -2262,10 +2238,8 @@ register struct monst *mon; mayberem(uarmg, "gloves"); mayberem(uarms, "shield"); mayberem(uarmh, "helmet"); -#ifdef TOURIST if(!uarmc && !uarm) mayberem(uarmu, "shirt"); -#endif if (uarm || uarmc) { verbalize("You're such a %s; I wish...", @@ -2430,9 +2404,7 @@ const char *str; (obj == uarmc || obj == uarms) ? "it's in the way" : (obj == uarmf) ? "let me rub your feet" : (obj == uarmg) ? "they're too clumsy" : -#ifdef TOURIST (obj == uarmu) ? "let me massage you" : -#endif /* obj == uarmh */ hairbuf); } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mkobj.c nethack-base/src/mkobj.c --- nethack-3.4.3/src/mkobj.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mkobj.c 2006-06-15 14:45:32.000000000 +1000 @@ -489,9 +489,7 @@ boolean artif; case OILSKIN_SACK: case BAG_OF_HOLDING: mkbox_cnts(otmp); break; -#ifdef TOURIST case EXPENSIVE_CAMERA: -#endif case TINNING_KIT: case MAGIC_MARKER: otmp->spe = rn1(70,30); break; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mon.c nethack-base/src/mon.c --- nethack-3.4.3/src/mon.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mon.c 2006-06-15 14:45:32.000000000 +1000 @@ -106,9 +106,7 @@ int mndx, mode; case PM_HUNTER: mndx = mode ? PM_RANGER : PM_HUMAN; break; case PM_THUG: mndx = mode ? PM_ROGUE : PM_HUMAN; break; case PM_ROSHI: mndx = mode ? PM_SAMURAI : PM_HUMAN; break; -#ifdef TOURIST case PM_GUIDE: mndx = mode ? PM_TOURIST : PM_HUMAN; break; -#endif case PM_APPRENTICE: mndx = mode ? PM_WIZARD : PM_HUMAN; break; case PM_WARRIOR: mndx = mode ? PM_VALKYRIE : PM_HUMAN; break; default: @@ -389,12 +387,10 @@ register struct monst *mtmp; !is_flyer(mtmp->data) && !is_floater(mtmp->data); infountain = IS_FOUNTAIN(levl[mtmp->mx][mtmp->my].typ); -#ifdef STEED /* Flying and levitation keeps our steed out of the liquid */ /* (but not water-walking or swimming) */ if (mtmp == u.usteed && (Flying || Levitation)) return (0); -#endif /* Gremlin multiplying won't go on forever since the hit points * keep going down, and when it gets to 1 hit point the clone @@ -500,14 +496,12 @@ struct monst *mon; else if (mon->mspeed == MFAST) mmove = (4 * mmove + 2) / 3; -#ifdef STEED if (mon == u.usteed) { if (u.ugallop && flags.mv) { /* average movement is 1.50 times normal */ mmove = ((rn2(2) ? 4 : 5) * mmove) / 3; } } -#endif return mmove; } @@ -972,10 +966,8 @@ struct obj *otmp; (otyp != BELL_OF_OPENING || !is_covetous(mdat))) return FALSE; -#ifdef STEED /* Steeds don't pick up stuff (to avoid shop abuse) */ if (mtmp == u.usteed) return (FALSE); -#endif if (mtmp->isshk) return(TRUE); /* no limit */ if (mtmp->mpeaceful && !mtmp->mtame) return(FALSE); /* otherwise players might find themselves obligated to violate @@ -1286,9 +1278,7 @@ register struct monst *mtmp, *mtmp2; relmon(mtmp); /* finish adding its replacement */ -#ifdef STEED if (mtmp == u.usteed) ; else /* don't place steed onto the map */ -#endif place_monster(mtmp2, mtmp2->mx, mtmp2->my); if (mtmp2->wormno) /* update level.monsters[wseg->wx][wseg->wy] */ place_wsegs(mtmp2); /* locations to mtmp2 not mtmp. */ @@ -1303,9 +1293,7 @@ register struct monst *mtmp, *mtmp2; mtmp2->nmon = fmon; fmon = mtmp2; if (u.ustuck == mtmp) u.ustuck = mtmp2; -#ifdef STEED if (u.usteed == mtmp) u.usteed = mtmp2; -#endif if (mtmp2->isshk) replshk(mtmp,mtmp2); /* discard the old monster */ @@ -1424,11 +1412,9 @@ register struct monst *mtmp; lifesaved_monster(mtmp); if (mtmp->mhp > 0) return; -#ifdef STEED /* Player is thrown from his steed when it dies */ if (mtmp == u.usteed) dismount_steed(DISMOUNT_GENERIC); -#endif mptr = mtmp->data; /* save this for m_detach() */ /* restore chameleon, lycanthropes to true form at death */ @@ -1576,12 +1562,9 @@ mongone(mdef) register struct monst *mdef; { mdef->mhp = 0; /* can skip some inventory bookkeeping */ -#ifdef STEED /* Player is thrown from his steed when it disappears */ if (mdef == u.usteed) dismount_steed(DISMOUNT_GENERIC); -#endif - /* drop special items like the Amulet so that a dismissed Kop or nurse can't remove them from the game */ mdrop_special_objs(mdef); @@ -1930,14 +1913,12 @@ mnexto(mtmp) /* Make monster mtmp next t { coord mm; -#ifdef STEED if (mtmp == u.usteed) { /* Keep your steed in sync with you instead */ mtmp->mx = u.ux; mtmp->my = u.uy; return; } -#endif if(!enexto(&mm, u.ux, u.uy, mtmp->data)) return; rloc_to(mtmp, mm.x, mm.y); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/monmove.c nethack-base/src/monmove.c --- nethack-3.4.3/src/monmove.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/monmove.c 2006-06-15 14:45:32.000000000 +1000 @@ -1338,9 +1338,7 @@ struct monst *mtmp; typ != SLING && !is_cloak(obj) && typ != FEDORA && !is_gloves(obj) && typ != LEATHER_JACKET && -#ifdef TOURIST typ != CREDIT_CARD && !is_shirt(obj) && -#endif !(typ == CORPSE && verysmall(&mons[obj->corpsenm])) && typ != FORTUNE_COOKIE && typ != CANDY_BAR && typ != PANCAKE && typ != LEMBAS_WAFER && diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/monst.c nethack-base/src/monst.c --- nethack-3.4.3/src/monst.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/monst.c 2006-06-15 14:45:32.000000000 +1000 @@ -3012,7 +3012,6 @@ struct permonst _mons2[] = { SIZ(WT_HUMAN, 400, 0, MS_HUMANOID, MZ_HUMAN), 0, 0, M1_HUMANOID|M1_OMNIVORE, M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC), -#ifdef TOURIST MON("tourist", S_HUMAN, LVL(10, 12, 10, 1, 0), G_NOGEN, A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6), @@ -3020,7 +3019,6 @@ struct permonst _mons2[] = { SIZ(WT_HUMAN, 400, 0, MS_HUMANOID, MZ_HUMAN), 0, 0, M1_HUMANOID|M1_OMNIVORE, M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC), -#endif MON("valkyrie", S_HUMAN, LVL(10, 12, 10, 1, -1), G_NOGEN, A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 8), @@ -3156,7 +3154,6 @@ struct permonst _mons2[] = { M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_PEACEFUL|M2_STRONG|M2_MALE| M2_COLLECT|M2_MAGIC, M3_CLOSE|M3_INFRAVISIBLE, HI_LORD), -#ifdef TOURIST MON("Twoflower", S_HUMAN, LVL(20, 12, 10, 20, 0), (G_NOGEN|G_UNIQ), A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6), @@ -3166,7 +3163,6 @@ struct permonst _mons2[] = { M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_PEACEFUL|M2_STRONG|M2_MALE| M2_COLLECT|M2_MAGIC, M3_CLOSE|M3_INFRAVISIBLE, HI_DOMESTIC), -#endif MON("Norn", S_HUMAN, LVL(20, 12, 0, 80, 0), (G_NOGEN|G_UNIQ), A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 6), @@ -3304,11 +3300,9 @@ struct permonst _mons2[] = { M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_STALK| M2_NASTY|M2_MALE|M2_COLLECT|M2_MAGIC, M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISIBLE, HI_LORD), -#ifdef TOURIST /* * Note: the Master of Thieves was defined above. */ -#endif MON("Lord Surtur", S_GIANT, LVL(15, 12, 2, 50, 12), (G_NOGEN|G_UNIQ), A(ATTK(AT_WEAP, AD_PHYS, 2,10), ATTK(AT_WEAP, AD_PHYS, 2,10), @@ -3429,7 +3423,6 @@ struct permonst _mons2[] = { M1_HUMANOID|M1_OMNIVORE, M2_NOPOLY|M2_HUMAN|M2_PEACEFUL|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC), -#ifdef TOURIST MON("guide", S_HUMAN, LVL(5, 12, 10, 20, 0), G_NOGEN, A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_MAGC, AD_SPEL, 0, 0), @@ -3438,7 +3431,6 @@ struct permonst _mons2[] = { M1_HUMANOID|M1_OMNIVORE, M2_NOPOLY|M2_HUMAN|M2_PEACEFUL | M2_STRONG|M2_COLLECT|M2_MAGIC, M3_INFRAVISIBLE, HI_DOMESTIC), -#endif MON("warrior", S_HUMAN, LVL(5, 12, 10, 10, -1), G_NOGEN, A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 8), diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mplayer.c nethack-base/src/mplayer.c --- nethack-3.4.3/src/mplayer.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mplayer.c 2006-06-15 14:45:32.000000000 +1000 @@ -200,11 +200,9 @@ register boolean special; case PM_SAMURAI: if (rn2(2)) weapon = KATANA; break; -#ifdef TOURIST case PM_TOURIST: /* Defaults are just fine */ break; -#endif case PM_VALKYRIE: if (rn2(2)) weapon = WAR_HAMMER; if (rn2(2)) armor = rnd_class(PLATE_MAIL, CHAIN_MAIL); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/mthrowu.c nethack-base/src/mthrowu.c --- nethack-3.4.3/src/mthrowu.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/mthrowu.c 2006-06-15 14:45:32.000000000 +1000 @@ -772,9 +772,7 @@ int whodidit; /* 1==hero, 0=other, -1==j case TOOL_CLASS: hits = (obj_type != SKELETON_KEY && obj_type != LOCK_PICK && -#ifdef TOURIST obj_type != CREDIT_CARD && -#endif obj_type != TALLOW_CANDLE && obj_type != WAX_CANDLE && obj_type != LENSES && diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/muse.c nethack-base/src/muse.c --- nethack-3.4.3/src/muse.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/muse.c 2006-06-15 14:45:32.000000000 +1000 @@ -978,10 +978,8 @@ struct monst *mtmp; if (u.uswallow) return FALSE; if (in_your_sanctuary(mtmp, 0, 0)) return FALSE; if (dmgtype(mtmp->data, AD_HEAL) && !uwep -#ifdef TOURIST - && !uarmu -#endif - && !uarm && !uarmh && !uarms && !uarmg && !uarmc && !uarmf) + && !uarmu && !uarm && !uarmh && !uarms + && !uarmg && !uarmc && !uarmf) return FALSE; if (!ranged_stuff) return FALSE; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/objects.c nethack-base/src/objects.c --- nethack-3.4.3/src/objects.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/objects.c 2006-06-15 14:45:32.000000000 +1000 @@ -365,13 +365,8 @@ ARMOR("plate mail", (char *)0, 1, 0, 1, 0, 44, 5, 450, 600, 3, 2, ARM_SUIT, IRON, HI_METAL), ARMOR("crystal plate mail", (char *)0, 1, 0, 1, 0, 10, 5, 450, 820, 3, 2, ARM_SUIT, GLASS, CLR_WHITE), -#ifdef TOURIST ARMOR("bronze plate mail", (char *)0, 1, 0, 1, 0, 25, 5, 450, 400, 4, 0, ARM_SUIT, COPPER, HI_COPPER), -#else -ARMOR("bronze plate mail", (char *)0, - 1, 0, 1, 0, 35, 5, 450, 400, 4, 0, ARM_SUIT, COPPER, HI_COPPER), -#endif ARMOR("splint mail", (char *)0, 1, 0, 1, 0, 62, 5, 400, 80, 4, 1, ARM_SUIT, IRON, HI_METAL), ARMOR("banded mail", (char *)0, @@ -396,14 +391,11 @@ ARMOR("leather armor", (char *)0, 1, 0, 0, 0, 82, 3, 150, 5, 8, 0, ARM_SUIT, LEATHER, HI_LEATHER), ARMOR("leather jacket", (char *)0, 1, 0, 0, 0, 12, 0, 30, 10, 9, 0, ARM_SUIT, LEATHER, CLR_BLACK), - -#ifdef TOURIST /* shirts */ ARMOR("Hawaiian shirt", (char *)0, 1, 0, 0, 0, 8, 0, 5, 3, 10, 0, ARM_SHIRT, CLOTH, CLR_MAGENTA), ARMOR("T-shirt", (char *)0, 1, 0, 0, 0, 2, 0, 5, 2, 10, 0, ARM_SHIRT, CLOTH, CLR_WHITE), -#endif /* cloaks */ /* 'cope' is not a spelling mistake... leave it be */ @@ -589,12 +581,8 @@ CONTAINER("bag of tricks", "bag", /* lock opening tools */ TOOL("skeleton key", "key", 0, 0, 0, 0, 80, 3, 10, IRON, HI_METAL), -#ifdef TOURIST TOOL("lock pick", (char *)0, 1, 0, 0, 0, 60, 4, 20, IRON, HI_METAL), TOOL("credit card", (char *)0, 1, 0, 0, 0, 15, 1, 10, PLASTIC, CLR_WHITE), -#else -TOOL("lock pick", (char *)0, 1, 0, 0, 0, 75, 4, 20, IRON, HI_METAL), -#endif /* light sources */ TOOL("tallow candle", "candle", 0, 1, 0, 0, 20, 2, 10, WAX, CLR_WHITE), TOOL("wax candle", "candle", 0, 1, 0, 0, 5, 2, 20, WAX, CLR_WHITE), @@ -602,24 +590,16 @@ TOOL("brass lantern", (char *)0,1, 0, 0, TOOL("oil lamp", "lamp", 0, 0, 0, 0, 45, 20, 10, COPPER, CLR_YELLOW), TOOL("magic lamp", "lamp", 0, 0, 1, 0, 15, 20, 50, COPPER, CLR_YELLOW), /* other tools */ -#ifdef TOURIST TOOL("expensive camera", (char *)0, 1, 0, 0, 1, 15, 12, 200, PLASTIC, CLR_BLACK), TOOL("mirror", "looking glass", 0, 0, 0, 0, 45, 13, 10, GLASS, HI_SILVER), -#else -TOOL("mirror", "looking glass", 0, 0, 0, 0, 60, 13, 10, GLASS, HI_SILVER), -#endif TOOL("crystal ball", "glass orb", 0, 0, 1, 1, 15,150, 60, GLASS, HI_GLASS), TOOL("lenses", (char *)0, 1, 0, 0, 0, 5, 3, 80, GLASS, HI_GLASS), TOOL("blindfold", (char *)0, 1, 0, 0, 0, 50, 2, 20, CLOTH, CLR_BLACK), TOOL("towel", (char *)0, 1, 0, 0, 0, 50, 2, 50, CLOTH, CLR_MAGENTA), -#ifdef STEED TOOL("saddle", (char *)0, 1, 0, 0, 0, 5,200, 150, LEATHER, HI_LEATHER), TOOL("leash", (char *)0, 1, 0, 0, 0, 65, 12, 20, LEATHER, HI_LEATHER), -#else -TOOL("leash", (char *)0, 1, 0, 0, 0, 70, 12, 20, LEATHER, HI_LEATHER), -#endif TOOL("stethoscope", (char *)0, 1, 0, 0, 0, 25, 4, 75, IRON, HI_METAL), TOOL("tinning kit", (char *)0, 1, 0, 0, 1, 15,100, 30, IRON, HI_METAL), TOOL("tin opener", (char *)0, 1, 0, 0, 0, 35, 4, 30, IRON, HI_METAL), diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/objnam.c nethack-base/src/objnam.c --- nethack-3.4.3/src/objnam.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/objnam.c 2006-06-15 14:45:32.000000000 +1000 @@ -649,10 +649,7 @@ plus: if (!is_weptool(obj)) add_erosion_words(obj, prefix); if(obj->owornmask & (W_TOOL /* blindfold */ -#ifdef STEED - | W_SADDLE -#endif - )) { + | W_SADDLE)) { Strcat(bp, " (being worn)"); break; } @@ -1507,9 +1504,7 @@ STATIC_OVL NEARDATA const struct o_range { "boots", ARMOR_CLASS, LOW_BOOTS, LEVITATION_BOOTS }, { "shoes", ARMOR_CLASS, LOW_BOOTS, IRON_SHOES }, { "cloak", ARMOR_CLASS, MUMMY_WRAPPING, CLOAK_OF_DISPLACEMENT }, -#ifdef TOURIST { "shirt", ARMOR_CLASS, HAWAIIAN_SHIRT, T_SHIRT }, -#endif { "dragon scales", ARMOR_CLASS, GRAY_DRAGON_SCALES, YELLOW_DRAGON_SCALES }, { "dragon scale mail", @@ -1726,10 +1721,8 @@ struct alt_spellings { { "mattock", DWARVISH_MATTOCK }, { "amulet of poison resistance", AMULET_VERSUS_POISON }, { "stone", ROCK }, -#ifdef TOURIST { "camera", EXPENSIVE_CAMERA }, { "tee shirt", T_SHIRT }, -#endif { "can", TIN }, { "can opener", TIN_OPENER }, { "kelp", KELP_FROND }, diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/pager.c nethack-base/src/pager.c --- nethack-3.4.3/src/pager.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/pager.c 2006-06-15 14:45:32.000000000 +1000 @@ -85,7 +85,6 @@ lookat(x, y, buf, monbuf) if (Role_if(PM_WIZARD) && Race_if(PM_GNOME) && !Upolyd) pm = &mons[PM_WIZARD]; -#ifdef STEED if (u.usteed) { char steedbuf[BUFSZ]; @@ -93,7 +92,6 @@ lookat(x, y, buf, monbuf) /* assert((sizeof buf >= strlen(buf)+strlen(steedbuf)+1); */ Strcat(buf, steedbuf); } -#endif /* When you see yourself normally, no explanation is appended (even if you could also see yourself via other means). Sensing self while blind or swallowed is treated as if it diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/pickup.c nethack-base/src/pickup.c --- nethack-3.4.3/src/pickup.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/pickup.c 2006-06-15 14:45:32.000000000 +1000 @@ -1464,11 +1464,9 @@ able_to_loot(x, y) int x, y; { if (!can_reach_floor()) { -#ifdef STEED if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) rider_cant_reach(); /* not skilled enough to reach */ else -#endif You("cannot reach the %s.", surface(x, y)); return FALSE; } else if (is_pool(x, y) || is_lava(x, y)) { @@ -1684,7 +1682,6 @@ boolean *prev_loot; { int c = -1; int timepassed = 0; -#ifdef STEED struct obj *otmp; char qbuf[QBUFSZ]; @@ -1723,7 +1720,6 @@ boolean *prev_loot; return (0); } } -#endif /* STEED */ /* 3.4.0 introduced the ability to pick things up from within swallower's stomach */ if (u.uswallow) { int count = passed_info ? *passed_info : 0; diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/pline.c nethack-base/src/pline.c --- nethack-3.4.3/src/pline.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/pline.c 2006-06-15 14:45:32.000000000 +1000 @@ -335,9 +335,7 @@ register struct monst *mtmp; ", swallowed you" : ", engulfed you") : ", holding you"); -#ifdef STEED if (mtmp == u.usteed) Strcat(info, ", carrying you"); -#endif /* avoid "Status of the invisible newt ..., invisible" */ /* and unlike a normal mon_nam, use "saddled" even if it has a name */ @@ -385,10 +383,7 @@ ustatusline() } /* note: "goop" == "glop"; variation is intentional */ } if (Stunned) Strcat(info, ", stunned"); -#ifdef STEED - if (!u.usteed) -#endif - if (Wounded_legs) { + if (Wounded_legs && !u.usteed) { const char *what = body_part(LEG); if ((Wounded_legs & BOTH_SIDES) == BOTH_SIDES) what = makeplural(what); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/polyself.c nethack-base/src/polyself.c --- nethack-3.4.3/src/polyself.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/polyself.c 2006-06-15 14:45:32.000000000 +1000 @@ -479,7 +479,6 @@ int mntmp; if (!sticky && !u.uswallow && u.ustuck && sticks(youmonst.data)) u.ustuck = 0; else if (sticky && !sticks(youmonst.data)) uunstick(); -#ifdef STEED if (u.usteed) { if (touch_petrifies(u.usteed->data) && !Stone_resistance && rnl(3)) { @@ -492,7 +491,6 @@ int mntmp; } if (!can_ride(u.usteed)) dismount_steed(DISMOUNT_POLY); } -#endif if (flags.verbose) { static const char use_thec[] = "Use the command #%s to %s."; @@ -591,12 +589,10 @@ break_armor() useup(otmp); } } -#ifdef TOURIST if (uarmu) { Your("shirt rips to shreds!"); useup(uarmu); } -#endif } else if (sliparm(youmonst.data)) { if (((otmp = uarm) != 0) && (racial_exception(&youmonst, otmp) < 1)) { if (donning(otmp)) cancel_don(); @@ -611,7 +607,6 @@ break_armor() (void) Cloak_off(); dropx(otmp); } -#ifdef TOURIST if ((otmp = uarmu) != 0) { if (is_whirly(youmonst.data)) You("seep right through your shirt!"); @@ -619,7 +614,6 @@ break_armor() setworn((struct obj *)0, otmp->owornmask & W_ARMU); dropx(otmp); } -#endif } if (has_horns(youmonst.data)) { if ((otmp = uarmh) != 0) { diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/potion.c nethack-base/src/potion.c --- nethack-3.4.3/src/potion.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/potion.c 2006-06-15 14:45:32.000000000 +1000 @@ -84,11 +84,9 @@ boolean talk; } if (xtime && !old) { if (talk) { -#ifdef STEED if (u.usteed) You("wobble in the saddle."); else -#endif You("%s...", stagger(youmonst.data, "stagger")); } } @@ -596,10 +594,8 @@ peffects(otmp) else { if (Levitation || Is_airlevel(&u.uz)||Is_waterlevel(&u.uz)) You("are motionlessly suspended."); -#ifdef STEED else if (u.usteed) You("are frozen in place!"); -#endif else Your("%s are frozen to the %s!", makeplural(body_part(FOOT)), surface(u.ux, u.uy)); @@ -725,11 +721,8 @@ peffects(otmp) } break; case POT_SPEED: - if(Wounded_legs && !otmp->cursed -#ifdef STEED - && !u.usteed /* heal_legs() would heal steeds legs */ -#endif - ) { + /* heal_legs() would heal steeds legs if u.usteed */ + if(Wounded_legs && !otmp->cursed && !u.usteed) { heal_legs(); unkn++; break; @@ -1549,11 +1542,9 @@ dodip() if (yn(qbuf) == 'y') { if (Levitation) { floating_above(tmp); -#ifdef STEED } else if (u.usteed && !is_swimmer(u.usteed->data) && P_SKILL(P_RIDING) < P_BASIC) { rider_cant_reach(); /* not skilled enough to reach */ -#endif } else { (void) get_wet(obj); if (obj->otyp == POT_ACID) useup(obj); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/pray.c nethack-base/src/pray.c --- nethack-3.4.3/src/pray.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/pray.c 2006-06-15 14:45:32.000000000 +1000 @@ -179,21 +179,15 @@ in_trouble() Cursed_obj(uarmf, FUMBLE_BOOTS)) return TROUBLE_FUMBLING; if (worst_cursed_item()) return TROUBLE_CURSED_ITEMS; -#ifdef STEED if (u.usteed) { /* can't voluntarily dismount from a cursed saddle */ otmp = which_armor(u.usteed, W_SADDLE); if (Cursed_obj(otmp, SADDLE)) return TROUBLE_SADDLE; } -#endif if (Blinded > 1 && haseyes(youmonst.data)) return(TROUBLE_BLIND); for(i=0; i= HUNGRY) return(TROUBLE_HUNGRY); if(HStun) return (TROUBLE_STUNNED); if(HConfusion) return (TROUBLE_CONFUSED); @@ -231,10 +225,8 @@ worst_cursed_item() otmp = uarmh; } else if (uarmf && uarmf->cursed) { /* boots */ otmp = uarmf; -#ifdef TOURIST } else if (uarmu && uarmu->cursed) { /* shirt */ otmp = uarmu; -#endif } else if (uamul && uamul->cursed) { /* amulet */ otmp = uamul; } else if (uleft && uleft->cursed) { /* left ring */ @@ -438,7 +430,6 @@ decurse: pline ("Looks like you are back in Kansas."); (void) make_hallucinated(0L,FALSE,0L); break; -#ifdef STEED case TROUBLE_SADDLE: otmp = which_armor(u.usteed, W_SADDLE); uncurse(otmp); @@ -450,7 +441,6 @@ decurse: otmp->bknown = TRUE; } break; -#endif } } @@ -515,9 +505,7 @@ aligntyp resp_god; if (uarm && !(EReflecting & W_ARM) && !(EDisint_resistance & W_ARM) && !uarmc) (void) destroy_arm(uarm); -#ifdef TOURIST if (uarmu && !uarm && !uarmc) (void) destroy_arm(uarmu); -#endif if (!Disint_resistance) fry_by_god(resp_god); else { diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/read.c nethack-base/src/read.c --- nethack-3.4.3/src/read.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/read.c 2006-06-15 14:45:32.000000000 +1000 @@ -54,7 +54,6 @@ doread() if (!Blind) u.uconduct.literate++; useup(scroll); return(1); -#ifdef TOURIST } else if (scroll->otyp == T_SHIRT) { static const char *shirt_msgs[] = { /* Scott Bigham */ "I explored the Dungeons of Doom and all I got was this lousy T-shirt!", @@ -92,7 +91,6 @@ doread() scroll->o_id ^ (unsigned)u.ubirthday); pline("\"%s\"", buf); return 1; -#endif /* TOURIST */ } else if (scroll->oclass != SCROLL_CLASS && scroll->oclass != SPBOOK_CLASS) { pline(silly_thing_to, "read"); @@ -311,9 +309,7 @@ int curse_bless; break; case MAGIC_MARKER: case TINNING_KIT: -#ifdef TOURIST case EXPENSIVE_CAMERA: -#endif if (is_cursed) stripspe(obj); else if (rechrg && obj->otyp == MAGIC_MARKER) { /* previously recharged */ obj->recharged = 1; /* override increment done above */ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/restore.c nethack-base/src/restore.c --- nethack-3.4.3/src/restore.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/restore.c 2006-06-15 14:45:32.000000000 +1000 @@ -432,10 +432,8 @@ unsigned int *stuckid, *steedid; /* STEE restore_oracles(fd); if (u.ustuck) mread(fd, (genericptr_t) stuckid, sizeof (*stuckid)); -#ifdef STEED if (u.usteed) mread(fd, (genericptr_t) steedid, sizeof (*steedid)); -#endif mread(fd, (genericptr_t) pl_character, sizeof pl_character); mread(fd, (genericptr_t) pl_fruit, sizeof pl_fruit); @@ -466,7 +464,6 @@ unsigned int stuckid, steedid; /* STEED if (!mtmp) panic("Cannot find the monster ustuck."); u.ustuck = mtmp; } -#ifdef STEED if (steedid) { for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) if (mtmp->m_id == steedid) break; @@ -474,7 +471,6 @@ unsigned int stuckid, steedid; /* STEED u.usteed = mtmp; remove_monster(mtmp->mx, mtmp->my); } -#endif } /*ARGSUSED*/ /* fd used in MFLOPPY only */ @@ -576,9 +572,7 @@ register int fd; * place_monster() on other levels */ u.ustuck = (struct monst *)0; -#ifdef STEED u.usteed = (struct monst *)0; -#endif #ifdef MICRO # ifdef AMII_GRAPHICS diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/role.c nethack-base/src/role.c --- nethack-3.4.3/src/role.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/role.c 2006-06-15 14:45:32.000000000 +1000 @@ -299,7 +299,6 @@ const struct Role roles[] = { { 1, 0, 0, 1, 0, 1 },11, /* Energy */ 10, 10, 0, 0, 8, A_INT, SPE_CLAIRVOYANCE, -4 }, -#ifdef TOURIST { {"Tourist", 0}, { {"Rambler", 0}, {"Sightseer", 0}, @@ -325,7 +324,6 @@ const struct Role roles[] = { { 1, 0, 0, 1, 0, 1 },14, /* Energy */ 0, 5, 1, 2, 10, A_INT, SPE_CHARM_MONSTER, -4 }, -#endif { {"Valkyrie", 0}, { {"Stripling", 0}, {"Skirmisher", 0}, @@ -1454,10 +1452,8 @@ struct monst *mtmp; case PM_SAMURAI: return (mtmp && mtmp->data == &mons[PM_SHOPKEEPER] ? "Irasshaimase" : "Konnichi wa"); /* Japanese */ -#ifdef TOURIST case PM_TOURIST: return ("Aloha"); /* Hawaiian */ -#endif case PM_VALKYRIE: return ( #ifdef MAIL @@ -1477,10 +1473,8 @@ Goodbye() return ("Fare thee well"); /* Olde English */ case PM_SAMURAI: return ("Sayonara"); /* Japanese */ -#ifdef TOURIST case PM_TOURIST: return ("Aloha"); /* Hawaiian */ -#endif case PM_VALKYRIE: return ("Farvel"); /* Norse */ default: diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/save.c nethack-base/src/save.c --- nethack-3.4.3/src/save.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/save.c 2006-06-15 14:45:32.000000000 +1000 @@ -207,9 +207,7 @@ dosave0() bwrite(fd, (genericptr_t) plname, PL_NSIZ); #endif ustuck_id = (u.ustuck ? u.ustuck->m_id : 0); -#ifdef STEED usteed_id = (u.usteed ? u.usteed->m_id : 0); -#endif savelev(fd, ledger_no(&u.uz), WRITE_SAVE | FREE_SAVE); savegamestate(fd, WRITE_SAVE | FREE_SAVE); @@ -224,9 +222,7 @@ dosave0() * may mislead place_monster() on other levels */ u.ustuck = (struct monst *)0; -#ifdef STEED u.usteed = (struct monst *)0; -#endif for(ltmp = (xchar)1; ltmp <= maxledgerno(); ltmp++) { if (ltmp == ledger_no(&uz_save)) continue; @@ -309,10 +305,8 @@ register int fd, mode; save_oracles(fd, mode); if(ustuck_id) bwrite(fd, (genericptr_t) &ustuck_id, sizeof ustuck_id); -#ifdef STEED if(usteed_id) bwrite(fd, (genericptr_t) &usteed_id, sizeof usteed_id); -#endif bwrite(fd, (genericptr_t) pl_character, sizeof pl_character); bwrite(fd, (genericptr_t) pl_fruit, sizeof pl_fruit); bwrite(fd, (genericptr_t) ¤t_fruit, sizeof current_fruit); @@ -386,9 +380,7 @@ savestateinlock() bwrite(fd, (genericptr_t) plname, PL_NSIZ); #endif ustuck_id = (u.ustuck ? u.ustuck->m_id : 0); -#ifdef STEED usteed_id = (u.usteed ? u.usteed->m_id : 0); -#endif savegamestate(fd, WRITE_SAVE); } bclose(fd); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/shk.c nethack-base/src/shk.c --- nethack-3.4.3/src/shk.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/shk.c 2006-06-15 14:45:32.000000000 +1000 @@ -600,13 +600,11 @@ register char *enterstring; "Leave the %s%s outside.", tool, plur(cnt)); should_block = TRUE; -#ifdef STEED } else if (u.usteed) { verbalize(NOTANGRY(shkp) ? "Will you please leave %s outside?" : "Leave %s outside.", y_monnam(u.usteed)); should_block = TRUE; -#endif } else { should_block = (Fast && (sobj_at(PICK_AXE, u.ux, u.uy) || sobj_at(DWARVISH_MATTOCK, u.ux, u.uy))); @@ -1898,13 +1896,10 @@ register struct monst *shkp; /* if angry } else if (!(obj->o_id % 4)) /* arbitrarily impose surcharge */ tmp += tmp / 3L; } -#ifdef TOURIST if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2)) || (uarmu && !uarm && !uarmc)) /* touristy shirt visible */ tmp += tmp / 3L; - else -#endif - if (uarmh && uarmh->otyp == DUNCE_CAP) + else if (uarmh && uarmh->otyp == DUNCE_CAP) tmp += tmp / 3L; if (ACURR(A_CHA) > 18) tmp /= 2L; @@ -2024,13 +2019,10 @@ register struct monst *shkp; { long tmp = getprice(obj, TRUE) * obj->quan; -#ifdef TOURIST if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2)) || (uarmu && !uarm && !uarmc)) /* touristy shirt visible */ tmp /= 3L; - else -#endif - if (uarmh && uarmh->otyp == DUNCE_CAP) + else if (uarmh && uarmh->otyp == DUNCE_CAP) tmp /= 3L; else tmp /= 2L; @@ -3264,11 +3256,7 @@ register struct monst *shkp; avoid = FALSE; } else { #define GDIST(x,y) (dist2(x,y,gx,gy)) - if (Invis -#ifdef STEED - || u.usteed -#endif - ) { + if (Invis || u.usteed) { avoid = FALSE; } else { uondoor = (u.ux == eshkp->shd.x && u.uy == eshkp->shd.y); @@ -3864,11 +3852,8 @@ boolean altusage; /* some items have an } else if (otmp->oclass == SPBOOK_CLASS) { tmp -= tmp / 5L; } else if (otmp->otyp == CAN_OF_GREASE || - otmp->otyp == TINNING_KIT -#ifdef TOURIST - || otmp->otyp == EXPENSIVE_CAMERA -#endif - ) { + otmp->otyp == TINNING_KIT || + otmp->otyp == EXPENSIVE_CAMERA) { tmp /= 10L; } else if (otmp->otyp == POT_OIL) { tmp /= 5L; @@ -4022,10 +4007,7 @@ register xchar x, y; && shkp->mcanmove && !shkp->msleeping && (x == sx-1 || x == sx+1 || y == sy-1 || y == sy+1) && (Invis || carrying(PICK_AXE) || carrying(DWARVISH_MATTOCK) -#ifdef STEED - || u.usteed -#endif - )) { + || u.usteed)) { pline("%s%s blocks your way!", shkname(shkp), Invis ? " senses your motion and" : ""); return(TRUE); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/sit.c nethack-base/src/sit.c --- nethack-3.4.3/src/sit.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/sit.c 2006-06-15 14:45:32.000000000 +1000 @@ -43,12 +43,10 @@ dosit() register int typ = levl[u.ux][u.uy].typ; -#ifdef STEED if (u.usteed) { You("are already sitting on %s.", mon_nam(u.usteed)); return (0); } -#endif if(!can_reach_floor()) { if (Levitation) @@ -362,7 +360,6 @@ rndcurse() /* curse a few inventory it update_inventory(); } -#ifdef STEED /* treat steed's saddle as extended part of hero's inventory */ if (u.usteed && !rn2(4) && (otmp = which_armor(u.usteed, W_SADDLE)) != 0 && @@ -379,7 +376,6 @@ rndcurse() /* curse a few inventory it otmp->bknown = TRUE; } } -#endif /*STEED*/ } void diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/sounds.c nethack-base/src/sounds.c --- nethack-3.4.3/src/sounds.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/sounds.c 2006-06-15 14:45:32.000000000 +1000 @@ -709,11 +709,9 @@ register struct monst *mtmp; case PM_ARCHEOLOGIST: pline_msg = "describes a recent article in \"Spelunker Today\" magazine."; break; -#ifdef TOURIST case PM_TOURIST: verbl_msg = "Aloha."; break; -#endif default: pline_msg = "discusses dungeon exploration."; break; @@ -777,10 +775,8 @@ register struct monst *mtmp; verbl_msg = Role_if(PM_HEALER) ? "Doc, I can't help you unless you cooperate." : "Please undress so I can examine you."; -#ifdef TOURIST else if (uarmu) verbl_msg = "Take off your shirt, please."; -#endif else verbl_msg = "Relax, this won't hurt a bit."; break; case MS_GUARD: @@ -873,10 +869,8 @@ dochat() return(0); } -#ifdef STEED if (u.usteed && u.dz > 0) return (domonnoise(u.usteed)); -#endif if (u.dz) { pline("They won't hear you %s there.", u.dz < 0 ? "up" : "down"); return(0); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/steal.c nethack-base/src/steal.c --- nethack-3.4.3/src/steal.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/steal.c 2006-06-15 14:45:32.000000000 +1000 @@ -15,9 +15,7 @@ equipname(otmp) register struct obj *otmp; { return ( -#ifdef TOURIST (otmp == uarmu) ? "shirt" : -#endif (otmp == uarmf) ? "boots" : (otmp == uarms) ? "shield" : (otmp == uarmg) ? "gloves" : @@ -197,9 +195,7 @@ boolean unchain_ball; /* whether to unpu else if (obj == uarmg) (void) Gloves_off(); else if (obj == uarmh) (void) Helmet_off(); else if (obj == uarms) (void) Shield_off(); -#ifdef TOURIST else if (obj == uarmu) (void) Shirt_off(); -#endif /* catchall -- should never happen */ else setworn((struct obj *)0, obj->owornmask & W_ARMOR); } else if (obj->owornmask & W_AMUL) { @@ -298,10 +294,8 @@ nothing_to_steal: otmp = uwep; /* can't steal armor while wearing cloak - so steal the cloak. */ else if(otmp == uarm && uarmc) otmp = uarmc; -#ifdef TOURIST else if(otmp == uarmu && uarmc) otmp = uarmc; else if(otmp == uarmu && uarm) otmp = uarm; -#endif gotobj: if(otmp->o_id == stealoid) return(0); @@ -534,12 +528,10 @@ boolean verbosely; update_mon_intrinsics(mon, obj, FALSE, TRUE); /* obj_no_longer_held(obj); -- done by place_object */ if (obj->owornmask & W_WEP) setmnotwielded(mon, obj); -#ifdef STEED /* don't charge for an owned saddle on dead steed */ } else if (mon->mtame && (obj->owornmask & W_SADDLE) && !obj->unpaid && costly_spot(omx, omy)) { obj->no_charge = 1; -#endif } obj->owornmask = 0L; } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/steed.c nethack-base/src/steed.c --- nethack-3.4.3/src/steed.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/steed.c 2006-06-15 14:45:32.000000000 +1000 @@ -5,7 +5,6 @@ #include "hack.h" -#ifdef STEED /* Monsters that might be ridden */ static NEARDATA const char steeds[] = { @@ -636,6 +635,4 @@ int x, y; level.monsters[x][y] = mon; } -#endif /* STEED */ - /*steed.c*/ diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/teleport.c nethack-base/src/teleport.c --- nethack-3.4.3/src/teleport.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/teleport.c 2006-06-15 14:45:32.000000000 +1000 @@ -35,10 +35,7 @@ unsigned gpflags; * oh well. */ if (mtmp != &youmonst && x == u.ux && y == u.uy -#ifdef STEED - && (!u.usteed || mtmp != u.usteed) -#endif - ) + && (!u.usteed || mtmp != u.usteed)) return FALSE; if (mtmp) { @@ -310,13 +307,11 @@ boolean allow_drag; } initrack(); /* teleports mess up tracking monsters without this */ update_player_regions(); -#ifdef STEED /* Move your steed, too */ if (u.usteed) { u.usteed->mx = nux; u.usteed->my = nuy; } -#endif /* * Make sure the hero disappears from the old location. This will * not happen if she is teleported within sight of her previous @@ -370,11 +365,8 @@ boolean force_it; { register struct obj *otmp; -#ifdef STEED if (mtmp == u.usteed) return (FALSE); -#endif - if (mtmp->mleashed) { otmp = get_mleash(mtmp); if (!otmp) { @@ -426,15 +418,10 @@ tele() if (unconscious()) { pline("Being unconscious, you cannot control your teleport."); } else { -#ifdef STEED char buf[BUFSZ]; if (u.usteed) Sprintf(buf," and %s", mon_nam(u.usteed)); -#endif pline("To what position do you%s want to be teleported?", -#ifdef STEED - u.usteed ? buf : -#endif - ""); + u.usteed ? buf : ""); cc.x = u.ux; cc.y = u.uy; if (getpos(&cc, TRUE, "the desired position") < 0) @@ -983,12 +970,10 @@ boolean suppress_impossible; { register int x, y, trycount; -#ifdef STEED if (mtmp == u.usteed) { tele(); return TRUE; } -#endif if (mtmp->iswiz && mtmp->mx) { /* Wizard, not just arriving */ if (!In_W_tower(u.ux, u.uy, &u.uz)) diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/timeout.c nethack-base/src/timeout.c --- nethack-3.4.3/src/timeout.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/timeout.c 2006-06-15 14:45:32.000000000 +1000 @@ -207,12 +207,10 @@ nh_timeout() } } -#ifdef STEED if (u.ugallop) { if (--u.ugallop == 0L && u.usteed) pline("%s stops galloping.", Monnam(u.usteed)); } -#endif for(upp = u.uprops; upp < u.uprops+SIZE(u.uprops); upp++) if((upp->intrinsic & TIMEOUT) && !(--upp->intrinsic & TIMEOUT)) { @@ -620,9 +618,7 @@ slip_or_trip() const char *what, *pronoun; char buf[BUFSZ]; boolean on_foot = TRUE; -#ifdef STEED if (u.usteed) on_foot = FALSE; -#endif if (otmp && on_foot && !u.uinwater && is_pool(u.ux, u.uy)) otmp = 0; @@ -650,11 +646,9 @@ slip_or_trip() } } else if (rn2(3) && is_ice(u.ux, u.uy)) { pline("%s %s%s on the ice.", -#ifdef STEED u.usteed ? upstart(x_monnam(u.usteed, u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, (char *)0, SUPPRESS_SADDLE, FALSE)) : -#endif "You", rn2(2) ? "slip" : "slide", on_foot ? "" : "s"); } else { if (on_foot) { @@ -675,7 +669,6 @@ slip_or_trip() break; } } -#ifdef STEED else { switch (rn2(4)) { case 1: @@ -693,7 +686,6 @@ slip_or_trip() } dismount_steed(DISMOUNT_FELL); } -#endif } } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/trap.c nethack-base/src/trap.c --- nethack-3.4.3/src/trap.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/trap.c 2006-06-15 14:45:32.000000000 +1000 @@ -24,11 +24,9 @@ STATIC_DCL boolean FDECL(thitm, (int,str STATIC_DCL int FDECL(mkroll_launch, (struct trap *,XCHAR_P,XCHAR_P,SHORT_P,long)); STATIC_DCL boolean FDECL(isclearpath,(coord *, int, SCHAR_P, SCHAR_P)); -#ifdef STEED STATIC_OVL int FDECL(steedintrap, (struct trap *, struct obj *)); STATIC_OVL boolean FDECL(keep_saddle_with_steedcorpse, (unsigned, struct obj *, struct obj *)); -#endif #ifndef OVLB STATIC_VAR const char *a_your[2]; @@ -82,11 +80,9 @@ struct monst *victim; (void) burn_dmg(item, xname(item)); return TRUE; } -#ifdef TOURIST item = (victim == &youmonst) ? uarmu : which_armor(victim, W_ARMU); if (item) (void) burn_dmg(item, "shirt"); -#endif return TRUE; case 2: item = (victim == &youmonst) ? uarms : which_armor(victim, W_ARMS); @@ -549,7 +545,6 @@ boolean shatter; return mtmp; } -#ifdef STEED STATIC_OVL boolean keep_saddle_with_steedcorpse(steed_mid, objchn, saddle) unsigned steed_mid; @@ -578,7 +573,6 @@ struct obj *objchn, *saddle; } return FALSE; } -#endif /*STEED*/ void dotrap(trap, trflags) @@ -628,9 +622,7 @@ unsigned trflags; } } -#ifdef STEED if (u.usteed) u.usteed->mtrapseen |= (1 << (ttype-1)); -#endif switch(ttype) { case ARROW_TRAP: @@ -647,10 +639,9 @@ unsigned trflags; otmp->quan = 1L; otmp->owt = weight(otmp); otmp->opoisoned = 0; -#ifdef STEED - if (u.usteed && !rn2(2) && steedintrap(trap, otmp)) /* nothing */; + if (u.usteed && !rn2(2) && steedintrap(trap, otmp)) + /* nothing */; else -#endif if (thitu(8, dmgval(otmp, &youmonst), otmp, "arrow")) { obfree(otmp, (struct obj *)0); } else { @@ -674,10 +665,9 @@ unsigned trflags; otmp->quan = 1L; otmp->owt = weight(otmp); if (!rn2(6)) otmp->opoisoned = 1; -#ifdef STEED - if (u.usteed && !rn2(2) && steedintrap(trap, otmp)) /* nothing */; + if (u.usteed && !rn2(2) && steedintrap(trap, otmp)) + /* nothing */; else -#endif if (thitu(7, dmgval(otmp, &youmonst), otmp, "little dart")) { if (otmp->opoisoned) poisoned("dart", A_CON, "little dart", -10); @@ -752,10 +742,7 @@ unsigned trflags; A_Your[trap->madeby_u]); break; } - if( -#ifdef STEED - !u.usteed && -#endif + if(!u.usteed && youmonst.data->msize <= MZ_SMALL) { pline("%s bear trap closes harmlessly over you.", A_Your[trap->madeby_u]); @@ -763,13 +750,11 @@ unsigned trflags; } u.utrap = rn1(4, 4); u.utraptype = TT_BEARTRAP; -#ifdef STEED if (u.usteed) { pline("%s bear trap closes on %s %s!", A_Your[trap->madeby_u], s_suffix(mon_nam(u.usteed)), mbodypart(u.usteed, FOOT)); } else -#endif { pline("%s bear trap closes on your %s!", A_Your[trap->madeby_u], body_part(FOOT)); @@ -787,9 +772,7 @@ unsigned trflags; } pline("A cloud of gas puts you to sleep!"); fall_asleep(-rnd(25), TRUE); -#ifdef STEED (void) steedintrap(trap, (struct obj *)0); -#endif break; case RUST_TRAP: @@ -845,10 +828,8 @@ glovecheck: (void) rust_dmg(uarmg, "gau 1, TRUE, &youmonst); else if (uarm) (void) rust_dmg(uarm, "armor", 1, TRUE, &youmonst); -#ifdef TOURIST else if (uarmu) (void) rust_dmg(uarmu, "shirt", 1, TRUE, &youmonst); -#endif } update_inventory(); break; @@ -877,7 +858,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau } if (!In_sokoban(&u.uz)) { char verbbuf[BUFSZ]; -#ifdef STEED if (u.usteed) { if ((trflags & RECURSIVETRAP) != 0) Sprintf(verbbuf, "and %s fall", @@ -890,7 +870,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, "poor", SUPPRESS_SADDLE, FALSE)); } else -#endif Strcpy(verbbuf,"fall"); You("%s into %s pit!", verbbuf, a_your[trap->madeby_u]); } @@ -904,7 +883,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau pline("How pitiful. Isn't that the pits?"); if (ttype == SPIKED_PIT) { const char *predicament = "on a set of sharp iron spikes"; -#ifdef STEED if (u.usteed) { pline("%s lands %s!", upstart(x_monnam(u.usteed, @@ -912,20 +890,18 @@ glovecheck: (void) rust_dmg(uarmg, "gau "poor", SUPPRESS_SADDLE, FALSE)), predicament); } else -#endif You("land %s!", predicament); } if (!Passes_walls) u.utrap = rn1(6,2); u.utraptype = TT_PIT; -#ifdef STEED if (!steedintrap(trap, (struct obj *)0)) { -#endif if (ttype == SPIKED_PIT) { losehp(rnd(10),"fell into a pit of iron spikes", NO_KILLER_PREFIX); if (!rn2(6)) - poisoned("spikes", A_STR, "fall onto poison spikes", 8); + poisoned("spikes", A_STR, + "fall onto poison spikes", 8); } else losehp(rnd(6),"fell into a pit", NO_KILLER_PREFIX); if (Punished && !carried(uball)) { @@ -937,9 +913,7 @@ glovecheck: (void) rust_dmg(uarmg, "gau vision_full_recalc = 1; /* vision limits change */ exercise(A_STR, FALSE); exercise(A_DEX, FALSE); -#ifdef STEED } -#endif break; case HOLE: case TRAPDOOR: @@ -988,16 +962,14 @@ glovecheck: (void) rust_dmg(uarmg, "gau if (webmsgok) { char verbbuf[BUFSZ]; verbbuf[0] = '\0'; -#ifdef STEED if (u.usteed) Sprintf(verbbuf,"lead %s", x_monnam(u.usteed, u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, "poor", SUPPRESS_SADDLE, FALSE)); else -#endif - - Sprintf(verbbuf, "%s", Levitation ? (const char *)"float" : + Sprintf(verbbuf, "%s", Levitation ? + (const char *)"float" : locomotion(youmonst.data, "stumble")); You("%s into %s spider web!", verbbuf, a_your[trap->madeby_u]); @@ -1008,7 +980,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau { register int str = ACURR(A_STR); -#ifdef STEED /* If mounted, the steed gets trapped. Use mintrap * to do all the work. If mtrapped is set as a result, * unset it and set utrap instead. In the case of a @@ -1033,7 +1004,7 @@ glovecheck: (void) rust_dmg(uarmg, "gau webmsgok = FALSE; /* mintrap printed the messages */ } -#endif + if (str <= 3) u.utrap = rn1(6,6); else if (str < 6) u.utrap = rn1(6,4); else if (str < 9) u.utrap = rn1(4,4); @@ -1065,9 +1036,7 @@ glovecheck: (void) rust_dmg(uarmg, "gau Your("body absorbs some of the magical energy!"); u.uen = (u.uenmax += 2); } else domagictrap(); -#ifdef STEED (void) steedintrap(trap, (struct obj *)0); -#endif break; case ANTI_MAGIC: @@ -1081,14 +1050,12 @@ glovecheck: (void) rust_dmg(uarmg, "gau case POLY_TRAP: { char verbbuf[BUFSZ]; seetrap(trap); -#ifdef STEED if (u.usteed) Sprintf(verbbuf, "lead %s", x_monnam(u.usteed, u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, (char *)0, SUPPRESS_SADDLE, FALSE)); else -#endif Sprintf(verbbuf,"%s", Levitation ? (const char *)"float" : locomotion(youmonst.data, "step")); @@ -1098,9 +1065,7 @@ glovecheck: (void) rust_dmg(uarmg, "gau You_feel("momentarily different."); /* Trap did nothing; don't remove it --KAA */ } else { -#ifdef STEED (void) steedintrap(trap, (struct obj *)0); -#endif deltrap(trap); /* delete trap before polymorph */ newsym(u.ux,u.uy); /* get rid of trap symbol */ You_feel("a change coming over you."); @@ -1109,10 +1074,8 @@ glovecheck: (void) rust_dmg(uarmg, "gau break; } case LANDMINE: { -#ifdef STEED unsigned steed_mid = 0; struct obj *saddle = 0; -#endif if (Levitation || Flying) { if (!already_seen && rn2(3)) break; seetrap(trap); @@ -1127,7 +1090,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau already_seen ? a_your[trap->madeby_u] : "", already_seen ? " land mine" : "it"); } else { -#ifdef STEED /* prevent landmine from killing steed, throwing you to * the ground, and you being affected again by the same * mine because it hasn't been deleted yet @@ -1135,26 +1097,26 @@ glovecheck: (void) rust_dmg(uarmg, "gau static boolean recursive_mine = FALSE; if (recursive_mine) break; -#endif + seetrap(trap); pline("KAABLAMM!!! You triggered %s land mine!", a_your[trap->madeby_u]); -#ifdef STEED + if (u.usteed) steed_mid = u.usteed->m_id; recursive_mine = TRUE; (void) steedintrap(trap, (struct obj *)0); recursive_mine = FALSE; saddle = sobj_at(SADDLE,u.ux, u.uy); -#endif + set_wounded_legs(LEFT_SIDE, rn1(35, 41)); set_wounded_legs(RIGHT_SIDE, rn1(35, 41)); exercise(A_DEX, FALSE); } blow_up_landmine(trap); -#ifdef STEED + if (steed_mid && saddle && !u.usteed) (void)keep_saddle_with_steedcorpse(steed_mid, fobj, saddle); -#endif + newsym(u.ux,u.uy); /* update trap symbol */ losehp(rnd(16), "land mine", KILLED_BY_AN); /* fall recursively into the pit... */ @@ -1186,7 +1148,6 @@ glovecheck: (void) rust_dmg(uarmg, "gau } } -#ifdef STEED STATIC_OVL int steedintrap(trap, otmp) struct trap *trap; @@ -1276,7 +1237,6 @@ struct obj *otmp; else if(steedhit) return 1; else return 0; } -#endif /*STEED*/ /* some actions common to both player and monsters for triggered landmine */ void @@ -1698,10 +1658,9 @@ register struct monst *mtmp; In_sokoban(&u.uz) && !trap->madeby_u); const char *fallverb; -#ifdef STEED /* true when called from dotrap, inescapable is not an option */ if (mtmp == u.usteed) inescapable = TRUE; -#endif + if (!inescapable && ((mtmp->mtrapseen & (1 << (tt-1))) != 0 || (tt == HOLE && !mindless(mtmp->data)))) { @@ -1717,10 +1676,10 @@ register struct monst *mtmp; in_sight = canseemon(mtmp); see_it = cansee(mtmp->mx, mtmp->my); -#ifdef STEED + /* assume hero can tell what's going on for the steed */ if (mtmp == u.usteed) in_sight = TRUE; -#endif + switch (tt) { case ARROW_TRAP: if (trap->once && trap->tseen && !rn2(15)) { @@ -1864,12 +1823,10 @@ glovecheck: target = which_armor(mt target = which_armor(mtmp, W_ARM); if (target) (void) rust_dmg(target, "armor", 1, TRUE, mtmp); -#ifdef TOURIST else { target = which_armor(mtmp, W_ARMU); (void) rust_dmg(target, "shirt", 1, TRUE, mtmp); } -#endif } } if (mptr == &mons[PM_IRON_GOLEM]) { @@ -2272,7 +2229,7 @@ float_up() You("gain control over your movements."); else You("start to float in the air!"); -#ifdef STEED + if (u.usteed && !is_floater(u.usteed->data) && !is_flyer(u.usteed->data)) { if (Lev_at_will) @@ -2282,7 +2239,6 @@ float_up() dismount_steed(DISMOUNT_GENERIC); } } -#endif return; } @@ -2366,10 +2322,7 @@ long hmask, emask; /* might cancel t You_feel("heavier."); /* u.uinwater msgs already in spoteffects()/drown() */ else if (!u.uinwater && !no_msg) { -#ifdef STEED - if (!(emask & W_SADDLE)) -#endif - { + if (!(emask & W_SADDLE)) { boolean sokoban_trap = (In_sokoban(&u.uz) && trap); if (Hallucination) pline("Bummer! You've %s.", @@ -2390,9 +2343,7 @@ long hmask, emask; /* might cancel t */ You("fall over."); losehp(rnd(2), "dangerous winds", KILLED_BY); -#ifdef STEED if (u.usteed) dismount_steed(DISMOUNT_FELL); -#endif selftouch("As you fall, you"); } } @@ -2772,10 +2723,7 @@ boolean *lostsome; if (!((obj->otyp == LOADSTONE && obj->cursed) || obj == uamul || obj == uleft || obj == uright || obj == ublindf || obj == uarm || obj == uarmc || - obj == uarmg || obj == uarmf || -#ifdef TOURIST - obj == uarmu || -#endif + obj == uarmg || obj == uarmf || obj == uarmu || (obj->cursed && (obj == uarmh || obj == uarms)) || welded(obj))) otmp = obj; @@ -2892,13 +2840,11 @@ drown() return(TRUE); } else pline_The("attempted teleport spell fails."); } -#ifdef STEED if (u.usteed) { dismount_steed(DISMOUNT_GENERIC); if(!is_pool(u.ux,u.uy)) return(TRUE); } -#endif crawl_ok = FALSE; x = y = 0; /* lint suppression */ /* if sleeping, wake up now so that we don't crawl out of water @@ -3106,12 +3052,10 @@ boolean force_failure; } /* untrappable traps are located on the ground. */ if (!can_reach_floor()) { -#ifdef STEED if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) You("aren't skilled enough to reach from %s.", mon_nam(u.usteed)); else -#endif You("are unable to reach the %s!", defsyms[trap_to_defsym(ttype)].explanation); return 0; @@ -3131,12 +3075,10 @@ boolean force_failure; if (ttmp2) { pline_The("webbing sticks to you. You're caught too!"); dotrap(ttmp2, NOWEBMSG); -#ifdef STEED if (u.usteed && u.utrap) { /* you, not steed, are trapped */ dismount_steed(DISMOUNT_FELL); } -#endif } } else pline("%s remains entangled.", Monnam(mtmp)); @@ -3490,13 +3432,13 @@ boolean force; case 'q': return(0); case 'n': continue; } -#ifdef STEED + if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) { You("aren't skilled enough to reach from %s.", mon_nam(u.usteed)); return(0); } -#endif + if((otmp->otrapped && (force || (!confused && rn2(MAXULEV + 1 - u.ulevel) < 10))) || (!force && confused && !rn2(3))) { @@ -3958,9 +3900,7 @@ lava_effects() else if(obj == uarms) (void) Shield_off(); else if(obj == uarmg) (void) Gloves_off(); else if(obj == uarmf) (void) Boots_off(); -#ifdef TOURIST else if(obj == uarmu) setnotworn(obj); -#endif else if(obj == uleft) Ring_gone(obj); else if(obj == uright) Ring_gone(obj); else if(obj == ublindf) Blindf_off(obj); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/u_init.c nethack-base/src/u_init.c --- nethack-3.4.3/src/u_init.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/u_init.c 2006-06-15 14:45:32.000000000 +1000 @@ -137,7 +137,6 @@ static struct trobj Samurai[] = { { SPLINT_MAIL, 0, ARMOR_CLASS, 1, UNDEF_BLESS }, { 0, 0, 0, 0, 0 } }; -#ifdef TOURIST static struct trobj Tourist[] = { #define T_DARTS 0 { DART, 2, WEAPON_CLASS, 25, UNDEF_BLESS }, /* quan is variable */ @@ -149,7 +148,6 @@ static struct trobj Tourist[] = { { CREDIT_CARD, 0, TOOL_CLASS, 1, 0 }, { 0, 0, 0, 0, 0 } }; -#endif static struct trobj Valkyrie[] = { { LONG_SWORD, 1, WEAPON_CLASS, 1, UNDEF_BLESS }, { DAGGER, 0, WEAPON_CLASS, 1, UNDEF_BLESS }, @@ -199,7 +197,6 @@ static struct trobj Xtra_food[] = { { UNDEF_TYP, UNDEF_SPE, FOOD_CLASS, 2, 0 }, { 0, 0, 0, 0, 0 } }; -#ifdef TOURIST static struct trobj Leash[] = { { LEASH, 0, TOOL_CLASS, 1, 0 }, { 0, 0, 0, 0, 0 } @@ -208,7 +205,6 @@ static struct trobj Towel[] = { { TOWEL, 0, TOOL_CLASS, 1, 0 }, { 0, 0, 0, 0, 0 } }; -#endif /* TOURIST */ static struct trobj Wishing[] = { { WAN_WISHING, 3, WAND_CLASS, 1, 0 }, { 0, 0, 0, 0, 0 } @@ -261,9 +257,7 @@ static const struct def_skill Skill_A[] { P_UNICORN_HORN, P_SKILLED }, { P_ATTACK_SPELL, P_BASIC }, { P_HEALING_SPELL, P_BASIC }, { P_DIVINATION_SPELL, P_EXPERT}, { P_MATTER_SPELL, P_BASIC}, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_TWO_WEAPON_COMBAT, P_BASIC }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } @@ -280,9 +274,7 @@ static const struct def_skill Skill_B[] { P_QUARTERSTAFF, P_BASIC }, { P_SPEAR, P_SKILLED }, { P_TRIDENT, P_SKILLED }, { P_BOW, P_BASIC }, { P_ATTACK_SPELL, P_SKILLED }, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_TWO_WEAPON_COMBAT, P_BASIC }, { P_BARE_HANDED_COMBAT, P_MASTER }, { P_NONE, 0 } @@ -331,9 +323,7 @@ static const struct def_skill Skill_K[] { P_BOW, P_BASIC }, { P_CROSSBOW, P_SKILLED }, { P_ATTACK_SPELL, P_SKILLED }, { P_HEALING_SPELL, P_SKILLED }, { P_CLERIC_SPELL, P_SKILLED }, -#ifdef STEED { P_RIDING, P_EXPERT }, -#endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } @@ -379,9 +369,7 @@ static const struct def_skill Skill_R[] { P_DART, P_EXPERT }, { P_SHURIKEN, P_SKILLED }, { P_DIVINATION_SPELL, P_SKILLED }, { P_ESCAPE_SPELL, P_SKILLED }, { P_MATTER_SPELL, P_SKILLED }, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } @@ -401,9 +389,7 @@ static const struct def_skill Skill_Ran[ { P_HEALING_SPELL, P_BASIC }, { P_DIVINATION_SPELL, P_EXPERT }, { P_ESCAPE_SPELL, P_BASIC }, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; @@ -418,15 +404,12 @@ static const struct def_skill Skill_S[] { P_JAVELIN, P_BASIC }, { P_LANCE, P_SKILLED }, { P_BOW, P_EXPERT }, { P_SHURIKEN, P_EXPERT }, { P_ATTACK_SPELL, P_SKILLED }, { P_CLERIC_SPELL, P_SKILLED }, -#ifdef STEED { P_RIDING, P_SKILLED }, -#endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_MARTIAL_ARTS, P_MASTER }, { P_NONE, 0 } }; -#ifdef TOURIST static const struct def_skill Skill_T[] = { { P_DAGGER, P_EXPERT }, { P_KNIFE, P_SKILLED }, { P_AXE, P_BASIC }, { P_PICK_AXE, P_BASIC }, @@ -444,14 +427,11 @@ static const struct def_skill Skill_T[] { P_WHIP, P_BASIC }, { P_UNICORN_HORN, P_SKILLED }, { P_DIVINATION_SPELL, P_BASIC }, { P_ENCHANTMENT_SPELL, P_BASIC }, { P_ESCAPE_SPELL, P_SKILLED }, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; -#endif /* TOURIST */ static const struct def_skill Skill_V[] = { { P_DAGGER, P_EXPERT }, { P_AXE, P_EXPERT }, @@ -464,9 +444,7 @@ static const struct def_skill Skill_V[] { P_TRIDENT, P_BASIC }, { P_LANCE, P_SKILLED }, { P_SLING, P_BASIC }, { P_ATTACK_SPELL, P_BASIC }, { P_ESCAPE_SPELL, P_BASIC }, -#ifdef STEED { P_RIDING, P_SKILLED }, -#endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } @@ -484,9 +462,7 @@ static const struct def_skill Skill_W[] { P_DIVINATION_SPELL, P_EXPERT }, { P_ENCHANTMENT_SPELL, P_SKILLED }, { P_CLERIC_SPELL, P_SKILLED }, { P_ESCAPE_SPELL, P_EXPERT }, { P_MATTER_SPELL, P_EXPERT }, -#ifdef STEED { P_RIDING, P_BASIC }, -#endif { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; @@ -529,9 +505,7 @@ u_init() #if 0 /* documentation of more zero values as desirable */ u.usick_cause[0] = 0; u.uluck = u.moreluck = 0; -# ifdef TOURIST uarmu = 0; -# endif uarm = uarmc = uarmh = uarms = uarmg = uarmf = 0; uwep = uball = uchain = uleft = uright = 0; uswapwep = uquiver = 0; @@ -700,7 +674,6 @@ u_init() knows_class(ARMOR_CLASS); skill_init(Skill_S); break; -#ifdef TOURIST case PM_TOURIST: Tourist[T_DARTS].trquan = rn1(20, 21); #ifndef GOLDOBJ @@ -715,7 +688,6 @@ u_init() else if(!rn2(25)) ini_inv(Magicmarker); skill_init(Skill_T); break; -#endif case PM_VALKYRIE: ini_inv(Valkyrie); if(!rn2(6)) ini_inv(Lamp); @@ -864,9 +836,7 @@ int otyp; case PM_RANGER: skills = Skill_Ran; break; case PM_ROGUE: skills = Skill_R; break; case PM_SAMURAI: skills = Skill_S; break; -#ifdef TOURIST case PM_TOURIST: skills = Skill_T; break; -#endif case PM_VALKYRIE: skills = Skill_V; break; case PM_WIZARD: skills = Skill_W; break; default: skills = 0; break; /* lint suppression */ @@ -1023,10 +993,8 @@ register struct trobj *trop; setworn(obj, W_ARMH); else if (is_gloves(obj) && !uarmg) setworn(obj, W_ARMG); -#ifdef TOURIST else if (is_shirt(obj) && !uarmu) setworn(obj, W_ARMU); -#endif else if (is_cloak(obj) && !uarmc) setworn(obj, W_ARMC); else if (is_boots(obj) && !uarmf) diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/uhitm.c nethack-base/src/uhitm.c --- nethack-3.4.3/src/uhitm.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/uhitm.c 2006-06-15 14:45:32.000000000 +1000 @@ -8,9 +8,7 @@ STATIC_DCL boolean FDECL(known_hitum, (s STATIC_DCL void FDECL(steal_it, (struct monst *, struct attack *)); STATIC_DCL boolean FDECL(hitum, (struct monst *,int,struct attack *)); STATIC_DCL boolean FDECL(hmon_hitmon, (struct monst *,struct obj *,int)); -#ifdef STEED STATIC_DCL int FDECL(joust, (struct monst *,struct obj *)); -#endif STATIC_DCL void NDECL(demonpet); STATIC_DCL boolean FDECL(m_slips_free, (struct monst *mtmp,struct attack *mattk)); STATIC_DCL int FDECL(explum, (struct monst *,struct attack *)); @@ -66,10 +64,8 @@ int attk; } if ((target = which_armor(mdef, W_ARM)) != (struct obj *)0) { (void)rust_dmg(target, xname(target), hurt, TRUE, mdef); -#ifdef TOURIST } else if ((target = which_armor(mdef, W_ARMU)) != (struct obj *)0) { (void)rust_dmg(target, xname(target), hurt, TRUE, mdef); -#endif } break; case 2: @@ -523,9 +519,8 @@ int thrown; boolean silvermsg = FALSE, silverobj = FALSE; boolean valid_weapon_attack = FALSE; boolean unarmed = !uwep && !uarm && !uarms; -#ifdef STEED + int jousting = 0; -#endif int wtype; struct obj *monwep; char yourbuf[BUFSZ]; @@ -571,11 +566,7 @@ int thrown; /* or strike with a missile in your hand... */ (!thrown && (is_missile(obj) || is_ammo(obj))) || /* or use a pole at short range and not mounted... */ - (!thrown && -#ifdef STEED - !u.usteed && -#endif - is_pole(obj)) || + (!thrown && !u.usteed && is_pole(obj)) || /* or throw a missile without the proper bow... */ (is_ammo(obj) && !ammo_and_launcher(obj, uwep))) { /* then do only 1-2 points of damage */ @@ -649,14 +640,14 @@ int thrown; && hates_silver(mdat)) { silvermsg = TRUE; silverobj = TRUE; } -#ifdef STEED + if (u.usteed && !thrown && tmp > 0 && weapon_type(obj) == P_LANCE && mon != u.ustuck) { jousting = joust(mon, obj); /* exercise skill even for minimal damage hits */ if (jousting) valid_weapon_attack = TRUE; } -#endif + if (thrown && (is_ammo(obj) || is_missile(obj))) { if (ammo_and_launcher(obj, uwep)) { /* Elves and Samurai do extra damage using @@ -710,7 +701,6 @@ int thrown; } tmp = 1; break; -#ifdef TOURIST case EXPENSIVE_CAMERA: You("succeed in destroying %s camera. Congratulations!", shk_your(yourbuf, obj)); @@ -718,7 +708,6 @@ int thrown; return(TRUE); /*NOTREACHED*/ break; -#endif case CORPSE: /* fixed by polder@cs.vu.nl */ if (touch_petrifies(&mons[obj->corpsenm])) { static const char withwhat[] = "corpse"; @@ -945,7 +934,6 @@ int thrown; } } -#ifdef STEED if (jousting) { tmp += d(2, (obj == uwep) ? 10 : 2); /* [was in dmgval()] */ You("joust %s%s", @@ -966,9 +954,7 @@ int thrown; if (DEADMONSTER(mon)) already_killed = TRUE; } hittxt = TRUE; - } else -#endif - + } else { /* VERY small chance of stunning opponent if unarmed. */ if (unarmed && tmp > 1 && !thrown && !obj && !Upolyd) { if (rnd(100) < P_SKILL(P_BARE_HANDED_COMBAT) && @@ -985,6 +971,7 @@ int thrown; hittxt = TRUE; } } + } if (!already_killed) mon->mhp -= tmp; /* adjustments might have made tmp become less than what @@ -1102,9 +1089,7 @@ struct attack *mattk; /* grabbing attacks the body */ obj = which_armor(mdef, W_ARMC); /* cloak */ if (!obj) obj = which_armor(mdef, W_ARM); /* suit */ -#ifdef TOURIST if (!obj) obj = which_armor(mdef, W_ARMU); /* shirt */ -#endif } /* if your cloak/armor is greased, monster slips off; this diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/vault.c nethack-base/src/vault.c --- nethack-3.4.3/src/vault.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/vault.c 2006-06-15 14:45:32.000000000 +1000 @@ -274,10 +274,7 @@ fnd: } if (!strcmpi(buf, "Croesus") || !strcmpi(buf, "Kroisos") -#ifdef TOURIST - || !strcmpi(buf, "Creosote") -#endif - ) { + || !strcmpi(buf, "Creosote")) { if (!mvitals[PM_CROESUS].died) { verbalize("Oh, yes, of course. Sorry to have disturbed you."); mongone(guard); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/weapon.c nethack-base/src/weapon.c --- nethack-3.4.3/src/weapon.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/weapon.c 2006-06-15 14:45:38.000000000 +1000 @@ -50,9 +50,7 @@ STATIC_VAR NEARDATA const short skill_na PN_CLERIC_SPELL, PN_ESCAPE_SPELL, PN_MATTER_SPELL, PN_BARE_HANDED, PN_TWO_WEAPONS, -#ifdef STEED PN_RIDING -#endif }; /* note: entry [0] isn't used */ @@ -839,6 +837,7 @@ const static struct skill_range { { P_FIRST_H_TO_H, P_LAST_H_TO_H, "Fighting Skills" }, { P_FIRST_WEAPON, P_LAST_WEAPON, "Weapon Skills" }, { P_FIRST_SPELL, P_LAST_SPELL, "Spellcasting Skills" }, + { P_FIRST_NON_COMBAT, P_LAST_NON_COMBAT, "Non-Combat Skills" }, }; /* @@ -1141,7 +1140,6 @@ struct obj *weapon; bonus = ((bonus + 2) * (martial_bonus() ? 2 : 1)) / 2; } -#ifdef STEED /* KMH -- It's harder to hit while you are riding */ if (u.usteed) { switch (P_SKILL(P_RIDING)) { @@ -1153,7 +1151,6 @@ struct obj *weapon; } if (u.twoweap) bonus -= 2; } -#endif return bonus; } @@ -1210,7 +1207,6 @@ struct obj *weapon; bonus = ((bonus + 1) * (martial_bonus() ? 3 : 1)) / 2; } -#ifdef STEED /* KMH -- Riding gives some thrusting damage */ if (u.usteed && type != P_TWO_WEAPON_COMBAT) { switch (P_SKILL(P_RIDING)) { @@ -1221,7 +1217,6 @@ struct obj *weapon; case P_EXPERT: bonus += 2; break; } } -#endif return bonus; } @@ -1278,10 +1273,8 @@ const struct def_skill *class_skill; P_SKILL(P_BARE_HANDED_COMBAT) = P_BASIC; /* Roles that start with a horse know how to ride it */ -#ifdef STEED if (urole.petnum == PM_PONY) P_SKILL(P_RIDING) = P_BASIC; -#endif /* * Make sure we haven't missed setting the max on a skill diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/wield.c nethack-base/src/wield.c --- nethack-3.4.3/src/wield.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/wield.c 2006-06-15 14:45:32.000000000 +1000 @@ -103,10 +103,7 @@ register struct obj *obj; unweapon = (obj->oclass == WEAPON_CLASS) ? is_launcher(obj) || is_ammo(obj) || is_missile(obj) || (is_pole(obj) -#ifdef STEED - && !u.usteed -#endif - ) : !is_weptool(obj); + && !u.usteed) : !is_weptool(obj); } else unweapon = TRUE; /* for "bare hands" message */ update_inventory(); @@ -264,11 +261,8 @@ dowield() return (doswapweapon()); else if (wep == uquiver) setuqwep((struct obj *) 0); - else if (wep->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL -#ifdef STEED - | W_SADDLE -#endif - )) { + else if (wep->owornmask & + (W_ARMOR | W_RING | W_AMUL | W_TOOL | W_SADDLE)) { You("cannot wield that!"); return (0); } @@ -367,17 +361,13 @@ dowieldquiver() pline("%s already being used as a weapon!", !is_plural(uwep) ? "That is" : "They are"); return(0); - } else if (newquiver->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL -#ifdef STEED - | W_SADDLE -#endif - )) { + } else if (newquiver->owornmask & + (W_ARMOR | W_RING | W_AMUL | W_TOOL | W_SADDLE)) { You("cannot ready that!"); return (0); } else { long dummy; - /* Check if it's the secondary weapon */ if (newquiver == uswapwep) { setuswapwep((struct obj *) 0); diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/worn.c nethack-base/src/worn.c --- nethack-3.4.3/src/worn.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/worn.c 2006-06-15 14:45:32.000000000 +1000 @@ -18,9 +18,7 @@ const struct worn { { W_ARMS, &uarms }, { W_ARMG, &uarmg }, { W_ARMF, &uarmf }, -#ifdef TOURIST { W_ARMU, &uarmu }, -#endif { W_RINGL, &uleft }, { W_RINGR, &uright }, { W_WEP, &uwep }, @@ -314,10 +312,8 @@ boolean on, silently; break; } -#ifdef STEED if (!on && mon == u.usteed && obj->otyp == SADDLE) dismount_steed(DISMOUNT_FELL); -#endif /* if couldn't see it but now can, or vice versa, update display */ if (!silently && (unseen ^ !canseemon(mon))) @@ -374,11 +370,9 @@ boolean creation; return; m_dowear_type(mon, W_AMUL, creation, FALSE); -#ifdef TOURIST /* can't put on shirt if already wearing suit */ if (!cantweararm(mon->data) || (mon->misc_worn_check & W_ARM)) m_dowear_type(mon, W_ARMU, creation, FALSE); -#endif /* treating small as a special case allows hobbits, gnomes, and kobolds to wear cloaks */ if (!cantweararm(mon->data) || mon->data->msize == MZ_SMALL) @@ -426,11 +420,9 @@ boolean racialexception; continue; best = obj; goto outer_break; /* no such thing as better amulets */ -#ifdef TOURIST case W_ARMU: if (!is_shirt(obj)) continue; break; -#endif case W_ARMC: if (!is_cloak(obj)) continue; break; @@ -469,11 +461,8 @@ outer_break: /* if wearing a cloak, account for the time spent removing and re-wearing it when putting on a suit or shirt */ - if ((flag == W_ARM -#ifdef TOURIST - || flag == W_ARMU -#endif - ) && (mon->misc_worn_check & W_ARMC)) + if ((flag == W_ARM || flag == W_ARMU) + && (mon->misc_worn_check & W_ARMC)) m_delay += 2; /* when upgrading a piece of armor, account for time spent taking off current one */ @@ -632,7 +621,6 @@ boolean polyspot; m_useup(mon, otmp); } } -#ifdef TOURIST if ((otmp = which_armor(mon, W_ARMU)) != 0) { if (vis) pline("%s shirt rips to shreds!", s_suffix(Monnam(mon))); @@ -640,7 +628,6 @@ boolean polyspot; You_hear("a ripping sound."); m_useup(mon, otmp); } -#endif } else if (sliparm(mdat)) { if ((otmp = which_armor(mon, W_ARM)) != 0) { if (vis) @@ -663,7 +650,6 @@ boolean polyspot; if (polyspot) bypass_obj(otmp); m_lose_armor(mon, otmp); } -#ifdef TOURIST if ((otmp = which_armor(mon, W_ARMU)) != 0) { if (vis) { if (sliparm(mon->data)) @@ -676,7 +662,6 @@ boolean polyspot; if (polyspot) bypass_obj(otmp); m_lose_armor(mon, otmp); } -#endif } if (handless_or_tiny) { /* [caller needs to handle weapon checks] */ @@ -724,7 +709,6 @@ boolean polyspot; m_lose_armor(mon, otmp); } } -#ifdef STEED if (!can_saddle(mon)) { if ((otmp = which_armor(mon, W_SADDLE)) != 0) { if (polyspot) bypass_obj(otmp); @@ -748,7 +732,6 @@ boolean polyspot; } dismount_steed(DISMOUNT_FELL); } -#endif return; } diff -Npbaur -x '*~' -x '#*#' nethack-3.4.3/src/zap.c nethack-base/src/zap.c --- nethack-3.4.3/src/zap.c 2003-12-08 10:39:13.000000000 +1100 +++ nethack-base/src/zap.c 2006-06-15 14:45:32.000000000 +1000 @@ -28,9 +28,7 @@ STATIC_DCL boolean FDECL(zap_updown, (st STATIC_DCL int FDECL(zhitm, (struct monst *,int,int,struct obj **)); STATIC_DCL void FDECL(zhitu, (int,int,const char *,XCHAR_P,XCHAR_P)); STATIC_DCL void FDECL(revive_egg, (struct obj *)); -#ifdef STEED STATIC_DCL boolean FDECL(zap_steed, (struct obj *)); -#endif #ifdef OVLB STATIC_DCL int FDECL(zap_hit, (int,int)); @@ -242,7 +240,6 @@ struct obj *otmp; else pline("%s opens its mouth!", Monnam(mtmp)); } expels(mtmp, mtmp->data, TRUE); -#ifdef STEED } else if (!!(obj = which_armor(mtmp, W_SADDLE))) { mtmp->misc_worn_check &= ~obj->owornmask; update_mon_intrinsics(mtmp, obj, FALSE, FALSE); @@ -251,7 +248,6 @@ struct obj *otmp; place_object(obj, mtmp->mx, mtmp->my); /* call stackobj() if we ever drop anything that can merge */ newsym(mtmp->mx, mtmp->my); -#endif } break; case SPE_HEALING: @@ -2085,9 +2081,7 @@ boolean ordinary; case WAN_LIGHT: /* (broken wand) */ /* assert( !ordinary ); */ damage = d(obj->spe, 25); -#ifdef TOURIST case EXPENSIVE_CAMERA: -#endif damage += rnd(25); if (!resists_blnd(&youmonst)) { You(are_blinded_by_the_flash); @@ -2151,7 +2145,6 @@ boolean ordinary; return(damage); } -#ifdef STEED /* you've zapped a wand downwards while riding * Return TRUE if the steed was hit by the wand. * Return FALSE if the steed was not hit by the wand. @@ -2211,7 +2204,6 @@ struct obj *obj; /* wand or spell */ } return steedhit; } -#endif #endif /*OVL0*/ #ifdef OVL3 @@ -2452,12 +2444,10 @@ register struct obj *obj; boolean disclose = FALSE, was_unkn = !objects[otyp].oc_name_known; exercise(A_WIS, TRUE); -#ifdef STEED if (u.usteed && (objects[otyp].oc_dir != NODIR) && !u.dx && !u.dy && (u.dz > 0) && zap_steed(obj)) { disclose = TRUE; - } else -#endif + } else { if (objects[otyp].oc_dir == IMMEDIATE) { obj_zapped = FALSE; @@ -2493,6 +2483,7 @@ register struct obj *obj; impossible("weffects: unexpected spell or wand"); disclose = TRUE; } + } if (disclose && was_unkn) { makeknown(otyp); more_experienced(0,10); @@ -2997,10 +2988,8 @@ struct obj **ootmp; /* to return worn ar tmp = MAGIC_COOKIE; if ((otmp2 = which_armor(mon, W_ARMC)) != 0) m_useup(mon, otmp2); -#ifdef TOURIST if ((otmp2 = which_armor(mon, W_ARMU)) != 0) m_useup(mon, otmp2); -#endif } type = -1; /* no saving throw wanted */ bre