OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 11:49:09 +00:00
Code Releases Activity

Some fixes for compiler errors found on GCC/Linux

Browse Source
This commit is contained in:
Michael Hansen
2015-06-07 03:24:51 -07:00
parent 974b971b56
commit 00be10cdbf
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
View File

@ -544,7 +544,7 @@ PF_CONSOLE_CMD( Net, // groupName
"returns the age of the age" ) // helpString "returns the age of the age" ) // helpString
{ {
PrintStringF(PrintString, "Current age is %s, elapsed time since birth = %f secs", PrintStringF(PrintString, "Current age is %s, elapsed time since birth = %f secs",
NetCommGetAge()->ageDatasetName, plNetClientMgr::GetInstance()->GetCurrentAgeElapsedSeconds()); NetCommGetAge()->ageDatasetName.c_str(), plNetClientMgr::GetInstance()->GetCurrentAgeElapsedSeconds());
} }
PF_CONSOLE_CMD( Net, DownloadViaManifest, PF_CONSOLE_CMD( Net, DownloadViaManifest,

1
Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp
View File

@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <Python.h> #include <Python.h>
#pragma hdrstop #pragma hdrstop
#include "pyGlueHelpers.h"
#include "cyAccountManagement.h" #include "cyAccountManagement.h"
#include "plNetClientComm/plNetClientComm.h" #include "plNetClientComm/plNetClientComm.h"

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

@ -298,8 +298,10 @@ bool plJPEG::IWrite( plMipmap *source, hsStream *outStream )
jpeg_set_defaults( &cinfo ); jpeg_set_defaults( &cinfo );
#if JPEG_LIB_VERSION >= 70
cinfo.jpeg_width = source->GetWidth(); // default cinfo.jpeg_width = source->GetWidth(); // default
cinfo.jpeg_height = source->GetHeight(); // default cinfo.jpeg_height = source->GetHeight(); // default
#endif
cinfo.jpeg_color_space = JCS_YCbCr; // default cinfo.jpeg_color_space = JCS_YCbCr; // default
// not sure how to set 4:1:1 but supposedly it's the default // not sure how to set 4:1:1 but supposedly it's the default
jpeg_set_quality( &cinfo, fWriteQuality, TRUE ); jpeg_set_quality( &cinfo, fWriteQuality, TRUE );