actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove CachedThemeMetrics in favor of ThemeMetric<T>

Browse Source 
fix "CachedThemeMetrics don't read HTML colors and don't evaluate Lua expressions"
This commit is contained in:
Chris Danford
2004-11-06 20:36:04 +00:00
parent 3594cc345e
commit 5127ceef4d
30 changed files with 166 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Background.cpp
+4 -7
View File
@@ -16,18 +16,18 @@
#include "BeginnerHelper.h"
#include "StageStats.h"
#include "ScreenDimensions.h"
#include "ThemeMetric.h"
#include <set>
const float FADE_SECONDS = 1.0f;
#define LEFT_EDGE THEME->GetMetricF("Background","LeftEdge")
#define TOP_EDGE THEME->GetMetricF("Background","TopEdge")
#define RIGHT_EDGE THEME->GetMetricF("Background","RightEdge")
#define BOTTOM_EDGE THEME->GetMetricF("Background","BottomEdge")
CachedThemeMetricB BLINK_DANGER_ALL("Background","BlinkDangerAll");
CachedThemeMetricB DANGER_ALL_IS_OPAQUE("Background","DangerAllIsOpaque");
ThemeMetric<bool> BLINK_DANGER_ALL("Background","BlinkDangerAll");
ThemeMetric<bool> DANGER_ALL_IS_OPAQUE("Background","DangerAllIsOpaque");
#define BRIGHTNESS_FADE_COMMAND THEME->GetMetric("Background","BrightnessFadeCommand")
#define RECT_BACKGROUND RectF(LEFT_EDGE,TOP_EDGE,RIGHT_EDGE,BOTTOM_EDGE)
@@ -36,9 +36,6 @@ const CString STATIC_BACKGROUND = "static background";
Background::Background()
{
BLINK_DANGER_ALL.Refresh();
DANGER_ALL_IS_OPAQUE.Refresh();
m_iCurBGChangeIndex = -1;
m_pCurrentBGA = NULL;
m_pFadingBGA = NULL;
@@ -585,7 +582,7 @@ void Background::DrawPrimitives()
m_DangerAll.Draw();
}
if( !IsDangerAllVisible() || !DANGER_ALL_IS_OPAQUE )
if( !IsDangerAllVisible() || !(bool)DANGER_ALL_IS_OPAQUE )
{
if( m_pDancingCharacters )
m_pDancingCharacters->m_bDrawDangerLight = false;