OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Movie filename in plMovieMsg and plBinkPlayer => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-09 20:45:53 -08:00
parent 611b9a09c2
commit d8113a5ab7
6 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/Apps/plClient/plClient.cpp
View File

@ -860,7 +860,7 @@ bool plClient::MsgReceive(plMessage* msg)
//============================================================================
bool plClient::IHandleMovieMsg(plMovieMsg* mov)
{
if( !(mov->GetFileName() && *mov->GetFileName()) )
if (mov->GetFileName().IsEmpty())
return true;
int i;
@ -869,7 +869,7 @@ bool plClient::IHandleMovieMsg(plMovieMsg* mov)
{
for( i = 0; i < fMovies.GetCount(); i++ )
{
if( !stricmp(mov->GetFileName(), fMovies[i]->GetFileName()) )
if (mov->GetFileName().CompareI(fMovies[i]->GetFileName()) == 0)
break;
}
}
@ -929,7 +929,7 @@ bool plClient::IHandleMovieMsg(plMovieMsg* mov)
// If a movie has lost its filename, it means something went horribly wrong
// with playing it and it has shutdown. Or we just stopped it. Either way,
// we need to clear it out of our list.
if( !(fMovies[i]->GetFileName() && *fMovies[i]->GetFileName()) )
if (fMovies[i]->GetFileName().IsEmpty())
{
delete fMovies[i];
fMovies.Remove(i);
@ -1948,7 +1948,7 @@ void plClient::IServiceMovies()
int i;
for( i = 0; i < fMovies.GetCount(); i++ )
{
hsAssert(fMovies[i]->GetFileName() && *fMovies[i]->GetFileName(), "Lost our movie");
hsAssert(!fMovies[i]->GetFileName().IsEmpty(), "Lost our movie");
if( !fMovies[i]->NextFrame() )
{
delete fMovies[i];