OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00: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

32
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp
View File

@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
////////////////////////////////////////////////////////////////////////////////
pfMarkerMgr* pfMarkerMgr::fInstance = nil;
const UInt32 pfMarkerMgr::kNoMarkerSelected = (UInt32)(-1);
const uint32_t pfMarkerMgr::kNoMarkerSelected = (uint32_t)(-1);
pfMarkerMgr* pfMarkerMgr::Instance()
{
@ -99,7 +99,7 @@ void pfMarkerMgr::IInit()
void pfMarkerMgr::IShutdown()
{
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
{
curMarker->second->Remove();
@ -112,9 +112,9 @@ void pfMarkerMgr::IShutdown()
UnRegisterAs(kMarkerMgr_KEY);
}
pfMarkerInfo* pfMarkerMgr::IFindMarker(plKey markerKey, UInt32& id)
pfMarkerInfo* pfMarkerMgr::IFindMarker(plKey markerKey, uint32_t& id)
{
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
{
if (curMarker->second->GetKey() == markerKey)
@ -131,7 +131,7 @@ pfMarkerInfo* pfMarkerMgr::IFindMarker(plKey markerKey, UInt32& id)
void pfMarkerMgr::IUpdate()
{
// Update all markers
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
{
curMarker->second->Update(hsTimer::GetSeconds());
@ -145,7 +145,7 @@ void pfMarkerMgr::IMarkerHit(plKey markerKey, plKey playerKey)
return; // not the local player, abort
// make sure the marker isn't frozen
UInt32 id;
uint32_t id;
pfMarkerInfo* hitMarker = IFindMarker(markerKey, id);
if (!hitMarker)
return; // abort, something weird is going on
@ -159,7 +159,7 @@ void pfMarkerMgr::IMarkerHit(plKey markerKey, plKey playerKey)
msg->Send();
}
void pfMarkerMgr::AddMarker(double x, double y, double z, UInt32 id, bool justCreated)
void pfMarkerMgr::AddMarker(double x, double y, double z, uint32_t id, bool justCreated)
{
if (fMarkers.find(id) != fMarkers.end())
{
@ -173,7 +173,7 @@ void pfMarkerMgr::AddMarker(double x, double y, double z, UInt32 id, bool justCr
fMarkers[id]->Spawn(pfMarkerInfo::kMarkerOpen);
}
void pfMarkerMgr::RemoveMarker(UInt32 id)
void pfMarkerMgr::RemoveMarker(uint32_t id)
{
if (fMarkers.find(id) == fMarkers.end())
return;
@ -184,7 +184,7 @@ void pfMarkerMgr::RemoveMarker(UInt32 id)
void pfMarkerMgr::RemoveAllMarkers()
{
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
{
curMarker->second->Remove();
@ -204,7 +204,7 @@ void pfMarkerMgr::ClearSelectedMarker()
}
}
void pfMarkerMgr::SetSelectedMarker(UInt32 id)
void pfMarkerMgr::SetSelectedMarker(uint32_t id)
{
ClearSelectedMarker();
@ -218,13 +218,13 @@ void pfMarkerMgr::SetSelectedMarker(UInt32 id)
}
}
UInt32 pfMarkerMgr::GetSelectedMarker()
uint32_t pfMarkerMgr::GetSelectedMarker()
{
return fSelectedMarker;
}
// for QUEST games (no teams)
void pfMarkerMgr::CaptureMarker(UInt32 id, bool captured)
void pfMarkerMgr::CaptureMarker(uint32_t id, bool captured)
{
if (fMarkers.find(id) == fMarkers.end())
return;
@ -239,7 +239,7 @@ void pfMarkerMgr::CaptureMarker(UInt32 id, bool captured)
}
// for TEAM games (0 = not captured)
void pfMarkerMgr::CaptureMarker(UInt32 id, int team)
void pfMarkerMgr::CaptureMarker(uint32_t id, int team)
{
if (fMarkers.find(id) == fMarkers.end())
return;
@ -263,13 +263,13 @@ void pfMarkerMgr::LocalShowMarkers(bool show)
fShowingLocalMarkers = show;
if (show)
{
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
curMarker->second->Show(true);
}
else
{
std::map<UInt32, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
std::map<uint32_t, pfMarkerInfo*>::iterator curMarker = fMarkers.begin();
while (curMarker != fMarkers.end())
curMarker->second->Show(false);
}
@ -317,7 +317,7 @@ hsBool pfMarkerMgr::MsgReceive(plMessage* msg)
plKey cloneKey = cloneMsg->GetCloneKey();
if (cloneMsg->GetIsLoading() && cloneKey)
{
UInt32 id;
uint32_t id;
pfMarkerInfo* marker = IFindMarker(cloneKey, id);
marker->InitSpawned(cloneKey);
}

20
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h
View File

@ -68,14 +68,14 @@ protected:
bool fShowingLocalMarkers;
bool fMarkersRespawn;
UInt32 fSelectedMarker;
static const UInt32 kNoMarkerSelected;
std::map<UInt32, pfMarkerInfo*> fMarkers; // key is marker id number
uint32_t fSelectedMarker;
static const uint32_t kNoMarkerSelected;
std::map<uint32_t, pfMarkerInfo*> fMarkers; // key is marker id number
void IInit();
void IShutdown();
pfMarkerInfo* IFindMarker(plKey markerKey, UInt32& id);
pfMarkerInfo* IFindMarker(plKey markerKey, uint32_t& id);
void IUpdate();
void IMarkerHit(plKey markerKey, plKey playerKey);
@ -91,19 +91,19 @@ public:
hsBool MsgReceive(plMessage* msg);
void AddMarker(double x, double y, double z, UInt32 id, bool justCreated);
void RemoveMarker(UInt32 id);
void AddMarker(double x, double y, double z, uint32_t id, bool justCreated);
void RemoveMarker(uint32_t id);
void RemoveAllMarkers();
void ClearSelectedMarker();
void SetSelectedMarker(UInt32 id);
UInt32 GetSelectedMarker();
void SetSelectedMarker(uint32_t id);
uint32_t GetSelectedMarker();
void SetMarkersRespawn(bool respawn) {fMarkersRespawn = respawn;}
bool GetMarkersRespawn() {return fMarkersRespawn;}
void CaptureMarker(UInt32 id, bool captured); // for QUEST games (no teams)
void CaptureMarker(UInt32 id, int team); // for TEAM games (0 = not captured)
void CaptureMarker(uint32_t id, bool captured); // for QUEST games (no teams)
void CaptureMarker(uint32_t id, int team); // for TEAM games (0 = not captured)
// Shows your markers locally, so you can see where they are
void LocalShowMarkers(bool show = true);

2
Sources/Plasma/FeatureLib/pfCharacter/plPlayerModifier.cpp
View File

@ -277,7 +277,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//hsPoint3 forceRight(-200,0,0);
//hsPoint3 forceUp(0,0,15);
//
//hsBool plPlayerModifier::IEval(double secs, hsScalar del, UInt32 dirty)
//hsBool plPlayerModifier::IEval(double secs, hsScalar del, uint32_t dirty)
//{
// // setup for local player if necessary
// if (HasFlag(kNeedsLocalSetup))

2
Sources/Plasma/FeatureLib/pfCharacter/plPlayerModifier.h
View File

@ -129,7 +129,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// virtual void RemoveTarget(plSceneObject* so);
//
// hsBool HandleControlInput(plControlEventMsg* pMsg);
// virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
// virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
//
// void SetMoving(hsBool b);
// hsBool IsMoving() { return bMoving; }