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

Fix some conformance-based compiler warnings

Browse Source 
(cherry picked from commit 3a57088bcf)
This commit is contained in:
Zrax
2011-04-07 11:57:42 -07:00
committed by rarified
parent e43d316e7b
commit 329b0b2897
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/Plasma/CoreLib/hsUtils.h
View File

@ -60,6 +60,19 @@ void hsStrLower(char *s);
char * hsFormatStr(const char * fmt, ...); // You are responsible for returned memory. char * hsFormatStr(const char * fmt, ...); // You are responsible for returned memory.
char * hsFormatStrV(const char * fmt, va_list args); // You are responsible for returned memory. char * hsFormatStrV(const char * fmt, va_list args); // You are responsible for returned memory.
// Use "correct" stricmp based on the selected compiler / library
#ifdef _MSC_VER
#define stricmp _stricmp
#define strnicmp _strnicmp
#define wcsicmp _wcsicmp
#define wcsnicmp _wcsnicmp
#else
#define stricmp strcasecmp
#define strnicmp strncasecmp
#define wcsicmp wcscasecmp
#define wcsnicmp wcsncasecmp
#endif
// A pstring has a length byte at the beginning, and no trailing 0 // A pstring has a length byte at the beginning, and no trailing 0
char* hsP2CString(const UInt8 pstring[], char cstring[]); char* hsP2CString(const UInt8 pstring[], char cstring[]);

2
Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp
View File

@ -269,7 +269,7 @@ void pfGmBlueSpiral::HitCloth (int clothNum) {
msg.messageBytes = sizeof(msg); msg.messageBytes = sizeof(msg);
msg.recvGameId = GetGameId(); // send to GameSrv on server msg.recvGameId = GetGameId(); // send to GameSrv on server
msg.transId = 0; msg.transId = 0;
msg.clothNum = clothNum; msg.clothNum = (byte)clothNum;
GameMgrSend(&msg); GameMgrSend(&msg);
} }

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

@ -1263,7 +1263,7 @@ hsBool plPythonFileMod::MsgReceive(plMessage* msg)
if (pNtfyMsg) if (pNtfyMsg)
{ {
// remember if this was a Local Broad cast or not // remember if this was a Local Broad cast or not
fLocalNotify = (pNtfyMsg->HasBCastFlag(plMessage ::plBCastFlags::kNetNonLocal)) ? false : true; fLocalNotify = (pNtfyMsg->HasBCastFlag(plMessage::kNetNonLocal)) ? false : true;
// create a list for the event records // create a list for the event records
PyObject* levents = PyList_New(0); // start with a list of no elements PyObject* levents = PyList_New(0); // start with a list of no elements

6
Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp
View File

@ -487,9 +487,9 @@ void pyDynamicText::AddPlasmaClasses(PyObject *m)
void pyDynamicText::AddPlasmaConstantsClasses(PyObject *m) void pyDynamicText::AddPlasmaConstantsClasses(PyObject *m)
{ {
PYTHON_ENUM_START(PtJustify); PYTHON_ENUM_START(PtJustify);
PYTHON_ENUM_ELEMENT(PtJustify, kCenter, plDynamicTextMap::Justify::kCenter); PYTHON_ENUM_ELEMENT(PtJustify, kCenter, plDynamicTextMap::kCenter);
PYTHON_ENUM_ELEMENT(PtJustify, kLeftJustify, plDynamicTextMap::Justify::kLeftJustify); PYTHON_ENUM_ELEMENT(PtJustify, kLeftJustify, plDynamicTextMap::kLeftJustify);
PYTHON_ENUM_ELEMENT(PtJustify, kRightJustify, plDynamicTextMap::Justify::kRightJustify); PYTHON_ENUM_ELEMENT(PtJustify, kRightJustify, plDynamicTextMap::kRightJustify);
PYTHON_ENUM_END(m, PtJustify); PYTHON_ENUM_END(m, PtJustify);
PYTHON_ENUM_START(PtFontFlags); PYTHON_ENUM_START(PtFontFlags);

5
Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
View File

@ -248,8 +248,9 @@ class pfColorListElement : public pfGUIListText
wchar_t* thestring; wchar_t* thestring;
if ( fString1 && fString2 ) if ( fString1 && fString2 )
{ {
thestring = TRACKED_NEW wchar_t[ wcslen( fString1 ) + wcslen( fString2 ) + 3 ]; size_t length = wcslen( fString1 ) + wcslen( fString2 ) + 3;
swprintf( thestring, L"%s %s", fString1, fString2 ); thestring = TRACKED_NEW wchar_t[ length ];
swprintf( thestring, length, L"%s %s", fString1, fString2 );
wemade_string = true; wemade_string = true;
} }
else if (fString1) else if (fString1)

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

@ -192,7 +192,7 @@ PyObject* pyImage::LoadJPEGFromDisk(const wchar* filename, UInt16 width, UInt16
{ {
if (width > 0 && height > 0) if (width > 0 && height > 0)
{ {
if (!theMipmap->ResizeNicely(width, height, plMipmap::ScaleFilter::kDefaultFilter)) if (!theMipmap->ResizeNicely(width, height, plMipmap::kDefaultFilter))
{ {
delete theMipmap; delete theMipmap;
PYTHON_RETURN_NONE; PYTHON_RETURN_NONE;