mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Fix Endian functions names in hsTypes and hsStream.
Function and macro names for endianness were previously vague, and on big-endian systems entirely misleading. The names are now properly descriptive of what they actually do.
This commit is contained in:
@ -126,14 +126,14 @@ public:
|
||||
{
|
||||
plMessage::IMsgRead(stream, mgr);
|
||||
fControlKey = mgr->ReadKey(stream);
|
||||
fEvent = stream->ReadSwap32();
|
||||
fEvent = stream->ReadLE32();
|
||||
}
|
||||
|
||||
void Write(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgWrite(stream, mgr);
|
||||
mgr->WriteKey(stream, fControlKey);
|
||||
stream->WriteSwap32(fEvent);
|
||||
stream->WriteLE32(fEvent);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -78,7 +78,7 @@ class pfGameGUIMsg : public plMessage
|
||||
virtual void Read(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgRead( s, mgr );
|
||||
s->ReadSwap( &fCommand );
|
||||
s->ReadLE( &fCommand );
|
||||
s->Read( sizeof( fString ), fString );
|
||||
fAge = s->ReadSafeString();
|
||||
}
|
||||
@ -86,7 +86,7 @@ class pfGameGUIMsg : public plMessage
|
||||
virtual void Write(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgWrite( s, mgr );
|
||||
s->WriteSwap( fCommand );
|
||||
s->WriteLE( fCommand );
|
||||
s->Write( sizeof( fString ), fString );
|
||||
s->WriteSafeString( fAge );
|
||||
}
|
||||
|
@ -189,9 +189,9 @@ class pfKIMsg : public plMessage
|
||||
virtual void Read(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgRead( s, mgr );
|
||||
s->ReadSwap( &fCommand );
|
||||
s->ReadLE( &fCommand );
|
||||
fUser = s->ReadSafeString();
|
||||
fPlayerID = s->ReadSwap32();
|
||||
fPlayerID = s->ReadLE32();
|
||||
|
||||
wchar_t *temp = s->ReadSafeWString();
|
||||
if (temp) // apparently ReadSafeWString can return null, which std::wstring doesn't like being assigned
|
||||
@ -200,21 +200,21 @@ class pfKIMsg : public plMessage
|
||||
fString = L"";
|
||||
delete [] temp;
|
||||
|
||||
fFlags = s->ReadSwap32();
|
||||
fDelay = s->ReadSwapScalar();
|
||||
fValue = s->ReadSwap32();
|
||||
fFlags = s->ReadLE32();
|
||||
fDelay = s->ReadLEScalar();
|
||||
fValue = s->ReadLE32();
|
||||
}
|
||||
|
||||
virtual void Write(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgWrite( s, mgr );
|
||||
s->WriteSwap( fCommand );
|
||||
s->WriteLE( fCommand );
|
||||
s->WriteSafeString( fUser );
|
||||
s->WriteSwap32( fPlayerID );
|
||||
s->WriteLE32( fPlayerID );
|
||||
s->WriteSafeWString( fString.c_str() );
|
||||
s->WriteSwap32( fFlags );
|
||||
s->WriteSwapScalar(fDelay);
|
||||
s->WriteSwap32( fValue );
|
||||
s->WriteLE32( fFlags );
|
||||
s->WriteLEScalar(fDelay);
|
||||
s->WriteLE32( fValue );
|
||||
}
|
||||
|
||||
UInt8 GetCommand( void ) const { return fCommand; }
|
||||
|
@ -62,7 +62,7 @@ void pfMarkerMsg::Read(hsStream* stream, hsResMgr* mgr)
|
||||
fType = (Type)stream->ReadByte();
|
||||
|
||||
if (fType == kMarkerCaptured)
|
||||
fMarkerID = stream->ReadSwap32();
|
||||
fMarkerID = stream->ReadLE32();
|
||||
}
|
||||
|
||||
void pfMarkerMsg::Write(hsStream* stream, hsResMgr* mgr)
|
||||
@ -72,7 +72,7 @@ void pfMarkerMsg::Write(hsStream* stream, hsResMgr* mgr)
|
||||
stream->WriteByte(fType);
|
||||
|
||||
if (fType == kMarkerCaptured)
|
||||
stream->WriteSwap32(fMarkerID);
|
||||
stream->WriteLE32(fMarkerID);
|
||||
}
|
||||
|
||||
void pfMarkerMsg::PrintDebug(char* buf)
|
||||
|
@ -47,27 +47,27 @@ void plClothingMsg::Read(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgRead(stream, mgr);
|
||||
|
||||
fCommands = stream->ReadSwap32();
|
||||
fCommands = stream->ReadLE32();
|
||||
if (stream->ReadBool())
|
||||
fItemKey = mgr->ReadKey(stream);
|
||||
fColor.Read(stream);
|
||||
fLayer = stream->ReadByte();
|
||||
fDelta = stream->ReadByte();
|
||||
fWeight = stream->ReadSwapScalar();
|
||||
fWeight = stream->ReadLEScalar();
|
||||
}
|
||||
|
||||
void plClothingMsg::Write(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plMessage::IMsgWrite(stream, mgr);
|
||||
|
||||
stream->WriteSwap32(fCommands);
|
||||
stream->WriteLE32(fCommands);
|
||||
stream->WriteBool(fItemKey != nil);
|
||||
if (fItemKey)
|
||||
mgr->WriteKey(stream, fItemKey);
|
||||
fColor.Write(stream);
|
||||
stream->WriteByte(fLayer);
|
||||
stream->WriteByte(fDelta);
|
||||
stream->WriteSwapScalar(fWeight);
|
||||
stream->WriteLEScalar(fWeight);
|
||||
}
|
||||
|
||||
enum ClothingFlags
|
||||
@ -85,7 +85,7 @@ void plClothingMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Read(s);
|
||||
|
||||
if (contentFlags.IsBitSet(kClothingCommands))
|
||||
fCommands = s->ReadSwap32();
|
||||
fCommands = s->ReadLE32();
|
||||
if (contentFlags.IsBitSet(kClothingItemKey))
|
||||
{
|
||||
if (s->ReadBool())
|
||||
@ -106,7 +106,7 @@ void plClothingMsg::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Write(s);
|
||||
|
||||
// kClothingCommands
|
||||
s->WriteSwap32(fCommands);
|
||||
s->WriteLE32(fCommands);
|
||||
// kClothingItemKey
|
||||
s->WriteBool(fItemKey != nil);
|
||||
if (fItemKey)
|
||||
|
Reference in New Issue
Block a user