- added texture aliases so that tiles can given real names in the texture manager.

Use this to turn Duke's and RR's tile enums into real names, leaving out RRTILExx - the few that are needed were renamed.
This commit is contained in:
Christoph Oelckers 2020-10-06 19:26:22 +02:00
parent 1e131eda9e
commit 55e7e34707
10 changed files with 2192 additions and 2117 deletions

View file

@ -265,6 +265,11 @@ FTextureID FTextureManager::CheckForTexture (const char *name, ETextureType uset
} }
} }
} }
if (!(flags & TEXMAN_NoAlias))
{
int* alias = aliases.CheckKey(name);
if (alias) return FTextureID(*alias);
}
return FTextureID(-1); return FTextureID(-1);
} }
@ -1539,6 +1544,19 @@ void FTextureManager::SetTranslation(FTextureID fromtexnum, FTextureID totexnum)
} }
//-----------------------------------------------------------------------------
//
// Adds an alias name to the texture manager.
// Aliases are only checked if no real texture with the given name exists.
//
//-----------------------------------------------------------------------------
void FTextureManager::AddAlias(const char* name, FGameTexture* tex)
{
FTextureID id = tex->GetID();
if (tex != Textures[id.GetIndex()].Texture) return; // Whatever got passed in here was not valid, so ignore the alias.
aliases.Insert(name, id.GetIndex());
}
//========================================================================== //==========================================================================
// //

View file

@ -89,7 +89,8 @@ public:
TEXMAN_ShortNameOnly = 16, TEXMAN_ShortNameOnly = 16,
TEXMAN_DontCreate = 32, TEXMAN_DontCreate = 32,
TEXMAN_Localize = 64, TEXMAN_Localize = 64,
TEXMAN_ForceLookup = 128 TEXMAN_ForceLookup = 128,
TEXMAN_NoAlias = 256,
}; };
enum enum
@ -144,6 +145,8 @@ public:
tmanips.Remove(cname); tmanips.Remove(cname);
} }
void AddAlias(const char* name, FGameTexture* tex);
private: private:
// texture counting // texture counting
@ -190,6 +193,7 @@ private:
TArray<int> Translation; TArray<int> Translation;
TMap<FName, TextureManipulation> tmanips; TMap<FName, TextureManipulation> tmanips;
TMap<FName, int> aliases;
public: public:

View file

@ -369,11 +369,11 @@ public:
DRRLevelSummaryScreen(bool dofadeout = true) : DScreenJob(dofadeout? (fadein | fadeout) : fadein) DRRLevelSummaryScreen(bool dofadeout = true) : DScreenJob(dofadeout? (fadein | fadeout) : fadein)
{ {
if (currentLevel->flags & MI_USERMAP) if (currentLevel->flags & MI_USERMAP)
gfx_offset = RRTILE403; gfx_offset = BONUSPIC01;
else if (!isRRRA()) else if (!isRRRA())
gfx_offset = RRTILE403 + clamp((currentLevel->levelNumber / 100) * 7 + (currentLevel->levelNumber % 100), 0, 13); gfx_offset = BONUSPIC01 + clamp((currentLevel->levelNumber / 100) * 7 + (currentLevel->levelNumber % 100), 0, 13);
else else
gfx_offset = LEVELMAP + clamp((currentLevel->levelNumber / 100) * 7 + (currentLevel->levelNumber % 100), 0, 13); gfx_offset = LEVELMAP01 + clamp((currentLevel->levelNumber / 100) * 7 + (currentLevel->levelNumber % 100), 0, 13);
lastmapname = currentLevel->DisplayName(); lastmapname = currentLevel->DisplayName();
@ -544,7 +544,7 @@ public:
int Frame(uint64_t clock, bool skiprequest) int Frame(uint64_t clock, bool skiprequest)
{ {
int currentclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
auto tex = tileGetTexture(RRTILE8677 + ((currentclock >> 4) & 1)); auto tex = tileGetTexture(ENDGAME + ((currentclock >> 4) & 1));
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE); DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE);
if (!S_CheckSoundPlaying(-1, 35) && currentclock > 15*120) return 0; // make sure it stays, even if sound is off. if (!S_CheckSoundPlaying(-1, 35) && currentclock > 15*120) return 0; // make sure it stays, even if sound is off.
if (skiprequest) if (skiprequest)

View file

@ -242,6 +242,27 @@ static void initTiles()
tileDelete(FOF); tileDelete(FOF);
} }
#define x(a, b) registerName(#a, b);
#define y(a, b) // Do not create names for RRTILExxxx.
static void SetTileNames()
{
auto registerName = [](const char* name, int index)
{
TexMan.AddAlias(name, tileGetTexture(index));
};
if (!isRR())
{
#include "namelist_d.h"
}
else
{
#include "namelist_r.h"
}
}
#undef x
#undef y
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// set up the game module's state // set up the game module's state
@ -313,6 +334,7 @@ void GameInterface::app_init()
} }
LoadDefinitions(); LoadDefinitions();
SetTileNames();
TileFiles.SetBackup(); TileFiles.SetBackup();
if (ud.multimode > 1) if (ud.multimode > 1)

View file

@ -0,0 +1,754 @@
x(ARROW, 20)
x(FIRSTGUNSPRITE, 21)
x(CHAINGUNSPRITE, 22)
x(RPGSPRITE, 23)
x(FREEZESPRITE, 24)
x(SHRINKERSPRITE, 25)
x(HEAVYHBOMB, 26)
x(TRIPBOMBSPRITE, 27)
x(SHOTGUNSPRITE, 28)
x(DEVISTATORSPRITE, 29)
x(HEALTHBOX, 30)
x(AMMOBOX, 31)
x(GROWSPRITEICON, 32)
x(INVENTORYBOX, 33)
x(FREEZEAMMO, 37)
x(AMMO, 40)
x(BATTERYAMMO, 41)
x(DEVISTATORAMMO, 42)
x(RPGAMMO, 44)
x(GROWAMMO, 45)
x(CRYSTALAMMO, 46)
x(HBOMBAMMO, 47)
x(AMMOLOTS, 48)
x(SHOTGUNAMMO, 49)
x(COLA, 51)
x(SIXPAK, 52)
x(FIRSTAID, 53)
x(SHIELD, 54)
x(STEROIDS, 55)
x(AIRTANK, 56)
x(JETPACK, 57)
x(HEATSENSOR, 59)
x(ACCESSCARD, 60)
x(BOOTS, 61)
x(MIRRORBROKE, 70)
x(CLOUDYOCEAN, 78)
x(CLOUDYSKIES, 79)
x(MOONSKY1, 80)
x(MOONSKY2, 81)
x(MOONSKY3, 82)
x(MOONSKY4, 83)
x(BIGORBIT1, 84)
x(BIGORBIT2, 85)
x(BIGORBIT3, 86)
x(BIGORBIT4, 87)
x(BIGORBIT5, 88)
x(LA, 89)
x(REDSKY1, 98)
x(REDSKY2, 99)
x(ATOMICHEALTH, 100)
x(TECHLIGHT2, 120)
x(TECHLIGHTBUST2, 121)
x(TECHLIGHT4, 122)
x(TECHLIGHTBUST4, 123)
x(WALLLIGHT4, 124)
x(WALLLIGHTBUST4, 125)
x(ACCESSSWITCH, 130)
x(SLOTDOOR, 132)
x(LIGHTSWITCH, 134)
x(SPACEDOORSWITCH, 136)
x(SPACELIGHTSWITCH, 138)
x(FRANKENSTINESWITCH, 140)
x(NUKEBUTTON, 142)
x(MULTISWITCH, 146)
x(DOORTILE5, 150)
x(DOORTILE6, 151)
x(DOORTILE1, 152)
x(DOORTILE2, 153)
x(DOORTILE3, 154)
x(DOORTILE4, 155)
x(DOORTILE7, 156)
x(DOORTILE8, 157)
x(DOORTILE9, 158)
x(DOORTILE10, 159)
x(DOORSHOCK, 160)
x(DIPSWITCH, 162)
x(DIPSWITCH2, 164)
x(TECHSWITCH, 166)
x(DIPSWITCH3, 168)
x(ACCESSSWITCH2, 170)
x(REFLECTWATERTILE, 180)
x(FLOORSLIME, 200)
x(BIGFORCE, 230)
x(EPISODE, 247)
x(MASKWALL9, 255)
x(W_LIGHT, 260)
x(SCREENBREAK1, 263)
x(SCREENBREAK2, 264)
x(SCREENBREAK3, 265)
x(SCREENBREAK4, 266)
x(SCREENBREAK5, 267)
x(SCREENBREAK6, 268)
x(SCREENBREAK7, 269)
x(SCREENBREAK8, 270)
x(SCREENBREAK9, 271)
x(SCREENBREAK10, 272)
x(SCREENBREAK11, 273)
x(SCREENBREAK12, 274)
x(SCREENBREAK13, 275)
x(MASKWALL1, 285)
x(W_TECHWALL1, 293)
x(W_TECHWALL2, 297)
x(W_TECHWALL15, 299)
x(W_TECHWALL3, 301)
x(W_TECHWALL4, 305)
x(W_TECHWALL10, 306)
x(W_TECHWALL16, 307)
x(WATERTILE2, 336)
x(BPANNEL1, 341)
x(PANNEL1, 342)
x(PANNEL2, 343)
x(WATERTILE, 344)
x(STATIC, 351)
x(W_SCREENBREAK, 357)
x(W_HITTECHWALL3, 360)
x(W_HITTECHWALL4, 361)
x(W_HITTECHWALL2, 362)
x(W_HITTECHWALL1, 363)
x(MASKWALL10, 387)
x(MASKWALL11, 391)
x(DOORTILE22, 395)
x(FANSPRITE, 407)
x(FANSPRITEBROKE, 411)
x(FANSHADOW, 412)
x(FANSHADOWBROKE, 416)
x(DOORTILE18, 447)
x(DOORTILE19, 448)
x(DOORTILE20, 449)
x(SPACESHUTTLE, 487)
x(SATELLITE, 489)
x(VIEWSCREEN2, 499)
x(VIEWSCREENBROKE, 501)
x(VIEWSCREEN, 502)
x(GLASS, 503)
x(GLASS2, 504)
x(STAINGLASS1, 510)
x(MASKWALL5, 514)
x(SATELITE, 516)
x(FUELPOD, 517)
x(SLIMEPIPE, 538)
x(CRACK1, 546)
x(CRACK2, 547)
x(CRACK3, 548)
x(CRACK4, 549)
x(FOOTPRINTS, 550)
x(DOMELITE, 551)
x(CAMERAPOLE, 554)
x(CHAIR1, 556)
x(CHAIR2, 557)
x(BROKENCHAIR, 559)
x(MIRROR, 560)
x(WATERFOUNTAIN, 563)
x(WATERFOUNTAINBROKE, 567)
x(FEMMAG1, 568)
x(TOILET, 569)
x(STALL, 571)
x(STALLBROKE, 573)
x(FEMMAG2, 577)
x(REACTOR2, 578)
x(REACTOR2BURNT, 579)
x(REACTOR2SPARK, 580)
x(GRATE1, 595)
x(BGRATE1, 596)
x(SOLARPANNEL, 602)
x(NAKED1, 603)
x(ANTENNA, 607)
x(MASKWALL12, 609)
x(TOILETBROKE, 615)
x(PIPE2, 616)
x(PIPE1B, 617)
x(PIPE3, 618)
x(PIPE1, 619)
x(CAMERA1, 621)
x(BRICK, 626)
x(SPLINTERWOOD, 630)
x(PIPE2B, 633)
x(BOLT1, 634)
x(W_NUMBERS, 640)
x(WATERDRIP, 660)
x(WATERBUBBLE, 661)
x(WATERBUBBLEMAKER, 662)
x(W_FORCEFIELD, 663)
x(VACUUM, 669)
x(FOOTPRINTS2, 672)
x(FOOTPRINTS3, 673)
x(FOOTPRINTS4, 674)
x(EGG, 675)
x(SCALE, 678)
x(CHAIR3, 680)
x(CAMERALIGHT, 685)
x(MOVIECAMERA, 686)
x(IVUNIT, 689)
x(POT1, 694)
x(POT2, 695)
x(POT3, 697)
x(PIPE3B, 700)
x(WALLLIGHT3, 701)
x(WALLLIGHTBUST3, 702)
x(WALLLIGHT1, 703)
x(WALLLIGHTBUST1, 704)
x(WALLLIGHT2, 705)
x(WALLLIGHTBUST2, 706)
x(LIGHTSWITCH2, 712)
x(WAITTOBESEATED, 716)
x(DOORTILE14, 717)
x(STATUE, 753)
x(MIKE, 762)
x(VASE, 765)
x(SUSHIPLATE1, 768)
x(SUSHIPLATE2, 769)
x(SUSHIPLATE3, 774)
x(SUSHIPLATE4, 779)
x(DOORTILE16, 781)
x(SUSHIPLATE5, 792)
x(OJ, 806)
x(MASKWALL13, 830)
x(HURTRAIL, 859)
x(POWERSWITCH1, 860)
x(LOCKSWITCH1, 862)
x(POWERSWITCH2, 864)
x(ATM, 867)
x(STATUEFLASH, 869)
x(ATMBROKE, 888)
x(BIGHOLE2, 893)
x(STRIPEBALL, 901)
x(QUEBALL, 902)
x(POCKET, 903)
x(WOODENHORSE, 904)
x(TREE1, 908)
x(TREE2, 910)
x(CACTUS, 911)
x(MASKWALL2, 913)
x(MASKWALL3, 914)
x(MASKWALL4, 915)
x(FIREEXT, 916)
x(TOILETWATER, 921)
x(NEON1, 925)
x(NEON2, 926)
x(CACTUSBROKE, 939)
x(BOUNCEMINE, 940)
x(BROKEFIREHYDRENT, 950)
x(BOX, 951)
x(BULLETHOLE, 952)
x(BOTTLE1, 954)
x(BOTTLE2, 955)
x(BOTTLE3, 956)
x(BOTTLE4, 957)
x(FEMPIC5, 963)
x(FEMPIC6, 964)
x(FEMPIC7, 965)
x(HYDROPLANT, 969)
x(OCEANSPRITE1, 971)
x(OCEANSPRITE2, 972)
x(OCEANSPRITE3, 973)
x(OCEANSPRITE4, 974)
x(OCEANSPRITE5, 975)
x(GENERICPOLE, 977)
x(CONE, 978)
x(HANGLIGHT, 979)
x(HYDRENT, 981)
x(MASKWALL14, 988)
x(TIRE, 990)
x(PIPE5, 994)
x(PIPE6, 995)
x(PIPE4, 996)
x(PIPE4B, 997)
x(BROKEHYDROPLANT, 1003)
x(PIPE5B, 1005)
x(NEON3, 1007)
x(NEON4, 1008)
x(NEON5, 1009)
x(BOTTLE5, 1012)
x(BOTTLE6, 1013)
x(BOTTLE8, 1014)
x(SPOTLITE, 1020)
x(HANGOOZ, 1022)
x(MASKWALL15, 1024)
x(BOTTLE7, 1025)
x(HORSEONSIDE, 1026)
x(GLASSPIECES, 1031)
x(HORSELITE, 1034)
x(DONUTS, 1045)
x(NEON6, 1046)
x(MASKWALL6, 1059)
x(CLOCK, 1060)
x(RUBBERCAN, 1062)
x(BROKENCLOCK, 1067)
x(PLUG, 1069)
x(OOZFILTER, 1079)
x(FLOORPLASMA, 1082)
x(REACTOR, 1088)
x(REACTORSPARK, 1092)
x(REACTORBURNT, 1096)
x(DOORTILE15, 1102)
x(HANDSWITCH, 1111)
x(CIRCLEPANNEL, 1113)
x(CIRCLEPANNELBROKE, 1114)
x(PULLSWITCH, 1122)
x(MASKWALL8, 1124)
x(BIGHOLE, 1141)
x(ALIENSWITCH, 1142)
x(DOORTILE21, 1144)
x(HANDPRINTSWITCH, 1155)
x(BOTTLE10, 1157)
x(BOTTLE11, 1158)
x(BOTTLE12, 1159)
x(BOTTLE13, 1160)
x(BOTTLE14, 1161)
x(BOTTLE15, 1162)
x(BOTTLE16, 1163)
x(BOTTLE17, 1164)
x(BOTTLE18, 1165)
x(BOTTLE19, 1166)
x(DOORTILE17, 1169)
x(MASKWALL7, 1174)
x(JAILBARBREAK, 1175)
x(DOORTILE11, 1178)
x(DOORTILE12, 1179)
x(VENDMACHINE, 1212)
x(VENDMACHINEBROKE, 1214)
x(COLAMACHINE, 1215)
x(COLAMACHINEBROKE, 1217)
x(CRANEPOLE, 1221)
x(CRANE, 1222)
x(BARBROKE, 1225)
x(BLOODPOOL, 1226)
x(NUKEBARREL, 1227)
x(NUKEBARRELDENTED, 1228)
x(NUKEBARRELLEAKED, 1229)
x(CANWITHSOMETHING, 1232)
x(MONEY, 1233)
x(BANNER, 1236)
x(EXPLODINGBARREL, 1238)
x(EXPLODINGBARREL2, 1239)
x(FIREBARREL, 1240)
x(SEENINE, 1247)
x(SEENINEDEAD, 1248)
x(STEAM, 1250)
x(CEILINGSTEAM, 1255)
x(PIPE6B, 1260)
x(TRANSPORTERBEAM, 1261)
x(RAT, 1267)
x(TRASH, 1272)
x(FEMPIC1, 1280)
x(FEMPIC2, 1289)
x(BLANKSCREEN, 1293)
x(PODFEM1, 1294)
x(FEMPIC3, 1298)
x(FEMPIC4, 1306)
x(FEM1, 1312)
x(FEM2, 1317)
x(FEM3, 1321)
x(FEM5, 1323)
x(BLOODYPOLE, 1324)
x(FEM4, 1325)
x(FEM6, 1334)
x(FEM6PAD, 1335)
x(FEM8, 1336)
x(HELECOPT, 1346)
x(FETUSJIB, 1347)
x(HOLODUKE, 1348)
x(SPACEMARINE, 1353)
x(INDY, 1355)
x(FETUS, 1358)
x(FETUSBROKE, 1359)
x(MONK, 1352)
x(LUKE, 1354)
x(COOLEXPLOSION1, 1360)
x(WATERSPLASH2, 1380)
x(FIREVASE, 1390)
x(SCRATCH, 1393)
x(FEM7, 1395)
x(APLAYERTOP, 1400)
x(APLAYER, 1405)
x(PLAYERONWATER, 1420)
x(DUKELYINGDEAD, 1518)
x(DUKETORSO, 1520)
x(DUKEGUN, 1528)
x(DUKELEG, 1536)
x(SHARK, 1550)
x(BLOOD, 1620)
x(FIRELASER, 1625)
x(TRANSPORTERSTAR, 1630)
x(SPIT, 1636)
x(LOOGIE, 1637)
x(FIST, 1640)
x(FREEZEBLAST, 1641)
x(DEVISTATORBLAST, 1642)
x(SHRINKSPARK, 1646)
x(TONGUE, 1647)
x(MORTER, 1650)
x(SHRINKEREXPLOSION, 1656)
x(RADIUSEXPLOSION, 1670)
x(FORCERIPPLE, 1671)
x(LIZTROOP, 1680)
x(LIZTROOPRUNNING, 1681)
x(LIZTROOPSTAYPUT, 1682)
x(LIZTOP, 1705)
x(LIZTROOPSHOOT, 1715)
x(LIZTROOPJETPACK, 1725)
x(LIZTROOPDSPRITE, 1734)
x(LIZTROOPONTOILET, 1741)
x(LIZTROOPJUSTSIT, 1742)
x(LIZTROOPDUCKING, 1744)
x(HEADJIB1, 1768)
x(ARMJIB1, 1772)
x(LEGJIB1, 1776)
x(CANNONBALL, 1817)
x(OCTABRAIN, 1820)
x(OCTABRAINSTAYPUT, 1821)
x(OCTATOP, 1845)
x(OCTADEADSPRITE, 1855)
x(INNERJAW, 1860)
x(DRONE, 1880)
x(EXPLOSION2, 1890)
x(COMMANDER, 1920)
x(COMMANDERSTAYPUT, 1921)
x(RECON, 1960)
x(TANK, 1975)
x(PIGCOP, 2000)
x(PIGCOPSTAYPUT, 2001)
x(PIGCOPDIVE, 2045)
x(PIGCOPDEADSPRITE, 2060)
x(PIGTOP, 2061)
x(LIZMAN, 2120)
x(LIZMANSTAYPUT, 2121)
x(LIZMANSPITTING, 2150)
x(LIZMANFEEDING, 2160)
x(LIZMANJUMP, 2165)
x(LIZMANDEADSPRITE, 2185)
x(FECES, 2200)
x(LIZMANHEAD1, 2201)
x(LIZMANARM1, 2205)
x(LIZMANLEG1, 2209)
x(EXPLOSION2BOT, 2219)
x(USERWEAPON, 2235)
x(HEADERBAR, 2242)
x(JIBS1, 2245)
x(JIBS2, 2250)
x(JIBS3, 2255)
x(JIBS4, 2260)
x(JIBS5, 2265)
x(BURNING, 2270)
x(FIRE, 2271)
x(JIBS6, 2286)
x(BLOODSPLAT1, 2296)
x(BLOODSPLAT3, 2297)
x(BLOODSPLAT2, 2298)
x(BLOODSPLAT4, 2299)
x(OOZ, 2300)
x(OOZ2, 2309)
x(WALLBLOOD1, 2301)
x(WALLBLOOD2, 2302)
x(WALLBLOOD3, 2303)
x(WALLBLOOD4, 2304)
x(WALLBLOOD5, 2305)
x(WALLBLOOD6, 2306)
x(WALLBLOOD7, 2307)
x(WALLBLOOD8, 2308)
x(BURNING2, 2310)
x(FIRE2, 2311)
x(CRACKKNUCKLES, 2324)
x(SMALLSMOKE, 2329)
x(SMALLSMOKEMAKER, 2330)
x(FLOORFLAME, 2333)
x(ROTATEGUN, 2360)
x(GREENSLIME, 2370)
x(WATERDRIPSPLASH, 2380)
x(SCRAP6, 2390)
x(SCRAP1, 2400)
x(SCRAP2, 2404)
x(SCRAP3, 2408)
x(SCRAP4, 2412)
x(SCRAP5, 2416)
x(ORGANTIC, 2420)
x(BETAVERSION, 2440)
x(PLAYERISHERE, 2442)
x(PLAYERWASHERE, 2443)
x(SELECTDIR, 2444)
x(F1HELP, 2445)
x(NOTCHON, 2446)
x(NOTCHOFF, 2447)
x(GROWSPARK, 2448)
x(DUKEICON, 2452)
x(BADGUYICON, 2453)
x(FOODICON, 2454)
x(GETICON, 2455)
x(MENUSCREEN, 2456)
x(MENUBAR, 2457)
x(KILLSICON, 2458)
x(FIRSTAID_ICON, 2460)
x(HEAT_ICON, 2461)
x(BOTTOMSTATUSBAR, 2462)
x(BOOT_ICON, 2463)
x(FRAGBAR, 2465)
x(JETPACK_ICON, 2467)
x(AIRTANK_ICON, 2468)
x(STEROIDS_ICON, 2469)
x(HOLODUKE_ICON, 2470)
x(ACCESS_ICON, 2471)
x(DIGITALNUM, 2472)
x(DUKECAR, 2491)
x(CAMCORNER, 2482)
x(CAMLIGHT, 2484)
x(LOGO, 2485)
x(TITLE, 2486)
x(NUKEWARNINGICON, 2487)
x(MOUSECURSOR, 2488)
x(SLIDEBAR, 2489)
x(DREALMS, 2492)
x(BETASCREEN, 2493)
x(WINDOWBORDER1, 2494)
x(TEXTBOX, 2495)
x(WINDOWBORDER2, 2496)
x(DUKENUKEM, 2497)
x(THREEDEE, 2498)
x(INGAMEDUKETHREEDEE, 2499)
x(TENSCREEN, 2500)
x(PLUTOPAKSPRITE, 2501)
x(DEVISTATOR, 2510)
x(KNEE, 2521)
x(CROSSHAIR, 2523)
x(FIRSTGUN, 2524)
x(FIRSTGUNRELOAD, 2528)
x(FALLINGCLIP, 2530)
x(CLIPINHAND, 2531)
x(HAND, 2532)
x(SHELL, 2533)
x(SHOTGUNSHELL, 2535)
x(CHAINGUN, 2536)
x(RPGGUN, 2544)
x(RPGMUZZLEFLASH, 2545)
x(FREEZE, 2548)
x(CATLITE, 2552)
x(SHRINKER, 2556)
x(HANDHOLDINGLASER, 2563)
x(TRIPBOMB, 2566)
x(LASERLINE, 2567)
x(HANDHOLDINGACCESS, 2568)
x(HANDREMOTE, 2570)
x(HANDTHROW, 2573)
x(TIP, 2576)
x(GLAIR, 2578)
x(SCUBAMASK, 2581)
x(SPACEMASK, 2584)
x(FORCESPHERE, 2590)
x(SHOTSPARK1, 2595)
x(RPG, 2605)
x(LASERSITE, 2612)
x(SHOTGUN, 2613)
x(BOSS1, 2630)
x(BOSS1STAYPUT, 2631)
x(BOSS1SHOOT, 2660)
x(BOSS1LOB, 2670)
x(BOSSTOP, 2696)
x(BOSS2, 2710)
x(BOSS3, 2760)
x(SPINNINGNUKEICON, 2813)
x(BIGFNTCURSOR, 2820)
x(SMALLFNTCURSOR, 2821)
x(STARTALPHANUM, 2822)
x(ENDALPHANUM, 2915)
x(BIGALPHANUM, 2940)
x(BIGPERIOD, 3002)
x(BIGCOMMA, 3003)
x(BIGX, 3004)
x(BIGQ, 3005)
x(BIGSEMI, 3006)
x(BIGCOLIN, 3007)
x(THREEBYFIVE, 3010)
x(BIGAPPOS, 3022)
x(BLANK, 3026)
x(MINIFONT, 3072)
x(BUTTON1, 3164)
x(GLASS3, 3187)
x(RESPAWNMARKERRED, 3190)
x(RESPAWNMARKERYELLOW, 3200)
x(RESPAWNMARKERGREEN, 3210)
x(BONUSSCREEN, 3240)
x(VIEWBORDER, 3250)
x(VICTORY1, 3260)
x(ORDERING, 3270)
x(TEXTSTORY, 3280)
x(LOADSCREEN, 3281)
x(E1ENDSCREEN, 3292)
x(E2ENDSCREEN, 3293)
x(BORNTOBEWILDSCREEN, 3370)
x(BLIMP, 3400)
x(FEM9, 3450)
x(FOOTPRINT, 3701)
x(FRAMEEFFECT1_13, 3999)
x(POOP, 4094)
x(FRAMEEFFECT1, 4095)
x(PANNEL3, 4099)
x(SCREENBREAK14, 4120)
x(SCREENBREAK15, 4123)
x(SCREENBREAK19, 4125)
x(SCREENBREAK16, 4127)
x(SCREENBREAK17, 4128)
x(SCREENBREAK18, 4129)
x(W_TECHWALL11, 4130)
x(W_TECHWALL12, 4131)
x(W_TECHWALL13, 4132)
x(W_TECHWALL14, 4133)
x(W_TECHWALL5, 4134)
x(W_TECHWALL6, 4136)
x(W_TECHWALL7, 4138)
x(W_TECHWALL8, 4140)
x(W_TECHWALL9, 4142)
x(BPANNEL3, 4100)
x(W_HITTECHWALL16, 4144)
x(W_HITTECHWALL10, 4145)
x(W_HITTECHWALL15, 4147)
x(W_MILKSHELF, 4181)
x(W_MILKSHELFBROKE, 4203)
x(PURPLELAVA, 4240)
x(LAVABUBBLE, 4340)
x(DUKECUTOUT, 4352)
x(TARGET, 4359)
x(GUNPOWDERBARREL, 4360)
x(DUCK, 4361)
x(HATRACK, 4367)
x(DESKLAMP, 4370)
x(COFFEEMACHINE, 4372)
x(CUPS, 4373)
x(GAVALS, 4374)
x(GAVALS2, 4375)
x(POLICELIGHTPOLE, 4377)
x(FLOORBASKET, 4388)
x(PUKE, 4389)
x(DOORTILE23, 4391)
x(TOPSECRET, 4396)
x(SPEAKER, 4397)
x(TEDDYBEAR, 4400)
x(ROBOTDOG, 4402)
x(ROBOTPIRATE, 4404)
x(ROBOTMOUSE, 4407)
x(MAIL, 4410)
x(MAILBAG, 4413)
x(HOTMEAT, 4427)
x(COFFEEMUG, 4438)
x(DONUTS2, 4440)
x(TRIPODCAMERA, 4444)
x(METER, 4453)
x(DESKPHONE, 4454)
x(GUMBALLMACHINE, 4458)
x(GUMBALLMACHINEBROKE, 4459)
x(PAPER, 4460)
x(MACE, 4464)
x(GENERICPOLE2, 4465)
x(XXXSTACY, 4470)
x(WETFLOOR, 4495)
x(BROOM, 4496)
x(MOP, 4497)
x(LETTER, 4502)
x(PIRATE1A, 4510)
x(PIRATE4A, 4511)
x(PIRATE2A, 4512)
x(PIRATE5A, 4513)
x(PIRATE3A, 4514)
x(PIRATE6A, 4515)
x(PIRATEHALF, 4516)
x(CHESTOFGOLD, 4520)
x(SIDEBOLT1, 4525)
x(FOODOBJECT1, 4530)
x(FOODOBJECT2, 4531)
x(FOODOBJECT3, 4532)
x(FOODOBJECT4, 4533)
x(FOODOBJECT5, 4534)
x(FOODOBJECT6, 4535)
x(FOODOBJECT7, 4536)
x(FOODOBJECT8, 4537)
x(FOODOBJECT9, 4538)
x(FOODOBJECT10, 4539)
x(FOODOBJECT11, 4540)
x(FOODOBJECT12, 4541)
x(FOODOBJECT13, 4542)
x(FOODOBJECT14, 4543)
x(FOODOBJECT15, 4544)
x(FOODOBJECT16, 4545)
x(FOODOBJECT17, 4546)
x(FOODOBJECT18, 4547)
x(FOODOBJECT19, 4548)
x(FOODOBJECT20, 4549)
x(HEADLAMP, 4550)
x(TAMPON, 4557)
x(SKINNEDCHICKEN, 4554)
x(FEATHEREDCHICKEN, 4555)
x(ROBOTDOG2, 4560)
x(JOLLYMEAL, 4569)
x(DUKEBURGER, 4570)
x(SHOPPINGCART, 4576)
x(CANWITHSOMETHING2, 4580)
x(CANWITHSOMETHING3, 4581)
x(CANWITHSOMETHING4, 4582)
x(SNAKEP, 4590)
x(DOLPHIN1, 4591)
x(DOLPHIN2, 4592)
x(NEWBEAST, 4610)
x(NEWBEASTSTAYPUT, 4611)
x(NEWBEASTJUMP, 4690)
x(NEWBEASTHANG, 4670)
x(NEWBEASTHANGDEAD, 4671)
x(BOSS4, 4740)
x(BOSS4STAYPUT, 4741)
x(FEM10, 4864)
x(TOUGHGAL, 4866)
x(MAN, 4871)
x(MAN2, 4872)
x(WOMAN, 4874)
x(PLEASEWAIT, 4887)
x(NATURALLIGHTNING, 4890)
x(WEATHERWARN, 4893)
x(DUKETAG, 4900)
x(SIGN1, 4909)
x(SIGN2, 4912)
x(JURYGUY, 4943)
// New names from World Tour
x(WIDESCREENSTATUSBAR, 5120)
x(RPGGUNWIDE, 5121)
x(FIRSTGUNRELOADWIDE, 5122)
x(FREEZEWIDE, 5123)
x(FREEZEFIREWIDE, 5124)
x(SHRINKERWIDE, 5127)
x(CRACKKNUCKLESWIDE, 5129)
x(ONFIRESMOKE, 5143)
x(LAVASPLASH, 5371)
x(BOSS2STAYPUT, 2711)
x(BOSS3STAYPUT, 2761)
x(WTGLASS1, 5736)
x(WTGLASS2, 5737)
x(FLAMETHROWERSPRITE, 5134)
x(FLAMETHROWERAMMO, 5135)
x(FLAMETHROWER, 5138)
x(ONFIRE, 5152)
x(LAVAPOOL, 5304)
x(LAVAPOOLBUBBLE, 5207)
x(WHISPYSMOKE, 5268)
x(FLAMETHROWERFIRE, 5139)
x(FLAMETHROWERFLAME, 1891)
x(FLAMETHROWERPILOT, 5174)
x(FIREBALL, 5163)
x(BURNEDCORPSE, 5173)
x(FIREFLY, 5180)
x(FIREFLYSHRINKEFFECT, 5360)
x(FIREFLYGROWEFFECT, 5367)
x(FIREFLYFLYINGEFFECT, 5296)
x(DEVELOPERCOMMENTARY, 5294)
x(BOSS5, 5310)
x(BOSS5STAYPUT, 5311)
x(SERIOUSSAM, 5846)

File diff suppressed because it is too large Load diff

View file

@ -27,761 +27,11 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
BEGIN_DUKE_NS BEGIN_DUKE_NS
#define x(a, b) a = b,
enum enum
{ {
ARROW = 20, #include "namelist_d.h"
FIRSTGUNSPRITE = 21,
CHAINGUNSPRITE = 22,
RPGSPRITE = 23,
FREEZESPRITE = 24,
SHRINKERSPRITE = 25,
HEAVYHBOMB = 26,
TRIPBOMBSPRITE = 27,
SHOTGUNSPRITE = 28,
DEVISTATORSPRITE = 29,
HEALTHBOX = 30,
AMMOBOX = 31,
GROWSPRITEICON = 32,
INVENTORYBOX = 33,
FREEZEAMMO = 37,
AMMO = 40,
BATTERYAMMO = 41,
DEVISTATORAMMO = 42,
RPGAMMO = 44,
GROWAMMO = 45,
CRYSTALAMMO = 46,
HBOMBAMMO = 47,
AMMOLOTS = 48,
SHOTGUNAMMO = 49,
COLA = 51,
SIXPAK = 52,
FIRSTAID = 53,
SHIELD = 54,
STEROIDS = 55,
AIRTANK = 56,
JETPACK = 57,
HEATSENSOR = 59,
ACCESSCARD = 60,
BOOTS = 61,
MIRRORBROKE = 70,
CLOUDYOCEAN = 78,
CLOUDYSKIES = 79,
MOONSKY1 = 80,
MOONSKY2 = 81,
MOONSKY3 = 82,
MOONSKY4 = 83,
BIGORBIT1 = 84,
BIGORBIT2 = 85,
BIGORBIT3 = 86,
BIGORBIT4 = 87,
BIGORBIT5 = 88,
LA = 89,
REDSKY1 = 98,
REDSKY2 = 99,
ATOMICHEALTH = 100,
TECHLIGHT2 = 120,
TECHLIGHTBUST2 = 121,
TECHLIGHT4 = 122,
TECHLIGHTBUST4 = 123,
WALLLIGHT4 = 124,
WALLLIGHTBUST4 = 125,
ACCESSSWITCH = 130,
SLOTDOOR = 132,
LIGHTSWITCH = 134,
SPACEDOORSWITCH = 136,
SPACELIGHTSWITCH = 138,
FRANKENSTINESWITCH = 140,
NUKEBUTTON = 142,
MULTISWITCH = 146,
DOORTILE5 = 150,
DOORTILE6 = 151,
DOORTILE1 = 152,
DOORTILE2 = 153,
DOORTILE3 = 154,
DOORTILE4 = 155,
DOORTILE7 = 156,
DOORTILE8 = 157,
DOORTILE9 = 158,
DOORTILE10 = 159,
DOORSHOCK = 160,
DIPSWITCH = 162,
DIPSWITCH2 = 164,
TECHSWITCH = 166,
DIPSWITCH3 = 168,
ACCESSSWITCH2 = 170,
REFLECTWATERTILE = 180,
FLOORSLIME = 200,
BIGFORCE = 230,
EPISODE = 247,
MASKWALL9 = 255,
W_LIGHT = 260,
SCREENBREAK1 = 263,
SCREENBREAK2 = 264,
SCREENBREAK3 = 265,
SCREENBREAK4 = 266,
SCREENBREAK5 = 267,
SCREENBREAK6 = 268,
SCREENBREAK7 = 269,
SCREENBREAK8 = 270,
SCREENBREAK9 = 271,
SCREENBREAK10 = 272,
SCREENBREAK11 = 273,
SCREENBREAK12 = 274,
SCREENBREAK13 = 275,
MASKWALL1 = 285,
W_TECHWALL1 = 293,
W_TECHWALL2 = 297,
W_TECHWALL15 = 299,
W_TECHWALL3 = 301,
W_TECHWALL4 = 305,
W_TECHWALL10 = 306,
W_TECHWALL16 = 307,
WATERTILE2 = 336,
BPANNEL1 = 341,
PANNEL1 = 342,
PANNEL2 = 343,
WATERTILE = 344,
STATIC = 351,
W_SCREENBREAK = 357,
W_HITTECHWALL3 = 360,
W_HITTECHWALL4 = 361,
W_HITTECHWALL2 = 362,
W_HITTECHWALL1 = 363,
MASKWALL10 = 387,
MASKWALL11 = 391,
DOORTILE22 = 395,
FANSPRITE = 407,
FANSPRITEBROKE = 411,
FANSHADOW = 412,
FANSHADOWBROKE = 416,
DOORTILE18 = 447,
DOORTILE19 = 448,
DOORTILE20 = 449,
SPACESHUTTLE = 487,
SATELLITE = 489,
VIEWSCREEN2 = 499,
VIEWSCREENBROKE = 501,
VIEWSCREEN = 502,
GLASS = 503,
GLASS2 = 504,
STAINGLASS1 = 510,
MASKWALL5 = 514,
SATELITE = 516,
FUELPOD = 517,
SLIMEPIPE = 538,
CRACK1 = 546,
CRACK2 = 547,
CRACK3 = 548,
CRACK4 = 549,
FOOTPRINTS = 550,
DOMELITE = 551,
CAMERAPOLE = 554,
CHAIR1 = 556,
CHAIR2 = 557,
BROKENCHAIR = 559,
MIRROR = 560,
WATERFOUNTAIN = 563,
WATERFOUNTAINBROKE = 567,
FEMMAG1 = 568,
TOILET = 569,
STALL = 571,
STALLBROKE = 573,
FEMMAG2 = 577,
REACTOR2 = 578,
REACTOR2BURNT = 579,
REACTOR2SPARK = 580,
GRATE1 = 595,
BGRATE1 = 596,
SOLARPANNEL = 602,
NAKED1 = 603,
ANTENNA = 607,
MASKWALL12 = 609,
TOILETBROKE = 615,
PIPE2 = 616,
PIPE1B = 617,
PIPE3 = 618,
PIPE1 = 619,
CAMERA1 = 621,
BRICK = 626,
SPLINTERWOOD = 630,
PIPE2B = 633,
BOLT1 = 634,
W_NUMBERS = 640,
WATERDRIP = 660,
WATERBUBBLE = 661,
WATERBUBBLEMAKER = 662,
W_FORCEFIELD = 663,
VACUUM = 669,
FOOTPRINTS2 = 672,
FOOTPRINTS3 = 673,
FOOTPRINTS4 = 674,
EGG = 675,
SCALE = 678,
CHAIR3 = 680,
CAMERALIGHT = 685,
MOVIECAMERA = 686,
IVUNIT = 689,
POT1 = 694,
POT2 = 695,
POT3 = 697,
PIPE3B = 700,
WALLLIGHT3 = 701,
WALLLIGHTBUST3 = 702,
WALLLIGHT1 = 703,
WALLLIGHTBUST1 = 704,
WALLLIGHT2 = 705,
WALLLIGHTBUST2 = 706,
LIGHTSWITCH2 = 712,
WAITTOBESEATED = 716,
DOORTILE14 = 717,
STATUE = 753,
MIKE = 762,
VASE = 765,
SUSHIPLATE1 = 768,
SUSHIPLATE2 = 769,
SUSHIPLATE3 = 774,
SUSHIPLATE4 = 779,
DOORTILE16 = 781,
SUSHIPLATE5 = 792,
OJ = 806,
MASKWALL13 = 830,
HURTRAIL = 859,
POWERSWITCH1 = 860,
LOCKSWITCH1 = 862,
POWERSWITCH2 = 864,
ATM = 867,
STATUEFLASH = 869,
ATMBROKE = 888,
BIGHOLE2 = 893,
STRIPEBALL = 901,
QUEBALL = 902,
POCKET = 903,
WOODENHORSE = 904,
TREE1 = 908,
TREE2 = 910,
CACTUS = 911,
MASKWALL2 = 913,
MASKWALL3 = 914,
MASKWALL4 = 915,
FIREEXT = 916,
TOILETWATER = 921,
NEON1 = 925,
NEON2 = 926,
CACTUSBROKE = 939,
BOUNCEMINE = 940,
BROKEFIREHYDRENT = 950,
BOX = 951,
BULLETHOLE = 952,
BOTTLE1 = 954,
BOTTLE2 = 955,
BOTTLE3 = 956,
BOTTLE4 = 957,
FEMPIC5 = 963,
FEMPIC6 = 964,
FEMPIC7 = 965,
HYDROPLANT = 969,
OCEANSPRITE1 = 971,
OCEANSPRITE2 = 972,
OCEANSPRITE3 = 973,
OCEANSPRITE4 = 974,
OCEANSPRITE5 = 975,
GENERICPOLE = 977,
CONE = 978,
HANGLIGHT = 979,
HYDRENT = 981,
MASKWALL14 = 988,
TIRE = 990,
PIPE5 = 994,
PIPE6 = 995,
PIPE4 = 996,
PIPE4B = 997,
BROKEHYDROPLANT = 1003,
PIPE5B = 1005,
NEON3 = 1007,
NEON4 = 1008,
NEON5 = 1009,
BOTTLE5 = 1012,
BOTTLE6 = 1013,
BOTTLE8 = 1014,
SPOTLITE = 1020,
HANGOOZ = 1022,
MASKWALL15 = 1024,
BOTTLE7 = 1025,
HORSEONSIDE = 1026,
GLASSPIECES = 1031,
HORSELITE = 1034,
DONUTS = 1045,
NEON6 = 1046,
MASKWALL6 = 1059,
CLOCK = 1060,
RUBBERCAN = 1062,
BROKENCLOCK = 1067,
PLUG = 1069,
OOZFILTER = 1079,
FLOORPLASMA = 1082,
REACTOR = 1088,
REACTORSPARK = 1092,
REACTORBURNT = 1096,
DOORTILE15 = 1102,
HANDSWITCH = 1111,
CIRCLEPANNEL = 1113,
CIRCLEPANNELBROKE = 1114,
PULLSWITCH = 1122,
MASKWALL8 = 1124,
BIGHOLE = 1141,
ALIENSWITCH = 1142,
DOORTILE21 = 1144,
HANDPRINTSWITCH = 1155,
BOTTLE10 = 1157,
BOTTLE11 = 1158,
BOTTLE12 = 1159,
BOTTLE13 = 1160,
BOTTLE14 = 1161,
BOTTLE15 = 1162,
BOTTLE16 = 1163,
BOTTLE17 = 1164,
BOTTLE18 = 1165,
BOTTLE19 = 1166,
DOORTILE17 = 1169,
MASKWALL7 = 1174,
JAILBARBREAK = 1175,
DOORTILE11 = 1178,
DOORTILE12 = 1179,
VENDMACHINE = 1212,
VENDMACHINEBROKE = 1214,
COLAMACHINE = 1215,
COLAMACHINEBROKE = 1217,
CRANEPOLE = 1221,
CRANE = 1222,
BARBROKE = 1225,
BLOODPOOL = 1226,
NUKEBARREL = 1227,
NUKEBARRELDENTED = 1228,
NUKEBARRELLEAKED = 1229,
CANWITHSOMETHING = 1232,
MONEY = 1233,
BANNER = 1236,
EXPLODINGBARREL = 1238,
EXPLODINGBARREL2 = 1239,
FIREBARREL = 1240,
SEENINE = 1247,
SEENINEDEAD = 1248,
STEAM = 1250,
CEILINGSTEAM = 1255,
PIPE6B = 1260,
TRANSPORTERBEAM = 1261,
RAT = 1267,
TRASH = 1272,
FEMPIC1 = 1280,
FEMPIC2 = 1289,
BLANKSCREEN = 1293,
PODFEM1 = 1294,
FEMPIC3 = 1298,
FEMPIC4 = 1306,
FEM1 = 1312,
FEM2 = 1317,
FEM3 = 1321,
FEM5 = 1323,
BLOODYPOLE = 1324,
FEM4 = 1325,
FEM6 = 1334,
FEM6PAD = 1335,
FEM8 = 1336,
HELECOPT = 1346,
FETUSJIB = 1347,
HOLODUKE = 1348,
SPACEMARINE = 1353,
INDY = 1355,
FETUS = 1358,
FETUSBROKE = 1359,
MONK = 1352,
LUKE = 1354,
COOLEXPLOSION1 = 1360,
WATERSPLASH2 = 1380,
FIREVASE = 1390,
SCRATCH = 1393,
FEM7 = 1395,
APLAYERTOP = 1400,
APLAYER = 1405,
PLAYERONWATER = 1420,
DUKELYINGDEAD = 1518,
DUKETORSO = 1520,
DUKEGUN = 1528,
DUKELEG = 1536,
SHARK = 1550,
BLOOD = 1620,
FIRELASER = 1625,
TRANSPORTERSTAR = 1630,
SPIT = 1636,
LOOGIE = 1637,
FIST = 1640,
FREEZEBLAST = 1641,
DEVISTATORBLAST = 1642,
SHRINKSPARK = 1646,
TONGUE = 1647,
MORTER = 1650,
SHRINKEREXPLOSION = 1656,
RADIUSEXPLOSION = 1670,
FORCERIPPLE = 1671,
LIZTROOP = 1680,
LIZTROOPRUNNING = 1681,
LIZTROOPSTAYPUT = 1682,
LIZTOP = 1705,
LIZTROOPSHOOT = 1715,
LIZTROOPJETPACK = 1725,
LIZTROOPDSPRITE = 1734,
LIZTROOPONTOILET = 1741,
LIZTROOPJUSTSIT = 1742,
LIZTROOPDUCKING = 1744,
HEADJIB1 = 1768,
ARMJIB1 = 1772,
LEGJIB1 = 1776,
CANNONBALL = 1817,
OCTABRAIN = 1820,
OCTABRAINSTAYPUT = 1821,
OCTATOP = 1845,
OCTADEADSPRITE = 1855,
INNERJAW = 1860,
DRONE = 1880,
EXPLOSION2 = 1890,
COMMANDER = 1920,
COMMANDERSTAYPUT = 1921,
RECON = 1960,
TANK = 1975,
PIGCOP = 2000,
PIGCOPSTAYPUT = 2001,
PIGCOPDIVE = 2045,
PIGCOPDEADSPRITE = 2060,
PIGTOP = 2061,
LIZMAN = 2120,
LIZMANSTAYPUT = 2121,
LIZMANSPITTING = 2150,
LIZMANFEEDING = 2160,
LIZMANJUMP = 2165,
LIZMANDEADSPRITE = 2185,
FECES = 2200,
LIZMANHEAD1 = 2201,
LIZMANARM1 = 2205,
LIZMANLEG1 = 2209,
EXPLOSION2BOT = 2219,
USERWEAPON = 2235,
HEADERBAR = 2242,
JIBS1 = 2245,
JIBS2 = 2250,
JIBS3 = 2255,
JIBS4 = 2260,
JIBS5 = 2265,
BURNING = 2270,
FIRE = 2271,
JIBS6 = 2286,
BLOODSPLAT1 = 2296,
BLOODSPLAT3 = 2297,
BLOODSPLAT2 = 2298,
BLOODSPLAT4 = 2299,
OOZ = 2300,
OOZ2 = 2309,
WALLBLOOD1 = 2301,
WALLBLOOD2 = 2302,
WALLBLOOD3 = 2303,
WALLBLOOD4 = 2304,
WALLBLOOD5 = 2305,
WALLBLOOD6 = 2306,
WALLBLOOD7 = 2307,
WALLBLOOD8 = 2308,
BURNING2 = 2310,
FIRE2 = 2311,
CRACKKNUCKLES = 2324,
SMALLSMOKE = 2329,
SMALLSMOKEMAKER = 2330,
FLOORFLAME = 2333,
ROTATEGUN = 2360,
GREENSLIME = 2370,
WATERDRIPSPLASH = 2380,
SCRAP6 = 2390,
SCRAP1 = 2400,
SCRAP2 = 2404,
SCRAP3 = 2408,
SCRAP4 = 2412,
SCRAP5 = 2416,
ORGANTIC = 2420,
BETAVERSION = 2440,
PLAYERISHERE = 2442,
PLAYERWASHERE = 2443,
SELECTDIR = 2444,
F1HELP = 2445,
NOTCHON = 2446,
NOTCHOFF = 2447,
GROWSPARK = 2448,
DUKEICON = 2452,
BADGUYICON = 2453,
FOODICON = 2454,
GETICON = 2455,
MENUSCREEN = 2456,
MENUBAR = 2457,
KILLSICON = 2458,
FIRSTAID_ICON = 2460,
HEAT_ICON = 2461,
BOTTOMSTATUSBAR = 2462,
BOOT_ICON = 2463,
FRAGBAR = 2465,
JETPACK_ICON = 2467,
AIRTANK_ICON = 2468,
STEROIDS_ICON = 2469,
HOLODUKE_ICON = 2470,
ACCESS_ICON = 2471,
DIGITALNUM = 2472,
DUKECAR = 2491,
CAMCORNER = 2482,
CAMLIGHT = 2484,
LOGO = 2485,
TITLE = 2486,
NUKEWARNINGICON = 2487,
MOUSECURSOR = 2488,
SLIDEBAR = 2489,
DREALMS = 2492,
BETASCREEN = 2493,
WINDOWBORDER1 = 2494,
TEXTBOX = 2495,
WINDOWBORDER2 = 2496,
DUKENUKEM = 2497,
THREEDEE = 2498,
INGAMEDUKETHREEDEE = 2499,
TENSCREEN = 2500,
PLUTOPAKSPRITE = 2501,
DEVISTATOR = 2510,
KNEE = 2521,
CROSSHAIR = 2523,
FIRSTGUN = 2524,
FIRSTGUNRELOAD = 2528,
FALLINGCLIP = 2530,
CLIPINHAND = 2531,
HAND = 2532,
SHELL = 2533,
SHOTGUNSHELL = 2535,
CHAINGUN = 2536,
RPGGUN = 2544,
RPGMUZZLEFLASH = 2545,
FREEZE = 2548,
CATLITE = 2552,
SHRINKER = 2556,
HANDHOLDINGLASER = 2563,
TRIPBOMB = 2566,
LASERLINE = 2567,
HANDHOLDINGACCESS = 2568,
HANDREMOTE = 2570,
HANDTHROW = 2573,
TIP = 2576,
GLAIR = 2578,
SCUBAMASK = 2581,
SPACEMASK = 2584,
FORCESPHERE = 2590,
SHOTSPARK1 = 2595,
RPG = 2605,
LASERSITE = 2612,
SHOTGUN = 2613,
BOSS1 = 2630,
BOSS1STAYPUT = 2631,
BOSS1SHOOT = 2660,
BOSS1LOB = 2670,
BOSSTOP = 2696,
BOSS2 = 2710,
BOSS3 = 2760,
SPINNINGNUKEICON = 2813,
BIGFNTCURSOR = 2820,
SMALLFNTCURSOR = 2821,
STARTALPHANUM = 2822,
ENDALPHANUM = 2915,
BIGALPHANUM = 2940,
BIGPERIOD = 3002,
BIGCOMMA = 3003,
BIGX = 3004,
BIGQ = 3005,
BIGSEMI = 3006,
BIGCOLIN = 3007,
THREEBYFIVE = 3010,
BIGAPPOS = 3022,
BLANK = 3026,
MINIFONT = 3072,
BUTTON1 = 3164,
GLASS3 = 3187,
RESPAWNMARKERRED = 3190,
RESPAWNMARKERYELLOW = 3200,
RESPAWNMARKERGREEN = 3210,
BONUSSCREEN = 3240,
VIEWBORDER = 3250,
VICTORY1 = 3260,
ORDERING = 3270,
TEXTSTORY = 3280,
LOADSCREEN = 3281,
E1ENDSCREEN = 3292,
E2ENDSCREEN = 3293,
BORNTOBEWILDSCREEN = 3370,
BLIMP = 3400,
FEM9 = 3450,
FOOTPRINT = 3701,
FRAMEEFFECT1_13= 3999,
POOP = 4094,
FRAMEEFFECT1 = 4095,
PANNEL3 = 4099,
SCREENBREAK14 = 4120,
SCREENBREAK15 = 4123,
SCREENBREAK19 = 4125,
SCREENBREAK16 = 4127,
SCREENBREAK17 = 4128,
SCREENBREAK18 = 4129,
W_TECHWALL11 = 4130,
W_TECHWALL12 = 4131,
W_TECHWALL13 = 4132,
W_TECHWALL14 = 4133,
W_TECHWALL5 = 4134,
W_TECHWALL6 = 4136,
W_TECHWALL7 = 4138,
W_TECHWALL8 = 4140,
W_TECHWALL9 = 4142,
BPANNEL3 = 4100,
W_HITTECHWALL16 = 4144,
W_HITTECHWALL10 = 4145,
W_HITTECHWALL15 = 4147,
W_MILKSHELF = 4181,
W_MILKSHELFBROKE = 4203,
PURPLELAVA = 4240,
LAVABUBBLE = 4340,
DUKECUTOUT = 4352,
TARGET = 4359,
GUNPOWDERBARREL = 4360,
DUCK = 4361,
HATRACK = 4367,
DESKLAMP = 4370,
COFFEEMACHINE = 4372,
CUPS = 4373,
GAVALS = 4374,
GAVALS2 = 4375,
POLICELIGHTPOLE = 4377,
FLOORBASKET = 4388,
PUKE = 4389,
DOORTILE23 = 4391,
TOPSECRET = 4396,
SPEAKER = 4397,
TEDDYBEAR = 4400,
ROBOTDOG = 4402,
ROBOTPIRATE = 4404,
ROBOTMOUSE = 4407,
MAIL = 4410,
MAILBAG = 4413,
HOTMEAT = 4427,
COFFEEMUG = 4438,
DONUTS2 = 4440,
TRIPODCAMERA = 4444,
METER = 4453,
DESKPHONE = 4454,
GUMBALLMACHINE = 4458,
GUMBALLMACHINEBROKE = 4459,
PAPER = 4460,
MACE = 4464,
GENERICPOLE2 = 4465,
XXXSTACY = 4470,
WETFLOOR = 4495,
BROOM = 4496,
MOP = 4497,
LETTER = 4502,
PIRATE1A = 4510,
PIRATE4A = 4511,
PIRATE2A = 4512,
PIRATE5A = 4513,
PIRATE3A = 4514,
PIRATE6A = 4515,
PIRATEHALF = 4516,
CHESTOFGOLD = 4520,
SIDEBOLT1 = 4525,
FOODOBJECT1 = 4530,
FOODOBJECT2 = 4531,
FOODOBJECT3 = 4532,
FOODOBJECT4 = 4533,
FOODOBJECT5 = 4534,
FOODOBJECT6 = 4535,
FOODOBJECT7 = 4536,
FOODOBJECT8 = 4537,
FOODOBJECT9 = 4538,
FOODOBJECT10 = 4539,
FOODOBJECT11 = 4540,
FOODOBJECT12 = 4541,
FOODOBJECT13 = 4542,
FOODOBJECT14 = 4543,
FOODOBJECT15 = 4544,
FOODOBJECT16 = 4545,
FOODOBJECT17 = 4546,
FOODOBJECT18 = 4547,
FOODOBJECT19 = 4548,
FOODOBJECT20 = 4549,
HEADLAMP = 4550,
TAMPON = 4557,
SKINNEDCHICKEN = 4554,
FEATHEREDCHICKEN = 4555,
ROBOTDOG2 = 4560,
JOLLYMEAL = 4569,
DUKEBURGER = 4570,
SHOPPINGCART = 4576,
CANWITHSOMETHING2 = 4580,
CANWITHSOMETHING3 = 4581,
CANWITHSOMETHING4 = 4582,
SNAKEP = 4590,
DOLPHIN1 = 4591,
DOLPHIN2 = 4592,
NEWBEAST = 4610,
NEWBEASTSTAYPUT = 4611,
NEWBEASTJUMP = 4690,
NEWBEASTHANG = 4670,
NEWBEASTHANGDEAD = 4671,
BOSS4 = 4740,
BOSS4STAYPUT = 4741,
FEM10 = 4864,
TOUGHGAL = 4866,
MAN = 4871,
MAN2 = 4872,
WOMAN = 4874,
PLEASEWAIT = 4887,
NATURALLIGHTNING = 4890,
WEATHERWARN = 4893,
DUKETAG = 4900,
SIGN1 = 4909,
SIGN2 = 4912,
JURYGUY = 4943,
// New names from World Tour
WIDESCREENSTATUSBAR = 5120,
RPGGUNWIDE = 5121,
FIRSTGUNRELOADWIDE = 5122,
FREEZEWIDE = 5123,
FREEZEFIREWIDE = 5124,
SHRINKERWIDE = 5127,
CRACKKNUCKLESWIDE = 5129,
ONFIRESMOKE = 5143,
LAVASPLASH = 5371,
BOSS2STAYPUT = 2711,
BOSS3STAYPUT = 2761,
WTGLASS1 = 5736,
WTGLASS2 = 5737,
FLAMETHROWERSPRITE = 5134,
FLAMETHROWERAMMO = 5135,
FLAMETHROWER = 5138,
ONFIRE = 5152,
LAVAPOOL = 5304,
LAVAPOOLBUBBLE = 5207,
WHISPYSMOKE = 5268,
FLAMETHROWERFIRE = 5139,
FLAMETHROWERFLAME = 1891,
FLAMETHROWERPILOT = 5174,
FIREBALL = 5163,
BURNEDCORPSE = 5173,
FIREFLY = 5180,
FIREFLYSHRINKEFFECT = 5360,
FIREFLYGROWEFFECT = 5367,
FIREFLYFLYINGEFFECT = 5296,
DEVELOPERCOMMENTARY = 5294,
BOSS5 = 5310,
BOSS5STAYPUT = 5311,
SERIOUSSAM = 5846
}; };
#undef x
END_DUKE_NS END_DUKE_NS

File diff suppressed because it is too large Load diff

View file

@ -57,7 +57,7 @@ public:
// optionally draw at the top of the screen. // optionally draw at the top of the screen.
SetSize(tilesiz[BOTTOMSTATUSBAR].y); SetSize(tilesiz[BOTTOMSTATUSBAR].y);
scale = 0.5; scale = 0.5;
ammo_sprites = { -1, AMMO, SHOTGUNAMMO, BATTERYAMMO, HBOMBAMMO, HBOMBAMMO, RRTILE43, DEVISTATORAMMO, TRIPBOMBSPRITE, GROWSPRITEICON, HBOMBAMMO, -1, BOWLINGBALLSPRITE, MOTOAMMO, BOATAMMO, -1, RPG2SPRITE }; ammo_sprites = { -1, AMMO, SHOTGUNAMMO, BATTERYAMMO, HBOMBAMMO, HBOMBAMMO, SAWAMMO, DEVISTATORAMMO, TRIPBOMBSPRITE, GROWSPRITEICON, HBOMBAMMO, -1, BOWLINGBALLSPRITE, MOTOAMMO, BOATAMMO, -1, RPG2SPRITE };
item_icons = { 0, FIRSTAID_ICON, STEROIDS_ICON, HOLODUKE_ICON, JETPACK_ICON, HEAT_ICON, AIRTANK_ICON, BOOT_ICON }; item_icons = { 0, FIRSTAID_ICON, STEROIDS_ICON, HOLODUKE_ICON, JETPACK_ICON, HEAT_ICON, AIRTANK_ICON, BOOT_ICON };
} }

View file

@ -1142,7 +1142,7 @@ int spawn_r(int j, int pn)
case FIRSTAID: case FIRSTAID:
case SIXPAK: case SIXPAK:
case RRTILE43: case SAWAMMO:
case BOWLINGBALLSPRITE: case BOWLINGBALLSPRITE:
if (j >= 0) if (j >= 0)
{ {
@ -1289,7 +1289,7 @@ int spawn_r(int j, int pn)
sp->xrepeat = 18; sp->xrepeat = 18;
sp->yrepeat = 17; sp->yrepeat = 17;
break; break;
case RRTILE43: case SAWAMMO:
sp->xrepeat = 12; sp->xrepeat = 12;
sp->yrepeat = 7; sp->yrepeat = 7;
break; break;