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

Fix some noteworthy warnings (mostly hsBool->bool incompatibility) and missing headers

Browse Source
This commit is contained in:
Michael Hansen
2012-11-11 22:34:05 -08:00
parent 6d4726c766
commit 40d5e2e867
16 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/CoreLib/hsFastMath.cpp
View File

@ -604,7 +604,7 @@ float hsFastMath::IATan2OverTwoPi(float y, float x)
if( (x == 0)&&(y == 0) )
return 0;
bool xNeg, yNeg;
int xNeg, yNeg;
if((yNeg = (y < 0)))y = -y;
if((xNeg = (x < 0)))x = -x;
bool yBigger = y >= x;

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

@ -565,7 +565,7 @@ uint8_t pfConsoleCmd::GetSigEntry( uint8_t i )
const char *pfConsoleCmd::GetSignature( void )
{
char string[256];
static char string[256];
int i;
char pStr[ 128 ];

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

@ -85,6 +85,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyAgeInfoStruct.h"
#include "pyAgeLinkStruct.h"
#include "pyAlarm.h"
#include "pyGeometry3.h"
#include "pfMessage/pfKIMsg.h"
#include "plNetMessage/plNetMessage.h"
#include "pfCamera/plVirtualCamNeu.h"

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

@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGUIDialog.h"
#include "pyColor.h"
#include "pyGeometry3.h"
#include "pyGUIControlCheckBox.h"

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

@ -54,6 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class pyGUIDialog;
class pyColor;
class pyPoint3;
class pyGUIControl
{

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

@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGUIControlClickMap.h"
#include "pyGUIDialog.h"
#include "pyGeometry3.h"
pyGUIControlClickMap::pyGUIControlClickMap(pyKey& gckey) : pyGUIControl(gckey)
{

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

@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGUIControlDraggable.h"
#include "pyGUIDialog.h"
#include "pyGeometry3.h"
pyGUIControlDraggable::pyGUIControlDraggable(pyKey& gckey) : pyGUIControl(gckey)
{

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

@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma hdrstop
#include "pyGUIControl.h"
#include "pyGeometry3.h"
// glue functions
PYTHON_CLASS_DEFINITION(ptGUIControl, pyGUIControl);

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

@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma hdrstop
#include "pyImage.h"
#include "pyGeometry3.h"
#include "plJPEG/plJPEG.h"
#include "plGImage/plPNG.h"
#include "pnKeyedObject/plUoid.h"

2
Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
View File

@ -369,7 +369,7 @@ int plMsgCStringHelper::Poke(const char * str, hsStream* stream, const uint32_t
{
plMessage::plStrLen len = (str) ? strlen(str) : 0;
stream->WriteLE(len);
if (strlen)
if (len)
stream->Write(len,str);
return stream->GetPosition();
}

4
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h
View File

@ -85,8 +85,8 @@ protected:
uint16_t fNumIdx;
double fBirth;
float fInitAtten;
bool fFlags;
float fInitAtten;
uint32_t fFlags;
plDecalVtxFormat* fVtxBase; // Safe pointer, the buffer data will outlive this decal

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

@ -155,7 +155,7 @@ HFONT plWinFontCache::IMakeFont( const char *face, int height, int weight, boo
err = "Height of created font does not match";
if( fontInfo.lfWeight != weight )
err = "Weight of created font does not match";
if( fontInfo.lfItalic != italic )
if( static_cast<bool>(fontInfo.lfItalic) != italic )
err = "Italic-ness of created font does not match";
if( stricmp( fontInfo.lfFaceName, face ) != 0 )
err = "Face of created font does not match";

3
Sources/Tools/MaxComponent/plAudioComponents.cpp
View File

@ -2813,7 +2813,6 @@ public:
BOOL DlgProc( TimeValue t, IParamMap2 *map, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
int i;
IParamBlock2 *pb = map->GetParamBlock();
@ -2827,7 +2826,7 @@ public:
ComboBox_ResetContent( comboBox );
#ifdef EAX_SDK_AVAILABLE
for( i = 0; i < /*sizeof( EAX30_ORIGINAL_PRESETS )
for( int i = 0; i < /*sizeof( EAX30_ORIGINAL_PRESETS )
/ sizeof( EAXLISTENERPROPERTIES )*/26 ; i++ )
ComboBox_AddString( comboBox, EAX30_ORIGINAL_PRESET_NAMES[ i ] );
#endif

2
Sources/Tools/MaxMain/plMaxNodeBase.cpp
View File

@ -1026,7 +1026,7 @@ Matrix3 plMaxNodeBase::GetWorldToParent(TimeValue t)
GetTMController()->GetLocalTMComponents(t, cmpts, parentMatrix);
Quat q;
if( cmpts.rotRep == TMComponentsArg::RotationRep::kQuat )
if( cmpts.rotRep == TMComponentsArg::kQuat )
q = Quat(rot);
else
EulerToQuat(rot, q, cmpts.rotRep);

2
Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp
View File

@ -463,7 +463,7 @@ void plRTProjDirLight::SetFallsize( TimeValue time, float f )
RefResult plRTProjDirLight::EvalLightState( TimeValue t, Interval& valid, LightState *ls )
{
ls->type = DIRECT_LGT;
if( fLightPB->GetInt( kLightOn, t ) == true )
if( fLightPB->GetInt( kLightOn, t ) )
ls->color = GetRGBColor( t, valid );
else
ls->color = Color( 0, 0, 0 );

2
Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp
View File

@ -1430,7 +1430,7 @@ RefResult plRTLightBase::EvalLightState(TimeValue t, Interval& valid, LightState
{
//t uselight;
//#if 0 //fLightPB->GetInt(kLightOn, t);
if(fLightPB->GetInt(kLightOn, t) == true)
if(fLightPB->GetInt(kLightOn, t) )
ls->color = GetRGBColor(t,valid);
else
ls->color = Color(0,0,0);