diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index eaf70c739..4b79449e0 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -815,6 +815,7 @@ set (PCH_SOURCES common/rendering/hwrenderer/utility/hw_shaderpatcher.cpp dukerr/namesdyn.cpp + dukerr/soundsdyn.cpp ) macro( use_precompiled_header ) diff --git a/source/duke3d/CMakeLists.txt b/source/duke3d/CMakeLists.txt index 908fef269..fbf31412f 100644 --- a/source/duke3d/CMakeLists.txt +++ b/source/duke3d/CMakeLists.txt @@ -26,7 +26,6 @@ set( PCH_SOURCES src/text.cpp src/sector.cpp src/sounds.cpp - src/soundsdyn.cpp src/d_menu.cpp ) diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h index 430482d83..b293dc9d0 100644 --- a/source/duke3d/src/duke3d.h +++ b/source/duke3d/src/duke3d.h @@ -124,7 +124,7 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); #include "rts.h" #include "sector.h" #include "sounds.h" -#include "soundsdyn.h" +#include "dukerr/soundsdyn.h" #include "text.h" BEGIN_DUKE_NS diff --git a/source/duke3d/src/soundefs.h b/source/duke3d/src/soundefs.h deleted file mode 100644 index f72481312..000000000 --- a/source/duke3d/src/soundefs.h +++ /dev/null @@ -1,418 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- - -#define KICK_HIT 0 -#define PISTOL_RICOCHET 1 -#define PISTOL_BODYHIT 2 -#define PISTOL_FIRE 3 -#define EJECT_CLIP 4 -#define INSERT_CLIP 5 -#define CHAINGUN_FIRE 6 -#define RPG_SHOOT 7 -#define POOLBALLHIT 8 -#define RPG_EXPLODE 9 -#define CAT_FIRE 10 -#define SHRINKER_FIRE 11 -#define ACTOR_SHRINKING 12 -#define PIPEBOMB_BOUNCE 13 -#define PIPEBOMB_EXPLODE 14 -#define LASERTRIP_ONWALL 15 -#define LASERTRIP_ARMING 16 -#define LASERTRIP_EXPLODE 17 -#define VENT_BUST 18 -#define GLASS_BREAKING 19 -#define GLASS_HEAVYBREAK 20 -#define SHORT_CIRCUIT 21 -#define ITEM_SPLASH 22 -#define DUKE_BREATHING 23 -#define DUKE_EXHALING 24 -#define DUKE_GASP 25 -#define SLIM_RECOG 26 -// #define ENDSEQVOL3SND1 27 -#define DUKE_URINATE 28 -#define ENDSEQVOL3SND2 29 -#define ENDSEQVOL3SND3 30 -#define DUKE_PASSWIND 32 -#define DUKE_CRACK 33 -#define SLIM_ATTACK 34 -#define SOMETHINGHITFORCE 35 -#define DUKE_DRINKING 36 -#define DUKE_KILLED1 37 -#define DUKE_GRUNT 38 -#define DUKE_HARTBEAT 39 -#define DUKE_ONWATER 40 -#define DUKE_DEAD 41 -#define DUKE_LAND 42 -#define DUKE_WALKINDUCTS 43 -#define DUKE_GLAD 44 -#define DUKE_YES 45 -#define DUKE_HEHE 46 -#define DUKE_SHUCKS 47 -#define DUKE_UNDERWATER 48 -#define DUKE_JETPACK_ON 49 -#define DUKE_JETPACK_IDLE 50 -#define DUKE_JETPACK_OFF 51 -#define LIZTROOP_GROWL 52 -#define LIZTROOP_TALK1 53 -#define LIZTROOP_TALK2 54 -#define LIZTROOP_TALK3 55 -#define DUKETALKTOBOSS 56 -#define LIZCAPT_GROWL 57 -#define LIZCAPT_TALK1 58 -#define LIZCAPT_TALK2 59 -#define LIZCAPT_TALK3 60 -#define LIZARD_BEG 61 -#define LIZARD_PAIN 62 -#define LIZARD_DEATH 63 -#define LIZARD_SPIT 64 -#define DRONE1_HISSRATTLE 65 -#define DRONE1_HISSSCREECH 66 -#define DUKE_TIP2 67 -#define FLESH_BURNING 68 -#define SQUISHED 69 -#define TELEPORTER 70 -#define ELEVATOR_ON 71 -#define DUKE_KILLED3 72 -#define ELEVATOR_OFF 73 -#define DOOR_OPERATE1 74 -#define SUBWAY 75 -#define SWITCH_ON 76 -#define FAN 77 -#define DUKE_GETWEAPON3 78 -#define FLUSH_TOILET 79 -#define HOVER_CRAFT 80 -#define EARTHQUAKE 81 -#define INTRUDER_ALERT 82 -#define END_OF_LEVEL_WARN 83 -#define ENGINE_OPERATING 84 -#define REACTOR_ON 85 -#define COMPUTER_AMBIENCE 86 -#define GEARS_GRINDING 87 -#define BUBBLE_AMBIENCE 88 -#define MACHINE_AMBIENCE 89 -#define SEWER_AMBIENCE 90 -#define WIND_AMBIENCE 91 -#define SOMETHING_DRIPPING 92 -#define STEAM_HISSING 93 -#define THEATER_BREATH 94 -#define BAR_MUSIC 95 -#define BOS1_ROAM 96 -#define BOS1_RECOG 97 -#define BOS1_ATTACK1 98 -#define BOS1_PAIN 99 -#define BOS1_DYING 100 -#define BOS2_ROAM 101 -#define BOS2_RECOG 102 -#define BOS2_ATTACK 103 -#define BOS2_PAIN 104 -#define BOS2_DYING 105 -#define GETATOMICHEALTH 106 -#define DUKE_GETWEAPON2 107 -#define BOS3_DYING 108 -#define SHOTGUN_FIRE 109 -#define PRED_ROAM 110 -#define PRED_RECOG 111 -#define PRED_ATTACK 112 -#define PRED_PAIN 113 -#define PRED_DYING 114 -#define CAPT_ROAM 115 -#define CAPT_ATTACK 116 -#define CAPT_RECOG 117 -#define CAPT_PAIN 118 -#define CAPT_DYING 119 -#define PIG_ROAM 120 -#define PIG_RECOG 121 -#define PIG_ATTACK 122 -#define PIG_PAIN 123 -#define PIG_DYING 124 -#define RECO_ROAM 125 -#define RECO_RECOG 126 -#define RECO_ATTACK 127 -#define RECO_PAIN 128 -#define RECO_DYING 129 -#define DRON_ROAM 130 -#define DRON_RECOG 131 -#define DRON_ATTACK1 132 -#define DRON_PAIN 133 -#define DRON_DYING 134 -#define COMM_ROAM 135 -#define COMM_RECOG 136 -#define COMM_ATTACK 137 -#define COMM_PAIN 138 -#define COMM_DYING 139 -#define OCTA_ROAM 140 -#define OCTA_RECOG 141 -#define OCTA_ATTACK1 142 -#define OCTA_PAIN 143 -#define OCTA_DYING 144 -#define TURR_ROAM 145 -#define TURR_RECOG 146 -#define TURR_ATTACK 147 -#define DUMPSTER_MOVE 148 -#define SLIM_DYING 149 -#define BOS3_ROAM 150 -#define BOS3_RECOG 151 -#define BOS3_ATTACK1 152 -#define BOS3_PAIN 153 -#define BOS1_ATTACK2 154 -#define COMM_SPIN 155 -#define BOS1_WALK 156 -#define DRON_ATTACK2 157 -#define THUD 158 -#define OCTA_ATTACK2 159 -#define WIERDSHOT_FLY 160 -#define TURR_PAIN 161 -#define TURR_DYING 162 -#define SLIM_ROAM 163 -#define LADY_SCREAM 164 -#define DOOR_OPERATE2 165 -#define DOOR_OPERATE3 166 -#define DOOR_OPERATE4 167 -#define BORNTOBEWILDSND 168 -#define SHOTGUN_COCK 169 -#define GENERIC_AMBIENCE1 170 -#define GENERIC_AMBIENCE2 171 -#define GENERIC_AMBIENCE3 172 -#define GENERIC_AMBIENCE4 173 -#define GENERIC_AMBIENCE5 174 -#define GENERIC_AMBIENCE6 175 -#define BOS3_ATTACK2 176 -#define GENERIC_AMBIENCE17 177 -#define GENERIC_AMBIENCE18 178 -#define GENERIC_AMBIENCE19 179 -#define GENERIC_AMBIENCE20 180 -#define GENERIC_AMBIENCE21 181 -#define GENERIC_AMBIENCE22 182 -#define SECRETLEVELSND 183 -#define GENERIC_AMBIENCE8 184 -#define GENERIC_AMBIENCE9 185 -#define GENERIC_AMBIENCE10 186 -#define GENERIC_AMBIENCE11 187 -#define GENERIC_AMBIENCE12 188 -#define GENERIC_AMBIENCE13 189 -#define GENERIC_AMBIENCE14 190 -#define GENERIC_AMBIENCE15 192 -#define GENERIC_AMBIENCE16 193 -#define FIRE_CRACKLE 194 -#define BONUS_SPEECH1 195 -#define BONUS_SPEECH2 196 -#define BONUS_SPEECH3 197 -#define PIG_CAPTURE_DUKE 198 -#define BONUS_SPEECH4 199 -#define DUKE_LAND_HURT 200 -#define DUKE_HIT_STRIPPER1 201 -#define DUKE_TIP1 202 -#define DUKE_KILLED2 203 -#define PRED_ROAM2 204 -#define PIG_ROAM2 205 -#define DUKE_GETWEAPON1 206 -#define DUKE_SEARCH2 207 -#define DUKE_CRACK2 208 -#define DUKE_SEARCH 209 -#define DUKE_GET 210 -#define DUKE_LONGTERM_PAIN 211 -#define MONITOR_ACTIVE 212 -#define NITEVISION_ONOFF 213 -#define DUKE_HIT_STRIPPER2 214 -#define DUKE_CRACK_FIRST 215 -#define DUKE_USEMEDKIT 216 -#define DUKE_TAKEPILLS 217 -#define DUKE_PISSRELIEF 218 -#define SELECT_WEAPON 219 -#define WATER_GURGLE 220 -#define DUKE_GETWEAPON4 221 -#define JIBBED_ACTOR1 222 -#define JIBBED_ACTOR2 223 -#define JIBBED_ACTOR3 224 -#define JIBBED_ACTOR4 225 -#define JIBBED_ACTOR5 226 -#define JIBBED_ACTOR6 227 -#define JIBBED_ACTOR7 228 -#define DUKE_GOTHEALTHATLOW 229 -#define BOSSTALKTODUKE 230 -#define WAR_AMBIENCE1 231 -#define WAR_AMBIENCE2 232 -#define WAR_AMBIENCE3 233 -#define WAR_AMBIENCE4 234 -#define WAR_AMBIENCE5 235 -#define WAR_AMBIENCE6 236 -#define WAR_AMBIENCE7 237 -#define WAR_AMBIENCE8 238 -#define WAR_AMBIENCE9 239 -#define WAR_AMBIENCE10 240 -#define ALIEN_TALK1 241 -#define ALIEN_TALK2 242 -#define EXITMENUSOUND 243 -#define FLY_BY 244 -#define DUKE_SCREAM 245 -#define SHRINKER_HIT 246 -#define RATTY 247 -#define INTO_MENU 248 -#define BONUSMUSIC 249 -#define DUKE_BOOBY 250 -#define DUKE_TALKTOBOSSFALL 251 -#define DUKE_LOOKINTOMIRROR 252 -#define PIG_ROAM3 253 -#define KILLME 254 -#define DRON_JETSND 255 -#define SPACE_DOOR1 256 -#define SPACE_DOOR2 257 -#define SPACE_DOOR3 258 -#define SPACE_DOOR4 259 -#define SPACE_DOOR5 260 -#define ALIEN_ELEVATOR1 261 -#define VAULT_DOOR 262 -#define JIBBED_ACTOR13 263 -#define DUKE_GETWEAPON6 264 -#define JIBBED_ACTOR8 265 -#define JIBBED_ACTOR9 266 -#define JIBBED_ACTOR10 267 -#define JIBBED_ACTOR11 268 -#define JIBBED_ACTOR12 269 -#define DUKE_KILLED4 270 -#define DUKE_KILLED5 271 -#define ALIEN_SWITCH1 272 -#define DUKE_STEPONFECES 273 -#define DUKE_LONGTERM_PAIN2 274 -#define DUKE_LONGTERM_PAIN3 275 -#define DUKE_LONGTERM_PAIN4 276 -#define COMPANB2 277 -#define KTIT 278 -#define HELICOP_IDLE 279 -#define STEPNIT 280 -#define SPACE_AMBIENCE1 281 -#define SPACE_AMBIENCE2 282 -#define SLIM_HATCH 283 -#define RIPHEADNECK 284 -#define FOUNDJONES 285 -#define ALIEN_DOOR1 286 -#define ALIEN_DOOR2 287 -#define ENDSEQVOL3SND4 288 -#define ENDSEQVOL3SND5 289 -#define ENDSEQVOL3SND6 290 -#define ENDSEQVOL3SND7 291 -#define ENDSEQVOL3SND8 292 -#define ENDSEQVOL3SND9 293 -#define WHIPYOURASS 294 -#define ENDSEQVOL2SND1 295 -#define ENDSEQVOL2SND2 296 -#define ENDSEQVOL2SND3 297 -#define ENDSEQVOL2SND4 298 -#define ENDSEQVOL2SND5 299 -#define ENDSEQVOL2SND6 300 -#define ENDSEQVOL2SND7 301 -#define GENERIC_AMBIENCE23 302 -#define SOMETHINGFROZE 303 -#define DUKE_LONGTERM_PAIN5 304 -#define DUKE_LONGTERM_PAIN6 305 -#define DUKE_LONGTERM_PAIN7 306 -#define DUKE_LONGTERM_PAIN8 307 -#define WIND_REPEAT 308 -#define MYENEMY_ROAM 309 -#define MYENEMY_HURT 310 -#define MYENEMY_DEAD 311 -#define MYENEMY_SHOOT 312 -#define STORE_MUSIC 313 -#define STORE_MUSIC_BROKE 314 -#define ACTOR_GROWING 315 -#define NEWBEAST_ROAM 316 -#define NEWBEAST_RECOG 317 -#define NEWBEAST_ATTACK 318 -#define NEWBEAST_PAIN 319 -#define NEWBEAST_DYING 320 -#define NEWBEAST_SPIT 321 -#define VOL4_1 322 -#define SUPERMARKET 323 -#define MOUSEANNOY 324 -#define BOOKEM 325 -#define SUPERMARKETCRY 326 -#define DESTRUCT 327 -#define EATFOOD 328 -#define MAKEMYDAY 329 -#define WITNESSSTAND 330 -#define VACATIONSPEECH 331 -#define YIPPEE1 332 -#define YOHOO1 333 -#define YOHOO2 334 -#define DOLPHINSND 335 -#define TOUGHGALSND1 336 -#define TOUGHGALSND2 337 -#define TOUGHGALSND3 338 -#define TOUGHGALSND4 339 -#define TANK_ROAM 340 -#define BOS4_ROAM 341 -#define BOS4_RECOG 342 -#define BOS4_ATTACK 343 -#define BOS4_PAIN 344 -#define BOS4_DYING 345 -#define NEWBEAST_ATTACKMISS 346 -#define VOL4_2 347 -#define COOKINGDEEPFRIER 348 -#define WHINING_DOG 349 -#define DEAD_DOG 350 -#define LIGHTNING_SLAP 351 -#define THUNDER 352 -#define HAPPYMOUSESND1 353 -#define HAPPYMOUSESND2 354 -#define HAPPYMOUSESND3 355 -#define HAPPYMOUSESND4 356 -#define ALARM 357 -#define RAIN 358 -#define DTAG_GREENRUN 359 -#define DTAG_BROWNRUN 360 -#define DTAG_GREENSCORE 361 -#define DTAG_BROWNSCORE 362 -#define INTRO4_1 363 -#define INTRO4_2 364 -#define INTRO4_3 365 -#define INTRO4_4 366 -#define INTRO4_5 367 -#define INTRO4_6 368 -#define SCREECH 369 -#define BOSS4_DEADSPEECH 370 -#define BOSS4_FIRSTSEE 371 -#define PARTY_SPEECH 372 -#define POSTAL_SPEECH 373 -#define TGSPEECH 374 -#define DOGROOMSPEECH 375 -#define SMACKED 376 -#define MDEVSPEECH 377 -#define AREA51SPEECH 378 -#define JEEPSOUND 379 -#define BIGDOORSLAM 380 -#define BOS4_LAY 381 -#define WAVESOUND 382 -#define ILLBEBACK 383 -#define VOL4ENDSND1 384 -#define VOL4ENDSND2 385 -#define EXPANDERHIT 386 -#define SNAKESPEECH 387 -#define EXPANDERSHOOT 388 -#define GETBACKTOWORK 389 -#define JIBBED_ACTOR14 390 -#define JIBBED_ACTOR15 391 -#define INTRO4_B 392 -#define BIGBANG 393 -#define HORNSND 394 -#define BELLSND 395 -#define GOAWAY 396 -#define JOKE 397 diff --git a/source/duke3d/src/sounds.h b/source/duke3d/src/sounds.h index 54c336e32..19772f724 100644 --- a/source/duke3d/src/sounds.h +++ b/source/duke3d/src/sounds.h @@ -29,14 +29,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef sounds_public_h_ #define sounds_public_h_ -#include "sounds_common.h" +#include "dukerr/sounds_common.h" #include "sound/s_soundinternal.h" #include "z_music.h" BEGIN_DUKE_NS // KEEPINSYNC lunatic/con_lang.lua -#define MAXSOUNDS 4096 #define LOUDESTVOLUME 111 enum esound_t diff --git a/source/duke3d/src/soundsdyn.cpp b/source/duke3d/src/soundsdyn.cpp deleted file mode 100644 index 11bdf9b8d..000000000 --- a/source/duke3d/src/soundsdyn.cpp +++ /dev/null @@ -1,383 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2013 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- - -#include "ns.h" // Must come before everything else! - -#include "compat.h" -#include "build.h" - -#include "dukerr/namesdyn.h" -#include "sounds.h" -#include "soundsdyn.h" -#include "global.h" - -BEGIN_DUKE_NS - -#ifdef DYNSOUNDREMAP_ENABLE -# define DVPTR(x) &x -#else -# define DVPTR(x) NULL -#endif - -int16_t DynamicSoundMap[MAXSOUNDS]; - -struct dynitem -{ - const char *str; - int32_t *dynvalptr; - const int16_t staticval; -}; - -LUNATIC_EXTERN struct dynitem g_dynSoundList[] = -{ - { "ALIEN_SWITCH1", DVPTR(ALIEN_SWITCH1), ALIEN_SWITCH1__STATIC }, - { "BIGBANG", DVPTR(BIGBANG), BIGBANG__STATIC }, - { "BONUS_SPEECH1", DVPTR(BONUS_SPEECH1), BONUS_SPEECH1__STATIC }, - { "BONUS_SPEECH2", DVPTR(BONUS_SPEECH2), BONUS_SPEECH2__STATIC }, - { "BONUS_SPEECH3", DVPTR(BONUS_SPEECH3), BONUS_SPEECH3__STATIC }, - { "BONUS_SPEECH4", DVPTR(BONUS_SPEECH4), BONUS_SPEECH4__STATIC }, - { "BONUSMUSIC", DVPTR(BONUSMUSIC), BONUSMUSIC__STATIC }, - { "BOS1_RECOG", DVPTR(BOS1_RECOG), BOS1_RECOG__STATIC }, - { "BOS1_WALK", DVPTR(BOS1_WALK), BOS1_WALK__STATIC }, - { "BOS2_RECOG", DVPTR(BOS2_RECOG), BOS2_RECOG__STATIC }, - { "BOS3_RECOG", DVPTR(BOS3_RECOG), BOS3_RECOG__STATIC }, - { "BOS4_RECOG", DVPTR(BOS4_RECOG), BOS4_RECOG__STATIC }, - { "BOSS4_DEADSPEECH", DVPTR(BOSS4_DEADSPEECH), BOSS4_DEADSPEECH__STATIC }, - { "BOSS4_FIRSTSEE", DVPTR(BOSS4_FIRSTSEE), BOSS4_FIRSTSEE__STATIC }, - { "BOSSTALKTODUKE", DVPTR(BOSSTALKTODUKE), BOSSTALKTODUKE__STATIC }, - { "CAPT_RECOG", DVPTR(CAPT_RECOG), CAPT_RECOG__STATIC }, - { "CAT_FIRE", DVPTR(CAT_FIRE), CAT_FIRE__STATIC }, - { "CHAINGUN_FIRE", DVPTR(CHAINGUN_FIRE), CHAINGUN_FIRE__STATIC }, - { "COMM_RECOG", DVPTR(COMM_RECOG), COMM_RECOG__STATIC }, - { "DRON_RECOG", DVPTR(DRON_RECOG), DRON_RECOG__STATIC }, - { "DUKE_CRACK", DVPTR(DUKE_CRACK), DUKE_CRACK__STATIC }, - { "DUKE_CRACK_FIRST", DVPTR(DUKE_CRACK_FIRST), DUKE_CRACK_FIRST__STATIC }, - { "DUKE_CRACK2", DVPTR(DUKE_CRACK2), DUKE_CRACK2__STATIC }, - { "DUKE_DRINKING", DVPTR(DUKE_DRINKING), DUKE_DRINKING__STATIC }, - { "DUKE_GASP", DVPTR(DUKE_GASP), DUKE_GASP__STATIC }, - { "DUKE_GET", DVPTR(DUKE_GET), DUKE_GET__STATIC }, - { "DUKE_GETWEAPON2", DVPTR(DUKE_GETWEAPON2), DUKE_GETWEAPON2__STATIC }, - { "DUKE_GETWEAPON6", DVPTR(DUKE_GETWEAPON6), DUKE_GETWEAPON6__STATIC }, - { "DUKE_GOTHEALTHATLOW", DVPTR(DUKE_GOTHEALTHATLOW), DUKE_GOTHEALTHATLOW__STATIC }, - { "DUKE_GRUNT", DVPTR(DUKE_GRUNT), DUKE_GRUNT__STATIC }, - { "DUKE_HARTBEAT", DVPTR(DUKE_HARTBEAT), DUKE_HARTBEAT__STATIC }, - { "DUKE_JETPACK_IDLE", DVPTR(DUKE_JETPACK_IDLE), DUKE_JETPACK_IDLE__STATIC }, - { "DUKE_JETPACK_OFF", DVPTR(DUKE_JETPACK_OFF), DUKE_JETPACK_OFF__STATIC }, - { "DUKE_JETPACK_ON", DVPTR(DUKE_JETPACK_ON), DUKE_JETPACK_ON__STATIC }, - { "DUKE_LAND", DVPTR(DUKE_LAND), DUKE_LAND__STATIC }, - { "DUKE_LAND_HURT", DVPTR(DUKE_LAND_HURT), DUKE_LAND_HURT__STATIC }, - { "DUKE_LONGTERM_PAIN", DVPTR(DUKE_LONGTERM_PAIN), DUKE_LONGTERM_PAIN__STATIC }, - { "DUKE_ONWATER", DVPTR(DUKE_ONWATER), DUKE_ONWATER__STATIC }, - { "DUKE_PISSRELIEF", DVPTR(DUKE_PISSRELIEF), DUKE_PISSRELIEF__STATIC }, - { "DUKE_SCREAM", DVPTR(DUKE_SCREAM), DUKE_SCREAM__STATIC }, - { "DUKE_SEARCH", DVPTR(DUKE_SEARCH), DUKE_SEARCH__STATIC }, - { "DUKE_SEARCH2", DVPTR(DUKE_SEARCH2), DUKE_SEARCH2__STATIC }, - { "DUKE_TAKEPILLS", DVPTR(DUKE_TAKEPILLS), DUKE_TAKEPILLS__STATIC }, - { "DUKE_UNDERWATER", DVPTR(DUKE_UNDERWATER), DUKE_UNDERWATER__STATIC }, - { "DUKE_URINATE", DVPTR(DUKE_URINATE), DUKE_URINATE__STATIC }, - { "DUKE_USEMEDKIT", DVPTR(DUKE_USEMEDKIT), DUKE_USEMEDKIT__STATIC }, - { "DUKE_WALKINDUCTS", DVPTR(DUKE_WALKINDUCTS), DUKE_WALKINDUCTS__STATIC }, - { "DUKETALKTOBOSS", DVPTR(DUKETALKTOBOSS), DUKETALKTOBOSS__STATIC }, - { "EARTHQUAKE", DVPTR(EARTHQUAKE), EARTHQUAKE__STATIC }, - { "EJECT_CLIP", DVPTR(EJECT_CLIP), EJECT_CLIP__STATIC }, - { "ELEVATOR_OFF", DVPTR(ELEVATOR_OFF), ELEVATOR_OFF__STATIC }, - { "ELEVATOR_ON", DVPTR(ELEVATOR_ON), ELEVATOR_ON__STATIC }, - { "END_OF_LEVEL_WARN", DVPTR(END_OF_LEVEL_WARN), END_OF_LEVEL_WARN__STATIC }, - { "ENDSEQVOL2SND1", DVPTR(ENDSEQVOL2SND1), ENDSEQVOL2SND1__STATIC }, - { "ENDSEQVOL2SND2", DVPTR(ENDSEQVOL2SND2), ENDSEQVOL2SND2__STATIC }, - { "ENDSEQVOL2SND3", DVPTR(ENDSEQVOL2SND3), ENDSEQVOL2SND3__STATIC }, - { "ENDSEQVOL2SND4", DVPTR(ENDSEQVOL2SND4), ENDSEQVOL2SND4__STATIC }, - { "ENDSEQVOL2SND5", DVPTR(ENDSEQVOL2SND5), ENDSEQVOL2SND5__STATIC }, - { "ENDSEQVOL2SND6", DVPTR(ENDSEQVOL2SND6), ENDSEQVOL2SND6__STATIC }, - { "ENDSEQVOL2SND7", DVPTR(ENDSEQVOL2SND7), ENDSEQVOL2SND7__STATIC }, - { "ENDSEQVOL3SND2", DVPTR(ENDSEQVOL3SND2), ENDSEQVOL3SND2__STATIC }, - { "ENDSEQVOL3SND3", DVPTR(ENDSEQVOL3SND3), ENDSEQVOL3SND3__STATIC }, - { "ENDSEQVOL3SND4", DVPTR(ENDSEQVOL3SND4), ENDSEQVOL3SND4__STATIC }, - { "ENDSEQVOL3SND5", DVPTR(ENDSEQVOL3SND5), ENDSEQVOL3SND5__STATIC }, - { "ENDSEQVOL3SND6", DVPTR(ENDSEQVOL3SND6), ENDSEQVOL3SND6__STATIC }, - { "ENDSEQVOL3SND7", DVPTR(ENDSEQVOL3SND7), ENDSEQVOL3SND7__STATIC }, - { "ENDSEQVOL3SND8", DVPTR(ENDSEQVOL3SND8), ENDSEQVOL3SND8__STATIC }, - { "ENDSEQVOL3SND9", DVPTR(ENDSEQVOL3SND9), ENDSEQVOL3SND9__STATIC }, - { "EXITMENUSOUND", DVPTR(EXITMENUSOUND), EXITMENUSOUND__STATIC }, - { "EXPANDERSHOOT", DVPTR(EXPANDERSHOOT), EXPANDERSHOOT__STATIC }, - { "FLUSH_TOILET", DVPTR(FLUSH_TOILET), FLUSH_TOILET__STATIC }, - { "FLY_BY", DVPTR(FLY_BY), FLY_BY__STATIC }, - { "GENERIC_AMBIENCE17", DVPTR(GENERIC_AMBIENCE17), GENERIC_AMBIENCE17__STATIC }, - { "GLASS_BREAKING", DVPTR(GLASS_BREAKING), GLASS_BREAKING__STATIC }, - { "GLASS_HEAVYBREAK", DVPTR(GLASS_HEAVYBREAK), GLASS_HEAVYBREAK__STATIC }, - { "INSERT_CLIP", DVPTR(INSERT_CLIP), INSERT_CLIP__STATIC }, - { "INTRO4_1", DVPTR(INTRO4_1), INTRO4_1__STATIC }, - { "INTRO4_2", DVPTR(INTRO4_2), INTRO4_2__STATIC }, - { "INTRO4_3", DVPTR(INTRO4_3), INTRO4_3__STATIC }, - { "INTRO4_4", DVPTR(INTRO4_4), INTRO4_4__STATIC }, - { "INTRO4_5", DVPTR(INTRO4_5), INTRO4_5__STATIC }, - { "INTRO4_6", DVPTR(INTRO4_6), INTRO4_6__STATIC }, - { "INTRO4_B", DVPTR(INTRO4_B), INTRO4_B__STATIC }, - { "ITEM_SPLASH", DVPTR(ITEM_SPLASH), ITEM_SPLASH__STATIC }, - { "JIBBED_ACTOR5", DVPTR(JIBBED_ACTOR5), JIBBED_ACTOR5__STATIC }, - { "JIBBED_ACTOR6", DVPTR(JIBBED_ACTOR6), JIBBED_ACTOR6__STATIC }, - { "KICK_HIT", DVPTR(KICK_HIT), KICK_HIT__STATIC }, - { "LASERTRIP_ARMING", DVPTR(LASERTRIP_ARMING), LASERTRIP_ARMING__STATIC }, - { "LASERTRIP_EXPLODE", DVPTR(LASERTRIP_EXPLODE), LASERTRIP_EXPLODE__STATIC }, - { "LASERTRIP_ONWALL", DVPTR(LASERTRIP_ONWALL), LASERTRIP_ONWALL__STATIC }, - { "LIGHTNING_SLAP", DVPTR(LIGHTNING_SLAP), LIGHTNING_SLAP__STATIC }, - { "MONITOR_ACTIVE", DVPTR(MONITOR_ACTIVE), MONITOR_ACTIVE__STATIC }, - { "NITEVISION_ONOFF", DVPTR(NITEVISION_ONOFF), NITEVISION_ONOFF__STATIC }, - { "OCTA_RECOG", DVPTR(OCTA_RECOG), OCTA_RECOG__STATIC }, - { "PIG_RECOG", DVPTR(PIG_RECOG), PIG_RECOG__STATIC }, - { "PIPEBOMB_BOUNCE", DVPTR(PIPEBOMB_BOUNCE), PIPEBOMB_BOUNCE__STATIC }, - { "PIPEBOMB_EXPLODE", DVPTR(PIPEBOMB_EXPLODE), PIPEBOMB_EXPLODE__STATIC }, - { "PISTOL_BODYHIT", DVPTR(PISTOL_BODYHIT), PISTOL_BODYHIT__STATIC }, - { "PISTOL_FIRE", DVPTR(PISTOL_FIRE), PISTOL_FIRE__STATIC }, - { "PISTOL_RICOCHET", DVPTR(PISTOL_RICOCHET), PISTOL_RICOCHET__STATIC }, - { "POOLBALLHIT", DVPTR(POOLBALLHIT), POOLBALLHIT__STATIC }, - { "PRED_RECOG", DVPTR(PRED_RECOG), PRED_RECOG__STATIC }, - { "RATTY", DVPTR(RATTY), RATTY__STATIC }, - { "RECO_ATTACK", DVPTR(RECO_ATTACK), RECO_ATTACK__STATIC }, - { "RECO_PAIN", DVPTR(RECO_PAIN), RECO_PAIN__STATIC }, - { "RECO_RECOG", DVPTR(RECO_RECOG), RECO_RECOG__STATIC }, - { "RECO_ROAM", DVPTR(RECO_ROAM), RECO_ROAM__STATIC }, - { "RIPHEADNECK", DVPTR(RIPHEADNECK), RIPHEADNECK__STATIC }, - { "RPG_EXPLODE", DVPTR(RPG_EXPLODE), RPG_EXPLODE__STATIC }, - { "RPG_SHOOT", DVPTR(RPG_SHOOT), RPG_SHOOT__STATIC }, - { "SELECT_WEAPON", DVPTR(SELECT_WEAPON), SELECT_WEAPON__STATIC }, - { "SHORT_CIRCUIT", DVPTR(SHORT_CIRCUIT), SHORT_CIRCUIT__STATIC }, - { "SHOTGUN_COCK", DVPTR(SHOTGUN_COCK), SHOTGUN_COCK__STATIC }, - { "SHOTGUN_FIRE", DVPTR(SHOTGUN_FIRE), SHOTGUN_FIRE__STATIC }, - { "SHRINKER_FIRE", DVPTR(SHRINKER_FIRE), SHRINKER_FIRE__STATIC }, - { "SHRINKER_HIT", DVPTR(SHRINKER_HIT), SHRINKER_HIT__STATIC }, - { "SLIM_ATTACK", DVPTR(SLIM_ATTACK), SLIM_ATTACK__STATIC }, - { "SLIM_DYING", DVPTR(SLIM_DYING), SLIM_DYING__STATIC }, - { "SLIM_RECOG", DVPTR(SLIM_RECOG), SLIM_RECOG__STATIC }, - { "SLIM_ROAM", DVPTR(SLIM_ROAM), SLIM_ROAM__STATIC }, - { "SOMETHING_DRIPPING", DVPTR(SOMETHING_DRIPPING), SOMETHING_DRIPPING__STATIC }, - { "SOMETHINGFROZE", DVPTR(SOMETHINGFROZE), SOMETHINGFROZE__STATIC }, - { "SOMETHINGHITFORCE", DVPTR(SOMETHINGHITFORCE), SOMETHINGHITFORCE__STATIC }, - { "SQUISHED", DVPTR(SQUISHED), SQUISHED__STATIC }, - { "SUBWAY", DVPTR(SUBWAY), SUBWAY__STATIC }, - { "SWITCH_ON", DVPTR(SWITCH_ON), SWITCH_ON__STATIC }, - { "TELEPORTER", DVPTR(TELEPORTER), TELEPORTER__STATIC }, - { "THUD", DVPTR(THUD), THUD__STATIC }, - { "THUNDER", DVPTR(THUNDER), THUNDER__STATIC }, - { "TURR_RECOG", DVPTR(TURR_RECOG), TURR_RECOG__STATIC }, - { "VENT_BUST", DVPTR(VENT_BUST), VENT_BUST__STATIC }, - { "VOL4ENDSND1", DVPTR(VOL4ENDSND1), VOL4ENDSND1__STATIC }, - { "VOL4ENDSND2", DVPTR(VOL4ENDSND2), VOL4ENDSND2__STATIC }, - { "WAR_AMBIENCE2", DVPTR(WAR_AMBIENCE2), WAR_AMBIENCE2__STATIC }, - { "WHIPYOURASS", DVPTR(WHIPYOURASS), WHIPYOURASS__STATIC }, - { "WIERDSHOT_FLY", DVPTR(WIERDSHOT_FLY), WIERDSHOT_FLY__STATIC }, - { "WIND_AMBIENCE", DVPTR(WIND_AMBIENCE), WIND_AMBIENCE__STATIC }, - { "WIND_REPEAT", DVPTR(WIND_REPEAT), WIND_REPEAT__STATIC }, - }; - -#ifdef DYNSOUNDREMAP_ENABLE - -int32_t ALIEN_SWITCH1 = ALIEN_SWITCH1__STATIC; -int32_t BIGBANG = BIGBANG__STATIC; -int32_t BONUS_SPEECH1 = BONUS_SPEECH1__STATIC; -int32_t BONUS_SPEECH2 = BONUS_SPEECH2__STATIC; -int32_t BONUS_SPEECH3 = BONUS_SPEECH3__STATIC; -int32_t BONUS_SPEECH4 = BONUS_SPEECH4__STATIC; -int32_t BONUSMUSIC = BONUSMUSIC__STATIC; -int32_t BOS1_RECOG = BOS1_RECOG__STATIC; -int32_t BOS1_WALK = BOS1_WALK__STATIC; -int32_t BOS2_RECOG = BOS2_RECOG__STATIC; -int32_t BOS3_RECOG = BOS3_RECOG__STATIC; -int32_t BOS4_RECOG = BOS4_RECOG__STATIC; -int32_t BOSS4_DEADSPEECH = BOSS4_DEADSPEECH__STATIC; -int32_t BOSS4_FIRSTSEE = BOSS4_FIRSTSEE__STATIC; -int32_t BOSSTALKTODUKE = BOSSTALKTODUKE__STATIC; -int32_t CAPT_RECOG = CAPT_RECOG__STATIC; -int32_t CAT_FIRE = CAT_FIRE__STATIC; -int32_t CHAINGUN_FIRE = CHAINGUN_FIRE__STATIC; -int32_t COMM_RECOG = COMM_RECOG__STATIC; -int32_t DRON_RECOG = DRON_RECOG__STATIC; -int32_t DUKE_CRACK = DUKE_CRACK__STATIC; -int32_t DUKE_CRACK_FIRST = DUKE_CRACK_FIRST__STATIC; -int32_t DUKE_CRACK2 = DUKE_CRACK2__STATIC; -int32_t DUKE_DRINKING = DUKE_DRINKING__STATIC; -int32_t DUKE_GASP = DUKE_GASP__STATIC; -int32_t DUKE_GET = DUKE_GET__STATIC; -int32_t DUKE_GETWEAPON2 = DUKE_GETWEAPON2__STATIC; -int32_t DUKE_GETWEAPON6 = DUKE_GETWEAPON6__STATIC; -int32_t DUKE_GOTHEALTHATLOW = DUKE_GOTHEALTHATLOW__STATIC; -int32_t DUKE_GRUNT = DUKE_GRUNT__STATIC; -int32_t DUKE_HARTBEAT = DUKE_HARTBEAT__STATIC; -int32_t DUKE_JETPACK_IDLE = DUKE_JETPACK_IDLE__STATIC; -int32_t DUKE_JETPACK_OFF = DUKE_JETPACK_OFF__STATIC; -int32_t DUKE_JETPACK_ON = DUKE_JETPACK_ON__STATIC; -int32_t DUKE_LAND = DUKE_LAND__STATIC; -int32_t DUKE_LAND_HURT = DUKE_LAND_HURT__STATIC; -int32_t DUKE_LONGTERM_PAIN = DUKE_LONGTERM_PAIN__STATIC; -int32_t DUKE_ONWATER = DUKE_ONWATER__STATIC; -int32_t DUKE_PISSRELIEF = DUKE_PISSRELIEF__STATIC; -int32_t DUKE_SCREAM = DUKE_SCREAM__STATIC; -int32_t DUKE_SEARCH = DUKE_SEARCH__STATIC; -int32_t DUKE_SEARCH2 = DUKE_SEARCH2__STATIC; -int32_t DUKE_TAKEPILLS = DUKE_TAKEPILLS__STATIC; -int32_t DUKE_UNDERWATER = DUKE_UNDERWATER__STATIC; -int32_t DUKE_URINATE = DUKE_URINATE__STATIC; -int32_t DUKE_USEMEDKIT = DUKE_USEMEDKIT__STATIC; -int32_t DUKE_WALKINDUCTS = DUKE_WALKINDUCTS__STATIC; -int32_t DUKETALKTOBOSS = DUKETALKTOBOSS__STATIC; -int32_t EARTHQUAKE = EARTHQUAKE__STATIC; -int32_t EJECT_CLIP = EJECT_CLIP__STATIC; -int32_t ELEVATOR_OFF = ELEVATOR_OFF__STATIC; -int32_t ELEVATOR_ON = ELEVATOR_ON__STATIC; -int32_t END_OF_LEVEL_WARN = END_OF_LEVEL_WARN__STATIC; -int32_t ENDSEQVOL2SND1 = ENDSEQVOL2SND1__STATIC; -int32_t ENDSEQVOL2SND2 = ENDSEQVOL2SND2__STATIC; -int32_t ENDSEQVOL2SND3 = ENDSEQVOL2SND3__STATIC; -int32_t ENDSEQVOL2SND4 = ENDSEQVOL2SND4__STATIC; -int32_t ENDSEQVOL2SND5 = ENDSEQVOL2SND5__STATIC; -int32_t ENDSEQVOL2SND6 = ENDSEQVOL2SND6__STATIC; -int32_t ENDSEQVOL2SND7 = ENDSEQVOL2SND7__STATIC; -int32_t ENDSEQVOL3SND2 = ENDSEQVOL3SND2__STATIC; -int32_t ENDSEQVOL3SND3 = ENDSEQVOL3SND3__STATIC; -int32_t ENDSEQVOL3SND4 = ENDSEQVOL3SND4__STATIC; -int32_t ENDSEQVOL3SND5 = ENDSEQVOL3SND5__STATIC; -int32_t ENDSEQVOL3SND6 = ENDSEQVOL3SND6__STATIC; -int32_t ENDSEQVOL3SND7 = ENDSEQVOL3SND7__STATIC; -int32_t ENDSEQVOL3SND8 = ENDSEQVOL3SND8__STATIC; -int32_t ENDSEQVOL3SND9 = ENDSEQVOL3SND9__STATIC; -int32_t EXITMENUSOUND = EXITMENUSOUND__STATIC; -int32_t EXPANDERSHOOT = EXPANDERSHOOT__STATIC; -int32_t FLUSH_TOILET = FLUSH_TOILET__STATIC; -int32_t FLY_BY = FLY_BY__STATIC; -int32_t GENERIC_AMBIENCE17 = GENERIC_AMBIENCE17__STATIC; -int32_t GLASS_BREAKING = GLASS_BREAKING__STATIC; -int32_t GLASS_HEAVYBREAK = GLASS_HEAVYBREAK__STATIC; -int32_t INSERT_CLIP = INSERT_CLIP__STATIC; -int32_t INTRO4_1 = INTRO4_1__STATIC; -int32_t INTRO4_2 = INTRO4_2__STATIC; -int32_t INTRO4_3 = INTRO4_3__STATIC; -int32_t INTRO4_4 = INTRO4_4__STATIC; -int32_t INTRO4_5 = INTRO4_5__STATIC; -int32_t INTRO4_6 = INTRO4_6__STATIC; -int32_t INTRO4_B = INTRO4_B__STATIC; -int32_t ITEM_SPLASH = ITEM_SPLASH__STATIC; -int32_t JIBBED_ACTOR5 = JIBBED_ACTOR5__STATIC; -int32_t JIBBED_ACTOR6 = JIBBED_ACTOR6__STATIC; -int32_t KICK_HIT = KICK_HIT__STATIC; -int32_t LASERTRIP_ARMING = LASERTRIP_ARMING__STATIC; -int32_t LASERTRIP_EXPLODE = LASERTRIP_EXPLODE__STATIC; -int32_t LASERTRIP_ONWALL = LASERTRIP_ONWALL__STATIC; -int32_t LIGHTNING_SLAP = LIGHTNING_SLAP__STATIC; -int32_t MONITOR_ACTIVE = MONITOR_ACTIVE__STATIC; -int32_t NITEVISION_ONOFF = NITEVISION_ONOFF__STATIC; -int32_t OCTA_RECOG = OCTA_RECOG__STATIC; -int32_t PIG_RECOG = PIG_RECOG__STATIC; -int32_t PIPEBOMB_BOUNCE = PIPEBOMB_BOUNCE__STATIC; -int32_t PIPEBOMB_EXPLODE = PIPEBOMB_EXPLODE__STATIC; -int32_t PISTOL_BODYHIT = PISTOL_BODYHIT__STATIC; -int32_t PISTOL_FIRE = PISTOL_FIRE__STATIC; -int32_t PISTOL_RICOCHET = PISTOL_RICOCHET__STATIC; -int32_t POOLBALLHIT = POOLBALLHIT__STATIC; -int32_t PRED_RECOG = PRED_RECOG__STATIC; -int32_t RATTY = RATTY__STATIC; -int32_t RECO_ATTACK = RECO_ATTACK__STATIC; -int32_t RECO_PAIN = RECO_PAIN__STATIC; -int32_t RECO_RECOG = RECO_RECOG__STATIC; -int32_t RECO_ROAM = RECO_ROAM__STATIC; -int32_t RIPHEADNECK = RIPHEADNECK__STATIC; -int32_t RPG_EXPLODE = RPG_EXPLODE__STATIC; -int32_t RPG_SHOOT = RPG_SHOOT__STATIC; -int32_t SELECT_WEAPON = SELECT_WEAPON__STATIC; -int32_t SHORT_CIRCUIT = SHORT_CIRCUIT__STATIC; -int32_t SHOTGUN_COCK = SHOTGUN_COCK__STATIC; -int32_t SHOTGUN_FIRE = SHOTGUN_FIRE__STATIC; -int32_t SHRINKER_FIRE = SHRINKER_FIRE__STATIC; -int32_t SHRINKER_HIT = SHRINKER_HIT__STATIC; -int32_t SLIM_ATTACK = SLIM_ATTACK__STATIC; -int32_t SLIM_DYING = SLIM_DYING__STATIC; -int32_t SLIM_RECOG = SLIM_RECOG__STATIC; -int32_t SLIM_ROAM = SLIM_ROAM__STATIC; -int32_t SOMETHING_DRIPPING = SOMETHING_DRIPPING__STATIC; -int32_t SOMETHINGFROZE = SOMETHINGFROZE__STATIC; -int32_t SOMETHINGHITFORCE = SOMETHINGHITFORCE__STATIC; -int32_t SQUISHED = SQUISHED__STATIC; -int32_t SUBWAY = SUBWAY__STATIC; -int32_t SWITCH_ON = SWITCH_ON__STATIC; -int32_t TELEPORTER = TELEPORTER__STATIC; -int32_t THUD = THUD__STATIC; -int32_t THUNDER = THUNDER__STATIC; -int32_t TURR_RECOG = TURR_RECOG__STATIC; -int32_t VENT_BUST = VENT_BUST__STATIC; -int32_t VOL4ENDSND1 = VOL4ENDSND1__STATIC; -int32_t VOL4ENDSND2 = VOL4ENDSND2__STATIC; -int32_t WAR_AMBIENCE2 = WAR_AMBIENCE2__STATIC; -int32_t WHIPYOURASS = WHIPYOURASS__STATIC; -int32_t WIERDSHOT_FLY = WIERDSHOT_FLY__STATIC; -int32_t WIND_AMBIENCE = WIND_AMBIENCE__STATIC; -int32_t WIND_REPEAT = WIND_REPEAT__STATIC; - -#if !defined LUNATIC -static hashtable_t h_names = {512, NULL}; - -void G_ProcessDynamicSoundMapping(const char *szLabel, int32_t lValue) -{ - if ((unsigned)lValue >= MAXSOUNDS || !szLabel) - return; - - int const i = hash_find(&h_names,szLabel); - - if (i>=0) - { - struct dynitem *di = &g_dynSoundList[i]; -#ifdef DEBUGGINGAIDS - if (g_scriptDebug && di->staticval != lValue) - OSD_Printf("REMAP %s (%d) --> %d\n", di->str, di->staticval, lValue); -#endif - *di->dynvalptr = lValue; - } -} - -void initsoundhashnames(void) -{ - hash_init(&h_names); - - for (int i=0; i < ARRAY_SSIZE(g_dynSoundList); i++) - hash_add(&h_names, g_dynSoundList[i].str, i, 0); -} - -void freesoundhashnames(void) -{ - hash_free(&h_names); -} -#endif -#endif - -// This is run after all CON define's have been processed to set up the -// dynamic->static sound mapping. -void G_InitDynamicSounds(void) -{ - Bmemset(DynamicSoundMap, 0, sizeof(DynamicSoundMap)); - - for (auto & i : g_dynSoundList) -#ifdef DYNSOUNDREMAP_ENABLE - DynamicSoundMap[*(i.dynvalptr)] = i.staticval; -#else - DynamicSoundMap[i.staticval] = i.staticval; -#endif - -} -END_DUKE_NS diff --git a/source/duke3d/src/soundsdyn.h b/source/duke3d/src/soundsdyn.h deleted file mode 100644 index 72e65da91..000000000 --- a/source/duke3d/src/soundsdyn.h +++ /dev/null @@ -1,338 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2013 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#ifndef soundsdyn_h__ -#define soundsdyn_h__ - -BEGIN_DUKE_NS - -#define DYNSOUNDREMAP_ENABLE - - -#define KICK_HIT__STATIC 0 -#define PISTOL_RICOCHET__STATIC 1 -#define PISTOL_BODYHIT__STATIC 2 -#define PISTOL_FIRE__STATIC 3 -#define EJECT_CLIP__STATIC 4 -#define INSERT_CLIP__STATIC 5 -#define CHAINGUN_FIRE__STATIC 6 -#define RPG_SHOOT__STATIC 7 -#define POOLBALLHIT__STATIC 8 -#define RPG_EXPLODE__STATIC 9 -#define CAT_FIRE__STATIC 10 -#define SHRINKER_FIRE__STATIC 11 -#define PIPEBOMB_BOUNCE__STATIC 13 -#define PIPEBOMB_EXPLODE__STATIC 14 -#define LASERTRIP_ONWALL__STATIC 15 -#define LASERTRIP_ARMING__STATIC 16 -#define LASERTRIP_EXPLODE__STATIC 17 -#define VENT_BUST__STATIC 18 -#define GLASS_BREAKING__STATIC 19 -#define GLASS_HEAVYBREAK__STATIC 20 -#define SHORT_CIRCUIT__STATIC 21 -#define ITEM_SPLASH__STATIC 22 -#define DUKE_GASP__STATIC 25 -#define SLIM_RECOG__STATIC 26 -#define DUKE_URINATE__STATIC 28 -#define ENDSEQVOL3SND2__STATIC 29 -#define ENDSEQVOL3SND3__STATIC 30 -#define DUKE_CRACK__STATIC 33 -#define SLIM_ATTACK__STATIC 34 -#define SOMETHINGHITFORCE__STATIC 35 -#define DUKE_DRINKING__STATIC 36 -#define DUKE_GRUNT__STATIC 38 -#define DUKE_HARTBEAT__STATIC 39 -#define DUKE_ONWATER__STATIC 40 -#define DUKE_LAND__STATIC 42 -#define DUKE_WALKINDUCTS__STATIC 43 -#define DUKE_UNDERWATER__STATIC 48 -#define DUKE_JETPACK_ON__STATIC 49 -#define DUKE_JETPACK_IDLE__STATIC 50 -#define DUKE_JETPACK_OFF__STATIC 51 -#define DUKETALKTOBOSS__STATIC 56 -#define SQUISHED__STATIC 69 -#define TELEPORTER__STATIC 70 -#define ELEVATOR_ON__STATIC 71 -#define ELEVATOR_OFF__STATIC 73 -#define SUBWAY__STATIC 75 -#define SWITCH_ON__STATIC 76 -#define FLUSH_TOILET__STATIC 79 -#define EARTHQUAKE__STATIC 81 -#define END_OF_LEVEL_WARN__STATIC 83 -#define WIND_AMBIENCE__STATIC 91 -#define SOMETHING_DRIPPING__STATIC 92 -#define BOS1_RECOG__STATIC 97 -#define BOS2_RECOG__STATIC 102 -#define DUKE_GETWEAPON2__STATIC 107 -#define SHOTGUN_FIRE__STATIC 109 -#define PRED_RECOG__STATIC 111 -#define CAPT_RECOG__STATIC 117 -#define PIG_RECOG__STATIC 121 -#define RECO_ROAM__STATIC 125 -#define RECO_RECOG__STATIC 126 -#define RECO_ATTACK__STATIC 127 -#define RECO_PAIN__STATIC 128 -#define DRON_RECOG__STATIC 131 -#define COMM_RECOG__STATIC 136 -#define OCTA_RECOG__STATIC 141 -#define TURR_RECOG__STATIC 146 -#define SLIM_DYING__STATIC 149 -#define BOS3_RECOG__STATIC 151 -#define BOS1_WALK__STATIC 156 -#define THUD__STATIC 158 -#define WIERDSHOT_FLY__STATIC 160 -#define SLIM_ROAM__STATIC 163 -#define SHOTGUN_COCK__STATIC 169 -#define GENERIC_AMBIENCE17__STATIC 177 -#define BONUS_SPEECH1__STATIC 195 -#define BONUS_SPEECH2__STATIC 196 -#define BONUS_SPEECH3__STATIC 197 -#define BONUS_SPEECH4__STATIC 199 -#define DUKE_LAND_HURT__STATIC 200 -#define DUKE_SEARCH2__STATIC 207 -#define DUKE_CRACK2__STATIC 208 -#define DUKE_SEARCH__STATIC 209 -#define DUKE_GET__STATIC 210 -#define DUKE_LONGTERM_PAIN__STATIC 211 -#define MONITOR_ACTIVE__STATIC 212 -#define NITEVISION_ONOFF__STATIC 213 -#define DUKE_CRACK_FIRST__STATIC 215 -#define DUKE_USEMEDKIT__STATIC 216 -#define DUKE_TAKEPILLS__STATIC 217 -#define DUKE_PISSRELIEF__STATIC 218 -#define SELECT_WEAPON__STATIC 219 -#define JIBBED_ACTOR5__STATIC 226 -#define JIBBED_ACTOR6__STATIC 227 -#define DUKE_GOTHEALTHATLOW__STATIC 229 -#define BOSSTALKTODUKE__STATIC 230 -#define WAR_AMBIENCE2__STATIC 232 -#define EXITMENUSOUND__STATIC 243 -#define FLY_BY__STATIC 244 -#define DUKE_SCREAM__STATIC 245 -#define SHRINKER_HIT__STATIC 246 -#define RATTY__STATIC 247 -#define BONUSMUSIC__STATIC 249 -#define DUKE_GETWEAPON6__STATIC 264 -#define ALIEN_SWITCH1__STATIC 272 -#define RIPHEADNECK__STATIC 284 -#define ENDSEQVOL3SND4__STATIC 288 -#define ENDSEQVOL3SND5__STATIC 289 -#define ENDSEQVOL3SND6__STATIC 290 -#define ENDSEQVOL3SND7__STATIC 291 -#define ENDSEQVOL3SND8__STATIC 292 -#define ENDSEQVOL3SND9__STATIC 293 -#define WHIPYOURASS__STATIC 294 -#define ENDSEQVOL2SND1__STATIC 295 -#define ENDSEQVOL2SND2__STATIC 296 -#define ENDSEQVOL2SND3__STATIC 297 -#define ENDSEQVOL2SND4__STATIC 298 -#define ENDSEQVOL2SND5__STATIC 299 -#define ENDSEQVOL2SND6__STATIC 300 -#define ENDSEQVOL2SND7__STATIC 301 -#define SOMETHINGFROZE__STATIC 303 -#define WIND_REPEAT__STATIC 308 -#define BOS4_RECOG__STATIC 342 -#define LIGHTNING_SLAP__STATIC 351 -#define THUNDER__STATIC 352 -#define INTRO4_1__STATIC 363 -#define INTRO4_2__STATIC 364 -#define INTRO4_3__STATIC 365 -#define INTRO4_4__STATIC 366 -#define INTRO4_5__STATIC 367 -#define INTRO4_6__STATIC 368 -#define BOSS4_DEADSPEECH__STATIC 370 -#define BOSS4_FIRSTSEE__STATIC 371 -#define VOL4ENDSND1__STATIC 384 -#define VOL4ENDSND2__STATIC 385 -#define EXPANDERSHOOT__STATIC 388 -#define INTRO4_B__STATIC 392 -#define BIGBANG__STATIC 393 - -extern int16_t DynamicSoundMap[MAXSOUNDS]; - -void G_InitDynamicSounds(void); - -#ifdef DYNSOUNDREMAP_ENABLE - -void G_ProcessDynamicSoundMapping(const char *szLabel, int32_t lValue); - -#if !defined LUNATIC -void initsoundhashnames(void); -void freesoundhashnames(void); -#endif - -extern int32_t ALIEN_SWITCH1; -extern int32_t BIGBANG; -extern int32_t BONUS_SPEECH1; -extern int32_t BONUS_SPEECH2; -extern int32_t BONUS_SPEECH3; -extern int32_t BONUS_SPEECH4; -extern int32_t BONUSMUSIC; -extern int32_t BOS1_RECOG; -extern int32_t BOS1_WALK; -extern int32_t BOS2_RECOG; -extern int32_t BOS3_RECOG; -extern int32_t BOS4_RECOG; -extern int32_t BOSS4_DEADSPEECH; -extern int32_t BOSS4_FIRSTSEE; -extern int32_t BOSSTALKTODUKE; -extern int32_t CAPT_RECOG; -extern int32_t CAT_FIRE; -extern int32_t CHAINGUN_FIRE; -extern int32_t COMM_RECOG; -extern int32_t DRON_RECOG; -extern int32_t DUKE_CRACK; -extern int32_t DUKE_CRACK_FIRST; -extern int32_t DUKE_CRACK2; -extern int32_t DUKE_DRINKING; -extern int32_t DUKE_GASP; -extern int32_t DUKE_GET; -extern int32_t DUKE_GETWEAPON2; -extern int32_t DUKE_GETWEAPON6; -extern int32_t DUKE_GOTHEALTHATLOW; -extern int32_t DUKE_GRUNT; -extern int32_t DUKE_HARTBEAT; -extern int32_t DUKE_JETPACK_IDLE; -extern int32_t DUKE_JETPACK_OFF; -extern int32_t DUKE_JETPACK_ON; -extern int32_t DUKE_LAND; -extern int32_t DUKE_LAND_HURT; -extern int32_t DUKE_LONGTERM_PAIN; -extern int32_t DUKE_ONWATER; -extern int32_t DUKE_PISSRELIEF; -extern int32_t DUKE_SCREAM; -extern int32_t DUKE_SEARCH; -extern int32_t DUKE_SEARCH2; -extern int32_t DUKE_TAKEPILLS; -extern int32_t DUKE_UNDERWATER; -extern int32_t DUKE_URINATE; -extern int32_t DUKE_USEMEDKIT; -extern int32_t DUKE_WALKINDUCTS; -extern int32_t DUKETALKTOBOSS; -extern int32_t EARTHQUAKE; -extern int32_t EJECT_CLIP; -extern int32_t ELEVATOR_OFF; -extern int32_t ELEVATOR_ON; -extern int32_t END_OF_LEVEL_WARN; -extern int32_t ENDSEQVOL2SND1; -extern int32_t ENDSEQVOL2SND2; -extern int32_t ENDSEQVOL2SND3; -extern int32_t ENDSEQVOL2SND4; -extern int32_t ENDSEQVOL2SND5; -extern int32_t ENDSEQVOL2SND6; -extern int32_t ENDSEQVOL2SND7; -extern int32_t ENDSEQVOL3SND2; -extern int32_t ENDSEQVOL3SND3; -extern int32_t ENDSEQVOL3SND4; -extern int32_t ENDSEQVOL3SND5; -extern int32_t ENDSEQVOL3SND6; -extern int32_t ENDSEQVOL3SND7; -extern int32_t ENDSEQVOL3SND8; -extern int32_t ENDSEQVOL3SND9; -extern int32_t EXITMENUSOUND; -extern int32_t EXPANDERSHOOT; -extern int32_t FLUSH_TOILET; -extern int32_t FLY_BY; -extern int32_t GENERIC_AMBIENCE17; -extern int32_t GLASS_BREAKING; -extern int32_t GLASS_HEAVYBREAK; -extern int32_t INSERT_CLIP; -extern int32_t INTRO4_1; -extern int32_t INTRO4_2; -extern int32_t INTRO4_3; -extern int32_t INTRO4_4; -extern int32_t INTRO4_5; -extern int32_t INTRO4_6; -extern int32_t INTRO4_B; -extern int32_t ITEM_SPLASH; -extern int32_t JIBBED_ACTOR5; -extern int32_t JIBBED_ACTOR6; -extern int32_t KICK_HIT; -extern int32_t LASERTRIP_ARMING; -extern int32_t LASERTRIP_EXPLODE; -extern int32_t LASERTRIP_ONWALL; -extern int32_t LIGHTNING_SLAP; -extern int32_t MONITOR_ACTIVE; -extern int32_t NITEVISION_ONOFF; -extern int32_t OCTA_RECOG; -extern int32_t PIG_RECOG; -extern int32_t PIPEBOMB_BOUNCE; -extern int32_t PIPEBOMB_EXPLODE; -extern int32_t PISTOL_BODYHIT; -extern int32_t PISTOL_FIRE; -extern int32_t PISTOL_RICOCHET; -extern int32_t POOLBALLHIT; -extern int32_t PRED_RECOG; -extern int32_t RATTY; -extern int32_t RECO_ATTACK; -extern int32_t RECO_PAIN; -extern int32_t RECO_RECOG; -extern int32_t RECO_ROAM; -extern int32_t RIPHEADNECK; -extern int32_t RPG_EXPLODE; -extern int32_t RPG_SHOOT; -extern int32_t SELECT_WEAPON; -extern int32_t SHORT_CIRCUIT; -extern int32_t SHOTGUN_COCK; -extern int32_t SHOTGUN_FIRE; -extern int32_t SHRINKER_FIRE; -extern int32_t SHRINKER_HIT; -extern int32_t SLIM_ATTACK; -extern int32_t SLIM_DYING; -extern int32_t SLIM_RECOG; -extern int32_t SLIM_ROAM; -extern int32_t SOMETHING_DRIPPING; -extern int32_t SOMETHINGFROZE; -extern int32_t SOMETHINGHITFORCE; -extern int32_t SQUISHED; -extern int32_t SUBWAY; -extern int32_t SWITCH_ON; -extern int32_t TELEPORTER; -extern int32_t THUD; -extern int32_t THUNDER; -extern int32_t TURR_RECOG; -extern int32_t VENT_BUST; -extern int32_t VOL4ENDSND1; -extern int32_t VOL4ENDSND2; -extern int32_t WAR_AMBIENCE2; -extern int32_t WHIPYOURASS; -extern int32_t WIERDSHOT_FLY; -extern int32_t WIND_AMBIENCE; -extern int32_t WIND_REPEAT; - -#define DYNAMICSOUNDMAP(Soundnum) (DynamicSoundMap[Soundnum]) - -#else /* if !defined DYNSOUNDREMAP_ENABLE */ - -#define G_ProcessDynamicSoundMapping(x, y) ((void)(0)) - -#define initsoundhashnames() ((void)0) -#define freesoundhashnames() ((void)0) - -#include "soundefs.h" - -#define DYNAMICSOUNDMAP(Soundnum) (Soundnum) - -#endif - -END_DUKE_NS - -#endif // soundsdyn_h__ diff --git a/source/dukerr/namesdyn.cpp b/source/dukerr/namesdyn.cpp index fc958e5f1..1b9b400ef 100644 --- a/source/dukerr/namesdyn.cpp +++ b/source/dukerr/namesdyn.cpp @@ -2909,7 +2909,6 @@ int32_t MAMA = 0; int32_t MAMAJIBA = 0; int32_t MAMAJIBB = 0; -#if 0 static hashtable_t h_names = {512, NULL}; void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue) @@ -2923,10 +2922,6 @@ void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue) if (i>=0) { struct dynitem *di = &g_dynTileList[i]; -#ifdef DEBUGGINGAIDS - if (g_scriptDebug && di->staticval != lValue) - OSD_Printf("REMAP %s (%d) --> %d\n", di->str, di->staticval, lValue); -#endif *di->dynvalptr = lValue; } } @@ -2945,7 +2940,6 @@ void freehashnames(void) { hash_free(&h_names); } -#endif static struct dynitem g_dynWeaponList[] = diff --git a/source/duke3d/src/sounds_common.h b/source/dukerr/sounds_common.h similarity index 100% rename from source/duke3d/src/sounds_common.h rename to source/dukerr/sounds_common.h diff --git a/source/rr/src/soundsdyn.cpp b/source/dukerr/soundsdyn.cpp similarity index 97% rename from source/rr/src/soundsdyn.cpp rename to source/dukerr/soundsdyn.cpp index c91cd19b2..562b9d496 100644 --- a/source/rr/src/soundsdyn.cpp +++ b/source/dukerr/soundsdyn.cpp @@ -24,12 +24,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "dukerr/namesdyn.h" -#include "sounds.h" +#include "namesdyn.h" #include "soundsdyn.h" -#include "global.h" -BEGIN_RR_NS +BEGIN_DUKERR_NS #ifdef DYNSOUNDREMAP_ENABLE # define DVPTR(x) &x @@ -334,12 +332,10 @@ static hashtable_t h_names = {512, NULL}; void G_ProcessDynamicSoundMapping(const char *szLabel, int32_t lValue) { - int32_t i; - if ((unsigned)lValue >= MAXSOUNDS || !szLabel) return; - i = hash_find(&h_names,szLabel); + int i = hash_find(&h_names,szLabel); if (i>=0) { struct sdynitem *di = &g_dynSoundList[i]; @@ -353,11 +349,10 @@ void G_ProcessDynamicSoundMapping(const char *szLabel, int32_t lValue) void initsoundhashnames(void) { - int32_t i; hash_init(&h_names); - for (i=0; g_dynSoundList[i].staticval >= 0; i++) + for (int i=0; g_dynSoundList[i].staticval >= 0; i++) hash_add(&h_names, g_dynSoundList[i].str, i, 0); } @@ -371,15 +366,14 @@ void freesoundhashnames(void) // dynamic->static sound mapping. void G_InitDynamicSounds(void) { - int32_t i; Bmemset(DynamicSoundMap, 0, sizeof(DynamicSoundMap)); - for (i=0; g_dynSoundList[i].staticval >= 0; i++) + for (auto & i : g_dynSoundList) #ifdef DYNSOUNDREMAP_ENABLE - DynamicSoundMap[*(g_dynSoundList[i].dynvalptr)] = g_dynSoundList[i].staticval; + DynamicSoundMap[*(i.dynvalptr)] = i.staticval; #else - DynamicSoundMap[g_dynSoundList[i].staticval] = g_dynSoundList[i].staticval; + DynamicSoundMap[i.staticval] = i.staticval; #endif } diff --git a/source/rr/src/soundsdyn.h b/source/dukerr/soundsdyn.h similarity index 99% rename from source/rr/src/soundsdyn.h rename to source/dukerr/soundsdyn.h index cca3c2154..dff862a31 100644 --- a/source/rr/src/soundsdyn.h +++ b/source/dukerr/soundsdyn.h @@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- -BEGIN_RR_NS +BEGIN_DUKERR_NS #define DYNSOUNDREMAP_ENABLE +#define MAXSOUNDS 4096 #define KICK_HIT__STATIC 0 #define PISTOL_RICOCHET__STATIC 1 diff --git a/source/rr/CMakeLists.txt b/source/rr/CMakeLists.txt index 6b21af8b8..0468d5a12 100644 --- a/source/rr/CMakeLists.txt +++ b/source/rr/CMakeLists.txt @@ -23,7 +23,6 @@ set( PCH_SOURCES src/text.cpp src/sector.cpp src/sounds.cpp - src/soundsdyn.cpp src/rrdh.cpp) add_game_library( rr ) diff --git a/source/rr/src/duke3d.h b/source/rr/src/duke3d.h index 8316bf010..9ab09f448 100644 --- a/source/rr/src/duke3d.h +++ b/source/rr/src/duke3d.h @@ -128,7 +128,7 @@ END_RR_NS #include "text.h" #include "sector.h" #include "sounds.h" -#include "soundsdyn.h" +#include "dukerr/soundsdyn.h" #include "rrdh.h" BEGIN_RR_NS diff --git a/source/rr/src/gamedef.cpp b/source/rr/src/gamedef.cpp index aa93f8f66..ef49f7cae 100644 --- a/source/rr/src/gamedef.cpp +++ b/source/rr/src/gamedef.cpp @@ -324,7 +324,6 @@ void C_InitHashes() for (auto &varvar : varvartable) inthash_add(&h_varvar, varvar.x, varvar.y, 0); - //inithashnames(); initsoundhashnames(); for (tokenmap_t const & keyword : vm_keywords) @@ -1316,8 +1315,6 @@ static int32_t C_ParseCommand(int32_t loop) hash_add(&h_labels,label+(g_labelCnt<<6),g_labelCnt,0); labeltype[g_labelCnt] = LABEL_DEFINE; labelcode[g_labelCnt++] = *(g_scriptPtr-1); - //if (*(g_scriptPtr-1) >= 0 && *(g_scriptPtr-1) < MAXTILES && g_dynamicTileMapping) - // G_ProcessDynamicTileMapping(label+((g_labelCnt-1)<<6),*(g_scriptPtr-1)); } g_scriptPtr -= 2; continue; @@ -2724,7 +2721,6 @@ void C_Compile(const char *fileName) for (auto *i : tables_free) hash_free(i); - //freehashnames(); freesoundhashnames(); if (g_scriptDebug) diff --git a/source/rr/src/soundefs.h b/source/rr/src/soundefs.h deleted file mode 100644 index f72481312..000000000 --- a/source/rr/src/soundefs.h +++ /dev/null @@ -1,418 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- - -#define KICK_HIT 0 -#define PISTOL_RICOCHET 1 -#define PISTOL_BODYHIT 2 -#define PISTOL_FIRE 3 -#define EJECT_CLIP 4 -#define INSERT_CLIP 5 -#define CHAINGUN_FIRE 6 -#define RPG_SHOOT 7 -#define POOLBALLHIT 8 -#define RPG_EXPLODE 9 -#define CAT_FIRE 10 -#define SHRINKER_FIRE 11 -#define ACTOR_SHRINKING 12 -#define PIPEBOMB_BOUNCE 13 -#define PIPEBOMB_EXPLODE 14 -#define LASERTRIP_ONWALL 15 -#define LASERTRIP_ARMING 16 -#define LASERTRIP_EXPLODE 17 -#define VENT_BUST 18 -#define GLASS_BREAKING 19 -#define GLASS_HEAVYBREAK 20 -#define SHORT_CIRCUIT 21 -#define ITEM_SPLASH 22 -#define DUKE_BREATHING 23 -#define DUKE_EXHALING 24 -#define DUKE_GASP 25 -#define SLIM_RECOG 26 -// #define ENDSEQVOL3SND1 27 -#define DUKE_URINATE 28 -#define ENDSEQVOL3SND2 29 -#define ENDSEQVOL3SND3 30 -#define DUKE_PASSWIND 32 -#define DUKE_CRACK 33 -#define SLIM_ATTACK 34 -#define SOMETHINGHITFORCE 35 -#define DUKE_DRINKING 36 -#define DUKE_KILLED1 37 -#define DUKE_GRUNT 38 -#define DUKE_HARTBEAT 39 -#define DUKE_ONWATER 40 -#define DUKE_DEAD 41 -#define DUKE_LAND 42 -#define DUKE_WALKINDUCTS 43 -#define DUKE_GLAD 44 -#define DUKE_YES 45 -#define DUKE_HEHE 46 -#define DUKE_SHUCKS 47 -#define DUKE_UNDERWATER 48 -#define DUKE_JETPACK_ON 49 -#define DUKE_JETPACK_IDLE 50 -#define DUKE_JETPACK_OFF 51 -#define LIZTROOP_GROWL 52 -#define LIZTROOP_TALK1 53 -#define LIZTROOP_TALK2 54 -#define LIZTROOP_TALK3 55 -#define DUKETALKTOBOSS 56 -#define LIZCAPT_GROWL 57 -#define LIZCAPT_TALK1 58 -#define LIZCAPT_TALK2 59 -#define LIZCAPT_TALK3 60 -#define LIZARD_BEG 61 -#define LIZARD_PAIN 62 -#define LIZARD_DEATH 63 -#define LIZARD_SPIT 64 -#define DRONE1_HISSRATTLE 65 -#define DRONE1_HISSSCREECH 66 -#define DUKE_TIP2 67 -#define FLESH_BURNING 68 -#define SQUISHED 69 -#define TELEPORTER 70 -#define ELEVATOR_ON 71 -#define DUKE_KILLED3 72 -#define ELEVATOR_OFF 73 -#define DOOR_OPERATE1 74 -#define SUBWAY 75 -#define SWITCH_ON 76 -#define FAN 77 -#define DUKE_GETWEAPON3 78 -#define FLUSH_TOILET 79 -#define HOVER_CRAFT 80 -#define EARTHQUAKE 81 -#define INTRUDER_ALERT 82 -#define END_OF_LEVEL_WARN 83 -#define ENGINE_OPERATING 84 -#define REACTOR_ON 85 -#define COMPUTER_AMBIENCE 86 -#define GEARS_GRINDING 87 -#define BUBBLE_AMBIENCE 88 -#define MACHINE_AMBIENCE 89 -#define SEWER_AMBIENCE 90 -#define WIND_AMBIENCE 91 -#define SOMETHING_DRIPPING 92 -#define STEAM_HISSING 93 -#define THEATER_BREATH 94 -#define BAR_MUSIC 95 -#define BOS1_ROAM 96 -#define BOS1_RECOG 97 -#define BOS1_ATTACK1 98 -#define BOS1_PAIN 99 -#define BOS1_DYING 100 -#define BOS2_ROAM 101 -#define BOS2_RECOG 102 -#define BOS2_ATTACK 103 -#define BOS2_PAIN 104 -#define BOS2_DYING 105 -#define GETATOMICHEALTH 106 -#define DUKE_GETWEAPON2 107 -#define BOS3_DYING 108 -#define SHOTGUN_FIRE 109 -#define PRED_ROAM 110 -#define PRED_RECOG 111 -#define PRED_ATTACK 112 -#define PRED_PAIN 113 -#define PRED_DYING 114 -#define CAPT_ROAM 115 -#define CAPT_ATTACK 116 -#define CAPT_RECOG 117 -#define CAPT_PAIN 118 -#define CAPT_DYING 119 -#define PIG_ROAM 120 -#define PIG_RECOG 121 -#define PIG_ATTACK 122 -#define PIG_PAIN 123 -#define PIG_DYING 124 -#define RECO_ROAM 125 -#define RECO_RECOG 126 -#define RECO_ATTACK 127 -#define RECO_PAIN 128 -#define RECO_DYING 129 -#define DRON_ROAM 130 -#define DRON_RECOG 131 -#define DRON_ATTACK1 132 -#define DRON_PAIN 133 -#define DRON_DYING 134 -#define COMM_ROAM 135 -#define COMM_RECOG 136 -#define COMM_ATTACK 137 -#define COMM_PAIN 138 -#define COMM_DYING 139 -#define OCTA_ROAM 140 -#define OCTA_RECOG 141 -#define OCTA_ATTACK1 142 -#define OCTA_PAIN 143 -#define OCTA_DYING 144 -#define TURR_ROAM 145 -#define TURR_RECOG 146 -#define TURR_ATTACK 147 -#define DUMPSTER_MOVE 148 -#define SLIM_DYING 149 -#define BOS3_ROAM 150 -#define BOS3_RECOG 151 -#define BOS3_ATTACK1 152 -#define BOS3_PAIN 153 -#define BOS1_ATTACK2 154 -#define COMM_SPIN 155 -#define BOS1_WALK 156 -#define DRON_ATTACK2 157 -#define THUD 158 -#define OCTA_ATTACK2 159 -#define WIERDSHOT_FLY 160 -#define TURR_PAIN 161 -#define TURR_DYING 162 -#define SLIM_ROAM 163 -#define LADY_SCREAM 164 -#define DOOR_OPERATE2 165 -#define DOOR_OPERATE3 166 -#define DOOR_OPERATE4 167 -#define BORNTOBEWILDSND 168 -#define SHOTGUN_COCK 169 -#define GENERIC_AMBIENCE1 170 -#define GENERIC_AMBIENCE2 171 -#define GENERIC_AMBIENCE3 172 -#define GENERIC_AMBIENCE4 173 -#define GENERIC_AMBIENCE5 174 -#define GENERIC_AMBIENCE6 175 -#define BOS3_ATTACK2 176 -#define GENERIC_AMBIENCE17 177 -#define GENERIC_AMBIENCE18 178 -#define GENERIC_AMBIENCE19 179 -#define GENERIC_AMBIENCE20 180 -#define GENERIC_AMBIENCE21 181 -#define GENERIC_AMBIENCE22 182 -#define SECRETLEVELSND 183 -#define GENERIC_AMBIENCE8 184 -#define GENERIC_AMBIENCE9 185 -#define GENERIC_AMBIENCE10 186 -#define GENERIC_AMBIENCE11 187 -#define GENERIC_AMBIENCE12 188 -#define GENERIC_AMBIENCE13 189 -#define GENERIC_AMBIENCE14 190 -#define GENERIC_AMBIENCE15 192 -#define GENERIC_AMBIENCE16 193 -#define FIRE_CRACKLE 194 -#define BONUS_SPEECH1 195 -#define BONUS_SPEECH2 196 -#define BONUS_SPEECH3 197 -#define PIG_CAPTURE_DUKE 198 -#define BONUS_SPEECH4 199 -#define DUKE_LAND_HURT 200 -#define DUKE_HIT_STRIPPER1 201 -#define DUKE_TIP1 202 -#define DUKE_KILLED2 203 -#define PRED_ROAM2 204 -#define PIG_ROAM2 205 -#define DUKE_GETWEAPON1 206 -#define DUKE_SEARCH2 207 -#define DUKE_CRACK2 208 -#define DUKE_SEARCH 209 -#define DUKE_GET 210 -#define DUKE_LONGTERM_PAIN 211 -#define MONITOR_ACTIVE 212 -#define NITEVISION_ONOFF 213 -#define DUKE_HIT_STRIPPER2 214 -#define DUKE_CRACK_FIRST 215 -#define DUKE_USEMEDKIT 216 -#define DUKE_TAKEPILLS 217 -#define DUKE_PISSRELIEF 218 -#define SELECT_WEAPON 219 -#define WATER_GURGLE 220 -#define DUKE_GETWEAPON4 221 -#define JIBBED_ACTOR1 222 -#define JIBBED_ACTOR2 223 -#define JIBBED_ACTOR3 224 -#define JIBBED_ACTOR4 225 -#define JIBBED_ACTOR5 226 -#define JIBBED_ACTOR6 227 -#define JIBBED_ACTOR7 228 -#define DUKE_GOTHEALTHATLOW 229 -#define BOSSTALKTODUKE 230 -#define WAR_AMBIENCE1 231 -#define WAR_AMBIENCE2 232 -#define WAR_AMBIENCE3 233 -#define WAR_AMBIENCE4 234 -#define WAR_AMBIENCE5 235 -#define WAR_AMBIENCE6 236 -#define WAR_AMBIENCE7 237 -#define WAR_AMBIENCE8 238 -#define WAR_AMBIENCE9 239 -#define WAR_AMBIENCE10 240 -#define ALIEN_TALK1 241 -#define ALIEN_TALK2 242 -#define EXITMENUSOUND 243 -#define FLY_BY 244 -#define DUKE_SCREAM 245 -#define SHRINKER_HIT 246 -#define RATTY 247 -#define INTO_MENU 248 -#define BONUSMUSIC 249 -#define DUKE_BOOBY 250 -#define DUKE_TALKTOBOSSFALL 251 -#define DUKE_LOOKINTOMIRROR 252 -#define PIG_ROAM3 253 -#define KILLME 254 -#define DRON_JETSND 255 -#define SPACE_DOOR1 256 -#define SPACE_DOOR2 257 -#define SPACE_DOOR3 258 -#define SPACE_DOOR4 259 -#define SPACE_DOOR5 260 -#define ALIEN_ELEVATOR1 261 -#define VAULT_DOOR 262 -#define JIBBED_ACTOR13 263 -#define DUKE_GETWEAPON6 264 -#define JIBBED_ACTOR8 265 -#define JIBBED_ACTOR9 266 -#define JIBBED_ACTOR10 267 -#define JIBBED_ACTOR11 268 -#define JIBBED_ACTOR12 269 -#define DUKE_KILLED4 270 -#define DUKE_KILLED5 271 -#define ALIEN_SWITCH1 272 -#define DUKE_STEPONFECES 273 -#define DUKE_LONGTERM_PAIN2 274 -#define DUKE_LONGTERM_PAIN3 275 -#define DUKE_LONGTERM_PAIN4 276 -#define COMPANB2 277 -#define KTIT 278 -#define HELICOP_IDLE 279 -#define STEPNIT 280 -#define SPACE_AMBIENCE1 281 -#define SPACE_AMBIENCE2 282 -#define SLIM_HATCH 283 -#define RIPHEADNECK 284 -#define FOUNDJONES 285 -#define ALIEN_DOOR1 286 -#define ALIEN_DOOR2 287 -#define ENDSEQVOL3SND4 288 -#define ENDSEQVOL3SND5 289 -#define ENDSEQVOL3SND6 290 -#define ENDSEQVOL3SND7 291 -#define ENDSEQVOL3SND8 292 -#define ENDSEQVOL3SND9 293 -#define WHIPYOURASS 294 -#define ENDSEQVOL2SND1 295 -#define ENDSEQVOL2SND2 296 -#define ENDSEQVOL2SND3 297 -#define ENDSEQVOL2SND4 298 -#define ENDSEQVOL2SND5 299 -#define ENDSEQVOL2SND6 300 -#define ENDSEQVOL2SND7 301 -#define GENERIC_AMBIENCE23 302 -#define SOMETHINGFROZE 303 -#define DUKE_LONGTERM_PAIN5 304 -#define DUKE_LONGTERM_PAIN6 305 -#define DUKE_LONGTERM_PAIN7 306 -#define DUKE_LONGTERM_PAIN8 307 -#define WIND_REPEAT 308 -#define MYENEMY_ROAM 309 -#define MYENEMY_HURT 310 -#define MYENEMY_DEAD 311 -#define MYENEMY_SHOOT 312 -#define STORE_MUSIC 313 -#define STORE_MUSIC_BROKE 314 -#define ACTOR_GROWING 315 -#define NEWBEAST_ROAM 316 -#define NEWBEAST_RECOG 317 -#define NEWBEAST_ATTACK 318 -#define NEWBEAST_PAIN 319 -#define NEWBEAST_DYING 320 -#define NEWBEAST_SPIT 321 -#define VOL4_1 322 -#define SUPERMARKET 323 -#define MOUSEANNOY 324 -#define BOOKEM 325 -#define SUPERMARKETCRY 326 -#define DESTRUCT 327 -#define EATFOOD 328 -#define MAKEMYDAY 329 -#define WITNESSSTAND 330 -#define VACATIONSPEECH 331 -#define YIPPEE1 332 -#define YOHOO1 333 -#define YOHOO2 334 -#define DOLPHINSND 335 -#define TOUGHGALSND1 336 -#define TOUGHGALSND2 337 -#define TOUGHGALSND3 338 -#define TOUGHGALSND4 339 -#define TANK_ROAM 340 -#define BOS4_ROAM 341 -#define BOS4_RECOG 342 -#define BOS4_ATTACK 343 -#define BOS4_PAIN 344 -#define BOS4_DYING 345 -#define NEWBEAST_ATTACKMISS 346 -#define VOL4_2 347 -#define COOKINGDEEPFRIER 348 -#define WHINING_DOG 349 -#define DEAD_DOG 350 -#define LIGHTNING_SLAP 351 -#define THUNDER 352 -#define HAPPYMOUSESND1 353 -#define HAPPYMOUSESND2 354 -#define HAPPYMOUSESND3 355 -#define HAPPYMOUSESND4 356 -#define ALARM 357 -#define RAIN 358 -#define DTAG_GREENRUN 359 -#define DTAG_BROWNRUN 360 -#define DTAG_GREENSCORE 361 -#define DTAG_BROWNSCORE 362 -#define INTRO4_1 363 -#define INTRO4_2 364 -#define INTRO4_3 365 -#define INTRO4_4 366 -#define INTRO4_5 367 -#define INTRO4_6 368 -#define SCREECH 369 -#define BOSS4_DEADSPEECH 370 -#define BOSS4_FIRSTSEE 371 -#define PARTY_SPEECH 372 -#define POSTAL_SPEECH 373 -#define TGSPEECH 374 -#define DOGROOMSPEECH 375 -#define SMACKED 376 -#define MDEVSPEECH 377 -#define AREA51SPEECH 378 -#define JEEPSOUND 379 -#define BIGDOORSLAM 380 -#define BOS4_LAY 381 -#define WAVESOUND 382 -#define ILLBEBACK 383 -#define VOL4ENDSND1 384 -#define VOL4ENDSND2 385 -#define EXPANDERHIT 386 -#define SNAKESPEECH 387 -#define EXPANDERSHOOT 388 -#define GETBACKTOWORK 389 -#define JIBBED_ACTOR14 390 -#define JIBBED_ACTOR15 391 -#define INTRO4_B 392 -#define BIGBANG 393 -#define HORNSND 394 -#define BELLSND 395 -#define GOAWAY 396 -#define JOKE 397 diff --git a/source/rr/src/sounds.h b/source/rr/src/sounds.h index 719ae0beb..80fa457fd 100644 --- a/source/rr/src/sounds.h +++ b/source/rr/src/sounds.h @@ -29,14 +29,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef sounds_public_h_ #define sounds_public_h_ -#include "sounds_common.h" +#include "dukerr/sounds_common.h" #include "sound/s_soundinternal.h" #include "z_music.h" BEGIN_RR_NS // KEEPINSYNC lunatic/con_lang.lua -#define MAXSOUNDS 4096 #define LOUDESTVOLUME 111 enum esound_t diff --git a/source/rr/src/sounds_common.h b/source/rr/src/sounds_common.h deleted file mode 100644 index 5c0dae7ff..000000000 --- a/source/rr/src/sounds_common.h +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2013 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- - -#ifndef EDUKE32_SOUNDS_COMMON_H -#define EDUKE32_SOUNDS_COMMON_H - -// Sound flags -enum { - SF_LOOP = 1, - SF_MSFX = 2, - SF_TALK = 4, - SF_ADULT = 8, - SF_GLOBAL = 16, - SF_ONEINST_INTERNAL = 32, - - SF_DTAG = 128, -}; - -#endif