From 2382cebd114eb1e380972cdfb8cdf3bb6f188973 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 5 Jan 2013 19:08:15 -0800 Subject: [PATCH] Fix some plString vararg parameters in normally-disabled code --- .../FeatureLib/pfPython/cyPythonInterface.cpp | 2 +- .../Plasma/NucleusLib/pnKeyedObject/plKey.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp index 4de701e1..e77e3c39 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp @@ -1194,7 +1194,7 @@ void PythonInterface::initPython() getOutputAndReset(&error); } - #ifndef BUILDING_PYPLASMA +#ifndef BUILDING_PYPLASMA // Begin PEP 302 Import Hook stuff // We need to create a ptImportHook object ptImportHook* hook = PyObject_New(ptImportHook, &ptImportHook_type); diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp index ba31300f..3db7564c 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp @@ -79,7 +79,7 @@ static int IsTracked(const plKeyData* 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) ) { if( (kCloneID < 0) @@ -180,9 +180,12 @@ plKey &plKey::operator=( const plKey &rhs ) { char msg[ 512 ]; 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 - 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 ); hsStatusMessageF(msg); } @@ -190,9 +193,12 @@ plKey &plKey::operator=( const plKey &rhs ) { char msg[ 512 ]; 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 - 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 ); hsStatusMessageF(msg); }