From 02507d937d0bab28b8030d180e024fd338554874 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 Oct 2020 23:40:17 +0200 Subject: [PATCH] - got the text screens working. Also reformatted RR's credits a bit for a better presentation. --- source/common/menu/menudef.cpp | 2 + source/games/duke/src/namelist_r.h | 2 +- wadsrc/static/menudef.txt | 126 +++++++++--------- wadsrc/static/zscript/games/duke/ui/menu.zs | 6 +- .../static/zscript/ui/menu/imagescroller.zs | 5 +- 5 files changed, 73 insertions(+), 68 deletions(-) diff --git a/source/common/menu/menudef.cpp b/source/common/menu/menudef.cpp index 756af5da8..f289df4db 100644 --- a/source/common/menu/menudef.cpp +++ b/source/common/menu/menudef.cpp @@ -1255,6 +1255,8 @@ static void ParseImageScroller(FScanner& sc) desc->textFont = SmallFont; desc->textScale = 1; desc->mAnimatedTransition = false; + desc->virtWidth = 320; + desc->virtHeight = 200; ParseImageScrollerBody(sc, desc); bool scratch = ReplaceMenu(sc, desc); diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h index 7f0348e99..ea59ca1a5 100644 --- a/source/games/duke/src/namelist_r.h +++ b/source/games/duke/src/namelist_r.h @@ -473,7 +473,7 @@ x(SELECTDIR, 1632) x(F1HELP, 1633) x(NOTCHON, 1634) x(NOTCHOFF, 1635) -y(RRTILE1636, 1636) +x(DRIVABLES, 1636) x(DUKEICON, 1637) x(BADGUYICON, 1638) x(FOODICON, 1639) diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 1e9ec8c48..7da5d2d42 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -201,23 +201,17 @@ LISTMENU "SkillMenu" ImageScroller "HelpMenu" { - ifgame(Duke, Nam, WW2GI) + ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides) { ImageItem "TEXTSTORY" ImageItem "F1HELP" - animatedtransition - } - /* - ifgame(Redneck, RedneckRides) - { - ImageItem "#2541" - ImageItem "#1633" ifgame(RedneckRides) { - ImageItem "#1636" + ImageItem "DRIVABLES" } animatedtransition } + /* ifgame(blood) { class "$.ImageScrollerMenu" @@ -261,69 +255,77 @@ ImageScroller "CreditsMenu" ImageItem "CREDITPAGE3" animatedtransition } - /* ifgame(Redneck) { + TextBackground "MENUSCREEN" + TextBackgroundBrightness 0.5 + TextFont "SmallFont" + TextScale 0.45 // no point putting this into the string table. - TextItem "ORIGINAL CONCEPT, DESIGN AND DIRECTION\n\nDREW MARKHAM", 80 - TextItem "PRODUCED BY\n\nGREG GOODRICH", 80 - TextItem "GAME PROGRAMMING\n\nRAFAEL PAIZ", 80 - TextItem "ART DIRECTORS\n\nCLAIRE PRADERIE MAXX KAUFMAN ", 80 - TextItem "LEAD LEVEL DESIGNER\nALEX MAYBERRY\n\nLEVEL DESIGN\nMAL BLACKWELL\nSVERRE KVERNMO", 80 - TextItem "SENIOR ANIMATOR AND ARTIST\n\nJASON HOOVER", 80 - TextItem "TECHNICAL DIRECTOR\n\nBARRY DEMPSEY", 80 - TextItem "MOTION CAPTURE SPECIALIST AND\nCHARACTER ANIMATION\nAMIT DORON\n\nA.I. PROGRAMMING\nARTHUR DONAVAN\n\nADDITIONAL ANIMATION\nGEORGE KARL", 60 - TextItem "CHARACTER DESIGN\nCORKY LEHMKUHL\n\nMAP PAINTERS\nVIKTOR ANTONOV\nMATTHIAS BEEGUER\nSTEPHAN BURLE\n\nSCULPTORS\nGEORGE ENGEL\nJAKE GARBER\nJEFF HIMMEL", 50 - TextItem "CHARACTER VOICES\n\nLEONARD\nBURTON GILLIAM\n\nBUBBA, BILLY RAY, SKINNY OL' COOT\nAND THE TURD MINION\nDREW MARKHAM\n\nSHERIFF LESTER T. HOBBES\nMOJO NIXON\n\nALIEN VIXEN\nPEGGY JO JACOBS", 40 - TextItem "SOUND DESIGN\nGARY BRADFIELD\n\nMUSIC\nMOJO NIXON\nTHE BEAT FARMERS\nTHE REVEREND HORTON HEAT\nCEMENT POND\n\nADDITIONAL SOUND EFFECTS\nJIM SPURGIN", 50 - TextItem "MOTION CAPTURE ACTOR\nJ.P. MANOUX\n\nMOTION CAPTURE VIXEN\nSHAWN WOLFE", 80 - TextItem "PRODUCTION ASSISTANCE\nMINERVA MAYBERRY\n\nNUTS AND BOLTS\nSTEVE GOLDBERG\nMARCUS HUTCHINSON\n\nBEAN COUNTING\nMAX YOSHIKAWA\n\nADMINISTRATIVE ASSISTANCE\nSERAFIN LEWIS", 50 - TextItem "LOCATION MANAGER, LOUISIANA\nRICK SKINNER\n\nLOCATION SCOUT, LOUISIANA\nBRIAN BENOS\n\nPHOTOGRAPHER\nCARLOS SERRAO", 70 - TextItem "ADDITIONAL 3D MODELING BY\n3 NAME 3D\nVIEWPOINT DATALABS INTERNATIONAL\n\nAUDIO RECORDED AT\nPACIFIC OCEAN POST, SANTA MONICA, C.A.\n\nCEMENT POND TRACKS RECORDED AT\nDREAMSTATE RECORDING, BURBANK, C.A.\n\nRECORDING ENGINEER\nDAVE AHLERT", 50 - TextItem "3D BUILD ENGINE LICENSED FROM\n3D REALMS ENTERTAINMENT\n\nBUILD ENGINE AND RELATED TOOLS\nCREATED BY KEN SILVERMAN", 80 - TextItem "FOR INTERPLAY\n\nLEAD TESTER\nDARRELL JONES\n\nTESTERS\nTIM ANDERSON\nERICK LUJAN\nTIEN TRAN", 60 - TextItem "IS TECHS\nBILL DELK\nAARON MEYERS\n\nCOMPATIBILITY TECHS\nMARC DURAN\nDAN FORSYTH\nDEREK GIBBS\nAARON OLAIZ\nJACK PARKER", 60 - TextItem "DIRECTOR OF COMPATIBILITY\nPHUONG NGUYEN\n\nASSISTANT QA DIRECTOR\nCOLIN TOTMAN\n\nQA DIRECTOR\nCHAD ALLISON", 70 - TextItem "INTERPLAY PRODUCER\nBILL DUGAN\n\nINTERPLAY LINE PRODUCER\nCHRIS BENSON\n\nPRODUCT MANAGER\nJIM VEEVAERT\n\nPUBLIC RELATIONS\nERIKA PRICE", 50 - TextItem "SPECIAL THANKS\n\nJIM GAUER\nPAUL VAIS\nSCOTT MILLER\nTODD REPLOGLE\nCHUCK BUECHE\nCARTER LIPSCOMB\nJOHN CONLEY\nDON MAGGI", 60 - TextItem "EXTRA SPECIAL THANKS\n\nBRIAN FARGO", 80 - TextItem "REDNECK RAMPAGE\n(c) 1997 XATRIX ENTERTAINMENT, INC.\n\nREDNECK RAMPAGE IS A TRADEMARK OF\nINTERPLAY PRODUCTIONS", 60 + TextItem "ORIGINAL CONCEPT, DESIGN AND DIRECTION\n\nDREW MARKHAM" //, 80 + TextItem "PRODUCED BY\n\nGREG GOODRICH" //, 80 + TextItem "GAME PROGRAMMING\n\nRAFAEL PAIZ" //, 80 + TextItem "ART DIRECTORS\n\nCLAIRE PRADERIE MAXX KAUFMAN " //, 80 + TextItem "LEAD LEVEL DESIGNER\nALEX MAYBERRY\n\nLEVEL DESIGN\nMAL BLACKWELL\nSVERRE KVERNMO" //, 60 + TextItem "SENIOR ANIMATOR AND ARTIST\n\nJASON HOOVER" //, 80 + TextItem "TECHNICAL DIRECTOR\n\nBARRY DEMPSEY" //, 80 + TextItem "MOTION CAPTURE SPECIALIST AND\nCHARACTER ANIMATION\nAMIT DORON\n\nA.I. PROGRAMMING\nARTHUR DONAVAN\n\nADDITIONAL ANIMATION\nGEORGE KARL" //, 60 + TextItem "CHARACTER DESIGN\nCORKY LEHMKUHL\n\nMAP PAINTERS\nVIKTOR ANTONOV\nMATTHIAS BEEGUER\nSTEPHAN BURLE\n\nSCULPTORS\nGEORGE ENGEL\nJAKE GARBER\nJEFF HIMMEL" //, 30 + TextItem "CHARACTER VOICES\n\nLEONARD\nBURTON GILLIAM\n\nBUBBA, BILLY RAY, SKINNY OL' COOT\nAND THE TURD MINION\nDREW MARKHAM\n\nSHERIFF LESTER T. HOBBES\nMOJO NIXON\n\nALIEN VIXEN\nPEGGY JO JACOBS" //, 30 + TextItem "SOUND DESIGN\nGARY BRADFIELD\n\nMUSIC\nMOJO NIXON\nTHE BEAT FARMERS\nTHE REVEREND HORTON HEAT\nCEMENT POND\n\nADDITIONAL SOUND EFFECTS\nJIM SPURGIN" //, 30 + TextItem "MOTION CAPTURE ACTOR\nJ.P. MANOUX\n\nMOTION CAPTURE VIXEN\nSHAWN WOLFE" //, 70 + TextItem "PRODUCTION ASSISTANCE\nMINERVA MAYBERRY\n\nNUTS AND BOLTS\nSTEVE GOLDBERG\nMARCUS HUTCHINSON\n\nBEAN COUNTING\nMAX YOSHIKAWA\n\nADMINISTRATIVE ASSISTANCE\nSERAFIN LEWIS" //, 50 + TextItem "LOCATION MANAGER, LOUISIANA\nRICK SKINNER\n\nLOCATION SCOUT, LOUISIANA\nBRIAN BENOS\n\nPHOTOGRAPHER\nCARLOS SERRAO" //, 70 + TextItem "ADDITIONAL 3D MODELING BY\n3 NAME 3D\nVIEWPOINT DATALABS INTERNATIONAL\n\nAUDIO RECORDED AT\nPACIFIC OCEAN POST, SANTA MONICA, C.A.\n\nCEMENT POND TRACKS RECORDED AT\nDREAMSTATE RECORDING, BURBANK, C.A.\n\nRECORDING ENGINEER\nDAVE AHLERT" //, 50 + TextItem "3D BUILD ENGINE LICENSED FROM\n3D REALMS ENTERTAINMENT\n\nBUILD ENGINE AND RELATED TOOLS\nCREATED BY KEN SILVERMAN" //, 80 + TextItem "FOR INTERPLAY\n\nLEAD TESTER\nDARRELL JONES\n\nTESTERS\nTIM ANDERSON\nERICK LUJAN\nTIEN TRAN" //, 60 + TextItem "IS TECHS\nBILL DELK\nAARON MEYERS\n\nCOMPATIBILITY TECHS\nMARC DURAN\nDAN FORSYTH\nDEREK GIBBS\nAARON OLAIZ\nJACK PARKER" //, 60 + TextItem "DIRECTOR OF COMPATIBILITY\nPHUONG NGUYEN\n\nASSISTANT QA DIRECTOR\nCOLIN TOTMAN\n\nQA DIRECTOR\nCHAD ALLISON" //, 70 + TextItem "INTERPLAY PRODUCER\nBILL DUGAN\n\nINTERPLAY LINE PRODUCER\nCHRIS BENSON\n\nPRODUCT MANAGER\nJIM VEEVAERT\n\nPUBLIC RELATIONS\nERIKA PRICE" //, 50 + TextItem "SPECIAL THANKS\n\nJIM GAUER\nPAUL VAIS\nSCOTT MILLER\nTODD REPLOGLE\nCHUCK BUECHE\nCARTER LIPSCOMB\nJOHN CONLEY\nDON MAGGI" //, 60 + TextItem "EXTRA SPECIAL THANKS\n\nBRIAN FARGO" //, 80 + TextItem "REDNECK RAMPAGE\n(c) 1997 XATRIX ENTERTAINMENT, INC.\n\nREDNECK RAMPAGE IS A TRADEMARK OF\nINTERPLAY PRODUCTIONS" //, 60 animatedtransition } ifgame(RedneckRides) { - TextItem "ORIGINAL CONCEPT, DESIGN AND DIRECTION\n\nDREW MARKHAM", 80 - TextItem "ART DIRECTION AND ADDITIONAL DESIGN\n\nCORKY LEHMKUHL", 80 - TextItem "PRODUCED BY\n\nGREG GOODRICH", 80 - TextItem "GAME PROGRAMMING\n\nJOSEPH AURILI", 80 - TextItem "ORIGINAL GAME PROGRAMMING\n\nRAFAEL PAIZ", 80 - TextItem "LEVEL DESIGN\n\nRHETT BALDWIN & AARON BARBER", 80 - TextItem "ORIGINAL ART DIRECTION AND SUPPORT\n\nMAXX KAUFMAN & CLAIRE PRADERIE-MARKHAM", 80 - TextItem "COMPUTER GRAPHICS SUPERVISOR &\nCHARACTER ANIMATION DIRECTION\n\nBARRY DEMPSEY", 80 - TextItem "SENIOR ANIMATOR & MODELER\n\nJASON HOOVER", 80 - TextItem "CHARACTER ANIMATION &\nMOTION CAPTURE SPECIALIST\n\nAMIT DORON", 80 - TextItem "SOUND DESIGN &\nMUSIC PRODUCTION COORDINATION\n\nGARY BRADFIELD", 80 - TextItem "INTRODUCTION ANIMATION\n\nDOMINIQUE DROZDZ", 80 - TextItem "ARTIST\n\nMATTHIAS BEEGUER", 80 - TextItem "ADDITIONAL ART\n\nVIKTOR ANTONOV", 80 - TextItem "PRODUCTION COORDINATOR\n\nVICTORIA SYLVESTER", 80 - TextItem "CHARACTER VOICES\n\nLEONARD\nBURTON GILLIAM\n\nDAISY MAE\nTARA CHARENDOFF\n\nBUBBA, BILLY RAY, SKINNY OL' COOT,\nFRANK THE BIKER, THE TURD MINION\n& ALL OTHER VARIOUS RAMBLINGS...\nDREW MARKHAM", 40 - TextItem "SPECIAL APPEARENCE BY\n\nSHERIFF LESTER T. HOBBES\nMOJO NIXON\n\nALIEN VIXEN\nPEGGY JO JACOBS", 70 + TextBackground "MENUSCREEN" + TextBackgroundBrightness 0.5 + TextFont "SmallFont" + TextScale 0.45 + TextItem "ORIGINAL CONCEPT, DESIGN AND DIRECTION\n\nDREW MARKHAM" //, 80 + TextItem "ART DIRECTION AND ADDITIONAL DESIGN\n\nCORKY LEHMKUHL" //, 80 + TextItem "PRODUCED BY\n\nGREG GOODRICH" //, 80 + TextItem "GAME PROGRAMMING\n\nJOSEPH AURILI" //, 80 + TextItem "ORIGINAL GAME PROGRAMMING\n\nRAFAEL PAIZ" //, 80 + TextItem "LEVEL DESIGN\n\nRHETT BALDWIN & AARON BARBER" //, 80 + TextItem "ORIGINAL ART DIRECTION AND SUPPORT\n\nMAXX KAUFMAN & CLAIRE PRADERIE-MARKHAM" //, 80 + TextItem "COMPUTER GRAPHICS SUPERVISOR &\nCHARACTER ANIMATION DIRECTION\n\nBARRY DEMPSEY" //, 80 + TextItem "SENIOR ANIMATOR & MODELER\n\nJASON HOOVER" //, 80 + TextItem "CHARACTER ANIMATION &\nMOTION CAPTURE SPECIALIST\n\nAMIT DORON" //, 80 + TextItem "SOUND DESIGN &\nMUSIC PRODUCTION COORDINATION\n\nGARY BRADFIELD" //, 80 + TextItem "INTRODUCTION ANIMATION\n\nDOMINIQUE DROZDZ" //, 80 + TextItem "ARTIST\n\nMATTHIAS BEEGUER" //, 80 + TextItem "ADDITIONAL ART\n\nVIKTOR ANTONOV" //, 80 + TextItem "PRODUCTION COORDINATOR\n\nVICTORIA SYLVESTER" //, 80 + TextItem "CHARACTER VOICES\n\nLEONARD\nBURTON GILLIAM\n\nDAISY MAE\nTARA CHARENDOFF\n\nBUBBA, BILLY RAY, SKINNY OL' COOT,\nFRANK THE BIKER, THE TURD MINION\n& ALL OTHER VARIOUS RAMBLINGS...\nDREW MARKHAM" //, 40 + TextItem "SPECIAL APPEARENCE BY\n\nSHERIFF LESTER T. HOBBES\nMOJO NIXON\n\nALIEN VIXEN\nPEGGY JO JACOBS" //, 70 TextItem "REDNECK RAMPAGE TITLE TRACK & CYBERSEX\nWRITTEN & PERFORMED BY\nMOJO NIXON\n\n(c) MUFFIN'STUFFIN' MUSIC (BMI)\nADMINISTERED BY BUG.", 70 - TextItem "MUSIC\n\nDISGRACELAND\nTINY D & THE SOFA KINGS\n\nBANJO AND GUITAR PICKIN\nJOHN SCHLOCKER\nHOWARD YEARWOOD", 60 - TextItem "RECORDING ENGINEER\nDAVE AHLERT\n\nRECORDING ASSISTANCE\nJEFF GILBERT", 80 - TextItem "MOTION CAPTURE ACTOR\nJ.P. MANOUX\n\nMOTION CAPTURE ACTRESS\nSHAWN WOLFE", 80 - TextItem "THIS GAME COULD NOT HAVE BEEN MADE WITHOUT\nALEX MAYBERRY\nMAL BLACKWELL\n\nNUTS AND BOLTS\nSTEVE GOLDBERG\n\nBEAN COUNTING\nMAX YOSHIKAWA\n\nADMINISTRATIVE ASSISTANCE\nMINERVA MAYBERRY", 50 - TextItem "FOR INTERPLAY\n\nPRODUCER\nBILL DUGAN\n\nLINE PRODUCER\nCHRIS BENSON\n\nLEAD TESTER\nDARRELL JONES", 60 - TextItem "TESTERS\n\nTIM ANDERSON\nPRIMO PULANCO\nMARK MCCARTY\nBRIAN AXLINE", 70 - TextItem "PRODUCTION BABY\n\nPAULINE MARIE MARKHAM", 80 - TextItem "ORIGINAL PRODUCTION BABY\n\nALYSON KAUFMAN", 80 - TextItem "3D BUILD ENGINE LICENSED FROM\n3D REALMS ENTERTAINMENT\n\nBUILD ENGINE AND RELATED TOOLS\nCREATED BY KEN SILVERMAN", 80 - TextItem "SPECIAL THANKS\n\nSCOTT MILLER\nGEORGE BROUSSARD", 80 - TextItem "EXTRA SPECIAL THANKS\n\nBRIAN FARGO", 80 - TextItem "REDNECK RAMPAGE RIDES AGAIN\n(c) 1998 XATRIX ENTERTAINMENT, INC.\n\nREDNECK RAMPAGE RIDES AGAIN\nIS A TRADEMARK OF\nINTERPLAY PRODUCTIONS", 70 + TextItem "MUSIC\n\nDISGRACELAND\nTINY D & THE SOFA KINGS\n\nBANJO AND GUITAR PICKIN\nJOHN SCHLOCKER\nHOWARD YEARWOOD" //, 60 + TextItem "RECORDING ENGINEER\nDAVE AHLERT\n\nRECORDING ASSISTANCE\nJEFF GILBERT" //, 80 + TextItem "MOTION CAPTURE ACTOR\nJ.P. MANOUX\n\nMOTION CAPTURE ACTRESS\nSHAWN WOLFE" //, 80 + TextItem "THIS GAME COULD NOT HAVE BEEN MADE WITHOUT\nALEX MAYBERRY\nMAL BLACKWELL\n\nNUTS AND BOLTS\nSTEVE GOLDBERG\n\nBEAN COUNTING\nMAX YOSHIKAWA\n\nADMINISTRATIVE ASSISTANCE\nMINERVA MAYBERRY" //, 50 + TextItem "FOR INTERPLAY\n\nPRODUCER\nBILL DUGAN\n\nLINE PRODUCER\nCHRIS BENSON\n\nLEAD TESTER\nDARRELL JONES" //, 60 + TextItem "TESTERS\n\nTIM ANDERSON\nPRIMO PULANCO\nMARK MCCARTY\nBRIAN AXLINE" //, 70 + TextItem "PRODUCTION BABY\n\nPAULINE MARIE MARKHAM" //, 80 + TextItem "ORIGINAL PRODUCTION BABY\n\nALYSON KAUFMAN" //, 80 + TextItem "3D BUILD ENGINE LICENSED FROM\n3D REALMS ENTERTAINMENT\n\nBUILD ENGINE AND RELATED TOOLS\nCREATED BY KEN SILVERMAN" //, 80 + TextItem "SPECIAL THANKS\n\nSCOTT MILLER\nGEORGE BROUSSARD" //, 80 + TextItem "EXTRA SPECIAL THANKS\n\nBRIAN FARGO" //, 80 + TextItem "REDNECK RAMPAGE RIDES AGAIN\n(c) 1998 XATRIX ENTERTAINMENT, INC.\n\nREDNECK RAMPAGE RIDES AGAIN\nIS A TRADEMARK OF\nINTERPLAY PRODUCTIONS" //, 70 animatedtransition } + /* ifgame(blood) { class "Blood.ImageScrollerMenu" diff --git a/wadsrc/static/zscript/games/duke/ui/menu.zs b/wadsrc/static/zscript/games/duke/ui/menu.zs index a1bc018d3..6cc9fb562 100644 --- a/wadsrc/static/zscript/games/duke/ui/menu.zs +++ b/wadsrc/static/zscript/games/duke/ui/menu.zs @@ -34,7 +34,7 @@ class DukeMenuDelegate : RazeMenuDelegate void DrawCursor(double x, double y, double scale, bool right) { uint mclock = MSTime() * 120 / 1000; - uint frames = (gameinfo.gametype & GAMEFLAG_RR) ? 16 : 7; + uint frames = (gameinfo.gametype & GAMEFLAG_RRALL) ? 16 : 7; String picname; if (!right) picname= String.Format("SPINNINGNUKEICON%d", ((mclock >> 3) % frames)); else picname = String.Format("SPINNINGNUKEICON%d", frames - 1 - ((frames - 1 + (mclock >> 3)) % frames)); @@ -46,7 +46,7 @@ class DukeMenuDelegate : RazeMenuDelegate override bool DrawSelector(ListMenuDescriptor desc) { int cursorOffset = 110; - double cursorScale = (gameinfo.gametype & GAMEFLAG_RR) ? 0.2 : 1.0; + double cursorScale = (gameinfo.gametype & GAMEFLAG_RRALL) ? 0.2 : 1.0; double ymid = desc.mItems[desc.mSelectedItem].GetY() + 7; // half height must be hardcoded or layouts will break. DrawCursor(160 + cursorOffset, ymid, cursorScale, false); DrawCursor(169 - cursorOffset, ymid, cursorScale, true); @@ -117,7 +117,7 @@ class ListMenuItemDukeTextItem : ListMenuItemTextItem { int trans = mColorSelected? Translation.MakeID(Translation_Remap, 1) : 0; Color pe; - double scale = (gameinfo.gametype & GAMEFLAG_RR) ? 0.4 : 1.; + double scale = (gameinfo.gametype & GAMEFLAG_RRALL) ? 0.4 : 1.; let xpos = mXpos - BigFont.StringWidth(mText) * scale * 0.5; if (selected) diff --git a/wadsrc/static/zscript/ui/menu/imagescroller.zs b/wadsrc/static/zscript/ui/menu/imagescroller.zs index 62e0bbad5..db4c5b273 100644 --- a/wadsrc/static/zscript/ui/menu/imagescroller.zs +++ b/wadsrc/static/zscript/ui/menu/imagescroller.zs @@ -103,8 +103,9 @@ class ImageScrollerPageTextItem : ImageScrollerPage mTextScale = desc.textScale; virtWidth = desc.virtWidth; virtHeight = desc.virtHeight; - mText = mFont.BreakLines(Stringtable.Localize(txt), virtWidth / mTextScale); - mYpos = y >= 0? y : virtHeight / 2 - mText.Count() * mFont.GetHeight() / 2; + + mText = mFont.BreakLines(Stringtable.Localize(txt.Filter()), virtWidth / mTextScale); + mYpos = y >= 0? y : virtHeight / 2 - mText.Count() * mFont.GetHeight() * mTextScale / 2; }