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

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -880,7 +880,7 @@ PF_CONSOLE_CMD( Avatar_Swim, Start, "", "")
//
///////////////////////////////////////////////////////////////////////////////////////////////////
// void WarpPlayerToAnother(hsBool iMove, UInt32 remoteID)
// void WarpPlayerToAnother(hsBool iMove, uint32_t remoteID)
PF_CONSOLE_CMD( Avatar_Warp, WarpToPlayer, "int PlayerID", "Warp our player to the same position as another player.")
{
plAvatarMgr::WarpPlayerToAnother(true, (int)params[0]);

12
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
View File

@ -73,7 +73,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//// Static Class Stuff //////////////////////////////////////////////////////
pfConsole *pfConsole::fTheConsole = nil;
UInt32 pfConsole::fConsoleTextColor = 0xff00ff00;
uint32_t pfConsole::fConsoleTextColor = 0xff00ff00;
plPipeline *pfConsole::fPipeline = nil;
@ -136,8 +136,8 @@ class pfConsoleInputInterface : public plInputInterface
// RestoreDefaultKeyMappings()!!!!
}
virtual UInt32 GetPriorityLevel( void ) const { return kConsolePriority; }
virtual UInt32 GetCurrentCursorID( void ) const { return kCursorHidden; }
virtual uint32_t GetPriorityLevel( void ) const { return kConsolePriority; }
virtual uint32_t GetCurrentCursorID( void ) const { return kCursorHidden; }
virtual hsBool HasInterestingCursorID( void ) const { return false; }
virtual hsBool InterpretInputEvent( plInputEventMsg *pMsg )
@ -255,7 +255,7 @@ void pfConsole::Init( pfConsoleEngine *engine )
//// ISetMode ////////////////////////////////////////////////////////////////
void pfConsole::ISetMode( UInt8 mode )
void pfConsole::ISetMode( uint8_t mode )
{
fMode = mode;
fEffectCounter = ( fFXEnabled ? kEffectDivisions : 0 );
@ -538,7 +538,7 @@ void pfConsole::IHandleKey( plKeyEventMsg *msg )
wchar_t key;
int i,eol;
static hsBool findAgain = false;
static UInt32 findCounter = 0;
static uint32_t findCounter = 0;
if( !msg->GetKeyDown() )
@ -1089,7 +1089,7 @@ void pfConsole::Draw( plPipeline *p )
HGLOBAL hdl = LoadResource( nil, rsrc );
if( hdl != nil )
{
UInt8 *ptr = (UInt8 *)LockResource( hdl );
uint8_t *ptr = (uint8_t *)LockResource( hdl );
if( ptr != nil )
{
for( i = 0; i < SizeofResource( nil, rsrc ); i++ )

24
Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
View File

@ -88,23 +88,23 @@ class pfConsole : public hsKeyedObject
};
UInt32 fNumDisplayLines;
uint32_t fNumDisplayLines;
Int32 fEffectCounter;
int32_t fEffectCounter;
float fLastTime;
UInt32 fHelpTimer;
uint32_t fHelpTimer;
char fLastHelpMsg[ kWorkingLineSize ];
UInt8 fMode; // 0 - invisible, 1 - single line, 2 - full
uint8_t fMode; // 0 - invisible, 1 - single line, 2 - full
hsBool fInited, fHelpMode, fPythonMode, fPythonFirstTime, fFXEnabled;
UInt32 fPythonMultiLines;
uint32_t fPythonMultiLines;
short fCursorTicks;
UInt32 fMsgTimeoutTimer;
uint32_t fMsgTimeoutTimer;
char fHistory[ kNumHistoryItems ][ kMaxCharsWide ];
UInt32 fHistoryCursor, fHistoryRecallCursor;
uint32_t fHistoryCursor, fHistoryRecallCursor;
char *fDisplayBuffer;
char fWorkingLine[ kWorkingLineSize ];
UInt32 fWorkingCursor;
uint32_t fWorkingCursor;
pfConsoleInputInterface *fInputInterface;
@ -112,7 +112,7 @@ class pfConsole : public hsKeyedObject
void IHandleKey( plKeyEventMsg *msg );
static UInt32 fConsoleTextColor;
static uint32_t fConsoleTextColor;
static pfConsole *fTheConsole;
static void _cdecl IAddLineCallback( const char *string );
@ -122,7 +122,7 @@ class pfConsole : public hsKeyedObject
void IAddParagraph( const char *string, short margin = 0 );
void IClear( void );
void ISetMode( UInt8 mode );
void ISetMode( uint8_t mode );
void IEnableFX( hsBool e ) { fFXEnabled = e; }
hsBool IFXEnabled( void ) { return fFXEnabled; }
@ -151,8 +151,8 @@ class pfConsole : public hsKeyedObject
static void EnableEffects( hsBool enable ) { fTheConsole->IEnableFX( enable ); }
static hsBool AreEffectsEnabled( void ) { return fTheConsole->IFXEnabled(); }
static void SetTextColor( UInt32 color ) { fConsoleTextColor = color; }
static UInt32 GetTextColor() { return fConsoleTextColor; }
static void SetTextColor( uint32_t color ) { fConsoleTextColor = color; }
static uint32_t GetTextColor() { return fConsoleTextColor; }
static void SetPipeline( plPipeline *pipe ) { fPipeline = pipe; }
static plPipeline *GetPipeline( void ) { return fPipeline; }

66
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
View File

@ -214,7 +214,7 @@ PF_CONSOLE_FILE_DUMMY(Main)
// name isn't obvious (i.e. SetFogColor doesn't really need one)
//
// The actual C code prototype looks like:
// void pfConsoleCmd_groupName_functionName( UInt32 numParams, pfConsoleCmdParam *params,
// void pfConsoleCmd_groupName_functionName( uint32_t numParams, pfConsoleCmdParam *params,
// void (*PrintString)( char * ) );
//
// numParams is exactly what it sounds like. params is an array of console
@ -723,7 +723,7 @@ PF_CONSOLE_CMD( Console, EnableFX, "bool enable", "Enables flashy console effect
PF_CONSOLE_CMD( Console, SetTextColor, "int r, int g, int b",
"Sets the color of normal console text" )
{
UInt32 color = 0xff000000 | ( (int)params[ 0 ] << 16 ) | ( (int)params[ 1 ] << 8 ) | ( (int)params[ 2 ] );
uint32_t color = 0xff000000 | ( (int)params[ 0 ] << 16 ) | ( (int)params[ 1 ] << 8 ) | ( (int)params[ 2 ] );
pfConsole::SetTextColor( color );
}
@ -865,7 +865,7 @@ PF_CONSOLE_CMD( Console, PrintVar, "string name", "Prints the value of a given g
{
pfConsoleContext &ctx = pfConsoleContext::GetRootContext();
Int32 idx = ctx.FindVar( params[ 0 ] );
int32_t idx = ctx.FindVar( params[ 0 ] );
if( idx == -1 )
PrintString( "Variable not found" );
else
@ -878,7 +878,7 @@ PF_CONSOLE_CMD( Console, PrintAllVars, "", "Prints the values of all global cons
{
pfConsoleContext &ctx = pfConsoleContext::GetRootContext();
UInt32 i;
uint32_t i;
PrintString( "Global console variables:" );
for( i = 0; i < ctx.GetNumVars(); i++ )
@ -958,14 +958,14 @@ PF_CONSOLE_CMD( Graphics, // Group name
\tonlyProjLights - Turns off runtime non-projected lights\n\
\tnoFog - Disable all fog" ) // Help string
{
UInt32 flag;
uint32_t flag;
bool on;
char string[ 128 ], name[ 64 ];
int i;
struct
{
char name[ 64 ]; UInt32 flag;
char name[ 64 ]; uint32_t flag;
} flags[] = { { "reloadTextures", plPipeDbg::kFlagReload },
{ "noPreShade", plPipeDbg::kFlagNoPreShade},
{ "noMultitexture", plPipeDbg::kFlagNoMultitexture },
@ -1081,7 +1081,7 @@ PF_CONSOLE_CMD( Graphics, AllowWBuffering, "", "Enables the use of w-buffering\n
{
PF_SANITY_CHECK( pfConsole::GetPipeline() == nil, "This command MUST be used in an .ini file (before pipeline initialization)" );
extern UInt32 fDbgSetupInitFlags;
extern uint32_t fDbgSetupInitFlags;
fDbgSetupInitFlags |= 0x00000001;
@ -1092,7 +1092,7 @@ PF_CONSOLE_CMD( Graphics, ForceGeForce2Quality, "", "Forces higher-level hardwar
{
PF_SANITY_CHECK( pfConsole::GetPipeline() == nil, "This command MUST be used in an .ini file (before pipeline initialization)" );
extern UInt32 fDbgSetupInitFlags;
extern uint32_t fDbgSetupInitFlags;
fDbgSetupInitFlags |= 0x00000004;
@ -1262,7 +1262,7 @@ PF_CONSOLE_CMD( Graphics_DebugText, // Group name
"string face, int size", // Params
"Sets the font face and size used for drawing debug text" ) // Help string
{
plDebugText::Instance().SetFont( params[ 0 ], (UInt16)(int)params[ 1 ] );
plDebugText::Instance().SetFont( params[ 0 ], (uint16_t)(int)params[ 1 ] );
}
PF_CONSOLE_CMD( Graphics_DebugText, // Group name
@ -1349,7 +1349,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, Gamma2, "float g", "Set gamma value (alternat
{
hsAssert( pfConsole::GetPipeline() != nil, "Cannot use this command before pipeline initialization" );
hsTArray<UInt16> ramp;
hsTArray<uint16_t> ramp;
ramp.SetCount(256);
hsScalar g = params[0];
@ -1366,7 +1366,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, Gamma2, "float g", "Set gamma value (alternat
else if( remap > 1.f )
remap = 1.f;
ramp[i] = UInt16(remap * hsScalar(UInt16(-1)) + 0.5f);
ramp[i] = uint16_t(remap * hsScalar(uint16_t(-1)) + 0.5f);
}
pfConsole::GetPipeline()->SetGamma(ramp.AcquireArray());
@ -1453,7 +1453,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, Overwire, "...", "Turn on (off) overlay wire
hsAssert( pfConsole::GetPipeline() != nil, "Cannot use this command before pipeline initialization" );
hsBool on = false;
UInt32 flag = plPipeDbg::kFlagOverlayWire;
uint32_t flag = plPipeDbg::kFlagOverlayWire;
if( !numParams )
on = !pfConsole::GetPipeline()->IsDebugFlagSet( flag );
else
@ -1569,7 +1569,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, ResetDevice,
static bool MakeUniqueFileName(const char* prefix, const char* ext, char* fileName)
{
for (UInt32 uniqueNumber = 1; uniqueNumber < 1000; uniqueNumber++)
for (uint32_t uniqueNumber = 1; uniqueNumber < 1000; uniqueNumber++)
{
sprintf(fileName, "%s%03d.%s", prefix, uniqueNumber, ext);
@ -1687,7 +1687,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t
else
{
char str[ 512 ];
UInt8 quality = 75;
uint8_t quality = 75;
if( numParams == 2 )
@ -1930,7 +1930,7 @@ PF_CONSOLE_CMD( Graphics_Show, SoundOnly, "", "Toggle only sound fields visible"
static hsBool on = false;
plProxyDrawMsg* msg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kAudible | ((on = !on) ? plProxyDrawMsg::kCreate : plProxyDrawMsg::kDestroy));
plgDispatch::MsgSend(msg);
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -1947,7 +1947,7 @@ PF_CONSOLE_CMD( Graphics_Show, SoundOnly, "", "Toggle only sound fields visible"
PF_CONSOLE_CMD( Graphics_Show, OccSnap, "", "Take snapshot of current occlusion and render (or toggle)")
{
UInt32 flag = plPipeDbg::kFlagOcclusionSnap;
uint32_t flag = plPipeDbg::kFlagOcclusionSnap;
hsBool on = !pfConsole::GetPipeline()->IsDebugFlagSet(flag);
pfConsole::GetPipeline()->SetDebugFlag( flag, on );
@ -1963,10 +1963,10 @@ PF_CONSOLE_CMD( Graphics_Show, OccSnap, "", "Take snapshot of current occlusion
PF_CONSOLE_CMD( Graphics_Show, OccSnapOnly, "", "Take snapshot of current occlusion and render (or toggle)")
{
UInt32 flag = plPipeDbg::kFlagOcclusionSnap;
uint32_t flag = plPipeDbg::kFlagOcclusionSnap;
hsBool on = !pfConsole::GetPipeline()->IsDebugFlagSet(flag);
static UInt32 oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
static uint32_t oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
pfConsole::GetPipeline()->SetDebugFlag( flag, on );
if( on )
@ -2000,7 +2000,7 @@ PF_CONSOLE_CMD( Graphics_Show, OccludersOnly, "", "Toggle only occluder geometry
static hsBool on = false;
plProxyDrawMsg* msg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kOccluder | ((on = !on) ? plProxyDrawMsg::kCreate : plProxyDrawMsg::kDestroy));
plgDispatch::MsgSend(msg);
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -2035,7 +2035,7 @@ PF_CONSOLE_CMD( Graphics_Show, PhysicalsOnly, "", "Toggle only Physical geometry
static hsBool on = false;
plProxyDrawMsg* msg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kPhysical | ((on = !on) ? plProxyDrawMsg::kCreate : plProxyDrawMsg::kDestroy));
plgDispatch::MsgSend(msg);
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -2066,7 +2066,7 @@ PF_CONSOLE_CMD( Graphics_Show, Normal, "", "Toggle normal geometry visible")
PF_CONSOLE_CMD( Graphics_Show, NormalOnly, "", "Toggle only normal geometry visible")
{
static hsBool on = false;
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on = !on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -2101,7 +2101,7 @@ PF_CONSOLE_CMD( Graphics_Show, LightsOnly, "", "Toggle visible proxies for light
static hsBool on = false;
plProxyDrawMsg* msg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kLight | ((on = !on) ? plProxyDrawMsg::kCreate : plProxyDrawMsg::kDestroy));
plgDispatch::MsgSend(msg);
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -2137,7 +2137,7 @@ PF_CONSOLE_CMD( Graphics_Show, ClickOnly, "", "Toggle visible proxies for click
static hsBool on = false;
plProxyDrawMsg* msg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kCamera | ((on = !on) ? plProxyDrawMsg::kCreate : plProxyDrawMsg::kDestroy));
plgDispatch::MsgSend(msg);
static UInt32 oldMask = plDrawableSpans::kNormal;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on )
{
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
@ -2746,7 +2746,7 @@ PF_CONSOLE_CMD( Registry, SetLoggingLevel, "int level", "Sets the logging level
return;
}
plResMgrSettings::Get().SetLoggingLevel( (UInt8)newLevel );
plResMgrSettings::Get().SetLoggingLevel( (uint8_t)newLevel );
{
char msg[ 128 ];
sprintf( msg, "Registry logging set to %s", ( newLevel == 0 ) ? "none" : ( newLevel == 1 ) ? "basic" :
@ -2759,7 +2759,7 @@ PF_CONSOLE_CMD( Registry, SetLoggingLevel, "int level", "Sets the logging level
class plActiveRefPeekerKey : public plKeyImp
{
public:
UInt16 PeekNumNotifies() { return GetNumNotifyCreated(); }
uint16_t PeekNumNotifies() { return GetNumNotifyCreated(); }
plRefMsg* PeekNotifyCreated(int i) { return GetNotifyCreated(i); }
hsBool PeekIsActiveRef(int i) const { return IsActiveRef(i); }
};
@ -2781,7 +2781,7 @@ void MyHandyPrintFunction( const plKey &obj, void (*PrintString)( const char
if( peeker->PeekNumNotifies() == 0 )
return;
UInt32 a, i, j, limit = 30, count = 0;
uint32_t a, i, j, limit = 30, count = 0;
for( a = 0; a < 2; a++ )
{
PrintString( ( a == 0 ) ? " Active:" : " Passive:" );
@ -2830,7 +2830,7 @@ PF_CONSOLE_CMD( Registry, ListRefs, "string keyType, string keyName", "For the g
plActiveRefPeekerKey *peeker = (plActiveRefPeekerKey *)(plKeyImp *)obj;
if( peeker->GetNumClones() > 0 )
{
UInt32 i;
uint32_t i;
for( i = 0; i < peeker->GetNumClones(); i++ )
{
MyHandyPrintFunction( peeker->GetCloneByIdx( i ), PrintString );
@ -3749,7 +3749,7 @@ PF_CONSOLE_CMD( Listener, UsePlayerVelocity, "", "Use the player's velocity to s
PF_CONSOLE_CMD( Listener, XMode, "bool b", "Sets velocity and position to avatar, and orientation to camera")
{
static UInt32 oldPosType = 0, oldFacingType = 0, oldVelType = 0;
static uint32_t oldPosType = 0, oldFacingType = 0, oldVelType = 0;
plSetListenerMsg *set = nil;
plKey pKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
@ -4705,8 +4705,8 @@ PF_CONSOLE_CMD( Access,
hsPoint3 from = pfConsole::GetPipeline()->GetViewPositionWorld();
Int32 sx = pfConsole::GetPipeline()->Width() / 2;
Int32 sy = pfConsole::GetPipeline()->Height() / 2;
int32_t sx = pfConsole::GetPipeline()->Width() / 2;
int32_t sy = pfConsole::GetPipeline()->Height() / 2;
hsPoint3 targ;
pfConsole::GetPipeline()->ScreenToWorldPoint(1, 0, &sx, &sy, dist, 0, &targ);
@ -6238,7 +6238,7 @@ PF_CONSOLE_CMD( Age, SetSDLBool, "string varName, bool value, int index", "Set t
PF_CONSOLE_GROUP( ParticleSystem ) // Defines a main command group
void UpdateParticleParam(char *objName, Int32 paramID, hsScalar value, void (*PrintString)(const char *))
void UpdateParticleParam(char *objName, int32_t paramID, hsScalar value, void (*PrintString)(const char *))
{
char str[256];
plKey key = FindSceneObjectByName(objName, nil, str);
@ -6394,7 +6394,7 @@ PF_CONSOLE_CMD( ParticleSystem,
const plParticleSystem *sys = plParticleSystem::ConvertNoRef(so->GetModifierByType(plParticleSystem::Index()));
if (sys != nil)
{
UInt8 flags = (params[3] ? plParticleKillMsg::kParticleKillPercentage : 0);
uint8_t flags = (params[3] ? plParticleKillMsg::kParticleKillPercentage : 0);
(TRACKED_NEW plParticleKillMsg(nil, sys->GetKey(), 0, params[2], params[1], flags))->Send();
}
}
@ -6766,7 +6766,7 @@ PF_CONSOLE_CMD( Clothing, // Group name
{
plArmatureMod *avMod = plAvatarMgr::GetInstance()->GetLocalAvatar();
plClothingItem *item = plClothingMgr::GetClothingMgr()->FindItemByName(params[0]);
UInt8 layer;
uint8_t layer;
if ((int)params[4] == 2)
layer = plClothingElement::kLayerTint2;
else

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

@ -143,7 +143,7 @@ PF_CONSOLE_FILE_DUMMY(Net)
// name isn't obvious (i.e. SetFogColor doesn't really need one)
//
// The actual C code prototype looks like:
// void pfConsoleCmd_groupName_functionName( UInt32 numParams, pfConsoleCmdParam *params,
// void pfConsoleCmd_groupName_functionName( uint32_t numParams, pfConsoleCmdParam *params,
// void (*PrintString)( char * ) );
//
// numParams is exactly what it sounds like. params is an array of console
@ -792,8 +792,8 @@ PF_CONSOLE_CMD( Net_Vault,
"string stationName, string mtSpawnPt",
"Register an MT Station with your Nexus" )
{
wchar wName[MAX_PATH];
wchar wObj[MAX_PATH];
wchar_t wName[MAX_PATH];
wchar_t wObj[MAX_PATH];
StrToUnicode(wName, params[0], arrsize(wName));
StrToUnicode(wObj, params[1], arrsize(wObj));
VaultRegisterMTStationAndWait ( wName, wObj );

8
Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp
View File

@ -67,8 +67,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
hsBool pfConsoleDirSrc::ParseDirectory(const std::string& path, const std::string& mask /* = "*.*" */)
{
wchar* wPath = hsStringToWString(path.c_str());
wchar* wMask = hsStringToWString(mask.c_str());
wchar_t* wPath = hsStringToWString(path.c_str());
wchar_t* wMask = hsStringToWString(mask.c_str());
hsBool ret = ParseDirectory(wPath, wMask);
delete [] wPath;
delete [] wMask;
@ -104,8 +104,8 @@ hsBool pfConsoleDirSrc::ParseDirectory(const std::wstring& path, const std::wst
// errors in the parsing
std::wstringstream error;
std::wstringstream caption;
wchar* errorMsg = hsStringToWString(fEngine->GetErrorMsg());
wchar* errorLine = hsStringToWString(fEngine->GetLastErrorLine());
wchar_t* errorMsg = hsStringToWString(fEngine->GetErrorMsg());
wchar_t* errorLine = hsStringToWString(fEngine->GetLastErrorLine());
caption << L"Error parsing " << findInfo.cFileName;
error << errorMsg << L":\n\nCommand: '" << errorLine << L"'\n\nPress OK to continue parsing files.";

14
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
View File

@ -79,7 +79,7 @@ void plDispatchLog::LogStatusBarChange(const char* name, const char* action)
memset(&mbi, 0, sizeof(MEMORY_BASIC_INFORMATION));
// Note: this will return shared mem too on Win9x. There's a way to catch that, but it's too slow -Colin
UInt32 processMemUsed = 0;
uint32_t processMemUsed = 0;
void* curAddress = 0;
while (VirtualQuery(curAddress, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION))
{
@ -97,7 +97,7 @@ void plDispatchLog::LogStatusBarChange(const char* name, const char* action)
#endif // HS_BUILD_FOR_WIN32
}
void plDispatchLog::LogLongReceive(const char* keyname, const char* className, UInt32 clonePlayerID, plMessage* msg, float ms)
void plDispatchLog::LogLongReceive(const char* keyname, const char* className, uint32_t clonePlayerID, plMessage* msg, float ms)
{
std::string info;
if (DumpSpecificMsgInfo(msg, info))
@ -106,7 +106,7 @@ void plDispatchLog::LogLongReceive(const char* keyname, const char* className, U
fLog->AddLineF("%-30s[%7u](%-20s) took %6.1f ms to receive %s\n", keyname, clonePlayerID, className, ms, msg->ClassName());
}
void plDispatchLog::DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, Int32 indent)
void plDispatchLog::DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, int32_t indent)
{
if (!msg)
return;
@ -145,7 +145,7 @@ void plDispatchLog::DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, In
lastTime=curTime;
}
void plDispatchLog::AddFilterType(UInt16 hClass)
void plDispatchLog::AddFilterType(uint16_t hClass)
{
if (hClass>=plFactory::GetNumClasses())
return;
@ -158,13 +158,13 @@ void plDispatchLog::AddFilterType(UInt16 hClass)
}
}
void plDispatchLog::AddFilterExactType(UInt16 type)
void plDispatchLog::AddFilterExactType(uint16_t type)
{
if (type<plFactory::GetNumClasses())
fIncludeTypes.SetBit(type);
}
void plDispatchLog::RemoveFilterType(UInt16 hClass)
void plDispatchLog::RemoveFilterType(uint16_t hClass)
{
if (hClass>=plFactory::GetNumClasses())
return;
@ -177,7 +177,7 @@ void plDispatchLog::RemoveFilterType(UInt16 hClass)
}
}
void plDispatchLog::RemoveFilterExactType(UInt16 type)
void plDispatchLog::RemoveFilterExactType(uint16_t type)
{
if (type<plFactory::GetNumClasses())
fIncludeTypes.ClearBit(type);

14
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h
View File

@ -51,7 +51,7 @@ class plDispatchLog : public plDispatchLogBase
{
private:
hsBitVector fIncludeTypes; // include/exclude list
UInt64 fStartTicks;
uint64_t fStartTicks;
plStatusLog* fLog;
public:
@ -60,16 +60,16 @@ public:
static void InitInstance();
void AddFilterType(UInt16 type);
void AddFilterExactType(UInt16 type);
void AddFilterType(uint16_t type);
void AddFilterExactType(uint16_t type);
void RemoveFilterType(UInt16 type);
void RemoveFilterExactType(UInt16 type);
void RemoveFilterType(uint16_t type);
void RemoveFilterExactType(uint16_t type);
void LogStatusBarChange(const char* name, const char* action);
void LogLongReceive(const char* keyname, const char* className, UInt32 clonePlayerID, plMessage* msg, float ms);
void LogLongReceive(const char* keyname, const char* className, uint32_t clonePlayerID, plMessage* msg, float ms);
void DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, Int32 indent);
void DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, int32_t indent);
};
#endif // pfDispatchLog_inc

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

@ -122,7 +122,7 @@ PF_CONSOLE_CMD( Game, TakeScreenshot, "...", "Takes a shot of the current frame
plMipmap myMipmap;
char fileName[ 512 ];
UInt32 uniqueNumber;
uint32_t uniqueNumber;
if( numParams > 1 )