purge trampoli.h

diff --git a/include/extern.h b/include/extern.h
index ee4d78f68dad86c8af75ed1f3090a53f70570abd..b8f6faaa063406e1ba5c770afe9ea151eb92d594 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -208,20 +208,6 @@ E char FDECL(cmd_from_func, (int NDECL((*))));
 E const char *FDECL(cmdname_from_func, (int NDECL((*)), char *, BOOLEAN_P));
 E boolean FDECL(redraw_cmd, (CHAR_P));
 E const char *FDECL(levltyp_to_name, (int));
-#ifdef USE_TRAMPOLI
-E int NDECL(doextcmd);
-E int NDECL(domonability);
-E int NDECL(doprev_message);
-E int NDECL(timed_occupation);
-E int NDECL(doattributes);
-E int NDECL(wiz_detect);
-E int NDECL(wiz_genesis);
-E int NDECL(wiz_identify);
-E int NDECL(wiz_level_tele);
-E int NDECL(wiz_map);
-E int NDECL(wiz_where);
-E int NDECL(wiz_wish);
-#endif /* USE_TRAMPOLI */
 E void NDECL(reset_occupations);
 E void FDECL(set_occupation, (int (*)(void), const char *, int));
 E char NDECL(pgetchar);
@@ -297,10 +283,6 @@ E void FDECL(use_crystal_ball, (struct obj **));
 E void NDECL(do_mapping);
 E void FDECL(do_vicinity_map, (struct obj *));
 E void FDECL(cvt_sdoor_to_door, (struct rm *));
-#ifdef USE_TRAMPOLI
-E void FDECL(findone, (int, int, genericptr_t));
-E void FDECL(openone, (int, int, genericptr_t));
-#endif
 E int NDECL(findit);
 E int NDECL(openit);
 E boolean FDECL(detecting, (void (*)(int, int, genericptr)));
@@ -318,9 +300,6 @@ E void FDECL(reveal_terrain, (int, int));
 
 E int FDECL(dig_typ, (struct obj *, XCHAR_P, XCHAR_P));
 E boolean NDECL(is_digging);
-#ifdef USE_TRAMPOLI
-E int NDECL(dig);
-#endif
 E int NDECL(holetime);
 E boolean FDECL(dig_check, (struct monst *, BOOLEAN_P, int, int));
 E void FDECL(digactualhole, (int, int, struct monst *, int));
@@ -398,10 +377,6 @@ E int FDECL(warning_of, (struct monst *));
 
 /* ### do.c ### */
 
-#ifdef USE_TRAMPOLI
-E int FDECL(drop, (struct obj *));
-E int NDECL(wipeoff);
-#endif
 E int NDECL(dodrop);
 E boolean FDECL(boulder_hits_pool, (struct obj *, int, int, BOOLEAN_P));
 E boolean FDECL(flooreffects, (struct obj *, int, int, const char *));
@@ -485,14 +460,6 @@ E const char *FDECL(lookup_novel, (const char *, int *));
 
 /* ### do_wear.c ### */
 
-#ifdef USE_TRAMPOLI
-E int NDECL(Armor_on);
-E int NDECL(Boots_on);
-E int NDECL(Gloves_on);
-E int NDECL(Helmet_on);
-E int FDECL(select_off, (struct obj *));
-E int NDECL(take_off);
-#endif
 E const char *FDECL(fingers_or_gloves, (BOOLEAN_P));
 E void FDECL(off_msg, (struct obj *));
 E void FDECL(toggle_displacement, (struct obj *, long, BOOLEAN_P));
@@ -562,9 +529,6 @@ E struct obj *FDECL(droppables, (struct monst *));
 E int FDECL(dog_nutrition, (struct monst *, struct obj *));
 E int FDECL(dog_eat, (struct monst *, struct obj *, int, int, BOOLEAN_P));
 E int FDECL(dog_move, (struct monst *, int));
-#ifdef USE_TRAMPOLI
-E void FDECL(wantdoor, (int, int, genericptr_t));
-#endif
 E void FDECL(finish_meating, (struct monst *));
 
 /* ### dokick.c ### */
@@ -685,12 +649,6 @@ E const char *FDECL(endgamelevelname, (char *, int));
 
 /* ### eat.c ### */
 
-#ifdef USE_TRAMPOLI
-E int NDECL(eatmdone);
-E int NDECL(eatfood);
-E int NDECL(opentin);
-E int NDECL(unfaint);
-#endif
 E void NDECL(eatmupdate);
 E boolean FDECL(is_edible, (struct obj *));
 E void NDECL(init_uhunger);
@@ -724,9 +682,6 @@ E boolean FDECL(Popeye, (int));
 
 E void FDECL(done1, (int));
 E int NDECL(done2);
-#ifdef USE_TRAMPOLI
-E void FDECL(done_intr, (int));
-#endif
 E void FDECL(done_in_by, (struct monst *, int));
 #endif /* !MAKEDEFS_C && MDLIB_C */
 E void VDECL(panic, (const char *, ...)) PRINTF_F(1, 2) NORETURN;
@@ -866,9 +821,6 @@ E boolean FDECL(Death_quote, (char *, int));
 
 E void FDECL(floating_above, (const char *));
 E void FDECL(dogushforth, (int));
-#ifdef USE_TRAMPOLI
-E void FDECL(gush, (int, int, genericptr_t));
-#endif
 E void FDECL(dryup, (XCHAR_P, XCHAR_P, BOOLEAN_P));
 E void NDECL(drinkfountain);
 E void FDECL(dipfountain, (struct obj *));
@@ -1026,9 +978,6 @@ E void FDECL(unsortloot, (Loot **));
 E void FDECL(assigninvlet, (struct obj *));
 E struct obj *FDECL(merge_choice, (struct obj *, struct obj *));
 E int FDECL(merged, (struct obj **, struct obj **));
-#ifdef USE_TRAMPOLI
-E int FDECL(ckunpaid, (struct obj *));
-#endif
 E void FDECL(addinv_core1, (struct obj *));
 E void FDECL(addinv_core2, (struct obj *));
 E struct obj *FDECL(addinv, (struct obj *));
@@ -1144,10 +1093,6 @@ E int NDECL(wiz_light_sources);
 
 /* ### lock.c ### */
 
-#ifdef USE_TRAMPOLI
-E int NDECL(forcelock);
-E int NDECL(picklock);
-#endif
 E boolean FDECL(picking_lock, (int *, int *));
 E boolean FDECL(picking_at, (int, int));
 E void FDECL(breakchestlock, (struct obj *, BOOLEAN_P));
@@ -1318,9 +1263,6 @@ E void NDECL(gain_guardian_angel);
 
 /* ### mklev.c ### */
 
-#ifdef USE_TRAMPOLI
-E int FDECL(do_comp, (genericptr_t, genericptr_t));
-#endif
 E void NDECL(sort_rooms);
 E void FDECL(add_room, (int, int, int, int, BOOLEAN_P, SCHAR_P, BOOLEAN_P));
 E void FDECL(add_subroom, (struct mkroom *, int, int, int, int, BOOLEAN_P,
@@ -1704,9 +1646,6 @@ E boolean FDECL(find_defensive, (struct monst *));
 E int FDECL(use_defensive, (struct monst *));
 E int FDECL(rnd_defensive_item, (struct monst *));
 E boolean FDECL(find_offensive, (struct monst *));
-#ifdef USE_TRAMPOLI
-E int FDECL(mbhitm, (struct monst *, struct obj *));
-#endif
 E int FDECL(use_offensive, (struct monst *));
 E int FDECL(rnd_offensive_item, (struct monst *));
 E boolean FDECL(find_misc, (struct monst *));
@@ -1998,10 +1937,6 @@ E boolean FDECL(allow_category, (struct obj *));
 E boolean FDECL(is_worn_by_type, (struct obj *));
 E int FDECL(ck_bag, (struct obj *));
 E void FDECL(removed_from_icebox, (struct obj *));
-#ifdef USE_TRAMPOLI
-E int FDECL(in_container, (struct obj *));
-E int FDECL(out_container, (struct obj *));
-#endif
 E int FDECL(pickup, (int));
 E int FDECL(pickup_object, (struct obj *, long, BOOLEAN_P));
 E int FDECL(query_category, (const char *, struct obj *, int,
@@ -2104,9 +2039,6 @@ E const char *NDECL(bottlename);
 
 E boolean FDECL(critically_low_hp, (BOOLEAN_P));
 E boolean NDECL(stuck_in_wall);
-#ifdef USE_TRAMPOLI
-E int NDECL(prayer_done);
-#endif
 E int NDECL(dosacrifice);
 E boolean FDECL(can_pray, (BOOLEAN_P));
 E int NDECL(dopray);
@@ -2197,9 +2129,6 @@ E void FDECL(drop_boulder_on_player,
              (BOOLEAN_P, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
 E boolean FDECL(drop_boulder_on_monster, (int, int, BOOLEAN_P, BOOLEAN_P));
 E void FDECL(wand_explode, (struct obj *, int));
-#ifdef USE_TRAMPOLI
-E void FDECL(set_lit, (int, int, genericptr_t));
-#endif
 E void FDECL(litroom, (BOOLEAN_P, struct obj *));
 E void FDECL(do_genocide, (int));
 E void FDECL(punish, (struct obj *));
@@ -2534,9 +2463,6 @@ E void FDECL(l_register_des, (lua_State *));
 /* ### spell.c ### */
 
 E void FDECL(book_cursed, (struct obj *));
-#ifdef USE_TRAMPOLI
-E int NDECL(learn);
-#endif
 E int FDECL(study_book, (struct obj *));
 E void FDECL(book_disappears, (struct obj *));
 E void FDECL(book_substitution, (struct obj *, struct obj *));
@@ -2551,10 +2477,6 @@ E void FDECL(initialspell, (struct obj *));
 
 /* ### steal.c ### */
 
-#ifdef USE_TRAMPOLI
-E int NDECL(stealarm);
-E void NDECL(unstolenarm);
-#endif
 E long FDECL(somegold, (long));
 E void FDECL(stealgold, (struct monst *));
 E void NDECL(thiefdead);

diff --git a/include/hack.h b/include/hack.h
index 9900d54263be8f12b700cf3de1b28ce80dcee278..0917b93c472d9d2ca78d0c8d77a9ec2945486264 100644 (file)
--- a/include/hack.h
+++ b/include/hack.h
@@ -272,23 +272,10 @@ typedef struct sortloot_item Loot;
 #include "display.h"
 #include "engrave.h"
 
-#ifdef USE_TRAMPOLI /* this doesn't belong here, but we have little choice */
-#undef NDECL
-#define NDECL(f) f()
-#endif
-
 #include "extern.h"
 #include "winprocs.h"
 #include "sys.h"
 
-#ifdef USE_TRAMPOLI
-#include "wintty.h"
-#undef WINTTY_H
-#include "trampoli.h"
-#undef EXTERN_H
-#include "extern.h"
-#endif /* USE_TRAMPOLI */
-
 /* flags to control makemon(); goodpos() uses some plus has some of its own*/
 #define NO_MM_FLAGS 0x000000L /* use this rather than plain 0 */
 #define NO_MINVENT  0x000001L /* suppress minvent when creating mon */

diff --git a/include/pcconf.h b/include/pcconf.h
index 5e0445eba7e418224df10d113ab3b220cb1b209d..e2e6eca8ae73584a16f676234f4542ace1261db6 100644 (file)
--- a/include/pcconf.h
+++ b/include/pcconf.h
@@ -259,22 +259,6 @@
 
 /* Sanity check, do not modify these blocks. */
 
-/* OVERLAY must be defined with MOVERLAY or VROOMM */
-#if (defined(MOVERLAY) || defined(VROOMM))
-#ifndef OVERLAY
-#define OVERLAY
-#endif
-#endif
-
-#if defined(FUNCTION_LEVEL_LINKING)
-#define OVERLAY
-#endif
-
-#if defined(OVERLAY) && !defined(MOVERLAY) && !defined(VROOMM) \
-    && !defined(FUNCTION_LEVEL_LINKING)
-#define USE_TRAMPOLI
-#endif
-
 #if defined(MSDOS) && defined(NO_TERMS)
 #ifdef TERMLIB
 #if defined(_MSC_VER) || defined(__SC__)

diff --git a/include/tradstdc.h b/include/tradstdc.h
index 65fea90b08e23c703e91be7a303246b331f5951f..3827195f53f06b7a6a258bf60b18208861396dae 100644 (file)
--- a/include/tradstdc.h
+++ b/include/tradstdc.h
@@ -184,11 +184,10 @@ typedef const char *vA;
  * FDECL() is used for functions with a fixed number of arguments;
  * VDECL() is used for functions with a variable number of arguments.
  * Separate macros are needed because ANSI will mix old-style declarations
- * with prototypes, except in the case of varargs, and the OVERLAY-specific
- * trampoli.* mechanism conflicts with the ANSI <<f(void)>> syntax.
- */
+ * with prototypes, except in the case of varargs
+  */
 
-#define NDECL(f) f(void) /* overridden later if USE_TRAMPOLI set */
+#define NDECL(f) f(void)
 
 #define FDECL(f, p) f p
 

diff --git a/include/trampoli.h b/outdated/include/trampoli.h
similarity index 100%
rename from include/trampoli.h
rename to outdated/include/trampoli.h

diff --git a/outdated/sys/amiga/Makefile.agc b/outdated/sys/amiga/Makefile.agc
index 22b1473f6e5f1cb7083d62599982736b2968ab37..5f36d00499263f07de65e875296c2628e5eced57 100644 (file)
--- a/outdated/sys/amiga/Makefile.agc
+++ b/outdated/sys/amiga/Makefile.agc
@@ -1185,7 +1185,7 @@ $(I)global.h:  $(I)coord.h $(I)pcconf.h $(I)amiconf.h
 $(I)hack.h:  $(I)config.h $(I)context.h $(I)trap.h $(I)decl.h $(I)dungeon.h 
                $(I)monsym.h $(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h 
                $(I)vision.h $(I)display.h $(I)wintype.h $(I)engrave.h 
-               $(I)rect.h $(I)region.h $(I)trampoli.h $(I)sys.h
+               $(I)rect.h $(I)region.h $(I)sys.h
        -setdate $(I)hack.h
        -c:wait 2
 
@@ -1211,7 +1211,7 @@ $(I)dungeon.h: $(I)align.h
        -setdate $(I)dungeon.h
        -c:wait 2
 
-$(I)engrave.h: $(I)trampoli.h $(I)rect.h
+$(I)engrave.h: $(I)rect.h
        -setdate $(I)engrave.h
        -c:wait 2
 

diff --git a/outdated/sys/amiga/Makefile.ami b/outdated/sys/amiga/Makefile.ami
index b3b29e7754157e66af940d726e0302463a7aad3f..d07a6633bb8ba38f270149e2b13f84a0718ab33f 100644 (file)
--- a/outdated/sys/amiga/Makefile.ami
+++ b/outdated/sys/amiga/Makefile.ami
@@ -1521,7 +1521,7 @@ $(I)global.h:  $(I)coord.h $(I)pcconf.h $(I)amiconf.h
 $(I)hack.h:  $(I)config.h $(I)context.h $(I)trap.h $(I)decl.h $(I)dungeon.h \
                $(I)monsym.h $(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h \
                $(I)vision.h $(I)display.h $(I)wintype.h $(I)engrave.h \
-               $(I)rect.h $(I)region.h $(I)trampoli.h $(I)sys.h
+               $(I)rect.h $(I)region.h $(I)sys.h
        -setdate $(I)hack.h
        -wait 2
 
@@ -1547,7 +1547,7 @@ $(I)dungeon.h: $(I)align.h
        -setdate $(I)dungeon.h
        -wait 2
 
-$(I)engrave.h: $(I)trampoli.h $(I)rect.h
+$(I)engrave.h: $(I)rect.h
        -setdate $(I)engrave.h
        -wait 2
 

diff --git a/outdated/sys/wince/bootstrp.mak b/outdated/sys/wince/bootstrp.mak
index 35cb625951b7f8b2f1df5845e0453eb4cb509bfb..3d2414cb1e2e86fd1f3099fce74c452fabbeccfd 100644 (file)
--- a/outdated/sys/wince/bootstrp.mak
+++ b/outdated/sys/wince/bootstrp.mak
@@ -200,7 +200,7 @@ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \
                $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
                $(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \
                $(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h \
-               $(INCL)\wintty.h $(INCL)\trampoli.h
+               $(INCL)\wintty.h
 
 DGN_FILE_H  = $(INCL)\dgn_file.h
 LEV_COMP_H  = $(INCL)\lev_comp.h

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index 6ffb918d0617fbbd90ed111e960e0e1a969f05ed..0837d991b63247891c2e91ccd3e493eb341dc741 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -400,7 +400,7 @@ HACK_H         = $(CONFIG_H)        $(INCL)/context.h  $(DUNGEON_H)        \
             $(INCL)/mkroom.h   $(INCL)/objclass.h $(INCL)/trap.h      \
             $(INCL)/flag.h     $(RM_H)            $(INCL)/vision.h    \
             $(INCL)/wintype.h  $(INCL)/engrave.h  $(INCL)/rect.h      \
-            $(INCL)/trampoli.h $(INCL)/hack.h     $(REGION_H)         \
+            $(INCL)/hack.h     $(REGION_H)            \
             $(INCL)/sys.h
 DLB_H      = $(INCL)/dlb.h
 

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 335d718537c19c65eca6520707fb3175cfc14399..76631e60f14338ecbb4bcdc52fe917c58eb7b114 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -566,7 +566,7 @@ HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
        monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \
        optlist.h patchlevel.h pcconf.h permonst.h prop.h rect.h \
        region.h rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h \
-       tradstdc.h trampoli.h trap.h unixconf.h vision.h vmsconf.h \
+       tradstdc.h trap.h unixconf.h vision.h vmsconf.h \
        wintty.h wincurs.h winX.h winprocs.h wintype.h you.h youprop.h
 
 HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h dgn_file.h
@@ -852,7 +852,7 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \
                ../include/mextra.h ../include/skills.h ../include/onames.h \
                ../include/timeout.h ../include/trap.h ../include/flag.h \
                ../include/vision.h ../include/display.h ../include/winprocs.h \
-               ../include/sys.h ../include/wintty.h ../include/trampoli.h
+               ../include/sys.h ../include/wintty.h
        touch $(HACK_H)
 #
 $(TARGETPFX)pcmain.o: ../sys/share/pcmain.c $(HACK_H) ../include/dlb.h

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index 807c7231ebc6cf64b29425757cd77faf9ba106ae..db847d7fc0f0e108c3b02ac0a779ec501d2b69b5 100644 (file)
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -261,7 +261,6 @@
                3186A38921A4B0FB0052BF02 /* mttypriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mttypriv.h; path = ../../include/mttypriv.h; sourceTree = "<group>"; };
                3186A38A21A4B0FB0052BF02 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system.h; path = ../../include/system.h; sourceTree = "<group>"; };
                3186A38B21A4B0FC0052BF02 /* onames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = onames.h; path = ../../include/onames.h; sourceTree = "<group>"; };
-               3186A38C21A4B0FC0052BF02 /* trampoli.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trampoli.h; path = ../../include/trampoli.h; sourceTree = "<group>"; };
                3186A38D21A4B0FC0052BF02 /* vis_tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vis_tab.h; path = ../../include/vis_tab.h; sourceTree = "<group>"; };
                3186A38E21A4B0FC0052BF02 /* dlb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dlb.h; path = ../../include/dlb.h; sourceTree = "<group>"; };
                3186A38F21A4B0FC0052BF02 /* monflag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = monflag.h; path = ../../include/monflag.h; sourceTree = "<group>"; };
@@ -747,7 +746,6 @@
                                3186A39421A4B0FC0052BF02 /* tileset.h */,
                                3186A3CA21A4B0FE0052BF02 /* timeout.h */,
                                3186A3C721A4B0FE0052BF02 /* tradstdc.h */,
-                               3186A38C21A4B0FC0052BF02 /* trampoli.h */,
                                3186A3CD21A4B0FE0052BF02 /* trap.h */,
                                3186A3AD21A4B0FD0052BF02 /* unixconf.h */,
                                3186A38D21A4B0FC0052BF02 /* vis_tab.h */,

diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src
index 8e5ac62cf93de9a2575adfea54a2d539e07e35be..fa561d17e776d2049d502523ded299431ab6aa84 100644 (file)
--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -180,7 +180,7 @@ HACKINCL = align.h artifact.h artilist.h attrib.h color.h \
           monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \
           patchlevel.h pcconf.h permonst.h prop.h rect.h \
           region.h rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h \
-          tradstdc.h trampoli.h trap.h unixconf.h vision.h \
+          tradstdc.h trap.h unixconf.h vision.h \
           vmsconf.h wintty.h winX.h winprocs.h wintype.h you.h youprop.h
 
 #HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h\
@@ -403,7 +403,7 @@ $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
                $(INC)onames.h $(INC)timeout.h $(INC)trap.h \
                $(INC)flag.h $(INC)rm.h $(INC)vision.h \
                $(INC)display.h $(INC)engrave.h $(INC)rect.h $(INC)region.h \
-               $(INC)winprocs.h $(INC)wintty.h $(INC)trampoli.h $(INC)sys.h
+               $(INC)winprocs.h $(INC)wintty.h $(INC)sys.h
        $(TOUCH) $(HACK_H)
 #      VMS-specific code
 vmsmain.obj :  $(VMS)vmsmain.c $(HACK_H) $(INC)dlb.h

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index c2b2d1c16f5062a1f5a0877aa07ed5c60ac8e7e2..21ae0aa535e57b32e3fa03f1f0c896b42bccf63c 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -501,7 +501,7 @@ HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
               $(INCL)/timeout.h $(INCL)/trap.h $(INCL)/flag.h $(INCL)/rm.h \
               $(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \
               $(INCL)/rect.h $(INCL)/region.h $(INCL)/winprocs.h \
-              $(INCL)/wintty.h $(INCL)/sys.h $(INCL)/trampoli.h
+              $(INCL)/wintty.h $(INCL)/sys.h
 
 DGN_FILE_H  = $(INCL)/dgn_file.h
 SP_LEV_H    = $(INCL)/sp_lev.h

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index c793dd87844794371f8ac2abcc0e9ce75ed4ed15..6aa6d484b3dd464e707624116e9894d16e37f656 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -501,8 +501,7 @@ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \
                $(INCL)\mextra.h $(INCL)\skills.h $(INCL)\onames.h \
                $(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h \
                $(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \
-               $(INCL)\winprocs.h $(INCL)\sys.h $(INCL)\wintty.h \
-               $(INCL)\trampoli.h
+               $(INCL)\winprocs.h $(INCL)\sys.h $(INCL)\wintty.h
 
 TILE_H      = ..\win\share\tile.h
 

diff --git a/util/mdgrep.pl b/util/mdgrep.pl
index 72eb7b56781d3f36bd055e5d56bd0fd2d0b2578c..72c06efb7241b5ffdbdb343574fc9ba0045f25eb 100644 (file)
--- a/util/mdgrep.pl
+++ b/util/mdgrep.pl
@@ -44,7 +44,6 @@
 # NeXT __osf__ SVR4 _AIX32 _BULL_SOURCE AUX __sgi GNUDOS
 # TIMED_DELAY DEF_MAILREADER DEF_PAGER NO_SIGNAL PC_LOCKING LATTICE __GO32__
 # msleep NO_FILE_LINKS bsdi HPUX AMIFLUSH
-# OVERLAY USE_TRAMPOLI USE_OVLx SPEC_LEV DGN_COMP
 # SCREEN_BIOS SCREEN_DJGPPFAST SCREEN_VGA SCREEN_8514
 # EXEPATH NOTSTDC SELECTSAVED NOTPARMDECL
 

diff --git a/win/win32/vs/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj
index d49463e30620c7d9ea41b0a59018a99073f3fb83..994b7213e0b9dde9b11fb88888b81bf1088da4cc 100644 (file)
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/win/win32/vs/NetHackW.vcxproj
@@ -310,7 +310,6 @@
     <ClInclude Include="$(IncDir)tileset.h" />\r
     <ClInclude Include="$(IncDir)timeout.h" />\r
     <ClInclude Include="$(IncDir)tradstdc.h" />\r
-    <ClInclude Include="$(IncDir)trampoli.h" />\r
     <ClInclude Include="$(IncDir)trap.h" />\r
     <ClInclude Include="$(IncDir)unixconf.h" />\r
     <ClInclude Include="$(IncDir)vision.h" />\r

diff --git a/win/win32/vs/tilemap.vcxproj b/win/win32/vs/tilemap.vcxproj
index 139dd17a2dfb6bceaa2101d6b97f0f776f350bdb..8ab1ab1db80db9d5ff94fc1cd0d6812027706e84 100644 (file)
--- a/win/win32/vs/tilemap.vcxproj
+++ b/win/win32/vs/tilemap.vcxproj
@@ -67,7 +67,6 @@
     <ClInclude Include="$(IncDir)spell.h" />\r
     <ClInclude Include="$(IncDir)timeout.h" />\r
     <ClInclude Include="$(IncDir)tradstdc.h" />\r
-    <ClInclude Include="$(IncDir)trampoli.h" />\r
     <ClInclude Include="$(IncDir)trap.h" />\r
     <ClInclude Include="$(IncDir)vision.h" />\r
     <ClInclude Include="$(IncDir)winprocs.h" />\r
@@ -86,4 +85,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r