From 8269bebe3caedf67eef69839fe4bef9606d1a889 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Oct 2005 05:28:25 +0000 Subject: [PATCH] remove HoldGhostArrow --- stepmania/src/HoldGhostArrow.cpp | 49 ------------------------------ stepmania/src/HoldGhostArrow.h | 52 -------------------------------- stepmania/src/Makefile.am | 2 +- stepmania/src/StepMania.vcproj | 6 ---- 4 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 stepmania/src/HoldGhostArrow.cpp delete mode 100644 stepmania/src/HoldGhostArrow.h diff --git a/stepmania/src/HoldGhostArrow.cpp b/stepmania/src/HoldGhostArrow.cpp deleted file mode 100644 index 952d2c043e..0000000000 --- a/stepmania/src/HoldGhostArrow.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "global.h" -#include "HoldGhostArrow.h" -#include "NoteSkinManager.h" - - - -HoldGhostArrow::HoldGhostArrow() -{ - m_bHoldIsActive = false; -} - -void HoldGhostArrow::Load( const CString &sButton, const CString &sElement ) -{ - m_sprGhost.Load( NOTESKIN->GetPath(sButton, sElement) ); - m_sprGhost->RunCommands( NOTESKIN->GetMetricA("HoldGhostArrow","OnCommand") ); - this->AddChild( m_sprGhost ); -} - -void HoldGhostArrow::Update( float fDeltaTime ) -{ - ActorFrame::Update( fDeltaTime ); - - m_bHoldIsActive = false; -} - -/* - * (c) 2001-2004 Ben Nordstrom, Chris Danford - * 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/HoldGhostArrow.h b/stepmania/src/HoldGhostArrow.h deleted file mode 100644 index 3b9583e8c0..0000000000 --- a/stepmania/src/HoldGhostArrow.h +++ /dev/null @@ -1,52 +0,0 @@ -/* HoldGhostArrow - Graphic shown while holding a HoldNote. */ - -#ifndef HOLDGHOSTARROW_H -#define HOLDGHOSTARROW_H - -#include "ActorFrame.h" -#include "AutoActor.h" - -class HoldGhostArrow : public ActorFrame -{ -public: - HoldGhostArrow(); - - virtual void Load( const CString &sButton, const CString &sElement ); - - virtual void Update( float fDeltaTime ); - virtual bool EarlyAbortDraw() const { return !m_bHoldIsActive; } - - void SetHoldIsActive( bool bHoldIsActive ) { m_bHoldIsActive = bHoldIsActive; } - -private: - bool m_bHoldIsActive; - AutoActor m_sprGhost; -}; - - -#endif - -/* - * (c) 2001-2004 Ben Nordstrom, Chris Danford - * 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 e09dd00d24..00469cd2cc 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -275,7 +275,7 @@ ActorsInGameplay = \ ArrowEffects.cpp ArrowEffects.h AttackDisplay.cpp AttackDisplay.h \ Background.cpp Background.h BeginnerHelper.cpp BeginnerHelper.h CombinedLifeMeterTug.cpp CombinedLifeMeterTug.h \ Combo.cpp Combo.h DancingCharacters.cpp DancingCharacters.h Foreground.cpp Foreground.h \ -GhostArrowRow.cpp GhostArrowRow.h HoldGhostArrow.cpp HoldGhostArrow.h HoldJudgment.cpp HoldJudgment.h \ +GhostArrowRow.cpp GhostArrowRow.h HoldJudgment.cpp HoldJudgment.h \ Judgment.cpp Judgment.h LifeMeter.h LifeMeterBar.cpp LifeMeterBar.h \ LifeMeterBattery.cpp LifeMeterBattery.h LifeMeterTime.cpp LifeMeterTime.h \ LyricDisplay.cpp LyricDisplay.h NoteDisplay.cpp NoteDisplay.h NoteField.cpp NoteField.h \ diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index b133567212..c36e8e5c98 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1861,12 +1861,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -