]> granicus.if.org Git - nethack/commitdiff
remove a maintenance/synchronization requirement
authornhmall <nhmall@nethack.org>
Sat, 25 Feb 2023 21:05:27 +0000 (16:05 -0500)
committernhmall <nhmall@nethack.org>
Sat, 25 Feb 2023 21:05:27 +0000 (16:05 -0500)
adds a file include/seffects.h

include/sndprocs.h
src/sounds.c
sys/unix/Makefile.src
sys/windows/Makefile.nmake
sys/windows/vs/NetHack/NetHack.vcxproj
sys/windows/vs/NetHackW/NetHackW.vcxproj

index 6ed6134520270bbd17bc966d6812fae80244a260..9d9d981c08c1611ff642fdacddf541ad8ff0dd43 100755 (executable)
@@ -139,214 +139,13 @@ enum instruments_broad {
 };
 #endif
 
-/*
- * When adding entries to this enum list, please also add an entry to the
- * soundeffect_automapping table in src/sounds.c, so that a soundlib that
- * supports SND_SOUNDEFFECTS_AUTOMAP can locate a file meant to be mapped
- * to the soundeffect.
- */
-
+#define SEFFECTS_ENUM
 enum sound_effect_entries {
-    se_zero_invalid                   = 0,
-    se_faint_splashing                = 1,
-    se_crackling_of_hellfire          = 2,
-    se_heart_beat                     = 3,
-    se_typing_noise                   = 4,
-    se_hollow_sound                   = 5,
-    se_rustling_paper                 = 6,
-    se_crushing_sound                 = 7,
-    se_splash                         = 8,
-    se_chains_rattling_gears_turning  = 9,
-    se_smashing_and_crushing          = 10,
-    se_gears_turning_chains_rattling  = 11,
-    se_loud_splash                    = 12,
-    se_lound_crash                    = 13,
-    se_crashing_rock                  = 14,
-    se_sizzling                       = 15,
-    se_crashing_boulder               = 16,
-    se_boulder_drop                   = 17,
-    se_item_tumble_downwards          = 18,
-    se_drain_noises                   = 19,
-    se_ring_in_drain                  = 20,
-    se_groans_and_moans               = 21,
-    se_scratching                     = 22,
-    se_glass_shattering               = 23,
-    se_egg_cracking                   = 24,
-    se_gushing_sound                  = 25,
-    se_glass_crashing                 = 26,
-    se_egg_splatting                  = 27,
-    se_sinister_laughter              = 28,
-    se_blast                          = 29,
-    se_stone_breaking                 = 30,
-    se_stone_crumbling                = 31,
-    se_snakes_hissing                 = 32,
-    se_loud_pop                       = 33,
-    se_clanking_pipe                  = 34,
-    se_sewer_song                     = 35,
-    se_monster_behind_boulder         = 36,
-    se_wailing_of_the_banshee         = 37,
-    se_swoosh                         = 38,
-    se_explosion                      = 39,
-    se_crashing_sound                 = 40,
-    se_someone_summoning              = 41,
-    se_rushing_wind_noise             = 42,
-    se_splat_from_engulf              = 43,
-    se_faint_sloshing                 = 44,
-    se_crunching_sound                = 45,
-    se_slurping_sound                 = 46,
-    se_masticating_sound              = 47,
-    se_distant_thunder                = 48,
-    se_applause                       = 49,
-    se_shrill_whistle                 = 50,
-    se_someone_yells                  = 51,
-    se_door_unlock_and_open           = 52,
-    se_door_open                      = 53,
-    se_door_crash_open                = 54,
-    se_dry_throat_rattle              = 55,
-    se_cough                          = 56,
-    se_angry_snakes                   = 57,
-    se_zap_then_explosion             = 58,
-    se_zap                            = 59,
-    se_horn_being_played              = 60,
-    se_mon_chugging_potion            = 61,
-    se_bugle_playing_reveille         = 62,
-    se_crash_through_floor            = 63,
-    se_thump                          = 64,
-    se_scream                         = 65,
-    se_tumbler_click                  = 66,
-    se_gear_turn                      = 67,
-    se_divine_music                   = 68,
-    se_thunderclap                    = 69,
-    se_sad_wailing                    = 70,
-    se_maniacal_laughter              = 71,
-    se_rumbling_of_earth              = 72,
-    se_clanging_sound                 = 73,
-    se_mutter_imprecations            = 74,
-    se_mutter_incantation             = 75,
-    se_angry_voice                    = 76,
-    se_sceptor_pounding               = 77,
-    se_courtly_conversation           = 78,
-    se_low_buzzing                    = 79,
-    se_angry_drone                    = 80,
-    se_bees                           = 81,
-    se_someone_searching              = 82,
-    se_guards_footsteps               = 83,
-    se_faint_chime                    = 84,
-    se_loud_click                     = 85,
-    se_soft_click                     = 86,
-    se_squeak                         = 87,
-    se_squeak_C                       = 88,
-    se_squeak_D_flat                  = 89,
-    se_squeak_D                       = 90,
-    se_squeak_E_flat                  = 91,
-    se_squeak_E                       = 92,
-    se_squeak_F                       = 93,
-    se_squeak_F_sharp                 = 94,
-    se_squeak_G                       = 95,
-    se_squeak_G_sharp                 = 96,
-    se_squeak_A                       = 97,
-    se_squeak_B_flat                  = 98,
-    se_squeak_B                       = 99,
-    se_someone_bowling                = 100,
-    se_rumbling                       = 101,
-    se_loud_crash                     = 102,
-    se_deafening_roar_atmospheric     = 103,
-    se_low_hum                        = 104,
-    se_laughter                       = 105,
-    se_cockatrice_hiss                = 106,
-    se_chant                          = 107,
-    se_cracking_sound                 = 108,
-    se_ripping_sound                  = 109,
-    se_thud                           = 110,
-    se_clank                          = 111,
-    se_crumbling_sound                = 112,
-    se_soft_crackling                 = 113,
-    se_crackling                      = 114,
-    se_sharp_crack                    = 115,
-    se_wall_of_force                  = 116,
-    se_alarm                          = 117,
-    se_kick_door_it_shatters          = 118,
-    se_kick_door_it_crashes_open      = 119,
-    se_bubble_rising                  = 120,
-    se_bolt_of_lightning              = 121,
-    se_board_squeak                   = 122,
-    se_board_squeaks_loudly           = 123,
-    se_boing                          = 124,
-    se_crashed_ceiling                = 125,
-    se_clash                          = 126,
-    se_crash_door                     = 127,
-    se_crash                          = 128,
-    se_crash_throne_destroyed         = 129,
-    se_crash_something_broke          = 130,
-    se_kadoom_boulder_falls_in        = 131,
-    se_klunk_pipe                     = 132,
-    se_kerplunk_boulder_gone          = 133,
-    se_klunk                          = 134,
-    se_klick                          = 135,
-    se_kaboom_door_explodes           = 136,
-    se_kaboom_boom_boom               = 137,
-    se_kaablamm_of_mine               = 138,
-    se_kaboom                         = 139,
-    se_splat_egg                      = 140,
-    se_destroy_web                    = 141,
-    se_iron_ball_dragging_you         = 142,
-    se_iron_ball_hits_you             = 143,
-    se_lid_slams_open_falls_shut      = 144,
-    se_chain_shatters                 = 145,
-    se_furious_bubbling               = 146,
-    se_air_crackles                   = 147,
-    se_potion_crash_and_break         = 148,
-    se_hiss                           = 149,
-    se_growl                          = 150,
-    se_canine_bark                    = 151,
-    se_canine_growl                   = 152,
-    se_canine_whine                   = 153,
-    se_canine_yip                     = 154,
-    se_canine_howl                    = 155,
-    se_canine_yowl                    = 156,
-    se_canine_yelp                    = 157,
-    se_feline_meow                    = 158,
-    se_feline_purr                    = 159,
-    se_feline_yip                     = 160,
-    se_feline_mew                     = 161,
-    se_feline_yowl                    = 162,
-    se_feline_yelp                    = 163,
-    se_roar                           = 164,
-    se_snarl                          = 165,
-    se_buzz                           = 166,
-    se_squeek                         = 167,
-    se_squawk                         = 168,
-    se_chirp                          = 169,
-    se_squeal                         = 170,
-    se_screech                        = 171,
-    se_equine_neigh                   = 172,
-    se_equine_whinny                  = 173,
-    se_equine_whicker                 = 174,
-    se_bovine_moo                     = 175,
-    se_bovine_bellow                  = 176,
-    se_croc_bellow                    = 177,
-    se_wail                           = 178,
-    se_groan                          = 179,
-    se_grunt                          = 180,
-    se_gurgle                         = 181,
-    se_elephant_trumpet               = 182,
-    se_snake_rattle                   = 183,
-    se_yelp                           = 184,
-    se_jabberwock_burble              = 185,
-    se_shriek                         = 186,
-    se_bone_rattle                    = 187,
-    se_orc_grunt                      = 188,
-    se_avian_screak                   = 189,
-    se_paranoid_confirmation          = 190,
-    se_bars_whang                     = 191,
-    se_bars_whap                      = 192,
-    se_bars_flapp                     = 193,
-    se_bars_clink                     = 194,
-    se_bars_clonk                     = 195,
-    se_boomerang_klonk                = 196,
-    se_bang_weapon_side               = 197,
+    se_zero_invalid = 0,
+#include "seffects.h"
     number_of_se_entries
 };
+#undef SEFFECTS_ENUM
 
 enum ambience_actions {
     ambience_nothing, ambience_begin, ambience_end, ambience_update
index 35964e0928bebefc934eae2e0013154e64ad459f..0a6582f5e832bf02a211354346b2fc835de9a525 100644 (file)
@@ -1934,221 +1934,13 @@ struct soundeffect_automapping {
     const char *base_filename;
 };
 
-/*
- * The base_filename field represents the unique part of a file
- * name to find in the file system (or in the embedded resources for
- * some soundlibs). It is the soundeffects file that will be played
- * for the sound effect identified by seid. Without an entry in the
- * table below, the automapping of a soundeffect id to a particular
- * file name will not occur and no soundeffect will be possible.
-
- * The entries in the following table are not required to be in
- * any particular order, but an entry for each soundeffect from the
- * sound_effect_entries enum in sndprocs.h should be present.
- *
- */
-
+#define SEFFECTS_AUTOMAP
 static const struct soundeffect_automapping
     se_mappings_init[number_of_se_entries] = {
     { se_zero_invalid,                  "" },
-    { se_faint_splashing,               "faint_splashing" },
-    { se_crackling_of_hellfire,         "crackling_of_hellfire" },
-    { se_heart_beat,                    "heart_beat" },
-    { se_typing_noise,                  "typing_noise" },
-    { se_hollow_sound,                  "hollow_sound" },
-    { se_rustling_paper,                "rustling_paper" },
-    { se_crushing_sound,                "crushing_sound" },
-    { se_splash,                        "splash" },
-    { se_chains_rattling_gears_turning, "chains_rattling_gears_turning" },
-    { se_smashing_and_crushing,         "smashing_and_crushing" },
-    { se_gears_turning_chains_rattling, "gears_turning_chains_rattling" },
-    { se_loud_splash,                   "loud_splash" },
-    { se_lound_crash,                   "lound_crash" },
-    { se_crashing_rock,                 "crashing_rock" },
-    { se_sizzling,                      "sizzling" },
-    { se_crashing_boulder,              "crashing_boulder" },
-    { se_boulder_drop,                  "boulder_drop" },
-    { se_item_tumble_downwards,         "item_tumble_downwards" },
-    { se_drain_noises,                  "drain_noises" },
-    { se_ring_in_drain,                 "ring_in_drain" },
-    { se_groans_and_moans,              "groans_and_moans" },
-    { se_scratching,                    "scratching" },
-    { se_glass_shattering,              "glass_shattering" },
-    { se_egg_cracking,                  "egg_cracking" },
-    { se_gushing_sound,                 "gushing_sound" },
-    { se_glass_crashing,                "glass_crashing" },
-    { se_egg_splatting,                 "egg_splatting" },
-    { se_sinister_laughter,             "sinister_laughter" },
-    { se_blast,                         "blast" },
-    { se_stone_breaking,                "stone_breaking" },
-    { se_stone_crumbling,               "stone_crumbling" },
-    { se_snakes_hissing,                "snakes_hissing" },
-    { se_loud_pop,                      "loud_pop" },
-    { se_clanking_pipe,                 "clanking_pipe" },
-    { se_sewer_song,                    "sewer_song" },
-    { se_monster_behind_boulder,        "monster_behind_boulder" },
-    { se_wailing_of_the_banshee,        "wailing_of_the_banshee" },
-    { se_swoosh,                        "swoosh" },
-    { se_explosion,                     "explosion" },
-    { se_crashing_sound,                "crashing_sound" },
-    { se_someone_summoning,             "someone_summoning" },
-    { se_rushing_wind_noise,            "rushing_wind_noise" },
-    { se_splat_from_engulf,             "splat_from_engulf" },
-    { se_faint_sloshing,                "faint_sloshing" },
-    { se_crunching_sound,               "crunching_sound" },
-    { se_slurping_sound,                "slurping_sound" },
-    { se_masticating_sound,             "masticating_sound" },
-    { se_distant_thunder,               "distant_thunder" },
-    { se_applause,                      "applause" },
-    { se_shrill_whistle,                "shrill_whistle" },
-    { se_someone_yells,                 "someone_yells" },
-    { se_door_unlock_and_open,          "door_unlock_and_open" },
-    { se_door_open,                     "door_open" },
-    { se_door_crash_open,               "door_crash_open" },
-    { se_dry_throat_rattle,             "dry_throat_rattle" },
-    { se_cough,                         "cough" },
-    { se_angry_snakes,                  "angry_snakes" },
-    { se_zap_then_explosion,            "zap_then_explosion" },
-    { se_zap,                           "zap" },
-    { se_horn_being_played,             "horn_being_played" },
-    { se_mon_chugging_potion,           "mon_chugging_potion" },
-    { se_bugle_playing_reveille,        "bugle_playing_reveille" },
-    { se_crash_through_floor,           "crash_through_floor" },
-    { se_thump,                         "thump" },
-    { se_scream,                        "scream" },
-    { se_tumbler_click,                 "tumbler_click" },
-    { se_gear_turn,                     "gear_turn" },
-    { se_divine_music,                  "divine_music" },
-    { se_thunderclap,                   "thunderclap" },
-    { se_sad_wailing,                   "sad_wailing" },
-    { se_maniacal_laughter,             "maniacal_laughter" },
-    { se_rumbling_of_earth,             "rumbling_of_earth" },
-    { se_clanging_sound,                "clanging_sound" },
-    { se_mutter_imprecations,           "mutter_imprecations" },
-    { se_mutter_incantation,            "mutter_incantation" },
-    { se_angry_voice,                   "angry_voice" },
-    { se_sceptor_pounding,              "sceptor_pounding" },
-    { se_courtly_conversation,          "courtly_conversation" },
-    { se_low_buzzing,                   "low_buzzing" },
-    { se_angry_drone,                   "angry_drone" },
-    { se_bees,                          "bees" },
-    { se_someone_searching,             "someone_searching" },
-    { se_guards_footsteps,              "guards_footsteps" },
-    { se_faint_chime,                   "faint_chime" },
-    { se_loud_click,                    "loud_click" },
-    { se_soft_click,                    "soft_click" },
-    { se_squeak,                        "squeak" },
-    { se_squeak_C,                      "squeak_C" },
-    { se_squeak_D_flat,                 "squeak_D_flat" },
-    { se_squeak_D,                      "squeak_D" },
-    { se_squeak_E_flat,                 "squeak_E_flat" },
-    { se_squeak_E,                      "squeak_E" },
-    { se_squeak_F,                      "squeak_F" },
-    { se_squeak_F_sharp,                "squeak_F_sharp" },
-    { se_squeak_G,                      "squeak_G" },
-    { se_squeak_G_sharp,                "squeak_G_sharp" },
-    { se_squeak_A,                      "squeak_A" },
-    { se_squeak_B_flat,                 "squeak_B_flat" },
-    { se_squeak_B,                      "squeak_B" },
-    { se_someone_bowling,               "someone_bowling" },
-    { se_rumbling,                      "rumbling" },
-    { se_loud_crash,                    "loud_crash" },
-    { se_deafening_roar_atmospheric,    "deafening_roar_atmospheric" },
-    { se_low_hum,                       "low_hum" },
-    { se_laughter,                      "laughter" },
-    { se_cockatrice_hiss,               "cockatrice_hiss" },
-    { se_chant,                         "chant" },
-    { se_cracking_sound,                "cracking_sound" },
-    { se_ripping_sound,                 "ripping_sound" },
-    { se_thud,                          "thud" },
-    { se_clank,                         "clank" },
-    { se_crumbling_sound,               "crumbling_sound" },
-    { se_soft_crackling,                "soft_crackling" },
-    { se_crackling,                     "crackling" },
-    { se_sharp_crack,                   "sharp_crack" },
-    { se_wall_of_force,                 "wall_of_force" },
-    { se_alarm,                         "alarm" },
-    { se_kick_door_it_shatters,         "kick_door_it_shatters" },
-    { se_kick_door_it_crashes_open,     "kick_door_it_crashes_open" },
-    { se_bubble_rising,                 "bubble_rising" },
-    { se_bolt_of_lightning,             "bolt_of_lightning" },
-    { se_board_squeak,                  "board_squeak" },
-    { se_board_squeaks_loudly,          "board_squeaks_loudly" },
-    { se_boing,                         "boing" },
-    { se_crashed_ceiling,               "crashed_ceiling" },
-    { se_clash,                         "clash" },
-    { se_crash_door,                    "crash_door" },
-    { se_crash,                         "crash" },
-    { se_crash_throne_destroyed,        "crash_throne_destroyed" },
-    { se_crash_something_broke,         "crash_something_broke" },
-    { se_kadoom_boulder_falls_in,       "kadoom_boulder_falls_in" },
-    { se_klunk_pipe,                    "klunk_pipe" },
-    { se_kerplunk_boulder_gone,         "kerplunk_boulder_gone" },
-    { se_klunk,                         "klunk" },
-    { se_klick,                         "klick" },
-    { se_kaboom_door_explodes,          "kaboom_door_explodes" },
-    { se_kaboom_boom_boom,              "kaboom_boom_boom" },
-    { se_kaablamm_of_mine,              "kaablamm_of_mine" },
-    { se_kaboom,                        "kaboom" },
-    { se_splat_egg,                     "splat_egg" },
-    { se_destroy_web,                   "destroy_web" },
-    { se_iron_ball_dragging_you,        "iron_ball_dragging_you" },
-    { se_iron_ball_hits_you,            "iron_ball_hits_you" },
-    { se_lid_slams_open_falls_shut,     "lid_slams_open_falls_shut" },
-    { se_chain_shatters,                "chain_shatters" },
-    { se_furious_bubbling,              "furious_bubbling" },
-    { se_air_crackles,                  "air_crackles" },
-    { se_potion_crash_and_break,        "potion_crash_and_break" },
-    { se_hiss,                          "hiss" },
-    { se_growl,                         "growl" },
-    { se_canine_bark,                   "canine_bark" },
-    { se_canine_growl,                  "canine_growl" },
-    { se_canine_whine,                  "canine_whine" },
-    { se_canine_yip,                    "canine_yip" },
-    { se_canine_howl,                   "canine_howl" },
-    { se_canine_yowl,                   "canine_yowl" },
-    { se_canine_yelp,                   "canine_yelp" },
-    { se_feline_meow,                   "feline_meow" },
-    { se_feline_purr,                   "feline_purr" },
-    { se_feline_yip,                    "feline_yip" },
-    { se_feline_mew,                    "feline_mew" },
-    { se_feline_yowl,                   "feline_yowl" },
-    { se_feline_yelp,                   "feline_yelp" },
-    { se_roar,                          "roar" },
-    { se_snarl,                         "snarl" },
-    { se_buzz,                          "buzz" },
-    { se_squeek,                        "squeek" },
-    { se_squawk,                        "squawk" },
-    { se_squeal,                        "squeal" },
-    { se_screech,                       "screech" },
-    { se_equine_neigh,                  "equine_neigh" },
-    { se_equine_whinny,                 "equine_whinny" },
-    { se_equine_whicker,                "equine_whicker" },
-    { se_bovine_moo,                    "bovine_moo" },
-    { se_bovine_bellow,                 "bovine_bellow" },
-    { se_wail,                          "wail" },
-    { se_groan,                         "groan" },
-    { se_grunt,                         "grunt" },
-    { se_gurgle,                        "gurgle" },
-    { se_elephant_trumpet,              "elephant_trumpet" },
-    { se_snake_rattle,                  "snake_rattle" },
-    { se_yelp,                          "yelp" },
-    { se_jabberwock_burble,             "jabberwock_burble" },
-    { se_shriek,                        "shriek" },
-    { se_bone_rattle,                   "bone_rattle" },
-    { se_orc_grunt,                     "orc_grunt" },
-    { se_avian_screak,                  "avian_screak" },
-    { se_paranoid_confirmation,         "paranoid_confirmation" },
-    { se_bars_whang,                    "bars_whang" },
-    { se_bars_whap,                     "bars_whap" },
-    { se_bars_flapp,                    "bars_flapp" },
-    { se_bars_clink,                    "bars_clink" },
-    { se_bars_clonk,                    "bars_clonk" },
-    { se_boomerang_klonk,               "boomerang_klonk" },
-    { se_bang_weapon_side,              "bang_weapon_side" },
-    { se_chirp,                         "chirp" },
-    { se_croc_bellow,                   "croc_bellow" },
+#include "seffects.h"
 };
+#undef SEFFECTS_AUTOMAP
 
 static const char *semap_basenames[SIZE(se_mappings_init)];
 static boolean basenames_initialized = FALSE;
index 6c9bddc0aaf356006e5b6976f6dd48e865d9862c..1df1c91a882d8161337a8c6150703d4445265395 100644 (file)
@@ -547,9 +547,9 @@ HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
        micro.h mkroom.h monattk.h mondata.h monflag.h monst.h monsters.h \
        obj.h objects.h objclass.h optlist.h patchlevel.h pcconf.h \
        permonst.h prop.h rect.h region.h sym.h defsym.h rm.h sp_lev.h \
-       spell.h sndprocs.h sys.h system.h tcap.h timeout.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
+       spell.h sndprocs.h seffects.h sys.h system.h tcap.h timeout.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) dgn_file.h
 
@@ -815,11 +815,12 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \
                ../include/context.h ../include/rm.h ../include/botl.h \
                ../include/rect.h ../include/region.h ../include/trap.h \
                ../include/display.h ../include/vision.h ../include/color.h \
-               ../include/sndprocs.h ../include/decl.h ../include/quest.h \
-               ../include/spell.h ../include/obj.h ../include/engrave.h \
-               ../include/you.h ../include/attrib.h ../include/monst.h \
-               ../include/mextra.h ../include/skills.h ../include/timeout.h \
-               ../include/flag.h ../include/winprocs.h ../include/sys.h
+               ../include/sndprocs.h ../include/seffects.h ../include/decl.h \
+               ../include/quest.h ../include/spell.h ../include/obj.h \
+               ../include/engrave.h ../include/you.h ../include/attrib.h \
+               ../include/monst.h ../include/mextra.h ../include/skills.h \
+               ../include/timeout.h ../include/flag.h ../include/winprocs.h \
+               ../include/sys.h
        touch $(HACK_H)
 #
 $(TARGETPFX)pcmain.o: ../sys/share/pcmain.c $(HACK_H) ../include/dlb.h
@@ -1121,10 +1122,10 @@ $(TARGETPFX)mdlib.o: mdlib.c $(CONFIG_H) ../include/permonst.h \
                ../include/monsters.h ../include/objclass.h \
                ../include/defsym.h ../include/objects.h ../include/wintype.h \
                ../include/sym.h ../include/artilist.h ../include/dungeon.h \
-               ../include/sndprocs.h ../include/obj.h ../include/monst.h \
-               ../include/mextra.h ../include/you.h ../include/attrib.h \
-               ../include/prop.h ../include/skills.h ../include/context.h \
-               ../include/flag.h ../include/dlb.h
+               ../include/sndprocs.h ../include/seffects.h ../include/obj.h \
+               ../include/monst.h ../include/mextra.h ../include/you.h \
+               ../include/attrib.h ../include/prop.h ../include/skills.h \
+               ../include/context.h ../include/flag.h ../include/dlb.h
 $(TARGETPFX)mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h
 $(TARGETPFX)mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h
 $(TARGETPFX)minion.o: minion.c $(HACK_H)
index fe172bac5bfaae8855eef1545eba35dce44053ba..90021f65dca53ca497d798645d9f05e8a36e93da 100644 (file)
@@ -457,8 +457,8 @@ HACKINCL = $(INCL)\align.h $(INCL)\artifact.h $(INCL)\artilist.h \
        $(INCL)\timeout.h $(INCL)\tradstdc.h $(INCL)\trap.h \
        $(INCL)\unixconf.h $(INCL)\vision.h $(INCL)\vmsconf.h \
        $(INCL)\wintty.h $(INCL)\wincurs.h $(INCL)\winX.h \
-       $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\wintype.h $(INCL)\you.h \
-       $(INCL)\youprop.h
+       $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\seffects.h \
+       $(INCL)\wintype.h $(INCL)\you.h $(INCL)\youprop.h
 
 # all .c that are part of the main NetHack program and are not operating- or
 # windowing-system specific
@@ -871,7 +871,7 @@ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \
                $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\mextra.h \
                $(INCL)\skills.h $(INCL)\timeout.h $(INCL)\trap.h \
                $(INCL)\flag.h $(INCL)\winprocs.h $(INCL)\sndprocs.h \
-               $(INCL)\sys.h
+               $(INCL)\seffects.h $(INCL)\sys.h
 
 TILE_H      = ..\win\share\tile.h
 
@@ -2358,7 +2358,8 @@ MOCPATH = moc.exe
 #              $(INCL)\obj.h $(INCL)\engrave.h $(INCL)\you.h \
 #              $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\mextra.h \
 #              $(INCL)\skills.h $(INCL)\timeout.h $(INCL)\flag.h \
-#              $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\sys.h
+#              $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\seffects.h \
+#              $(INCL)\sys.h
 #      touch $(HACK_H)
 #
 $(OTTY)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h
@@ -2777,7 +2778,8 @@ MOCPATH = moc.exe
 #              $(INCL)\obj.h $(INCL)\engrave.h $(INCL)\you.h \
 #              $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\mextra.h \
 #              $(INCL)\skills.h $(INCL)\timeout.h $(INCL)\flag.h \
-#              $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\sys.h
+#              $(INCL)\winprocs.h $(INCL)\sndprocs.h \
+#              $(INCL)\seffects.h $(INCL)\sys.h
 #      touch $(HACK_H)
 #
 $(OGUI)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h
index 5af14dcb5f775e23c533dc762e8f5c08b3ac5165..df3a0108fbf693f10eef53e38ffde7eb3d1f52ba 100644 (file)
     <ClInclude Include="$(IncDir)rm.h" />\r
     <ClInclude Include="$(IncDir)skills.h" />\r
     <ClInclude Include="$(IncDir)sndprocs.h" />\r
+    <ClInclude Include="$(IncDir)seffects.h" />\r
     <ClInclude Include="$(IncDir)spell.h" />\r
     <ClInclude Include="$(IncDir)sp_lev.h" />\r
     <ClInclude Include="$(IncDir)sym.h" />\r
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r
index 9fa1a20096c23dc67a81cd94fa06ebdd02afae66..a7017b81cff9007557c0697b75265f01118f8db7 100644 (file)
     <ClInclude Include="$(IncDir)rm.h" />\r
     <ClInclude Include="$(IncDir)skills.h" />\r
     <ClInclude Include="$(IncDir)sndprocs.h" />\r
+    <ClInclude Include="$(IncDir)seffects.h" />\r
     <ClInclude Include="$(IncDir)spell.h" />\r
     <ClInclude Include="$(IncDir)sp_lev.h" />\r
     <ClInclude Include="$(IncDir)sym.h" />\r
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r