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

Some cross-platform MinGW/gcc fixes.

Browse Source
This commit is contained in:
Darryl Pogue
2015-02-08 23:24:23 -08:00
parent 8010f5d051
commit 79a470d31c
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp
View File

@ -131,7 +131,7 @@ bool plMorphSequence::MsgReceive(plMessage* msg)
// Can always add it in later if desired. // Can always add it in later if desired.
if( fTgtWgts.GetCount() ) if( fTgtWgts.GetCount() )
{ {
float delWgt = hsTimer::GetDelSysSeconds() / (kMorphTime > 0 ? kMorphTime : 1.e-3f); float delWgt = hsTimer::GetDelSysSeconds() / (kMorphTime > 0 ? float(kMorphTime) : 1.e-3f);
int i; int i;
for( i = 0; i < fTgtWgts.GetCount(); i++ ) for( i = 0; i < fTgtWgts.GetCount(); i++ )
{ {

2
Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp
View File

@ -154,7 +154,7 @@ void plMorphSequenceSDLMod::ISetCurrentStateFrom(const plStateDataRecord* srcSta
{ {
plKey meshKey; plKey meshKey;
morphSD->GetStateDataRecord(i)->FindVar(kStrMesh)->Get(&meshKey); morphSD->GetStateDataRecord(i)->FindVar(kStrMesh)->Get(&meshKey);
if (meshKey && !meshKey->GetUoid().GetClassType() == plSharedMesh::Index()) if (meshKey && meshKey->GetUoid().GetClassType() != plSharedMesh::Index())
continue; continue;
// meshKey will be nil when dealing with non-sharedMesh data // meshKey will be nil when dealing with non-sharedMesh data

3
Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp
View File

@ -325,7 +325,10 @@ uint32_t plSecureStream::IRead(uint32_t bytes, void* buffer)
} }
else else
{ {
// TODO: errno equivalent for *nix
#if HS_BUILD_FOR_WIN32
hsDebugMessage("Error on Windows read", GetLastError()); hsDebugMessage("Error on Windows read", GetLastError());
#endif
} }
} }
return numItems; return numItems;