From 93b8a46399540dff947543290f452d3d45a68eec Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 19 Dec 2003 05:01:42 +0000 Subject: [PATCH] better memory card assignment logic, add memory card icons, more memory card sounds --- stepmania/src/MemoryCardDisplay.cpp | 43 +++++++++++++++++++++++++++++ stepmania/src/MemoryCardDisplay.h | 34 +++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 stepmania/src/MemoryCardDisplay.cpp create mode 100644 stepmania/src/MemoryCardDisplay.h diff --git a/stepmania/src/MemoryCardDisplay.cpp b/stepmania/src/MemoryCardDisplay.cpp new file mode 100644 index 0000000000..393a4396bc --- /dev/null +++ b/stepmania/src/MemoryCardDisplay.cpp @@ -0,0 +1,43 @@ +#include "global.h" +#include "MemoryCardDisplay.h" +#include "ThemeManager.h" +#include "MemoryCardManager.h" + + +MemoryCardDisplay::MemoryCardDisplay() +{ + m_PlayerNumber = PLAYER_INVALID; + m_LastSeenState = MEMORY_CARD_STATE_INVALID; +} + +void MemoryCardDisplay::Load( PlayerNumber pn ) +{ + m_PlayerNumber = pn; + + for( int i=0; iGetPathToG(ssprintf("MemoryCardDisplay %s p%d",sState.c_str(),pn+1)) ); + m_spr[i].SetHidden( true ); + this->AddChild( &m_spr[i] ); + } +} + +void MemoryCardDisplay::Update( float fDelta ) +{ + MemoryCardState newMcs = MEMCARDMAN->GetCardState(m_PlayerNumber); + if( m_LastSeenState != newMcs ) + { + m_spr[m_LastSeenState].SetHidden( true ); + m_LastSeenState = newMcs; + m_spr[m_LastSeenState].SetHidden( false ); + } + + ActorFrame::Update( fDelta ); +} + +/* + Copyright (c) 2003 by the person(s) listed below. All rights reserved. + Chris Danford +*/ diff --git a/stepmania/src/MemoryCardDisplay.h b/stepmania/src/MemoryCardDisplay.h new file mode 100644 index 0000000000..c1b8c3caad --- /dev/null +++ b/stepmania/src/MemoryCardDisplay.h @@ -0,0 +1,34 @@ +#ifndef MEMORY_CARD_DISPLAY_H +#define MEMORY_CARD_DISPLAY_H + +/* +----------------------------------------------------------------------- +File: MemoryCardDisplay.h + +Desc: A graphic displayed on the screen during dance + +Copyright (c) 2003 by the person(s) listed below. All rights reserved. + Chris Danford +----------------------------------------------------------------------- +*/ + +#include "GameConstantsAndTypes.h" +#include "PlayerNumber.h" +#include "Sprite.h" +#include "ActorFrame.h" + + +class MemoryCardDisplay : public ActorFrame +{ +public: + MemoryCardDisplay(); + void Load( PlayerNumber pn ); + void Update( float fDelta ); + +protected: + PlayerNumber m_PlayerNumber; + MemoryCardState m_LastSeenState; + Sprite m_spr[NUM_MEMORY_CARD_STATES]; +}; + +#endif