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

STL fixes needed to link from StartUp to Personal

Browse Source
This commit is contained in:
Branan Purvine-Riley
2011-04-10 23:20:08 -07:00
parent 4b17c0d28a
commit 2c5e01464e
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
View File

@ -242,10 +242,10 @@ void plAGAnimInstance::DetachChannels()
do {
plAGChannel *channel = (*i).second;
channelMod->DetachChannel(channel);
} while (i != fManualDetachChannels.end() && (*++i).first == channelName);
} while (++i != fManualDetachChannels.end() && i->first == channelName);
} else {
do {
} while (i != fManualDetachChannels.end() && (*++i).first == channelName);
} while (++i != fManualDetachChannels.end() && i->first == channelName);
}
}

9
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp
View File

@ -227,12 +227,12 @@ plAGChannel * plAGModifier::MergeChannel(plAGApplicator *app,
// DETACHCHANNEL
hsBool plAGModifier::DetachChannel(plAGChannel * channel)
{
plAppTable::iterator i = fApps.begin();
size_t i = 0;
hsBool done = false;
for( ; i != fApps.end(); i++)
for( ; i != fApps.size(); i++)
{
plAGApplicator *app = *i;
plAGApplicator *app = fApps[i];
plAGChannel *existingChannel = app->GetChannel();
if(existingChannel)
{
@ -243,9 +243,8 @@ hsBool plAGModifier::DetachChannel(plAGChannel * channel)
app->SetChannel(replacementChannel);
if( ! replacementChannel && app->AutoDelete())
{
plAppTable::iterator old = i;
fApps.erase(fApps.begin()+i);
i--;
fApps.erase(old);
delete app;
}
done = true;