diff --git a/source/games/blood/src/namelist.h b/source/games/blood/src/namelist.h index 0ac5d0782..0d83f39d1 100644 --- a/source/games/blood/src/namelist.h +++ b/source/games/blood/src/namelist.h @@ -193,3 +193,9 @@ x(SBarWaponNum0, 2248) x(SBarWaponNum0, 2249) x(MIRRORTILE, 504) + +x(ICONFLAREGUN, 524) +x(ICONSHOTGUN, 559) +x(ICONTOMMY, 558) +x(ICONTESLA, 539) +x(ICONLEECH, 800) diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h index c469f48c8..7535d608b 100644 --- a/source/games/duke/src/namelist_r.h +++ b/source/games/duke/src/namelist_r.h @@ -941,6 +941,7 @@ y(RRTILE3115, 3115) y(RRTILE3116, 3116) y(RRTILE3117, 3117) x(CHICKENLOAF, 3120) +x(CHICKENLOAF1, 3121) x(CHICKENNUGGET, 3122) x(ROASTEDCHICKEN, 3123) x(BONELESSCHICKEN, 3124) diff --git a/source/games/sw/src/namelist.h b/source/games/sw/src/namelist.h index 2b0242839..c279c1f3d 100644 --- a/source/games/sw/src/namelist.h +++ b/source/games/sw/src/namelist.h @@ -300,3 +300,4 @@ x(COMPASS_MID_TIC2, 2391) x(FAF_PORTAL, 341) x(FAF_PORTAL2, 342) +x(SYBEXSCREEN, 5261) diff --git a/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt b/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt index 7e4631267..4b9e216c5 100644 --- a/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt +++ b/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt @@ -75,7 +75,8 @@ map { 2, 3 } { interbackground = "BONUSPIC10" rr_startsound = 177 - PrecacheTextures = "#03190","#03191","#03192","#03144","#03139","#03132","#03120","#03121","#03122","#03123","#03124" + // todo: attach these to the spawner objects. + PrecacheTextures = "CHICKENA","CHICKENB","CHICKENC","RRTILE3144","RRTILE3139","CHICKENHEAD","CHICKENLOAF","CHICKENLOAF1","CHICKENNUGGET","ROASTEDCHICKEN","BONELESSCHICKEN" } map { 2, 4 } diff --git a/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt b/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt index 98f54fd46..713fd1629 100644 --- a/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt +++ b/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt @@ -38,7 +38,7 @@ map { 1, 5 } { interbackground = "LEVELMAP05" rr_startsound = 102 - PrecacheTextures = "#02577" + PrecacheTextures = "RRTHUNDERSKY" } map { 1, 6 } diff --git a/wadsrc/static/zscript/games/blood/ui/sbar.zs b/wadsrc/static/zscript/games/blood/ui/sbar.zs index 77431fad2..bbe490632 100644 --- a/wadsrc/static/zscript/games/blood/ui/sbar.zs +++ b/wadsrc/static/zscript/games/blood/ui/sbar.zs @@ -807,7 +807,7 @@ class BloodStatusBar : RazeStatusBar } // only show those weapons which are not their same ammo. - static const String weaponIcons[] = { "", "" /* pitchfork */, "#00524", "#00559", "#00558", "", "", "#00539", "#00800", "", "", "" }; + static const String weaponIcons[] = { "", "" /* pitchfork */, "ICONFLAREGUN", "ICONSHOTGUN", "ICONTOMMY", "", "", "ICONTESLA", "ICONLEECH", "", "", "" }; for(int i = 0; i < 11; i++) { diff --git a/wadsrc/static/zscript/games/sw/ui/screens.zs b/wadsrc/static/zscript/games/sw/ui/screens.zs index 364c92e49..56add9809 100644 --- a/wadsrc/static/zscript/games/sw/ui/screens.zs +++ b/wadsrc/static/zscript/games/sw/ui/screens.zs @@ -459,7 +459,7 @@ class SWCutscenes ui static void BuildSybexScreen(ScreenJobRunner runner) { if (Raze.isShareware() && !netgame) - runner.Append(ImageScreen.CreateNamed("#05261", TexMan.Type_Any)); + runner.Append(ImageScreen.CreateNamed("SYBEXSCREEN", TexMan.Type_Any)); } //---------------------------------------------------------------------------