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

Manual merge of Pull Request #232 from zrax/plString

Browse Source 
Conflicts:
	Sources/Plasma/CoreLib/HeadSpin.h
This commit is contained in:
Adam Johnson
2012-12-20 17:22:31 -05:00
parent 66038d4fc2 e0e141fd01
commit 75793e5182
74 changed files with 746 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp
View File

@ -134,7 +134,7 @@ void plMorphSequenceSDLMod::ISetCurrentStateFrom(const plStateDataRecord* srcSta
plSceneObject* sobj=GetTarget();
hsAssert(sobj, "plMorphSequenceSDLMod, nil target");
if (strcmp(srcState->GetDescriptor()->GetName(), kSDLMorphSequence))
if (srcState->GetDescriptor()->GetName() != kSDLMorphSequence)
{
hsAssert(false, "Wrong type of state data record passed into plMorphSequenceSDLMod.");
return;