OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix some plString vararg parameters in normally-disabled code

Browse Source
This commit is contained in:
Michael Hansen
2013-01-05 19:08:15 -08:00
parent ca916fee49
commit 2382cebd11
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp
View File

@ -1194,7 +1194,7 @@ void PythonInterface::initPython()
getOutputAndReset(&error); getOutputAndReset(&error);
} }
#ifndef BUILDING_PYPLASMA #ifndef BUILDING_PYPLASMA
// Begin PEP 302 Import Hook stuff // Begin PEP 302 Import Hook stuff
// We need to create a ptImportHook object // We need to create a ptImportHook object
ptImportHook* hook = PyObject_New(ptImportHook, &ptImportHook_type); ptImportHook* hook = PyObject_New(ptImportHook, &ptImportHook_type);

16
Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
View File

@ -79,7 +79,7 @@ static int IsTracked(const plKeyData* keyData)
{ {
if( mlfTrack && keyData ) if( mlfTrack && keyData )
{ {
if( keyData->GetUoid().GetObjectName() && !stricmp(keyData->GetUoid().GetObjectName(), keyNameToLookFor) if( !keyData->GetUoid().GetObjectName().CompareI(keyNameToLookFor)
&& (keyData->GetUoid().GetClassType() == CLASS_TO_TRACK) ) && (keyData->GetUoid().GetClassType() == CLASS_TO_TRACK) )
{ {
if( (kCloneID < 0) if( (kCloneID < 0)
@ -180,9 +180,12 @@ plKey &plKey::operator=( const plKey &rhs )
{ {
char msg[ 512 ]; char msg[ 512 ];
if (fKeyData == nil) if (fKeyData == nil)
sprintf( msg, "=: Key %s %s is being assigned to a nil key", keyNameToLookFor, CloneString(rhs.fKeyData) ); sprintf( msg, "=: Key %s %s is being assigned to a nil key",
keyNameToLookFor, CloneString(rhs.fKeyData) );
else else
sprintf( msg, "=: Key %s %s is being assigned to %s", keyNameToLookFor, CloneString(rhs.fKeyData), fKeyData->GetUoid().GetObjectName() ); sprintf( msg, "=: Key %s %s is being assigned to %s",
keyNameToLookFor, CloneString(rhs.fKeyData),
fKeyData->GetUoid().GetObjectName().c_str() );
//hsAssert( false, msg ); //hsAssert( false, msg );
hsStatusMessageF(msg); hsStatusMessageF(msg);
} }
@ -190,9 +193,12 @@ plKey &plKey::operator=( const plKey &rhs )
{ {
char msg[ 512 ]; char msg[ 512 ];
if (fKeyData == nil) if (fKeyData == nil)
sprintf( msg, "=: Nil key is being assigned to %s %s", keyNameToLookFor, CloneString(fKeyData) ); sprintf( msg, "=: Nil key is being assigned to %s %s",
keyNameToLookFor, CloneString(fKeyData) );
else else
sprintf( msg, "=: Key %s %s is being assigned to %s", fKeyData->GetUoid().GetObjectName(), CloneString(fKeyData), keyNameToLookFor ); sprintf( msg, "=: Key %s %s is being assigned to %s",
fKeyData->GetUoid().GetObjectName().c_str(),
CloneString(fKeyData), keyNameToLookFor );
//hsAssert( false, msg ); //hsAssert( false, msg );
hsStatusMessageF(msg); hsStatusMessageF(msg);
} }