From: nethack.allison Date: Fri, 5 Sep 2003 02:45:18 +0000 (+0000) Subject: Remove vestiges of old overlay source split X-Git-Tag: MOVE2GIT~1812 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=416412f92bf6ceee711ca071a2881dc40b7d9950;p=nethack Remove vestiges of old overlay source split [trunk only] --- diff --git a/include/hack.h b/include/hack.h index 23f13c507..69f25ad4e 100644 --- a/include/hack.h +++ b/include/hack.h @@ -295,28 +295,19 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */ #define getlogin() ((char *)0) #endif /* MICRO */ -#if defined(OVERLAY)&&(defined(OVL0)||defined(OVL1)||defined(OVL2)||defined(OVL3)||defined(OVLB)) +#if defined(OVERLAY) # define USE_OVLx # define STATIC_DCL extern # define STATIC_OVL -# ifdef OVLB -# define STATIC_VAR -# else -# define STATIC_VAR extern -# endif +# define STATIC_VAR + +#else /* !OVERLAY */ -#else /* !OVERLAY || (!OVL0 && !OVL1 && !OVL2 && !OVL3 && !OVLB) */ # define STATIC_DCL static # define STATIC_OVL static # define STATIC_VAR static -/* If not compiling an overlay, compile everything. */ -# define OVL0 /* highest priority */ -# define OVL1 -# define OVL2 -# define OVL3 /* lowest specified priority */ -# define OVLB /* the base overlay segment */ -#endif /* OVERLAY && (OVL0 || OVL1 || OVL2 || OVL3 || OVLB) */ +#endif /* OVERLAY */ /* Macro for a few items that are only static if we're not overlaid.... */ #if defined(USE_TRAMPOLI) || defined(USE_OVLx) diff --git a/include/pcconf.h b/include/pcconf.h index 1df429e84..c186768f8 100644 --- a/include/pcconf.h +++ b/include/pcconf.h @@ -250,11 +250,6 @@ #if defined(FUNCTION_LEVEL_LINKING) #define OVERLAY -#define OVL0 -#define OVL1 -#define OVL2 -#define OVL3 -#define OVLB #endif #if defined(OVERLAY) && !defined(MOVERLAY) && !defined(VROOMM) && !defined(FUNCTION_LEVEL_LINKING) diff --git a/src/allmain.c b/src/allmain.c index b54f7cebc..a56cf4d83 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -14,8 +14,6 @@ STATIC_DCL void NDECL(do_positionbar); #endif -#ifdef OVL0 - void moveloop() { @@ -423,9 +421,6 @@ moveloop() } } -#endif /* OVL0 */ -#ifdef OVL1 - void stop_occupation() { @@ -444,9 +439,6 @@ stop_occupation() } } -#endif /* OVL1 */ -#ifdef OVLB - void display_gamewindows() { @@ -628,6 +620,4 @@ do_positionbar() } #endif -#endif /* OVLB */ - /*allmain.c*/ diff --git a/src/apply.c b/src/apply.c index edde51565..6c25551c5 100644 --- a/src/apply.c +++ b/src/apply.c @@ -5,7 +5,6 @@ #include "hack.h" #include "edog.h" -#ifdef OVLB static const char tools[] = { TOOL_CLASS, WEAPON_CLASS, WAND_CLASS, 0 }; static const char tools_too[] = { ALL_CLASSES, TOOL_CLASS, POTION_CLASS, @@ -502,8 +501,6 @@ register struct monst *mtmp; return((struct obj *)0); } -#endif /* OVLB */ -#ifdef OVL1 boolean next_to_u() @@ -535,9 +532,6 @@ next_to_u() return(TRUE); } -#endif /* OVL1 */ -#ifdef OVL0 - void check_leash(x, y) register xchar x, y; @@ -596,9 +590,6 @@ register xchar x, y; } } -#endif /* OVL0 */ -#ifdef OVLB - #define WEAK 3 /* from eat.c */ static const char look_str[] = "look %s."; @@ -3055,6 +3046,4 @@ unfixable_trouble_count(is_horn) return unfixable_trbl; } -#endif /* OVLB */ - /*apply.c*/ diff --git a/src/artifact.c b/src/artifact.c index a624e5e5a..76433a513 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -4,11 +4,8 @@ #include "hack.h" #include "artifact.h" -#ifdef OVLB #include "artilist.h" -#else -STATIC_DCL struct artifact artilist[]; -#endif + /* * Note: both artilist[] and artiexist[] have a dummy element #0, * so loops over them should normally start at #1. The primary @@ -36,10 +33,6 @@ STATIC_DCL boolean FDECL(Mb_hit, (struct monst *magr,struct monst *mdef, of hit points that will fit in a 15 bit integer. */ #define FATAL_DAMAGE_MODIFIER 200 -#ifndef OVLB -STATIC_DCL int spec_dbon_applies; -STATIC_DCL xchar artidisco[NROFARTIFACTS]; -#else /* OVLB */ /* coordinate effects from spec_dbon() with messages in artifact_hit() */ STATIC_OVL int spec_dbon_applies = 0; @@ -238,8 +231,6 @@ nartifact_exist() return a; } -#endif /* OVLB */ -#ifdef OVL0 boolean spec_ability(otmp, abil) @@ -279,9 +270,6 @@ struct obj *obj; return FALSE; } -#endif /* OVL0 */ -#ifdef OVLB - boolean restrict_name(otmp, name) /* returns 1 if name is restricted for otmp->otyp */ register struct obj *otmp; @@ -554,9 +542,6 @@ touch_artifact(obj,mon) return 1; } -#endif /* OVLB */ -#ifdef OVL1 - /* decide whether an artifact's special attacks apply against mtmp */ STATIC_OVL int spec_applies(weap, mtmp) @@ -717,11 +702,6 @@ winid tmpwin; /* supplied by dodiscover() */ return i; } -#endif /* OVL1 */ - -#ifdef OVLB - - /* * Magicbane's intrinsic magic is incompatible with normal * enchantment magic. Thus, its effects have a negative @@ -1456,6 +1436,4 @@ struct obj *otmp; return (100L * (long)objects[otmp->otyp].oc_cost); } -#endif /* OVLB */ - /*artifact.c*/ diff --git a/src/attrib.c b/src/attrib.c index e4fab6f0c..0100a3de7 100644 --- a/src/attrib.c +++ b/src/attrib.c @@ -8,8 +8,6 @@ /* #define DEBUG */ /* uncomment for debugging info */ -#ifdef OVLB - /* part of the output on gain or loss of attribute */ static const char * const plusattr[] = { @@ -232,9 +230,6 @@ set_moreluck() else u.moreluck = -LUCKADD; } -#endif /* OVLB */ -#ifdef OVL1 - void restore_attrib() { @@ -254,9 +249,6 @@ restore_attrib() (void)encumber_msg(); } -#endif /* OVL1 */ -#ifdef OVLB - #define AVAL 50 /* tune value for exercise gains */ void @@ -658,9 +650,6 @@ newhp() return((hp <= 0) ? 1 : hp); } -#endif /* OVLB */ -#ifdef OVL0 - schar acurr(x) int x; @@ -703,9 +692,6 @@ acurrstr() else return((schar)(str - 100)); } -#endif /* OVL0 */ -#ifdef OVL2 - /* avoid possible problems with alignment overflow, and provide a centralized * location for any future alignment limits */ @@ -726,6 +712,4 @@ register int n; } } -#endif /* OVL2 */ - /*attrib.c*/ diff --git a/src/botl.c b/src/botl.c index 6534ad797..37fe2578a 100644 --- a/src/botl.c +++ b/src/botl.c @@ -4,7 +4,6 @@ #include "hack.h" -#ifdef OVL0 extern const char *hu_stat[]; /* defined in eat.c */ const char * const enc_stat[] = { @@ -18,7 +17,6 @@ const char * const enc_stat[] = { STATIC_DCL void NDECL(bot1); STATIC_DCL void NDECL(bot2); -#endif /* OVL0 */ /* MAXCO must hold longest uncompressed status line, and must be larger * than COLNO @@ -34,16 +32,9 @@ STATIC_DCL void NDECL(bot2); #define MAXCO (COLNO+20) #endif -#ifndef OVLB -STATIC_DCL int mrank_sz; -#else /* OVLB */ STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */ -#endif /* OVLB */ - STATIC_DCL const char *NDECL(rank); -#ifdef OVL1 - /* convert experience level (1..30) to rank index (0..8) */ int xlev_to_rank(xlev) @@ -126,9 +117,6 @@ int *rank_indx, *title_length; return NON_PM; } -#endif /* OVL1 */ -#ifdef OVLB - void max_rank_sz() { @@ -141,9 +129,6 @@ max_rank_sz() return; } -#endif /* OVLB */ -#ifdef OVL0 - #ifdef SCORE_ON_BOTL long botl_score() @@ -304,6 +289,4 @@ bot() flags.botl = flags.botlx = 0; } -#endif /* OVL0 */ - /*botl.c*/ diff --git a/src/cmd.c b/src/cmd.c index d3e3249a6..554ff26fe 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -101,9 +101,7 @@ extern int NDECL(dozap); /**/ extern int NDECL(doorganize); /**/ #endif /* DUMB */ -#ifdef OVL1 static int NDECL((*timed_occ_fn)); -#endif /* OVL1 */ STATIC_PTR int NDECL(doprev_message); STATIC_PTR int NDECL(timed_occupation); @@ -143,13 +141,11 @@ STATIC_PTR int NDECL(doattributes); STATIC_PTR int NDECL(doconduct); /**/ STATIC_PTR boolean NDECL(minimal_enlightenment); -#ifdef OVLB STATIC_DCL void FDECL(enlght_line, (const char *,const char *,const char *)); STATIC_DCL char *FDECL(enlght_combatinc, (const char *,int,int,char *)); #ifdef UNIX static void NDECL(end_of_input); #endif -#endif /* OVLB */ static const char* readchar_queue=""; static coord clicklook_cc; @@ -157,8 +153,6 @@ static coord clicklook_cc; STATIC_DCL char *NDECL(parse); STATIC_DCL boolean FDECL(help_dir, (CHAR_P,const char *)); -#ifdef OVL1 - STATIC_PTR int doprev_message() { @@ -280,9 +274,6 @@ char ch; } #endif /* REDO */ -#endif /* OVL1 */ -#ifdef OVLB - STATIC_PTR int doextcmd() /* here after # - now read a full-word command */ { @@ -1335,9 +1326,6 @@ int final; destroy_nhwindow(en_win); } -#endif /* OVLB */ -#ifdef OVL1 - #ifndef M # ifndef NHSTDC # define M(c) (0x80 | (c)) @@ -2153,9 +2141,6 @@ const char *msg; return TRUE; } -#endif /* OVL1 */ -#ifdef OVLB - void confdir() { @@ -2165,9 +2150,6 @@ confdir() return; } -#endif /* OVLB */ -#ifdef OVL0 - int isok(x,y) register int x, y; @@ -2355,9 +2337,6 @@ parse() return(in_line); } -#endif /* OVL0 */ -#ifdef OVLB - #ifdef UNIX static void @@ -2373,9 +2352,6 @@ end_of_input() } #endif -#endif /* OVLB */ -#ifdef OVL0 - char readchar() { @@ -2496,8 +2472,6 @@ wiz_port_debug() } # endif /*PORT_DEBUG*/ -#endif /* OVL0 */ -#ifdef OVLB /* * Parameter validator for generic yes/no function to prevent * the core from sending too long a prompt string to the @@ -2522,6 +2496,5 @@ char def; Strcat(qbuf,"..."); return (*windowprocs.win_yn_function)(qbuf, resp, def); } -#endif /*cmd.c*/ diff --git a/src/dbridge.c b/src/dbridge.c index 020ee3273..8f21326af 100644 --- a/src/dbridge.c +++ b/src/dbridge.c @@ -12,7 +12,6 @@ #include "hack.h" -#ifdef OVLB STATIC_DCL void FDECL(get_wall_for_db, (int *, int *)); STATIC_DCL struct entity *FDECL(e_at, (int, int)); STATIC_DCL void FDECL(m_to_e, (struct monst *, int, int, struct entity *)); @@ -29,9 +28,6 @@ STATIC_DCL boolean FDECL(automiss, (struct entity *)); STATIC_DCL boolean FDECL(e_missed, (struct entity *, BOOLEAN_P)); STATIC_DCL boolean FDECL(e_jumps, (struct entity *)); STATIC_DCL void FDECL(do_entity, (struct entity *)); -#endif /* OVLB */ - -#ifdef OVL0 boolean is_pool(x,y) @@ -75,10 +71,6 @@ int x,y; return FALSE; } -#endif /* OVL0 */ - -#ifdef OVL1 - /* * We want to know whether a wall (or a door) is the portcullis (passageway) * of an eventual drawbridge. @@ -150,9 +142,6 @@ int *x,*y; return FALSE; } -#endif /* OVL1 */ -#ifdef OVLB - /* * Find the drawbridge wall associated with a drawbridge. */ @@ -928,6 +917,4 @@ int x,y; } } -#endif /* OVLB */ - /*dbridge.c*/ diff --git a/src/dig.c b/src/dig.c index 024175eee..09365c5fc 100644 --- a/src/dig.c +++ b/src/dig.c @@ -6,8 +6,6 @@ #include "edog.h" /* #define DEBUG */ /* turn on for diagnostics */ -#ifdef OVLB - static NEARDATA boolean did_dig_msg; STATIC_DCL boolean NDECL(rm_waslit); @@ -1062,9 +1060,6 @@ watch_dig(mtmp, x, y, zap) } } -#endif /* OVLB */ -#ifdef OVL0 - /* Return TRUE if monster died, FALSE otherwise. Called from m_move(). */ boolean mdig_tunnel(mtmp) @@ -1138,9 +1133,6 @@ register struct monst *mtmp; return FALSE; } -#endif /* OVL0 */ -#ifdef OVL3 - /* digging via wand zap or spell cast */ void zap_dig() @@ -1663,8 +1655,6 @@ wiz_debug_cmd() /* in this case, bury everything at your loc and around */ if (isok(x,y)) bury_objs(x,y); return 0; } - #endif /* DEBUG */ -#endif /* OVL3 */ /*dig.c*/ diff --git a/src/do.c b/src/do.c index 86b90a34b..0bd93348c 100644 --- a/src/do.c +++ b/src/do.c @@ -8,25 +8,17 @@ #include "lev.h" #ifdef SINKS -# ifdef OVLB STATIC_DCL void FDECL(trycall, (struct obj *)); -# endif /* OVLB */ STATIC_DCL void FDECL(dosinkring, (struct obj *)); #endif /* SINKS */ STATIC_PTR int FDECL(drop, (struct obj *)); STATIC_PTR int NDECL(wipeoff); -#ifdef OVL0 STATIC_DCL int FDECL(menu_drop, (int)); -#endif -#ifdef OVL2 STATIC_DCL int NDECL(currentlevel_rewrite); STATIC_DCL void NDECL(final_level); /* static boolean FDECL(badspot, (XCHAR_P,XCHAR_P)); */ -#endif - -#ifdef OVLB static NEARDATA const char drop_types[] = { ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, 0 }; @@ -49,9 +41,6 @@ dodrop() return result; } -#endif /* OVLB */ -#ifdef OVL0 - /* Called when a boulder is dropped, thrown, or pushed. If it ends up * in a pool, it either fills the pool up or sinks away. In either case, * it's gone for good... If the destination is not a pool, returns FALSE. @@ -210,9 +199,6 @@ const char *verb; return FALSE; } -#endif /* OVL0 */ -#ifdef OVLB - void doaltarobj(obj) /* obj is an object dropped on an altar */ register struct obj *obj; @@ -389,9 +375,6 @@ giveback: } #endif -#endif /* OVLB */ -#ifdef OVL0 - /* some common tests when trying to drop or throw items */ boolean canletgo(obj,word) @@ -722,9 +705,6 @@ int retry; return n_dropped; } -#endif /* OVL0 */ -#ifdef OVL2 - /* on a ladder, used in goto_level */ static NEARDATA boolean at_ladder = FALSE; @@ -1452,9 +1432,6 @@ deferred_goto() free((genericptr_t)dfr_post_msg), dfr_post_msg = 0; } -#endif /* OVL2 */ -#ifdef OVL3 - /* * Return TRUE if we created a monster for the corpse. If successful, the * corpse is gone. @@ -1567,9 +1544,6 @@ donull() return(1); /* Do nothing, but let other things happen */ } -#endif /* OVL3 */ -#ifdef OVLB - STATIC_PTR int wipeoff() { @@ -1658,6 +1632,4 @@ heal_legs() (void)encumber_msg(); } -#endif /* OVLB */ - /*do.c*/ diff --git a/src/do_name.c b/src/do_name.c index 0b276bb87..27815639b 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -4,8 +4,6 @@ #include "hack.h" -#ifdef OVLB - STATIC_DCL void FDECL(do_oname, (struct obj *)); static void FDECL(getpos_help, (BOOLEAN_P,const char *)); @@ -528,9 +526,6 @@ register struct obj *obj; } } -#endif /*OVLB*/ -#ifdef OVL0 - static const char * const ghostnames[] = { /* these names should have length < PL_NSIZ */ /* Capitalize the names for aesthetics -dgk */ @@ -750,9 +745,6 @@ boolean called; } } -#endif /* OVL0 */ -#ifdef OVLB - char * l_monnam(mtmp) register struct monst *mtmp; @@ -761,9 +753,6 @@ register struct monst *mtmp; mtmp->mnamelth ? SUPPRESS_SADDLE : 0, TRUE)); } -#endif /* OVLB */ -#ifdef OVL0 - char * mon_nam(mtmp) register struct monst *mtmp; @@ -831,9 +820,6 @@ struct monst *mtmp; return x_monnam(mtmp, prefix, (char *)0, suppression_flag, FALSE); } -#endif /* OVL0 */ -#ifdef OVLB - char * Adjmonnam(mtmp, adj) register struct monst *mtmp; @@ -978,9 +964,6 @@ roguename() /* Name of a Rogue player */ : "Glenn Wichman"; } #endif /* REINCARNATION */ -#endif /* OVLB */ - -#ifdef OVL2 static NEARDATA const char * const hcolors[] = { "ultraviolet", "infrared", "bluish-orange", @@ -1039,6 +1022,5 @@ char *buf; } return buf; } -#endif /* OVL2 */ /*do_name.c*/ diff --git a/src/do_wear.c b/src/do_wear.c index e6e653b06..fab517fd2 100644 --- a/src/do_wear.c +++ b/src/do_wear.c @@ -4,12 +4,6 @@ #include "hack.h" -#ifndef OVLB - -STATIC_DCL long takeoff_mask, taking_off; - -#else /* OVLB */ - STATIC_OVL NEARDATA long takeoff_mask = 0L; static NEARDATA long taking_off = 0L; @@ -1512,10 +1506,6 @@ doputon() return(1); } -#endif /* OVLB */ - -#ifdef OVL0 - void find_ac() { @@ -1541,9 +1531,6 @@ find_ac() } } -#endif /* OVL0 */ -#ifdef OVLB - void glibr() { @@ -2097,6 +2084,4 @@ register schar delta; } } -#endif /* OVLB */ - /*do_wear.c*/ diff --git a/src/dog.c b/src/dog.c index d16173858..86ca0b58b 100644 --- a/src/dog.c +++ b/src/dog.c @@ -5,8 +5,6 @@ #include "hack.h" #include "edog.h" -#ifdef OVLB - STATIC_DCL int NDECL(pet_type); void @@ -443,9 +441,6 @@ long nmv; /* number of moves */ else mtmp->mhp += imv; } -#endif /* OVLB */ -#ifdef OVL2 - /* called when you move to another level */ void keepdogs(pets_only) @@ -545,9 +540,6 @@ boolean pets_only; /* true for ascension or final escape */ } } -#endif /* OVL2 */ -#ifdef OVLB - void migrate_to_level(mtmp, tolev, xyloc, cc) register struct monst *mtmp; @@ -604,9 +596,6 @@ migrate_to_level(mtmp, tolev, xyloc, cc) mtmp->mx = mtmp->my = 0; /* this implies migration */ } -#endif /* OVLB */ -#ifdef OVL1 - /* return quality of food; the lower the better */ /* fungi will eat even tainted food */ int @@ -705,9 +694,6 @@ register struct obj *obj; } } -#endif /* OVL1 */ -#ifdef OVLB - struct monst * tamedog(mtmp, obj) register struct monst *mtmp; @@ -901,6 +887,4 @@ struct monst *mtmp; } } -#endif /* OVLB */ - /*dog.c*/ diff --git a/src/dogmove.c b/src/dogmove.c index e51b15ea2..c4847c70e 100644 --- a/src/dogmove.c +++ b/src/dogmove.c @@ -9,8 +9,6 @@ extern boolean notonhead; -#ifdef OVL0 - STATIC_DCL boolean FDECL(dog_hunger,(struct monst *,struct edog *)); STATIC_DCL int FDECL(dog_invent,(struct monst *,struct edog *,int)); STATIC_DCL int FDECL(dog_goal,(struct monst *,struct edog *,int,int,int)); @@ -48,15 +46,12 @@ register struct monst *mon; static NEARDATA const char nofetch[] = { BALL_CLASS, CHAIN_CLASS, ROCK_CLASS, 0 }; -#endif /* OVL0 */ - STATIC_OVL boolean FDECL(cursed_object_at, (int, int)); STATIC_VAR xchar gtyp, gx, gy; /* type and position of dog's current goal */ STATIC_PTR void FDECL(wantdoor, (int, int, genericptr_t)); -#ifdef OVLB STATIC_OVL boolean cursed_object_at(x, y) int x, y; @@ -204,9 +199,6 @@ boolean devour; return 1; } -#endif /* OVLB */ -#ifdef OVL0 - /* hunger effects -- returns TRUE on starvation */ STATIC_OVL boolean dog_hunger(mtmp, edog) @@ -832,9 +824,6 @@ xchar mx, my, fx, fy; return FALSE; } -#endif /* OVL0 */ -#ifdef OVLB - /*ARGSUSED*/ /* do_clear_area client */ STATIC_PTR void wantdoor(x, y, distance) @@ -850,6 +839,4 @@ genericptr_t distance; } } -#endif /* OVLB */ - /*dogmove.c*/ diff --git a/src/dungeon.c b/src/dungeon.c index 9a2bec388..9bee48303 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -6,8 +6,6 @@ #include "dgn_file.h" #include "dlb.h" -#ifdef OVL1 - #define DUNGEON_FILE "dungeon" #define X_START "x-strt" @@ -986,9 +984,6 @@ xchar ledgerno; return((xchar)(ledgerno - dungeons[ledger_to_dnum(ledgerno)].ledger_start)); } -#endif /* OVL1 */ -#ifdef OVL0 - /* returns the depth of a level, in floors below the surface */ /* (note levels in different dungeons can have the same depth). */ schar @@ -1005,9 +1000,6 @@ d_level *lev1, *lev2; return((boolean)((lev1->dnum == lev2->dnum) && (lev1->dlevel == lev2->dlevel))); } -#endif /* OVL0 */ -#ifdef OVL1 - /* is this level referenced in the special level chain? */ s_level * Is_special(lev) @@ -1253,9 +1245,6 @@ int levnum; newlevel->dlevel = levnum; } -#endif /* OVL1 */ -#ifdef OVL0 - boolean In_quest(lev) /* are you in the quest dungeon? */ d_level *lev; @@ -1263,9 +1252,6 @@ d_level *lev; return((boolean)(lev->dnum == quest_dnum)); } -#endif /* OVL0 */ -#ifdef OVL1 - boolean In_mines(lev) /* are you in the mines dungeon? */ d_level *lev; @@ -1352,9 +1338,6 @@ d_level *lev; return FALSE; } -#endif /* OVL1 */ -#ifdef OVL0 - boolean In_hell(lev) /* are you in one of the Hell levels? */ d_level *lev; @@ -1362,9 +1345,6 @@ d_level *lev; return((boolean)(dungeons[lev->dnum].flags.hellish)); } -#endif /* OVL0 */ -#ifdef OVL1 - void find_hell(lev) /* sets *lev to be the gateway to Gehennom... */ d_level *lev; @@ -1405,9 +1385,6 @@ int range; dest->dlevel = 1; } -#endif /* OVL1 */ -#ifdef OVL0 - int induced_align(pct) int pct; @@ -1425,9 +1402,6 @@ int pct; return(Align2amask(al)); } -#endif /* OVL0 */ -#ifdef OVL1 - boolean Invocation_lev(lev) d_level *lev; @@ -1721,6 +1695,4 @@ boolean bymenu; } #endif /* WIZARD */ -#endif /* OVL1 */ - /*dungeon.c*/ diff --git a/src/eat.c b/src/eat.c index 79e235a88..6b748c3cc 100644 --- a/src/eat.c +++ b/src/eat.c @@ -18,7 +18,6 @@ STATIC_PTR int NDECL(eatfood); STATIC_PTR int NDECL(opentin); STATIC_PTR int NDECL(unfaint); -#ifdef OVLB STATIC_DCL const char *FDECL(food_xname, (struct obj *,BOOLEAN_P)); STATIC_DCL void FDECL(choke, (struct obj *)); STATIC_DCL void NDECL(recalc_wt); @@ -45,8 +44,6 @@ STATIC_DCL const char *FDECL(foodword, (struct obj *)); char msgbuf[BUFSZ]; -#endif /* OVLB */ - /* hunger texts used on bottom line (each 8 chars long) */ #define SATIATED 0 #define NOT_HUNGRY 1 @@ -59,14 +56,6 @@ char msgbuf[BUFSZ]; /* also used to see if you're allowed to eat cats and dogs */ #define CANNIBAL_ALLOWED() (Role_if(PM_CAVEMAN) || Race_if(PM_ORC)) -#ifndef OVLB - -STATIC_DCL NEARDATA const char comestibles[]; -STATIC_DCL NEARDATA const char allobj[]; -STATIC_DCL boolean force_save_hs; - -#else - STATIC_OVL NEARDATA const char comestibles[] = { FOOD_CLASS, 0 }; /* Gold must come first for getobj(). */ @@ -87,9 +76,6 @@ const char *hu_stat[] = { "Starved " }; -#endif /* OVLB */ -#ifdef OVL1 - /* * Decide whether a particular object can be eaten by the possibly * polymorphed character. Not used for monster checks. @@ -118,9 +104,6 @@ register struct obj *obj; return (boolean)(obj->oclass == FOOD_CLASS); } -#endif /* OVL1 */ -#ifdef OVLB - void init_uhunger() { @@ -2097,9 +2080,6 @@ bite() return 0; } -#endif /* OVLB */ -#ifdef OVL0 - void gethungry() /* as time goes by - called by moveloop() and domove() */ { @@ -2141,9 +2121,6 @@ gethungry() /* as time goes by - called by moveloop() and domove() */ newuhs(TRUE); } -#endif /* OVL0 */ -#ifdef OVLB - void morehungry(num) /* called after vomiting and after performing feats of magic */ register int num; @@ -2210,9 +2187,6 @@ unfaint() return 0; } -#endif /* OVLB */ -#ifdef OVL0 - boolean is_fainted() { @@ -2369,9 +2343,6 @@ boolean incr; } } -#endif /* OVL0 */ -#ifdef OVLB - /* Returns an object representing food. Object may be either on floor or * in inventory. */ @@ -2541,9 +2512,6 @@ int amt; } } -#endif /* OVLB */ -#ifdef OVL1 - /* called when eatfood occupation has been interrupted, or in the case of theft, is about to be interrupted */ boolean @@ -2559,6 +2527,4 @@ boolean stopping; return FALSE; } -#endif /* OVL1 */ - /*eat.c*/ diff --git a/src/engrave.c b/src/engrave.c index a72b327fd..d79f7876a 100644 --- a/src/engrave.c +++ b/src/engrave.c @@ -8,7 +8,6 @@ STATIC_VAR NEARDATA struct engr *head_engr; -#ifdef OVLB /* random engravings */ static const char *random_mesg[] = { "Elbereth", @@ -141,8 +140,6 @@ can_reach_floor() (!Levitation || Is_airlevel(&u.uz) || Is_waterlevel(&u.uz))); } -#endif /* OVLB */ -#ifdef OVL0 const char * surface(x, y) @@ -236,9 +233,6 @@ sengr_at(s, x, y) } #endif /* ELBERETH */ -#endif /* OVL0 */ -#ifdef OVL2 - void u_wipe_engr(cnt) register int cnt; @@ -247,9 +241,6 @@ register int cnt; wipe_engr_at(u.ux, u.uy, cnt); } -#endif /* OVL2 */ -#ifdef OVL1 - void wipe_engr_at(x,y,cnt) register xchar x,y,cnt; @@ -270,9 +261,6 @@ register xchar x,y,cnt; } } -#endif /* OVL1 */ -#ifdef OVL2 - void read_engr_at(x,y) register int x,y; @@ -348,9 +336,6 @@ register int x,y; } } -#endif /* OVL2 */ -#ifdef OVLB - void make_engr_at(x,y,s,e_time,e_type) register int x,y; @@ -1253,7 +1238,4 @@ const char *str; return; } - -#endif /* OVLB */ - /*engrave.c*/ diff --git a/src/explode.c b/src/explode.c index 8671a2c1d..00a9f3da3 100644 --- a/src/explode.c +++ b/src/explode.c @@ -4,8 +4,6 @@ #include "hack.h" -#ifdef OVL0 - /* Note: Arrays are column first, while the screen is row first */ static int expl[3][3] = { { S_explode1, S_explode4, S_explode7 }, @@ -376,8 +374,6 @@ int expltype; if (i < 50) i = 50; /* in case random damage is very small */ wake_nearto(x, y, i); } -#endif /* OVL0 */ -#ifdef OVL1 struct scatter_chain { struct scatter_chain *next; /* pointer to next scatter item */ @@ -575,6 +571,4 @@ splatter_burning_oil(x, y) explode(x, y, ZT_SPELL_O_FIRE, d(4,4), BURNING_OIL, EXPL_FIERY); } -#endif /* OVL1 */ - /*explode.c*/ diff --git a/src/hack.c b/src/hack.c index f50a49d42..a71997217 100644 --- a/src/hack.c +++ b/src/hack.c @@ -4,9 +4,7 @@ #include "hack.h" -#ifdef OVL1 STATIC_DCL void NDECL(maybe_wail); -#endif /*OVL1*/ STATIC_DCL int NDECL(moverock); STATIC_DCL int FDECL(still_chewing,(XCHAR_P,XCHAR_P)); #ifdef SINKS @@ -19,8 +17,6 @@ STATIC_DCL void FDECL(move_update, (BOOLEAN_P)); #define IS_SHOP(x) (rooms[x].rtype >= SHOPBASE) -#ifdef OVL2 - boolean revive_nasty(x, y, msg) int x,y; @@ -429,9 +425,6 @@ still_chewing(x,y) return 0; } -#endif /* OVL2 */ -#ifdef OVLB - void movobj(obj, ox, oy) register struct obj *obj; @@ -516,9 +509,6 @@ register xchar x,y; (levl[x][y].wall_info & W_NONPASSWALL))); } -#endif /* OVLB */ -#ifdef OVL1 - boolean bad_rock(mdat,x,y) struct permonst *mdat; @@ -537,9 +527,6 @@ xchar x, y; return((boolean)(Invocation_lev(&u.uz) && x == inv_pos.x && y == inv_pos.y)); } -#endif /* OVL1 */ -#ifdef OVL3 - /* return TRUE if (dx,dy) is an OK place to move * mode is one of DO_MOVE, TEST_MOVE or TEST_TRAV */ @@ -1430,9 +1417,6 @@ invocation_message() } } -#endif /* OVL3 */ -#ifdef OVL2 - void spoteffects(pick) boolean pick; @@ -1804,9 +1788,6 @@ register boolean newlev; return; } -#endif /* OVL2 */ -#ifdef OVLB - int dopickup() { @@ -1867,9 +1848,6 @@ dopickup() return (pickup(-count)); } -#endif /* OVLB */ -#ifdef OVL2 - /* stop running if we see something interesting */ /* turn around a corner if that is the only way we can proceed */ /* do not turn left or right twice */ @@ -2049,9 +2027,6 @@ const char *msg_override; afternmv = 0; } -#endif /* OVL2 */ -#ifdef OVL1 - STATIC_OVL void maybe_wail() { @@ -2225,9 +2200,6 @@ const char *str; return 0; } -#endif /* OVL1 */ -#ifdef OVLB - int inv_cnt() { @@ -2258,6 +2230,5 @@ struct obj *otmp; return 0; } #endif -#endif /* OVLB */ /*hack.c*/ diff --git a/src/hacklib.c b/src/hacklib.c index 0d082705a..8cba8ca9c 100644 --- a/src/hacklib.c +++ b/src/hacklib.c @@ -50,7 +50,6 @@ NetHack, except that rounddiv may call panic(). # define Static static #endif -#ifdef OVLB boolean digit(c) /* is 'c' a digit? */ char c; @@ -64,9 +63,7 @@ letter(c) /* is 'c' a letter? note: '@' classed as letter */ { return((boolean)(('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z'))); } -#endif /* OVLB */ -#ifdef OVL1 char highc(c) /* force 'c' into uppercase */ char c; @@ -80,9 +77,7 @@ lowc(c) /* force 'c' into lowercase */ { return((char)(('A' <= c && c <= 'Z') ? (c | 040) : c)); } -#endif /* OVL1 */ -#ifdef OVLB char * lcase(s) /* convert a string into all lowercase */ char *s; @@ -120,9 +115,6 @@ char *bp; return bp; } -#endif /* OVLB */ - -#ifdef OVL0 char * eos(s) /* return the end of a string (pointing at '\0') */ register char *s; @@ -177,9 +169,7 @@ char *buf; *q = '\0'; return buf; } -#endif /* OVL0 */ -#ifdef OVL2 boolean onlyspace(s) /* is a string entirely whitespace? */ const char *s; @@ -188,9 +178,7 @@ onlyspace(s) /* is a string entirely whitespace? */ if (*s != ' ' && *s != '\t') return FALSE; return TRUE; } -#endif /* OVL2 */ -#ifdef OVLB char * tabexpand(sbuf) /* expand tabs into proper number of spaces */ char *sbuf; @@ -234,9 +222,7 @@ visctrl(c) /* make a displayable string from a character */ } return ccc; } -#endif /* OVLB */ -#ifdef OVL2 const char * ordin(n) /* return the ordinal suffix of a number */ int n; /* note: should be non-negative */ @@ -246,9 +232,7 @@ ordin(n) /* return the ordinal suffix of a number */ return (dd == 0 || dd > 3 || (n % 100) / 10 == 1) ? "th" : (dd == 1) ? "st" : (dd == 2) ? "nd" : "rd"; } -#endif /* OVL2 */ -#ifdef OVL1 char * sitoa(n) /* make a signed digit string from a number */ int n; @@ -265,9 +249,7 @@ sgn(n) /* return the sign of a number: -1, 0, or 1 */ { return (n < 0) ? -1 : (n != 0); } -#endif /* OVL1 */ -#ifdef OVLB int rounddiv(x, y) /* calculate x/y, rounding as appropriate */ long x; @@ -290,9 +272,7 @@ rounddiv(x, y) /* calculate x/y, rounding as appropriate */ return divsgn * r; } -#endif /* OVLB */ -#ifdef OVL0 int distmin(x0, y0, x1, y1) /* distance between two points, in moves */ int x0, y0, x1, y1; @@ -325,9 +305,6 @@ online2(x0, y0, x1, y1) /* are two points lined up (on a straight line)? */ return((boolean)(!dy || !dx || (dy == dx) || (dy + dx == 0))); /* (dy == -dx) */ } -#endif /* OVL0 */ -#ifdef OVLB - boolean pmatch(patrn, strng) /* match a string against a pattern */ const char *patrn, *strng; @@ -349,9 +326,7 @@ pmatch_top: else /* return pmatch(patrn, strng); */ goto pmatch_top; /* optimize tail recursion */ } -#endif /* OVLB */ -#ifdef OVL2 #ifndef STRNCMPI int strncmpi(s1, s2, n) /* case insensitive counted string comparison */ @@ -370,9 +345,7 @@ strncmpi(s1, s2, n) /* case insensitive counted string comparison */ return 0; /* s1 == s2 */ } #endif /* STRNCMPI */ -#endif /* OVL2 */ -#ifdef OVLB #ifndef STRSTRI char * @@ -438,9 +411,6 @@ fuzzymatch(s1, s2, ignore_chars, caseblind) return (boolean)(!c1 && !c2); } -#endif /* OVLB */ -#ifdef OVL2 - /* * Time routines * @@ -610,6 +580,5 @@ midnight() { return(getlt()->tm_hour == 0); } -#endif /* OVL2 */ /*hacklib.c*/ diff --git a/src/invent.c b/src/invent.c index 2614d68ba..f1853aff2 100644 --- a/src/invent.c +++ b/src/invent.c @@ -7,30 +7,24 @@ #define NOINVSYM '#' #define CONTAINED_SYM '>' /* designator for inside a container */ -#ifdef OVL1 STATIC_DCL void NDECL(reorder_invent); STATIC_DCL boolean FDECL(mergable,(struct obj *,struct obj *)); STATIC_DCL void FDECL(invdisp_nothing, (const char *,const char *)); STATIC_DCL boolean FDECL(worn_wield_only, (struct obj *)); STATIC_DCL boolean FDECL(only_here, (struct obj *)); -#endif /* OVL1 */ STATIC_DCL void FDECL(compactify,(char *)); STATIC_DCL boolean FDECL(taking_off, (const char *)); STATIC_DCL boolean FDECL(putting_on, (const char *)); STATIC_PTR int FDECL(ckunpaid,(struct obj *)); STATIC_PTR int FDECL(ckvalidcat,(struct obj *)); static char FDECL(display_pickinv, (const char *,BOOLEAN_P, long *)); -#ifdef OVLB STATIC_DCL boolean FDECL(this_type_only, (struct obj *)); STATIC_DCL void NDECL(dounpaid); STATIC_DCL struct obj *FDECL(find_unpaid,(struct obj *,struct obj **)); STATIC_DCL void FDECL(menu_identify, (int)); STATIC_DCL boolean FDECL(tool_in_use, (struct obj *)); -#endif /* OVLB */ STATIC_DCL char FDECL(obj_to_let,(struct obj *)); -#ifdef OVLB - static int lastinvnr = 51; /* 0 ... 51 (never saved&restored) */ #ifdef WIZARD @@ -79,9 +73,6 @@ register struct obj *otmp; lastinvnr = i; } -#endif /* OVLB */ -#ifdef OVL1 - /* note: assumes ASCII; toggling a bit puts lowercase in front of uppercase */ #define inv_rank(o) ((o)->invlet ^ 040) @@ -360,9 +351,6 @@ struct obj *obj; } } -#endif /* OVL1 */ -#ifdef OVLB - /* Add an item to the inventory unless we're fumbling or it refuses to be * held (via touch_artifact), and give a message. * If there aren't any free inventory slots, we'll drop it instead. @@ -475,9 +463,6 @@ boolean maybe_unpaid; /* false if caller handles shop billing */ if (obj->known) update_inventory(); } -#endif /* OVLB */ -#ifdef OVL3 - /* Adjust hero's attributes as if this object was being removed from the hero's inventory. This should only be called from freeinv() and @@ -554,9 +539,6 @@ int x, y; } } -#endif /* OVL3 */ -#ifdef OVL2 - /* destroy object in fobj chain (if unpaid, it remains on the bill) */ void delobj(obj) @@ -581,9 +563,6 @@ register struct obj *obj; obfree(obj, (struct obj *) 0); /* frees contents also */ } -#endif /* OVL2 */ -#ifdef OVL0 - struct obj * sobj_at(n,x,y) register int n, x, y; @@ -596,9 +575,6 @@ register int n, x, y; return((struct obj *)0); } -#endif /* OVL0 */ -#ifdef OVLB - struct obj * carrying(type) register int type; @@ -658,9 +634,6 @@ int x, y; return(FALSE); } -#endif /* OVLB */ -#ifdef OVL2 - struct obj * g_at(x,y) register int x, y; @@ -673,8 +646,6 @@ register int x, y; return((struct obj *)0); } -#endif /* OVL2 */ -#ifdef OVLB #ifndef GOLDOBJ /* Make a gold object from the hero's gold. */ struct obj * @@ -691,8 +662,6 @@ register long q; return(otmp); } #endif -#endif /* OVLB */ -#ifdef OVL1 STATIC_OVL void compactify(buf) @@ -1125,9 +1094,6 @@ struct obj *otmp; } } -#endif /* OVL1 */ -#ifdef OVLB - STATIC_PTR int ckvalidcat(otmp) register struct obj *otmp; @@ -1553,9 +1519,6 @@ int id_limit; update_inventory(); } -#endif /* OVLB */ -#ifdef OVL2 - STATIC_OVL char obj_to_let(obj) /* should of course only be called for things in invent */ register struct obj *obj; @@ -1587,9 +1550,6 @@ long quan; xprname(obj, (char *)0, obj_to_let(obj), TRUE, 0L, quan)); } -#endif /* OVL2 */ -#ifdef OVL1 - char * xprname(obj, txt, let, dot, cost, quan) struct obj *obj; @@ -1638,9 +1598,6 @@ long quan; /* if non-0, print this quantity, not obj->quan */ return li; } -#endif /* OVL1 */ -#ifdef OVLB - /* the 'i' command */ int ddoinv() @@ -2300,9 +2257,6 @@ boolean force_touch; } } -#endif /* OVLB */ -#ifdef OVL1 - void stackobj(obj) struct obj *obj; @@ -2413,9 +2367,6 @@ doprgold() return 0; } -#endif /* OVL1 */ -#ifdef OVLB - int doprwep() { @@ -2558,11 +2509,6 @@ long numused; u.uundetected = OBJ_AT(u.ux, u.uy); } -#endif /* OVLB */ - - -#ifdef OVL1 - /* * Conversion from a class to a string for printing. * This must match the object class order. @@ -2623,9 +2569,6 @@ free_invbuf() invbufsiz = 0; } -#endif /* OVL1 */ -#ifdef OVLB - void reassign() { @@ -2637,9 +2580,6 @@ reassign() lastinvnr = i; } -#endif /* OVLB */ -#ifdef OVL1 - int doorganize() /* inventory organizer by Del Lamb */ { @@ -2927,6 +2867,4 @@ boolean as_if_seen; return n; } -#endif /* OVL1 */ - /*invent.c*/ diff --git a/src/light.c b/src/light.c index d0029e78f..b3d3b452f 100644 --- a/src/light.c +++ b/src/light.c @@ -38,8 +38,6 @@ * across saves and restores. */ -#ifdef OVL3 - /* flags */ #define LSF_SHOW 0x1 /* display the light source */ #define LSF_NEEDS_FIXUP 0x2 /* need oid fixup */ @@ -621,6 +619,4 @@ wiz_light_sources() #endif /* WIZARD */ -#endif /* OVL3 */ - /*light.c*/ diff --git a/src/lock.c b/src/lock.c index 4d5d333c5..5ceabde2b 100644 --- a/src/lock.c +++ b/src/lock.c @@ -14,8 +14,6 @@ STATIC_VAR NEARDATA struct xlock_s { int picktyp, chance, usedtime; } xlock; -#ifdef OVLB - STATIC_DCL const char *NDECL(lock_action); STATIC_DCL boolean FDECL(obstructed,(int,int)); STATIC_DCL void FDECL(chest_shatter_msg, (struct obj *)); @@ -208,9 +206,6 @@ forcelock() /* try to force a locked chest */ return((xlock.usedtime = 0)); } -#endif /* OVLB */ -#ifdef OVL0 - void reset_pick() { @@ -219,9 +214,6 @@ reset_pick() xlock.box = 0; } -#endif /* OVL0 */ -#ifdef OVLB - int pick_lock(pick) /* pick a lock with a given object */ register struct obj *pick; @@ -916,6 +908,4 @@ struct obj *otmp; pline("%s %s!", An(thing), disposition); } -#endif /* OVLB */ - /*lock.c*/ diff --git a/src/mail.c b/src/mail.c index 99d7637f9..19fbb4cf6 100644 --- a/src/mail.c +++ b/src/mail.c @@ -38,15 +38,10 @@ STATIC_DCL void FDECL(newmail, (struct mail_info *)); extern char *viz_rmin, *viz_rmax; /* line-of-sight limits (vision.c) */ -#ifdef OVL0 - # if !defined(UNIX) && !defined(VMS) && !defined(LAN_MAIL) int mustgetmail = -1; # endif -#endif /* OVL0 */ -#ifdef OVLB - # ifdef UNIX #include #include @@ -117,9 +112,6 @@ getmailstatus() } # endif /* UNIX */ -#endif /* OVLB */ -#ifdef OVL0 - /* * Pick coordinates for a starting position for the mail daemon. Called * from newmail() and newphone(). @@ -618,8 +610,6 @@ struct obj *otmp; # endif /* LAN_MAIL */ -#endif /* OVL0 */ - #endif /* MAIL */ /*mail.c*/ diff --git a/src/makemon.c b/src/makemon.c index 8e936ba0e..7b7dda6a5 100644 --- a/src/makemon.c +++ b/src/makemon.c @@ -19,17 +19,13 @@ STATIC_VAR NEARDATA struct monst zeromonst; (mptr->mlet == S_HUMAN && Role_if(role_pm) && \ (mptr->msound == MS_LEADER || mptr->msound == MS_NEMESIS)) -#ifdef OVL0 STATIC_DCL boolean FDECL(uncommon, (int)); STATIC_DCL int FDECL(align_shift, (struct permonst *)); -#endif /* OVL0 */ STATIC_DCL boolean FDECL(wrong_elem_type, (struct permonst *)); STATIC_DCL void FDECL(m_initgrp,(struct monst *,int,int,int)); STATIC_DCL void FDECL(m_initthrow,(struct monst *,int,int)); STATIC_DCL void FDECL(m_initweap,(struct monst *)); -#ifdef OVL1 STATIC_DCL void FDECL(m_initinv,(struct monst *)); -#endif /* OVL1 */ extern const int monstr[]; @@ -38,7 +34,6 @@ extern const int monstr[]; #define toostrong(monindx, lev) (monstr[monindx] > lev) #define tooweak(monindx, lev) (monstr[monindx] < lev) -#ifdef OVLB boolean is_home_elemental(ptr) register struct permonst *ptr; @@ -157,9 +152,6 @@ int otyp,oquan; (void) mpickobj(mtmp, otmp); } -#endif /* OVLB */ -#ifdef OVL2 - STATIC_OVL void m_initweap(mtmp) register struct monst *mtmp; @@ -465,9 +457,6 @@ register struct monst *mtmp; (void) mongets(mtmp, rnd_offensive_item(mtmp)); } -#endif /* OVL2 */ -#ifdef OVL1 - #ifdef GOLDOBJ /* * Makes up money for monster's inventory. @@ -1101,9 +1090,6 @@ struct permonst *mptr; /* usually null; used for confused reading */ return known; } -#endif /* OVL1 */ -#ifdef OVL0 - STATIC_OVL boolean uncommon(mndx) int mndx; @@ -1254,9 +1240,6 @@ int mndx; /* particular species that can no longer be created */ } /* note: safe to ignore extinction of unique monsters */ } -#endif /* OVL0 */ -#ifdef OVL1 - /* The routine below is used to make one of the multiple types * of a given monster class. The second parameter specifies a * special casing bit mask to allow the normal genesis @@ -1343,9 +1326,6 @@ register struct permonst *ptr; return((tmp > tmp2) ? tmp2 : (tmp > 0 ? tmp : 0)); /* 0 lower limit */ } -#endif /* OVL1 */ -#ifdef OVLB - struct permonst * grow_up(mtmp, victim) /* `mtmp' might "grow up" into a bigger version */ struct monst *mtmp, *victim; @@ -1435,9 +1415,6 @@ struct monst *mtmp, *victim; return ptr; } -#endif /* OVLB */ -#ifdef OVL1 - int mongets(mtmp, otyp) register struct monst *mtmp; @@ -1487,9 +1464,6 @@ register int otyp; } else return(0); } -#endif /* OVL1 */ -#ifdef OVLB - int golemhp(type) int type; @@ -1510,9 +1484,6 @@ int type; } } -#endif /* OVLB */ -#ifdef OVL1 - /* * Alignment vs. yours determines monster's attitude to you. * ( some "animal" types are co-aligned, but also hungry ) @@ -1609,9 +1580,6 @@ struct monst *mtmp; mtmp->malign = abs(mal); } -#endif /* OVL1 */ -#ifdef OVLB - static NEARDATA char syms[] = { MAXOCLASSES, MAXOCLASSES+1, RING_CLASS, WAND_CLASS, WEAPON_CLASS, FOOD_CLASS, COIN_CLASS, SCROLL_CLASS, POTION_CLASS, ARMOR_CLASS, @@ -1752,6 +1720,4 @@ struct obj *bag; } } -#endif /* OVLB */ - /*makemon.c*/ diff --git a/src/mcastu.c b/src/mcastu.c index 93d3b8d33..25c9114c8 100644 --- a/src/mcastu.c +++ b/src/mcastu.c @@ -38,8 +38,6 @@ STATIC_DCL void FDECL(cast_cleric_spell,(struct monst *, int,int)); STATIC_DCL boolean FDECL(is_undirected_spell,(unsigned int,int)); STATIC_DCL boolean FDECL(spell_would_be_useless,(struct monst *,unsigned int,int)); -#ifdef OVL0 - extern const char * const flash_types[]; /* from zap.c */ /* feedback when frustrated monster couldn't cast a spell */ @@ -71,9 +69,6 @@ boolean undirected; } } -#endif /* OVL0 */ -#ifdef OVLB - /* convert a level based random selection into a specific mage spell; inappropriate choices will be screened out by spell_would_be_useless() */ STATIC_OVL int @@ -750,9 +745,6 @@ int spellnum; return FALSE; } -#endif /* OVLB */ -#ifdef OVL0 - /* convert 1..10 to 0..9; add 10 for second group (spell casting) */ #define ad_to_typ(k) (10 + (int)k - 1) @@ -783,6 +775,4 @@ buzzmu(mtmp, mattk) /* monster uses spell (ranged) */ return(1); } -#endif /* OVL0 */ - /*mcastu.c*/ diff --git a/src/mhitm.c b/src/mhitm.c index e3cbc6645..630e9faef 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -8,8 +8,6 @@ extern boolean notonhead; -#ifdef OVLB - static NEARDATA boolean vis, far_noise; static NEARDATA long noisetime; static NEARDATA struct obj *otmp; @@ -1150,11 +1148,6 @@ mdamagem(magr, mdef, mattk) return(MM_HIT); } -#endif /* OVLB */ - - -#ifdef OVL0 - int noattacks(ptr) /* returns 1 if monster doesn't attack */ struct permonst *ptr; @@ -1201,9 +1194,6 @@ struct monst *mon; } } -#endif /* OVL0 */ -#ifdef OVLB - STATIC_OVL void mrustm(magr, mdef, obj) register struct monst *magr, *mdef; @@ -1442,7 +1432,5 @@ int aatyp; return w_mask; } -#endif /* OVLB */ - /*mhitm.c*/ diff --git a/src/mhitu.c b/src/mhitu.c index 039e6dc3a..69d5c009c 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -8,16 +8,12 @@ STATIC_VAR NEARDATA struct obj *otmp; STATIC_DCL void FDECL(urustm, (struct monst *, struct obj *)); -# ifdef OVL1 STATIC_DCL boolean FDECL(u_slip_free, (struct monst *,struct attack *)); STATIC_DCL int FDECL(passiveum, (struct permonst *,struct monst *,struct attack *)); -# endif /* OVL1 */ -#ifdef OVLB -# ifdef SEDUCE +#ifdef SEDUCE STATIC_DCL void FDECL(mayberem, (struct obj *, const char *)); -# endif -#endif /* OVLB */ +#endif STATIC_DCL boolean FDECL(diseasemu, (struct permonst *)); STATIC_DCL int FDECL(hitmu, (struct monst *,struct attack *)); @@ -34,9 +30,6 @@ STATIC_DCL void FDECL(hitmsg,(struct monst *,struct attack *)); /* changed to a parameter to mhitu. */ static int dieroll; -#ifdef OVL1 - - STATIC_OVL void hitmsg(mtmp, mattk) register struct monst *mtmp; @@ -144,9 +137,6 @@ u_slow_down() exercise(A_DEX, FALSE); } -#endif /* OVL1 */ -#ifdef OVLB - STATIC_OVL void wildmiss(mtmp, mattk) /* monster attacked your displaced image */ register struct monst *mtmp; @@ -263,9 +253,6 @@ boolean message; pline("Brrooaa... You land hard at some distance."); } -#endif /* OVLB */ -#ifdef OVL0 - /* select a monster's next attack, possibly substituting for its usual one */ struct attack * getmattk(mptr, indx, prev_result, alt_attk_buf) @@ -670,9 +657,6 @@ mattacku(mtmp) return(0); } -#endif /* OVL0 */ -#ifdef OVLB - /* * helper function for some compilers that have trouble with hitmu */ @@ -736,9 +720,6 @@ int attk; } } -#endif /* OVLB */ -#ifdef OVL1 - STATIC_OVL boolean diseasemu(mdat) struct permonst *mdat; @@ -1586,9 +1567,6 @@ dopois: return res; } -#endif /* OVL1 */ -#ifdef OVLB - /* An interface for use when taking a blindfold off, for example, * to see if an engulfing attack should immediately take affect, like * a passive attack. TRUE if engulfing blindness occurred */ @@ -2020,9 +1998,6 @@ gazemu(mtmp, mattk) /* monster gazes at you */ return(0); } -#endif /* OVLB */ -#ifdef OVL1 - void mdamageu(mtmp, n) /* mtmp hits you for n points damage */ register struct monst *mtmp; @@ -2038,9 +2013,6 @@ register int n; } } -#endif /* OVL1 */ -#ifdef OVLB - STATIC_OVL void urustm(mon, obj) register struct monst *mon; @@ -2079,9 +2051,6 @@ register struct obj *obj; } } -#endif /* OVLB */ -#ifdef OVL1 - int could_seduce(magr,mdef,mattk) struct monst *magr, *mdef; @@ -2133,9 +2102,6 @@ struct attack *mattk; return (pagr->mlet == S_NYMPH) ? 2 : 0; } -#endif /* OVL1 */ -#ifdef OVLB - #ifdef SEDUCE /* Returns 1 if monster teleported */ int @@ -2423,10 +2389,6 @@ const char *str; } #endif /* SEDUCE */ -#endif /* OVLB */ - -#ifdef OVL1 - STATIC_OVL int passiveum(olduasmon,mtmp,mattk) struct permonst *olduasmon; @@ -2588,9 +2550,6 @@ register struct attack *mattk; return 1; } -#endif /* OVL1 */ -#ifdef OVLB - #include "edog.h" struct monst * cloneu() @@ -2611,6 +2570,4 @@ cloneu() return(mon); } -#endif /* OVLB */ - /*mhitu.c*/ diff --git a/src/mkobj.c b/src/mkobj.c index 5631ede68..b6fc2ec77 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -7,14 +7,12 @@ STATIC_DCL void FDECL(mkbox_cnts,(struct obj *)); STATIC_DCL void FDECL(obj_timer_checks,(struct obj *, XCHAR_P, XCHAR_P, int)); -#ifdef OVL1 STATIC_DCL void FDECL(container_weight, (struct obj *)); STATIC_DCL struct obj *FDECL(save_mtraits, (struct obj *, struct monst *)); #ifdef WIZARD STATIC_DCL const char *FDECL(where_name, (int)); STATIC_DCL void FDECL(check_contained, (struct obj *,const char *)); #endif -#endif /* OVL1 */ extern struct obj *thrownobj; /* defined in dothrow.c */ @@ -25,8 +23,6 @@ struct icp { char iclass; /* item class */ }; -#ifdef OVL1 - const struct icp mkobjprobs[] = { {10, WEAPON_CLASS}, {10, ARMOR_CLASS}, @@ -351,9 +347,6 @@ register struct obj *otmp; return; } -#endif /* OVL1 */ -#ifdef OVLB - static const char dknowns[] = { WAND_CLASS, RING_CLASS, POTION_CLASS, SCROLL_CLASS, GEM_CLASS, SPBOOK_CLASS, WEAPON_CLASS, TOOL_CLASS, 0 @@ -756,9 +749,6 @@ register struct obj *otmp; return; } -#endif /* OVLB */ -#ifdef OVL1 - void blessorcurse(otmp, chance) register struct obj *otmp; @@ -776,9 +766,6 @@ register int chance; return; } -#endif /* OVL1 */ -#ifdef OVLB - int bcsign(otmp) register struct obj *otmp; @@ -786,9 +773,6 @@ register struct obj *otmp; return(!!otmp->blessed - !!otmp->cursed); } -#endif /* OVLB */ -#ifdef OVL0 - /* * Calculate the weight of the given object. This will recursively follow * and calculate the weight of any containers. @@ -863,8 +847,6 @@ int x, y; { return mksobj_at(treefruits[rn2(SIZE(treefruits))], x, y, TRUE, FALSE); } -#endif /* OVL0 */ -#ifdef OVLB struct obj * mkgold(amount, x, y) @@ -885,9 +867,6 @@ int x, y; return (gold); } -#endif /* OVLB */ -#ifdef OVL1 - /* return TRUE if the corpse has special timing */ #define special_corpse(num) (((num) == PM_LIZARD) \ || ((num) == PM_LICHEN) \ @@ -1023,9 +1002,6 @@ boolean copyof; return mnew; } -#endif /* OVL1 */ -#ifdef OVLB - /* make an object named after someone listed in the scoreboard file */ struct obj * mk_tt_object(objtype, x, y) @@ -1084,9 +1060,6 @@ register struct obj *otmp; objects[otyp].oc_material != LIQUID)); } -#endif /* OVLB */ -#ifdef OVL1 - /* * These routines maintain the single-linked lists headed in level.objects[][] * and threaded through the nexthere fields in the object-instance structure. @@ -1628,6 +1601,4 @@ check_contained(container, mesg) } #endif /* WIZARD */ -#endif /* OVL1 */ - /*mkobj.c*/ diff --git a/src/mkroom.c b/src/mkroom.c index b6e708caa..3e0f78827 100644 --- a/src/mkroom.c +++ b/src/mkroom.c @@ -15,7 +15,6 @@ #include "hack.h" -#ifdef OVLB STATIC_DCL boolean FDECL(isbig, (struct mkroom *)); STATIC_DCL struct mkroom * FDECL(pick_room,(BOOLEAN_P)); STATIC_DCL void NDECL(mkshop), FDECL(mkzoo,(int)), NDECL(mkswamp); @@ -26,14 +25,11 @@ STATIC_DCL struct permonst * NDECL(antholemon); STATIC_DCL struct permonst * NDECL(squadmon); STATIC_DCL void FDECL(save_room, (int,struct mkroom *)); STATIC_DCL void FDECL(rest_room, (int,struct mkroom *)); -#endif /* OVLB */ #define sq(x) ((x)*(x)) extern const struct shclass shtypes[]; /* defined in shknam.c */ -#ifdef OVLB - STATIC_OVL boolean isbig(sroom) register struct mkroom *sroom; @@ -553,9 +549,6 @@ register struct mkroom *sroom; return FALSE; } -#endif /* OVLB */ -#ifdef OVL0 - int somex(croom) register struct mkroom *croom; @@ -656,9 +649,6 @@ schar type; return (struct mkroom *) 0; } -#endif /* OVL0 */ -#ifdef OVLB - struct permonst * courtmon() { @@ -776,6 +766,5 @@ int fd; rooms[nroom].hx = -1; /* restore ending flags */ subrooms[nsubroom].hx = -1; } -#endif /* OVLB */ /*mkroom.c*/ diff --git a/src/mon.c b/src/mon.c index 56b8dc3da..a4dede164 100644 --- a/src/mon.c +++ b/src/mon.c @@ -14,11 +14,9 @@ STATIC_DCL boolean FDECL(restrap,(struct monst *)); STATIC_DCL long FDECL(mm_aggression, (struct monst *,struct monst *)); -#ifdef OVL2 STATIC_DCL int NDECL(pick_animal); STATIC_DCL int FDECL(select_newcham_form, (struct monst *)); STATIC_DCL void FDECL(kill_eggs, (struct obj *)); -#endif #ifdef REINCARNATION #define LEVEL_SPECIFIC_NOCORPSE(mdat) \ @@ -32,7 +30,6 @@ STATIC_DCL void FDECL(kill_eggs, (struct obj *)); #if 0 /* part of the original warning code which was replaced in 3.3.1 */ -#ifdef OVL1 #define warnDelay 10 long lastwarntime; int lastwarnlev; @@ -42,12 +39,8 @@ const char *warnings[] = { }; STATIC_DCL void NDECL(warn_effects); -#endif /* OVL1 */ #endif /* 0 */ -#ifndef OVLB -STATIC_VAR short cham_to_pm[]; -#else STATIC_DCL struct obj *FDECL(make_corpse,(struct monst *)); STATIC_DCL void FDECL(m_detach, (struct monst *, struct permonst *)); STATIC_DCL void FDECL(lifesaved_monster, (struct monst *)); @@ -315,9 +308,6 @@ register struct monst *mtmp; return obj; } -#endif /* OVLB */ -#ifdef OVL1 - #if 0 /* part of the original warning code which was replaced in 3.3.1 */ STATIC_OVL void @@ -636,9 +626,6 @@ movemon() return somebody_can_move; } -#endif /* OVL1 */ -#ifdef OVLB - #define mstoning(obj) (ofood(obj) && \ (touch_petrifies(&mons[(obj)->corpsenm]) || \ (obj)->corpsenm == PM_MEDUSA)) @@ -853,8 +840,6 @@ mpickgold(mtmp) } } } -#endif /* OVLB */ -#ifdef OVL2 boolean mpickstuff(mtmp, str) @@ -899,9 +884,6 @@ mpickstuff(mtmp, str) return FALSE; } -#endif /* OVL2 */ -#ifdef OVL0 - int curr_mon_load(mtmp) register struct monst *mtmp; @@ -1197,9 +1179,6 @@ impossible("A monster looked at a very strange trap of type %d.", ttmp->ttyp); return(cnt); } -#endif /* OVL0 */ -#ifdef OVL1 - /* Monster against monster special attacks; for the specified monster combinations, this allows one monster to attack another adjacent one in the absence of Conflict. There is no provision for targetting @@ -1255,9 +1234,6 @@ dmonsfree() iflags.purge_monsters = 0; } -#endif /* OVL1 */ -#ifdef OVLB - /* called when monster is moved to larger structure */ void replmon(mtmp, mtmp2) @@ -2080,9 +2056,6 @@ register struct monst *mtmp; } } -#endif /* OVLB */ -#ifdef OVL2 - void setmangry(mtmp) register struct monst *mtmp; @@ -2689,9 +2662,6 @@ kill_genocided_monsters() kill_eggs(level.buriedobjlist); } -#endif /* OVL2 */ -#ifdef OVLB - void golemeffects(mon, damtype, dam) register struct monst *mon; @@ -2798,6 +2768,5 @@ short otyp; break; } } -#endif /* OVLB */ /*mon.c*/ diff --git a/src/mondata.c b/src/mondata.c index 5eb076052..5de5331b1 100644 --- a/src/mondata.c +++ b/src/mondata.c @@ -8,8 +8,6 @@ /* These routines provide basic data for any type of monster. */ -#ifdef OVLB - void set_mon_data(mon, ptr, flag) struct monst *mon; @@ -26,9 +24,6 @@ int flag; return; } -#endif /* OVLB */ -#ifdef OVL0 - struct attack * attacktype_fordmg(ptr, atyp, dtyp) struct permonst *ptr; @@ -51,9 +46,6 @@ int atyp; return attacktype_fordmg(ptr, atyp, AD_ANY) ? TRUE : FALSE; } -#endif /* OVL0 */ -#ifdef OVLB - boolean poly_when_stoned(ptr) struct permonst *ptr; @@ -212,9 +204,6 @@ struct obj *obj; /* aatyp == AT_WEAP, AT_SPIT */ return TRUE; } -#endif /* OVLB */ -#ifdef OVL0 - boolean ranged_attk(ptr) /* returns TRUE if monster can attack at range */ struct permonst *ptr; @@ -257,9 +246,6 @@ struct permonst *mptr; (slithy(mptr) && !bigmonst(mptr))); } -#endif /* OVL0 */ -#ifdef OVL1 - boolean can_track(ptr) /* returns TRUE if monster can track well */ register struct permonst *ptr; @@ -270,9 +256,6 @@ can_track(ptr) /* returns TRUE if monster can track well */ return((boolean)haseyes(ptr)); } -#endif /* OVL1 */ -#ifdef OVLB - boolean sliparm(ptr) /* creature will slide out of armor */ register struct permonst *ptr; @@ -290,8 +273,6 @@ breakarm(ptr) /* creature will break out of armor */ ptr == &mons[PM_MARILITH] || ptr == &mons[PM_WINGED_GARGOYLE]) && !sliparm(ptr)); } -#endif /* OVLB */ -#ifdef OVL1 boolean sticks(ptr) /* creature sticks other creatures it hits */ @@ -373,9 +354,6 @@ max_passive_dmg(mdef, magr) return 0; } -#endif /* OVL1 */ -#ifdef OVL0 - int monsndx(ptr) /* return an index into the mons array */ struct permonst *ptr; @@ -393,10 +371,6 @@ monsndx(ptr) /* return an index into the mons array */ return(i); } -#endif /* OVL0 */ -#ifdef OVL1 - - int name_to_mon(in_str) const char *in_str; @@ -505,9 +479,6 @@ const char *in_str; return mntmp; } -#endif /* OVL1 */ -#ifdef OVL2 - /* returns 3 values (0=male, 1=female, 2=none) */ int gender(mtmp) @@ -528,9 +499,6 @@ register struct monst *mtmp; type_is_pname(mtmp->data)) ? (int)mtmp->female : 2; } -#endif /* OVL2 */ -#ifdef OVLB - /* used for nearby monsters when you go to another level */ boolean levl_follower(mtmp) @@ -747,6 +715,4 @@ struct attack *mattk; return what; } -#endif /* OVLB */ - /*mondata.c*/ diff --git a/src/monmove.c b/src/monmove.c index f0d1a156e..048acc70e 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -9,16 +9,11 @@ extern boolean notonhead; -#ifdef OVL0 - STATIC_DCL int FDECL(disturb,(struct monst *)); STATIC_DCL void FDECL(distfleeck,(struct monst *,int *,int *,int *)); STATIC_DCL int FDECL(m_arrival, (struct monst *)); STATIC_DCL void FDECL(watch_on_duty,(struct monst *)); -#endif /* OVL0 */ -#ifdef OVLB - boolean /* TRUE : mtmp died */ mb_trapped(mtmp) register struct monst *mtmp; @@ -42,9 +37,6 @@ register struct monst *mtmp; return(FALSE); } -#endif /* OVLB */ -#ifdef OVL0 - STATIC_OVL void watch_on_duty(mtmp) register struct monst *mtmp; @@ -76,9 +68,6 @@ register struct monst *mtmp; } } -#endif /* OVL0 */ -#ifdef OVL1 - int dochugw(mtmp) register struct monst *mtmp; @@ -123,9 +112,6 @@ dochugw(mtmp) return(rd); } -#endif /* OVL1 */ -#ifdef OVL2 - boolean onscary(x, y, mtmp) int x, y; @@ -145,9 +131,6 @@ struct monst *mtmp; && IS_ALTAR(levl[x][y].typ))); } -#endif /* OVL2 */ -#ifdef OVL0 - /* regenerate lost hit points */ void mon_regen(mon, digest_meal) @@ -1210,9 +1193,6 @@ postmov: return(mmoved); } -#endif /* OVL0 */ -#ifdef OVL2 - boolean closed_door(x, y) register int x, y; @@ -1228,9 +1208,6 @@ register int x, y; return((boolean)(ACCESSIBLE(levl[x][y].typ) && !closed_door(x, y))); } -#endif /* OVL2 */ -#ifdef OVL0 - /* decide where the monster thinks you are standing */ void set_apparxy(mtmp) @@ -1360,6 +1337,4 @@ struct monst *mtmp; return TRUE; } -#endif /* OVL0 */ - /*monmove.c*/ diff --git a/src/mthrowu.c b/src/mthrowu.c index 3038ced80..539ba3658 100644 --- a/src/mthrowu.c +++ b/src/mthrowu.c @@ -10,12 +10,6 @@ STATIC_DCL int FDECL(drop_throw,(struct obj *,BOOLEAN_P,int,int)); #define POLE_LIM 5 /* How far monsters can use pole-weapons */ -#ifndef OVLB - -STATIC_DCL const char *breathwep[]; - -#else /* OVLB */ - /* * Keep consistent with breath weapons in zap.c, and AD_* in monattk.h. */ @@ -132,9 +126,6 @@ int x,y; return retvalu; } -#endif /* OVLB */ -#ifdef OVL1 - /* an object launched by someone/thing other than player attacks a monster; return 1 if the object has stopped moving (hit or its range used up) */ int @@ -454,9 +445,6 @@ m_throw(mon, x, y, dx, dy, range, obj) } } -#endif /* OVL1 */ -#ifdef OVLB - /* Remove an item from the monster's inventory and destroy it. */ void m_useup(mon, obj) @@ -477,9 +465,6 @@ struct obj *obj; } } -#endif /* OVLB */ -#ifdef OVL1 - /* monster attempts ranged weapon attack against player */ void thrwmu(mtmp) @@ -611,9 +596,6 @@ struct monst *mtmp; nomul(0); } -#endif /* OVL1 */ -#ifdef OVLB - int spitmu(mtmp, mattk) /* monster spits substance at you */ register struct monst *mtmp; @@ -653,9 +635,6 @@ register struct attack *mattk; return 0; } -#endif /* OVLB */ -#ifdef OVL1 - int breamu(mtmp, mattk) /* monster breathes at you (ranged) */ register struct monst *mtmp; @@ -724,9 +703,6 @@ lined_up(mtmp) /* is mtmp in position to use ranged attack? */ return(linedup(mtmp->mux,mtmp->muy,mtmp->mx,mtmp->my)); } -#endif /* OVL1 */ -#ifdef OVL0 - /* Check if a monster is carrying a particular item. */ struct obj * @@ -819,6 +795,4 @@ int whodidit; /* 1==hero, 0=other, -1==just check whether it'll pass thru */ return hits; } -#endif /* OVL0 */ - /*mthrowu.c*/ diff --git a/src/objnam.c b/src/objnam.c index dbe637f16..216052cd9 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -10,9 +10,7 @@ #define NUMOBUF 12 STATIC_DCL char *FDECL(strprepend,(char *,const char *)); -#ifdef OVLB static boolean FDECL(wishymatch, (const char *,const char *,BOOLEAN_P)); -#endif static char *NDECL(nextobuf); static void FDECL(add_erosion_words, (struct obj *, char *)); @@ -29,12 +27,6 @@ struct Jitem { typ != BLACK_OPAL && \ typ != EMERALD && typ != OPAL))) -#ifndef OVLB - -STATIC_DCL struct Jitem Japanese_items[]; - -#else /* OVLB */ - STATIC_OVL struct Jitem Japanese_items[] = { { SHORT_SWORD, "wakizashi" }, { BROADSWORD, "ninja-to" }, @@ -51,12 +43,8 @@ STATIC_OVL struct Jitem Japanese_items[] = { {0, "" } }; -#endif /* OVLB */ - STATIC_DCL const char *FDECL(Japanese_item_name,(int i)); -#ifdef OVL1 - STATIC_OVL char * strprepend(s,pref) register char *s; @@ -73,9 +61,6 @@ register const char *pref; return(s); } -#endif /* OVL1 */ -#ifdef OVLB - /* manage a pool of BUFSZ buffers, so callers don't have to */ static char * nextobuf() @@ -227,9 +212,6 @@ boolean juice; /* whether or not to append " juice" to the name */ return buf; } -#endif /* OVLB */ -#ifdef OVL1 - char * xname(obj) register struct obj *obj; @@ -500,8 +482,6 @@ struct obj *obj; return onm; } -#endif /* OVL1 */ -#ifdef OVL0 /* used for naming "the unique_item" instead of "a unique_item" */ boolean @@ -789,9 +769,6 @@ ring: return(bp); } -#endif /* OVL0 */ -#ifdef OVLB - /* used from invent.c */ boolean not_fully_identified(otmp) @@ -1251,9 +1228,6 @@ static const char wrpsym[] = { FOOD_CLASS }; -#endif /* OVLB */ -#ifdef OVL0 - /* Plural routine; chiefly used for user-defined fruits. We have to try to * account for everything reasonable the player has; something unreasonable * can still break the code. However, it's still a lot more accurate than @@ -1481,19 +1455,11 @@ bottom: if (excess) Strcpy(eos(str), excess); return str; } -#endif /* OVL0 */ - struct o_range { const char *name, oclass; int f_o_range, l_o_range; }; -#ifndef OVLB - -STATIC_DCL const struct o_range o_ranges[]; - -#else /* OVLB */ - /* wishable subranges of objects */ STATIC_OVL NEARDATA const struct o_range o_ranges[] = { { "bag", TOOL_CLASS, SACK, BAG_OF_TRICKS }, @@ -2784,6 +2750,5 @@ struct monst *mtmp; } return "whatcha-may-callit"; } -#endif /* OVLB */ /*objnam.c*/ diff --git a/src/pline.c b/src/pline.c index b966104d5..32ef3e500 100644 --- a/src/pline.c +++ b/src/pline.c @@ -9,8 +9,6 @@ #include "edog.h" #endif -#ifdef OVLB - static boolean no_repeat = FALSE; static char *FDECL(You_buf, (int)); @@ -432,5 +430,4 @@ self_invis_message() "can't see yourself"); } -#endif /* OVLB */ /*pline.c*/ diff --git a/src/polyself.c b/src/polyself.c index b967e07f2..75dd37875 100644 --- a/src/polyself.c +++ b/src/polyself.c @@ -12,7 +12,6 @@ #include "hack.h" -#ifdef OVLB STATIC_DCL void FDECL(polyman, (const char *,const char *)); STATIC_DCL void NDECL(break_armor); STATIC_DCL void FDECL(drop_weapon,(int)); @@ -1135,9 +1134,6 @@ boolean silently; } } -#endif /* OVLB */ -#ifdef OVL1 - const char * mbodypart(mon, part) struct monst *mon; @@ -1258,9 +1254,6 @@ int part; return mbodypart(&youmonst, part); } -#endif /* OVL1 */ -#ifdef OVL0 - int poly_gender() { @@ -1271,9 +1264,6 @@ poly_gender() return flags.female; } -#endif /* OVL0 */ -#ifdef OVLB - void ugolemeffects(damtype, dam) int damtype, dam; @@ -1344,6 +1334,4 @@ int atyp; } } -#endif /* OVLB */ - /*polyself.c*/ diff --git a/src/potion.c b/src/potion.c index 94e98aa48..bc5f20a91 100644 --- a/src/potion.c +++ b/src/potion.c @@ -4,7 +4,6 @@ #include "hack.h" -#ifdef OVLB boolean notonhead = FALSE; static NEARDATA int nothing, unkn; @@ -2006,6 +2005,4 @@ struct monst *mon, /* monster being split */ return mtmp2; } -#endif /* OVLB */ - /*potion.c*/ diff --git a/src/priest.c b/src/priest.c index 6404bbed2..5d7359afe 100644 --- a/src/priest.c +++ b/src/priest.c @@ -11,8 +11,6 @@ /* this matches the categorizations shown by enlightenment */ #define ALGN_SINNED (-4) /* worse than strayed */ -#ifdef OVLB - STATIC_DCL boolean FDECL(histemple_at,(struct monst *,XCHAR_P,XCHAR_P)); STATIC_DCL boolean FDECL(has_shrine,(struct monst *)); @@ -109,10 +107,6 @@ pick_move: return(0); } -#endif /* OVLB */ - -#ifdef OVL0 - char temple_occupied(array) register char *array; @@ -125,9 +119,6 @@ register char *array; return('\0'); } -#endif /* OVL0 */ -#ifdef OVLB - STATIC_OVL boolean histemple_at(priest, x, y) register struct monst *priest; @@ -714,6 +705,4 @@ boolean ghostly; } } -#endif /* OVLB */ - /*priest.c*/ diff --git a/src/read.c b/src/read.c index e1d1ef1cd..6042afa0c 100644 --- a/src/read.c +++ b/src/read.c @@ -15,8 +15,6 @@ ((mndx) == urace.malenum || \ (urace.femalenum != NON_PM && (mndx) == urace.femalenum)) -#ifdef OVLB - boolean known; static NEARDATA const char readable[] = @@ -1911,6 +1909,4 @@ create_particular() } #endif /* WIZARD */ -#endif /* OVLB */ - /*read.c*/ diff --git a/src/rnd.c b/src/rnd.c index 313b70bda..ae4bb8a20 100644 --- a/src/rnd.c +++ b/src/rnd.c @@ -16,8 +16,6 @@ extern int NDECL(rand); # endif #endif /* LINT */ -#ifdef OVL0 - int rn2(x) /* 0 <= rn2(x) < x */ register int x; @@ -34,9 +32,6 @@ register int x; #endif } -#endif /* OVL0 */ -#ifdef OVLB - int rnl(x) /* 0 <= rnl(x) < x; sometimes subtracting Luck */ register int x; /* good luck approaches 0, bad luck approaches (x-1) */ @@ -60,9 +55,6 @@ register int x; /* good luck approaches 0, bad luck approaches (x-1) */ return i; } -#endif /* OVLB */ -#ifdef OVL0 - int rnd(x) /* 1 <= rnd(x) <= x */ register int x; @@ -79,9 +71,6 @@ register int x; #endif } -#endif /* OVL0 */ -#ifdef OVL1 - int d(n,x) /* n <= d(n,x) <= (n*x) */ register int n, x; @@ -98,9 +87,6 @@ register int n, x; return(tmp); /* Alea iacta est. -- J.C. */ } -#endif /* OVL1 */ -#ifdef OVLB - int rne(x) register int x; @@ -140,6 +126,4 @@ int i; return((int)x); } -#endif /* OVLB */ - /*rnd.c*/ diff --git a/src/shk.c b/src/shk.c index f77a4ce24..c32e812d8 100644 --- a/src/shk.c +++ b/src/shk.c @@ -16,9 +16,7 @@ #ifdef KOPS STATIC_DCL void FDECL(makekops, (coord *)); STATIC_DCL void FDECL(call_kops, (struct monst *,BOOLEAN_P)); -# ifdef OVLB STATIC_DCL void FDECL(kops_gone, (BOOLEAN_P)); -# endif /* OVLB */ #endif /* KOPS */ #define IS_SHOP(x) (rooms[x].rtype >= SHOPBASE) @@ -65,11 +63,8 @@ STATIC_DCL void FDECL(dropped_container, (struct obj *, struct monst *, STATIC_DCL void FDECL(add_to_billobjs, (struct obj *)); STATIC_DCL void FDECL(bill_box_content, (struct obj *, BOOLEAN_P, BOOLEAN_P, struct monst *)); -#ifdef OVL1 static boolean FDECL(rob_shop, (struct monst *)); -#endif -#ifdef OVLB /* invariants: obj->unpaid iff onbill(obj) [unless bp->useup] obj->quan <= bp->bquan @@ -256,9 +251,6 @@ boolean ghostly; } } -#endif /* OVLB */ -#ifdef OVL3 - /* Clear the unpaid bit on all of the objects in the list. */ STATIC_OVL void clear_unpaid(list) @@ -270,8 +262,6 @@ register struct obj *list; list = list->nobj; } } -#endif /*OVL3*/ -#ifdef OVLB /* either you paid or left the shop or the shopkeeper died */ STATIC_OVL void @@ -320,9 +310,6 @@ register struct monst *shkp; return(total); } -#endif /* OVLB */ -#ifdef OVL1 - #ifdef KOPS STATIC_OVL void call_kops(shkp, nearshop) @@ -700,9 +687,6 @@ shopper_financial_report() } } -#endif /* OVL1 */ -#ifdef OVLB - int inhishop(mtmp) register struct monst *mtmp; @@ -833,8 +817,6 @@ register struct obj *obj, *merge; } dealloc_obj(obj); } -#endif /* OVLB */ -#ifdef OVL3 STATIC_OVL long check_credit(tmp, shkp) @@ -878,8 +860,6 @@ register struct monst *shkp; ESHK(shkp)->robbed = robbed; } } -#endif /*OVL3*/ -#ifdef OVLB /* return shkp to home position */ void @@ -1060,13 +1040,6 @@ STATIC_VAR const char no_money[] = "Moreover, you%s have no money."; STATIC_VAR const char not_enough_money[] = "Besides, you don't have enough to interest %s."; -#else -STATIC_VAR const char no_money[]; -STATIC_VAR const char not_enough_money[]; -#endif /*OVLB*/ - -#ifdef OVL3 - STATIC_OVL long cheapest_item(shkp) /* delivers the cheapest item on the list */ register struct monst *shkp; @@ -1082,8 +1055,6 @@ register struct monst *shkp; } return(gmin); } -#endif /*OVL3*/ -#ifdef OVL0 int dopay() @@ -1471,8 +1442,6 @@ proceed: shtypes[eshkp->shoptype - SHOPBASE].name); return(1); } -#endif /*OVL0*/ -#ifdef OVL3 /* return 2 if used-up portion paid */ /* 1 if paid successfully */ @@ -1582,8 +1551,6 @@ boolean itemize; update_inventory(); /* Done just once in dopay() if !itemize. */ return buy; } -#endif /*OVL3*/ -#ifdef OVLB static coord repo_location; /* repossession context */ @@ -1833,8 +1800,6 @@ unsigned id; /* not found at all */ return (struct obj *)0; } -#endif /*OVLB*/ -#ifdef OVL3 /* calculate the value that the shk will charge for [one of] an object */ STATIC_OVL long @@ -1914,8 +1879,6 @@ register struct monst *shkp; /* if angry, impose a surcharge */ if (shkp && ESHK(shkp)->surcharge) tmp += (tmp + 2L) / 3L; return tmp; } -#endif /*OVL3*/ -#ifdef OVLB /* returns the price of a container's content. the price * of the "top" container is added in the calling functions. @@ -2008,8 +1971,6 @@ register struct obj *obj; picked_container(otmp); } } -#endif /*OVLB*/ -#ifdef OVL3 /* calculate how much the shk will pay when buying [all of] an object */ STATIC_OVL long @@ -2046,9 +2007,6 @@ register struct monst *shkp; return tmp; } -#endif /*OVL3*/ -#ifdef OVLB - /* called from doinv(invent.c) for inventory of unpaid objects */ long unpaid_cost(unp_obj) @@ -2390,9 +2348,6 @@ register struct monst *shkp; } } -#endif /*OVLB*/ -#ifdef OVL3 - STATIC_OVL long stolen_container(obj, shkp, price, ininv) register struct obj *obj; @@ -2432,8 +2387,6 @@ register boolean ininv; return(price); } -#endif /*OVL3*/ -#ifdef OVLB long stolen_value(obj, x, y, peaceful, silent) @@ -2946,9 +2899,6 @@ long cost; levl[x][y].seenv = SVALL; } -#endif /*OVLB*/ -#ifdef OVL0 - /* * Do something about damage. Either (!croaked) try to repair it, or * (croaked) just discard damage structs for non-shared locations, since @@ -3180,8 +3130,7 @@ boolean catchup; /* restoring a level */ #undef vert #undef horiz } -#endif /*OVL0*/ -#ifdef OVL3 + /* * shk_move: return 1: moved 0: didn't -1: let m_move do it -2: died */ @@ -3309,9 +3258,6 @@ struct monst *shkp; } } -#endif /*OVL3*/ -#ifdef OVLB - /* for use in levl_follower (mondata.c) */ boolean is_fshk(mtmp) @@ -3592,8 +3538,7 @@ getcad: adjalign(-sgn(u.ualign.type)); } } -#endif /*OVLB*/ -#ifdef OVL0 + /* called in dokick.c when we kick an object that might be in a store */ boolean costly_spot(x, y) @@ -3609,8 +3554,6 @@ register xchar x, y; !(x == ESHK(shkp)->shk.x && y == ESHK(shkp)->shk.y))); } -#endif /*OVL0*/ -#ifdef OVLB /* called by dotalk(sounds.c) when #chatting; returns obj if location contains shop goods and shopkeeper is willing & able to speak */ @@ -3680,8 +3623,6 @@ register struct obj *first_obj; } destroy_nhwindow(tmpwin); } -#endif /*OVLB*/ -#ifdef OVL3 STATIC_OVL const char * shk_embellish(itm, cost) @@ -3712,8 +3653,6 @@ long cost; } return "."; } -#endif /*OVL3*/ -#ifdef OVLB /* First 4 supplied by Ronen and Tamar, remainder by development team */ const char *Izchak_speaks[]={ @@ -3815,9 +3754,6 @@ register boolean silent; } #endif /* KOPS */ -#endif /*OVLB*/ -#ifdef OVL3 - STATIC_OVL long cost_per_charge(shkp, otmp, altusage) struct monst *shkp; @@ -3870,8 +3806,6 @@ boolean altusage; /* some items have an "alternate" use with different cost */ } return(tmp); } -#endif /*OVL3*/ -#ifdef OVLB /* Charge the player for partial use of an unpaid object. * @@ -4028,9 +3962,6 @@ register xchar x, y; return(FALSE); } -#endif /* OVLB */ -#ifdef OVL2 - char * shk_your(buf, obj) char *buf; @@ -4078,9 +4009,6 @@ struct obj *obj; return (char *)0; } -#endif /* OVL2 */ -#ifdef OVLB - #ifdef __SASC void sasc_bug(struct obj *op, unsigned x){ @@ -4088,6 +4016,4 @@ sasc_bug(struct obj *op, unsigned x){ } #endif -#endif /* OVLB */ - /*shk.c*/ diff --git a/src/shknam.c b/src/shknam.c index 77c8c2660..7182de6bf 100644 --- a/src/shknam.c +++ b/src/shknam.c @@ -7,11 +7,6 @@ #include "hack.h" #include "eshk.h" -#ifndef OVLB -extern const struct shclass shtypes[]; - -#else - STATIC_DCL void FDECL(mkshobj_at, (const struct shclass *,int,int)); STATIC_DCL void FDECL(nameshk, (struct monst *,const char * const *)); STATIC_DCL int FDECL(shkinit, (const struct shclass *,struct mkroom *)); @@ -498,9 +493,6 @@ register struct mkroom *sroom; level.flags.has_shop = TRUE; } -#endif /* OVLB */ -#ifdef OVL0 - /* does shkp's shop stock this item type? */ boolean saleable(shkp, obj) @@ -534,6 +526,4 @@ int type; return shp->iprobs[i].itype; } -#endif /* OVL0 */ - /*shknam.c*/ diff --git a/src/sounds.c b/src/sounds.c index ebd51aa75..f0b7dfda8 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -10,15 +10,8 @@ # endif #endif -#ifdef OVLB - static int FDECL(domonnoise,(struct monst *)); static int NDECL(dochat); - -#endif /* OVLB */ - -#ifdef OVL0 - static int FDECL(mon_in_room, (struct monst *,int)); /* this easily could be a macro, but it might overtax dumb compilers */ @@ -258,9 +251,6 @@ dosounds() } } -#endif /* OVL0 */ -#ifdef OVLB - static const char * const h_sounds[] = { "beep", "boing", "sing", "belche", "creak", "cough", "rattle", "ululate", "pop", "jingle", "sniffle", "tinkle", "eep" @@ -1028,6 +1018,4 @@ const char* msg; #endif /* USER_SOUNDS */ -#endif /* OVLB */ - /*sounds.c*/ diff --git a/src/steal.c b/src/steal.c index 5ec16c8a3..8cf92e53e 100644 --- a/src/steal.c +++ b/src/steal.c @@ -6,7 +6,6 @@ STATIC_PTR int NDECL(stealarm); -#ifdef OVLB STATIC_DCL const char *FDECL(equipname, (struct obj *)); STATIC_OVL const char * @@ -420,9 +419,6 @@ gotobj: return((multi < 0) ? 0 : 1); } -#endif /* OVLB */ -#ifdef OVL1 - /* Returns 1 if otmp is free'd, 0 otherwise. */ int mpickobj(mtmp,otmp) @@ -463,9 +459,6 @@ register struct obj *otmp; return freed_otmp; } -#endif /* OVL1 */ -#ifdef OVLB - void stealamulet(mtmp) struct monst *mtmp; @@ -510,9 +503,6 @@ struct monst *mtmp; } } -#endif /* OVLB */ -#ifdef OVL0 - /* release the objects the creature is carrying */ void relobj(mtmp,show,is_pet) @@ -589,6 +579,4 @@ boolean is_pet; /* If true, pet should keep wielded/worn items */ newsym(omx, omy); } -#endif /* OVL0 */ - /*steal.c*/ diff --git a/src/timeout.c b/src/timeout.c index 085a27222..832815a4d 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -14,8 +14,6 @@ STATIC_DCL void FDECL(see_lamp_flicker, (struct obj *, const char *)); STATIC_DCL void FDECL(lantern_message, (struct obj *)); STATIC_DCL void FDECL(cleanup_burn, (genericptr_t,long)); -#ifdef OVLB - /* He is being petrified - dialogue by inmet!tower */ static NEARDATA const char * const stoned_texts[] = { "You are slowing down.", /* 5 */ @@ -154,9 +152,6 @@ burn_away_slime() } -#endif /* OVLB */ -#ifdef OVL0 - void nh_timeout() { @@ -358,9 +353,6 @@ nh_timeout() run_timers(); } -#endif /* OVL0 */ -#ifdef OVL1 - void fall_asleep(how_long, wakeup_msg) int how_long; @@ -1160,9 +1152,6 @@ end_burn(obj, timer_attached) impossible("end_burn: obj %s not timed!", xname(obj)); } -#endif /* OVL1 */ -#ifdef OVL0 - /* * Cleanup a burning object if timer stopped. */ @@ -1188,9 +1177,6 @@ cleanup_burn(arg, expire_time) update_inventory(); } -#endif /* OVL0 */ -#ifdef OVL1 - void do_storms() { @@ -1230,10 +1216,7 @@ do_storms() } else You_hear("a rumbling noise."); } -#endif /* OVL1 */ - -#ifdef OVL0 /* ------------------------------------------------------------------------- */ /* * Generic Timeout Functions. @@ -1856,6 +1839,4 @@ relink_timers(ghostly) } } -#endif /* OVL0 */ - /*timeout.c*/ diff --git a/src/track.c b/src/track.c index d8d9e71c3..c906c47a3 100644 --- a/src/track.c +++ b/src/track.c @@ -10,17 +10,12 @@ STATIC_VAR NEARDATA int utcnt, utpnt; STATIC_VAR NEARDATA coord utrack[UTSZ]; -#ifdef OVLB - void initrack() { utcnt = utpnt = 0; } -#endif /* OVLB */ -#ifdef OVL1 - /* add to track */ void settrack() @@ -32,9 +27,6 @@ settrack() utpnt++; } -#endif /* OVL1 */ -#ifdef OVL0 - coord * gettrack(x, y) register int x, y; @@ -63,6 +55,4 @@ register int x, y; return (coord *)0; } -#endif /* OVL0 */ - /*track.c*/ diff --git a/src/trap.c b/src/trap.c index 94db47ebf..662f7e7d5 100644 --- a/src/trap.c +++ b/src/trap.c @@ -30,16 +30,6 @@ STATIC_OVL boolean FDECL(keep_saddle_with_steedcorpse, (unsigned, struct obj *, struct obj *)); #endif -#ifndef OVLB -STATIC_VAR const char *a_your[2]; -STATIC_VAR const char *A_Your[2]; -STATIC_VAR const char *the_your[2]; -STATIC_VAR const char tower_of_flame[]; -STATIC_VAR const char *A_gush_of_water_hits; -STATIC_VAR const char * const blindgas[6]; - -#else - STATIC_VAR const char * const a_your[2] = { "a", "your" }; STATIC_VAR const char * const A_Your[2] = { "A", "Your" }; STATIC_VAR const char * const the_your[2] = { "the", "your" }; @@ -48,10 +38,6 @@ STATIC_VAR const char * const A_gush_of_water_hits = "A gush of water hits"; STATIC_VAR const char * const blindgas[6] = {"humid", "odorless", "pungent", "chilling", "acrid", "biting"}; -#endif /* OVLB */ - -#ifdef OVLB - /* called when you're hit by fire (dofiretrap,buzz,zapyourself,explode) */ boolean /* returns TRUE if hit on torso */ burnarmor(victim) @@ -1292,9 +1278,6 @@ struct trap *trap; seetrap(trap); /* and it isn't concealed */ } -#endif /* OVLB */ -#ifdef OVL3 - /* * Move obj from (x1,y1) to (x2,y2) * @@ -1534,9 +1517,6 @@ int style; return 2; } -#endif /* OVL3 */ -#ifdef OVLB - void seetrap(trap) register struct trap *trap; @@ -1547,9 +1527,6 @@ seetrap(trap) } } -#endif /* OVLB */ -#ifdef OVL3 - STATIC_OVL int mkroll_launch(ttmp, x, y, otyp, ocount) struct trap *ttmp; @@ -1634,8 +1611,6 @@ schar dx,dy; cc->y = y; return TRUE; } -#endif /* OVL3 */ -#ifdef OVL1 int mintrap(mtmp) @@ -2152,9 +2127,6 @@ glovecheck: target = which_armor(mtmp, W_ARMG); return mtmp->mtrapped; } -#endif /* OVL1 */ -#ifdef OVLB - /* Combine cockatrice checks into single functions to avoid repeating code. */ void instapetrify(str) @@ -2980,8 +2952,6 @@ dountrap() /* disarm a trap */ } return untrap(FALSE); } -#endif /* OVLB */ -#ifdef OVL2 /* Probability of disabling a trap. Helge Hafting */ STATIC_OVL int @@ -3576,8 +3546,6 @@ boolean force; return(1); } } -#endif /* OVL2 */ -#ifdef OVLB /* only called when the player is doing something to the chest directly */ boolean @@ -3758,9 +3726,6 @@ boolean disarm; return FALSE; } -#endif /* OVLB */ -#ifdef OVL0 - struct trap * t_at(x,y) register int x, y; @@ -3773,9 +3738,6 @@ register int x, y; return((struct trap *)0); } -#endif /* OVL0 */ -#ifdef OVLB - void deltrap(trap) register struct trap *trap; @@ -3994,6 +3956,4 @@ burn_stuff: return(FALSE); } -#endif /* OVLB */ - /*trap.c*/ diff --git a/src/vault.c b/src/vault.c index 0f9e17904..0fcbd69ff 100644 --- a/src/vault.c +++ b/src/vault.c @@ -10,8 +10,6 @@ STATIC_DCL struct monst *NDECL(findgd); #define g_monnam(mtmp) \ x_monnam(mtmp, ARTICLE_NONE, (char *)0, SUPPRESS_IT, FALSE) -#ifdef OVLB - STATIC_DCL boolean FDECL(clear_fcorr, (struct monst *,BOOLEAN_P)); STATIC_DCL void FDECL(restfakecorr,(struct monst *)); STATIC_DCL boolean FDECL(in_fcorridor, (struct monst *,int,int)); @@ -111,9 +109,6 @@ findgd() return((struct monst *)0); } -#endif /* OVLB */ -#ifdef OVL0 - char vault_occupied(array) char *array; @@ -346,9 +341,6 @@ fnd: } } -#endif /* OVL0 */ -#ifdef OVLB - STATIC_OVL void move_gold(gold, vroom) struct obj *gold; @@ -821,6 +813,4 @@ gd_sound() /* prevent "You hear footsteps.." when inappropriate */ else return((boolean)(grd == (struct monst *)0)); } -#endif /* OVLB */ - /*vault.c*/ diff --git a/src/weapon.c b/src/weapon.c index 37eca580f..a3e4407d4 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -28,14 +28,6 @@ STATIC_DCL void FDECL(give_may_advance_msg, (int)); -#ifndef OVLB - -STATIC_DCL NEARDATA const short skill_names_indices[]; -STATIC_DCL NEARDATA const char *odd_skill_names[]; -STATIC_DCL NEARDATA const char *barehands_or_martial[]; - -#else /* OVLB */ - STATIC_VAR NEARDATA const short skill_names_indices[P_NUM_SKILLS] = { 0, DAGGER, KNIFE, AXE, PICK_AXE, SHORT_SWORD, BROADSWORD, LONG_SWORD, @@ -92,27 +84,19 @@ int skill; "fighting "); } -#endif /* OVLB */ - STATIC_DCL boolean FDECL(can_advance, (int, BOOLEAN_P)); STATIC_DCL boolean FDECL(could_advance, (int)); STATIC_DCL boolean FDECL(peaked_skill, (int)); STATIC_DCL int FDECL(slots_required, (int)); - -#ifdef OVL1 - STATIC_DCL char *FDECL(skill_level_name, (int,char *)); STATIC_DCL void FDECL(skill_advance, (int)); -#endif /* OVL1 */ - #define P_NAME(type) ((skill_names_indices[type] > 0) ? \ OBJ_NAME(objects[skill_names_indices[type]]) : \ (type == P_BARE_HANDED_COMBAT) ? \ barehands_or_martial[martial_bonus()] : \ odd_skill_names[-skill_names_indices[type]]) -#ifdef OVLB static NEARDATA const char kebabable[] = { S_XORN, S_DRAGON, S_JABBERWOCK, S_NAGA, S_GIANT, '\0' }; @@ -314,9 +298,6 @@ struct monst *mon; return(tmp); } -#endif /* OVLB */ -#ifdef OVL0 - STATIC_DCL struct obj *FDECL(oselect, (struct monst *,int)); #define Oselect(x) if ((otmp = oselect(mtmp, x)) != 0) return(otmp); @@ -709,9 +690,6 @@ abon() /* attack bonus for strength & dexterity */ else return(sbon + dex-14); } -#endif /* OVL0 */ -#ifdef OVL1 - int dbon() /* damage bonus for strength */ { @@ -1006,9 +984,6 @@ int skill; } } -#endif /* OVL1 */ -#ifdef OVLB - void use_skill(skill,degree) int skill; @@ -1314,6 +1289,4 @@ register struct obj *obj; obj->owornmask &= ~W_WEP; } -#endif /* OVLB */ - /*weapon.c*/ diff --git a/src/were.c b/src/were.c index 0bc9881b9..43d321f98 100644 --- a/src/were.c +++ b/src/were.c @@ -4,8 +4,6 @@ #include "hack.h" -#ifdef OVL0 - void were_change(mon) register struct monst *mon; @@ -35,9 +33,6 @@ register struct monst *mon; } } -#endif /* OVL0 */ -#ifdef OVLB - STATIC_DCL int FDECL(counter_were,(int)); STATIC_OVL int @@ -151,6 +146,4 @@ boolean purify; rehumanize(); } -#endif /* OVLB */ - /*were.c*/ diff --git a/src/wizard.c b/src/wizard.c index 6c39f52eb..0eba36785 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -13,8 +13,6 @@ extern const int monstr[]; -#ifdef OVLB - STATIC_DCL short FDECL(which_arti, (int)); STATIC_DCL boolean FDECL(mon_has_arti, (struct monst *,SHORT_P)); STATIC_DCL struct monst *FDECL(other_mon_has_arti, (struct monst *,SHORT_P)); @@ -44,9 +42,6 @@ static NEARDATA const unsigned wizapp[] = { PM_TRAPPER }; -#endif /* OVLB */ -#ifdef OVL0 - /* If you've found the Amulet, make the Wizard appear after some time */ /* Also, give hints about portal locations, if amulet is worn/wielded -dlc */ void @@ -92,9 +87,6 @@ amulet() } } -#endif /* OVL0 */ -#ifdef OVLB - int mon_has_amulet(mtmp) register struct monst *mtmp; @@ -633,6 +625,4 @@ register struct monst *mtmp; } } -#endif /* OVLB */ - /*wizard.c*/ diff --git a/src/zap.c b/src/zap.c index 23209fec5..838f555ed 100644 --- a/src/zap.c +++ b/src/zap.c @@ -11,10 +11,8 @@ */ #define MAGIC_COOKIE 1000 -#ifdef OVLB static NEARDATA boolean obj_zapped; static NEARDATA int poly_zapped; -#endif extern boolean notonhead; /* for long worms */ @@ -32,13 +30,9 @@ STATIC_DCL void FDECL(revive_egg, (struct obj *)); STATIC_DCL boolean FDECL(zap_steed, (struct obj *)); #endif -#ifdef OVLB STATIC_DCL int FDECL(zap_hit, (int,int)); -#endif -#ifdef OVL0 STATIC_DCL void FDECL(backfire, (struct obj *)); STATIC_DCL int FDECL(spell_hit_bonus, (int)); -#endif #define ZT_MAGIC_MISSILE (AD_MAGM-1) #define ZT_FIRE (AD_FIRE-1) @@ -56,10 +50,6 @@ STATIC_DCL int FDECL(spell_hit_bonus, (int)); #define is_hero_spell(type) ((type) >= 10 && (type) < 20) -#ifndef OVLB -STATIC_VAR const char are_blinded_by_the_flash[]; -extern const char * const flash_types[]; -#else STATIC_VAR const char are_blinded_by_the_flash[] = "are blinded by the flash!"; const char * const flash_types[] = { /* also used in buzzmu(mcastu.c) */ @@ -382,9 +372,6 @@ struct monst *mtmp; } } -#endif /*OVLB*/ -#ifdef OVL1 - /* * Return the object's physical location. This only makes sense for * objects that are currently on the level (i.e. migrating objects @@ -768,9 +755,7 @@ struct monst *mon; } return res; } -#endif /*OVL1*/ -#ifdef OVLB static const char charged_objs[] = { WAND_CLASS, WEAPON_CLASS, ARMOR_CLASS, 0 }; STATIC_OVL void @@ -976,9 +961,6 @@ register struct obj *obj; return (TRUE); } -#endif /*OVLB*/ -#ifdef OVL0 - boolean obj_resists(obj, ochance, achance) struct obj *obj; @@ -1017,8 +999,6 @@ struct obj *obj; return((boolean)(! rn2(zap_odds))); } -#endif /*OVL0*/ -#ifdef OVLB /* Use up at least minwt number of things made of material mat. * There's also a chance that other stuff will be used up. Finally, @@ -1729,8 +1709,6 @@ bhitpile(obj,fhito,tx,ty) return hitanything; } -#endif /*OVLB*/ -#ifdef OVL1 /* * zappable - returns 1 if zap is available, 0 otherwise. @@ -1796,8 +1774,6 @@ register struct obj *obj; more_experienced(0,10); } } -#endif /*OVL1*/ -#ifdef OVL0 STATIC_OVL void backfire(otmp) @@ -2202,9 +2178,6 @@ struct obj *obj; /* wand or spell */ } #endif -#endif /*OVL0*/ -#ifdef OVL3 - /* * cancel a monster (possibly the hero). inventory is cancelled only * if the monster is zapping itself directly, since otherwise the @@ -2429,9 +2402,6 @@ struct obj *obj; /* wand or spell */ return disclose; } -#endif /*OVL3*/ -#ifdef OVLB - /* called for various wand and spell effects - M. Stephenson */ void weffects(obj) @@ -2488,8 +2458,6 @@ register struct obj *obj; } return; } -#endif /*OVLB*/ -#ifdef OVL0 /* * Generate the to damage bonus for a spell. Based on the hero's intelligence @@ -2582,8 +2550,6 @@ register struct monst *mtmp; && flags.verbose) ? mon_nam(mtmp) : "it"); } -#endif /*OVL0*/ -#ifdef OVL1 /* * Called for the following distance effects: @@ -3177,9 +3143,6 @@ xchar sx, sy; return; } -#endif /*OVL1*/ -#ifdef OVLB - /* * burn scrolls and spellbooks on floor at position x,y * return the number of scrolls and spellbooks burned @@ -3506,8 +3469,6 @@ register int dx,dy; abstype == ZT_DEATH ? "disintegrate" : "destroy", FALSE); bhitpos = save_bhitpos; } -#endif /*OVLB*/ -#ifdef OVL0 void melt_ice(x, y) @@ -3745,9 +3706,6 @@ boolean *shopdamage; return rangemod; } -#endif /*OVL0*/ -#ifdef OVL3 - void fracture_rock(obj) /* fractured by pick-axe or wand of striking */ register struct obj *obj; /* no texts here! */ @@ -4032,9 +3990,6 @@ int osym, dmgtyp; return(tmp); } -#endif /*OVL3*/ -#ifdef OVL2 - int resist(mtmp, oclass, damage, tell) struct monst *mtmp; @@ -4130,6 +4085,4 @@ retry: } } -#endif /*OVL2*/ - /*zap.c*/ diff --git a/sys/msdos/msdos.c b/sys/msdos/msdos.c index 29e19fbf9..9e8bbf021 100644 --- a/sys/msdos/msdos.c +++ b/sys/msdos/msdos.c @@ -47,8 +47,6 @@ void FDECL(get_cursor,(int *, int *)); -#ifdef OVL0 - /* direct bios calls are used only when iflags.BIOS is set */ static char NDECL(DOSgetch); @@ -515,6 +513,4 @@ unsigned setvalue; return (regs.x.dx); } -# endif /* OVLB */ - #endif /* MSDOS */ diff --git a/sys/msdos/pctiles.c b/sys/msdos/pctiles.c index 66a6587e8..8289c022f 100644 --- a/sys/msdos/pctiles.c +++ b/sys/msdos/pctiles.c @@ -45,8 +45,6 @@ boolean otiles_in_ram = FALSE; extern int total_tiles_used; /* tile.c */ #endif -# ifdef OVLB - /* * Read the header/palette information at the start of the * NetHack.tib file. @@ -161,9 +159,6 @@ boolean filestyle; } #endif } -# endif /* OVLB */ - -# ifdef OVL0 struct planar_cell_struct plancell; struct overview_planar_cell_struct oplancell; @@ -253,7 +248,6 @@ char (*pta)[TILE_X]; return 0; } # endif -# endif /* OVL0 */ #endif /* USE_TILES */ /* pctiles.c */ diff --git a/sys/msdos/video.c b/sys/msdos/video.c index 48460bb1f..1576828d4 100644 --- a/sys/msdos/video.c +++ b/sys/msdos/video.c @@ -73,7 +73,6 @@ */ -#ifdef OVLB void get_scr_size() { @@ -84,7 +83,6 @@ get_scr_size() # endif txt_get_scr_size(); } -#endif /*OVLB*/ /* * -------------------------------------------------------------- @@ -122,7 +120,6 @@ void FDECL(cmov, (int, int)); void FDECL(nocmov, (int, int)); STATIC_DCL void NDECL(init_ttycolor); -# ifdef OVLB int savevmode; /* store the original video mode in here */ int curcol,currow; /* graphics mode current cursor locations */ int g_attribute; /* Current attribute to use */ @@ -136,23 +133,7 @@ boolean inmap = FALSE; /* in the map window */ # ifdef TEXTCOLOR char ttycolors[CLR_MAX]; /* also used/set in options.c */ # endif /* TEXTCOLOR */ -# else -extern int savevmode; -extern int curcol,currow; -extern int g_attribute; -extern int monoflag; -extern int attrib_text_normal; -extern int attrib_gr_normal; -extern int attrib_text_intense; -extern int attrib_gr_intense; -extern boolean traditonal; -extern boolean inmap; -# ifdef TEXTCOLOR -extern char ttycolors[CLR_MAX]; /* also used/set in options.c */ -# endif /* TEXTCOLOR */ -# endif /* OVLB */ -# ifdef OVLB void backsp() { @@ -164,9 +145,7 @@ backsp() # endif } } -# endif /* OVLB */ -# ifdef OVL0 void clear_screen() { @@ -227,9 +206,7 @@ register int col, row; # endif } } -# endif /* OVL0 */ -# ifdef OVLB int has_color(int color) { @@ -240,9 +217,7 @@ has_color(int color) return 0; # endif } -# endif /* OVLB */ -# ifdef OVL0 void home() { @@ -283,10 +258,7 @@ standoutend() g_attribute = iflags.grmode ? attrib_gr_normal : attrib_text_normal; } -# endif /* OVL0 */ - -# ifdef OVLB void term_end_attr(int attr) { @@ -378,9 +350,7 @@ term_start_raw_bold(void) { standoutbeg(); } -# endif /* OVLB */ -# ifdef OVL0 void tty_delay_output() { @@ -393,9 +363,6 @@ tty_delay_output() #endif } -# endif /* OVL0 */ - -# ifdef OVLB void tty_end_screen() { @@ -514,8 +481,6 @@ gr_finish() } } -# endif /* OVLB */ - /* * Screen output routines (these are heavily used). * @@ -546,7 +511,6 @@ gr_finish() * (that include wintty.h) are actually using these routines. */ -# ifdef OVL0 void xputs(s) const char *s; @@ -659,7 +623,6 @@ HideCursor() } # endif /* SIMULATE_CURSOR */ -# endif /* OVL0 */ # ifdef TEXTCOLOR /* @@ -688,21 +651,12 @@ HideCursor() /* assign_videocolors() is prototyped in extern.h */ /* assign_video() is prototyped in extern.h */ -# ifdef OVLB int shadeflag; /* shades are initialized */ int colorflag; /* colors are initialized */ char *schoice[3] = {"dark","normal","light"}; char *shade[3]; -# else -extern int shadeflag; -extern int colorflag; -extern char *schoice[3]; -extern char *shade[3]; -# endif /* OVLB */ - # endif /* VIDEOSHADES */ -# ifdef OVLB STATIC_OVL void init_ttycolor() { @@ -741,9 +695,7 @@ init_ttycolor() } # endif } -# endif /* OVLB */ -# ifdef OVL1 static int FDECL(convert_uchars,(char *, uchar *, int)); # ifdef VIDEOSHADES int assign_videoshades(char *choiceptr) @@ -872,7 +824,6 @@ convert_uchars(bufp,list,size) } # endif /* VIDEOSHADES */ -# endif /* OVL1 */ # endif /* TEXTCOLOR */ /* @@ -884,7 +835,6 @@ convert_uchars(bufp,list,size) * default (force use of the default video method for environment) * vga (use vga adapter code) */ -# ifdef OVL1 int assign_video(sopt) char *sopt; @@ -948,8 +898,6 @@ char *sopt; } return 1; } -# endif /* OVL1 */ -# ifdef OVL0 void tileview(enable) boolean enable; @@ -958,12 +906,15 @@ boolean enable; if (iflags.grmode) vga_traditional(enable ? FALSE : TRUE); #endif } -# endif /* OVL0 */ #endif /* NO_TERMS */ + #else /* STUBVIDEO */ + void tileview(enable) boolean enable; { } #endif /* STUBVIDEO */ +/*video.c*/ + diff --git a/sys/msdos/vidtxt.c b/sys/msdos/vidtxt.c index 692659efd..96506505e 100644 --- a/sys/msdos/vidtxt.c +++ b/sys/msdos/vidtxt.c @@ -38,8 +38,6 @@ extern int attrib_gr_normal; /* graphics mode normal attribute */ extern int attrib_text_intense; /* text mode intense attribute */ extern int attrib_gr_intense; /* graphics mode intense attribute */ -#ifdef OVLB - void txt_get_scr_size() { @@ -84,7 +82,6 @@ txt_get_scr_size() CO = regs.h.ah; # endif /* PC9800 */ } -#endif /*OVLB*/ /* * -------------------------------------------------------------- @@ -113,7 +110,6 @@ void FDECL(txt_get_cursor, (int *, int *)); extern int g_attribute; /* Current attribute to use */ extern int monoflag; /* 0 = not monochrome, else monochrome */ -# ifdef OVLB void txt_backsp() { @@ -145,9 +141,7 @@ txt_nhbell() regs.h.ah = 0x02; /* Character Output function */ (void) int86(DOSCALL, ®s, ®s); } -# endif /* OVLB */ -# ifdef OVL0 void txt_clear_screen() /* djgpp provides ScreenClear(), but in version 1.09 it is broken @@ -254,9 +248,7 @@ txt_cl_eos() /* clear to end of screen */ (void) int86(VIDEO_BIOS, ®s, ®s); /* Scroll or initialize window */ # endif } -# endif /* OVL0 */ -# ifdef OVLB void txt_startup(wid, hgt) int *wid, *hgt; @@ -269,7 +261,6 @@ txt_startup(wid, hgt) attrib_gr_intense = attrib_text_intense; g_attribute = attrib_text_normal; /* Give it a starting value */ } -# endif /* OVLB */ /* * Screen output routines (these are heavily used). @@ -295,7 +286,6 @@ txt_startup(wid, hgt) * (that include wintty.h) are actually using these routines. */ -# ifdef OVL0 void txt_xputs(s,col,row) const char *s; @@ -372,7 +362,6 @@ int attr; txt_gotoxy(col,row); # endif /* PC9800 */ } -# endif /* OVL0 */ /* * This marks the end of the general screen output routines that are @@ -396,7 +385,6 @@ int attr; * the location of the player on the NetHack level. */ -# ifdef OVL0 # if defined(SCREEN_BIOS) && !defined(PC9800) /* * This is implemented as a macro under DJGPPFAST. @@ -447,14 +435,12 @@ int x,y; * returns nothing. -3. */ } -# endif /* OVL0 */ /* * This marks the end of the cursor manipulation/information routines. * ------------------------------------------------------------------- */ -# ifdef OVLB # ifdef MONO_CHECK int txt_monoadapt_check() { @@ -466,7 +452,6 @@ int txt_monoadapt_check() return (regs.h.al == 7) ? 1 : 0; /* 7 means monochrome mode */ } # endif /* MONO_CHECK */ -# endif /* OVLB */ #endif /* NO_TERMS */ /* vidtxt.c */ diff --git a/sys/msdos/vidvga.c b/sys/msdos/vidvga.c index 00a14752f..de3d0b25d 100644 --- a/sys/msdos/vidvga.c +++ b/sys/msdos/vidvga.c @@ -54,11 +54,6 @@ * the Video BIOS ROM on board the VGA adapter. Code in vga_WriteChar * copies the appropriate pixels from the video ROM to the Video buffer. * - * - Currently, most of the routines are in an ifdef OVLB. - * If you change that, you may have to muck with some of the - * variable declarations which now assume this. This is not a - * problem in a non-overlaid environment (djgpp for example). - * * - VGA 640 by 480, 16 colour mode (0x12) uses an odd method to * represent a colour value from the palette. There are four * planes of video memory, all overlaid at the same memory location. @@ -153,7 +148,7 @@ STATIC_VAR struct map_struct { for (x=0; x < COLNO; ++x) { map[y][x].glyph = cmap_to_glyph(S_stone); \ map[y][x].ch = S_stone; map[y][x].attr = 0; map[y][x].special = 0;} } # define TOP_MAP_ROW 1 -# if defined(OVLB) + STATIC_VAR int vgacmap[CLR_MAX] = {0,3,5,9,4,8,12,14,11,2,6,7,1,8,12,13}; STATIC_VAR int viewport_size = 40; /* STATIC_VAR char masktable[8]={0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01}; */ @@ -183,17 +178,6 @@ STATIC_VAR char defpalette[] = { /* Default VGA palette */ int vp[SCREENPLANES] = {8,4,2,1}; # endif int vp2[SCREENPLANES] = {1,2,4,8}; -# else -extern int vgacmap[CLR_MAX]; -extern int viewport_size; -extern char masktable[8]; -extern char bittable[8]; -extern char defpalette[]; -# ifndef ALTERNATE_VIDEO_METHOD -extern int vp[SCREENPLANES]; -# endif -extern int vp2[SCREENPLANES]; -# endif /* OVLB */ STATIC_VAR struct planar_cell_struct *planecell; STATIC_VAR struct overview_planar_cell_struct *planecell_O; @@ -205,18 +189,12 @@ STATIC_VAR struct tibhdr_struct tibheader; /* STATIC_VAR int g_attribute; */ /* Current attribute to use */ -#ifdef OVLB void vga_get_scr_size() { CO = 80; LI = 29; } -#endif /*OVLB*/ - - - -# ifdef OVLB void vga_backsp() @@ -230,9 +208,6 @@ vga_backsp() vga_gotoloc(col,row); } -# endif /* OVLB */ -# ifdef OVL0 - void vga_clear_screen(colour) int colour; @@ -292,10 +267,6 @@ int cy; } } - -# endif /* OVL0 */ - -# ifdef OVLB void vga_tty_end_screen() { @@ -321,7 +292,6 @@ vga_tty_startup(wid, hgt) attrib_gr_intense = ATTRIB_VGA_INTENSE; g_attribute = attrib_gr_normal; /* Give it a starting value */ } -# endif /* OVLB */ /* * Screen output routines (these are heavily used). @@ -344,7 +314,6 @@ vga_tty_startup(wid, hgt) * */ -# ifdef OVL0 void vga_xputs(s,col,row) const char *s; @@ -537,8 +506,6 @@ boolean clearfirst; } } # endif /* USE_TILES && CLIPPING */ -# endif /* OVL0 */ -# ifdef OVL2 void vga_userpan(left) @@ -668,9 +635,7 @@ boolean left; } } # endif /* SCROLLMAP */ -# endif /* OVL2 */ -# ifdef OVLB STATIC_OVL void decal_planar(gp, special) struct planar_cell_struct *gp; @@ -1004,10 +969,6 @@ int len,col,row,colour; } } -# endif /* OVLB */ - - -# ifdef OVLB /* * Initialize the VGA palette with the desired colours. This * must be a series of 48 bytes for use with a card in @@ -1474,7 +1435,6 @@ vga_HideCursor() egawriteplane(15); } # endif /* SIMULATE_CURSOR */ -# endif /* OVLB */ #endif /* SCREEN_VGA */ /* vidvga.c */ diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index a5aea36b7..be5ee3104 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -29,14 +29,7 @@ #include /* for getcwd() prototype */ #endif -#ifdef OVL0 -#define SHARED_DCL -#else -#define SHARED_DCL extern -#endif - - -SHARED_DCL char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */ +char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */ #ifdef TOS boolean run_from_desktop = TRUE; /* should we pause before exiting?? */ @@ -67,23 +60,16 @@ extern void NDECL(mswin_destroy_reg); STATIC_DCL char *FDECL(exepath,(char *)); #endif -#ifdef OVL0 int FDECL(main, (int,char **)); -#endif extern void FDECL(pcmain, (int,char **)); #if defined(__BORLANDC__) && !defined(_WIN32) void NDECL( startup ); -# ifdef OVLB unsigned _stklen = STKSIZ; -# else -extern unsigned _stklen; -# endif #endif -#ifdef OVL0 /* If the graphics version is built, we don't need a main; it is skipped * to help MinGW decide which entry point to choose. If both main and * WinMain exist, the resulting executable won't work correctly. @@ -104,8 +90,6 @@ char *argv[]; return 0; } #endif /*MSWIN_GRAPHICS*/ -#endif /*OVL0*/ -#ifdef OVL1 void pcmain(argc,argv) @@ -667,8 +651,6 @@ boolean wr; if (wr) check_recordfile(dir ? dir : thisdir); } #endif /* CHDIR */ -#endif /*OVL1*/ -#ifdef OVLB #ifdef PORT_HELP # if defined(MSDOS) || defined(WIN32) @@ -718,5 +700,5 @@ char *str; return tmp; } #endif /* EXEPATH */ -#endif /*OVLB*/ + /*pcmain.c*/ diff --git a/sys/share/pcunix.c b/sys/share/pcunix.c index 3a3f50fea..439aaeb19 100644 --- a/sys/share/pcunix.c +++ b/sys/share/pcunix.c @@ -19,8 +19,6 @@ extern void NDECL(backsp); extern void NDECL(clear_screen); #endif -#ifdef OVLB - #if 0 static struct stat buf; #endif @@ -292,8 +290,6 @@ register char *s; *lp = '_'; } # endif /* WIN32 */ -#endif /* OVLB */ - #ifdef __EMX__ void seteuid(int i){;} diff --git a/sys/wince/winhack.c b/sys/wince/winhack.c index 6a768ac49..80d839405 100644 --- a/sys/wince/winhack.c +++ b/sys/wince/winhack.c @@ -8,13 +8,7 @@ #include "mhmain.h" #include "mhmap.h" -#ifdef OVL0 -#define SHARED_DCL -#else -#define SHARED_DCL extern -#endif - -SHARED_DCL char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */ +extern char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */ extern void FDECL(nethack_exit,(int)); static TCHAR* _get_cmd_arg(TCHAR* pCmdLine); diff --git a/win/tty/getline.c b/win/tty/getline.c index c897cb83a..cb797b953 100644 --- a/win/tty/getline.c +++ b/win/tty/getline.c @@ -13,9 +13,7 @@ #include "wintty.h" #include "func_tab.h" -#ifdef OVL1 char morc = 0; /* tell the outside world what char you chose */ -#endif /* OVL1 */ STATIC_DCL boolean FDECL(ext_cmd_getlin_hook, (char *)); typedef boolean FDECL((*getlin_hook_proc), (char *)); @@ -25,8 +23,6 @@ extern int NDECL(extcmd_via_menu); /* cmd.c */ extern char erase_char, kill_char; /* from appropriate tty.c file */ -#ifdef OVL1 - /* * Read a line closed with '\n' into the array char bufp[BUFSZ]. * (The '\n' is not stored. The string is closed with a '\0'.) @@ -197,9 +193,6 @@ register const char *s; /* chars allowed besides return */ } -#endif /* OVL1 */ -#ifdef OVL2 - /* * Implement extended command completion by using this hook into * tty_getlin. Check the characters already typed, if they uniquely @@ -277,8 +270,6 @@ tty_get_ext_cmd() return i; } -#endif /* OVL2 */ - #endif /* TTY_GRAPHICS */ /*getline.c*/ diff --git a/win/tty/termcap.c b/win/tty/termcap.c index 366275df9..3484ddf11 100644 --- a/win/tty/termcap.c +++ b/win/tty/termcap.c @@ -23,22 +23,18 @@ static char * FDECL(e_atr2str, (int)); void FDECL(cmov, (int, int)); void FDECL(nocmov, (int, int)); #if defined(TEXTCOLOR) && defined(TERMLIB) -# ifdef OVLB -# if !defined(UNIX) || !defined(TERMINFO) -# ifndef TOS +# if !defined(UNIX) || !defined(TERMINFO) +# ifndef TOS static void FDECL(analyze_seq, (char *, int *, int *)); -# endif # endif +# endif static void NDECL(init_hilite); static void NDECL(kill_hilite); -# endif /* OVLB */ #endif -#ifdef OVLB /* (see tcap.h) -- nh_CM, nh_ND, nh_CD, nh_HI,nh_HE, nh_US,nh_UE, ul_hack */ struct tc_lcl_data tc_lcl_data = { 0, 0, 0, 0,0, 0,0, FALSE }; -#endif /* OVLB */ STATIC_VAR char *HO, *CL, *CE, *UP, *XD, *BC, *SO, *SE, *TI, *TE; STATIC_VAR char *VS, *VE; @@ -48,18 +44,15 @@ STATIC_VAR char *MR; STATIC_VAR char *MB, *MH; STATIC_VAR char *MD; /* may already be in use below */ #endif + #ifdef TERMLIB # ifdef TEXTCOLOR STATIC_VAR char *MD; # endif STATIC_VAR int SG; -#ifdef OVLB STATIC_OVL char PC = '\0'; -#else /* OVLB */ -STATIC_DCL char PC; -#endif /* OVLB */ STATIC_VAR char tbuf[512]; -#endif +#endif /*TERMLIB*/ #ifdef TEXTCOLOR # ifdef TOS @@ -69,10 +62,8 @@ char NEARDATA *hilites[CLR_MAX]; /* terminal escapes for the various colors */ # endif #endif -#ifdef OVLB static char *KS = (char *)0, *KE = (char *)0; /* keypad sequences */ static char nullstr[] = ""; -#endif /* OVLB */ #if defined(ASCIIGRAPH) && !defined(NO_TERMS) extern boolean HE_resets_AS; @@ -87,8 +78,6 @@ STATIC_VAR char tgotobuf[20]; # endif #endif /* TERMLIB */ -#ifdef OVLB - void tty_startup(wid, hgt) int *wid, *hgt; @@ -489,10 +478,7 @@ tty_end_screen() /* Cursor movements */ -#endif /* OVLB */ - -#ifdef OVL0 -/* Note to OVLx tinkerers. The placement of this overlay controls the location +/* Note to overlay tinkerers. The placement of this overlay controls the location of the function xputc(). This function is not currently in trampoli.[ch] files for what is deemed to be performance reasons. If this define is moved and or xputc() is taken out of the ROOT overlay, then action must be taken @@ -554,7 +540,7 @@ register int x, y; ttyDisplay->curx = x; } -/* See note at OVLx ifdef above. xputc() is a special function. */ +/* See note above. xputc() is a special function. */ void xputc(c) #if defined(apollo) @@ -600,9 +586,6 @@ cl_end() } } -#endif /* OVL0 */ -#ifdef OVLB - void clear_screen() { @@ -615,9 +598,6 @@ clear_screen() } } -#endif /* OVLB */ -#ifdef OVL0 - void home() { @@ -675,9 +655,6 @@ m_end() } #endif -#endif /* OVL0 */ -#ifdef OVLB - void backsp() { @@ -692,9 +669,6 @@ tty_nhbell() (void) fflush(stdout); } -#endif /* OVLB */ -#ifdef OVL0 - #ifdef ASCIIGRAPH void graph_on() { @@ -707,9 +681,6 @@ graph_off() { } #endif -#endif /* OVL0 */ -#ifdef OVL1 - #if !defined(MICRO) # ifdef VMS static const short tmspc10[] = { /* from termcap */ @@ -776,9 +747,6 @@ tty_delay_output() #endif /* MICRO */ } -#endif /* OVL1 */ -#ifdef OVLB - void cl_eos() /* free after Robert Viduya */ { /* must only be called with curx = 1 */ @@ -1175,8 +1143,6 @@ int color; #endif /* TEXTCOLOR */ -#endif /* OVLB */ - #endif /* TTY_GRAPHICS */ /*termcap.c*/ diff --git a/win/tty/topl.c b/win/tty/topl.c index 989ec94d6..da4d39d0a 100644 --- a/win/tty/topl.c +++ b/win/tty/topl.c @@ -19,8 +19,6 @@ STATIC_DCL void FDECL(topl_putsym, (CHAR_P)); STATIC_DCL void NDECL(remember_topl); STATIC_DCL void FDECL(removetopl, (int)); -#ifdef OVLB - int tty_doprev_message() { @@ -117,9 +115,6 @@ tty_doprev_message() return 0; } -#endif /* OVLB */ -#ifdef OVL1 - STATIC_OVL void redotoplin(str) const char *str; @@ -169,9 +164,6 @@ const char *s; ttyDisplay->toplin = 1; } -#endif /* OVL1 */ -#ifdef OVL2 - void more() { @@ -451,9 +443,6 @@ char def; return q; } - -#endif /* OVL2 */ - #endif /* TTY_GRAPHICS */ /*topl.c*/ diff --git a/win/win32/winhack.c b/win/win32/winhack.c index 84061748f..07b31e8ee 100644 --- a/win/win32/winhack.c +++ b/win/win32/winhack.c @@ -33,12 +33,6 @@ typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *); #endif -#ifdef OVL0 -#define SHARED_DCL -#else -#define SHARED_DCL extern -#endif - /* Minimal common control library version Version _WIN_32IE Platform/IE ======= ========= ===========