From 7682367a4e21b45e4b8c4b8fd68b73d8b9dbe0e0 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 10 Feb 2002 06:25:12 +0000
Subject: [PATCH] no message

---
 stepmania/src/Background.cpp          |  4 ++-
 stepmania/src/MusicStatusDisplay.h    | 18 +++++++-------
 stepmania/src/MusicWheel.cpp          | 20 ++++++++++++---
 stepmania/src/MusicWheel.h            |  3 +++
 stepmania/src/RageMovieTexture.cpp    |  2 ++
 stepmania/src/TransitionInvisible.cpp | 33 ++++++++++++++++++++++++
 stepmania/src/TransitionInvisible.h   | 36 +++++++++++++++++++++++++++
 7 files changed, 103 insertions(+), 13 deletions(-)
 create mode 100644 stepmania/src/TransitionInvisible.cpp
 create mode 100644 stepmania/src/TransitionInvisible.h

diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 560503dacd..60f29443b4 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -66,8 +66,10 @@ bool Background::LoadFromSong( Song &song )
 				int iIndexRandom = rand() % sVisualizationPaths.GetSize();
 
 				m_sprVisualizationOverlay.Load( VIS_DIR + sVisualizationPaths[iIndexRandom] );
+
+				
 				m_sprVisualizationOverlay.StretchTo( CRect( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT ) );
-				m_sprVisualizationOverlay.SetZoomY( -1 );
+				m_sprVisualizationOverlay.SetZoomY( m_sprVisualizationOverlay.GetZoomY()*-1 );
 				m_sprVisualizationOverlay.SetBlendModeAdd();
 				m_sprVisualizationOverlay.SetDiffuseColor( D3DXCOLOR(0,0,0,0) );
 				this->AddActor( &m_sprVisualizationOverlay );
diff --git a/stepmania/src/MusicStatusDisplay.h b/stepmania/src/MusicStatusDisplay.h
index ece922e790..06bc8bbfdb 100644
--- a/stepmania/src/MusicStatusDisplay.h
+++ b/stepmania/src/MusicStatusDisplay.h
@@ -70,6 +70,10 @@ public:
 	{
 		Sprite::Update( fDeltaTime );
 
+	};
+
+	virtual void RenderPrimitives()
+	{
 		switch( m_MusicStatusDisplayType )
 		{
 		case TYPE_CROWN1:
@@ -77,16 +81,12 @@ public:
 		case TYPE_CROWN3:
 			// blink
 			if( (GetTickCount() % 1000) > 500 )		// show the new icon
-				SetDiffuseColor( D3DXCOLOR(1,1,1,1) );
-			else
-					SetDiffuseColor( D3DXCOLOR(0,0,0,0) );		// invisible
-		}
-	};
-
-	virtual void RenderPrimitives()
-	{
-		if( m_MusicStatusDisplayType == TYPE_NONE )
+				return;
+			break;
+		case TYPE_NONE:
 			return;
+			break;
+		}
 
 		Sprite::RenderPrimitives();
 	}
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 8a297ceef1..2b55d3cf32 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -119,7 +119,7 @@ void WheelItemDisplay::LoadFromWheelItemData( WheelItemData* pWID )
 	case TYPE_MUSIC:
 		m_Banner.LoadFromSong( m_pSong );
 		m_Banner.SetDiffuseColor( m_colorTint );
-		m_MusicStatusDisplay.SetType( (m_pSong->GetNumTimesPlayed()==0) ? TYPE_NEW : TYPE_NONE );
+		m_MusicStatusDisplay.SetType( m_MusicStatusDisplayType );
 		break;
 	default:
 		ASSERT( true );	// invalid type
@@ -382,13 +382,24 @@ void MusicWheel::BuildWheelItemDatas( CArray<WheelItemData, WheelItemData&> &arr
 		ASSERT( true );	// unhandled SORT_ORDER
 	}
 
+	// init crowns
+	for( i=0; i<arrayWheelItemDatas.GetSize(); i++ )
+	{
+		Song* pSong = arrayWheelItemDatas[i].m_pSong;
+		if( pSong != NULL )
+		{
+			MusicStatusDisplayType crown = (pSong->GetNumTimesPlayed()==0) ? TYPE_NEW : TYPE_NONE;
+			arrayWheelItemDatas[i].m_MusicStatusDisplayType = crown;
+		}		
+	}
 
 	if( so == SORT_MOST_PLAYED )
 	{
 		// init crown icons 
-		for( int i=0; i<arrayWheelItemDatas.GetSize(); i++ )
+		for( int i=0; i<arrayWheelItemDatas.GetSize() && i<3; i++ )
 		{
-			arrayWheelItemDatas[i].m_MusicStatusDisplayType = MusicStatusDisplayType(TYPE_CROWN1 + i);
+			MusicStatusDisplayType crown = MusicStatusDisplayType(TYPE_CROWN1 + i);
+			arrayWheelItemDatas[i].m_MusicStatusDisplayType = crown;
 		}
 	}
 
@@ -472,6 +483,9 @@ void MusicWheel::RebuildWheelItemDisplays()
 {
 	// rewind to first index that will be displayed;
 	int iIndex = m_iSelection;
+	if( m_iSelection > GetCurWheelItemDatas().GetSize()-1 )
+		m_iSelection = 0;
+
 	for( int i=0; i<NUM_WHEEL_ITEMS_TO_DRAW/2; i++ )
 	{
 		do
diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h
index 2a14ee7971..9ce32f1b61 100644
--- a/stepmania/src/MusicWheel.h
+++ b/stepmania/src/MusicWheel.h
@@ -154,6 +154,9 @@ protected:
 
 	CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so )
 	{
+		if( pSong == NULL )
+			return "";
+
 		CString sTemp;
 
 		switch( so )
diff --git a/stepmania/src/RageMovieTexture.cpp b/stepmania/src/RageMovieTexture.cpp
index fbc44f9dd0..48d71fe2b9 100644
--- a/stepmania/src/RageMovieTexture.cpp
+++ b/stepmania/src/RageMovieTexture.cpp
@@ -419,6 +419,8 @@ HRESULT RageMovieTexture::InitDShowTextureRenderer()
 	// The source and image width will always be the same since we can't scale the video
 	m_uSourceWidth  = m_pCTR->GetVidWidth();
 	m_uSourceHeight = m_pCTR->GetVidHeight();
+	m_uImageWidth   = m_uSourceWidth;
+	m_uImageHeight  = m_uSourceHeight;
 
 	
     return S_OK;
diff --git a/stepmania/src/TransitionInvisible.cpp b/stepmania/src/TransitionInvisible.cpp
new file mode 100644
index 0000000000..21849bfa12
--- /dev/null
+++ b/stepmania/src/TransitionInvisible.cpp
@@ -0,0 +1,33 @@
+#include "stdafx.h"
+/*
+-----------------------------------------------------------------------------
+ File: TransitionInvisible.cpp
+
+ Desc: Fades out or in.
+
+ Copyright (c) 2001 Chris Danford.  All rights reserved.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "RageUtil.h"
+
+#include "TransitionInvisible.h"
+#include "ScreenDimensions.h"
+
+
+
+TransitionInvisible::TransitionInvisible()
+{
+}
+
+TransitionInvisible::~TransitionInvisible()
+{
+
+}
+
+void TransitionInvisible::RenderPrimitives()
+{
+}
+
+
diff --git a/stepmania/src/TransitionInvisible.h b/stepmania/src/TransitionInvisible.h
new file mode 100644
index 0000000000..da24f34f51
--- /dev/null
+++ b/stepmania/src/TransitionInvisible.h
@@ -0,0 +1,36 @@
+/*
+-----------------------------------------------------------------------------
+ File: TransitionInvisible.cpp
+
+ Desc: Fades out or in.
+
+ Copyright (c) 2001 Chris Danford.  All rights reserved.
+-----------------------------------------------------------------------------
+*/
+
+
+#ifndef _TransitionInvisible_H_
+#define _TransitionInvisible_H_
+
+
+#include "Transition.h"
+#include "RageScreen.h"
+#include "RageSound.h"
+#include "Rectangle.h"
+
+
+class TransitionInvisible : public Transition
+{
+public:
+	TransitionInvisible();
+	virtual ~TransitionInvisible();
+
+	virtual void RenderPrimitives();
+
+protected:
+};
+
+
+
+
+#endif
\ No newline at end of file