From da3ee0b6542c74f46d56cce99c1956eeaed9b9b1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 11 Mar 2008 10:02:24 +0000 Subject: [PATCH] remove DifficultyRating (old ez2 reminant) --- stepmania/src/DifficultyRating.cpp | 149 ----------------------------- stepmania/src/DifficultyRating.h | 51 ---------- stepmania/src/Makefile.am | 2 +- 3 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 stepmania/src/DifficultyRating.cpp delete mode 100644 stepmania/src/DifficultyRating.h diff --git a/stepmania/src/DifficultyRating.cpp b/stepmania/src/DifficultyRating.cpp deleted file mode 100644 index 2ca5e24fd5..0000000000 --- a/stepmania/src/DifficultyRating.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "global.h" -#include "DifficultyRating.h" -#include "ThemeManager.h" -#include "RageUtil.h" - -const int ORIENTATION_LEFT = 0; -const int ORIENTATION_CENTER = 1; - -#define ELEMSPACING THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingSpacing") - -DifficultyRating::DifficultyRating() -{ - iMaxElements=10; - for(int i=0; iLoad( THEME->GetPathG("DifficultyRating","icon") ); - m_apSprites.push_back( pNewSprite ); - m_apSprites[i]->SetDiffuse( RageColor(1,1,1,0) ); -// this->AddChild(m_apSprites[i]); - } - -} - -DifficultyRating::~DifficultyRating() -{ - -} - -void DifficultyRating::DrawPrimitives() -{ - for(int i=0; iDraw(); - } -} - -void DifficultyRating::SetDifficulty(int Difficulty) -{ - iCurrentDifficulty = Difficulty; - for(int i=0; iSetDiffuse( RageColor(1,1,1,1) ); - } - else - { - m_apSprites[i]->SetDiffuse( RageColor(1,1,1,0) ); - } - } - -} - -void DifficultyRating::Update(float fDeltaTime) -{ - for(int i=0; iUpdate(fDeltaTime); - } -} - -void DifficultyRating::SetOrientation(int Orientation) -{ - if(Orientation == ORIENTATION_LEFT) - { - for(int i=0; iSetX(0 + (ELEMSPACING * i) ); - } - } - else // central orientation - { - if(iCurrentDifficulty % 2 == 0) // even number? - { - //damn! in that case everything is to the side of the middle.... - int incrementor=1; // start on one... 0 is reserved for 'central' (read odd number) - float offset=0.5f; - for(int i=0; iSetX(0 + offset); - incrementor++; - } - else // - offset - { - m_apSprites[i]->SetX(0 - offset); - offset += ELEMSPACING + 0.5f; // increase offset - incrementor=1; - } - } - } - else - { - int incrementor=0; - float offset=0; - for(int i=0; iSetX(0); // set to the middle. - offset=ELEMSPACING; - incrementor++; - } - //the rest go either side.... - else - { - if(incrementor == 1) // + offset - { - m_apSprites[i]->SetX(0+offset); - incrementor++; - } - else // - offset - { - m_apSprites[i]->SetX(0-offset); - offset += ELEMSPACING; // increase offset - incrementor=1; - } - } - } - } - } -} - -/* - * (c) 2001-2002 "Frieza" - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/stepmania/src/DifficultyRating.h b/stepmania/src/DifficultyRating.h deleted file mode 100644 index 6daa6a940e..0000000000 --- a/stepmania/src/DifficultyRating.h +++ /dev/null @@ -1,51 +0,0 @@ -/* DifficultyRating - Displays a whole bunch of graphics, either left aligned or center aligned. */ - -#ifndef DIFFICULTY_RATING_H -#define DIFFICULTY_RATING_H - -#include "ActorFrame.h" -#include "Sprite.h" -#include "ThemeManager.h" - -class DifficultyRating : public ActorFrame -{ -public: - DifficultyRating(); - ~DifficultyRating(); - void SetDifficulty(int Difficulty); - void SetOrientation(int Orientation); - virtual void DrawPrimitives(); - virtual void Update(float fDeltaTime); -private: - int iMaxElements; - int iOrientation; - int iCurrentDifficulty; - vector m_apSprites; // stores the list of elements (left to right) -}; - -#endif - -/* - * (c) 2001-2002 "Frieza" - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 8d1bb05d79..07f0e37558 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -313,7 +313,7 @@ ActorsInMenus = \ ActiveAttackList.cpp ActiveAttackList.h BPMDisplay.cpp BPMDisplay.h ComboGraph.cpp ComboGraph.h \ CourseContentsList.cpp CourseContentsList.h \ DifficultyList.cpp DifficultyList.h \ -DifficultyMeter.cpp DifficultyMeter.h DifficultyRating.cpp DifficultyRating.h \ +DifficultyMeter.cpp DifficultyMeter.h \ DualScrollBar.cpp DualScrollBar.h \ EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \