diff -Naurd ../nethack-3.4.1/sys/msdos/Install.dos ./sys/msdos/Install.dos --- ../nethack-3.4.1/sys/msdos/Install.dos Sun Feb 23 14:43:35 2003 +++ ./sys/msdos/Install.dos Mon Sep 1 14:33:32 2003 @@ -7,7 +7,7 @@ NetHack 3.4 on a DOS system ====================================================== (or, How to make PC NetHack 3.4) - Last revision: $Date: 2003/02/22 01:20:02 $ + Last revision: $Date: 2003/06/13 19:57:52 $ Credit for a runnable full PC NetHack 3.4 goes to the PC Development team of Paul Winner, Kevin Smolkowski, Michael Allison, Yitzhak Sapir, Bill Dyer, @@ -55,7 +55,10 @@ or byacc). While not strictly necessary to compile nethack, they are required should you desire to make any changes to the level and dungeon compilers. Flex and Bison are included with the DJGPP distribution and - are also available on many archive sites. + are also available on many archive sites. + + Also be sure to pick up djgpp v2gnu/fil41b.zip to get ls.exe and + touch.exe, since the Makefile uses them by default. II. To compile your copy of NetHack on a DOS machine: (or "just follow these few 'simple' steps outlined below.") @@ -217,6 +220,9 @@ At the time of this release in April 2002, the URL http://www.delorie.com/djgpp/zip-picker.html/ had information on how to obtain djgpp and what pieces to get. + Be sure to pick up djgpp v2gnu/fil41b.zip to get ls.exe and + touch.exe, since the Makefile uses them by default (or change + the Makefile to use alternatives). Special note for Windows 2000 / Windows XP users: You must have a recent djgpp distribution for the build process, and the generated diff -Naurd ../nethack-3.4.1/sys/msdos/Makefile.GCC ./sys/msdos/Makefile.GCC --- ../nethack-3.4.1/sys/msdos/Makefile.GCC Sun Feb 23 14:43:36 2003 +++ ./sys/msdos/Makefile.GCC Mon Sep 1 14:33:32 2003 @@ -1,4 +1,4 @@ -# SCCS Id: @(#)Makefile.GCC 3.4 $Date: 2003/02/17 23:56:35 $ +# SCCS Id: @(#)Makefile.GCC 3.4 $Date: 2003/06/15 15:56:45 $ # Copyright (c) NetHack PC Development Team 1996-2003. # PC NetHack 3.4 Makefile for djgpp V2 # @@ -67,6 +67,10 @@ # If you have yacc/lex or a work-alike set YACC_LEX to Y # YACC_LEX = Y +ifeq ($(YACC_LEX),Y) +DO_YACC = YACC_ACT +DO_LEX = LEX_ACT +endif # If YACC_LEX is Y above, set the following to values appropriate for # your tools. @@ -75,6 +79,10 @@ LEX = flex YTABC = y_tab.c YTABH = y_tab.h +#If your tool produces y.tab.c and y.tab.h DOS might require +#the following instead. +#YTABC = ytab~1.c +#YTABH = ytab~1.h LEXYYC = lexyy.c # @@ -83,8 +91,9 @@ USE_DLB = Y -# djgpp ships with an ls.exe command so changing this should -# not be necessary +# djgpp includes ls.exe and touch.exe in fil41b.zip from the v2gnu +# folder so be sure to include that when downloading djgpp. Doing +# so will make changing this unnecessary. LS = ls -1 # ls.exe from djgpp distribution #LS = dir /l/b # DOS command @@ -608,15 +617,15 @@ ifeq "$(DO_YACC)" "YACC_ACT" -$(INCL)/lev_comp.h: lev_yacc.c +$(INCL)/lev_comp.h: $(U)lev_yacc.c $(U)lev_yacc.c $(INCL)/lev_comp.h : $(U)lev_comp.y - @$(subst /,\,chdir $(U)) & \ - @$(subst /,\,$(YACC) -d lev_comp.y) & \ - @$(subst /,\,copy $(YTABC) lev_yacc.c) & \ - @$(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h) & \ - @$(subst /,\,@del $(YTABC)) & \ - @$(subst /,\,@del $(YTABH)) & \ + @$(subst /,\,chdir $(UTIL)) + @$(subst /,\,$(YACC) -d lev_comp.y) + @$(subst /,\,copy $(YTABC) lev_yacc.c) + @$(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h) + @$(subst /,\,@del $(YTABC)) + @$(subst /,\,@del $(YTABH)) @$(subst /,\,chdir $(SRC)) else @@ -638,10 +647,11 @@ $(U)lev_$(LEX).c: $(U)lev_comp.l ifeq "$(DO_LEX)" "LEX_ACT" - @$(subst /,\,chdir $(U)) & \ - @$(subst /,\,$(LEX) $(FLEXSKEL) lev_comp.l) & \ - @$(subst /,\,copy $(LEXYYC) $@) & \ - @$(subst /,\,@del $(LEXYYC)) & \ + @$(subst /,\,chdir $(UTIL)) + @$(subst /,\,$(LEX) $(FLEXSKEL) lev_comp.l) + @$(subst /,\,if exist $@ del $@) + @$(subst /,\,copy $(LEXYYC) $@) + @$(subst /,\,del $(LEXYYC)) @$(subst /,\,chdir $(SRC)) else @echo --- @@ -660,12 +670,12 @@ ifeq "$(DO_YACC)" "YACC_ACT" $(U)dgn_yacc.c $(INCL)/dgn_comp.h : $(U)dgn_comp.y - @$(subst /,\,chdir $(U)) & \ - @$(subst /,\,$(YACC) -d dgn_comp.y) & \ - @$(subst /,\,copy $(YTABC) dgn_yacc.c) & \ - @$(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) & \ - @$(subst /,\,@del $(YTABC)) & \ - @$(subst /,\,@del $(YTABH)) & \ + @$(subst /,\,chdir $(UTIL)) + @$(subst /,\,$(YACC) -d dgn_comp.y) + @$(subst /,\,copy $(YTABC) dgn_yacc.c) + @$(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) + @$(subst /,\,@del $(YTABC)) + @$(subst /,\,@del $(YTABH)) @$(subst /,\,chdir $(SRC)) else $(U)dgn_yacc.c: $(SSHR)/dgn_yacc.c @@ -687,10 +697,11 @@ ifeq "$(DO_LEX)" "LEX_ACT" $(U)dgn_$(LEX).c: $(U)dgn_comp.l $(INCL)/dgn_comp.h - @$(subst /,\,chdir $(U)) & \ - @$(subst /,\,$(LEX) $(FLEXSKEL) dgn_comp.l) & \ - @$(subst /,\,copy $(LEXYYC) $@) & \ - @$(subst /,\,@del $(LEXYYC)) & \ + @$(subst /,\,chdir $(UTIL)) + @$(subst /,\,$(LEX) $(FLEXSKEL) dgn_comp.l) + @$(subst /,\,if exist $@ del $@) + @$(subst /,\,copy $(LEXYYC) $@) + @$(subst /,\,del $(LEXYYC)) @$(subst /,\,chdir $(SRC)) else @@ -938,7 +949,7 @@ @$(subst /,\,echo wizhelp >>dlb.lst) @$(subst /,\,echo license >>dlb.lst) @$(subst /,\,echo msdoshlp.txt >>dlb.lst) - @$(subst /,\,$(LS) *.lev >>dlb.lst) + $(LS) $(subst /,\,*.lev) >>dlb.lst @$(subst /,\,$(U)dlb_main cvIf dlb.lst nhdat) @$(subst /,\,cd $(SRC)) diff -Naurd ../nethack-3.4.1/sys/msdos/msdos.c ./sys/msdos/msdos.c --- ../nethack-3.4.1/sys/msdos/msdos.c Sun Feb 23 14:43:36 2003 +++ ./sys/msdos/msdos.c Mon Sep 1 14:33:32 2003 @@ -178,13 +178,13 @@ {'9', M('9'), '9'}, /* 9 */ {'m', C('p'), C('p')}, /* - */ {'4', M('4'), '4'}, /* 4 */ - {'g', 'G', 'g'}, /* 5 */ + {'5', M('5'), '5'}, /* 5 */ {'6', M('6'), '6'}, /* 6 */ {'p', 'P', C('p')}, /* + */ {'1', M('1'), '1'}, /* 1 */ {'2', M('2'), '2'}, /* 2 */ {'3', M('3'), '3'}, /* 3 */ - {'i', 'I', C('i')}, /* Ins */ + {'0', M('0'), '0'}, /* Ins */ {'.', ':', ':'} /* Del */ #endif }; diff -Naurd ../nethack-3.4.1/sys/msdos/msdoshlp.txt ./sys/msdos/msdoshlp.txt --- ../nethack-3.4.1/sys/msdos/msdoshlp.txt Sun Feb 23 14:43:36 2003 +++ ./sys/msdos/msdoshlp.txt Mon Sep 1 14:33:32 2003 @@ -1,7 +1,7 @@ - MSDOS specific help file for NetHack 3.4.1 - (Last Revision: December 4, 1999) + MSDOS specific help file for NetHack 3.4.2 + (Last Revision: March 16, 2003) -Copyright (c) NetHack PC Development Team 1993-1999. +Copyright (c) NetHack PC Development Team 1993-2003. NetHack may be freely distributed. See license for details. New players should be sure to read GuideBoo.txt which contains essential diff -Naurd ../nethack-3.4.1/sys/msdos/schema3.MSC ./sys/msdos/schema3.MSC --- ../nethack-3.4.1/sys/msdos/schema3.MSC Sun Feb 23 14:43:36 2003 +++ ./sys/msdos/schema3.MSC Mon Sep 1 14:33:32 2003 @@ -1,4 +1,4 @@ -; SCCS Id: @(#)schema3.MSC 3.4 2000/07/31 +; SCCS Id: @(#)schema3.MSC 3.4 2003/08/03 ; Copyright (c) NetHack PC Development Team, 2000 ; ; NetHack Overlay Schema @@ -43,7 +43,7 @@ functions:18 _backfire _backsp _bad_location _bad_negation _bad_rock _badoption _bail _ballfall functions:19 _bc_order _bclose _bcsign _beg _begin_burn _bflush _bhit _bhitm functions:20 _bhito _bhitpile _big_to_little _bill_box_content _bill_dummy_object _bite _bless _blessorcurse -functions:21 _Blindf_off _Blindf_on _block_door _block_entry _block_point _blow_up_landmine _body_part _boolopt_only_initial +functions:21 _Blindf_off _Blindf_on _block_door _block_entry _block_point _blow_up_landmine _body_part functions:22 _boomhit _Boots_off _Boots_on _bot _bot1 _bot2 _boulder_hits_pool _bound_digging functions:23 _boxlock _br_string _break_armor _break_statue _breakarm _breakmsg functions:24 _breakobj _breaks _breaksink _breaktest _breamu _bribe _bufoff _bufon @@ -74,7 +74,7 @@ functions:49 _delete_levelfile _delete_savefile _delfloortrap _deliver_by_pline _deliver_by_window _delobj _deltrap _demon_talk functions:50 _demonpet _destroy_arm _destroy_drawbridge _destroy_item _destroy_mitem _dev_name _dig functions:51 _dig_check _dig_corridor _dig_point _dig_typ _digactualhole _dighole _digit _dipfountain -functions:52 _disable_ctrlP _disarm_beartrap _disarm_landmine _disarm_shooting_trap _disarm_squeaky_board _discard_minvent _disclose _discover_object +functions:52 _disable_ctrlP _disarm_landmine _disarm_shooting_trap _disarm_squeaky_board _discard_minvent _disclose _discover_object functions:53 _diseasemu _display_binventory _display_cinventory _display_gamewindows _display_inventory _display_minventory functions:54 _distant_name _distfleeck _disturb _djinni_from_bottle _dlb_cleanup _dlb_fclose functions:55 _dlb_fgets _dlb_fopen _dlb_fread _dlb_fseek _dlb_ftell _dlb_init _dlord _dmgtype @@ -82,7 +82,7 @@ functions:57 _do_earthquake _do_entity _do_genocide _do_improvisation _do_light_sources _do_look _do_mapping _do_mname functions:57 _vga_xputg _vga_xputs _video_update_positionbar _view_from _view_init _visctrl _vision_init _vision_recalc functions:58 _do_oname _do_osshock _do_play_instrument _do_reset_eat _do_room_or_subroom _do_storms _do_takeoff -functions:60 _doclose _doconfuse _doconsult _docorner _docrt _doddoremarm _doddrop _dodip +functions:60 _doclose _doconsult _docorner _docrt _doddoremarm _doddrop _dodip functions:61 _adjust_prefix _build_plselection_prompt _duplicate_opt_detection _enter_explore_mode _maybe_wail functions:62 _doextcmd _doextlist _doextversion _dofindgem _dofiretrap _doforce _dog_eat _dog_goal functions:63 _dog_hunger _dog_invent _dog_move _dog_nutrition _dogfood _dogushforth _dohelp _dohide @@ -117,7 +117,7 @@ functions:92 _fprefx _fracture_rock _free_dungeons _free_rooms _free_ttlist _free_window_info _freediskspace _freedynamicdata functions:93 _freefruitchn _freehand _freeinv _friday_13th _fruitadd _fry_by_god _fully_identify_obj _g_at functions:94 _gainstr _gameDiskPrompt _gazemm _gazemu _gd_move _gd_sound _gem_accept -functions:95 _display_artifact_score _display_warning _dlb_fgetc _doattributes _dochug _dochugw +functions:95 _display_warning _dlb_fgetc _doattributes _dochug _dochugw functions:96 _fill_point _fill_room _fill_zoo _fillholetyp _find_ac _find_branch _find_branch_room _find_defensive functions:96 _get_mon_location _get_mplname _get_obj_location _get_rect _get_rect_ind _get_room_loc _get_scr_size _get_shop_item functions:97 _get_uchars _get_unused_cs _get_valuables _get_wall_for_db _get_wet _get_wormno _getbones _getdir @@ -145,7 +145,7 @@ functions:119 _sticks _still_chewing _stock_room _stolen_container _stolen_value _stone_luck _stoned_dialogue _stop_occupation functions:120 _kick_monster _kick_object _kickdmg _kickstr _kill_egg _kill_eggs _kill_genocided_monsters _killed functions:121 _kind_name _known_hitum _kops_gone _l_monnam _lantern_message _launch_obj _lava_effects -functions:122 _ldrname _leader_speaks _leaderless _learn_egg_type _ledger_no _ledger_to_dlev _ledger_to_dnum +functions:122 _ldrname _leader_speaks _learn_egg_type _ledger_no _ledger_to_dlev _ledger_to_dnum functions:123 _left_side _lesshungry _let_to_name _letter _lev_by_name _level_difficulty _level_distance _level_range functions:124 _level_tele _level_tele_trap _levl_follower _lifesaved_monster _lift_object _light_cocktail _light_region _lined_up functions:125 _linedup _list_genocided _list_vanquished _litroom _litter _little_to_big _llord _lminion @@ -161,7 +161,7 @@ functions:135 _map_menu_cmd _map_object _map_trap _match_optname _mattackm _mattacku _max_capacity _max_mon_load functions:136 _max_passive_dmg _max_rank_sz _maxledgerno _may_dig _may_passwall _maybe_write_ls _maybe_write_timer _mayberem functions:137 _maze0xy _maze1xy _mazexy _mb_trapped _mbag_explodes _mbhit _mbhitm _mcalcdistress -functions:138 _md_rush _md_start _md_stop _mdig_tunnel _meatgold +functions:138 _md_rush _md_start _md_stop _mdig_tunnel functions:139 _meatobj _melt_ice _menu_drop _menu_identify _menu_loot _menu_remarm _mergable _merge_choice functions:140 _merged _mfndpos _midnight _migrate_to_level _mineralize _minit _miniwalk _minstapetrify functions:140 _On_stairs _on_start _On_W_tower_level _oname _onbill _online2 _only_here _onlyspace @@ -326,8 +326,6 @@ ; the following were 225 functions:294 _erode_armor functions:295 _swallowed -; the following were 233 -functions:296 _erode_weapon ; the following were 7 functions:298 _acurrstr ; the following were 17 @@ -387,7 +385,7 @@ functions:349 _wakeup functions:350 _walkfrom functions:351 _wall_angle -functions:352 _able_to_loot _add_artifact_score _add_mon_to_reg _add_rect_to_reg _add_region _addinv_core1 +functions:352 _able_to_loot _add_mon_to_reg _add_rect_to_reg _add_region _addinv_core1 functions:352 _addinv_core2 _age_spells _align_gtitle _align_shift _align_str _all_but_uchain functions:353 _allow_all _allow_category _already_wearing _already_wearing2 _angrygods functions:354 _animate_statue _antholemon _arti_speak _assign_warnings _attach_fig_transform_timeout _blocked_boulder diff -Naurd ../nethack-3.4.1/include/pcconf.h ./include/pcconf.h --- ../nethack-3.4.1/include/pcconf.h Sun Feb 23 14:43:22 2003 +++ ./include/pcconf.h Mon Sep 1 14:33:32 2003 @@ -113,6 +113,9 @@ #define _NAIVE_DOS_REGS #include #include /* Provides prototypes of strncmpi(), etc. */ +# ifndef M +#define M(c) ((char) (0x80 | (c))) +# endif #endif /*