From 99d4f12881fcfce78680f5bffca47c3b14dc207d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 16 Jul 2005 02:52:16 +0000 Subject: [PATCH] copy ctor --- stepmania/src/OptionIcon.cpp | 12 ++++++++++-- stepmania/src/OptionIcon.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp index 212f1cb01e..556ccb4db7 100644 --- a/stepmania/src/OptionIcon.cpp +++ b/stepmania/src/OptionIcon.cpp @@ -17,10 +17,18 @@ OptionIcon::OptionIcon() { } +OptionIcon::OptionIcon( const OptionIcon &cpy ): + ActorFrame(cpy), + m_text(cpy.m_text), + m_spr(cpy.m_spr) +{ + this->RemoveAllChildren(); + this->AddChild( &m_spr ); + this->AddChild( &m_text ); +} + void OptionIcon::Load( CString sType ) { - ASSERT( m_SubActors.empty() ); // don't load twice - m_spr.Load( THEME->GetPathG(sType,"icon 3x2") ); m_spr.StopAnimating(); this->AddChild( &m_spr ); diff --git a/stepmania/src/OptionIcon.h b/stepmania/src/OptionIcon.h index 154531789f..5961d48faa 100644 --- a/stepmania/src/OptionIcon.h +++ b/stepmania/src/OptionIcon.h @@ -13,6 +13,7 @@ class OptionIcon : public ActorFrame { public: OptionIcon(); + OptionIcon( const OptionIcon &cpy ); void Load( CString sType ); void Set( PlayerNumber pn, const CString &sText, bool bHeader = false );