mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Update2 for MSVC10
Add missing type specifiers.
This commit is contained in:
@ -1290,7 +1290,7 @@ BOOL CALLBACK UruLoginDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
|
||||
{
|
||||
static ShaDigest namePassHash;
|
||||
static LoginDialogParam* loginParam;
|
||||
static showAuthFailed = false;
|
||||
static bool showAuthFailed = false;
|
||||
|
||||
switch( uMsg )
|
||||
{
|
||||
|
@ -238,7 +238,7 @@ public:
|
||||
plCameraBrain1_Drive(plCameraModifier1* pMod);
|
||||
~plCameraBrain1_Drive();
|
||||
|
||||
static SetSensitivity(hsScalar f) { fTurnRate = f; }
|
||||
static void SetSensitivity(hsScalar f) { fTurnRate = f; }
|
||||
|
||||
CLASSNAME_REGISTER( plCameraBrain1_Drive );
|
||||
GETINTERFACE_ANY( plCameraBrain1_Drive, plCameraBrain1 );
|
||||
|
@ -68,10 +68,10 @@ public:
|
||||
virtual ~pfGUIMultiLineEditProc() {}
|
||||
|
||||
// we've hit the end of the control list (by moving the cursor)
|
||||
virtual OnEndOfControlList(Int32 cursorPos) {}
|
||||
virtual void OnEndOfControlList(Int32 cursorPos) {}
|
||||
|
||||
// we've hit the beginning of the control ist (by moving the cursor)
|
||||
virtual OnBeginningOfControlList(Int32 cursorPos) {}
|
||||
virtual void OnBeginningOfControlList(Int32 cursorPos) {}
|
||||
};
|
||||
|
||||
class pfGUIMultiLineEditCtrl : public pfGUIControlMod
|
||||
|
@ -64,7 +64,7 @@ struct Factory : THashKeyVal<Uuid> {
|
||||
const GameTypeReg & reg;
|
||||
|
||||
Factory (const GameTypeReg & reg);
|
||||
operator= (const Factory &); // not impl
|
||||
Factory & operator= (const Factory &); // not impl
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
|
@ -438,8 +438,8 @@ public:
|
||||
pfBookMultiLineEditProc(pfBookData *owner) { bookData = owner; }
|
||||
virtual ~pfBookMultiLineEditProc() {}
|
||||
|
||||
virtual OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
|
||||
virtual OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
|
||||
virtual void OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
|
||||
virtual void OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
|
||||
};
|
||||
|
||||
//// Book data class /////////////////////////////////////////////////////////
|
||||
|
@ -440,7 +440,7 @@ hsBool plAvAnimTask::Start(plArmatureMod *avatar, plArmatureBrain *brain, double
|
||||
}
|
||||
|
||||
// PROCESS
|
||||
plAvAnimTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
|
||||
hsBool plAvAnimTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
|
||||
{
|
||||
// the only reason we need this function is to watch the animation until it fades out
|
||||
hsBool result = false;
|
||||
@ -664,7 +664,7 @@ hsBool plAvOneShotTask::Start(plArmatureMod *avatar, plArmatureBrain *brain, dou
|
||||
}
|
||||
|
||||
// PROCESS
|
||||
plAvOneShotTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
|
||||
hsBool plAvOneShotTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
|
||||
{
|
||||
// *** if we are under mouse control, adjust it here
|
||||
|
||||
|
@ -250,7 +250,7 @@ plMatrixTimeScale::~plMatrixTimeScale()
|
||||
|
||||
// IsStoppedAt ----------------------------
|
||||
// ------------
|
||||
plMatrixTimeScale::IsStoppedAt(double time)
|
||||
hsBool plMatrixTimeScale::IsStoppedAt(double time)
|
||||
{
|
||||
return fTimeSource->IsStoppedAt(time);
|
||||
}
|
||||
|
@ -173,7 +173,7 @@ plPointTimeScale::~plPointTimeScale()
|
||||
|
||||
// IsStoppedAt ---------------------------
|
||||
// ------------
|
||||
plPointTimeScale::IsStoppedAt(double time)
|
||||
hsBool plPointTimeScale::IsStoppedAt(double time)
|
||||
{
|
||||
return fTimeSource->IsStoppedAt(time);
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ plQuatTimeScale::~plQuatTimeScale()
|
||||
{
|
||||
}
|
||||
|
||||
plQuatTimeScale::IsStoppedAt(double time)
|
||||
hsBool plQuatTimeScale::IsStoppedAt(double time)
|
||||
{
|
||||
return fTimeSource->IsStoppedAt(time);
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ plScalarTimeScale::~plScalarTimeScale()
|
||||
{
|
||||
}
|
||||
|
||||
plScalarTimeScale::IsStoppedAt(double time)
|
||||
hsBool plScalarTimeScale::IsStoppedAt(double time)
|
||||
{
|
||||
return fTimeSource->IsStoppedAt(time);
|
||||
}
|
||||
|
@ -1651,7 +1651,7 @@ plMipmap* plWaveSet7::ICreateBumpMipmapPS()
|
||||
// const int sizeV = kCompositeSize;
|
||||
const int sizeV = 1;
|
||||
|
||||
const kNumLevels = 8; // must be log2(kCompositeSize)
|
||||
const int kNumLevels = 8; // must be log2(kCompositeSize)
|
||||
hsAssert(kCompositeSize == (1 << kNumLevels), "Mismatch on size and num mip levels");
|
||||
|
||||
if( !fCosineLUT )
|
||||
|
@ -108,7 +108,7 @@ void plLODMipmap::SetLOD(int lod)
|
||||
{
|
||||
hsAssert(fBase, "UnInitialized");
|
||||
|
||||
const kMaxLOD = 5;
|
||||
const int kMaxLOD = 5;
|
||||
if( lod > kMaxLOD )
|
||||
lod = kMaxLOD;
|
||||
if( lod >= fBase->GetNumLevels() )
|
||||
|
@ -207,7 +207,7 @@ UInt32 plMipmap::Read( hsStream *s )
|
||||
|
||||
// Decide to clamp if we were told to
|
||||
int clampBy = fGlobalNumLevelsToChop;
|
||||
const kMaxSkipLevels = 1;
|
||||
const int kMaxSkipLevels = 1;
|
||||
if( clampBy > kMaxSkipLevels )
|
||||
clampBy = kMaxSkipLevels;
|
||||
if( fFlags & kNoMaxSize )
|
||||
|
Reference in New Issue
Block a user