From 12a655b58f50b1a79f58ae2d5a1bb3f9d9968ba0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 6 Mar 2020 13:26:32 +0200 Subject: [PATCH 1/3] - fixed build with GCC and Clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit source/duke3d/src/gameexec.h:109:35: error: expected primary-expression before ‘)’ token source/duke3d/src/gameexec.h:115:35: error: expected primary-expression before ‘)’ token --- source/duke3d/src/gameexec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/duke3d/src/gameexec.h b/source/duke3d/src/gameexec.h index 577a82398..9cec1bbe9 100644 --- a/source/duke3d/src/gameexec.h +++ b/source/duke3d/src/gameexec.h @@ -106,13 +106,13 @@ void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int3 #define CON_ERRPRINTF(Text, ...) do { \ - FStringf str(Text, __VA_ARGS__); \ + FStringf str(Text, ## __VA_ARGS__); \ vm.flags |= VM_RETURN; \ OSD_Printf("Line %d, %s: %s", VM_DECODE_LINE_NUMBER(g_tw), VM_GetKeywordForID(VM_DECODE_INST(g_tw)), str.GetChars()); \ } while (0) #define CON_CRITICALERRPRINTF(Text, ...) do { \ - FStringf str(Text, __VA_ARGS__); \ + FStringf str(Text, ## __VA_ARGS__); \ vm.flags |= VM_RETURN; \ I_Error("Line %d, %s: %s", VM_DECODE_LINE_NUMBER(g_tw), VM_GetKeywordForID(VM_DECODE_INST(g_tw)), str.GetChars()); \ } while (0) From a5c21525307792ecb8f85c084007f4bbf7face0d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 6 Mar 2020 17:12:38 +0100 Subject: [PATCH 2/3] - consolidated the dynamic tile handling for Duke and RR frontends --- source/CMakeLists.txt | 2 + source/blood/src/blood.cpp | 38 - source/blood/src/network.cpp | 16 +- source/duke3d/CMakeLists.txt | 1 - source/duke3d/src/actors.h | 2 +- source/duke3d/src/d_menu.cpp | 8 +- source/duke3d/src/duke3d.h | 2 +- source/duke3d/src/gamedef.cpp | 2 +- source/duke3d/src/global.cpp | 19 - source/duke3d/src/global.h | 1 - source/duke3d/src/inv.h | 19 +- source/duke3d/src/namesdyn.cpp | 1313 ------------------------ source/duke3d/src/namesdyn.h | 1238 ---------------------- source/duke3d/src/player.cpp | 72 +- source/duke3d/src/player.h | 20 +- source/duke3d/src/sector.cpp | 42 +- source/duke3d/src/sector.h | 2 +- source/duke3d/src/soundsdyn.cpp | 2 +- source/{rr/src => dukerr}/namesdyn.cpp | 44 +- source/{rr/src => dukerr}/namesdyn.h | 10 +- source/rr/CMakeLists.txt | 1 - source/rr/src/actors.h | 2 +- source/rr/src/d_menu.cpp | 2 +- source/rr/src/demo.cpp | 20 - source/rr/src/duke3d.h | 2 +- source/rr/src/game.cpp | 4 +- source/rr/src/gamedef.cpp | 2 +- source/rr/src/gamevars.cpp | 2 +- source/rr/src/global.cpp | 18 - source/rr/src/global.h | 1 - source/rr/src/player.cpp | 5 +- source/rr/src/player.h | 3 +- source/rr/src/sector.h | 2 +- source/rr/src/soundsdyn.cpp | 2 +- wadsrc/static/engine/menudef.txt | 6 +- 35 files changed, 125 insertions(+), 2800 deletions(-) delete mode 100644 source/duke3d/src/namesdyn.cpp delete mode 100644 source/duke3d/src/namesdyn.h rename source/{rr/src => dukerr}/namesdyn.cpp (99%) rename source/{rr/src => dukerr}/namesdyn.h (99%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index dfdfcba42..eaf70c739 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -813,6 +813,8 @@ set (PCH_SOURCES common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp common/rendering/hwrenderer/utility/hw_shaderpatcher.cpp + + dukerr/namesdyn.cpp ) macro( use_precompiled_header ) diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index f825cdc00..6d2fdc526 100644 --- a/source/blood/src/blood.cpp +++ b/source/blood/src/blood.cpp @@ -397,30 +397,6 @@ void PreloadCache(void) if ((++cnt & 7) == 0) gameHandleEvents(); - -#if 0 - if (videoGetRenderMode() != REND_CLASSIC && totalclock - clock > (kTicRate>>2)) - { - int const percentComplete = min(100, tabledivide32_noinline(100 * cnt, nPrecacheCount)); - - // this just prevents the loading screen percentage bar from making large jumps - while (percentDisplayed < percentComplete) - { - gameHandleEvents(); - Bsprintf(tempbuf, "Loaded %d%% (%d/%d textures)\n", percentDisplayed, cnt, nPrecacheCount); - viewLoadingScreenUpdate(tempbuf, percentDisplayed); - videoNextPage(); - - if (totalclock - clock >= 1) - { - clock = totalclock; - percentDisplayed++; - } - } - - clock = totalclock; - } -#endif } } memset(gotpic,0,sizeof(gotpic)); @@ -1296,20 +1272,6 @@ RESTART: gRestartGame = 0; gGameStarted = 0; levelSetupOptions(0,0); -#if 0 - // What's this loop for? Needs checking - while (gGameMenuMgr.m_bActive) - { - gGameMenuMgr.Process(); - gameHandleEvents(); - if (G_FPSLimit()) - { - videoClearScreen(0); - gGameMenuMgr.Draw(); - videoNextPage(); - } - } -#endif if (gGameOptions.nGameType != 0) { if (!gDemo.at0 && gDemo.at59ef > 0 && gGameOptions.nGameType == 0 && !bNoDemo && demo_playloop) diff --git a/source/blood/src/network.cpp b/source/blood/src/network.cpp index 76dab0cd7..f560c5c94 100644 --- a/source/blood/src/network.cpp +++ b/source/blood/src/network.cpp @@ -1011,13 +1011,7 @@ void netInitialize(bool bConsole) while (numplayers < gNetPlayers) { handleevents(); -#if 0 - if (quitevent) - { - netServerDisconnect(); - QuitGame(); - } -#endif + if (!bConsole && inputState.GetKeyStatus(sc_Escape)) { netServerDisconnect(); @@ -1174,13 +1168,7 @@ void netInitialize(bool bConsole) while (bWaitServer) { handleevents(); -#if 0 - if (quitevent) - { - netClientDisconnect(); - QuitGame(); - } -#endif + if (!bConsole && inputState.GetKeyStatus(sc_Escape)) { netClientDisconnect(); diff --git a/source/duke3d/CMakeLists.txt b/source/duke3d/CMakeLists.txt index cb852ddc7..908fef269 100644 --- a/source/duke3d/CMakeLists.txt +++ b/source/duke3d/CMakeLists.txt @@ -16,7 +16,6 @@ set( PCH_SOURCES src/gameexec.cpp src/gamevars.cpp src/global.cpp - src/namesdyn.cpp src/network.cpp src/osdcmds.cpp src/player.cpp diff --git a/source/duke3d/src/actors.h b/source/duke3d/src/actors.h index 3702862eb..c6900b455 100644 --- a/source/duke3d/src/actors.h +++ b/source/duke3d/src/actors.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define actors_h_ #include "player.h" -# include "namesdyn.h" +# include "dukerr/namesdyn.h" #include "dukerr/actors.h" BEGIN_DUKE_NS diff --git a/source/duke3d/src/d_menu.cpp b/source/duke3d/src/d_menu.cpp index bdb7e0959..49ad014d1 100644 --- a/source/duke3d/src/d_menu.cpp +++ b/source/duke3d/src/d_menu.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "menu/menu.h" #include "gstrings.h" #include "version.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "menus.h" #include "../../glbackend/glbackend.h" @@ -603,7 +603,7 @@ bool GameInterface::DrawSpecialScreen(const DVector2 &origin, int tilenum) int32_t m, l; if (!haveCredits) { - if (tilenum == CREDITSTEXT1) + if (tilenum == 2504) { Menu_DrawBackground(origin); m = int(origin.X * 65536) + (20 << 16); @@ -663,7 +663,7 @@ bool GameInterface::DrawSpecialScreen(const DVector2 &origin, int tilenum) shadowminitext(m, l, "Michael Hadwin", 12); l += 7 << 16; return true; } - else if (tilenum == CREDITSTEXT2__STATIC) + else if (tilenum == 2505) { Menu_DrawBackground(origin); m = int(origin.X * 65536) + (20 << 16); @@ -705,7 +705,7 @@ bool GameInterface::DrawSpecialScreen(const DVector2 &origin, int tilenum) shadowminitext(m, l, "Thanks for the hardware, guys.", 12); l += 7 << 16; return true; } - else if (tilenum == CREDITSTEXT3) + else if (tilenum == 2506) { Menu_DrawBackground(origin); mgametextcenter(int(origin.X * 65536), int(origin.Y * 65536) + (50 << 16), "Duke Nukem 3D is a trademark of\n" diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h index 454a6765f..430482d83 100644 --- a/source/duke3d/src/duke3d.h +++ b/source/duke3d/src/duke3d.h @@ -117,7 +117,7 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); #include "global.h" #include "inv.h" #include "macros.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "network.h" #include "player.h" #include "quotes.h" diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index dbffb79e6..2a9dc5338 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "m_crc32.h" #include "duke3d.h" #include "gameexec.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "osd.h" #include "savegame.h" #include "printf.h" diff --git a/source/duke3d/src/global.cpp b/source/duke3d/src/global.cpp index efddc8e1d..0e895cbd0 100644 --- a/source/duke3d/src/global.cpp +++ b/source/duke3d/src/global.cpp @@ -103,25 +103,6 @@ int32_t g_spriteGravity = 176; int32_t g_timerTicsPerSecond = TICRATE; int32_t g_tripbombRadius = 3880; -int16_t g_blimpSpawnItems[15] = -{ - RPGSPRITE__STATIC, - CHAINGUNSPRITE__STATIC, - DEVISTATORAMMO__STATIC, - RPGAMMO__STATIC, - RPGAMMO__STATIC, - JETPACK__STATIC, - SHIELD__STATIC, - FIRSTAID__STATIC, - STEROIDS__STATIC, - RPGAMMO__STATIC, - RPGAMMO__STATIC, - RPGSPRITE__STATIC, - RPGAMMO__STATIC, - FREEZESPRITE__STATIC, - FREEZEAMMO__STATIC -}; - char CheatKeys[2] = { sc_D, sc_N }; END_DUKE_NS diff --git a/source/duke3d/src/global.h b/source/duke3d/src/global.h index 7be73c3b3..b4b1261fa 100644 --- a/source/duke3d/src/global.h +++ b/source/duke3d/src/global.h @@ -177,7 +177,6 @@ extern int32_t g_timerTicsPerSecond; extern int32_t g_tripbombRadius; extern int32_t g_volumeCnt; -extern int16_t g_blimpSpawnItems[15]; extern int32_t g_gametypeFlags[MAXGAMETYPES]; diff --git a/source/duke3d/src/inv.h b/source/duke3d/src/inv.h index e85b9f1d0..856ac1430 100644 --- a/source/duke3d/src/inv.h +++ b/source/duke3d/src/inv.h @@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma once +#include "dukerr/namesdyn.h" + BEGIN_DUKE_NS enum dukeinv_t @@ -58,21 +60,4 @@ extern int const icon_to_inv[ICON_MAX]; extern int const inv_to_icon[GET_MAX]; -enum dukeweapon_t -{ - KNEE_WEAPON, // 0 - PISTOL_WEAPON, - SHOTGUN_WEAPON, - CHAINGUN_WEAPON, - RPG_WEAPON, - HANDBOMB_WEAPON, // 5 - SHRINKER_WEAPON, - DEVISTATOR_WEAPON, - TRIPBOMB_WEAPON, - FREEZE_WEAPON, - HANDREMOTE_WEAPON, // 10 - GROW_WEAPON, - MAX_WEAPONS -}; - END_DUKE_NS diff --git a/source/duke3d/src/namesdyn.cpp b/source/duke3d/src/namesdyn.cpp deleted file mode 100644 index d4b8fb520..000000000 --- a/source/duke3d/src/namesdyn.cpp +++ /dev/null @@ -1,1313 +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. -*/ -//------------------------------------------------------------------------- - -#include "ns.h" // Must come before everything else! - -#include "compat.h" -#include "build.h" - -#include "namesdyn.h" -#include "global.h" -#include "gamecontrol.h" - -BEGIN_DUKE_NS - -# define DVPTR(x) &x - -int16_t DynamicTileMap[MAXTILES]; - -struct dynitem -{ - const char *str; - int32_t *dynvalptr; - const int16_t staticval; -}; - -LUNATIC_EXTERN struct dynitem g_dynTileList[] = -{ - { "ACCESS_ICON", DVPTR(ACCESS_ICON), ACCESS_ICON__STATIC }, - { "ACCESSCARD", DVPTR(ACCESSCARD), ACCESSCARD__STATIC }, - { "ACCESSSWITCH", DVPTR(ACCESSSWITCH), ACCESSSWITCH__STATIC }, - { "ACCESSSWITCH2", DVPTR(ACCESSSWITCH2), ACCESSSWITCH2__STATIC }, - { "ACTIVATOR", DVPTR(ACTIVATOR), ACTIVATOR__STATIC }, - { "ACTIVATORLOCKED", DVPTR(ACTIVATORLOCKED), ACTIVATORLOCKED__STATIC }, - { "AIRTANK", DVPTR(AIRTANK), AIRTANK__STATIC }, - { "AIRTANK_ICON", DVPTR(AIRTANK_ICON), AIRTANK_ICON__STATIC }, - { "ALIENSWITCH", DVPTR(ALIENSWITCH), ALIENSWITCH__STATIC }, - { "AMMO", DVPTR(AMMO), AMMO__STATIC }, - { "AMMOBOX", DVPTR(AMMOBOX), AMMOBOX__STATIC }, - { "AMMOLOTS", DVPTR(AMMOLOTS), AMMOLOTS__STATIC }, - { "ANTENNA", DVPTR(ANTENNA), ANTENNA__STATIC }, - { "APLAYER", DVPTR(APLAYER), APLAYER__STATIC }, - { "APLAYERTOP", DVPTR(APLAYERTOP), APLAYERTOP__STATIC }, - { "ARMJIB1", DVPTR(ARMJIB1), ARMJIB1__STATIC }, - { "ARROW", DVPTR(ARROW), ARROW__STATIC }, - { "ATM", DVPTR(ATM), ATM__STATIC }, - { "ATMBROKE", DVPTR(ATMBROKE), ATMBROKE__STATIC }, - { "ATOMICHEALTH", DVPTR(ATOMICHEALTH), ATOMICHEALTH__STATIC }, - { "BANNER", DVPTR(BANNER), BANNER__STATIC }, - { "BARBROKE", DVPTR(BARBROKE), BARBROKE__STATIC }, - { "BATTERYAMMO", DVPTR(BATTERYAMMO), BATTERYAMMO__STATIC }, - { "BETASCREEN", DVPTR(BETASCREEN), BETASCREEN__STATIC }, - { "BETAVERSION", DVPTR(BETAVERSION), BETAVERSION__STATIC }, - { "BGRATE1", DVPTR(BGRATE1), BGRATE1__STATIC }, - { "BIGALPHANUM", DVPTR(BIGALPHANUM), BIGALPHANUM__STATIC }, - { "BIGAPPOS", DVPTR(BIGAPPOS), BIGAPPOS__STATIC }, - { "BIGCOLIN", DVPTR(BIGCOLIN), BIGCOLIN__STATIC }, - { "BIGCOMMA", DVPTR(BIGCOMMA), BIGCOMMA__STATIC }, - { "BIGFORCE", DVPTR(BIGFORCE), BIGFORCE__STATIC }, - { "BIGHOLE", DVPTR(BIGHOLE), BIGHOLE__STATIC }, - { "BIGORBIT1", DVPTR(BIGORBIT1), BIGORBIT1__STATIC }, - { "BIGPERIOD", DVPTR(BIGPERIOD), BIGPERIOD__STATIC }, - { "BIGQ", DVPTR(BIGQ), BIGQ__STATIC }, - { "BIGSEMI", DVPTR(BIGSEMI), BIGSEMI__STATIC }, - { "BIGX", DVPTR(BIGX_), BIGX__STATIC }, - { "BLANKSCREEN", DVPTR(BLANKSCREEN), BLANKSCREEN__STATIC }, - { "BLIMP", DVPTR(BLIMP), BLIMP__STATIC }, - { "BLOOD", DVPTR(BLOOD), BLOOD__STATIC }, - { "BLOODPOOL", DVPTR(BLOODPOOL), BLOODPOOL__STATIC }, - { "BLOODSPLAT1", DVPTR(BLOODSPLAT1), BLOODSPLAT1__STATIC }, - { "BLOODSPLAT2", DVPTR(BLOODSPLAT2), BLOODSPLAT2__STATIC }, - { "BLOODSPLAT3", DVPTR(BLOODSPLAT3), BLOODSPLAT3__STATIC }, - { "BLOODSPLAT4", DVPTR(BLOODSPLAT4), BLOODSPLAT4__STATIC }, - { "BLOODYPOLE", DVPTR(BLOODYPOLE), BLOODYPOLE__STATIC }, - { "BOLT1", DVPTR(BOLT1), BOLT1__STATIC }, - { "BONUSSCREEN", DVPTR(BONUSSCREEN), BONUSSCREEN__STATIC }, - { "BOOT_ICON", DVPTR(BOOT_ICON), BOOT_ICON__STATIC }, - { "BOOTS", DVPTR(BOOTS), BOOTS__STATIC }, - { "BORNTOBEWILDSCREEN", DVPTR(BORNTOBEWILDSCREEN), BORNTOBEWILDSCREEN__STATIC }, - { "BOSS1", DVPTR(BOSS1), BOSS1__STATIC }, - { "BOSS1LOB", DVPTR(BOSS1LOB), BOSS1LOB__STATIC }, - { "BOSS1SHOOT", DVPTR(BOSS1SHOOT), BOSS1SHOOT__STATIC }, - { "BOSS1STAYPUT", DVPTR(BOSS1STAYPUT), BOSS1STAYPUT__STATIC }, - { "BOSS2", DVPTR(BOSS2), BOSS2__STATIC }, - { "BOSS3", DVPTR(BOSS3), BOSS3__STATIC }, - { "BOSS4", DVPTR(BOSS4), BOSS4__STATIC }, - { "BOSS4STAYPUT", DVPTR(BOSS4STAYPUT), BOSS4STAYPUT__STATIC }, - { "BOSSTOP", DVPTR(BOSSTOP), BOSSTOP__STATIC }, - { "BOTTLE1", DVPTR(BOTTLE1), BOTTLE1__STATIC }, - { "BOTTLE10", DVPTR(BOTTLE10), BOTTLE10__STATIC }, - { "BOTTLE11", DVPTR(BOTTLE11), BOTTLE11__STATIC }, - { "BOTTLE12", DVPTR(BOTTLE12), BOTTLE12__STATIC }, - { "BOTTLE13", DVPTR(BOTTLE13), BOTTLE13__STATIC }, - { "BOTTLE14", DVPTR(BOTTLE14), BOTTLE14__STATIC }, - { "BOTTLE15", DVPTR(BOTTLE15), BOTTLE15__STATIC }, - { "BOTTLE16", DVPTR(BOTTLE16), BOTTLE16__STATIC }, - { "BOTTLE17", DVPTR(BOTTLE17), BOTTLE17__STATIC }, - { "BOTTLE18", DVPTR(BOTTLE18), BOTTLE18__STATIC }, - { "BOTTLE19", DVPTR(BOTTLE19), BOTTLE19__STATIC }, - { "BOTTLE2", DVPTR(BOTTLE2), BOTTLE2__STATIC }, - { "BOTTLE3", DVPTR(BOTTLE3), BOTTLE3__STATIC }, - { "BOTTLE4", DVPTR(BOTTLE4), BOTTLE4__STATIC }, - { "BOTTLE5", DVPTR(BOTTLE5), BOTTLE5__STATIC }, - { "BOTTLE6", DVPTR(BOTTLE6), BOTTLE6__STATIC }, - { "BOTTLE7", DVPTR(BOTTLE7), BOTTLE7__STATIC }, - { "BOTTLE8", DVPTR(BOTTLE8), BOTTLE8__STATIC }, - { "BOTTOMSTATUSBAR", DVPTR(BOTTOMSTATUSBAR), BOTTOMSTATUSBAR__STATIC }, - { "BOUNCEMINE", DVPTR(BOUNCEMINE), BOUNCEMINE__STATIC }, - { "BOX", DVPTR(BOX), BOX__STATIC }, - { "BPANNEL1", DVPTR(BPANNEL1), BPANNEL1__STATIC }, - { "BPANNEL3", DVPTR(BPANNEL3), BPANNEL3__STATIC }, - { "BROKEFIREHYDRENT", DVPTR(BROKEFIREHYDRENT), BROKEFIREHYDRENT__STATIC }, - { "BROKEHYDROPLANT", DVPTR(BROKEHYDROPLANT), BROKEHYDROPLANT__STATIC }, - { "BROKENCHAIR", DVPTR(BROKENCHAIR), BROKENCHAIR__STATIC }, - { "BULLETHOLE", DVPTR(BULLETHOLE), BULLETHOLE__STATIC }, - { "BURNING", DVPTR(BURNING), BURNING__STATIC }, - { "BURNING2", DVPTR(BURNING2), BURNING2__STATIC }, - { "CACTUS", DVPTR(CACTUS), CACTUS__STATIC }, - { "CACTUSBROKE", DVPTR(CACTUSBROKE), CACTUSBROKE__STATIC }, - { "CAMCORNER", DVPTR(CAMCORNER), CAMCORNER__STATIC }, - { "CAMERA1", DVPTR(CAMERA1), CAMERA1__STATIC }, - { "CAMERALIGHT", DVPTR(CAMERALIGHT), CAMERALIGHT__STATIC }, - { "CAMERAPOLE", DVPTR(CAMERAPOLE), CAMERAPOLE__STATIC }, - { "CAMLIGHT", DVPTR(CAMLIGHT), CAMLIGHT__STATIC }, - { "CANWITHSOMETHING", DVPTR(CANWITHSOMETHING), CANWITHSOMETHING__STATIC }, - { "CANWITHSOMETHING2", DVPTR(CANWITHSOMETHING2), CANWITHSOMETHING2__STATIC }, - { "CANWITHSOMETHING3", DVPTR(CANWITHSOMETHING3), CANWITHSOMETHING3__STATIC }, - { "CANWITHSOMETHING4", DVPTR(CANWITHSOMETHING4), CANWITHSOMETHING4__STATIC }, - { "CEILINGSTEAM", DVPTR(CEILINGSTEAM), CEILINGSTEAM__STATIC }, - { "CHAINGUN", DVPTR(CHAINGUN), CHAINGUN__STATIC }, - { "CHAINGUNSPRITE", DVPTR(CHAINGUNSPRITE), CHAINGUNSPRITE__STATIC }, - { "CHAIR1", DVPTR(CHAIR1), CHAIR1__STATIC }, - { "CHAIR2", DVPTR(CHAIR2), CHAIR2__STATIC }, - { "CHAIR3", DVPTR(CHAIR3), CHAIR3__STATIC }, - { "CIRCLEPANNEL", DVPTR(CIRCLEPANNEL), CIRCLEPANNEL__STATIC }, - { "CIRCLEPANNELBROKE", DVPTR(CIRCLEPANNELBROKE), CIRCLEPANNELBROKE__STATIC }, - { "CLOUDYOCEAN", DVPTR(CLOUDYOCEAN), CLOUDYOCEAN__STATIC }, - { "CLOUDYSKIES", DVPTR(CLOUDYSKIES), CLOUDYSKIES__STATIC }, - { "COLA", DVPTR(COLA), COLA__STATIC }, - { "COLAMACHINE", DVPTR(COLAMACHINE), COLAMACHINE__STATIC }, - { "COMMANDER", DVPTR(COMMANDER), COMMANDER__STATIC }, - { "COMMANDERSTAYPUT", DVPTR(COMMANDERSTAYPUT), COMMANDERSTAYPUT__STATIC }, - { "CONE", DVPTR(CONE), CONE__STATIC }, - { "COOLEXPLOSION1", DVPTR(COOLEXPLOSION1), COOLEXPLOSION1__STATIC }, - { "CRACK1", DVPTR(CRACK1), CRACK1__STATIC }, - { "CRACK2", DVPTR(CRACK2), CRACK2__STATIC }, - { "CRACK3", DVPTR(CRACK3), CRACK3__STATIC }, - { "CRACK4", DVPTR(CRACK4), CRACK4__STATIC }, - { "CRACKKNUCKLES", DVPTR(CRACKKNUCKLES), CRACKKNUCKLES__STATIC }, - { "CRANE", DVPTR(CRANE), CRANE__STATIC }, - { "CRANEPOLE", DVPTR(CRANEPOLE), CRANEPOLE__STATIC }, - { "CREDITSTEXT1", DVPTR(CREDITSTEXT1), CREDITSTEXT1__STATIC }, - { "CREDITSTEXT2", DVPTR(CREDITSTEXT2), CREDITSTEXT2__STATIC }, - { "CREDITSTEXT3", DVPTR(CREDITSTEXT3), CREDITSTEXT3__STATIC }, - { "CROSSHAIR", DVPTR(CROSSHAIR), CROSSHAIR__STATIC }, - { "CRYSTALAMMO", DVPTR(CRYSTALAMMO), CRYSTALAMMO__STATIC }, - { "CYCLER", DVPTR(CYCLER), CYCLER__STATIC }, - { "DEVISTATOR", DVPTR(DEVISTATOR), DEVISTATOR__STATIC }, - { "DEVISTATORAMMO", DVPTR(DEVISTATORAMMO), DEVISTATORAMMO__STATIC }, - { "DEVISTATORSPRITE", DVPTR(DEVISTATORSPRITE), DEVISTATORSPRITE__STATIC }, - { "DIGITALNUM", DVPTR(DIGITALNUM), DIGITALNUM__STATIC }, - { "DIPSWITCH", DVPTR(DIPSWITCH), DIPSWITCH__STATIC }, - { "DIPSWITCH2", DVPTR(DIPSWITCH2), DIPSWITCH2__STATIC }, - { "DIPSWITCH3", DVPTR(DIPSWITCH3), DIPSWITCH3__STATIC }, - { "DOLPHIN1", DVPTR(DOLPHIN1), DOLPHIN1__STATIC }, - { "DOLPHIN2", DVPTR(DOLPHIN2), DOLPHIN2__STATIC }, - { "DOMELITE", DVPTR(DOMELITE), DOMELITE__STATIC }, - { "DOORSHOCK", DVPTR(DOORSHOCK), DOORSHOCK__STATIC }, - { "DOORTILE1", DVPTR(DOORTILE1), DOORTILE1__STATIC }, - { "DOORTILE10", DVPTR(DOORTILE10), DOORTILE10__STATIC }, - { "DOORTILE11", DVPTR(DOORTILE11), DOORTILE11__STATIC }, - { "DOORTILE12", DVPTR(DOORTILE12), DOORTILE12__STATIC }, - { "DOORTILE14", DVPTR(DOORTILE14), DOORTILE14__STATIC }, - { "DOORTILE15", DVPTR(DOORTILE15), DOORTILE15__STATIC }, - { "DOORTILE16", DVPTR(DOORTILE16), DOORTILE16__STATIC }, - { "DOORTILE17", DVPTR(DOORTILE17), DOORTILE17__STATIC }, - { "DOORTILE18", DVPTR(DOORTILE18), DOORTILE18__STATIC }, - { "DOORTILE19", DVPTR(DOORTILE19), DOORTILE19__STATIC }, - { "DOORTILE2", DVPTR(DOORTILE2), DOORTILE2__STATIC }, - { "DOORTILE20", DVPTR(DOORTILE20), DOORTILE20__STATIC }, - { "DOORTILE21", DVPTR(DOORTILE21), DOORTILE21__STATIC }, - { "DOORTILE22", DVPTR(DOORTILE22), DOORTILE22__STATIC }, - { "DOORTILE23", DVPTR(DOORTILE23), DOORTILE23__STATIC }, - { "DOORTILE3", DVPTR(DOORTILE3), DOORTILE3__STATIC }, - { "DOORTILE4", DVPTR(DOORTILE4), DOORTILE4__STATIC }, - { "DOORTILE5", DVPTR(DOORTILE5), DOORTILE5__STATIC }, - { "DOORTILE6", DVPTR(DOORTILE6), DOORTILE6__STATIC }, - { "DOORTILE7", DVPTR(DOORTILE7), DOORTILE7__STATIC }, - { "DOORTILE8", DVPTR(DOORTILE8), DOORTILE8__STATIC }, - { "DOORTILE9", DVPTR(DOORTILE9), DOORTILE9__STATIC }, - { "DREALMS", DVPTR(DREALMS), DREALMS__STATIC }, - { "DRONE", DVPTR(DRONE), DRONE__STATIC }, - { "DUCK", DVPTR(DUCK), DUCK__STATIC }, - { "DUKECAR", DVPTR(DUKECAR), DUKECAR__STATIC }, - { "DUKEGUN", DVPTR(DUKEGUN), DUKEGUN__STATIC }, - { "DUKELEG", DVPTR(DUKELEG), DUKELEG__STATIC }, - { "DUKELYINGDEAD", DVPTR(DUKELYINGDEAD), DUKELYINGDEAD__STATIC }, - { "DUKENUKEM", DVPTR(DUKENUKEM), DUKENUKEM__STATIC }, - { "DUKETAG", DVPTR(DUKETAG), DUKETAG__STATIC }, - { "DUKETORSO", DVPTR(DUKETORSO), DUKETORSO__STATIC }, - { "EGG", DVPTR(EGG), EGG__STATIC }, - { "ENDALPHANUM", DVPTR(ENDALPHANUM), ENDALPHANUM__STATIC }, - { "EXPLODINGBARREL", DVPTR(EXPLODINGBARREL), EXPLODINGBARREL__STATIC }, - { "EXPLODINGBARREL2", DVPTR(EXPLODINGBARREL2), EXPLODINGBARREL2__STATIC }, - { "EXPLOSION2", DVPTR(EXPLOSION2), EXPLOSION2__STATIC }, - { "EXPLOSION2BOT", DVPTR(EXPLOSION2BOT), EXPLOSION2BOT__STATIC }, - { "F1HELP", DVPTR(F1HELP), F1HELP__STATIC }, - { "FANSHADOW", DVPTR(FANSHADOW), FANSHADOW__STATIC }, - { "FANSHADOWBROKE", DVPTR(FANSHADOWBROKE), FANSHADOWBROKE__STATIC }, - { "FANSPRITE", DVPTR(FANSPRITE), FANSPRITE__STATIC }, - { "FANSPRITEBROKE", DVPTR(FANSPRITEBROKE), FANSPRITEBROKE__STATIC }, - { "FECES", DVPTR(FECES), FECES__STATIC }, - { "FEM1", DVPTR(FEM1), FEM1__STATIC }, - { "FEM10", DVPTR(FEM10), FEM10__STATIC }, - { "FEM2", DVPTR(FEM2), FEM2__STATIC }, - { "FEM3", DVPTR(FEM3), FEM3__STATIC }, - { "FEM4", DVPTR(FEM4), FEM4__STATIC }, - { "FEM5", DVPTR(FEM5), FEM5__STATIC }, - { "FEM6", DVPTR(FEM6), FEM6__STATIC }, - { "FEM6PAD", DVPTR(FEM6PAD), FEM6PAD__STATIC }, - { "FEM7", DVPTR(FEM7), FEM7__STATIC }, - { "FEM8", DVPTR(FEM8), FEM8__STATIC }, - { "FEM9", DVPTR(FEM9), FEM9__STATIC }, - { "FEMMAG1", DVPTR(FEMMAG1), FEMMAG1__STATIC }, - { "FEMMAG2", DVPTR(FEMMAG2), FEMMAG2__STATIC }, - { "FEMPIC1", DVPTR(FEMPIC1), FEMPIC1__STATIC }, - { "FEMPIC2", DVPTR(FEMPIC2), FEMPIC2__STATIC }, - { "FEMPIC3", DVPTR(FEMPIC3), FEMPIC3__STATIC }, - { "FEMPIC4", DVPTR(FEMPIC4), FEMPIC4__STATIC }, - { "FEMPIC5", DVPTR(FEMPIC5), FEMPIC5__STATIC }, - { "FEMPIC6", DVPTR(FEMPIC6), FEMPIC6__STATIC }, - { "FEMPIC7", DVPTR(FEMPIC7), FEMPIC7__STATIC }, - { "FETUS", DVPTR(FETUS), FETUS__STATIC }, - { "FETUSBROKE", DVPTR(FETUSBROKE), FETUSBROKE__STATIC }, - { "FETUSJIB", DVPTR(FETUSJIB), FETUSJIB__STATIC }, - { "FIRE", DVPTR(FIRE), FIRE__STATIC }, - { "FIRE2", DVPTR(FIRE2), FIRE2__STATIC }, - { "FIREBARREL", DVPTR(FIREBARREL), FIREBARREL__STATIC }, - { "FIREEXT", DVPTR(FIREEXT), FIREEXT__STATIC }, - { "FIRELASER", DVPTR(FIRELASER), FIRELASER__STATIC }, - { "FIREVASE", DVPTR(FIREVASE), FIREVASE__STATIC }, - { "FIRSTAID", DVPTR(FIRSTAID), FIRSTAID__STATIC }, - { "FIRSTAID_ICON", DVPTR(FIRSTAID_ICON), FIRSTAID_ICON__STATIC }, - { "FIRSTGUN", DVPTR(FIRSTGUN), FIRSTGUN__STATIC }, - { "FIRSTGUNRELOAD", DVPTR(FIRSTGUNRELOAD), FIRSTGUNRELOAD__STATIC }, - { "FIRSTGUNSPRITE", DVPTR(FIRSTGUNSPRITE), FIRSTGUNSPRITE__STATIC }, - { "FIST", DVPTR(FIST), FIST__STATIC }, - { "FLOORFLAME", DVPTR(FLOORFLAME), FLOORFLAME__STATIC }, - { "FLOORPLASMA", DVPTR(FLOORPLASMA), FLOORPLASMA__STATIC }, - { "FLOORSLIME", DVPTR(FLOORSLIME), FLOORSLIME__STATIC }, - { "FOF", DVPTR(FOF), FOF__STATIC }, - { "FOODOBJECT16", DVPTR(FOODOBJECT16), FOODOBJECT16__STATIC }, - { "FOOTPRINTS", DVPTR(FOOTPRINTS), FOOTPRINTS__STATIC }, - { "FOOTPRINTS2", DVPTR(FOOTPRINTS2), FOOTPRINTS2__STATIC }, - { "FOOTPRINTS3", DVPTR(FOOTPRINTS3), FOOTPRINTS3__STATIC }, - { "FOOTPRINTS4", DVPTR(FOOTPRINTS4), FOOTPRINTS4__STATIC }, - { "FORCERIPPLE", DVPTR(FORCERIPPLE), FORCERIPPLE__STATIC }, - { "FORCESPHERE", DVPTR(FORCESPHERE), FORCESPHERE__STATIC }, - { "FRAGBAR", DVPTR(FRAGBAR), FRAGBAR__STATIC }, - { "FRAMEEFFECT1", DVPTR(FRAMEEFFECT1), FRAMEEFFECT1__STATIC }, - { "FRAMEEFFECT1_13", DVPTR(FRAMEEFFECT1_13), FRAMEEFFECT1_13__STATIC }, - { "FRANKENSTINESWITCH", DVPTR(FRANKENSTINESWITCH), FRANKENSTINESWITCH__STATIC }, - { "FREEZE", DVPTR(FREEZE), FREEZE__STATIC }, - { "FREEZEAMMO", DVPTR(FREEZEAMMO), FREEZEAMMO__STATIC }, - { "FREEZEBLAST", DVPTR(FREEZEBLAST), FREEZEBLAST__STATIC }, - { "FREEZESPRITE", DVPTR(FREEZESPRITE), FREEZESPRITE__STATIC }, - { "FUELPOD", DVPTR(FUELPOD), FUELPOD__STATIC }, - { "GENERICPOLE", DVPTR(GENERICPOLE), GENERICPOLE__STATIC }, - { "GENERICPOLE2", DVPTR(GENERICPOLE2), GENERICPOLE2__STATIC }, - { "GLASS", DVPTR(GLASS), GLASS__STATIC }, - { "GLASS2", DVPTR(GLASS2), GLASS2__STATIC }, - { "GLASSPIECES", DVPTR(GLASSPIECES), GLASSPIECES__STATIC }, - { "GPSPEED", DVPTR(GPSPEED), GPSPEED__STATIC }, - { "GRATE1", DVPTR(GRATE1), GRATE1__STATIC }, - { "GREENSLIME", DVPTR(GREENSLIME), GREENSLIME__STATIC }, - { "GROWAMMO", DVPTR(GROWAMMO), GROWAMMO__STATIC }, - { "GROWSPARK", DVPTR(GROWSPARK), GROWSPARK__STATIC }, - { "GROWSPRITEICON", DVPTR(GROWSPRITEICON), GROWSPRITEICON__STATIC }, - { "HANDHOLDINGACCESS", DVPTR(HANDHOLDINGACCESS), HANDHOLDINGACCESS__STATIC }, - { "HANDHOLDINGLASER", DVPTR(HANDHOLDINGLASER), HANDHOLDINGLASER__STATIC }, - { "HANDPRINTSWITCH", DVPTR(HANDPRINTSWITCH), HANDPRINTSWITCH__STATIC }, - { "HANDREMOTE", DVPTR(HANDREMOTE), HANDREMOTE__STATIC }, - { "HANDSWITCH", DVPTR(HANDSWITCH), HANDSWITCH__STATIC }, - { "HANDTHROW", DVPTR(HANDTHROW), HANDTHROW__STATIC }, - { "HANGLIGHT", DVPTR(HANGLIGHT), HANGLIGHT__STATIC }, - { "HBOMBAMMO", DVPTR(HBOMBAMMO), HBOMBAMMO__STATIC }, - { "HEADJIB1", DVPTR(HEADJIB1), HEADJIB1__STATIC }, - { "HEALTHBOX", DVPTR(HEALTHBOX), HEALTHBOX__STATIC }, - { "HEAT_ICON", DVPTR(HEAT_ICON), HEAT_ICON__STATIC }, - { "HEATSENSOR", DVPTR(HEATSENSOR), HEATSENSOR__STATIC }, - { "HEAVYHBOMB", DVPTR(HEAVYHBOMB), HEAVYHBOMB__STATIC }, - { "HELECOPT", DVPTR(HELECOPT), HELECOPT__STATIC }, - { "HOLODUKE", DVPTR(HOLODUKE), HOLODUKE__STATIC }, - { "HOLODUKE_ICON", DVPTR(HOLODUKE_ICON), HOLODUKE_ICON__STATIC }, - { "HORSEONSIDE", DVPTR(HORSEONSIDE), HORSEONSIDE__STATIC }, - { "HOTMEAT", DVPTR(HOTMEAT), HOTMEAT__STATIC }, - { "HURTRAIL", DVPTR(HURTRAIL), HURTRAIL__STATIC }, - { "HYDRENT", DVPTR(HYDRENT), HYDRENT__STATIC }, - { "HYDROPLANT", DVPTR(HYDROPLANT), HYDROPLANT__STATIC }, - { "INDY", DVPTR(INDY), INDY__STATIC }, - { "INGAMEDUKETHREEDEE", DVPTR(INGAMEDUKETHREEDEE), INGAMEDUKETHREEDEE__STATIC }, - { "INNERJAW", DVPTR(INNERJAW), INNERJAW__STATIC }, - { "INVENTORYBOX", DVPTR(INVENTORYBOX), INVENTORYBOX__STATIC }, - { "IVUNIT", DVPTR(IVUNIT), IVUNIT__STATIC }, - { "JETPACK", DVPTR(JETPACK), JETPACK__STATIC }, - { "JETPACK_ICON", DVPTR(JETPACK_ICON), JETPACK_ICON__STATIC }, - { "JIBS1", DVPTR(JIBS1), JIBS1__STATIC }, - { "JIBS2", DVPTR(JIBS2), JIBS2__STATIC }, - { "JIBS3", DVPTR(JIBS3), JIBS3__STATIC }, - { "JIBS4", DVPTR(JIBS4), JIBS4__STATIC }, - { "JIBS5", DVPTR(JIBS5), JIBS5__STATIC }, - { "JIBS6", DVPTR(JIBS6), JIBS6__STATIC }, - { "JURYGUY", DVPTR(JURYGUY), JURYGUY__STATIC }, - { "KILLSICON", DVPTR(KILLSICON), KILLSICON__STATIC }, - { "KNEE", DVPTR(KNEE), KNEE__STATIC }, - { "LA", DVPTR(LA), LA__STATIC }, - { "LASERLINE", DVPTR(LASERLINE), LASERLINE__STATIC }, - { "LASERSITE", DVPTR(LASERSITE), LASERSITE__STATIC }, - { "LEGJIB1", DVPTR(LEGJIB1), LEGJIB1__STATIC }, - { "LETTER", DVPTR(LETTER), LETTER__STATIC }, - { "LIGHTSWITCH", DVPTR(LIGHTSWITCH), LIGHTSWITCH__STATIC }, - { "LIGHTSWITCH2", DVPTR(LIGHTSWITCH2), LIGHTSWITCH2__STATIC }, - { "LIZMAN", DVPTR(LIZMAN), LIZMAN__STATIC }, - { "LIZMANARM1", DVPTR(LIZMANARM1), LIZMANARM1__STATIC }, - { "LIZMANFEEDING", DVPTR(LIZMANFEEDING), LIZMANFEEDING__STATIC }, - { "LIZMANHEAD1", DVPTR(LIZMANHEAD1), LIZMANHEAD1__STATIC }, - { "LIZMANJUMP", DVPTR(LIZMANJUMP), LIZMANJUMP__STATIC }, - { "LIZMANLEG1", DVPTR(LIZMANLEG1), LIZMANLEG1__STATIC }, - { "LIZMANSPITTING", DVPTR(LIZMANSPITTING), LIZMANSPITTING__STATIC }, - { "LIZMANSTAYPUT", DVPTR(LIZMANSTAYPUT), LIZMANSTAYPUT__STATIC }, - { "LIZTROOP", DVPTR(LIZTROOP), LIZTROOP__STATIC }, - { "LIZTROOPDUCKING", DVPTR(LIZTROOPDUCKING), LIZTROOPDUCKING__STATIC }, - { "LIZTROOPJETPACK", DVPTR(LIZTROOPJETPACK), LIZTROOPJETPACK__STATIC }, - { "LIZTROOPJUSTSIT", DVPTR(LIZTROOPJUSTSIT), LIZTROOPJUSTSIT__STATIC }, - { "LIZTROOPONTOILET", DVPTR(LIZTROOPONTOILET), LIZTROOPONTOILET__STATIC }, - { "LIZTROOPRUNNING", DVPTR(LIZTROOPRUNNING), LIZTROOPRUNNING__STATIC }, - { "LIZTROOPSHOOT", DVPTR(LIZTROOPSHOOT), LIZTROOPSHOOT__STATIC }, - { "LIZTROOPSTAYPUT", DVPTR(LIZTROOPSTAYPUT), LIZTROOPSTAYPUT__STATIC }, - { "LOADSCREEN", DVPTR(LOADSCREEN), LOADSCREEN__STATIC }, - { "LOCATORS", DVPTR(LOCATORS), LOCATORS__STATIC }, - { "LOCKSWITCH1", DVPTR(LOCKSWITCH1), LOCKSWITCH1__STATIC }, - { "LOOGIE", DVPTR(LOOGIE), LOOGIE__STATIC }, - { "LUKE", DVPTR(LUKE), LUKE__STATIC }, - { "MAIL", DVPTR(MAIL), MAIL__STATIC }, - { "MAN", DVPTR(MAN), MAN__STATIC }, - { "MAN2", DVPTR(MAN2), MAN2__STATIC }, - { "MASKWALL1", DVPTR(MASKWALL1), MASKWALL1__STATIC }, - { "MASKWALL10", DVPTR(MASKWALL10), MASKWALL10__STATIC }, - { "MASKWALL11", DVPTR(MASKWALL11), MASKWALL11__STATIC }, - { "MASKWALL12", DVPTR(MASKWALL12), MASKWALL12__STATIC }, - { "MASKWALL13", DVPTR(MASKWALL13), MASKWALL13__STATIC }, - { "MASKWALL14", DVPTR(MASKWALL14), MASKWALL14__STATIC }, - { "MASKWALL15", DVPTR(MASKWALL15), MASKWALL15__STATIC }, - { "MASKWALL2", DVPTR(MASKWALL2), MASKWALL2__STATIC }, - { "MASKWALL3", DVPTR(MASKWALL3), MASKWALL3__STATIC }, - { "MASKWALL4", DVPTR(MASKWALL4), MASKWALL4__STATIC }, - { "MASKWALL5", DVPTR(MASKWALL5), MASKWALL5__STATIC }, - { "MASKWALL6", DVPTR(MASKWALL6), MASKWALL6__STATIC }, - { "MASKWALL7", DVPTR(MASKWALL7), MASKWALL7__STATIC }, - { "MASKWALL8", DVPTR(MASKWALL8), MASKWALL8__STATIC }, - { "MASKWALL9", DVPTR(MASKWALL9), MASKWALL9__STATIC }, - { "MASTERSWITCH", DVPTR(MASTERSWITCH), MASTERSWITCH__STATIC }, - { "MENUBAR", DVPTR(MENUBAR), MENUBAR__STATIC }, - { "MENUSCREEN", DVPTR(MENUSCREEN), MENUSCREEN__STATIC }, - { "MIKE", DVPTR(MIKE), MIKE__STATIC }, - { "MINIFONT", DVPTR(MINIFONT), MINIFONT__STATIC }, - { "MIRROR", DVPTR(MIRROR), MIRROR__STATIC }, - { "MIRRORBROKE", DVPTR(MIRRORBROKE), MIRRORBROKE__STATIC }, - { "MONEY", DVPTR(MONEY), MONEY__STATIC }, - { "MONK", DVPTR(MONK), MONK__STATIC }, - { "MOONSKY1", DVPTR(MOONSKY1), MOONSKY1__STATIC }, - { "MORTER", DVPTR(MORTER), MORTER__STATIC }, - { "MOVIECAMERA", DVPTR(MOVIECAMERA), MOVIECAMERA__STATIC }, - { "MULTISWITCH", DVPTR(MULTISWITCH), MULTISWITCH__STATIC }, - { "MUSICANDSFX", DVPTR(MUSICANDSFX), MUSICANDSFX__STATIC }, - { "NAKED1", DVPTR(NAKED1), NAKED1__STATIC }, - { "NATURALLIGHTNING", DVPTR(NATURALLIGHTNING), NATURALLIGHTNING__STATIC }, - { "NEON1", DVPTR(NEON1), NEON1__STATIC }, - { "NEON2", DVPTR(NEON2), NEON2__STATIC }, - { "NEON3", DVPTR(NEON3), NEON3__STATIC }, - { "NEON4", DVPTR(NEON4), NEON4__STATIC }, - { "NEON5", DVPTR(NEON5), NEON5__STATIC }, - { "NEON6", DVPTR(NEON6), NEON6__STATIC }, - { "NEWBEAST", DVPTR(NEWBEAST), NEWBEAST__STATIC }, - { "NEWBEASTSTAYPUT", DVPTR(NEWBEASTSTAYPUT), NEWBEASTSTAYPUT__STATIC }, - { "NUKEBARREL", DVPTR(NUKEBARREL), NUKEBARREL__STATIC }, - { "NUKEBARRELDENTED", DVPTR(NUKEBARRELDENTED), NUKEBARRELDENTED__STATIC }, - { "NUKEBARRELLEAKED", DVPTR(NUKEBARRELLEAKED), NUKEBARRELLEAKED__STATIC }, - { "NUKEBUTTON", DVPTR(NUKEBUTTON), NUKEBUTTON__STATIC }, - { "OCEANSPRITE1", DVPTR(OCEANSPRITE1), OCEANSPRITE1__STATIC }, - { "OCEANSPRITE2", DVPTR(OCEANSPRITE2), OCEANSPRITE2__STATIC }, - { "OCEANSPRITE3", DVPTR(OCEANSPRITE3), OCEANSPRITE3__STATIC }, - { "OCEANSPRITE4", DVPTR(OCEANSPRITE4), OCEANSPRITE4__STATIC }, - { "OCEANSPRITE5", DVPTR(OCEANSPRITE5), OCEANSPRITE5__STATIC }, - { "OCTABRAIN", DVPTR(OCTABRAIN), OCTABRAIN__STATIC }, - { "OCTABRAINSTAYPUT", DVPTR(OCTABRAINSTAYPUT), OCTABRAINSTAYPUT__STATIC }, - { "OJ", DVPTR(OJ), OJ__STATIC }, - { "OOZ", DVPTR(OOZ), OOZ__STATIC }, - { "OOZ2", DVPTR(OOZ2), OOZ2__STATIC }, - { "OOZFILTER", DVPTR(OOZFILTER), OOZFILTER__STATIC }, - { "ORDERING", DVPTR(ORDERING), ORDERING__STATIC }, - { "ORGANTIC", DVPTR(ORGANTIC), ORGANTIC__STATIC }, - { "PANNEL1", DVPTR(PANNEL1), PANNEL1__STATIC }, - { "PANNEL2", DVPTR(PANNEL2), PANNEL2__STATIC }, - { "PANNEL3", DVPTR(PANNEL3), PANNEL3__STATIC }, - { "PAPER", DVPTR(PAPER), PAPER__STATIC }, - { "PIGCOP", DVPTR(PIGCOP), PIGCOP__STATIC }, - { "PIGCOPDIVE", DVPTR(PIGCOPDIVE), PIGCOPDIVE__STATIC }, - { "PIGCOPSTAYPUT", DVPTR(PIGCOPSTAYPUT), PIGCOPSTAYPUT__STATIC }, - { "PIPE1", DVPTR(PIPE1), PIPE1__STATIC }, - { "PIPE1B", DVPTR(PIPE1B), PIPE1B__STATIC }, - { "PIPE2", DVPTR(PIPE2), PIPE2__STATIC }, - { "PIPE2B", DVPTR(PIPE2B), PIPE2B__STATIC }, - { "PIPE3", DVPTR(PIPE3), PIPE3__STATIC }, - { "PIPE3B", DVPTR(PIPE3B), PIPE3B__STATIC }, - { "PIPE4", DVPTR(PIPE4), PIPE4__STATIC }, - { "PIPE4B", DVPTR(PIPE4B), PIPE4B__STATIC }, - { "PIPE5", DVPTR(PIPE5), PIPE5__STATIC }, - { "PIPE5B", DVPTR(PIPE5B), PIPE5B__STATIC }, - { "PIPE6", DVPTR(PIPE6), PIPE6__STATIC }, - { "PIPE6B", DVPTR(PIPE6B), PIPE6B__STATIC }, - { "PLAYERONWATER", DVPTR(PLAYERONWATER), PLAYERONWATER__STATIC }, - { "PLUG", DVPTR(PLUG), PLUG__STATIC }, - { "PLUTOPAKSPRITE", DVPTR(PLUTOPAKSPRITE), PLUTOPAKSPRITE__STATIC }, - { "POCKET", DVPTR(POCKET), POCKET__STATIC }, - { "PODFEM1", DVPTR(PODFEM1), PODFEM1__STATIC }, - { "POT1", DVPTR(POT1), POT1__STATIC }, - { "POT2", DVPTR(POT2), POT2__STATIC }, - { "POT3", DVPTR(POT3), POT3__STATIC }, - { "POWERSWITCH1", DVPTR(POWERSWITCH1), POWERSWITCH1__STATIC }, - { "POWERSWITCH2", DVPTR(POWERSWITCH2), POWERSWITCH2__STATIC }, - { "PUKE", DVPTR(PUKE), PUKE__STATIC }, - { "PULLSWITCH", DVPTR(PULLSWITCH), PULLSWITCH__STATIC }, - { "PURPLELAVA", DVPTR(PURPLELAVA), PURPLELAVA__STATIC }, - { "QUEBALL", DVPTR(QUEBALL), QUEBALL__STATIC }, - { "RADIUSEXPLOSION", DVPTR(RADIUSEXPLOSION), RADIUSEXPLOSION__STATIC }, - { "RAT", DVPTR(RAT), RAT__STATIC }, - { "REACTOR", DVPTR(REACTOR), REACTOR__STATIC }, - { "REACTOR2", DVPTR(REACTOR2), REACTOR2__STATIC }, - { "REACTOR2BURNT", DVPTR(REACTOR2BURNT), REACTOR2BURNT__STATIC }, - { "REACTOR2SPARK", DVPTR(REACTOR2SPARK), REACTOR2SPARK__STATIC }, - { "REACTORBURNT", DVPTR(REACTORBURNT), REACTORBURNT__STATIC }, - { "REACTORSPARK", DVPTR(REACTORSPARK), REACTORSPARK__STATIC }, - { "RECON", DVPTR(RECON), RECON__STATIC }, - { "RESPAWN", DVPTR(RESPAWN), RESPAWN__STATIC }, - { "RESPAWNMARKERGREEN", DVPTR(RESPAWNMARKERGREEN), RESPAWNMARKERGREEN__STATIC }, - { "RESPAWNMARKERRED", DVPTR(RESPAWNMARKERRED), RESPAWNMARKERRED__STATIC }, - { "RESPAWNMARKERYELLOW", DVPTR(RESPAWNMARKERYELLOW), RESPAWNMARKERYELLOW__STATIC }, - { "ROTATEGUN", DVPTR(ROTATEGUN), ROTATEGUN__STATIC }, - { "RPG", DVPTR(RPG), RPG__STATIC }, - { "RPGAMMO", DVPTR(RPGAMMO), RPGAMMO__STATIC }, - { "RPGGUN", DVPTR(RPGGUN), RPGGUN__STATIC }, - { "RPGSPRITE", DVPTR(RPGSPRITE), RPGSPRITE__STATIC }, - { "RUBBERCAN", DVPTR(RUBBERCAN), RUBBERCAN__STATIC }, - { "SATELITE", DVPTR(SATELITE), SATELITE__STATIC }, - { "SCALE", DVPTR(SCALE), SCALE__STATIC }, - { "SCRAP1", DVPTR(SCRAP1), SCRAP1__STATIC }, - { "SCRAP2", DVPTR(SCRAP2), SCRAP2__STATIC }, - { "SCRAP3", DVPTR(SCRAP3), SCRAP3__STATIC }, - { "SCRAP4", DVPTR(SCRAP4), SCRAP4__STATIC }, - { "SCRAP5", DVPTR(SCRAP5), SCRAP5__STATIC }, - { "SCRAP6", DVPTR(SCRAP6), SCRAP6__STATIC }, - { "SCREENBREAK1", DVPTR(SCREENBREAK1), SCREENBREAK1__STATIC }, - { "SCREENBREAK10", DVPTR(SCREENBREAK10), SCREENBREAK10__STATIC }, - { "SCREENBREAK11", DVPTR(SCREENBREAK11), SCREENBREAK11__STATIC }, - { "SCREENBREAK12", DVPTR(SCREENBREAK12), SCREENBREAK12__STATIC }, - { "SCREENBREAK13", DVPTR(SCREENBREAK13), SCREENBREAK13__STATIC }, - { "SCREENBREAK14", DVPTR(SCREENBREAK14), SCREENBREAK14__STATIC }, - { "SCREENBREAK15", DVPTR(SCREENBREAK15), SCREENBREAK15__STATIC }, - { "SCREENBREAK16", DVPTR(SCREENBREAK16), SCREENBREAK16__STATIC }, - { "SCREENBREAK17", DVPTR(SCREENBREAK17), SCREENBREAK17__STATIC }, - { "SCREENBREAK18", DVPTR(SCREENBREAK18), SCREENBREAK18__STATIC }, - { "SCREENBREAK19", DVPTR(SCREENBREAK19), SCREENBREAK19__STATIC }, - { "SCREENBREAK2", DVPTR(SCREENBREAK2), SCREENBREAK2__STATIC }, - { "SCREENBREAK3", DVPTR(SCREENBREAK3), SCREENBREAK3__STATIC }, - { "SCREENBREAK4", DVPTR(SCREENBREAK4), SCREENBREAK4__STATIC }, - { "SCREENBREAK5", DVPTR(SCREENBREAK5), SCREENBREAK5__STATIC }, - { "SCREENBREAK6", DVPTR(SCREENBREAK6), SCREENBREAK6__STATIC }, - { "SCREENBREAK7", DVPTR(SCREENBREAK7), SCREENBREAK7__STATIC }, - { "SCREENBREAK8", DVPTR(SCREENBREAK8), SCREENBREAK8__STATIC }, - { "SCREENBREAK9", DVPTR(SCREENBREAK9), SCREENBREAK9__STATIC }, - { "SCUBAMASK", DVPTR(SCUBAMASK), SCUBAMASK__STATIC }, - { "SECTOREFFECTOR", DVPTR(SECTOREFFECTOR), SECTOREFFECTOR__STATIC }, - { "SEENINE", DVPTR(SEENINE), SEENINE__STATIC }, - { "SEENINEDEAD", DVPTR(SEENINEDEAD), SEENINEDEAD__STATIC }, - { "SELECTDIR", DVPTR(SELECTDIR), SELECTDIR__STATIC }, - { "SHARK", DVPTR(SHARK), SHARK__STATIC }, - { "SHELL", DVPTR(SHELL), SHELL__STATIC }, - { "SHIELD", DVPTR(SHIELD), SHIELD__STATIC }, - { "SHOTGUN", DVPTR(SHOTGUN), SHOTGUN__STATIC }, - { "SHOTGUNAMMO", DVPTR(SHOTGUNAMMO), SHOTGUNAMMO__STATIC }, - { "SHOTGUNSHELL", DVPTR(SHOTGUNSHELL), SHOTGUNSHELL__STATIC }, - { "SHOTGUNSPRITE", DVPTR(SHOTGUNSPRITE), SHOTGUNSPRITE__STATIC }, - { "SHOTSPARK1", DVPTR(SHOTSPARK1), SHOTSPARK1__STATIC }, - { "SHRINKER", DVPTR(SHRINKER), SHRINKER__STATIC }, - { "SHRINKEREXPLOSION", DVPTR(SHRINKEREXPLOSION), SHRINKEREXPLOSION__STATIC }, - { "SHRINKERSPRITE", DVPTR(SHRINKERSPRITE), SHRINKERSPRITE__STATIC }, - { "SHRINKSPARK", DVPTR(SHRINKSPARK), SHRINKSPARK__STATIC }, - { "SIDEBOLT1", DVPTR(SIDEBOLT1), SIDEBOLT1__STATIC }, - { "SIGN1", DVPTR(SIGN1), SIGN1__STATIC }, - { "SIGN2", DVPTR(SIGN2), SIGN2__STATIC }, - { "SIXPAK", DVPTR(SIXPAK), SIXPAK__STATIC }, - { "SLIDEBAR", DVPTR(SLIDEBAR), SLIDEBAR__STATIC }, - { "SLOTDOOR", DVPTR(SLOTDOOR), SLOTDOOR__STATIC }, - { "SMALLFNTCURSOR", DVPTR(SMALLFNTCURSOR), SMALLFNTCURSOR__STATIC }, - { "SMALLSMOKE", DVPTR(SMALLSMOKE), SMALLSMOKE__STATIC }, - { "SOLARPANNEL", DVPTR(SOLARPANNEL), SOLARPANNEL__STATIC }, - { "SPACEDOORSWITCH", DVPTR(SPACEDOORSWITCH), SPACEDOORSWITCH__STATIC }, - { "SPACELIGHTSWITCH", DVPTR(SPACELIGHTSWITCH), SPACELIGHTSWITCH__STATIC }, - { "SPACEMARINE", DVPTR(SPACEMARINE), SPACEMARINE__STATIC }, - { "SPEAKER", DVPTR(SPEAKER), SPEAKER__STATIC }, - { "SPINNINGNUKEICON", DVPTR(SPINNINGNUKEICON), SPINNINGNUKEICON__STATIC }, - { "SPIT", DVPTR(SPIT), SPIT__STATIC }, - { "SPOTLITE", DVPTR(SPOTLITE), SPOTLITE__STATIC }, - { "STAINGLASS1", DVPTR(STAINGLASS1), STAINGLASS1__STATIC }, - { "STALL", DVPTR(STALL), STALL__STATIC }, - { "STALLBROKE", DVPTR(STALLBROKE), STALLBROKE__STATIC }, - { "STARTALPHANUM", DVPTR(STARTALPHANUM), STARTALPHANUM__STATIC }, - { "STATIC", DVPTR(STATIC), STATIC__STATIC }, - { "STATUE", DVPTR(STATUE), STATUE__STATIC }, - { "STATUEFLASH", DVPTR(STATUEFLASH), STATUEFLASH__STATIC }, - { "STEAM", DVPTR(STEAM), STEAM__STATIC }, - { "STEROIDS", DVPTR(STEROIDS), STEROIDS__STATIC }, - { "STEROIDS_ICON", DVPTR(STEROIDS_ICON), STEROIDS_ICON__STATIC }, - { "STRIPEBALL", DVPTR(STRIPEBALL), STRIPEBALL__STATIC }, - { "SUSHIPLATE1", DVPTR(SUSHIPLATE1), SUSHIPLATE1__STATIC }, - { "SUSHIPLATE2", DVPTR(SUSHIPLATE2), SUSHIPLATE2__STATIC }, - { "SUSHIPLATE3", DVPTR(SUSHIPLATE3), SUSHIPLATE3__STATIC }, - { "SUSHIPLATE4", DVPTR(SUSHIPLATE4), SUSHIPLATE4__STATIC }, - { "SUSHIPLATE5", DVPTR(SUSHIPLATE5), SUSHIPLATE5__STATIC }, - { "TAMPON", DVPTR(TAMPON), TAMPON__STATIC }, - { "TANK", DVPTR(TANK), TANK__STATIC }, - { "TARGET", DVPTR(TARGET), TARGET__STATIC }, - { "TECHLIGHT2", DVPTR(TECHLIGHT2), TECHLIGHT2__STATIC }, - { "TECHLIGHT4", DVPTR(TECHLIGHT4), TECHLIGHT4__STATIC }, - { "TECHLIGHTBUST2", DVPTR(TECHLIGHTBUST2), TECHLIGHTBUST2__STATIC }, - { "TECHLIGHTBUST4", DVPTR(TECHLIGHTBUST4), TECHLIGHTBUST4__STATIC }, - { "TECHSWITCH", DVPTR(TECHSWITCH), TECHSWITCH__STATIC }, - { "TENSCREEN", DVPTR(TENSCREEN), TENSCREEN__STATIC }, - { "TEXTBOX", DVPTR(TEXTBOX), TEXTBOX__STATIC }, - { "TEXTSTORY", DVPTR(TEXTSTORY), TEXTSTORY__STATIC }, - { "THREEBYFIVE", DVPTR(THREEBYFIVE), THREEBYFIVE__STATIC }, - { "THREEDEE", DVPTR(THREEDEE), THREEDEE__STATIC }, - { "TIP", DVPTR(TIP), TIP__STATIC }, - { "TIRE", DVPTR(TIRE), TIRE__STATIC }, - { "TOILET", DVPTR(TOILET), TOILET__STATIC }, - { "TOILETBROKE", DVPTR(TOILETBROKE), TOILETBROKE__STATIC }, - { "TOILETWATER", DVPTR(TOILETWATER), TOILETWATER__STATIC }, - { "TONGUE", DVPTR(TONGUE), TONGUE__STATIC }, - { "TOUCHPLATE", DVPTR(TOUCHPLATE), TOUCHPLATE__STATIC }, - { "TOUGHGAL", DVPTR(TOUGHGAL), TOUGHGAL__STATIC }, - { "TRANSPORTERBEAM", DVPTR(TRANSPORTERBEAM), TRANSPORTERBEAM__STATIC }, - { "TRANSPORTERSTAR", DVPTR(TRANSPORTERSTAR), TRANSPORTERSTAR__STATIC }, - { "TRASH", DVPTR(TRASH), TRASH__STATIC }, - { "TREE1", DVPTR(TREE1), TREE1__STATIC }, - { "TREE2", DVPTR(TREE2), TREE2__STATIC }, - { "TRIPBOMB", DVPTR(TRIPBOMB), TRIPBOMB__STATIC }, - { "TRIPBOMBSPRITE", DVPTR(TRIPBOMBSPRITE), TRIPBOMBSPRITE__STATIC }, - { "TRIPODCAMERA", DVPTR(TRIPODCAMERA), TRIPODCAMERA__STATIC }, - { "VACUUM", DVPTR(VACUUM), VACUUM__STATIC }, - { "VASE", DVPTR(VASE), VASE__STATIC }, - { "VENDMACHINE", DVPTR(VENDMACHINE), VENDMACHINE__STATIC }, - { "VICTORY1", DVPTR(VICTORY1), VICTORY1__STATIC }, - { "VIEWBORDER", DVPTR(VIEWBORDER), VIEWBORDER__STATIC }, - { "VIEWSCREEN", DVPTR(VIEWSCREEN), VIEWSCREEN__STATIC }, - { "VIEWSCREEN2", DVPTR(VIEWSCREEN2), VIEWSCREEN2__STATIC }, - { "W_FORCEFIELD", DVPTR(W_FORCEFIELD), W_FORCEFIELD__STATIC }, - { "W_HITTECHWALL1", DVPTR(W_HITTECHWALL1), W_HITTECHWALL1__STATIC }, - { "W_HITTECHWALL10", DVPTR(W_HITTECHWALL10), W_HITTECHWALL10__STATIC }, - { "W_HITTECHWALL15", DVPTR(W_HITTECHWALL15), W_HITTECHWALL15__STATIC }, - { "W_HITTECHWALL16", DVPTR(W_HITTECHWALL16), W_HITTECHWALL16__STATIC }, - { "W_HITTECHWALL2", DVPTR(W_HITTECHWALL2), W_HITTECHWALL2__STATIC }, - { "W_HITTECHWALL3", DVPTR(W_HITTECHWALL3), W_HITTECHWALL3__STATIC }, - { "W_HITTECHWALL4", DVPTR(W_HITTECHWALL4), W_HITTECHWALL4__STATIC }, - { "W_MILKSHELF", DVPTR(W_MILKSHELF), W_MILKSHELF__STATIC }, - { "W_MILKSHELFBROKE", DVPTR(W_MILKSHELFBROKE), W_MILKSHELFBROKE__STATIC }, - { "W_NUMBERS", DVPTR(W_NUMBERS), W_NUMBERS__STATIC }, - { "W_SCREENBREAK", DVPTR(W_SCREENBREAK), W_SCREENBREAK__STATIC }, - { "W_TECHWALL1", DVPTR(W_TECHWALL1), W_TECHWALL1__STATIC }, - { "W_TECHWALL10", DVPTR(W_TECHWALL10), W_TECHWALL10__STATIC }, - { "W_TECHWALL11", DVPTR(W_TECHWALL11), W_TECHWALL11__STATIC }, - { "W_TECHWALL12", DVPTR(W_TECHWALL12), W_TECHWALL12__STATIC }, - { "W_TECHWALL13", DVPTR(W_TECHWALL13), W_TECHWALL13__STATIC }, - { "W_TECHWALL14", DVPTR(W_TECHWALL14), W_TECHWALL14__STATIC }, - { "W_TECHWALL15", DVPTR(W_TECHWALL15), W_TECHWALL15__STATIC }, - { "W_TECHWALL16", DVPTR(W_TECHWALL16), W_TECHWALL16__STATIC }, - { "W_TECHWALL2", DVPTR(W_TECHWALL2), W_TECHWALL2__STATIC }, - { "W_TECHWALL3", DVPTR(W_TECHWALL3), W_TECHWALL3__STATIC }, - { "W_TECHWALL4", DVPTR(W_TECHWALL4), W_TECHWALL4__STATIC }, - { "W_TECHWALL5", DVPTR(W_TECHWALL5), W_TECHWALL5__STATIC }, - { "W_TECHWALL6", DVPTR(W_TECHWALL6), W_TECHWALL6__STATIC }, - { "W_TECHWALL7", DVPTR(W_TECHWALL7), W_TECHWALL7__STATIC }, - { "W_TECHWALL8", DVPTR(W_TECHWALL8), W_TECHWALL8__STATIC }, - { "W_TECHWALL9", DVPTR(W_TECHWALL9), W_TECHWALL9__STATIC }, - { "WAITTOBESEATED", DVPTR(WAITTOBESEATED), WAITTOBESEATED__STATIC }, - { "WALLBLOOD1", DVPTR(WALLBLOOD1), WALLBLOOD1__STATIC }, - { "WALLBLOOD2", DVPTR(WALLBLOOD2), WALLBLOOD2__STATIC }, - { "WALLBLOOD3", DVPTR(WALLBLOOD3), WALLBLOOD3__STATIC }, - { "WALLBLOOD4", DVPTR(WALLBLOOD4), WALLBLOOD4__STATIC }, - { "WALLBLOOD5", DVPTR(WALLBLOOD5), WALLBLOOD5__STATIC }, - { "WALLBLOOD7", DVPTR(WALLBLOOD7), WALLBLOOD7__STATIC }, - { "WALLBLOOD8", DVPTR(WALLBLOOD8), WALLBLOOD8__STATIC }, - { "WALLLIGHT1", DVPTR(WALLLIGHT1), WALLLIGHT1__STATIC }, - { "WALLLIGHT2", DVPTR(WALLLIGHT2), WALLLIGHT2__STATIC }, - { "WALLLIGHT3", DVPTR(WALLLIGHT3), WALLLIGHT3__STATIC }, - { "WALLLIGHT4", DVPTR(WALLLIGHT4), WALLLIGHT4__STATIC }, - { "WALLLIGHTBUST1", DVPTR(WALLLIGHTBUST1), WALLLIGHTBUST1__STATIC }, - { "WALLLIGHTBUST2", DVPTR(WALLLIGHTBUST2), WALLLIGHTBUST2__STATIC }, - { "WALLLIGHTBUST3", DVPTR(WALLLIGHTBUST3), WALLLIGHTBUST3__STATIC }, - { "WALLLIGHTBUST4", DVPTR(WALLLIGHTBUST4), WALLLIGHTBUST4__STATIC }, - { "WATERBUBBLE", DVPTR(WATERBUBBLE), WATERBUBBLE__STATIC }, - { "WATERBUBBLEMAKER", DVPTR(WATERBUBBLEMAKER), WATERBUBBLEMAKER__STATIC }, - { "WATERDRIP", DVPTR(WATERDRIP), WATERDRIP__STATIC }, - { "WATERDRIPSPLASH", DVPTR(WATERDRIPSPLASH), WATERDRIPSPLASH__STATIC }, - { "WATERFOUNTAIN", DVPTR(WATERFOUNTAIN), WATERFOUNTAIN__STATIC }, - { "WATERFOUNTAINBROKE", DVPTR(WATERFOUNTAINBROKE), WATERFOUNTAINBROKE__STATIC }, - { "WATERSPLASH2", DVPTR(WATERSPLASH2), WATERSPLASH2__STATIC }, - { "WATERTILE2", DVPTR(WATERTILE2), WATERTILE2__STATIC }, - { "WEATHERWARN", DVPTR(WEATHERWARN), WEATHERWARN__STATIC }, - { "WINDOWBORDER1", DVPTR(WINDOWBORDER1), WINDOWBORDER1__STATIC }, - { "WINDOWBORDER2", DVPTR(WINDOWBORDER2), WINDOWBORDER2__STATIC }, - { "WOMAN", DVPTR(WOMAN), WOMAN__STATIC }, - { "WOODENHORSE", DVPTR(WOODENHORSE), WOODENHORSE__STATIC }, - { "XXXSTACY", DVPTR(XXXSTACY), XXXSTACY__STATIC }, - }; - - -int32_t ACCESS_ICON = ACCESS_ICON__STATIC; -int32_t ACCESSCARD = ACCESSCARD__STATIC; -int32_t ACCESSSWITCH = ACCESSSWITCH__STATIC; -int32_t ACCESSSWITCH2 = ACCESSSWITCH2__STATIC; -int32_t ACTIVATOR = ACTIVATOR__STATIC; -int32_t ACTIVATORLOCKED = ACTIVATORLOCKED__STATIC; -int32_t AIRTANK = AIRTANK__STATIC; -int32_t AIRTANK_ICON = AIRTANK_ICON__STATIC; -int32_t ALIENSWITCH = ALIENSWITCH__STATIC; -int32_t AMMO = AMMO__STATIC; -int32_t AMMOBOX = AMMOBOX__STATIC; -int32_t AMMOLOTS = AMMOLOTS__STATIC; -int32_t ANTENNA = ANTENNA__STATIC; -int32_t APLAYER = APLAYER__STATIC; -int32_t APLAYERTOP = APLAYERTOP__STATIC; -int32_t ARMJIB1 = ARMJIB1__STATIC; -int32_t ARROW = ARROW__STATIC; -int32_t ATM = ATM__STATIC; -int32_t ATMBROKE = ATMBROKE__STATIC; -int32_t ATOMICHEALTH = ATOMICHEALTH__STATIC; -int32_t BANNER = BANNER__STATIC; -int32_t BARBROKE = BARBROKE__STATIC; -int32_t BATTERYAMMO = BATTERYAMMO__STATIC; -int32_t BETASCREEN = BETASCREEN__STATIC; -int32_t BETAVERSION = BETAVERSION__STATIC; -int32_t BGRATE1 = BGRATE1__STATIC; -int32_t BIGALPHANUM = BIGALPHANUM__STATIC; -int32_t BIGAPPOS = BIGAPPOS__STATIC; -int32_t BIGCOLIN = BIGCOLIN__STATIC; -int32_t BIGCOMMA = BIGCOMMA__STATIC; -int32_t BIGFORCE = BIGFORCE__STATIC; -int32_t BIGHOLE = BIGHOLE__STATIC; -int32_t BIGORBIT1 = BIGORBIT1__STATIC; -int32_t BIGPERIOD = BIGPERIOD__STATIC; -int32_t BIGQ = BIGQ__STATIC; -int32_t BIGSEMI = BIGSEMI__STATIC; -int32_t BIGX_ = BIGX__STATIC; // "BIGX" clashes on the Wii? -int32_t BLANKSCREEN = BLANKSCREEN__STATIC; -int32_t BLIMP = BLIMP__STATIC; -int32_t BLOOD = BLOOD__STATIC; -int32_t BLOODPOOL = BLOODPOOL__STATIC; -int32_t BLOODSPLAT1 = BLOODSPLAT1__STATIC; -int32_t BLOODSPLAT2 = BLOODSPLAT2__STATIC; -int32_t BLOODSPLAT3 = BLOODSPLAT3__STATIC; -int32_t BLOODSPLAT4 = BLOODSPLAT4__STATIC; -int32_t BLOODYPOLE = BLOODYPOLE__STATIC; -int32_t BOLT1 = BOLT1__STATIC; -int32_t BONUSSCREEN = BONUSSCREEN__STATIC; -int32_t BOOT_ICON = BOOT_ICON__STATIC; -int32_t BOOTS = BOOTS__STATIC; -int32_t BORNTOBEWILDSCREEN = BORNTOBEWILDSCREEN__STATIC; -int32_t BOSS1 = BOSS1__STATIC; -int32_t BOSS1LOB = BOSS1LOB__STATIC; -int32_t BOSS1SHOOT = BOSS1SHOOT__STATIC; -int32_t BOSS1STAYPUT = BOSS1STAYPUT__STATIC; -int32_t BOSS2 = BOSS2__STATIC; -int32_t BOSS3 = BOSS3__STATIC; -int32_t BOSS4 = BOSS4__STATIC; -int32_t BOSS4STAYPUT = BOSS4STAYPUT__STATIC; -int32_t BOSSTOP = BOSSTOP__STATIC; -int32_t BOTTLE1 = BOTTLE1__STATIC; -int32_t BOTTLE10 = BOTTLE10__STATIC; -int32_t BOTTLE11 = BOTTLE11__STATIC; -int32_t BOTTLE12 = BOTTLE12__STATIC; -int32_t BOTTLE13 = BOTTLE13__STATIC; -int32_t BOTTLE14 = BOTTLE14__STATIC; -int32_t BOTTLE15 = BOTTLE15__STATIC; -int32_t BOTTLE16 = BOTTLE16__STATIC; -int32_t BOTTLE17 = BOTTLE17__STATIC; -int32_t BOTTLE18 = BOTTLE18__STATIC; -int32_t BOTTLE19 = BOTTLE19__STATIC; -int32_t BOTTLE2 = BOTTLE2__STATIC; -int32_t BOTTLE3 = BOTTLE3__STATIC; -int32_t BOTTLE4 = BOTTLE4__STATIC; -int32_t BOTTLE5 = BOTTLE5__STATIC; -int32_t BOTTLE6 = BOTTLE6__STATIC; -int32_t BOTTLE7 = BOTTLE7__STATIC; -int32_t BOTTLE8 = BOTTLE8__STATIC; -int32_t BOTTOMSTATUSBAR = BOTTOMSTATUSBAR__STATIC; -int32_t BOUNCEMINE = BOUNCEMINE__STATIC; -int32_t BOX = BOX__STATIC; -int32_t BPANNEL1 = BPANNEL1__STATIC; -int32_t BPANNEL3 = BPANNEL3__STATIC; -int32_t BROKEFIREHYDRENT = BROKEFIREHYDRENT__STATIC; -int32_t BROKEHYDROPLANT = BROKEHYDROPLANT__STATIC; -int32_t BROKENCHAIR = BROKENCHAIR__STATIC; -int32_t BULLETHOLE = BULLETHOLE__STATIC; -int32_t BURNING = BURNING__STATIC; -int32_t BURNING2 = BURNING2__STATIC; -int32_t CACTUS = CACTUS__STATIC; -int32_t CACTUSBROKE = CACTUSBROKE__STATIC; -int32_t CAMCORNER = CAMCORNER__STATIC; -int32_t CAMERA1 = CAMERA1__STATIC; -int32_t CAMERALIGHT = CAMERALIGHT__STATIC; -int32_t CAMERAPOLE = CAMERAPOLE__STATIC; -int32_t CAMLIGHT = CAMLIGHT__STATIC; -int32_t CANWITHSOMETHING = CANWITHSOMETHING__STATIC; -int32_t CANWITHSOMETHING2 = CANWITHSOMETHING2__STATIC; -int32_t CANWITHSOMETHING3 = CANWITHSOMETHING3__STATIC; -int32_t CANWITHSOMETHING4 = CANWITHSOMETHING4__STATIC; -int32_t CEILINGSTEAM = CEILINGSTEAM__STATIC; -int32_t CHAINGUN = CHAINGUN__STATIC; -int32_t CHAINGUNSPRITE = CHAINGUNSPRITE__STATIC; -int32_t CHAIR1 = CHAIR1__STATIC; -int32_t CHAIR2 = CHAIR2__STATIC; -int32_t CHAIR3 = CHAIR3__STATIC; -int32_t CIRCLEPANNEL = CIRCLEPANNEL__STATIC; -int32_t CIRCLEPANNELBROKE = CIRCLEPANNELBROKE__STATIC; -int32_t CLOUDYOCEAN = CLOUDYOCEAN__STATIC; -int32_t CLOUDYSKIES = CLOUDYSKIES__STATIC; -int32_t COLA = COLA__STATIC; -int32_t COLAMACHINE = COLAMACHINE__STATIC; -int32_t COMMANDER = COMMANDER__STATIC; -int32_t COMMANDERSTAYPUT = COMMANDERSTAYPUT__STATIC; -int32_t CONE = CONE__STATIC; -int32_t COOLEXPLOSION1 = COOLEXPLOSION1__STATIC; -int32_t CRACK1 = CRACK1__STATIC; -int32_t CRACK2 = CRACK2__STATIC; -int32_t CRACK3 = CRACK3__STATIC; -int32_t CRACK4 = CRACK4__STATIC; -int32_t CRACKKNUCKLES = CRACKKNUCKLES__STATIC; -int32_t CRANE = CRANE__STATIC; -int32_t CRANEPOLE = CRANEPOLE__STATIC; -int32_t CREDITSTEXT1 = CREDITSTEXT1__STATIC; -int32_t CREDITSTEXT2 = CREDITSTEXT2__STATIC; -int32_t CREDITSTEXT3 = CREDITSTEXT3__STATIC; -int32_t CROSSHAIR = CROSSHAIR__STATIC; -int32_t CRYSTALAMMO = CRYSTALAMMO__STATIC; -int32_t CYCLER = CYCLER__STATIC; -int32_t DEVISTATOR = DEVISTATOR__STATIC; -int32_t DEVISTATORAMMO = DEVISTATORAMMO__STATIC; -int32_t DEVISTATORSPRITE = DEVISTATORSPRITE__STATIC; -int32_t DIGITALNUM = DIGITALNUM__STATIC; -int32_t DIPSWITCH = DIPSWITCH__STATIC; -int32_t DIPSWITCH2 = DIPSWITCH2__STATIC; -int32_t DIPSWITCH3 = DIPSWITCH3__STATIC; -int32_t DOLPHIN1 = DOLPHIN1__STATIC; -int32_t DOLPHIN2 = DOLPHIN2__STATIC; -int32_t DOMELITE = DOMELITE__STATIC; -int32_t DOORSHOCK = DOORSHOCK__STATIC; -int32_t DOORTILE1 = DOORTILE1__STATIC; -int32_t DOORTILE10 = DOORTILE10__STATIC; -int32_t DOORTILE11 = DOORTILE11__STATIC; -int32_t DOORTILE12 = DOORTILE12__STATIC; -int32_t DOORTILE14 = DOORTILE14__STATIC; -int32_t DOORTILE15 = DOORTILE15__STATIC; -int32_t DOORTILE16 = DOORTILE16__STATIC; -int32_t DOORTILE17 = DOORTILE17__STATIC; -int32_t DOORTILE18 = DOORTILE18__STATIC; -int32_t DOORTILE19 = DOORTILE19__STATIC; -int32_t DOORTILE2 = DOORTILE2__STATIC; -int32_t DOORTILE20 = DOORTILE20__STATIC; -int32_t DOORTILE21 = DOORTILE21__STATIC; -int32_t DOORTILE22 = DOORTILE22__STATIC; -int32_t DOORTILE23 = DOORTILE23__STATIC; -int32_t DOORTILE3 = DOORTILE3__STATIC; -int32_t DOORTILE4 = DOORTILE4__STATIC; -int32_t DOORTILE5 = DOORTILE5__STATIC; -int32_t DOORTILE6 = DOORTILE6__STATIC; -int32_t DOORTILE7 = DOORTILE7__STATIC; -int32_t DOORTILE8 = DOORTILE8__STATIC; -int32_t DOORTILE9 = DOORTILE9__STATIC; -int32_t DREALMS = DREALMS__STATIC; -int32_t DRONE = DRONE__STATIC; -int32_t DUCK = DUCK__STATIC; -int32_t DUKECAR = DUKECAR__STATIC; -int32_t DUKEGUN = DUKEGUN__STATIC; -int32_t DUKELEG = DUKELEG__STATIC; -int32_t DUKELYINGDEAD = DUKELYINGDEAD__STATIC; -int32_t DUKENUKEM = DUKENUKEM__STATIC; -int32_t DUKETAG = DUKETAG__STATIC; -int32_t DUKETORSO = DUKETORSO__STATIC; -int32_t EGG = EGG__STATIC; -int32_t ENDALPHANUM = ENDALPHANUM__STATIC; -int32_t EXPLODINGBARREL = EXPLODINGBARREL__STATIC; -int32_t EXPLODINGBARREL2 = EXPLODINGBARREL2__STATIC; -int32_t EXPLOSION2 = EXPLOSION2__STATIC; -int32_t EXPLOSION2BOT = EXPLOSION2BOT__STATIC; -int32_t F1HELP = F1HELP__STATIC; -int32_t FANSHADOW = FANSHADOW__STATIC; -int32_t FANSHADOWBROKE = FANSHADOWBROKE__STATIC; -int32_t FANSPRITE = FANSPRITE__STATIC; -int32_t FANSPRITEBROKE = FANSPRITEBROKE__STATIC; -int32_t FECES = FECES__STATIC; -int32_t FEM1 = FEM1__STATIC; -int32_t FEM10 = FEM10__STATIC; -int32_t FEM2 = FEM2__STATIC; -int32_t FEM3 = FEM3__STATIC; -int32_t FEM4 = FEM4__STATIC; -int32_t FEM5 = FEM5__STATIC; -int32_t FEM6 = FEM6__STATIC; -int32_t FEM6PAD = FEM6PAD__STATIC; -int32_t FEM7 = FEM7__STATIC; -int32_t FEM8 = FEM8__STATIC; -int32_t FEM9 = FEM9__STATIC; -int32_t FEMMAG1 = FEMMAG1__STATIC; -int32_t FEMMAG2 = FEMMAG2__STATIC; -int32_t FEMPIC1 = FEMPIC1__STATIC; -int32_t FEMPIC2 = FEMPIC2__STATIC; -int32_t FEMPIC3 = FEMPIC3__STATIC; -int32_t FEMPIC4 = FEMPIC4__STATIC; -int32_t FEMPIC5 = FEMPIC5__STATIC; -int32_t FEMPIC6 = FEMPIC6__STATIC; -int32_t FEMPIC7 = FEMPIC7__STATIC; -int32_t FETUS = FETUS__STATIC; -int32_t FETUSBROKE = FETUSBROKE__STATIC; -int32_t FETUSJIB = FETUSJIB__STATIC; -int32_t FIRE = FIRE__STATIC; -int32_t FIRE2 = FIRE2__STATIC; -int32_t FIREBARREL = FIREBARREL__STATIC; -int32_t FIREEXT = FIREEXT__STATIC; -int32_t FIRELASER = FIRELASER__STATIC; -int32_t FIREVASE = FIREVASE__STATIC; -int32_t FIRSTAID = FIRSTAID__STATIC; -int32_t FIRSTAID_ICON = FIRSTAID_ICON__STATIC; -int32_t FIRSTGUN = FIRSTGUN__STATIC; -int32_t FIRSTGUNRELOAD = FIRSTGUNRELOAD__STATIC; -int32_t FIRSTGUNSPRITE = FIRSTGUNSPRITE__STATIC; -int32_t FIST = FIST__STATIC; -int32_t FLOORFLAME = FLOORFLAME__STATIC; -int32_t FLOORPLASMA = FLOORPLASMA__STATIC; -int32_t FLOORSLIME = FLOORSLIME__STATIC; -int32_t FOF = FOF__STATIC; -int32_t FOODOBJECT16 = FOODOBJECT16__STATIC; -int32_t FOOTPRINTS = FOOTPRINTS__STATIC; -int32_t FOOTPRINTS2 = FOOTPRINTS2__STATIC; -int32_t FOOTPRINTS3 = FOOTPRINTS3__STATIC; -int32_t FOOTPRINTS4 = FOOTPRINTS4__STATIC; -int32_t FORCERIPPLE = FORCERIPPLE__STATIC; -int32_t FORCESPHERE = FORCESPHERE__STATIC; -int32_t FRAGBAR = FRAGBAR__STATIC; -int32_t FRAMEEFFECT1 = FRAMEEFFECT1__STATIC; -int32_t FRAMEEFFECT1_13 = FRAMEEFFECT1_13__STATIC; -int32_t FRANKENSTINESWITCH = FRANKENSTINESWITCH__STATIC; -int32_t FREEZE = FREEZE__STATIC; -int32_t FREEZEAMMO = FREEZEAMMO__STATIC; -int32_t FREEZEBLAST = FREEZEBLAST__STATIC; -int32_t FREEZESPRITE = FREEZESPRITE__STATIC; -int32_t FUELPOD = FUELPOD__STATIC; -int32_t GENERICPOLE = GENERICPOLE__STATIC; -int32_t GENERICPOLE2 = GENERICPOLE2__STATIC; -int32_t GLASS = GLASS__STATIC; -int32_t GLASS2 = GLASS2__STATIC; -int32_t GLASSPIECES = GLASSPIECES__STATIC; -int32_t GPSPEED = GPSPEED__STATIC; -int32_t GRATE1 = GRATE1__STATIC; -int32_t GREENSLIME = GREENSLIME__STATIC; -int32_t GROWAMMO = GROWAMMO__STATIC; -int32_t GROWSPARK = GROWSPARK__STATIC; -int32_t GROWSPRITEICON = GROWSPRITEICON__STATIC; -int32_t HANDHOLDINGACCESS = HANDHOLDINGACCESS__STATIC; -int32_t HANDHOLDINGLASER = HANDHOLDINGLASER__STATIC; -int32_t HANDPRINTSWITCH = HANDPRINTSWITCH__STATIC; -int32_t HANDREMOTE = HANDREMOTE__STATIC; -int32_t HANDSWITCH = HANDSWITCH__STATIC; -int32_t HANDTHROW = HANDTHROW__STATIC; -int32_t HANGLIGHT = HANGLIGHT__STATIC; -int32_t HBOMBAMMO = HBOMBAMMO__STATIC; -int32_t HEADJIB1 = HEADJIB1__STATIC; -int32_t HEALTHBOX = HEALTHBOX__STATIC; -int32_t HEAT_ICON = HEAT_ICON__STATIC; -int32_t HEATSENSOR = HEATSENSOR__STATIC; -int32_t HEAVYHBOMB = HEAVYHBOMB__STATIC; -int32_t HELECOPT = HELECOPT__STATIC; -int32_t HOLODUKE = HOLODUKE__STATIC; -int32_t HOLODUKE_ICON = HOLODUKE_ICON__STATIC; -int32_t HORSEONSIDE = HORSEONSIDE__STATIC; -int32_t HOTMEAT = HOTMEAT__STATIC; -int32_t HURTRAIL = HURTRAIL__STATIC; -int32_t HYDRENT = HYDRENT__STATIC; -int32_t HYDROPLANT = HYDROPLANT__STATIC; -int32_t INDY = INDY__STATIC; -int32_t INGAMEDUKETHREEDEE = INGAMEDUKETHREEDEE__STATIC; -int32_t INNERJAW = INNERJAW__STATIC; -int32_t INVENTORYBOX = INVENTORYBOX__STATIC; -int32_t IVUNIT = IVUNIT__STATIC; -int32_t JETPACK = JETPACK__STATIC; -int32_t JETPACK_ICON = JETPACK_ICON__STATIC; -int32_t JIBS1 = JIBS1__STATIC; -int32_t JIBS2 = JIBS2__STATIC; -int32_t JIBS3 = JIBS3__STATIC; -int32_t JIBS4 = JIBS4__STATIC; -int32_t JIBS5 = JIBS5__STATIC; -int32_t JIBS6 = JIBS6__STATIC; -int32_t JURYGUY = JURYGUY__STATIC; -int32_t KILLSICON = KILLSICON__STATIC; -int32_t KNEE = KNEE__STATIC; -int32_t LA = LA__STATIC; -int32_t LASERLINE = LASERLINE__STATIC; -int32_t LASERSITE = LASERSITE__STATIC; -int32_t LEGJIB1 = LEGJIB1__STATIC; -int32_t LETTER = LETTER__STATIC; -int32_t LIGHTSWITCH = LIGHTSWITCH__STATIC; -int32_t LIGHTSWITCH2 = LIGHTSWITCH2__STATIC; -int32_t LIZMAN = LIZMAN__STATIC; -int32_t LIZMANARM1 = LIZMANARM1__STATIC; -int32_t LIZMANFEEDING = LIZMANFEEDING__STATIC; -int32_t LIZMANHEAD1 = LIZMANHEAD1__STATIC; -int32_t LIZMANJUMP = LIZMANJUMP__STATIC; -int32_t LIZMANLEG1 = LIZMANLEG1__STATIC; -int32_t LIZMANSPITTING = LIZMANSPITTING__STATIC; -int32_t LIZMANSTAYPUT = LIZMANSTAYPUT__STATIC; -int32_t LIZTROOP = LIZTROOP__STATIC; -int32_t LIZTROOPDUCKING = LIZTROOPDUCKING__STATIC; -int32_t LIZTROOPJETPACK = LIZTROOPJETPACK__STATIC; -int32_t LIZTROOPJUSTSIT = LIZTROOPJUSTSIT__STATIC; -int32_t LIZTROOPONTOILET = LIZTROOPONTOILET__STATIC; -int32_t LIZTROOPRUNNING = LIZTROOPRUNNING__STATIC; -int32_t LIZTROOPSHOOT = LIZTROOPSHOOT__STATIC; -int32_t LIZTROOPSTAYPUT = LIZTROOPSTAYPUT__STATIC; -int32_t LOADSCREEN = LOADSCREEN__STATIC; -int32_t LOCATORS = LOCATORS__STATIC; -int32_t LOCKSWITCH1 = LOCKSWITCH1__STATIC; -int32_t LOOGIE = LOOGIE__STATIC; -int32_t LUKE = LUKE__STATIC; -int32_t MAIL = MAIL__STATIC; -int32_t MAN = MAN__STATIC; -int32_t MAN2 = MAN2__STATIC; -int32_t MASKWALL1 = MASKWALL1__STATIC; -int32_t MASKWALL10 = MASKWALL10__STATIC; -int32_t MASKWALL11 = MASKWALL11__STATIC; -int32_t MASKWALL12 = MASKWALL12__STATIC; -int32_t MASKWALL13 = MASKWALL13__STATIC; -int32_t MASKWALL14 = MASKWALL14__STATIC; -int32_t MASKWALL15 = MASKWALL15__STATIC; -int32_t MASKWALL2 = MASKWALL2__STATIC; -int32_t MASKWALL3 = MASKWALL3__STATIC; -int32_t MASKWALL4 = MASKWALL4__STATIC; -int32_t MASKWALL5 = MASKWALL5__STATIC; -int32_t MASKWALL6 = MASKWALL6__STATIC; -int32_t MASKWALL7 = MASKWALL7__STATIC; -int32_t MASKWALL8 = MASKWALL8__STATIC; -int32_t MASKWALL9 = MASKWALL9__STATIC; -int32_t MASTERSWITCH = MASTERSWITCH__STATIC; -int32_t MENUBAR = MENUBAR__STATIC; -int32_t MENUSCREEN = MENUSCREEN__STATIC; -int32_t MIKE = MIKE__STATIC; -int32_t MINIFONT = MINIFONT__STATIC; -int32_t MIRROR = MIRROR__STATIC; -int32_t MIRRORBROKE = MIRRORBROKE__STATIC; -int32_t MONEY = MONEY__STATIC; -int32_t MONK = MONK__STATIC; -int32_t MOONSKY1 = MOONSKY1__STATIC; -int32_t MORTER = MORTER__STATIC; -int32_t MOVIECAMERA = MOVIECAMERA__STATIC; -int32_t MULTISWITCH = MULTISWITCH__STATIC; -int32_t MUSICANDSFX = MUSICANDSFX__STATIC; -int32_t NAKED1 = NAKED1__STATIC; -int32_t NATURALLIGHTNING = NATURALLIGHTNING__STATIC; -int32_t NEON1 = NEON1__STATIC; -int32_t NEON2 = NEON2__STATIC; -int32_t NEON3 = NEON3__STATIC; -int32_t NEON4 = NEON4__STATIC; -int32_t NEON5 = NEON5__STATIC; -int32_t NEON6 = NEON6__STATIC; -int32_t NEWBEAST = NEWBEAST__STATIC; -int32_t NEWBEASTSTAYPUT = NEWBEASTSTAYPUT__STATIC; -int32_t NUKEBARREL = NUKEBARREL__STATIC; -int32_t NUKEBARRELDENTED = NUKEBARRELDENTED__STATIC; -int32_t NUKEBARRELLEAKED = NUKEBARRELLEAKED__STATIC; -int32_t NUKEBUTTON = NUKEBUTTON__STATIC; -int32_t OCEANSPRITE1 = OCEANSPRITE1__STATIC; -int32_t OCEANSPRITE2 = OCEANSPRITE2__STATIC; -int32_t OCEANSPRITE3 = OCEANSPRITE3__STATIC; -int32_t OCEANSPRITE4 = OCEANSPRITE4__STATIC; -int32_t OCEANSPRITE5 = OCEANSPRITE5__STATIC; -int32_t OCTABRAIN = OCTABRAIN__STATIC; -int32_t OCTABRAINSTAYPUT = OCTABRAINSTAYPUT__STATIC; -int32_t OJ = OJ__STATIC; -int32_t OOZ = OOZ__STATIC; -int32_t OOZ2 = OOZ2__STATIC; -int32_t OOZFILTER = OOZFILTER__STATIC; -int32_t ORDERING = ORDERING__STATIC; -int32_t ORGANTIC = ORGANTIC__STATIC; -int32_t PANNEL1 = PANNEL1__STATIC; -int32_t PANNEL2 = PANNEL2__STATIC; -int32_t PANNEL3 = PANNEL3__STATIC; -int32_t PAPER = PAPER__STATIC; -int32_t PIGCOP = PIGCOP__STATIC; -int32_t PIGCOPDIVE = PIGCOPDIVE__STATIC; -int32_t PIGCOPSTAYPUT = PIGCOPSTAYPUT__STATIC; -int32_t PIPE1 = PIPE1__STATIC; -int32_t PIPE1B = PIPE1B__STATIC; -int32_t PIPE2 = PIPE2__STATIC; -int32_t PIPE2B = PIPE2B__STATIC; -int32_t PIPE3 = PIPE3__STATIC; -int32_t PIPE3B = PIPE3B__STATIC; -int32_t PIPE4 = PIPE4__STATIC; -int32_t PIPE4B = PIPE4B__STATIC; -int32_t PIPE5 = PIPE5__STATIC; -int32_t PIPE5B = PIPE5B__STATIC; -int32_t PIPE6 = PIPE6__STATIC; -int32_t PIPE6B = PIPE6B__STATIC; -int32_t PLAYERONWATER = PLAYERONWATER__STATIC; -int32_t PLUG = PLUG__STATIC; -int32_t PLUTOPAKSPRITE = PLUTOPAKSPRITE__STATIC; -int32_t POCKET = POCKET__STATIC; -int32_t PODFEM1 = PODFEM1__STATIC; -int32_t POT1 = POT1__STATIC; -int32_t POT2 = POT2__STATIC; -int32_t POT3 = POT3__STATIC; -int32_t POWERSWITCH1 = POWERSWITCH1__STATIC; -int32_t POWERSWITCH2 = POWERSWITCH2__STATIC; -int32_t PUKE = PUKE__STATIC; -int32_t PULLSWITCH = PULLSWITCH__STATIC; -int32_t PURPLELAVA = PURPLELAVA__STATIC; -int32_t QUEBALL = QUEBALL__STATIC; -int32_t RADIUSEXPLOSION = RADIUSEXPLOSION__STATIC; -int32_t RAT = RAT__STATIC; -int32_t REACTOR = REACTOR__STATIC; -int32_t REACTOR2 = REACTOR2__STATIC; -int32_t REACTOR2BURNT = REACTOR2BURNT__STATIC; -int32_t REACTOR2SPARK = REACTOR2SPARK__STATIC; -int32_t REACTORBURNT = REACTORBURNT__STATIC; -int32_t REACTORSPARK = REACTORSPARK__STATIC; -int32_t RECON = RECON__STATIC; -int32_t RESPAWN = RESPAWN__STATIC; -int32_t RESPAWNMARKERGREEN = RESPAWNMARKERGREEN__STATIC; -int32_t RESPAWNMARKERRED = RESPAWNMARKERRED__STATIC; -int32_t RESPAWNMARKERYELLOW = RESPAWNMARKERYELLOW__STATIC; -int32_t ROTATEGUN = ROTATEGUN__STATIC; -int32_t RPG = RPG__STATIC; -int32_t RPGAMMO = RPGAMMO__STATIC; -int32_t RPGGUN = RPGGUN__STATIC; -int32_t RPGSPRITE = RPGSPRITE__STATIC; -int32_t RUBBERCAN = RUBBERCAN__STATIC; -int32_t SATELITE = SATELITE__STATIC; -int32_t SCALE = SCALE__STATIC; -int32_t SCRAP1 = SCRAP1__STATIC; -int32_t SCRAP2 = SCRAP2__STATIC; -int32_t SCRAP3 = SCRAP3__STATIC; -int32_t SCRAP4 = SCRAP4__STATIC; -int32_t SCRAP5 = SCRAP5__STATIC; -int32_t SCRAP6 = SCRAP6__STATIC; -int32_t SCREENBREAK1 = SCREENBREAK1__STATIC; -int32_t SCREENBREAK10 = SCREENBREAK10__STATIC; -int32_t SCREENBREAK11 = SCREENBREAK11__STATIC; -int32_t SCREENBREAK12 = SCREENBREAK12__STATIC; -int32_t SCREENBREAK13 = SCREENBREAK13__STATIC; -int32_t SCREENBREAK14 = SCREENBREAK14__STATIC; -int32_t SCREENBREAK15 = SCREENBREAK15__STATIC; -int32_t SCREENBREAK16 = SCREENBREAK16__STATIC; -int32_t SCREENBREAK17 = SCREENBREAK17__STATIC; -int32_t SCREENBREAK18 = SCREENBREAK18__STATIC; -int32_t SCREENBREAK19 = SCREENBREAK19__STATIC; -int32_t SCREENBREAK2 = SCREENBREAK2__STATIC; -int32_t SCREENBREAK3 = SCREENBREAK3__STATIC; -int32_t SCREENBREAK4 = SCREENBREAK4__STATIC; -int32_t SCREENBREAK5 = SCREENBREAK5__STATIC; -int32_t SCREENBREAK6 = SCREENBREAK6__STATIC; -int32_t SCREENBREAK7 = SCREENBREAK7__STATIC; -int32_t SCREENBREAK8 = SCREENBREAK8__STATIC; -int32_t SCREENBREAK9 = SCREENBREAK9__STATIC; -int32_t SCUBAMASK = SCUBAMASK__STATIC; -int32_t SECTOREFFECTOR = SECTOREFFECTOR__STATIC; -int32_t SEENINE = SEENINE__STATIC; -int32_t SEENINEDEAD = SEENINEDEAD__STATIC; -int32_t SELECTDIR = SELECTDIR__STATIC; -int32_t SHARK = SHARK__STATIC; -int32_t SHELL = SHELL__STATIC; -int32_t SHIELD = SHIELD__STATIC; -int32_t SHOTGUN = SHOTGUN__STATIC; -int32_t SHOTGUNAMMO = SHOTGUNAMMO__STATIC; -int32_t SHOTGUNSHELL = SHOTGUNSHELL__STATIC; -int32_t SHOTGUNSPRITE = SHOTGUNSPRITE__STATIC; -int32_t SHOTSPARK1 = SHOTSPARK1__STATIC; -int32_t SHRINKER = SHRINKER__STATIC; -int32_t SHRINKEREXPLOSION = SHRINKEREXPLOSION__STATIC; -int32_t SHRINKERSPRITE = SHRINKERSPRITE__STATIC; -int32_t SHRINKSPARK = SHRINKSPARK__STATIC; -int32_t SIDEBOLT1 = SIDEBOLT1__STATIC; -int32_t SIGN1 = SIGN1__STATIC; -int32_t SIGN2 = SIGN2__STATIC; -int32_t SIXPAK = SIXPAK__STATIC; -int32_t SLIDEBAR = SLIDEBAR__STATIC; -int32_t SLOTDOOR = SLOTDOOR__STATIC; -int32_t SMALLFNTCURSOR = SMALLFNTCURSOR__STATIC; -int32_t SMALLSMOKE = SMALLSMOKE__STATIC; -int32_t SOLARPANNEL = SOLARPANNEL__STATIC; -int32_t SPACEDOORSWITCH = SPACEDOORSWITCH__STATIC; -int32_t SPACELIGHTSWITCH = SPACELIGHTSWITCH__STATIC; -int32_t SPACEMARINE = SPACEMARINE__STATIC; -int32_t SPEAKER = SPEAKER__STATIC; -int32_t SPINNINGNUKEICON = SPINNINGNUKEICON__STATIC; -int32_t SPIT = SPIT__STATIC; -int32_t SPOTLITE = SPOTLITE__STATIC; -int32_t STAINGLASS1 = STAINGLASS1__STATIC; -int32_t STALL = STALL__STATIC; -int32_t STALLBROKE = STALLBROKE__STATIC; -int32_t STARTALPHANUM = STARTALPHANUM__STATIC; -int32_t STATIC = STATIC__STATIC; -int32_t STATUE = STATUE__STATIC; -int32_t STATUEFLASH = STATUEFLASH__STATIC; -int32_t STEAM = STEAM__STATIC; -int32_t STEROIDS = STEROIDS__STATIC; -int32_t STEROIDS_ICON = STEROIDS_ICON__STATIC; -int32_t STRIPEBALL = STRIPEBALL__STATIC; -int32_t SUSHIPLATE1 = SUSHIPLATE1__STATIC; -int32_t SUSHIPLATE2 = SUSHIPLATE2__STATIC; -int32_t SUSHIPLATE3 = SUSHIPLATE3__STATIC; -int32_t SUSHIPLATE4 = SUSHIPLATE4__STATIC; -int32_t SUSHIPLATE5 = SUSHIPLATE5__STATIC; -int32_t TAMPON = TAMPON__STATIC; -int32_t TANK = TANK__STATIC; -int32_t TARGET = TARGET__STATIC; -int32_t TECHLIGHT2 = TECHLIGHT2__STATIC; -int32_t TECHLIGHT4 = TECHLIGHT4__STATIC; -int32_t TECHLIGHTBUST2 = TECHLIGHTBUST2__STATIC; -int32_t TECHLIGHTBUST4 = TECHLIGHTBUST4__STATIC; -int32_t TECHSWITCH = TECHSWITCH__STATIC; -int32_t TENSCREEN = TENSCREEN__STATIC; -int32_t TEXTBOX = TEXTBOX__STATIC; -int32_t TEXTSTORY = TEXTSTORY__STATIC; -int32_t THREEBYFIVE = THREEBYFIVE__STATIC; -int32_t THREEDEE = THREEDEE__STATIC; -int32_t TIP = TIP__STATIC; -int32_t TIRE = TIRE__STATIC; -int32_t TOILET = TOILET__STATIC; -int32_t TOILETBROKE = TOILETBROKE__STATIC; -int32_t TOILETWATER = TOILETWATER__STATIC; -int32_t TONGUE = TONGUE__STATIC; -int32_t TOUCHPLATE = TOUCHPLATE__STATIC; -int32_t TOUGHGAL = TOUGHGAL__STATIC; -int32_t TRANSPORTERBEAM = TRANSPORTERBEAM__STATIC; -int32_t TRANSPORTERSTAR = TRANSPORTERSTAR__STATIC; -int32_t TRASH = TRASH__STATIC; -int32_t TREE1 = TREE1__STATIC; -int32_t TREE2 = TREE2__STATIC; -int32_t TRIPBOMB = TRIPBOMB__STATIC; -int32_t TRIPBOMBSPRITE = TRIPBOMBSPRITE__STATIC; -int32_t TRIPODCAMERA = TRIPODCAMERA__STATIC; -int32_t VACUUM = VACUUM__STATIC; -int32_t VASE = VASE__STATIC; -int32_t VENDMACHINE = VENDMACHINE__STATIC; -int32_t VICTORY1 = VICTORY1__STATIC; -int32_t VIEWBORDER = VIEWBORDER__STATIC; -int32_t VIEWSCREEN = VIEWSCREEN__STATIC; -int32_t VIEWSCREEN2 = VIEWSCREEN2__STATIC; -int32_t W_FORCEFIELD = W_FORCEFIELD__STATIC; -int32_t W_HITTECHWALL1 = W_HITTECHWALL1__STATIC; -int32_t W_HITTECHWALL10 = W_HITTECHWALL10__STATIC; -int32_t W_HITTECHWALL15 = W_HITTECHWALL15__STATIC; -int32_t W_HITTECHWALL16 = W_HITTECHWALL16__STATIC; -int32_t W_HITTECHWALL2 = W_HITTECHWALL2__STATIC; -int32_t W_HITTECHWALL3 = W_HITTECHWALL3__STATIC; -int32_t W_HITTECHWALL4 = W_HITTECHWALL4__STATIC; -int32_t W_MILKSHELF = W_MILKSHELF__STATIC; -int32_t W_MILKSHELFBROKE = W_MILKSHELFBROKE__STATIC; -int32_t W_NUMBERS = W_NUMBERS__STATIC; -int32_t W_SCREENBREAK = W_SCREENBREAK__STATIC; -int32_t W_TECHWALL1 = W_TECHWALL1__STATIC; -int32_t W_TECHWALL10 = W_TECHWALL10__STATIC; -int32_t W_TECHWALL11 = W_TECHWALL11__STATIC; -int32_t W_TECHWALL12 = W_TECHWALL12__STATIC; -int32_t W_TECHWALL13 = W_TECHWALL13__STATIC; -int32_t W_TECHWALL14 = W_TECHWALL14__STATIC; -int32_t W_TECHWALL15 = W_TECHWALL15__STATIC; -int32_t W_TECHWALL16 = W_TECHWALL16__STATIC; -int32_t W_TECHWALL2 = W_TECHWALL2__STATIC; -int32_t W_TECHWALL3 = W_TECHWALL3__STATIC; -int32_t W_TECHWALL4 = W_TECHWALL4__STATIC; -int32_t W_TECHWALL5 = W_TECHWALL5__STATIC; -int32_t W_TECHWALL6 = W_TECHWALL6__STATIC; -int32_t W_TECHWALL7 = W_TECHWALL7__STATIC; -int32_t W_TECHWALL8 = W_TECHWALL8__STATIC; -int32_t W_TECHWALL9 = W_TECHWALL9__STATIC; -int32_t WAITTOBESEATED = WAITTOBESEATED__STATIC; -int32_t WALLBLOOD1 = WALLBLOOD1__STATIC; -int32_t WALLBLOOD2 = WALLBLOOD2__STATIC; -int32_t WALLBLOOD3 = WALLBLOOD3__STATIC; -int32_t WALLBLOOD4 = WALLBLOOD4__STATIC; -int32_t WALLBLOOD5 = WALLBLOOD5__STATIC; -int32_t WALLBLOOD7 = WALLBLOOD7__STATIC; -int32_t WALLBLOOD8 = WALLBLOOD8__STATIC; -int32_t WALLLIGHT1 = WALLLIGHT1__STATIC; -int32_t WALLLIGHT2 = WALLLIGHT2__STATIC; -int32_t WALLLIGHT3 = WALLLIGHT3__STATIC; -int32_t WALLLIGHT4 = WALLLIGHT4__STATIC; -int32_t WALLLIGHTBUST1 = WALLLIGHTBUST1__STATIC; -int32_t WALLLIGHTBUST2 = WALLLIGHTBUST2__STATIC; -int32_t WALLLIGHTBUST3 = WALLLIGHTBUST3__STATIC; -int32_t WALLLIGHTBUST4 = WALLLIGHTBUST4__STATIC; -int32_t WATERBUBBLE = WATERBUBBLE__STATIC; -int32_t WATERBUBBLEMAKER = WATERBUBBLEMAKER__STATIC; -int32_t WATERDRIP = WATERDRIP__STATIC; -int32_t WATERDRIPSPLASH = WATERDRIPSPLASH__STATIC; -int32_t WATERFOUNTAIN = WATERFOUNTAIN__STATIC; -int32_t WATERFOUNTAINBROKE = WATERFOUNTAINBROKE__STATIC; -int32_t WATERSPLASH2 = WATERSPLASH2__STATIC; -int32_t WATERTILE2 = WATERTILE2__STATIC; -int32_t WEATHERWARN = WEATHERWARN__STATIC; -int32_t WINDOWBORDER1 = WINDOWBORDER1__STATIC; -int32_t WINDOWBORDER2 = WINDOWBORDER2__STATIC; -int32_t WOMAN = WOMAN__STATIC; -int32_t WOODENHORSE = WOODENHORSE__STATIC; -int32_t XXXSTACY = XXXSTACY__STATIC; - -static hashtable_t h_names = {512, NULL}; - -void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue) -{ - if ((unsigned)lValue >= MAXTILES || !szLabel) - return; - - int const i = hash_find(&h_names,szLabel); - - if (i>=0) - { - struct dynitem *di = &g_dynTileList[i]; - *di->dynvalptr = lValue; - } -} - -void inithashnames(void) -{ - hash_init(&h_names); - - for (int i=0; i < ARRAY_SSIZE(g_dynTileList); i++) - hash_add(&h_names, g_dynTileList[i].str, i, 0); -} - -void freehashnames(void) -{ - hash_free(&h_names); -} - -// This is run after all CON define's have been processed to set up the -// dynamic->static tile mapping. -void G_InitDynamicTiles(void) -{ - Bmemset(DynamicTileMap, 0, sizeof(DynamicTileMap)); - - for (auto & i : g_dynTileList) - { - DynamicTileMap[*(i.dynvalptr)] = i.staticval; - NameToTileIndex.Insert(i.str, *(i.dynvalptr)); - } - - g_blimpSpawnItems[0] = RPGSPRITE; - g_blimpSpawnItems[1] = CHAINGUNSPRITE; - g_blimpSpawnItems[2] = DEVISTATORAMMO; - g_blimpSpawnItems[3] = RPGAMMO; - g_blimpSpawnItems[4] = RPGAMMO; - g_blimpSpawnItems[5] = JETPACK; - g_blimpSpawnItems[6] = SHIELD; - g_blimpSpawnItems[7] = FIRSTAID; - g_blimpSpawnItems[8] = STEROIDS; - g_blimpSpawnItems[9] = RPGAMMO; - g_blimpSpawnItems[10] = RPGAMMO; - g_blimpSpawnItems[11] = RPGSPRITE; - g_blimpSpawnItems[12] = RPGAMMO; - g_blimpSpawnItems[13] = FREEZESPRITE; - g_blimpSpawnItems[14] = FREEZEAMMO; - - WeaponPickupSprites[0] = KNEE; - WeaponPickupSprites[1] = FIRSTGUNSPRITE; - WeaponPickupSprites[2] = SHOTGUNSPRITE; - WeaponPickupSprites[3] = CHAINGUNSPRITE; - WeaponPickupSprites[4] = RPGSPRITE; - WeaponPickupSprites[5] = HEAVYHBOMB; - WeaponPickupSprites[6] = SHRINKERSPRITE; - WeaponPickupSprites[7] = DEVISTATORSPRITE; - WeaponPickupSprites[8] = TRIPBOMBSPRITE; - WeaponPickupSprites[9] = FREEZESPRITE; - WeaponPickupSprites[10] = HEAVYHBOMB; - WeaponPickupSprites[11] = SHRINKERSPRITE; -} -END_DUKE_NS diff --git a/source/duke3d/src/namesdyn.h b/source/duke3d/src/namesdyn.h deleted file mode 100644 index 6b5dcfe24..000000000 --- a/source/duke3d/src/namesdyn.h +++ /dev/null @@ -1,1238 +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. -*/ -//------------------------------------------------------------------------- - -#ifndef namesdyn_h__ -#define namesdyn_h__ - -BEGIN_DUKE_NS - - -#define SECTOREFFECTOR__STATIC 1 -#define ACTIVATOR__STATIC 2 -#define TOUCHPLATE__STATIC 3 -#define ACTIVATORLOCKED__STATIC 4 -#define MUSICANDSFX__STATIC 5 -#define LOCATORS__STATIC 6 -#define CYCLER__STATIC 7 -#define MASTERSWITCH__STATIC 8 -#define RESPAWN__STATIC 9 -#define GPSPEED__STATIC 10 -#define FOF__STATIC 13 -#define ARROW__STATIC 20 -#define FIRSTGUNSPRITE__STATIC 21 -#define CHAINGUNSPRITE__STATIC 22 -#define RPGSPRITE__STATIC 23 -#define FREEZESPRITE__STATIC 24 -#define SHRINKERSPRITE__STATIC 25 -#define HEAVYHBOMB__STATIC 26 -#define TRIPBOMBSPRITE__STATIC 27 -#define SHOTGUNSPRITE__STATIC 28 -#define DEVISTATORSPRITE__STATIC 29 -#define HEALTHBOX__STATIC 30 -#define AMMOBOX__STATIC 31 -#define GROWSPRITEICON__STATIC 32 -#define INVENTORYBOX__STATIC 33 -#define FREEZEAMMO__STATIC 37 -#define AMMO__STATIC 40 -#define BATTERYAMMO__STATIC 41 -#define DEVISTATORAMMO__STATIC 42 -#define RPGAMMO__STATIC 44 -#define GROWAMMO__STATIC 45 -#define CRYSTALAMMO__STATIC 46 -#define HBOMBAMMO__STATIC 47 -#define AMMOLOTS__STATIC 48 -#define SHOTGUNAMMO__STATIC 49 -#define COLA__STATIC 51 -#define SIXPAK__STATIC 52 -#define FIRSTAID__STATIC 53 -#define SHIELD__STATIC 54 -#define STEROIDS__STATIC 55 -#define AIRTANK__STATIC 56 -#define JETPACK__STATIC 57 -#define HEATSENSOR__STATIC 59 -#define ACCESSCARD__STATIC 60 -#define BOOTS__STATIC 61 -#define MIRRORBROKE__STATIC 70 -#define CLOUDYOCEAN__STATIC 78 -#define CLOUDYSKIES__STATIC 79 -#define MOONSKY1__STATIC 80 -#define BIGORBIT1__STATIC 84 -#define LA__STATIC 89 -#define ATOMICHEALTH__STATIC 100 -#define TECHLIGHT2__STATIC 120 -#define TECHLIGHTBUST2__STATIC 121 -#define TECHLIGHT4__STATIC 122 -#define TECHLIGHTBUST4__STATIC 123 -#define WALLLIGHT4__STATIC 124 -#define WALLLIGHTBUST4__STATIC 125 -#define ACCESSSWITCH__STATIC 130 -#define SLOTDOOR__STATIC 132 -#define LIGHTSWITCH__STATIC 134 -#define SPACEDOORSWITCH__STATIC 136 -#define SPACELIGHTSWITCH__STATIC 138 -#define FRANKENSTINESWITCH__STATIC 140 -#define NUKEBUTTON__STATIC 142 -#define MULTISWITCH__STATIC 146 -#define DOORTILE5__STATIC 150 -#define DOORTILE6__STATIC 151 -#define DOORTILE1__STATIC 152 -#define DOORTILE2__STATIC 153 -#define DOORTILE3__STATIC 154 -#define DOORTILE4__STATIC 155 -#define DOORTILE7__STATIC 156 -#define DOORTILE8__STATIC 157 -#define DOORTILE9__STATIC 158 -#define DOORTILE10__STATIC 159 -#define DOORSHOCK__STATIC 160 -#define DIPSWITCH__STATIC 162 -#define DIPSWITCH2__STATIC 164 -#define TECHSWITCH__STATIC 166 -#define DIPSWITCH3__STATIC 168 -#define ACCESSSWITCH2__STATIC 170 -#define FLOORSLIME__STATIC 200 -#define BIGFORCE__STATIC 230 -#define MASKWALL9__STATIC 255 -#define SCREENBREAK1__STATIC 263 -#define SCREENBREAK2__STATIC 264 -#define SCREENBREAK3__STATIC 265 -#define SCREENBREAK4__STATIC 266 -#define SCREENBREAK5__STATIC 267 -#define SCREENBREAK6__STATIC 268 -#define SCREENBREAK7__STATIC 269 -#define SCREENBREAK8__STATIC 270 -#define SCREENBREAK9__STATIC 271 -#define SCREENBREAK10__STATIC 272 -#define SCREENBREAK11__STATIC 273 -#define SCREENBREAK12__STATIC 274 -#define SCREENBREAK13__STATIC 275 -#define MASKWALL1__STATIC 285 -#define W_TECHWALL1__STATIC 293 -#define W_TECHWALL2__STATIC 297 -#define W_TECHWALL15__STATIC 299 -#define W_TECHWALL3__STATIC 301 -#define W_TECHWALL4__STATIC 305 -#define W_TECHWALL10__STATIC 306 -#define W_TECHWALL16__STATIC 307 -#define WATERTILE2__STATIC 336 -#define BPANNEL1__STATIC 341 -#define PANNEL1__STATIC 342 -#define PANNEL2__STATIC 343 -#define STATIC__STATIC 351 -#define W_SCREENBREAK__STATIC 357 -#define W_HITTECHWALL3__STATIC 360 -#define W_HITTECHWALL4__STATIC 361 -#define W_HITTECHWALL2__STATIC 362 -#define W_HITTECHWALL1__STATIC 363 -#define MASKWALL10__STATIC 387 -#define MASKWALL11__STATIC 391 -#define DOORTILE22__STATIC 395 -#define FANSPRITE__STATIC 407 -#define FANSPRITEBROKE__STATIC 411 -#define FANSHADOW__STATIC 412 -#define FANSHADOWBROKE__STATIC 416 -#define DOORTILE18__STATIC 447 -#define DOORTILE19__STATIC 448 -#define DOORTILE20__STATIC 449 -#define VIEWSCREEN2__STATIC 499 -#define VIEWSCREEN__STATIC 502 -#define GLASS__STATIC 503 -#define GLASS2__STATIC 504 -#define STAINGLASS1__STATIC 510 -#define MASKWALL5__STATIC 514 -#define SATELITE__STATIC 516 -#define FUELPOD__STATIC 517 -#define CRACK1__STATIC 546 -#define CRACK2__STATIC 547 -#define CRACK3__STATIC 548 -#define CRACK4__STATIC 549 -#define FOOTPRINTS__STATIC 550 -#define DOMELITE__STATIC 551 -#define CAMERAPOLE__STATIC 554 -#define CHAIR1__STATIC 556 -#define CHAIR2__STATIC 557 -#define BROKENCHAIR__STATIC 559 -#define MIRROR__STATIC 560 -#define WATERFOUNTAIN__STATIC 563 -#define WATERFOUNTAINBROKE__STATIC 567 -#define FEMMAG1__STATIC 568 -#define TOILET__STATIC 569 -#define STALL__STATIC 571 -#define STALLBROKE__STATIC 573 -#define FEMMAG2__STATIC 577 -#define REACTOR2__STATIC 578 -#define REACTOR2BURNT__STATIC 579 -#define REACTOR2SPARK__STATIC 580 -#define GRATE1__STATIC 595 -#define BGRATE1__STATIC 596 -#define SOLARPANNEL__STATIC 602 -#define NAKED1__STATIC 603 -#define ANTENNA__STATIC 607 -#define MASKWALL12__STATIC 609 -#define TOILETBROKE__STATIC 615 -#define PIPE2__STATIC 616 -#define PIPE1B__STATIC 617 -#define PIPE3__STATIC 618 -#define PIPE1__STATIC 619 -#define CAMERA1__STATIC 621 -#define PIPE2B__STATIC 633 -#define BOLT1__STATIC 634 -#define W_NUMBERS__STATIC 640 -#define WATERDRIP__STATIC 660 -#define WATERBUBBLE__STATIC 661 -#define WATERBUBBLEMAKER__STATIC 662 -#define W_FORCEFIELD__STATIC 663 -#define VACUUM__STATIC 669 -#define FOOTPRINTS2__STATIC 672 -#define FOOTPRINTS3__STATIC 673 -#define FOOTPRINTS4__STATIC 674 -#define EGG__STATIC 675 -#define SCALE__STATIC 678 -#define CHAIR3__STATIC 680 -#define CAMERALIGHT__STATIC 685 -#define MOVIECAMERA__STATIC 686 -#define IVUNIT__STATIC 689 -#define POT1__STATIC 694 -#define POT2__STATIC 695 -#define POT3__STATIC 697 -#define PIPE3B__STATIC 700 -#define WALLLIGHT3__STATIC 701 -#define WALLLIGHTBUST3__STATIC 702 -#define WALLLIGHT1__STATIC 703 -#define WALLLIGHTBUST1__STATIC 704 -#define WALLLIGHT2__STATIC 705 -#define WALLLIGHTBUST2__STATIC 706 -#define LIGHTSWITCH2__STATIC 712 -#define WAITTOBESEATED__STATIC 716 -#define DOORTILE14__STATIC 717 -#define STATUE__STATIC 753 -#define MIKE__STATIC 762 -#define VASE__STATIC 765 -#define SUSHIPLATE1__STATIC 768 -#define SUSHIPLATE2__STATIC 769 -#define SUSHIPLATE3__STATIC 774 -#define SUSHIPLATE4__STATIC 779 -#define DOORTILE16__STATIC 781 -#define SUSHIPLATE5__STATIC 792 -#define OJ__STATIC 806 -#define MASKWALL13__STATIC 830 -#define HURTRAIL__STATIC 859 -#define POWERSWITCH1__STATIC 860 -#define LOCKSWITCH1__STATIC 862 -#define POWERSWITCH2__STATIC 864 -#define ATM__STATIC 867 -#define STATUEFLASH__STATIC 869 -#define ATMBROKE__STATIC 888 -#define STRIPEBALL__STATIC 901 -#define QUEBALL__STATIC 902 -#define POCKET__STATIC 903 -#define WOODENHORSE__STATIC 904 -#define TREE1__STATIC 908 -#define TREE2__STATIC 910 -#define CACTUS__STATIC 911 -#define MASKWALL2__STATIC 913 -#define MASKWALL3__STATIC 914 -#define MASKWALL4__STATIC 915 -#define FIREEXT__STATIC 916 -#define TOILETWATER__STATIC 921 -#define NEON1__STATIC 925 -#define NEON2__STATIC 926 -#define CACTUSBROKE__STATIC 939 -#define BOUNCEMINE__STATIC 940 -#define BROKEFIREHYDRENT__STATIC 950 -#define BOX__STATIC 951 -#define BULLETHOLE__STATIC 952 -#define BOTTLE1__STATIC 954 -#define BOTTLE2__STATIC 955 -#define BOTTLE3__STATIC 956 -#define BOTTLE4__STATIC 957 -#define FEMPIC5__STATIC 963 -#define FEMPIC6__STATIC 964 -#define FEMPIC7__STATIC 965 -#define HYDROPLANT__STATIC 969 -#define OCEANSPRITE1__STATIC 971 -#define OCEANSPRITE2__STATIC 972 -#define OCEANSPRITE3__STATIC 973 -#define OCEANSPRITE4__STATIC 974 -#define OCEANSPRITE5__STATIC 975 -#define GENERICPOLE__STATIC 977 -#define CONE__STATIC 978 -#define HANGLIGHT__STATIC 979 -#define HYDRENT__STATIC 981 -#define MASKWALL14__STATIC 988 -#define TIRE__STATIC 990 -#define PIPE5__STATIC 994 -#define PIPE6__STATIC 995 -#define PIPE4__STATIC 996 -#define PIPE4B__STATIC 997 -#define BROKEHYDROPLANT__STATIC 1003 -#define PIPE5B__STATIC 1005 -#define NEON3__STATIC 1007 -#define NEON4__STATIC 1008 -#define NEON5__STATIC 1009 -#define BOTTLE5__STATIC 1012 -#define BOTTLE6__STATIC 1013 -#define BOTTLE8__STATIC 1014 -#define SPOTLITE__STATIC 1020 -#define MASKWALL15__STATIC 1024 -#define BOTTLE7__STATIC 1025 -#define HORSEONSIDE__STATIC 1026 -#define GLASSPIECES__STATIC 1031 -#define NEON6__STATIC 1046 -#define MASKWALL6__STATIC 1059 -#define RUBBERCAN__STATIC 1062 -#define PLUG__STATIC 1069 -#define OOZFILTER__STATIC 1079 -#define FLOORPLASMA__STATIC 1082 -#define REACTOR__STATIC 1088 -#define REACTORSPARK__STATIC 1092 -#define REACTORBURNT__STATIC 1096 -#define DOORTILE15__STATIC 1102 -#define HANDSWITCH__STATIC 1111 -#define CIRCLEPANNEL__STATIC 1113 -#define CIRCLEPANNELBROKE__STATIC 1114 -#define PULLSWITCH__STATIC 1122 -#define MASKWALL8__STATIC 1124 -#define BIGHOLE__STATIC 1141 -#define ALIENSWITCH__STATIC 1142 -#define DOORTILE21__STATIC 1144 -#define HANDPRINTSWITCH__STATIC 1155 -#define BOTTLE10__STATIC 1157 -#define BOTTLE11__STATIC 1158 -#define BOTTLE12__STATIC 1159 -#define BOTTLE13__STATIC 1160 -#define BOTTLE14__STATIC 1161 -#define BOTTLE15__STATIC 1162 -#define BOTTLE16__STATIC 1163 -#define BOTTLE17__STATIC 1164 -#define BOTTLE18__STATIC 1165 -#define BOTTLE19__STATIC 1166 -#define DOORTILE17__STATIC 1169 -#define MASKWALL7__STATIC 1174 -#define DOORTILE11__STATIC 1178 -#define DOORTILE12__STATIC 1179 -#define VENDMACHINE__STATIC 1212 -#define COLAMACHINE__STATIC 1215 -#define CRANEPOLE__STATIC 1221 -#define CRANE__STATIC 1222 -#define BARBROKE__STATIC 1225 -#define BLOODPOOL__STATIC 1226 -#define NUKEBARREL__STATIC 1227 -#define NUKEBARRELDENTED__STATIC 1228 -#define NUKEBARRELLEAKED__STATIC 1229 -#define CANWITHSOMETHING__STATIC 1232 -#define MONEY__STATIC 1233 -#define BANNER__STATIC 1236 -#define EXPLODINGBARREL__STATIC 1238 -#define EXPLODINGBARREL2__STATIC 1239 -#define FIREBARREL__STATIC 1240 -#define SEENINE__STATIC 1247 -#define SEENINEDEAD__STATIC 1248 -#define STEAM__STATIC 1250 -#define CEILINGSTEAM__STATIC 1255 -#define PIPE6B__STATIC 1260 -#define TRANSPORTERBEAM__STATIC 1261 -#define RAT__STATIC 1267 -#define TRASH__STATIC 1272 -#define FEMPIC1__STATIC 1280 -#define FEMPIC2__STATIC 1289 -#define BLANKSCREEN__STATIC 1293 -#define PODFEM1__STATIC 1294 -#define FEMPIC3__STATIC 1298 -#define FEMPIC4__STATIC 1306 -#define FEM1__STATIC 1312 -#define FEM2__STATIC 1317 -#define FEM3__STATIC 1321 -#define FEM5__STATIC 1323 -#define BLOODYPOLE__STATIC 1324 -#define FEM4__STATIC 1325 -#define FEM6__STATIC 1334 -#define FEM6PAD__STATIC 1335 -#define FEM8__STATIC 1336 -#define HELECOPT__STATIC 1346 -#define FETUSJIB__STATIC 1347 -#define HOLODUKE__STATIC 1348 -#define SPACEMARINE__STATIC 1353 -#define INDY__STATIC 1355 -#define FETUS__STATIC 1358 -#define FETUSBROKE__STATIC 1359 -#define MONK__STATIC 1352 -#define LUKE__STATIC 1354 -#define COOLEXPLOSION1__STATIC 1360 -#define WATERSPLASH2__STATIC 1380 -#define FIREVASE__STATIC 1390 -#define FEM7__STATIC 1395 -#define APLAYERTOP__STATIC 1400 -#define APLAYER__STATIC 1405 -#define PLAYERONWATER__STATIC 1420 -#define DUKELYINGDEAD__STATIC 1518 -#define DUKETORSO__STATIC 1520 -#define DUKEGUN__STATIC 1528 -#define DUKELEG__STATIC 1536 -#define SHARK__STATIC 1550 -#define BLOOD__STATIC 1620 -#define FIRELASER__STATIC 1625 -#define TRANSPORTERSTAR__STATIC 1630 -#define SPIT__STATIC 1636 -#define LOOGIE__STATIC 1637 -#define FIST__STATIC 1640 -#define FREEZEBLAST__STATIC 1641 -#define SHRINKSPARK__STATIC 1646 -#define TONGUE__STATIC 1647 -#define MORTER__STATIC 1650 -#define SHRINKEREXPLOSION__STATIC 1656 -#define RADIUSEXPLOSION__STATIC 1670 -#define FORCERIPPLE__STATIC 1671 -#define LIZTROOP__STATIC 1680 -#define LIZTROOPRUNNING__STATIC 1681 -#define LIZTROOPSTAYPUT__STATIC 1682 -#define LIZTROOPSHOOT__STATIC 1715 -#define LIZTROOPJETPACK__STATIC 1725 -#define LIZTROOPONTOILET__STATIC 1741 -#define LIZTROOPJUSTSIT__STATIC 1742 -#define LIZTROOPDUCKING__STATIC 1744 -#define HEADJIB1__STATIC 1768 -#define ARMJIB1__STATIC 1772 -#define LEGJIB1__STATIC 1776 -#define OCTABRAIN__STATIC 1820 -#define OCTABRAINSTAYPUT__STATIC 1821 -#define INNERJAW__STATIC 1860 -#define DRONE__STATIC 1880 -#define EXPLOSION2__STATIC 1890 -#define COMMANDER__STATIC 1920 -#define COMMANDERSTAYPUT__STATIC 1921 -#define RECON__STATIC 1960 -#define TANK__STATIC 1975 -#define PIGCOP__STATIC 2000 -#define PIGCOPSTAYPUT__STATIC 2001 -#define PIGCOPDIVE__STATIC 2045 -#define LIZMAN__STATIC 2120 -#define LIZMANSTAYPUT__STATIC 2121 -#define LIZMANSPITTING__STATIC 2150 -#define LIZMANFEEDING__STATIC 2160 -#define LIZMANJUMP__STATIC 2165 -#define FECES__STATIC 2200 -#define LIZMANHEAD1__STATIC 2201 -#define LIZMANARM1__STATIC 2205 -#define LIZMANLEG1__STATIC 2209 -#define EXPLOSION2BOT__STATIC 2219 -#define JIBS1__STATIC 2245 -#define JIBS2__STATIC 2250 -#define JIBS3__STATIC 2255 -#define JIBS4__STATIC 2260 -#define JIBS5__STATIC 2265 -#define BURNING__STATIC 2270 -#define FIRE__STATIC 2271 -#define JIBS6__STATIC 2286 -#define BLOODSPLAT1__STATIC 2296 -#define BLOODSPLAT3__STATIC 2297 -#define BLOODSPLAT2__STATIC 2298 -#define BLOODSPLAT4__STATIC 2299 -#define OOZ__STATIC 2300 -#define OOZ2__STATIC 2309 -#define WALLBLOOD1__STATIC 2301 -#define WALLBLOOD2__STATIC 2302 -#define WALLBLOOD3__STATIC 2303 -#define WALLBLOOD4__STATIC 2304 -#define WALLBLOOD5__STATIC 2305 -#define WALLBLOOD7__STATIC 2307 -#define WALLBLOOD8__STATIC 2308 -#define BURNING2__STATIC 2310 -#define FIRE2__STATIC 2311 -#define CRACKKNUCKLES__STATIC 2324 -#define SMALLSMOKE__STATIC 2329 -#define FLOORFLAME__STATIC 2333 -#define ROTATEGUN__STATIC 2360 -#define GREENSLIME__STATIC 2370 -#define WATERDRIPSPLASH__STATIC 2380 -#define SCRAP6__STATIC 2390 -#define SCRAP1__STATIC 2400 -#define SCRAP2__STATIC 2404 -#define SCRAP3__STATIC 2408 -#define SCRAP4__STATIC 2412 -#define SCRAP5__STATIC 2416 -#define ORGANTIC__STATIC 2420 -#define BETAVERSION__STATIC 2440 -#define SELECTDIR__STATIC 2444 -#define F1HELP__STATIC 2445 -#define GROWSPARK__STATIC 2448 -#define MENUSCREEN__STATIC 2456 -#define MENUBAR__STATIC 2457 -#define KILLSICON__STATIC 2458 -#define FIRSTAID_ICON__STATIC 2460 -#define HEAT_ICON__STATIC 2461 -#define BOTTOMSTATUSBAR__STATIC 2462 -#define BOOT_ICON__STATIC 2463 -#define FRAGBAR__STATIC 2465 -#define JETPACK_ICON__STATIC 2467 -#define AIRTANK_ICON__STATIC 2468 -#define STEROIDS_ICON__STATIC 2469 -#define HOLODUKE_ICON__STATIC 2470 -#define ACCESS_ICON__STATIC 2471 -#define DIGITALNUM__STATIC 2472 -#define DUKECAR__STATIC 2491 -#define CAMCORNER__STATIC 2482 -#define CAMLIGHT__STATIC 2484 -#define SLIDEBAR__STATIC 2489 -#define DREALMS__STATIC 2492 -#define BETASCREEN__STATIC 2493 -#define WINDOWBORDER1__STATIC 2494 -#define TEXTBOX__STATIC 2495 -#define WINDOWBORDER2__STATIC 2496 -#define DUKENUKEM__STATIC 2497 -#define THREEDEE__STATIC 2498 -#define INGAMEDUKETHREEDEE__STATIC 2499 -#define TENSCREEN__STATIC 2500 -#define PLUTOPAKSPRITE__STATIC 2501 -#define CREDITSTEXT1__STATIC 2504 -#define CREDITSTEXT2__STATIC 2505 -#define CREDITSTEXT3__STATIC 2506 -#define DEVISTATOR__STATIC 2510 -#define KNEE__STATIC 2521 -#define CROSSHAIR__STATIC 2523 -#define FIRSTGUN__STATIC 2524 -#define FIRSTGUNRELOAD__STATIC 2528 -#define SHELL__STATIC 2533 -#define SHOTGUNSHELL__STATIC 2535 -#define CHAINGUN__STATIC 2536 -#define RPGGUN__STATIC 2544 -#define FREEZE__STATIC 2548 -#define SHRINKER__STATIC 2556 -#define HANDHOLDINGLASER__STATIC 2563 -#define TRIPBOMB__STATIC 2566 -#define LASERLINE__STATIC 2567 -#define HANDHOLDINGACCESS__STATIC 2568 -#define HANDREMOTE__STATIC 2570 -#define HANDTHROW__STATIC 2573 -#define TIP__STATIC 2576 -#define SCUBAMASK__STATIC 2581 -#define FORCESPHERE__STATIC 2590 -#define SHOTSPARK1__STATIC 2595 -#define RPG__STATIC 2605 -#define LASERSITE__STATIC 2612 -#define SHOTGUN__STATIC 2613 -#define BOSS1__STATIC 2630 -#define BOSS1STAYPUT__STATIC 2631 -#define BOSS1SHOOT__STATIC 2660 -#define BOSS1LOB__STATIC 2670 -#define BOSSTOP__STATIC 2696 -#define BOSS2__STATIC 2710 -#define BOSS3__STATIC 2760 -#define SPINNINGNUKEICON__STATIC 2813 -#define SMALLFNTCURSOR__STATIC 2821 -#define STARTALPHANUM__STATIC 2822 -#define ENDALPHANUM__STATIC 2915 -#define BIGALPHANUM__STATIC 2940 -#define BIGPERIOD__STATIC 3002 -#define BIGCOMMA__STATIC 3003 -#define BIGX__STATIC 3004 -#define BIGQ__STATIC 3005 -#define BIGSEMI__STATIC 3006 -#define BIGCOLIN__STATIC 3007 -#define THREEBYFIVE__STATIC 3010 -#define BIGAPPOS__STATIC 3022 -#define MINIFONT__STATIC 3072 -#define RESPAWNMARKERRED__STATIC 3190 -#define RESPAWNMARKERYELLOW__STATIC 3200 -#define RESPAWNMARKERGREEN__STATIC 3210 -#define BONUSSCREEN__STATIC 3240 -#define VIEWBORDER__STATIC 3250 -#define VICTORY1__STATIC 3260 -#define ORDERING__STATIC 3270 -#define TEXTSTORY__STATIC 3280 -#define LOADSCREEN__STATIC 3281 -#define BORNTOBEWILDSCREEN__STATIC 3370 -#define BLIMP__STATIC 3400 -#define FEM9__STATIC 3450 -#define FRAMEEFFECT1_13__STATIC 3999 -#define FRAMEEFFECT1__STATIC 4095 -#define PANNEL3__STATIC 4099 -#define SCREENBREAK14__STATIC 4120 -#define SCREENBREAK15__STATIC 4123 -#define SCREENBREAK19__STATIC 4125 -#define SCREENBREAK16__STATIC 4127 -#define SCREENBREAK17__STATIC 4128 -#define SCREENBREAK18__STATIC 4129 -#define W_TECHWALL11__STATIC 4130 -#define W_TECHWALL12__STATIC 4131 -#define W_TECHWALL13__STATIC 4132 -#define W_TECHWALL14__STATIC 4133 -#define W_TECHWALL5__STATIC 4134 -#define W_TECHWALL6__STATIC 4136 -#define W_TECHWALL7__STATIC 4138 -#define W_TECHWALL8__STATIC 4140 -#define W_TECHWALL9__STATIC 4142 -#define BPANNEL3__STATIC 4100 -#define W_HITTECHWALL16__STATIC 4144 -#define W_HITTECHWALL10__STATIC 4145 -#define W_HITTECHWALL15__STATIC 4147 -#define W_MILKSHELF__STATIC 4181 -#define W_MILKSHELFBROKE__STATIC 4203 -#define PURPLELAVA__STATIC 4240 -#define TARGET__STATIC 4359 -#define DUCK__STATIC 4361 -#define PUKE__STATIC 4389 -#define DOORTILE23__STATIC 4391 -#define SPEAKER__STATIC 4397 -#define MAIL__STATIC 4410 -#define HOTMEAT__STATIC 4427 -#define TRIPODCAMERA__STATIC 4444 -#define PAPER__STATIC 4460 -#define GENERICPOLE2__STATIC 4465 -#define XXXSTACY__STATIC 4470 -#define LETTER__STATIC 4502 -#define SIDEBOLT1__STATIC 4525 -#define FOODOBJECT16__STATIC 4545 -#define TAMPON__STATIC 4557 -#define CANWITHSOMETHING2__STATIC 4580 -#define CANWITHSOMETHING3__STATIC 4581 -#define CANWITHSOMETHING4__STATIC 4582 -#define DOLPHIN1__STATIC 4591 -#define DOLPHIN2__STATIC 4592 -#define NEWBEAST__STATIC 4610 -#define NEWBEASTSTAYPUT__STATIC 4611 -#define BOSS4__STATIC 4740 -#define BOSS4STAYPUT__STATIC 4741 -#define FEM10__STATIC 4864 -#define TOUGHGAL__STATIC 4866 -#define MAN__STATIC 4871 -#define MAN2__STATIC 4872 -#define WOMAN__STATIC 4874 -#define NATURALLIGHTNING__STATIC 4890 -#define WEATHERWARN__STATIC 4893 -#define DUKETAG__STATIC 4900 -#define SIGN1__STATIC 4909 -#define SIGN2__STATIC 4912 -#define JURYGUY__STATIC 4943 - -extern int16_t DynamicTileMap[MAXTILES]; - -void G_InitDynamicTiles(void); - -void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue); - -#if !defined LUNATIC -void inithashnames(void); -void freehashnames(void); -#endif - -extern int32_t ACCESS_ICON; -extern int32_t ACCESSCARD; -extern int32_t ACCESSSWITCH; -extern int32_t ACCESSSWITCH2; -extern int32_t ACTIVATOR; -extern int32_t ACTIVATORLOCKED; -extern int32_t AIRTANK; -extern int32_t AIRTANK_ICON; -extern int32_t ALIENSWITCH; -extern int32_t AMMO; -extern int32_t AMMOBOX; -extern int32_t AMMOLOTS; -extern int32_t ANTENNA; -extern int32_t APLAYER; -extern int32_t APLAYERTOP; -extern int32_t ARMJIB1; -extern int32_t ARROW; -extern int32_t ATM; -extern int32_t ATMBROKE; -extern int32_t ATOMICHEALTH; -extern int32_t BANNER; -extern int32_t BARBROKE; -extern int32_t BATTERYAMMO; -extern int32_t BETASCREEN; -extern int32_t BETAVERSION; -extern int32_t BGRATE1; -extern int32_t BIGALPHANUM; -extern int32_t BIGAPPOS; -extern int32_t BIGCOLIN; -extern int32_t BIGCOMMA; -extern int32_t BIGFORCE; -extern int32_t BIGHOLE; -extern int32_t BIGORBIT1; -extern int32_t BIGPERIOD; -extern int32_t BIGQ; -extern int32_t BIGSEMI; -extern int32_t BIGX_; -extern int32_t BLANKSCREEN; -extern int32_t BLIMP; -extern int32_t BLOOD; -extern int32_t BLOODPOOL; -extern int32_t BLOODSPLAT1; -extern int32_t BLOODSPLAT2; -extern int32_t BLOODSPLAT3; -extern int32_t BLOODSPLAT4; -extern int32_t BLOODYPOLE; -extern int32_t BOLT1; -extern int32_t BONUSSCREEN; -extern int32_t BOOT_ICON; -extern int32_t BOOTS; -extern int32_t BORNTOBEWILDSCREEN; -extern int32_t BOSS1; -extern int32_t BOSS1LOB; -extern int32_t BOSS1SHOOT; -extern int32_t BOSS1STAYPUT; -extern int32_t BOSS2; -extern int32_t BOSS3; -extern int32_t BOSS4; -extern int32_t BOSS4STAYPUT; -extern int32_t BOSSTOP; -extern int32_t BOTTLE1; -extern int32_t BOTTLE10; -extern int32_t BOTTLE11; -extern int32_t BOTTLE12; -extern int32_t BOTTLE13; -extern int32_t BOTTLE14; -extern int32_t BOTTLE15; -extern int32_t BOTTLE16; -extern int32_t BOTTLE17; -extern int32_t BOTTLE18; -extern int32_t BOTTLE19; -extern int32_t BOTTLE2; -extern int32_t BOTTLE3; -extern int32_t BOTTLE4; -extern int32_t BOTTLE5; -extern int32_t BOTTLE6; -extern int32_t BOTTLE7; -extern int32_t BOTTLE8; -extern int32_t BOTTOMSTATUSBAR; -extern int32_t BOUNCEMINE; -extern int32_t BOX; -extern int32_t BPANNEL1; -extern int32_t BPANNEL3; -extern int32_t BROKEFIREHYDRENT; -extern int32_t BROKEHYDROPLANT; -extern int32_t BROKENCHAIR; -extern int32_t BULLETHOLE; -extern int32_t BURNING; -extern int32_t BURNING2; -extern int32_t CACTUS; -extern int32_t CACTUSBROKE; -extern int32_t CAMCORNER; -extern int32_t CAMERA1; -extern int32_t CAMERALIGHT; -extern int32_t CAMERAPOLE; -extern int32_t CAMLIGHT; -extern int32_t CANWITHSOMETHING; -extern int32_t CANWITHSOMETHING2; -extern int32_t CANWITHSOMETHING3; -extern int32_t CANWITHSOMETHING4; -extern int32_t CEILINGSTEAM; -extern int32_t CHAINGUN; -extern int32_t CHAINGUNSPRITE; -extern int32_t CHAIR1; -extern int32_t CHAIR2; -extern int32_t CHAIR3; -extern int32_t CIRCLEPANNEL; -extern int32_t CIRCLEPANNELBROKE; -extern int32_t CLOUDYOCEAN; -extern int32_t CLOUDYSKIES; -extern int32_t COLA; -extern int32_t COLAMACHINE; -extern int32_t COMMANDER; -extern int32_t COMMANDERSTAYPUT; -extern int32_t CONE; -extern int32_t COOLEXPLOSION1; -extern int32_t CRACK1; -extern int32_t CRACK2; -extern int32_t CRACK3; -extern int32_t CRACK4; -extern int32_t CRACKKNUCKLES; -extern int32_t CRANE; -extern int32_t CRANEPOLE; -extern int32_t CREDITSTEXT1; -extern int32_t CREDITSTEXT2; -extern int32_t CREDITSTEXT3; -extern int32_t CROSSHAIR; -extern int32_t CRYSTALAMMO; -extern int32_t CYCLER; -extern int32_t DEVISTATOR; -extern int32_t DEVISTATORAMMO; -extern int32_t DEVISTATORSPRITE; -extern int32_t DIGITALNUM; -extern int32_t DIPSWITCH; -extern int32_t DIPSWITCH2; -extern int32_t DIPSWITCH3; -extern int32_t DOLPHIN1; -extern int32_t DOLPHIN2; -extern int32_t DOMELITE; -extern int32_t DOORSHOCK; -extern int32_t DOORTILE1; -extern int32_t DOORTILE10; -extern int32_t DOORTILE11; -extern int32_t DOORTILE12; -extern int32_t DOORTILE14; -extern int32_t DOORTILE15; -extern int32_t DOORTILE16; -extern int32_t DOORTILE17; -extern int32_t DOORTILE18; -extern int32_t DOORTILE19; -extern int32_t DOORTILE2; -extern int32_t DOORTILE20; -extern int32_t DOORTILE21; -extern int32_t DOORTILE22; -extern int32_t DOORTILE23; -extern int32_t DOORTILE3; -extern int32_t DOORTILE4; -extern int32_t DOORTILE5; -extern int32_t DOORTILE6; -extern int32_t DOORTILE7; -extern int32_t DOORTILE8; -extern int32_t DOORTILE9; -extern int32_t DREALMS; -extern int32_t DRONE; -extern int32_t DUCK; -extern int32_t DUKECAR; -extern int32_t DUKEGUN; -extern int32_t DUKELEG; -extern int32_t DUKELYINGDEAD; -extern int32_t DUKENUKEM; -extern int32_t DUKETAG; -extern int32_t DUKETORSO; -extern int32_t EGG; -extern int32_t ENDALPHANUM; -extern int32_t EXPLODINGBARREL; -extern int32_t EXPLODINGBARREL2; -extern int32_t EXPLOSION2; -extern int32_t EXPLOSION2BOT; -extern int32_t F1HELP; -extern int32_t FANSHADOW; -extern int32_t FANSHADOWBROKE; -extern int32_t FANSPRITE; -extern int32_t FANSPRITEBROKE; -extern int32_t FECES; -extern int32_t FEM1; -extern int32_t FEM10; -extern int32_t FEM2; -extern int32_t FEM3; -extern int32_t FEM4; -extern int32_t FEM5; -extern int32_t FEM6; -extern int32_t FEM6PAD; -extern int32_t FEM7; -extern int32_t FEM8; -extern int32_t FEM9; -extern int32_t FEMMAG1; -extern int32_t FEMMAG2; -extern int32_t FEMPIC1; -extern int32_t FEMPIC2; -extern int32_t FEMPIC3; -extern int32_t FEMPIC4; -extern int32_t FEMPIC5; -extern int32_t FEMPIC6; -extern int32_t FEMPIC7; -extern int32_t FETUS; -extern int32_t FETUSBROKE; -extern int32_t FETUSJIB; -extern int32_t FIRE; -extern int32_t FIRE2; -extern int32_t FIREBARREL; -extern int32_t FIREEXT; -extern int32_t FIRELASER; -extern int32_t FIREVASE; -extern int32_t FIRSTAID; -extern int32_t FIRSTAID_ICON; -extern int32_t FIRSTGUN; -extern int32_t FIRSTGUNRELOAD; -extern int32_t FIRSTGUNSPRITE; -extern int32_t FIST; -extern int32_t FLOORFLAME; -extern int32_t FLOORPLASMA; -extern int32_t FLOORSLIME; -extern int32_t FOF; -extern int32_t FOODOBJECT16; -extern int32_t FOOTPRINTS; -extern int32_t FOOTPRINTS2; -extern int32_t FOOTPRINTS3; -extern int32_t FOOTPRINTS4; -extern int32_t FORCERIPPLE; -extern int32_t FORCESPHERE; -extern int32_t FRAGBAR; -extern int32_t FRAMEEFFECT1; -extern int32_t FRAMEEFFECT1_13; -extern int32_t FRANKENSTINESWITCH; -extern int32_t FREEZE; -extern int32_t FREEZEAMMO; -extern int32_t FREEZEBLAST; -extern int32_t FREEZESPRITE; -extern int32_t FUELPOD; -extern int32_t GENERICPOLE; -extern int32_t GENERICPOLE2; -extern int32_t GLASS; -extern int32_t GLASS2; -extern int32_t GLASSPIECES; -extern int32_t GPSPEED; -extern int32_t GRATE1; -extern int32_t GREENSLIME; -extern int32_t GROWAMMO; -extern int32_t GROWSPARK; -extern int32_t GROWSPRITEICON; -extern int32_t HANDHOLDINGACCESS; -extern int32_t HANDHOLDINGLASER; -extern int32_t HANDPRINTSWITCH; -extern int32_t HANDREMOTE; -extern int32_t HANDSWITCH; -extern int32_t HANDTHROW; -extern int32_t HANGLIGHT; -extern int32_t HBOMBAMMO; -extern int32_t HEADJIB1; -extern int32_t HEALTHBOX; -extern int32_t HEAT_ICON; -extern int32_t HEATSENSOR; -extern int32_t HEAVYHBOMB; -extern int32_t HELECOPT; -extern int32_t HOLODUKE; -extern int32_t HOLODUKE_ICON; -extern int32_t HORSEONSIDE; -extern int32_t HOTMEAT; -extern int32_t HURTRAIL; -extern int32_t HYDRENT; -extern int32_t HYDROPLANT; -extern int32_t INDY; -extern int32_t INGAMEDUKETHREEDEE; -extern int32_t INNERJAW; -extern int32_t INVENTORYBOX; -extern int32_t IVUNIT; -extern int32_t JETPACK; -extern int32_t JETPACK_ICON; -extern int32_t JIBS1; -extern int32_t JIBS2; -extern int32_t JIBS3; -extern int32_t JIBS4; -extern int32_t JIBS5; -extern int32_t JIBS6; -extern int32_t JURYGUY; -extern int32_t KILLSICON; -extern int32_t KNEE; -extern int32_t LA; -extern int32_t LASERLINE; -extern int32_t LASERSITE; -extern int32_t LEGJIB1; -extern int32_t LETTER; -extern int32_t LIGHTSWITCH; -extern int32_t LIGHTSWITCH2; -extern int32_t LIZMAN; -extern int32_t LIZMANARM1; -extern int32_t LIZMANFEEDING; -extern int32_t LIZMANHEAD1; -extern int32_t LIZMANJUMP; -extern int32_t LIZMANLEG1; -extern int32_t LIZMANSPITTING; -extern int32_t LIZMANSTAYPUT; -extern int32_t LIZTROOP; -extern int32_t LIZTROOPDUCKING; -extern int32_t LIZTROOPJETPACK; -extern int32_t LIZTROOPJUSTSIT; -extern int32_t LIZTROOPONTOILET; -extern int32_t LIZTROOPRUNNING; -extern int32_t LIZTROOPSHOOT; -extern int32_t LIZTROOPSTAYPUT; -extern int32_t LOADSCREEN; -extern int32_t LOCATORS; -extern int32_t LOCKSWITCH1; -extern int32_t LOOGIE; -extern int32_t LUKE; -extern int32_t MAIL; -extern int32_t MAN; -extern int32_t MAN2; -extern int32_t MASKWALL1; -extern int32_t MASKWALL10; -extern int32_t MASKWALL11; -extern int32_t MASKWALL12; -extern int32_t MASKWALL13; -extern int32_t MASKWALL14; -extern int32_t MASKWALL15; -extern int32_t MASKWALL2; -extern int32_t MASKWALL3; -extern int32_t MASKWALL4; -extern int32_t MASKWALL5; -extern int32_t MASKWALL6; -extern int32_t MASKWALL7; -extern int32_t MASKWALL8; -extern int32_t MASKWALL9; -extern int32_t MASTERSWITCH; -extern int32_t MENUBAR; -extern int32_t MENUSCREEN; -extern int32_t MIKE; -extern int32_t MINIFONT; -extern int32_t MIRROR; -extern int32_t MIRRORBROKE; -extern int32_t MONEY; -extern int32_t MONK; -extern int32_t MOONSKY1; -extern int32_t MORTER; -extern int32_t MOVIECAMERA; -extern int32_t MULTISWITCH; -extern int32_t MUSICANDSFX; -extern int32_t NAKED1; -extern int32_t NATURALLIGHTNING; -extern int32_t NEON1; -extern int32_t NEON2; -extern int32_t NEON3; -extern int32_t NEON4; -extern int32_t NEON5; -extern int32_t NEON6; -extern int32_t NEWBEAST; -extern int32_t NEWBEASTSTAYPUT; -extern int32_t NUKEBARREL; -extern int32_t NUKEBARRELDENTED; -extern int32_t NUKEBARRELLEAKED; -extern int32_t NUKEBUTTON; -extern int32_t OCEANSPRITE1; -extern int32_t OCEANSPRITE2; -extern int32_t OCEANSPRITE3; -extern int32_t OCEANSPRITE4; -extern int32_t OCEANSPRITE5; -extern int32_t OCTABRAIN; -extern int32_t OCTABRAINSTAYPUT; -extern int32_t OJ; -extern int32_t OOZ; -extern int32_t OOZ2; -extern int32_t OOZFILTER; -extern int32_t ORDERING; -extern int32_t ORGANTIC; -extern int32_t PANNEL1; -extern int32_t PANNEL2; -extern int32_t PANNEL3; -extern int32_t PAPER; -extern int32_t PIGCOP; -extern int32_t PIGCOPDIVE; -extern int32_t PIGCOPSTAYPUT; -extern int32_t PIPE1; -extern int32_t PIPE1B; -extern int32_t PIPE2; -extern int32_t PIPE2B; -extern int32_t PIPE3; -extern int32_t PIPE3B; -extern int32_t PIPE4; -extern int32_t PIPE4B; -extern int32_t PIPE5; -extern int32_t PIPE5B; -extern int32_t PIPE6; -extern int32_t PIPE6B; -extern int32_t PLAYERONWATER; -extern int32_t PLUG; -extern int32_t PLUTOPAKSPRITE; -extern int32_t POCKET; -extern int32_t PODFEM1; -extern int32_t POT1; -extern int32_t POT2; -extern int32_t POT3; -extern int32_t POWERSWITCH1; -extern int32_t POWERSWITCH2; -extern int32_t PUKE; -extern int32_t PULLSWITCH; -extern int32_t PURPLELAVA; -extern int32_t QUEBALL; -extern int32_t RADIUSEXPLOSION; -extern int32_t RAT; -extern int32_t REACTOR; -extern int32_t REACTOR2; -extern int32_t REACTOR2BURNT; -extern int32_t REACTOR2SPARK; -extern int32_t REACTORBURNT; -extern int32_t REACTORSPARK; -extern int32_t RECON; -extern int32_t RESPAWN; -extern int32_t RESPAWNMARKERGREEN; -extern int32_t RESPAWNMARKERRED; -extern int32_t RESPAWNMARKERYELLOW; -extern int32_t ROTATEGUN; -extern int32_t RPG; -extern int32_t RPGAMMO; -extern int32_t RPGGUN; -extern int32_t RPGSPRITE; -extern int32_t RUBBERCAN; -extern int32_t SATELITE; -extern int32_t SCALE; -extern int32_t SCRAP1; -extern int32_t SCRAP2; -extern int32_t SCRAP3; -extern int32_t SCRAP4; -extern int32_t SCRAP5; -extern int32_t SCRAP6; -extern int32_t SCREENBREAK1; -extern int32_t SCREENBREAK10; -extern int32_t SCREENBREAK11; -extern int32_t SCREENBREAK12; -extern int32_t SCREENBREAK13; -extern int32_t SCREENBREAK14; -extern int32_t SCREENBREAK15; -extern int32_t SCREENBREAK16; -extern int32_t SCREENBREAK17; -extern int32_t SCREENBREAK18; -extern int32_t SCREENBREAK19; -extern int32_t SCREENBREAK2; -extern int32_t SCREENBREAK3; -extern int32_t SCREENBREAK4; -extern int32_t SCREENBREAK5; -extern int32_t SCREENBREAK6; -extern int32_t SCREENBREAK7; -extern int32_t SCREENBREAK8; -extern int32_t SCREENBREAK9; -extern int32_t SCUBAMASK; -extern int32_t SECTOREFFECTOR; -extern int32_t SEENINE; -extern int32_t SEENINEDEAD; -extern int32_t SELECTDIR; -extern int32_t SHARK; -extern int32_t SHELL; -extern int32_t SHIELD; -extern int32_t SHOTGUN; -extern int32_t SHOTGUNAMMO; -extern int32_t SHOTGUNSHELL; -extern int32_t SHOTGUNSPRITE; -extern int32_t SHOTSPARK1; -extern int32_t SHRINKER; -extern int32_t SHRINKEREXPLOSION; -extern int32_t SHRINKERSPRITE; -extern int32_t SHRINKSPARK; -extern int32_t SIDEBOLT1; -extern int32_t SIGN1; -extern int32_t SIGN2; -extern int32_t SIXPAK; -extern int32_t SLIDEBAR; -extern int32_t SLOTDOOR; -extern int32_t SMALLFNTCURSOR; -extern int32_t SMALLSMOKE; -extern int32_t SOLARPANNEL; -extern int32_t SPACEDOORSWITCH; -extern int32_t SPACELIGHTSWITCH; -extern int32_t SPACEMARINE; -extern int32_t SPEAKER; -extern int32_t SPINNINGNUKEICON; -extern int32_t SPIT; -extern int32_t SPOTLITE; -extern int32_t STAINGLASS1; -extern int32_t STALL; -extern int32_t STALLBROKE; -extern int32_t STARTALPHANUM; -extern int32_t STATIC; -extern int32_t STATUE; -extern int32_t STATUEFLASH; -extern int32_t STEAM; -extern int32_t STEROIDS; -extern int32_t STEROIDS_ICON; -extern int32_t STRIPEBALL; -extern int32_t SUSHIPLATE1; -extern int32_t SUSHIPLATE2; -extern int32_t SUSHIPLATE3; -extern int32_t SUSHIPLATE4; -extern int32_t SUSHIPLATE5; -extern int32_t TAMPON; -extern int32_t TANK; -extern int32_t TARGET; -extern int32_t TECHLIGHT2; -extern int32_t TECHLIGHT4; -extern int32_t TECHLIGHTBUST2; -extern int32_t TECHLIGHTBUST4; -extern int32_t TECHSWITCH; -extern int32_t TENSCREEN; -extern int32_t TEXTBOX; -extern int32_t TEXTSTORY; -extern int32_t THREEBYFIVE; -extern int32_t THREEDEE; -extern int32_t TIP; -extern int32_t TIRE; -extern int32_t TOILET; -extern int32_t TOILETBROKE; -extern int32_t TOILETWATER; -extern int32_t TONGUE; -extern int32_t TOUCHPLATE; -extern int32_t TOUGHGAL; -extern int32_t TRANSPORTERBEAM; -extern int32_t TRANSPORTERSTAR; -extern int32_t TRASH; -extern int32_t TREE1; -extern int32_t TREE2; -extern int32_t TRIPBOMB; -extern int32_t TRIPBOMBSPRITE; -extern int32_t TRIPODCAMERA; -extern int32_t VACUUM; -extern int32_t VASE; -extern int32_t VENDMACHINE; -extern int32_t VICTORY1; -extern int32_t VIEWBORDER; -extern int32_t VIEWSCREEN; -extern int32_t VIEWSCREEN2; -extern int32_t W_FORCEFIELD; -extern int32_t W_HITTECHWALL1; -extern int32_t W_HITTECHWALL10; -extern int32_t W_HITTECHWALL15; -extern int32_t W_HITTECHWALL16; -extern int32_t W_HITTECHWALL2; -extern int32_t W_HITTECHWALL3; -extern int32_t W_HITTECHWALL4; -extern int32_t W_MILKSHELF; -extern int32_t W_MILKSHELFBROKE; -extern int32_t W_NUMBERS; -extern int32_t W_SCREENBREAK; -extern int32_t W_TECHWALL1; -extern int32_t W_TECHWALL10; -extern int32_t W_TECHWALL11; -extern int32_t W_TECHWALL12; -extern int32_t W_TECHWALL13; -extern int32_t W_TECHWALL14; -extern int32_t W_TECHWALL15; -extern int32_t W_TECHWALL16; -extern int32_t W_TECHWALL2; -extern int32_t W_TECHWALL3; -extern int32_t W_TECHWALL4; -extern int32_t W_TECHWALL5; -extern int32_t W_TECHWALL6; -extern int32_t W_TECHWALL7; -extern int32_t W_TECHWALL8; -extern int32_t W_TECHWALL9; -extern int32_t WAITTOBESEATED; -extern int32_t WALLBLOOD1; -extern int32_t WALLBLOOD2; -extern int32_t WALLBLOOD3; -extern int32_t WALLBLOOD4; -extern int32_t WALLBLOOD5; -extern int32_t WALLBLOOD7; -extern int32_t WALLBLOOD8; -extern int32_t WALLLIGHT1; -extern int32_t WALLLIGHT2; -extern int32_t WALLLIGHT3; -extern int32_t WALLLIGHT4; -extern int32_t WALLLIGHTBUST1; -extern int32_t WALLLIGHTBUST2; -extern int32_t WALLLIGHTBUST3; -extern int32_t WALLLIGHTBUST4; -extern int32_t WATERBUBBLE; -extern int32_t WATERBUBBLEMAKER; -extern int32_t WATERDRIP; -extern int32_t WATERDRIPSPLASH; -extern int32_t WATERFOUNTAIN; -extern int32_t WATERFOUNTAINBROKE; -extern int32_t WATERSPLASH2; -extern int32_t WATERTILE2; -extern int32_t WEATHERWARN; -extern int32_t WINDOWBORDER1; -extern int32_t WINDOWBORDER2; -extern int32_t WOMAN; -extern int32_t WOODENHORSE; -extern int32_t XXXSTACY; - -#define DYNAMICTILEMAP(Tilenum) (DynamicTileMap[Tilenum]) - -END_DUKE_NS - -#endif // namesdyn_h__ diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index 0ecfd9c46..410e2a372 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -1763,10 +1763,10 @@ static void G_DrawTileScaled(int drawX, int drawY, int tileNum, int drawShade, i int drawYOffset = 0; int drawXOffset = 192<<16; - switch (hudweap.cur) + switch (DYNAMICWEAPONMAP(hudweap.cur)) { - case DEVISTATOR_WEAPON: - case TRIPBOMB_WEAPON: + case DEVISTATOR_WEAPON__STATIC: + case TRIPBOMB_WEAPON__STATIC: drawXOffset = 160<<16; break; default: @@ -2257,9 +2257,9 @@ void P_DisplayWeapon(void) int const weaponPal = P_GetHudPal(pPlayer); if (!FURY) - switch (currentWeapon) + switch (DYNAMICWEAPONMAP(currentWeapon)) { - case KNEE_WEAPON: + case KNEE_WEAPON__STATIC: { int const kneePal = P_GetKneePal(pPlayer, weaponPal); @@ -2274,7 +2274,7 @@ void P_DisplayWeapon(void) break; } - case TRIPBOMB_WEAPON: + case TRIPBOMB_WEAPON__STATIC: weaponX += 8; weaponYOffset -= 10; @@ -2292,7 +2292,7 @@ void P_DisplayWeapon(void) weaponPal); break; - case RPG_WEAPON: + case RPG_WEAPON__STATIC: weaponX -= sintable[(768 + ((*weaponFrame) << 7)) & 2047] >> 11; weaponYOffset += sintable[(768 + ((*weaponFrame) << 7)) & 2047] >> 11; @@ -2320,7 +2320,7 @@ void P_DisplayWeapon(void) weaponBits, weaponPal); break; - case SHOTGUN_WEAPON: + case SHOTGUN_WEAPON__STATIC: weaponX -= 8; if (WW2GI) @@ -2427,7 +2427,7 @@ void P_DisplayWeapon(void) } break; - case CHAINGUN_WEAPON: + case CHAINGUN_WEAPON__STATIC: if (*weaponFrame > 0) { weaponYOffset -= sintable[(*weaponFrame)<<7]>>12; @@ -2554,7 +2554,7 @@ void P_DisplayWeapon(void) CHAINGUN, weaponShade, weaponBits, weaponPal); break; - case PISTOL_WEAPON: + case PISTOL_WEAPON__STATIC: if ((*weaponFrame) < PWEAPON(screenpeek, PISTOL_WEAPON, TotalTime)+1) { static uint8_t pistolFrames[] = { 0, 1, 2 }; @@ -2613,7 +2613,7 @@ void P_DisplayWeapon(void) break; - case HANDBOMB_WEAPON: + case HANDBOMB_WEAPON__STATIC: { static uint8_t pipebombFrames [] = { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2 }; @@ -2663,7 +2663,7 @@ void P_DisplayWeapon(void) } break; - case HANDREMOTE_WEAPON: + case HANDREMOTE_WEAPON__STATIC: { static uint8_t remoteFrames[] = { 0, 1, 1, 2, 1, 1, 0, 0, 0, 0, 0 }; @@ -2676,7 +2676,7 @@ void P_DisplayWeapon(void) } break; - case DEVISTATOR_WEAPON: + case DEVISTATOR_WEAPON__STATIC: if (WW2GI) { if (*weaponFrame) @@ -2761,7 +2761,7 @@ void P_DisplayWeapon(void) } break; - case FREEZE_WEAPON: + case FREEZE_WEAPON__STATIC: if (!(duke3d_globalflags & DUKE3D_NO_WIDESCREEN_PINNING) && DUKE) weaponBits |= 512; @@ -2785,8 +2785,8 @@ void P_DisplayWeapon(void) FREEZE, weaponShade, weaponBits, weaponPal); break; - case GROW_WEAPON: - case SHRINKER_WEAPON: + case GROW_WEAPON__STATIC: + case SHRINKER_WEAPON__STATIC: weaponX += 28; weaponY += 18; @@ -3332,10 +3332,6 @@ access_incs: return 0; } -int16_t WeaponPickupSprites[MAX_WEAPONS] = { KNEE__STATIC, FIRSTGUNSPRITE__STATIC, SHOTGUNSPRITE__STATIC, - CHAINGUNSPRITE__STATIC, RPGSPRITE__STATIC, HEAVYHBOMB__STATIC, SHRINKERSPRITE__STATIC, DEVISTATORSPRITE__STATIC, - TRIPBOMBSPRITE__STATIC, FREEZESPRITE__STATIC, HEAVYHBOMB__STATIC, SHRINKERSPRITE__STATIC - }; // this is used for player deaths void P_DropWeapon(int const playerNum) { @@ -3349,10 +3345,10 @@ void P_DropWeapon(int const playerNum) A_Spawn(pPlayer->i, WeaponPickupSprites[currentWeapon]); #ifndef EDUKE32_STANDALONE else if (!FURY) - switch (PWEAPON(playerNum, currentWeapon, WorksLike)) + switch (DYNAMICWEAPONMAP(PWEAPON(playerNum, currentWeapon, WorksLike))) { - case RPG_WEAPON: - case HANDBOMB_WEAPON: A_Spawn(pPlayer->i, EXPLOSION2); break; + case RPG_WEAPON__STATIC: + case HANDBOMB_WEAPON__STATIC: A_Spawn(pPlayer->i, EXPLOSION2); break; } #endif } @@ -3817,11 +3813,7 @@ void P_FragPlayer(int playerNum) } } -#ifdef LUNATIC -# define PIPEBOMB_CONTROL(playerNum) (g_player[playerNum].ps->pipebombControl) -#else # define PIPEBOMB_CONTROL(playerNum) (Gv_GetVarByLabel("PIPEBOMB_CONTROL", PIPEBOMB_REMOTE, -1, playerNum)) -#endif static void P_ProcessWeapon(int playerNum) { @@ -3980,9 +3972,9 @@ static void P_ProcessWeapon(int playerNum) // this event is deprecated VM_OnEvent(EVENT_FIREWEAPON, pPlayer->i, playerNum); - switch (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike)) + switch (DYNAMICWEAPONMAP(PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike))) { - case HANDBOMB_WEAPON: + case HANDBOMB_WEAPON__STATIC: pPlayer->hbomb_hold_delay = 0; if (pPlayer->ammo_amount[pPlayer->curr_weapon] > 0) { @@ -3992,7 +3984,7 @@ static void P_ProcessWeapon(int playerNum) } break; - case HANDREMOTE_WEAPON: + case HANDREMOTE_WEAPON__STATIC: pPlayer->hbomb_hold_delay = 0; (*weaponFrame) = 1; if (PWEAPON(playerNum, pPlayer->curr_weapon, InitialSound) > 0) @@ -4000,7 +3992,7 @@ static void P_ProcessWeapon(int playerNum) break; - case TRIPBOMB_WEAPON: + case TRIPBOMB_WEAPON__STATIC: if (pPlayer->ammo_amount[pPlayer->curr_weapon] > 0) { hitdata_t hitData; @@ -4045,13 +4037,13 @@ static void P_ProcessWeapon(int playerNum) } break; - case PISTOL_WEAPON: - case SHOTGUN_WEAPON: - case CHAINGUN_WEAPON: - case SHRINKER_WEAPON: - case GROW_WEAPON: - case FREEZE_WEAPON: - case RPG_WEAPON: + case PISTOL_WEAPON__STATIC: + case SHOTGUN_WEAPON__STATIC: + case CHAINGUN_WEAPON__STATIC: + case SHRINKER_WEAPON__STATIC: + case GROW_WEAPON__STATIC: + case FREEZE_WEAPON__STATIC: + case RPG_WEAPON__STATIC: if (pPlayer->ammo_amount[pPlayer->curr_weapon] > 0) { (*weaponFrame) = 1; @@ -4060,7 +4052,7 @@ static void P_ProcessWeapon(int playerNum) } break; - case DEVISTATOR_WEAPON: + case DEVISTATOR_WEAPON__STATIC: if (pPlayer->ammo_amount[pPlayer->curr_weapon] > 0) { (*weaponFrame) = 1; @@ -4070,7 +4062,7 @@ static void P_ProcessWeapon(int playerNum) } break; - case KNEE_WEAPON: + case KNEE_WEAPON__STATIC: if (pPlayer->quick_kick == 0) { (*weaponFrame) = 1; diff --git a/source/duke3d/src/player.h b/source/duke3d/src/player.h index 19bdabdec..9023fe93d 100644 --- a/source/duke3d/src/player.h +++ b/source/duke3d/src/player.h @@ -131,7 +131,7 @@ typedef struct { uint8_t extbits; } input_t; -#pragma pack(push,1) +//#pragma pack(push,1) // XXX: r1625 changed a lot types here, among others // * int32_t --> int16_t // * int16_t --> int8_t @@ -152,13 +152,7 @@ typedef struct { int32_t autostep, autostep_sbw; uint32_t interface_toggle; -#ifdef LUNATIC - int32_t pipebombControl, pipebombLifetime, pipebombLifetimeVar; - int32_t tripbombControl, tripbombLifetime, tripbombLifetimeVar; - int32_t zrange; - int16_t angrange, autoaimang; -#endif uint16_t max_actors_killed, actors_killed; uint16_t gotweapon, zoom; @@ -210,16 +204,7 @@ typedef struct { int8_t last_used_weapon; -#ifdef LUNATIC - int8_t palsfadespeed, palsfadenext, palsfadeprio, padding2_; - - // The player index. Always valid since we have no loose DukePlayer_t's - // anywhere (like with spritetype_t): g_player[i].ps->wa.idx == i. - struct { int32_t idx; } wa; -#endif - int8_t crouch_toggle; - int8_t padding_[1]; } DukePlayer_t; // KEEPINSYNC lunatic/_defs_game.lua @@ -239,7 +224,7 @@ typedef struct { char user_name[32]; uint32_t revision; } playerdata_t; -#pragma pack(pop) +//#pragma pack(pop) // KEEPINSYNC lunatic/con_lang.lua typedef struct @@ -326,7 +311,6 @@ typedef struct { extern input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS]; extern playerspawn_t g_playerSpawnPoints[MAXPLAYERS]; extern playerdata_t *const g_player; -extern int16_t WeaponPickupSprites[MAX_WEAPONS]; extern hudweapon_t hudweap; extern int32_t g_levelTextTime; extern int32_t g_numObituaries; diff --git a/source/duke3d/src/sector.cpp b/source/duke3d/src/sector.cpp index 376944cce..61456cced 100644 --- a/source/duke3d/src/sector.cpp +++ b/source/duke3d/src/sector.cpp @@ -2793,9 +2793,9 @@ CHECKINV1: { // this accounts for the expander when handling next/previous - switch (currentWeapon) + switch (DYNAMICWEAPONMAP(currentWeapon)) { - case DEVISTATOR_WEAPON: + case DEVISTATOR_WEAPON__STATIC: if ((int32_t) weaponNum == -1) { if (PLUTOPAK) @@ -2807,11 +2807,11 @@ CHECKINV1: currentWeapon++; break; - case GROW_WEAPON: + case GROW_WEAPON__STATIC: currentWeapon = ((int32_t) weaponNum == -1) ? SHRINKER_WEAPON : DEVISTATOR_WEAPON; break; - case SHRINKER_WEAPON: + case SHRINKER_WEAPON__STATIC: if ((int32_t)weaponNum == 1) { if (PLUTOPAK) @@ -2823,7 +2823,7 @@ CHECKINV1: currentWeapon--; break; - case HANDREMOTE_WEAPON: + case HANDREMOTE_WEAPON__STATIC: i = currentWeapon = HANDBOMB_WEAPON; fallthrough__; default: @@ -2857,12 +2857,12 @@ CHECKINV1: if (weaponNum >= 12) // alt weapon, last used weapon { uint32_t const weaponNumSwitch = weaponNum == 13 ? pPlayer->last_used_weapon : pPlayer->curr_weapon; - switch (weaponNumSwitch) + switch (DYNAMICWEAPONMAP(weaponNumSwitch)) { - case HANDREMOTE_WEAPON: + case HANDREMOTE_WEAPON__STATIC: weaponNum = HANDBOMB_WEAPON; break; - case GROW_WEAPON: + case GROW_WEAPON__STATIC: weaponNum = SHRINKER_WEAPON; break; default: @@ -2918,28 +2918,28 @@ CHECKINV1: pPlayer->weapon_pos = WEAPON_POS_LOWER; } else if ((uint32_t)weaponNum < MAX_WEAPONS && (pPlayer->gotweapon & (1<curr_weapon != weaponNum) - switch (weaponNum) + switch (DYNAMICWEAPONMAP(weaponNum)) { - case PISTOL_WEAPON: - case SHOTGUN_WEAPON: - case CHAINGUN_WEAPON: - case RPG_WEAPON: - case DEVISTATOR_WEAPON: - case FREEZE_WEAPON: - case GROW_WEAPON: - case SHRINKER_WEAPON: + case PISTOL_WEAPON__STATIC: + case SHOTGUN_WEAPON__STATIC: + case CHAINGUN_WEAPON__STATIC: + case RPG_WEAPON__STATIC: + case DEVISTATOR_WEAPON__STATIC: + case FREEZE_WEAPON__STATIC: + case GROW_WEAPON__STATIC: + case SHRINKER_WEAPON__STATIC: if (pPlayer->ammo_amount[weaponNum] == 0 && pPlayer->show_empty_weapon == 0) { pPlayer->last_full_weapon = pPlayer->curr_weapon; pPlayer->show_empty_weapon = 32; } fallthrough__; - case KNEE_WEAPON: - case HANDREMOTE_WEAPON: + case KNEE_WEAPON__STATIC: + case HANDREMOTE_WEAPON__STATIC: P_AddWeapon(pPlayer, weaponNum, 1); break; - case HANDBOMB_WEAPON: - case TRIPBOMB_WEAPON: + case HANDBOMB_WEAPON__STATIC: + case TRIPBOMB_WEAPON__STATIC: if (pPlayer->ammo_amount[weaponNum] > 0 && (pPlayer->gotweapon & (1<= 0; i++) { *(g_dynTileList[i].dynvalptr) = -g_dynTileList[i].staticval_rr; - if (RRRA && *(g_dynTileList[i].dynvalptr) == -UFO1__STATICRR) *(g_dynTileList[i].dynvalptr) = -UFO1__STATICRRRA; + if ((g_gameType & GAMEFLAG_RRRA) && *(g_dynTileList[i].dynvalptr) == -UFO1__STATICRR) *(g_dynTileList[i].dynvalptr) = -UFO1__STATICRRRA; DynamicTileMap[*(g_dynTileList[i].dynvalptr)] = g_dynTileList[i].staticval_rr; NameToTileIndex.Insert(g_dynTileList[i].str, *(g_dynTileList[i].dynvalptr)); } for (i = 0; g_dynWeaponList[i].staticval >= 0; i++) *(g_dynWeaponList[i].dynvalptr) = g_dynWeaponList[i].staticval_rr; - PHEIGHT = PHEIGHT_RR; } for (i=0; g_dynTileList[i].staticval >= 0; i++) @@ -3012,7 +3037,7 @@ void G_InitDynamicTiles(void) g_blimpSpawnItems[13] = FREEZESPRITE; g_blimpSpawnItems[14] = FREEZEAMMO; - if (RR) + if (g_gameType & GAMEFLAG_RR) { WeaponPickupSprites[0] = KNEE; WeaponPickupSprites[1] = FIRSTGUNSPRITE; @@ -3042,10 +3067,5 @@ void G_InitDynamicTiles(void) WeaponPickupSprites[10] = HEAVYHBOMB; WeaponPickupSprites[11] = SHRINKERSPRITE; } - - // ouch... the big background image takes up a fuckload of memory and takes a second to load! -#ifdef EDUKE32_GLES - MENUSCREEN = LOADSCREEN = BETASCREEN; -#endif } -END_RR_NS +END_DUKERR_NS diff --git a/source/rr/src/namesdyn.h b/source/dukerr/namesdyn.h similarity index 99% rename from source/rr/src/namesdyn.h rename to source/dukerr/namesdyn.h index 3c00d7107..9636b33d5 100644 --- a/source/rr/src/namesdyn.h +++ b/source/dukerr/namesdyn.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef namesdyn_h__ #define namesdyn_h__ -BEGIN_RR_NS +BEGIN_DUKERR_NS #define SECTOREFFECTOR__STATIC 1 @@ -625,6 +625,7 @@ BEGIN_RR_NS #define FEM9__STATIC 3450 #define FOOTPRINT__STATIC 3701 #define POOP__STATIC 4094 +#define FRAMEEFFECT1_13__STATIC 3999 #define FRAMEEFFECT1__STATIC 4095 #define PANNEL3__STATIC 4099 #define SCREENBREAK14__STATIC 4120 @@ -1311,6 +1312,7 @@ BEGIN_RR_NS #define FOOTPRINT__STATICRR -1160 #define POOP__STATICRR -2998 #define FRAMEEFFECT1__STATICRR -2999 +#define FRAMEEFFECT1_13__STATICRR -3000 #define PANNEL3__STATICRR -3005 #define SCREENBREAK14__STATICRR -3008 #define SCREENBREAK15__STATICRR -3009 @@ -2729,6 +2731,7 @@ extern int32_t FEM9; extern int32_t FOOTPRINT; extern int32_t POOP; extern int32_t FRAMEEFFECT1; +extern int32_t FRAMEEFFECT1_13; extern int32_t PANNEL3; extern int32_t SCREENBREAK14; extern int32_t SCREENBREAK15; @@ -3593,6 +3596,9 @@ extern int32_t CHICKEN_WEAPON; #define DYNAMICWEAPONMAP(Weaponnum) (DynamicWeaponMap[Weaponnum]) -END_RR_NS +extern int16_t g_blimpSpawnItems[15]; +extern int16_t WeaponPickupSprites[MAX_WEAPONS]; + +END_DUKERR_NS #endif // namesdyn_h__ diff --git a/source/rr/CMakeLists.txt b/source/rr/CMakeLists.txt index ca8eeeb42..6b21af8b8 100644 --- a/source/rr/CMakeLists.txt +++ b/source/rr/CMakeLists.txt @@ -13,7 +13,6 @@ set( PCH_SOURCES src/gameexec.cpp src/gamevars.cpp src/global.cpp - src/namesdyn.cpp src/net.cpp src/osdcmds.cpp src/player.cpp diff --git a/source/rr/src/actors.h b/source/rr/src/actors.h index da3ad1d5a..0e2b8d5b0 100644 --- a/source/rr/src/actors.h +++ b/source/rr/src/actors.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define actors_h_ #include "player.h" -# include "namesdyn.h" +# include "dukerr/namesdyn.h" #include "dukerr/actors.h" BEGIN_RR_NS diff --git a/source/rr/src/d_menu.cpp b/source/rr/src/d_menu.cpp index 50bb444de..840b19c68 100644 --- a/source/rr/src/d_menu.cpp +++ b/source/rr/src/d_menu.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "menu/menu.h" #include "gstrings.h" #include "version.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "../../glbackend/glbackend.h" diff --git a/source/rr/src/demo.cpp b/source/rr/src/demo.cpp index 55cad1b9d..1b894283d 100644 --- a/source/rr/src/demo.cpp +++ b/source/rr/src/demo.cpp @@ -729,8 +729,6 @@ nextdemo_nomenu: // if fast-forwarding, we must update totalclock totalclock += TICSPERFRAME; -// OSD_Printf("t:%d, l+T:%d; cnt:%d, goal:%d%s", totalclock, (lockclock+TICSPERFRAME), -// g_demo_cnt, g_demo_goalCnt, g_demo_cnt>=g_demo_goalCnt?" ":"\n"); if (g_demo_cnt>=g_demo_goalCnt) { g_demo_goalCnt = 0; @@ -816,16 +814,6 @@ nextdemo_nomenu: if (g_demo_showStats) { - #if 0 - if (g_demo_cntgm&MODE_MENU) goto RECHECK; -#if KRANDDEBUG - if (foundemo) - krd_print("krandplay.log"); -#endif - // finished playing a demo and not in menu: // return so that e.g. the title can be shown return 1; diff --git a/source/rr/src/duke3d.h b/source/rr/src/duke3d.h index a51ec6a40..8316bf010 100644 --- a/source/rr/src/duke3d.h +++ b/source/rr/src/duke3d.h @@ -120,7 +120,7 @@ END_RR_NS #include "global.h" #include "inv.h" #include "macros.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "net.h" #include "player.h" #include "quotes.h" diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp index c64c68900..6e1f37afb 100644 --- a/source/rr/src/game.cpp +++ b/source/rr/src/game.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------- +//------------------------------------------------------------------------- /* Copyright (C) 2016 EDuke32 developers and contributors @@ -6957,6 +6957,8 @@ static void G_Startup(void) G_FatalEngineError(); G_InitDynamicTiles(); + if (RR) PHEIGHT = PHEIGHT_RR; + G_InitDynamicSounds(); // These depend on having the dynamic tile and/or sound mappings set up: diff --git a/source/rr/src/gamedef.cpp b/source/rr/src/gamedef.cpp index 7f0ee1a5b..aa93f8f66 100644 --- a/source/rr/src/gamedef.cpp +++ b/source/rr/src/gamedef.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! #include "duke3d.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "gamedef.h" #include "gameexec.h" #include "savegame.h" diff --git a/source/rr/src/gamevars.cpp b/source/rr/src/gamevars.cpp index 7ba0abd0e..490b7ad26 100644 --- a/source/rr/src/gamevars.cpp +++ b/source/rr/src/gamevars.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "duke3d.h" #include "menus.h" #include "savegame.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "gamevars.h" //#include "vfs.h" diff --git a/source/rr/src/global.cpp b/source/rr/src/global.cpp index 09922db2b..4c91c348a 100644 --- a/source/rr/src/global.cpp +++ b/source/rr/src/global.cpp @@ -99,24 +99,6 @@ int32_t g_spriteGravity = 176; int32_t g_timerTicsPerSecond = TICRATE; int32_t g_tripbombRadius = 3880; -int16_t g_blimpSpawnItems[15] = -{ - RPGSPRITE__STATIC, - CHAINGUNSPRITE__STATIC, - DEVISTATORAMMO__STATIC, - RPGAMMO__STATIC, - RPGAMMO__STATIC, - JETPACK__STATIC, - SHIELD__STATIC, - FIRSTAID__STATIC, - STEROIDS__STATIC, - RPGAMMO__STATIC, - RPGAMMO__STATIC, - RPGSPRITE__STATIC, - RPGAMMO__STATIC, - FREEZESPRITE__STATIC, - FREEZEAMMO__STATIC -}; char CheatKeys[2] = { sc_D, sc_N }; diff --git a/source/rr/src/global.h b/source/rr/src/global.h index be920e86d..305b29e32 100644 --- a/source/rr/src/global.h +++ b/source/rr/src/global.h @@ -275,7 +275,6 @@ extern int32_t g_timerTicsPerSecond; extern int32_t g_tripbombRadius; extern int32_t g_volumeCnt; -extern int16_t g_blimpSpawnItems[15]; extern int32_t g_gametypeFlags[MAXGAMETYPES]; extern const char *s_buildDate; diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp index 066b98ded..8c9dd49ce 100644 --- a/source/rr/src/player.cpp +++ b/source/rr/src/player.cpp @@ -4580,10 +4580,7 @@ static int32_t P_DoCounters(int playerNum) return 0; } -int16_t WeaponPickupSprites[MAX_WEAPONS] = { KNEE__STATIC, FIRSTGUNSPRITE__STATIC, SHOTGUNSPRITE__STATIC, - CHAINGUNSPRITE__STATIC, RPGSPRITE__STATIC, HEAVYHBOMB__STATIC, SHRINKERSPRITE__STATIC, DEVISTATORSPRITE__STATIC, - TRIPBOMBSPRITE__STATIC, FREEZESPRITE__STATIC, HEAVYHBOMB__STATIC, SHRINKERSPRITE__STATIC - }; + // this is used for player deaths void P_DropWeapon(int const playerNum) { diff --git a/source/rr/src/player.h b/source/rr/src/player.h index 6ea7101c2..ccd326b14 100644 --- a/source/rr/src/player.h +++ b/source/rr/src/player.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define player_h_ #include "inv.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "fix16.h" #include "net.h" @@ -299,7 +299,6 @@ typedef struct { extern input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS]; extern playerspawn_t g_playerSpawnPoints[MAXPLAYERS]; extern playerdata_t *const g_player; -extern int16_t WeaponPickupSprites[MAX_WEAPONS]; extern hudweapon_t hudweap; extern int32_t g_levelTextTime; extern int32_t g_numObituaries; diff --git a/source/rr/src/sector.h b/source/rr/src/sector.h index ab9db8223..b947387b0 100644 --- a/source/rr/src/sector.h +++ b/source/rr/src/sector.h @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actors.h" // actor_t #include "gamevars.h" #include "macros.h" -#include "namesdyn.h" // for G_GetForcefieldPicnum() +#include "dukerr/namesdyn.h" // for G_GetForcefieldPicnum() #include "player.h" // playerspawn_t BEGIN_RR_NS diff --git a/source/rr/src/soundsdyn.cpp b/source/rr/src/soundsdyn.cpp index ae64f6d0f..c91cd19b2 100644 --- a/source/rr/src/soundsdyn.cpp +++ b/source/rr/src/soundsdyn.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "namesdyn.h" +#include "dukerr/namesdyn.h" #include "sounds.h" #include "soundsdyn.h" #include "global.h" diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt index a4f79dcee..d6c65340d 100644 --- a/wadsrc/static/engine/menudef.txt +++ b/wadsrc/static/engine/menudef.txt @@ -516,9 +516,9 @@ ImageScroller "CreditsMenu" { ifgame(Duke, Nam, WW2GI) { - ImageItem "CREDITSTEXT1", 990 - ImageItem "CREDITSTEXT2", 991 - ImageItem "CREDITSTEXT3", 992 + ImageItem "#2504", 990 + ImageItem "#2505", 991 + ImageItem "#2506", 992 animatedtransition class "Duke.ImageScrollerMenu" } From 609580850335e6160064bd919b9c20c238924acb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 6 Mar 2020 17:23:30 +0100 Subject: [PATCH 3/3] - consolidation of dynamic sound remapping --- source/CMakeLists.txt | 1 + source/duke3d/CMakeLists.txt | 1 - source/duke3d/src/duke3d.h | 2 +- source/duke3d/src/soundefs.h | 418 ------------------ source/duke3d/src/sounds.h | 3 +- source/duke3d/src/soundsdyn.cpp | 383 ---------------- source/duke3d/src/soundsdyn.h | 338 -------------- source/dukerr/namesdyn.cpp | 6 - source/{duke3d/src => dukerr}/sounds_common.h | 0 source/{rr/src => dukerr}/soundsdyn.cpp | 20 +- source/{rr/src => dukerr}/soundsdyn.h | 3 +- source/rr/CMakeLists.txt | 1 - source/rr/src/duke3d.h | 2 +- source/rr/src/gamedef.cpp | 4 - source/rr/src/soundefs.h | 418 ------------------ source/rr/src/sounds.h | 3 +- source/rr/src/sounds_common.h | 38 -- 17 files changed, 14 insertions(+), 1627 deletions(-) delete mode 100644 source/duke3d/src/soundefs.h delete mode 100644 source/duke3d/src/soundsdyn.cpp delete mode 100644 source/duke3d/src/soundsdyn.h rename source/{duke3d/src => dukerr}/sounds_common.h (100%) rename source/{rr/src => dukerr}/soundsdyn.cpp (97%) rename source/{rr/src => dukerr}/soundsdyn.h (99%) delete mode 100644 source/rr/src/soundefs.h delete mode 100644 source/rr/src/sounds_common.h 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