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 several format errors detected via vararg-template voodoo

Browse Source
This commit is contained in:
Michael Hansen
2013-12-16 18:36:34 -08:00
parent 09cc4b8259
commit 56507c5219
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleEngine.cpp
View File

@ -156,7 +156,7 @@ bool pfConsoleEngine::PrintCmdHelp( char *name, void (*PrintFn)( const char *
PrintFn(" Subgroups:"); PrintFn(" Subgroups:");
for( subGrp = group->GetFirstSubGroup(); subGrp != nil; subGrp = subGrp->GetNext() ) for( subGrp = group->GetFirstSubGroup(); subGrp != nil; subGrp = subGrp->GetNext() )
{ {
PrintFn(plString::Format(" %s", subGrp).c_str()); PrintFn(plString::Format(" %s", subGrp->GetName()).c_str());
} }
PrintFn(" Commands:"); PrintFn(" Commands:");
for( cmd = group->GetFirstCommand(); cmd != nil; cmd = cmd->GetNext() ) for( cmd = group->GetFirstCommand(); cmd != nil; cmd = cmd->GetNext() )

1
Sources/Plasma/FeatureLib/pfPython/cyAvatar.h
View File

@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
#include <string> #include <string>
#include "hsTemplates.h" #include "hsTemplates.h"
#include "plFileSystem.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
Sources/Plasma/PubUtilLib/plGImage/plFont.cpp
View File

@ -493,7 +493,7 @@ void plFont::IRenderString( plMipmap *mip, uint16_t x, uint16_t y, const wcha
break; break;
} }
// Are we a uint16_t breaker? // Are we a word breaker?
if( IIsWordBreaker( (char)(string[ i ]) ) ) if( IIsWordBreaker( (char)(string[ i ]) ) )
{ {
if (string[i] == '.') // we might have an ellipsis here if (string[i] == '.') // we might have an ellipsis here

11
Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
View File

@ -2177,10 +2177,13 @@ void plMipmap::IReportLeaks()
for( record = fRecords; record != nil; ) for( record = fRecords; record != nil; )
{ {
size = record->fHeight * record->fRowBytes; size = record->fHeight * record->fRowBytes;
if( size >= 1024 ) if (size >= 1024) {
sprintf( msg, "%s, %4.1f kB: \t%dx%d, %d levels, %d bpr", record->fKeyName, size / 1024.f, record->fWidth, record->fHeight, record->fNumLevels, record->fRowBytes ); sprintf(msg, "%s, %4.1f kB: \t%dx%d, %d levels, %d bpr", record->fKeyName.c_str(),
else size / 1024.f, record->fWidth, record->fHeight, record->fNumLevels, record->fRowBytes);
sprintf( msg, "%s, %u bytes: \t%dx%d, %d levels, %d bpr", record->fKeyName, size, record->fWidth, record->fHeight, record->fNumLevels, record->fRowBytes ); } else {
sprintf(msg, "%s, %u bytes: \t%dx%d, %d levels, %d bpr", record->fKeyName.c_str(),
size, record->fWidth, record->fHeight, record->fNumLevels, record->fRowBytes);
}
if( record->fCompressionType != kDirectXCompression ) if( record->fCompressionType != kDirectXCompression )
sprintf( m2, " UType: %d", record->fUncompressedInfo.fType ); sprintf( m2, " UType: %d", record->fUncompressedInfo.fType );

2
Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp
View File

@ -331,7 +331,7 @@ void plSceneNode::IRemovePhysical(plPhysical* p)
{ {
char buf[256]; char buf[256];
sprintf(buf, "Trying to remove physical %s from scenenode %s,\nbut it's actually in %s", sprintf(buf, "Trying to remove physical %s from scenenode %s,\nbut it's actually in %s",
p->GetKeyName(), GetKeyName(), oldNodeKey->GetName()); p->GetKeyName().c_str(), GetKeyName().c_str(), oldNodeKey->GetName().c_str());
hsAssert(0, buf); hsAssert(0, buf);
} }
} }

4
Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp
View File

@ -216,8 +216,8 @@ void plAutoProfileImp::INextProfile()
plMipmap mipmap; plMipmap mipmap;
if (plClient::GetInstance()->GetPipeline()->CaptureScreen(&mipmap)) if (plClient::GetInstance()->GetPipeline()->CaptureScreen(&mipmap))
{ {
plString fileName = plString::Format("%S%s_%s.jpg", plString fileName = plString::Format("%s\\%s_%s.jpg",
plProfileManagerFull::Instance().GetProfilePath(), plProfileManagerFull::Instance().GetProfilePath().AsString().c_str(),
ageName, fLastSpawnPointName.c_str()); ageName, fLastSpawnPointName.c_str());
plJPEG::Instance().SetWriteQuality(100); plJPEG::Instance().SetWriteQuality(100);

2
Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp
View File

@ -277,7 +277,7 @@ void plAnimStealthNode::SetNodeName( const char *parentName )
if( node != nil ) if( node != nil )
{ {
char name[ 512 ], newName[ 512 ]; char name[ 512 ], newName[ 512 ];
sprintf( name, "%s : %s", parentName, GetSegmentName() ); sprintf(name, "%s : %s", parentName, GetSegmentName().c_str());
if( GetCOREInterface()->GetINodeByName( name ) != nil ) if( GetCOREInterface()->GetINodeByName( name ) != nil )
{ {