actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't allow Load() on copies

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-22 08:28:21 +00:00
parent f7bf2ef2fa
commit 5c140d053e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+5 -2
View File
@@ -113,7 +113,6 @@ RageSound::RageSound(const RageSound &cpy)
original = cpy.original; original = cpy.original;
full_buf = cpy.full_buf; full_buf = cpy.full_buf;
big = cpy.big; big = cpy.big;
m_sFilePath = cpy.m_sFilePath;
m_StartSample = cpy.m_StartSample; m_StartSample = cpy.m_StartSample;
m_LengthSamples = cpy.m_LengthSamples; m_LengthSamples = cpy.m_LengthSamples;
Loop = cpy.Loop; Loop = cpy.Loop;
@@ -131,6 +130,10 @@ RageSound::RageSound(const RageSound &cpy)
Load(cpy.GetLoadedFilePath(), false); Load(cpy.GetLoadedFilePath(), false);
} }
/* Load() won't work on a copy if m_sFilePath is already set, so
* copy this down here. */
m_sFilePath = cpy.m_sFilePath;
/* Register ourselves, so we receive Update()s. */ /* Register ourselves, so we receive Update()s. */
SOUNDMAN->all_sounds.insert(this); SOUNDMAN->all_sounds.insert(this);
} }
@@ -154,7 +157,7 @@ void RageSound::Load(CString sSoundFilePath, bool cache)
LOG->Trace( "RageSound::LoadSound( '%s' )", sSoundFilePath.GetString() ); LOG->Trace( "RageSound::LoadSound( '%s' )", sSoundFilePath.GetString() );
/* Don't load over copies. */ /* Don't load over copies. */
// ASSERT(original == this); ASSERT(original == this || m_sFilePath == "");
Unload(); Unload();