diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua index 85dc33967f..793053ba2a 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua @@ -7,8 +7,8 @@ return Def.ActorFrame { LoadFont("_terminator two 60") .. { InitCommand=cmd(y,-150;settext,ScreenString("Warning");diffuse,color("#fef500");strokecolor,color("#0167d2");shadowlength,0); }; - LoadFont("_venacti bold 30") .. { - InitCommand=cmd(y,20;settext,ScreenString("BodyText");wrapwidthpixels,1000;strokecolor,color("#0167d2");shadowlength,0); + LoadFont("_venacti Bold 15px") .. { + InitCommand=cmd(y,20;settext,ScreenString("BodyText");uppercase,true;wrapwidthpixels,500;strokecolor,color("#0167d2");shadowlength,0); }; }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_regra 32 bold.ini b/stepmania/Themes/default/Fonts/_regra 32 bold.ini index 41a2efc896..9cb6ee6bdc 100755 --- a/stepmania/Themes/default/Fonts/_regra 32 bold.ini +++ b/stepmania/Themes/default/Fonts/_regra 32 bold.ini @@ -5,7 +5,6 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_regra bold 36.ini b/stepmania/Themes/default/Fonts/_regra bold 36.ini index ec159649d4..9a9eba319d 100755 --- a/stepmania/Themes/default/Fonts/_regra bold 36.ini +++ b/stepmania/Themes/default/Fonts/_regra bold 36.ini @@ -5,7 +5,6 @@ LineSpacing=43 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini index eba3156aa6..00c62f690a 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini @@ -6,7 +6,6 @@ DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 -FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini index 40fbae3e3a..9910cfe6f0 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini @@ -6,7 +6,6 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 -FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf square head 32.ini b/stepmania/Themes/default/Fonts/_sf square head 32.ini index a559311b28..48056599fb 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 32.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 32.ini @@ -5,7 +5,6 @@ LineSpacing=31 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=2 AdvanceExtraPixels=0 -FontBaseZoom=0.5 AddToAllWidths=4 0=5 1=5 diff --git a/stepmania/Themes/default/Fonts/_sf square head 52.ini b/stepmania/Themes/default/Fonts/_sf square head 52.ini index 6c80054c52..c00eceb63a 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 52.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 52.ini @@ -5,7 +5,6 @@ LineSpacing=51 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=7 1=7 2=7 diff --git a/stepmania/Themes/default/Fonts/_sf square head 60.ini b/stepmania/Themes/default/Fonts/_sf square head 60.ini index 0ae1f76f4b..2e50be6e79 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 60.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 60.ini @@ -5,7 +5,6 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini index 230b330eea..8657966e9a 100755 --- a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini +++ b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini @@ -6,7 +6,6 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 AddToAllWidths=2 -FontBaseZoom=0.5 0=6 1=6 2=6 diff --git a/stepmania/Themes/default/Fonts/_terminator two 32.ini b/stepmania/Themes/default/Fonts/_terminator two 32.ini index 37b979dd80..3d5e646c49 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 32.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 32.ini @@ -5,7 +5,6 @@ LineSpacing=32 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 -FontBaseZoom=0.5 DefaultStrokeColor=#00000077 0=8 1=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 36.ini b/stepmania/Themes/default/Fonts/_terminator two 36.ini index 6afcb00269..1cbb05c878 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 36.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 36.ini @@ -5,7 +5,6 @@ LineSpacing=36 DrawExtraPixelsLeft=1 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 DefaultStrokeColor=#FFFFFF00 0=15 1=15 diff --git a/stepmania/Themes/default/Fonts/_terminator two 40.ini b/stepmania/Themes/default/Fonts/_terminator two 40.ini index f46f41cba0..276db95941 100644 --- a/stepmania/Themes/default/Fonts/_terminator two 40.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 40.ini @@ -4,7 +4,6 @@ LineSpacing=40 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 DefaultStrokeColor=#FFFFFF [numbers] diff --git a/stepmania/Themes/default/Fonts/_terminator two 50.ini b/stepmania/Themes/default/Fonts/_terminator two 50.ini index f09face62c..094288ef4c 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 50.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 50.ini @@ -5,7 +5,6 @@ LineSpacing=51 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=8 1=8 2=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score.ini b/stepmania/Themes/default/Fonts/_terminator two 54 score.ini index 150e543fd3..1ed93f307e 100644 --- a/stepmania/Themes/default/Fonts/_terminator two 54 score.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 54 score.ini @@ -5,7 +5,6 @@ LineSpacing=54 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 -FontBaseZoom=0.5 [numbers] 0=36 diff --git a/stepmania/Themes/default/Fonts/_terminator two 60.ini b/stepmania/Themes/default/Fonts/_terminator two 60.ini index 4131dd7aa7..551816286d 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 60.ini @@ -5,7 +5,6 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two 92.ini b/stepmania/Themes/default/Fonts/_terminator two 92.ini index 232c97c73e..1f9648f2b0 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 92.ini @@ -5,7 +5,6 @@ LineSpacing=92 DrawExtraPixelsLeft=1 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini index 9ea6367a01..ac839ef6da 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini @@ -5,7 +5,6 @@ LineSpacing=60 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini index 0d90bdae08..2114d3fb78 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini @@ -5,7 +5,6 @@ LineSpacing=92 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini index a533e094ff..e857b80a22 100644 --- a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini +++ b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini @@ -5,7 +5,6 @@ LineSpacing=120 DrawExtraPixelsLeft=8 DrawExtraPixelsRight=8 AdvanceExtraPixels=0 -FontBaseZoom=0.5 [numbers] 0=67 diff --git a/stepmania/Themes/default/Fonts/_venacti 20px.ini b/stepmania/Themes/default/Fonts/_venacti 20px.ini index b2498f243f..be82fde473 100755 --- a/stepmania/Themes/default/Fonts/_venacti 20px.ini +++ b/stepmania/Themes/default/Fonts/_venacti 20px.ini @@ -5,7 +5,6 @@ LineSpacing=24 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 24.ini b/stepmania/Themes/default/Fonts/_venacti 24.ini index e369c4c10d..ffb8238717 100755 --- a/stepmania/Themes/default/Fonts/_venacti 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti 24.ini @@ -5,7 +5,6 @@ LineSpacing=29 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini index 8b1db7a86c..3fe349d0a0 100755 --- a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini +++ b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini @@ -5,7 +5,6 @@ LineSpacing=28 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 80 bold timer.ini b/stepmania/Themes/default/Fonts/_venacti 80 bold timer.ini index 8014d6d648..d2e65d44a0 100644 --- a/stepmania/Themes/default/Fonts/_venacti 80 bold timer.ini +++ b/stepmania/Themes/default/Fonts/_venacti 80 bold timer.ini @@ -5,7 +5,6 @@ LineSpacing=96 DrawExtraPixelsLeft=8 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24.ini b/stepmania/Themes/default/Fonts/_venacti bold 24.ini index c76afaa1ce..9d95844ab8 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 24.ini @@ -6,7 +6,6 @@ DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 DefaultStrokeColor=#FFFFFF00 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 26.ini b/stepmania/Themes/default/Fonts/_venacti bold 26.ini index c2fe98e1ce..24779bbe5a 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 26.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 26.ini @@ -5,7 +5,6 @@ LineSpacing=31 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 28.ini b/stepmania/Themes/default/Fonts/_venacti bold 28.ini index 4e21cb78f1..6e7f0783b9 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 28.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 28.ini @@ -5,7 +5,6 @@ LineSpacing=34 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 32.ini b/stepmania/Themes/default/Fonts/_venacti bold 32.ini index bfaf813812..774ea00b58 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 32.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 32.ini @@ -5,7 +5,6 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 50.ini b/stepmania/Themes/default/Fonts/_venacti bold 50.ini index 84c6515010..b2fb0d59f8 100644 --- a/stepmania/Themes/default/Fonts/_venacti bold 50.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 50.ini @@ -5,7 +5,6 @@ LineSpacing=60 DrawExtraPixelsLeft=5 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold fixed-width 24.ini b/stepmania/Themes/default/Fonts/_venacti bold fixed-width 24.ini index 068a0534e7..dd7e230761 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold fixed-width 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold fixed-width 24.ini @@ -2,7 +2,6 @@ Top=5 LineSpacing=29 DrawExtraPixelsLeft=2 -FontBaseZoom=0.5 [numbers] Baseline=24 diff --git a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini index ebfc8ae57d..2a57ee30f4 100755 --- a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini +++ b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini @@ -5,7 +5,6 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -FontBaseZoom=0.5 [numbers] Baseline=54 diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index fead91cac0..c7a2d51f88 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -452,28 +452,34 @@ void BitmapText::SetMaxHeight( float fMaxHeight ) void BitmapText::UpdateBaseZoom() { - const float fBaseZoom = m_pFont->GetFontBaseZoom(); - if( m_fMaxWidth == 0 ) { - this->SetBaseZoomX( fBaseZoom ); + this->SetBaseZoomX( 1 ); } else { const float fWidth = GetUnzoomedWidth(); - const float fZoom = min( 1, m_fMaxWidth/fWidth ); /* Never increase the zoom. */ - this->SetBaseZoomX( fBaseZoom * fZoom ); + if( fWidth != 0 ) // don't divide by 0 + { + /* Never decrease the zoom. */ + const float fZoom = min( 1, m_fMaxWidth/fWidth ); + this->SetBaseZoomX( fZoom ); + } } if( m_fMaxHeight == 0 ) { - this->SetBaseZoomY( fBaseZoom ); + this->SetBaseZoomY( 1 ); } else { const float fHeight = GetUnzoomedHeight(); - const float fZoom = min( 1, m_fMaxHeight/fHeight ); /* Never increase the zoom. */ - this->SetBaseZoomY( fBaseZoom * fZoom ); + if( fHeight != 0 ) // don't divide by 0 + { + /* Never decrease the zoom. */ + const float fZoom = min( 1, m_fMaxHeight/fHeight ); + this->SetBaseZoomY( fZoom ); + } } } diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp index 30027e06ae..6a64409991 100644 --- a/stepmania/src/Font.cpp +++ b/stepmania/src/Font.cpp @@ -228,7 +228,6 @@ Font::Font() m_iRefCount = 1; m_pDefault = NULL; m_bRightToLeft = false; - m_fFontBaseZoom = 1; m_DefaultStrokeColor = RageColor(1,1,1,1); m_bStrokeIsUnder = true; } @@ -692,7 +691,6 @@ void Font::Load( const RString &sIniPath, RString sChars ) ini.RenameKey("Char Widths", "main"); ini.GetValue( "main", "CapitalsOnly", bCapitalsOnly ); ini.GetValue( "main", "RightToLeft", m_bRightToLeft ); - ini.GetValue( "main", "FontBaseZoom", m_fFontBaseZoom ); RString s; if( ini.GetValue( "main", "DefaultStrokeColor", s ) ) m_DefaultStrokeColor.FromString( s ); diff --git a/stepmania/src/Font.h b/stepmania/src/Font.h index 5a068136bf..51e20e9f2a 100644 --- a/stepmania/src/Font.h +++ b/stepmania/src/Font.h @@ -147,7 +147,6 @@ public: void SetDefaultGlyph( FontPage *pPage ); bool IsRightToLeft() const { return m_bRightToLeft; }; - float GetFontBaseZoom() const { return m_fFontBaseZoom; }; const RageColor &GetDefaultStrokeColor() const { return m_DefaultStrokeColor; }; const bool GetStrokeIsUnder() const { return m_bStrokeIsUnder; }; @@ -168,7 +167,6 @@ private: // There may be a better way to handle this. bool m_bRightToLeft; - float m_fFontBaseZoom; RageColor m_DefaultStrokeColor; bool m_bStrokeIsUnder; // draw stroke under if true, over if false diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index a0b163bd4e..9d6a0df8c8 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -212,7 +212,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj"" AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib" - OutputFile="../Program/StepMania-fastdebug.exe" + OutputFile="..\Program\StepMania-fastdebug.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""