From bfdfff7a4275175edd7bdf3c8ae6694b9399970f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 10 Dec 2022 15:55:33 +0100 Subject: [PATCH] - named all of SW's breakable wall textures. We need this later when these get exported. --- source/games/sw/src/break.cpp | 159 +++++++++++++++------------------ source/games/sw/src/namelist.h | 155 +++++++++++++++++++++++++++----- 2 files changed, 208 insertions(+), 106 deletions(-) diff --git a/source/games/sw/src/break.cpp b/source/games/sw/src/break.cpp index f433663a0..c3cd8c2f7 100644 --- a/source/games/sw/src/break.cpp +++ b/source/games/sw/src/break.cpp @@ -43,94 +43,83 @@ static void DoWallBreakSpriteMatch(int match); BREAK_INFO WallBreakInfo[] = { - { 60, -1, SHRAP_METAL, BF_KILL, 0 }, - { 82, -1, SHRAP_METAL, BF_KILL, 0 }, - { 1, 3593, SHRAP_METAL, 0, 0 }, -//{ 13, -1, SHRAP_PAPER }, -//{ 14, -1, SHRAP_PAPER }, -//{ 49, -1, SHRAP_PAPER }, -//{ 52, -1, SHRAP_PAPER }, -//{ 99, -1, SHRAP_PAPER }, -//{ 102, -1, SHRAP_PAPER }, -//{ 207, -1, SHRAP_PAPER }, - { 253, 255, SHRAP_GLASS, 0, 0 }, - { 254, 255, SHRAP_GLASS, 0, 0 }, - { 282, -1, SHRAP_GLASS, 0, 0 }, - { 283, 4974, SHRAP_METAL, 0, 0 }, - { 318, 599, SHRAP_GLASS, 0, 0}, - { 486, -1, SHRAP_METAL, 0, 0 }, - { 487, 3676, SHRAP_METAL, 0, 0 }, - { 628, 3585, SHRAP_METAL, 0, 0}, - { 630, 3586, SHRAP_METAL, 0, 0}, - { 633, 608, SHRAP_GLASS, 0, 0}, - { 634, 608, SHRAP_GLASS, 0, 0 }, - { 637, 3587, SHRAP_METAL, 0, 0}, - { 640, 3588, SHRAP_METAL, 0, 0}, - { 641, 3588, SHRAP_METAL, 0, 0}, - { 665, 3588, SHRAP_METAL, 0, 0}, - { 742, 3589, SHRAP_COIN, 0, 0}, - { 743, 3590, SHRAP_COIN, 0, 0}, - { 750, 608, SHRAP_GLASS, 0, 0}, - { 2667, 608, SHRAP_GLASS, 0, 0}, - { 2769, 3681, SHRAP_GLASS, 0, 0}, - { 2676, 3591, SHRAP_GLASS, 0, 0}, - { 2677, 3592, SHRAP_GLASS, 0, 0}, - { 2687, 2727, SHRAP_GLASS, 0, 0}, - { 2688, 2728, SHRAP_GLASS, 0, 0}, -//{ 2714, 3593, SHRAP_GLASS}, - { 2732, 3594, SHRAP_GLASS, 0, 0}, - { 2777, 3683, SHRAP_METAL, 0, 0}, - { 2778, 2757, SHRAP_GLASS, 0, 0}, - { 2801, 3591, SHRAP_GLASS, 0, 0}, - { 2804, 3595, SHRAP_GLASS, 0, 0}, - { 2807, 3596, SHRAP_GLASS, 0, 0}, - { 2810, 4989, SHRAP_METAL, 0, 0}, - { 4890, 4910, SHRAP_METAL, 0, 0}, - { 4891, 4911, SHRAP_METAL, 0, 0}, - { 4892, 4912, SHRAP_METAL, 0, 0}, - { 4893, 4913, SHRAP_METAL, 0, 0}, - { 4894, 4914, SHRAP_METAL, 0, 0}, - { 4895, 4915, SHRAP_METAL, 0, 0}, - { 3336, 4940, SHRAP_COIN, 0, 0}, - { 3337, 4941, SHRAP_COIN, 0, 0}, - { 4885, 4888, SHRAP_METAL, 0, 0}, - { 4887, 4889, SHRAP_COIN, 0, 0}, - { 3350, 4942, SHRAP_GLASS, 0, 0}, - { 3351, 4943, SHRAP_METAL, 0, 0}, - { 3352, 4944, SHRAP_METAL, 0, 0}, - { 3353, 4945, SHRAP_METAL, 0, 0}, - { 4896, 4898, SHRAP_METAL, 0, 0}, - { 4897, 4899, SHRAP_METAL, 0, 0}, - { 3385, 4981, SHRAP_METALMIX, 0, 0}, - { 3389, 4982, SHRAP_METALMIX, 0, 0}, - { 3393, 4984, SHRAP_METALMIX, 0, 0}, - { 3397, 4983, SHRAP_METALMIX, 0, 0}, - { 3401, 4985, SHRAP_METALMIX, 0, 0}, - { 3405, 4986, SHRAP_METALMIX, 0, 0}, - { 3409, 4988, SHRAP_METALMIX, 0, 0}, - { 3413, 4987, SHRAP_METALMIX, 0, 0}, - { 253, 255, SHRAP_METALMIX, 0, 0}, - { 283, 4974, SHRAP_METALMIX, 0, 0}, - { 299, 4975, SHRAP_METALMIX, 0, 0}, - {5078, 5079, SHRAP_METALMIX, 0, 0}, - {5080, 5092, SHRAP_MARBELS, 0, 0}, - {5083, 5093, SHRAP_MARBELS, 0, 0}, - {5086, 5094, SHRAP_MARBELS, 0, 0}, - {5089, 5095, SHRAP_MARBELS, 0, 0}, - {4970, 4973, SHRAP_METAL, 0, 0}, - {297, 4980, SHRAP_METAL, 0, 0}, - {1, 4976, SHRAP_METAL, 0, 0}, - {4917, 4918, SHRAP_METAL, 0, 0}, - {4902, 4903, SHRAP_METAL, 0, 0}, + { IRONRAILING, -1, SHRAP_METAL, BF_KILL, 0 }, + { NOTHING, -1, SHRAP_METAL, BF_KILL, 0 }, + { METALGRATE, METALGRATEBROKE, SHRAP_METAL, 0, 0 }, + { COMPASSN, COMPASSBROKE, SHRAP_GLASS, 0, 0 }, + { COMPASSNW, COMPASSBROKE, SHRAP_GLASS, 0, 0 }, + { WINDOWGLASS, -1, SHRAP_GLASS, 0, 0 }, + { ARMATURES, ARMATURESBROKE, SHRAP_METAL, 0, 0 }, + { COMPDISPLAY, COMPDISPLAYBROKE, SHRAP_GLASS, 0, 0}, + { DC220, -1, SHRAP_METAL, 0, 0 }, + { MPHONE, MPHONEBROKE, SHRAP_METAL, 0, 0 }, + { LITEDISP1, LITEDISP1BROKE, SHRAP_METAL, 0, 0}, + { LITEDISP2, LITEDISP2BROKE, SHRAP_METAL, 0, 0}, + { LITEDISP3, LITEDISP3BROKE, SHRAP_GLASS, 0, 0}, + { LITEDISP4, LITEDISP3BROKE, SHRAP_GLASS, 0, 0 }, + { LITEDISP5, LITEDISP5BROKE, SHRAP_METAL, 0, 0}, + { LITEDISP6, LITEDISP6BROKE, SHRAP_METAL, 0, 0}, + { LITEDISP7, LITEDISP6BROKE, SHRAP_METAL, 0, 0}, + { LITEDISP8, LITEDISP6BROKE, SHRAP_METAL, 0, 0}, + { PAYPHONE, PAYPHONEBROKE, SHRAP_COIN, 0, 0}, + { PAYPHONE2, PAYPHONE2BROKE, SHRAP_COIN, 0, 0}, + { BIGLIGHT, LITEDISP1BROKE, SHRAP_GLASS, 0, 0}, + { DARKDISPLAY, LITEDISP1BROKE, SHRAP_GLASS, 0, 0}, + { TWOLIGHTS, TWOLIGHTSBROKE, SHRAP_GLASS, 0, 0}, + { DARKDISPLAY2, DARKDISPLAY2BROKE, SHRAP_GLASS, 0, 0}, + { VENDINGMACHINE, VENDINGMACHINEBROKE, SHRAP_GLASS, 0, 0}, + { FOURLIGHTS, FOURLIGHTSBROKE, SHRAP_GLASS, 0, 0}, + { FOURLIGHTSV, FOURLIGHTSVBROKE, SHRAP_GLASS, 0, 0}, + { VENDINGMACHINE2, VENDINGMACHINE2BROKE, SHRAP_GLASS, 0, 0}, + { METALGRATE2, METALGRATE2BROKE, SHRAP_METAL, 0, 0}, + { TWOLIGHTSV, TWOLIGHTSVBROKE, SHRAP_GLASS, 0, 0}, + { LITEDISP9, LITEDISP9BROKE, SHRAP_GLASS, 0, 0}, + { LITEDISP10, LITEDISP10BROKE, SHRAP_GLASS, 0, 0}, + { LITEDISP11, LITEDISP11BROKE, SHRAP_GLASS, 0, 0}, + { LITEDISP12, LITEDISP12BROKE, SHRAP_METAL, 0, 0}, + { CARFRONT, CARFRONTBROKE, SHRAP_METAL, 0, 0}, + { CARBACK, CARBACKBROKE, SHRAP_METAL, 0, 0}, + { CARHOOD, CARHOODBROKE, SHRAP_METAL, 0, 0}, + { CARSIDE, CARSIDEBROKE, SHRAP_METAL, 0, 0}, + { CARROOF, CARROOFBROKE, SHRAP_METAL, 0, 0}, + { CARWHEEL, CARWHEELBROKE, SHRAP_METAL, 0, 0}, + { ATMFRONT, ATMFRONTBROKE, SHRAP_COIN, 0, 0}, + { PAYPHONE3, PAYPHONE3BROKE, SHRAP_COIN, 0, 0}, + { CASHREGISTER, CASHREGISTER, SHRAP_METAL, 0, 0}, + { DRAWER, DRAWERBROKE, SHRAP_COIN, 0, 0}, + { COMPMONITOR, COMPMONITORBROKE, SHRAP_GLASS, 0, 0}, + { COMPMONITORSIDE, COMPMONITORSIDEBROKE, SHRAP_METAL, 0, 0}, + { PCFRONT, PCFRONTBROKE, SHRAP_METAL, 0, 0}, + { PCKEYNOARD, PCKEYNOARDBROKE, SHRAP_METAL, 0, 0}, + { VANBACK, VANBACKBROKE, SHRAP_METAL, 0, 0}, + { VANFRONT, VANFRONTBROKE, SHRAP_METAL, 0, 0}, + { LITEDISP13, LITEDISP13BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP14, LITEDISP14BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP15, LITEDISP15BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP16, LITEDISP16BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP17, LITEDISP17BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP18, LITEDISP18BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP19, LITEDISP19BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP20, LITEDISP20BROKE, SHRAP_METALMIX, 0, 0}, + { LITEDISP21, LITEDISP21BROKE, SHRAP_METALMIX, 0, 0}, + { GAMEROOMSIGN, GAMEROOMSIGNBROKE, SHRAP_METALMIX, 0, 0}, + { PINBALL1, PINBALL1BROKE, SHRAP_MARBELS, 0, 0}, + { PINBALL2, PINBALL2BROKE, SHRAP_MARBELS, 0, 0}, + { PINBALL3, PINBALL3BROKE, SHRAP_MARBELS, 0, 0}, + { PINBALL4, PINBALL4BROKE, SHRAP_MARBELS, 0, 0}, + { DANGERSIGN, DANGERSIGNBROKE, SHRAP_METAL, 0, 0}, + { LITEDISP22, LITEDISP22BROKE, SHRAP_METAL, 0, 0}, + { TITSUBISHI, TITSUBISHIBROKE, SHRAP_METAL, 0, 0}, + { ZILLACARSIDE, ZILLACARSIDEBROKE, SHRAP_METAL, 0, 0}, }; BREAK_INFO SpriteBreakInfo[] = { - { 60, -1, SHRAP_METAL, BF_KILL, 0}, - { 82, -1, SHRAP_METAL, BF_KILL, 0}, + { IRONRAILING, -1, SHRAP_METAL, BF_KILL, 0}, + { NOTHING, -1, SHRAP_METAL, BF_KILL, 0}, { 138, -1, SHRAP_GENERIC, BF_KILL, 0}, - { 253, 255, SHRAP_GLASS, 0, 0}, - { 254, 255, SHRAP_GLASS, 0, 0}, + { COMPASSN, COMPASSBROKE, SHRAP_GLASS, 0, 0}, + { COMPASSNW, COMPASSBROKE, SHRAP_GLASS, 0, 0}, { 270, -1, SHRAP_PAPER, BF_BURN, 0}, { 271, -1, SHRAP_PAPER, BF_BURN, 0}, { 272, -1, SHRAP_WOOD, 0, 0}, @@ -138,8 +127,8 @@ BREAK_INFO SpriteBreakInfo[] = //{ 276, -1, SHRAP_WOOD }, //{ 277, -1, SHRAP_WOOD }, //{ 278, -1, SHRAP_WOOD }, - { 282, -1, SHRAP_GLASS, 0, 0}, - { 283, -1, SHRAP_METAL, 0, 0}, + { WINDOWGLASS, -1, SHRAP_GLASS, 0, 0}, + { ARMATURES, -1, SHRAP_METAL, 0, 0}, { 297, -1, SHRAP_METAL, 0, 0}, { 299, -1, SHRAP_METAL, 0, 0}, { 363, -1, SHRAP_METAL, BF_KILL, 0}, diff --git a/source/games/sw/src/namelist.h b/source/games/sw/src/namelist.h index 65d54c9f5..a30063c8e 100644 --- a/source/games/sw/src/namelist.h +++ b/source/games/sw/src/namelist.h @@ -67,48 +67,34 @@ x(FragBarErase, 2375) x(FragBarErase2, 2376) x(MENUBAR, 2427) x(THREED_REALMS_PIC, 2325) - x(MIRROR, 340) x(FLOORMIRROR, 341) x(CAMSPRITE, 3830) - - x(ICON_STAR, 1793) - x(ICON_UZI, 1797) x(ICON_UZIFLOOR, 1807) x(ICON_LG_UZI_AMMO, 1799) - x(ICON_HEART, 1824) x(ICON_HEART_LG_AMMO, 1820) - x(ICON_GUARD_HEAD, 1814) x(ICON_FIREBALL_LG_AMMO, 3035) - x(NAPALM_MIN_AMMO, 10) x(RING_MIN_AMMO, 30) - x(ICON_ROCKET, 1843) x(ICON_SHOTGUN, 1794) x(ICON_LG_ROCKET, 1796) x(ICON_LG_SHOTSHELL, 1823) x(ICON_AUTORIOT, 1822) - x(ICON_MICRO_GUN, 1818) x(ICON_MICRO_BATTERY, 1800) - x(ICON_GRENADE_LAUNCHER, 1817) x(ICON_LG_GRENADE, 1831) - x(ICON_LG_MINE, 1842) - x(ICON_RAIL_GUN, 1811) x(ICON_RAIL_AMMO, 1812) - //, not, used, now) x(ICON_SPELL, 1880) x(ICON_ELECTRO, 1822) - x(ICON_EXPLOSIVE_BOX, 1801) x(ICON_ENVIRON_SUIT, 1837) x(ICON_FLY, 1782) @@ -133,17 +119,13 @@ x(ICON_FLASHBOMB, 1805) x(ICON_NUKE, 1809) x(ICON_CALTROPS, 1829) x(ICON_FLAG, 2520) - x(COINCURSOR, 2440) x(STARTALPHANUM, 4608) x(ENDALPHANUM, 4701) - x(STATUS_BAR, 2434) x(STATUS_KEYS, 2881) x(STATUS_NUMBERS, 2887) x(BORDER_TILE, 2604) - - x(BLUE_KEY, 1766) x(RED_KEY, 1770) x(GREEN_KEY, 1774) @@ -156,10 +138,8 @@ x(BLUE_CARD, 1767) x(RED_CARD, 1771) x(GREEN_CARD, 1775) x(YELLOW_CARD, 1779) - x(YINYANG, 2870) x(SHADOW_WARRIOR, 2366) - x(ADSCREEN1, 5262) x(ADSCREEN2, 5261) x(SWORDER1, 5110) @@ -168,7 +148,6 @@ x(CREDITS1, 5111) x(CREDITS2, 5118) x(SUPPORT, 4979) x(ONLINE, 5113) - x(STAT_SCREEN_PIC, 5114) x(BONUS_SCREEN_PIC, 5120) @@ -346,3 +325,137 @@ x(LAVA5, 179) x(LAVA6, 180) x(LAVA7, 181) x(LAVA8, 182) + +// breakables +x(IRONRAILING, 60) +x(NOTHING, 82) +x(COMPASSN, 253) +x(COMPASSNW, 254) +x(COMPASSBROKE, 255) +x(METALGRATE, 1) +x(METALGRATEBROKE, 3593) +x(WINDOWGLASS, 282) +x(ARMATURES, 283) +x(ARMATURESBROKE, 4974) +x(COMPDISPLAY, 318) +x(COMPDISPLAYBROKE, 599) +x(DC220, 486) +x(MPHONE, 487) +x(MPHONEBROKE, 3676) +x(LITEDISP1, 628) +x(LITEDISP1BROKE, 3585) +x(LITEDISP2, 630) +x(LITEDISP2BROKE, 3586) + +x(LITEDISP3, 633) +x(LITEDISP3BROKE, 608) +x(LITEDISP4, 634) +x(LITEDISP5, 637) +x(LITEDISP5BROKE, 3587) +x(LITEDISP6, 640) +x(LITEDISP6BROKE, 3588) +x(LITEDISP7, 641) +x(LITEDISP8, 665) +x(PAYPHONE, 742) +x(PAYPHONEBROKE, 3589) +x(PAYPHONE2, 743) +x(PAYPHONE2BROKE, 3590) +x(BIGLIGHT, 750) +x(DARKDISPLAY, 2667) +x(TWOLIGHTS, 2769) +x(TWOLIGHTSBROKE, 3681) +x(DARKDISPLAY2, 2676) +x(DARKDISPLAY2BROKE, 3591) +x(VENDINGMACHINE, 2677) +x(VENDINGMACHINEBROKE, 3592) +x(FOURLIGHTS, 2687) +x(FOURLIGHTSBROKE, 2727) +x(FOURLIGHTSV, 2688) +x(FOURLIGHTSVBROKE, 2728) +x(VENDINGMACHINE2, 2732) +x(VENDINGMACHINE2BROKE, 3594) +x(METALGRATE2, 2777) +x(METALGRATE2BROKE, 3683) +x(TWOLIGHTSV, 2778) +x(TWOLIGHTSVBROKE, 2757) + +x(LITEDISP9, 2801) +x(LITEDISP9BROKE, 3591) +x(LITEDISP10, 2804) +x(LITEDISP10BROKE, 3595) +x(LITEDISP11, 2807) +x(LITEDISP11BROKE, 3596) +x(LITEDISP12, 2810) +x(LITEDISP12BROKE, 4989) + +x(CARFRONT, 4890) +x(CARBACK, 4891) +x(CARHOOD, 4892) +x(CARSIDE, 4893) +x(CARROOF, 4894) +x(CARWHEEL, 4895) +x(ATMFRONT, 3336) +x(PAYPHONE3, 3337) +x(CASHREGISTER, 4885) +x(DRAWER, 4887) +x(COMPMONITOR, 3350) +x(COMPMONITORSIDE, 3351) +x(PCFRONT, 3352) +x(PCKEYNOARD, 3353) + +x(CARFRONTBROKE, 4910) +x(CARBACKBROKE, 4911) +x(CARHOODBROKE, 4912) +x(CARSIDEBROKE, 4913) +x(CARROOFBROKE, 4914) +x(CARWHEELBROKE, 4915) +x(ATMFRONTBROKE, 4940) +x(PAYPHONE3BROKE, 4941) +x(CASHREGISTERBROKE, 4888) +x(DRAWERBROKE, 4889) +x(COMPMONITORBROKE, 4942) +x(COMPMONITORSIDEBROKE, 4943) +x(PCFRONTBROKE, 4944) +x(PCKEYNOARDBROKE, 4945) + +x(VANBACK, 4896) +x(VANFRONT, 4897) +x(LITEDISP13, 3385) +x(LITEDISP14, 3389) +x(LITEDISP15, 3393) +x(LITEDISP16, 3397) +x(LITEDISP17, 3401) +x(LITEDISP18, 3405) +x(LITEDISP19, 3409) +x(LITEDISP20, 3413) +x(LITEDISP21, 299) +x(GAMEROOMSIGN, 5078) +x(PINBALL1, 5080) +x(PINBALL2, 5083) +x(PINBALL3, 5086) +x(PINBALL4, 5089) +x(DANGERSIGN, 4970) +x(LITEDISP22, 297) +x(TITSUBISHI, 4917) +x(ZILLACARSIDE, 4902) + +x(VANBACKBROKE, 4898) +x(VANFRONTBROKE, 4897) +x(LITEDISP13BROKE, 4981) +x(LITEDISP14BROKE, 4982) +x(LITEDISP15BROKE, 4984) +x(LITEDISP16BROKE, 4893) +x(LITEDISP17BROKE, 4985) +x(LITEDISP18BROKE, 4986) +x(LITEDISP19BROKE, 4988) +x(LITEDISP20BROKE, 4987) +x(LITEDISP21BROKE, 4975) +x(GAMEROOMSIGNBROKE, 5079) +x(PINBALL1BROKE, 5092) +x(PINBALL2BROKE, 5093) +x(PINBALL3BROKE, 5094) +x(PINBALL4BROKE, 5095) +x(DANGERSIGNBROKE, 4973) +x(LITEDISP22BROKE, 4980) +x(TITSUBISHIBROKE, 4918) +x(ZILLACARSIDEBROKE, 4903)