diff --git a/Manual/index.html b/Manual/index.html index a05277aeab..56251f96ed 100644 --- a/Manual/index.html +++ b/Manual/index.html @@ -70,7 +70,7 @@ specialized controllers.

However, we highly recommend at least these settings for decent performance:

-

On Windows, DirectX 8.0 is required in order to install StepMania. If DirectX +

On Windows, DirectX 9.0 is required in order to install StepMania. If DirectX is not installed on your computer, the StepMania installer will abort the installation with a warning.

diff --git a/Themes/_fallback/Fonts/_16px fonts.ini b/Themes/_fallback/Fonts/_16px fonts.ini index d56c851b17..23ad8678b0 100644 --- a/Themes/_fallback/Fonts/_16px fonts.ini +++ b/Themes/_fallback/Fonts/_16px fonts.ini @@ -5,4 +5,4 @@ # have them pulled in for every 16-pixel font. # xxx: we don't have 16px japanese or korean fonts [main] -import=_Thai 16px,_misc 16px,_game chars 16px +import=_Thai 16px,_misc 16px,_game chars 16px,_ui chars 16px diff --git a/Themes/_fallback/Fonts/_20px fonts.ini b/Themes/_fallback/Fonts/_20px fonts.ini index 915647249d..41104ffbc0 100644 --- a/Themes/_fallback/Fonts/_20px fonts.ini +++ b/Themes/_fallback/Fonts/_20px fonts.ini @@ -10,4 +10,4 @@ # The characters in _game chars 16px are actually very large; # they'll look fine here, too. -import=_japanese 24px,_korean 24px,_game chars 16px,_misc 16px +import=_japanese 24px,_korean 24px,_game chars 16px,_ui chars 16px,_misc 16px diff --git a/Themes/_fallback/Fonts/_ui chars 16px [main-stroke] 1x1.png b/Themes/_fallback/Fonts/_ui chars 16px [main-stroke] 1x1.png new file mode 100644 index 0000000000..5fcc04eb73 Binary files /dev/null and b/Themes/_fallback/Fonts/_ui chars 16px [main-stroke] 1x1.png differ diff --git a/Themes/_fallback/Fonts/_ui chars 16px [main] 1x1.png b/Themes/_fallback/Fonts/_ui chars 16px [main] 1x1.png new file mode 100644 index 0000000000..b503eec312 Binary files /dev/null and b/Themes/_fallback/Fonts/_ui chars 16px [main] 1x1.png differ diff --git a/Themes/_fallback/Fonts/_ui chars 16px.ini b/Themes/_fallback/Fonts/_ui chars 16px.ini new file mode 100644 index 0000000000..e9fca64617 --- /dev/null +++ b/Themes/_fallback/Fonts/_ui chars 16px.ini @@ -0,0 +1,14 @@ +# The characters in this font are actually much larger than 16 pixels. +# The "16px" indicates what size uppercase letter this font is meant +# for, not necessarily the actual size of the characters. + +[main] +0=24 + +# Don't load this font grayscale. +TextureHints=16bpp + +Top=8 +Baseline=24 + +map nextrow=0 diff --git a/Themes/_fallback/Scripts/04 LogDisplay.lua b/Themes/_fallback/Scripts/04 LogDisplay.lua index 482a73eaa7..537022be86 100644 --- a/Themes/_fallback/Scripts/04 LogDisplay.lua +++ b/Themes/_fallback/Scripts/04 LogDisplay.lua @@ -150,16 +150,8 @@ local log_display_mt= { -- and hardcoded it into BitmapText. local message= tostring(mess.message):gsub("::", ":") if params.IgnoreIdentical then - -- Use only the first line for comparison because the rest is - -- probably stack trace, with args that might vary uselessly. - self.width_tester:settext(message) - local lines= convert_text_to_indented_lines( - self.width_tester, self.indent, self.line_width, self.text_zoom) for i, prevmess in ipairs(self.message_log) do - self.width_tester:settext(prevmess) - local prevlines= convert_text_to_indented_lines( - self.width_tester, self.indent, self.line_width, self.text_zoom) - if lines[1][2] == prevmess[1][2] then return end + if message == prevmess then return end end end if params.ReplaceLinesWhenHidden and self.hidden then diff --git a/_assets/fonts/_ui chars 16px 1x1.psd b/_assets/fonts/_ui chars 16px 1x1.psd new file mode 100644 index 0000000000..1904f5bfc7 Binary files /dev/null and b/_assets/fonts/_ui chars 16px 1x1.psd differ diff --git a/src/Course.cpp b/src/Course.cpp index 3231dbed94..73528353e0 100644 --- a/src/Course.cpp +++ b/src/Course.cpp @@ -823,9 +823,24 @@ bool Course::GetTotalSeconds( StepsType st, float& fSecondsOut ) const if( !AllSongsAreFixed() ) return false; - Trail* pTrail = GetTrail( st, Difficulty_Medium ); + Trail* trail = GetTrail( st, Difficulty_Medium ); + if(!trail) + { + for(int cd= 0; cd < NUM_CourseDifficulty; ++cd) + { + trail= GetTrail(st, (CourseDifficulty)cd); + if(trail) + { + break; + } + } + if(!trail) + { + return false; + } + } - fSecondsOut = pTrail->GetLengthSeconds(); + fSecondsOut = trail->GetLengthSeconds(); return true; } diff --git a/src/NoteSkinManager.cpp b/src/NoteSkinManager.cpp index 1c226daa55..2148154829 100644 --- a/src/NoteSkinManager.cpp +++ b/src/NoteSkinManager.cpp @@ -438,14 +438,14 @@ Actor *NoteSkinManager::LoadActor( const RString &sButton, const RString &sEleme if( !PushActorTemplate(L, sButton, sElement, bSpriteOnly) ) { // ActorUtil will warn about the error - return new Sprite; + return Sprite::NewBlankSprite(); } auto_ptr pNode( XmlFileUtil::XNodeFromTable(L) ); if( pNode.get() == NULL ) { // XNode will warn about the error - return new Sprite; + return Sprite::NewBlankSprite(); } LUA->Release( L ); @@ -460,7 +460,7 @@ Actor *NoteSkinManager::LoadActor( const RString &sButton, const RString &sEleme { LuaHelpers::ReportScriptErrorFmt("%s: %s %s must be a Sprite", m_sCurrentNoteSkin.c_str(), sButton.c_str(), sElement.c_str()); delete pRet; - return new Sprite; + return Sprite::NewBlankSprite(); } } diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 49adc799bf..92429df8dd 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -1958,7 +1958,7 @@ void ScreenGameplay::UpdateHasteRate() { if( !GAMESTATE->IsHumanPlayer(pi->m_pn) ) continue; - fMaxLife = max( fMaxLife, pi->m_pLifeMeter->GetLife() ); + fMaxLife = max( fMaxLife, pi->m_pLifeMeter->GetLife() ); } if( fMaxLife <= m_fHasteLifeSwitchPoint ) GAMESTATE->m_fHasteRate = SCALE( fMaxLife, 0.0f, m_fHasteLifeSwitchPoint, -1.0f, 0.0f ); diff --git a/src/Sprite.cpp b/src/Sprite.cpp index 3a82cf343b..f9350e7e4b 100644 --- a/src/Sprite.cpp +++ b/src/Sprite.cpp @@ -32,11 +32,19 @@ Sprite::Sprite() m_fTexCoordVelocityX = 0; m_fTexCoordVelocityY = 0; - - // An uninitialized sprite should be valid to display. -Kyz - Load(TEXTUREMAN->GetDefaultTextureID()); } +// NoteSkinManager needs a sprite with a texture set to return in cases where +// the noteskin doesn't return a valid actor. I would really prefer to make +// Sprite::Sprite load the default texture, but that causes problems for +// banners on ScreenSelectMusic and videos on ScreenGameplay. So rather than +// dig through either of those, NoteSkinManager uses this special function. +Sprite* Sprite::NewBlankSprite() +{ + Sprite* news= new Sprite; + news->Load(TEXTUREMAN->GetDefaultTextureID()); + return news; +} Sprite::~Sprite() { diff --git a/src/Sprite.h b/src/Sprite.h index 0697fc8aec..4e4ba791ac 100644 --- a/src/Sprite.h +++ b/src/Sprite.h @@ -15,6 +15,9 @@ public: Sprite( const Sprite &cpy ); virtual ~Sprite(); + // See explanation in source. + static Sprite* NewBlankSprite(); + virtual void InitState(); void LoadFromNode( const XNode* pNode ); diff --git a/stepmania.nsi b/stepmania.nsi index 114b6a97fb..3ee9a2ccf9 100644 --- a/stepmania.nsi +++ b/stepmania.nsi @@ -643,6 +643,10 @@ Function PreInstall old_nsis_not_installed: + ; todo: this needs to be updated for DirectX 9.0c + ; HKEY_LOCAL_MACHINE "Software\Microsoft\DirectX" "Version" + ; 9.0c is "4.09.00.0904" + ; Check for DirectX 8.0 (to be moved to the right section later) ; We only use this for sound. Actually, I could probably make the sound ; work with an earlier one; I'm not sure if that's needed or not. For one