mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +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:
Darryl Pogue
@ -165,7 +165,7 @@ plNetMessage* plNetMessage::Create(const plNetCommonMessage* msg)
|
||||
hsReadOnlyStream readStream;
|
||||
ClassIndexType classIndex;
|
||||
readStream.Init(sizeof(classIndex), msg->GetData());
|
||||
readStream.ReadSwap(&classIndex);
|
||||
readStream.ReadLE(&classIndex);
|
||||
if (!plFactory::IsValidClassIndex(classIndex))
|
||||
return nil;
|
||||
plNetMessage* pnm = plNetMessage::ConvertNoRef(plFactory::Create(classIndex));
|
||||
@ -247,7 +247,7 @@ void plNetMessage::IWriteClassIndex(hsStream* stream)
|
||||
{
|
||||
ClassIndexType classIndex=ClassIndex();
|
||||
hsAssert(sizeof(classIndex)==sizeof(plNetMessageClassIndex), "somebody changed the size of plCreatable::ClassIndex");
|
||||
stream->WriteSwap(classIndex);
|
||||
stream->WriteLE(classIndex);
|
||||
}
|
||||
|
||||
// put in buffer
|
||||
@ -255,7 +255,7 @@ int plNetMessage::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
IWriteClassIndex(stream);
|
||||
|
||||
stream->WriteSwap32(fFlags);
|
||||
stream->WriteLE32(fFlags);
|
||||
|
||||
if (IsBitSet(kHasVersion))
|
||||
{
|
||||
@ -265,11 +265,11 @@ int plNetMessage::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (IsBitSet(kHasTimeSent))
|
||||
fTimeSent.Write(stream);
|
||||
if (IsBitSet(kHasContext))
|
||||
stream->WriteSwap(fContext);
|
||||
stream->WriteLE(fContext);
|
||||
if (IsBitSet(kHasTransactionID))
|
||||
stream->WriteSwap(fTransactionID);
|
||||
stream->WriteLE(fTransactionID);
|
||||
if (IsBitSet(kHasPlayerID))
|
||||
stream->WriteSwap(fPlayerID);
|
||||
stream->WriteLE(fPlayerID);
|
||||
if (IsBitSet(kHasAcctUUID))
|
||||
fAcctUUID.Write(stream);
|
||||
|
||||
@ -280,7 +280,7 @@ void plNetMessage::IReadClassIndex(hsStream* stream)
|
||||
{
|
||||
ClassIndexType classIndex;
|
||||
hsAssert(sizeof(classIndex)==sizeof(plNetMessageClassIndex), "somebody changed the size of plCreatable::ClassIndex");
|
||||
stream->LogReadSwap(&classIndex,"ClassIndex");
|
||||
stream->LogReadLE(&classIndex,"ClassIndex");
|
||||
}
|
||||
|
||||
// get out of buffer
|
||||
@ -288,13 +288,13 @@ int plNetMessage::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
IReadClassIndex(stream);
|
||||
|
||||
stream->LogReadSwap(&fFlags,"Flags");
|
||||
stream->LogReadLE(&fFlags,"Flags");
|
||||
|
||||
// verify version first
|
||||
if (IsBitSet(kHasVersion))
|
||||
{
|
||||
stream->LogReadSwap(&fProtocolVerMajor, "Protocol major version");
|
||||
stream->LogReadSwap(&fProtocolVerMinor, "Protocol minor version");
|
||||
stream->LogReadLE(&fProtocolVerMajor, "Protocol major version");
|
||||
stream->LogReadLE(&fProtocolVerMinor, "Protocol minor version");
|
||||
|
||||
if (fProtocolVerMajor != kVerMajor || fProtocolVerMinor != kVerMinor)
|
||||
return 0; // this will cause derived classes to stop reading
|
||||
@ -308,11 +308,11 @@ int plNetMessage::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (IsBitSet(kHasTimeSent))
|
||||
fTimeSent.Read(stream);
|
||||
if (IsBitSet(kHasContext))
|
||||
stream->LogReadSwap(&fContext,"Context");
|
||||
stream->LogReadLE(&fContext,"Context");
|
||||
if (IsBitSet(kHasTransactionID))
|
||||
stream->LogReadSwap(&fTransactionID,"TransactionID");
|
||||
stream->LogReadLE(&fTransactionID,"TransactionID");
|
||||
if (IsBitSet(kHasPlayerID))
|
||||
stream->LogReadSwap(&fPlayerID,"PlayerID");
|
||||
stream->LogReadLE(&fPlayerID,"PlayerID");
|
||||
if (IsBitSet(kHasAcctUUID))
|
||||
fAcctUUID.Read( stream );
|
||||
return stream->GetPosition();
|
||||
@ -324,14 +324,14 @@ void plNetMessage::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Read(s);
|
||||
|
||||
if (contentFlags.IsBitSet(kNetMsgFlags))
|
||||
s->LogReadSwap(&fFlags,"Flags");
|
||||
s->LogReadLE(&fFlags,"Flags");
|
||||
|
||||
if (contentFlags.IsBitSet(kNetMsgVersion))
|
||||
{
|
||||
if (IsBitSet(kHasVersion))
|
||||
{
|
||||
s->LogReadSwap(&fProtocolVerMajor, "Protocol major version");
|
||||
s->LogReadSwap(&fProtocolVerMinor, "Protocol minor version");
|
||||
s->LogReadLE(&fProtocolVerMajor, "Protocol major version");
|
||||
s->LogReadLE(&fProtocolVerMinor, "Protocol minor version");
|
||||
}
|
||||
}
|
||||
|
||||
@ -344,19 +344,19 @@ void plNetMessage::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
if (contentFlags.IsBitSet(kNetMsgContext))
|
||||
{
|
||||
if (IsBitSet(kHasContext))
|
||||
s->LogReadSwap(&fContext,"Context");
|
||||
s->LogReadLE(&fContext,"Context");
|
||||
}
|
||||
|
||||
if (contentFlags.IsBitSet(kNetMsgTransactionID))
|
||||
{
|
||||
if (IsBitSet(kHasTransactionID))
|
||||
s->LogReadSwap(&fTransactionID,"TransactionID");
|
||||
s->LogReadLE(&fTransactionID,"TransactionID");
|
||||
}
|
||||
|
||||
if (contentFlags.IsBitSet(kNetMsgPlayerID))
|
||||
{
|
||||
if (IsBitSet(kHasPlayerID))
|
||||
s->LogReadSwap(&fPlayerID,"PlayerID");
|
||||
s->LogReadLE(&fPlayerID,"PlayerID");
|
||||
}
|
||||
}
|
||||
|
||||
@ -372,7 +372,7 @@ void plNetMessage::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Write(s);
|
||||
|
||||
// kNetMsgFlags
|
||||
s->WriteSwap32(fFlags);
|
||||
s->WriteLE32(fFlags);
|
||||
|
||||
// version
|
||||
if (IsBitSet(kHasVersion))
|
||||
@ -387,15 +387,15 @@ void plNetMessage::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
|
||||
// kNetMsgContext
|
||||
if (IsBitSet(kHasContext))
|
||||
s->WriteSwap(fContext);
|
||||
s->WriteLE(fContext);
|
||||
|
||||
// kNetMsgTransactionID
|
||||
if (IsBitSet(kHasTransactionID))
|
||||
s->WriteSwap(fTransactionID);
|
||||
s->WriteLE(fTransactionID);
|
||||
|
||||
// kNetMsgPlayerID
|
||||
if (IsBitSet(kHasPlayerID))
|
||||
s->WriteSwap(fPlayerID);
|
||||
s->WriteLE(fPlayerID);
|
||||
}
|
||||
|
||||
// Get the Packed Size
|
||||
@ -738,18 +738,18 @@ int plNetMsgSDLState::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
ISetDescName(); // stash away the descName before poke/compress
|
||||
plNetMsgStreamedObject::IPokeBuffer(stream, peekOptions);
|
||||
stream->WriteSwap( fIsInitialState );
|
||||
stream->WriteSwap(fPersistOnServer);
|
||||
stream->WriteSwap(fIsAvatarState);
|
||||
stream->WriteLE( fIsInitialState );
|
||||
stream->WriteLE(fPersistOnServer);
|
||||
stream->WriteLE(fIsAvatarState);
|
||||
return stream->GetPosition();
|
||||
}
|
||||
|
||||
int plNetMsgSDLState::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
plNetMsgStreamedObject::IPeekBuffer(stream, peekOptions);
|
||||
stream->LogReadSwap( &fIsInitialState, "IsInitialAgeState" );
|
||||
stream->LogReadSwap(&fPersistOnServer, "SDLState PersistOnServer");
|
||||
stream->LogReadSwap(&fIsAvatarState, "SDLState IsAvatarState");
|
||||
stream->LogReadLE( &fIsInitialState, "IsInitialAgeState" );
|
||||
stream->LogReadLE(&fPersistOnServer, "SDLState PersistOnServer");
|
||||
stream->LogReadLE(&fIsAvatarState, "SDLState IsAvatarState");
|
||||
ISetDescName(); // stash away the descName after peek/uncompress
|
||||
return stream->GetPosition();
|
||||
}
|
||||
@ -764,7 +764,7 @@ void plNetMsgSDLState::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
if (contentFlags.IsBitSet(kSDLStateStream))
|
||||
{
|
||||
UInt32 len;
|
||||
s->LogReadSwap(&len,"SDLState StreamLen");
|
||||
s->LogReadLE(&len,"SDLState StreamLen");
|
||||
UInt8* buf = TRACKED_NEW UInt8[len];
|
||||
s->LogRead(len, buf,"SDLState StreamData");
|
||||
|
||||
@ -772,11 +772,11 @@ void plNetMsgSDLState::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
StreamInfo()->SetStreamBuf(buf);
|
||||
}
|
||||
if (contentFlags.IsBitSet(kSDLIsInitialState))
|
||||
s->LogReadSwap( &fIsInitialState, "IsInitialAgeState" );
|
||||
s->LogReadLE( &fIsInitialState, "IsInitialAgeState" );
|
||||
if (contentFlags.IsBitSet(kSDLPersist))
|
||||
s->ReadSwap(&fPersistOnServer);
|
||||
s->ReadLE(&fPersistOnServer);
|
||||
if (contentFlags.IsBitSet(kSDLAvatarState))
|
||||
s->ReadSwap(&fIsAvatarState);
|
||||
s->ReadLE(&fIsAvatarState);
|
||||
}
|
||||
|
||||
void plNetMsgSDLState::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
@ -791,11 +791,11 @@ void plNetMsgSDLState::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Write(s);
|
||||
|
||||
// kSDLStateStream
|
||||
s->WriteSwap32(StreamInfo()->GetStreamLen());
|
||||
s->WriteLE32(StreamInfo()->GetStreamLen());
|
||||
s->Write(StreamInfo()->GetStreamLen(), StreamInfo()->GetStreamBuf());
|
||||
s->WriteSwap( fIsInitialState );
|
||||
s->WriteSwap(fPersistOnServer);
|
||||
s->WriteSwap(fIsAvatarState);
|
||||
s->WriteLE( fIsInitialState );
|
||||
s->WriteLE(fPersistOnServer);
|
||||
s->WriteLE(fIsAvatarState);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////
|
||||
@ -848,7 +848,7 @@ int plNetMsgRoomsList::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (bytes)
|
||||
{
|
||||
int i, numRooms=fRooms.size();
|
||||
stream->WriteSwap(numRooms);
|
||||
stream->WriteLE(numRooms);
|
||||
for(i=0;i<numRooms;i++)
|
||||
{
|
||||
fRooms[i].Write(stream);
|
||||
@ -868,7 +868,7 @@ int plNetMsgRoomsList::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (bytes)
|
||||
{
|
||||
int i, numRooms;
|
||||
stream->LogReadSwap(&numRooms,"RoomList NumRooms");
|
||||
stream->LogReadLE(&numRooms,"RoomList NumRooms");
|
||||
fRooms.resize(numRooms);
|
||||
int oldSize = fRoomNames.size();
|
||||
fRoomNames.resize(numRooms);
|
||||
@ -914,7 +914,7 @@ int plNetMsgPagingRoom::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMsgRoomsList::IPokeBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->WriteSwap(fPageFlags);
|
||||
stream->WriteLE(fPageFlags);
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
@ -925,7 +925,7 @@ int plNetMsgPagingRoom::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMsgRoomsList::IPeekBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->LogReadSwap(&fPageFlags,"PageFlags");
|
||||
stream->LogReadLE(&fPageFlags,"PageFlags");
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
@ -940,7 +940,7 @@ int plNetMsgGroupOwner::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (bytes)
|
||||
{
|
||||
int i, numGroups=fGroups.size();
|
||||
stream->WriteSwap(numGroups);
|
||||
stream->WriteLE(numGroups);
|
||||
for(i=0;i<numGroups;i++)
|
||||
fGroups[i].Write(stream);
|
||||
|
||||
@ -955,7 +955,7 @@ int plNetMsgGroupOwner::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
if (bytes)
|
||||
{
|
||||
int i, num;
|
||||
stream->LogReadSwap(&num,"GroupOwnerNum");
|
||||
stream->LogReadLE(&num,"GroupOwnerNum");
|
||||
fGroups.resize(num);
|
||||
for(i=0;i<num;i++)
|
||||
{
|
||||
@ -986,7 +986,7 @@ int plNetMsgSharedState::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMsgStreamedObject::IPokeBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->WriteSwap(fLockRequest);
|
||||
stream->WriteLE(fLockRequest);
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
@ -997,7 +997,7 @@ int plNetMsgSharedState::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMsgStreamedObject::IPeekBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->LogReadSwap(&fLockRequest,"SharedState LockRequest");
|
||||
stream->LogReadLE(&fLockRequest,"SharedState LockRequest");
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
@ -1011,7 +1011,7 @@ void plNetMsgSharedState::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Read(s);
|
||||
|
||||
if (contentFlags.IsBitSet(kLockRequest))
|
||||
s->ReadSwap(&fLockRequest);
|
||||
s->ReadLE(&fLockRequest);
|
||||
}
|
||||
|
||||
void plNetMsgSharedState::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
@ -1022,7 +1022,7 @@ void plNetMsgSharedState::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.SetBit(kLockRequest);
|
||||
contentFlags.Write(s);
|
||||
|
||||
s->WriteSwap(fLockRequest);
|
||||
s->WriteLE(fLockRequest);
|
||||
}
|
||||
|
||||
|
||||
@ -1062,7 +1062,7 @@ int plNetMsgObjectUpdateFilter::IPokeBuffer(hsStream* stream, UInt32 peekOptions
|
||||
if (bytes)
|
||||
{
|
||||
fObjectListHelper.Poke(stream, peekOptions);
|
||||
stream->WriteSwap(fMaxUpdateFreq);
|
||||
stream->WriteLE(fMaxUpdateFreq);
|
||||
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
@ -1076,7 +1076,7 @@ int plNetMsgObjectUpdateFilter::IPeekBuffer(hsStream* stream, UInt32 peekOptions
|
||||
{
|
||||
stream->LogSubStreamPushDesc("ObjectUpdateFilter");
|
||||
fObjectListHelper.Peek(stream, peekOptions);
|
||||
stream->LogReadSwap(&fMaxUpdateFreq,"MsgObjectUpdateFilter MaxUpdateFreq");
|
||||
stream->LogReadLE(&fMaxUpdateFreq,"MsgObjectUpdateFilter MaxUpdateFreq");
|
||||
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
@ -1149,8 +1149,8 @@ int plNetMsgMemberUpdate::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int plNetMsgVoice::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
plNetMessage::IPokeBuffer(stream, peekOptions);
|
||||
stream->WriteSwap(fFlags);
|
||||
stream->WriteSwap(fNumFrames);
|
||||
stream->WriteLE(fFlags);
|
||||
stream->WriteLE(fNumFrames);
|
||||
plMsgStdStringHelper::Poke(fVoiceData, stream, peekOptions);
|
||||
fReceivers.Poke(stream, peekOptions);
|
||||
return stream->GetPosition();
|
||||
@ -1161,8 +1161,8 @@ int plNetMsgVoice::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMessage::IPeekBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->LogReadSwap(&fFlags,"Voice Flags");
|
||||
stream->LogReadSwap(&fNumFrames, "Number of encoded frames");
|
||||
stream->LogReadLE(&fFlags,"Voice Flags");
|
||||
stream->LogReadLE(&fNumFrames, "Number of encoded frames");
|
||||
stream->LogSubStreamPushDesc("Voice Data");
|
||||
plMsgStdStringHelper::Peek(fVoiceData, stream, peekOptions);
|
||||
stream->LogSubStreamPushDesc("Voice Receivers");
|
||||
@ -1181,11 +1181,11 @@ void plNetMsgVoice::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Read(s);
|
||||
|
||||
if (contentFlags.IsBitSet(kDead_FrameSize))
|
||||
s->ReadSwap(&old);
|
||||
s->ReadLE(&old);
|
||||
if (contentFlags.IsBitSet(kReceivers))
|
||||
fReceivers.ReadVersion(s,mgr);
|
||||
if (contentFlags.IsBitSet(kVoiceFlags))
|
||||
s->ReadSwap(&fFlags);
|
||||
s->ReadLE(&fFlags);
|
||||
if(contentFlags.IsBitSet(kVoiceData))
|
||||
plMsgStdStringHelper::Peek(fVoiceData, s);
|
||||
}
|
||||
@ -1202,7 +1202,7 @@ void plNetMsgVoice::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Write(s);
|
||||
|
||||
fReceivers.WriteVersion(s,mgr);
|
||||
s->WriteSwap(fFlags);
|
||||
s->WriteLE(fFlags);
|
||||
plMsgStdStringHelper::Poke(fVoiceData, s);
|
||||
}
|
||||
|
||||
@ -1225,7 +1225,7 @@ const char *plNetMsgVoice::GetVoiceData() const
|
||||
int plNetMsgListenListUpdate::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
int bytes=plNetMessage::IPokeBuffer(stream, peekOptions);
|
||||
stream->WriteSwap(fAdding);
|
||||
stream->WriteLE(fAdding);
|
||||
fReceivers.Poke(stream, peekOptions);
|
||||
return stream->GetPosition();
|
||||
}
|
||||
@ -1235,7 +1235,7 @@ int plNetMsgListenListUpdate::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int bytes=plNetMessage::IPeekBuffer(stream, peekOptions);
|
||||
if (bytes)
|
||||
{
|
||||
stream->LogReadSwap(&fAdding,"ListenListUpdate Adding");
|
||||
stream->LogReadLE(&fAdding,"ListenListUpdate Adding");
|
||||
stream->LogSubStreamPushDesc("ListenListUpdate Reveivers");
|
||||
fReceivers.Peek(stream, peekOptions);
|
||||
bytes=stream->GetPosition();
|
||||
@ -1250,7 +1250,7 @@ int plNetMsgListenListUpdate::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
|
||||
int plNetMsgPlayerPage::IPokeBuffer( hsStream* stream, UInt32 peekOptions )
|
||||
{
|
||||
plNetMessage::IPokeBuffer( stream, peekOptions );
|
||||
stream->WriteSwap( fUnload );
|
||||
stream->WriteLE( fUnload );
|
||||
fUoid.Write(stream);
|
||||
|
||||
return stream->GetPosition();
|
||||
@ -1261,7 +1261,7 @@ int plNetMsgPlayerPage::IPeekBuffer( hsStream* stream, UInt32 peekOptions )
|
||||
int bytes = plNetMessage::IPeekBuffer(stream, peekOptions );
|
||||
if ( bytes )
|
||||
{
|
||||
stream->LogReadSwap( &fUnload,"PlayersPage Unload");
|
||||
stream->LogReadLE( &fUnload,"PlayersPage Unload");
|
||||
fUoid.Read(stream);
|
||||
bytes = stream->GetPosition();
|
||||
}
|
||||
@ -1279,9 +1279,9 @@ int plNetMsgLoadClone::IPokeBuffer( hsStream* stream, UInt32 peekOptions )
|
||||
if ( bytes )
|
||||
{
|
||||
fObjectHelper.Poke(stream, peekOptions);
|
||||
stream->WriteSwap( fIsPlayer );
|
||||
stream->WriteSwap( fIsLoading );
|
||||
stream->WriteSwap( fIsInitialState );
|
||||
stream->WriteLE( fIsPlayer );
|
||||
stream->WriteLE( fIsLoading );
|
||||
stream->WriteLE( fIsInitialState );
|
||||
bytes = stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
@ -1296,9 +1296,9 @@ int plNetMsgLoadClone::IPeekBuffer( hsStream* stream, UInt32 peekOptions )
|
||||
stream->LogSubStreamPushDesc("MsgObject");
|
||||
fObjectHelper.Peek(stream, peekOptions);
|
||||
|
||||
stream->LogReadSwap( &fIsPlayer,"LoadClone IsPlayer");
|
||||
stream->LogReadSwap( &fIsLoading,"LoadClone IsLoading");
|
||||
stream->LogReadSwap( &fIsInitialState, "LoadClone IsInitialState" );
|
||||
stream->LogReadLE( &fIsPlayer,"LoadClone IsPlayer");
|
||||
stream->LogReadLE( &fIsLoading,"LoadClone IsLoading");
|
||||
stream->LogReadLE( &fIsInitialState, "LoadClone IsInitialState" );
|
||||
|
||||
bytes = stream->GetPosition();
|
||||
}
|
||||
@ -1315,11 +1315,11 @@ void plNetMsgLoadClone::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
if (contentFlags.IsBitSet(kObjectHelper))
|
||||
fObjectHelper.ReadVersion(s,mgr);
|
||||
if (contentFlags.IsBitSet(kIsPlayer))
|
||||
s->ReadSwap(&fIsPlayer);
|
||||
s->ReadLE(&fIsPlayer);
|
||||
if (contentFlags.IsBitSet(kIsLoading))
|
||||
s->ReadSwap(&fIsLoading);
|
||||
s->ReadLE(&fIsLoading);
|
||||
if (contentFlags.IsBitSet(kIsInitialState))
|
||||
s->ReadSwap(&fIsInitialState);
|
||||
s->ReadLE(&fIsInitialState);
|
||||
}
|
||||
|
||||
void plNetMsgLoadClone::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
@ -1334,9 +1334,9 @@ void plNetMsgLoadClone::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Write(s);
|
||||
|
||||
fObjectHelper.WriteVersion(s,mgr);
|
||||
s->WriteSwap(fIsPlayer);
|
||||
s->WriteSwap(fIsLoading);
|
||||
s->WriteSwap(fIsInitialState);
|
||||
s->WriteLE(fIsPlayer);
|
||||
s->WriteLE(fIsLoading);
|
||||
s->WriteLE(fIsInitialState);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
@ -1344,7 +1344,7 @@ void plNetMsgLoadClone::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
int plNetMsgInitialAgeStateSent::IPokeBuffer( hsStream* stream, UInt32 peekOptions )
|
||||
{
|
||||
plNetMessage::IPokeBuffer( stream, peekOptions );
|
||||
stream->WriteSwap( fNumInitialSDLStates );
|
||||
stream->WriteLE( fNumInitialSDLStates );
|
||||
return stream->GetPosition();
|
||||
}
|
||||
|
||||
@ -1354,7 +1354,7 @@ int plNetMsgInitialAgeStateSent::IPeekBuffer( hsStream* stream, UInt32 peekOptio
|
||||
int bytes=plNetMessage::IPeekBuffer(stream, peekOptions );
|
||||
if (bytes)
|
||||
{
|
||||
stream->LogReadSwap( &fNumInitialSDLStates, "NumInitialSDLStates" );
|
||||
stream->LogReadLE( &fNumInitialSDLStates, "NumInitialSDLStates" );
|
||||
bytes=stream->GetPosition();
|
||||
}
|
||||
return bytes;
|
||||
|
||||
@ -691,8 +691,8 @@ public:
|
||||
plNetGroupId fGroupID;
|
||||
bool fOwnIt; // else not the owner
|
||||
|
||||
void Read(hsStream* s) { fGroupID.Read(s); s->LogReadSwap(&fOwnIt,"GroupOwner OwnIt"); }
|
||||
void Write(hsStream* s) { fGroupID.Write(s); s->WriteSwap(fOwnIt); }
|
||||
void Read(hsStream* s) { fGroupID.Read(s); s->LogReadLE(&fOwnIt,"GroupOwner OwnIt"); }
|
||||
void Write(hsStream* s) { fGroupID.Write(s); s->WriteLE(fOwnIt); }
|
||||
|
||||
GroupInfo() : fGroupID(plNetGroup::kNetGroupUnknown), fOwnIt(false) {}
|
||||
GroupInfo(plNetGroupId gID, hsBool o) : fGroupID(gID),fOwnIt(o) {}
|
||||
|
||||
@ -121,7 +121,7 @@ int plNetMsgCreatableHelper::Poke(hsStream * s, UInt32 peekOptions)
|
||||
{
|
||||
hsAssert(fCreatable,"plNetMsgCreatableHelper::Poke: fCreatable not set");
|
||||
UInt16 classIndex = fCreatable->ClassIndex();
|
||||
s->WriteSwap(classIndex);
|
||||
s->WriteLE(classIndex);
|
||||
fCreatable->Write(s,nil);
|
||||
return s->GetPosition();
|
||||
}
|
||||
@ -130,7 +130,7 @@ int plNetMsgCreatableHelper::Peek(hsStream * s, UInt32 peekOptions)
|
||||
{
|
||||
UInt16 classIndex;
|
||||
s->LogSubStreamStart("push me");
|
||||
s->LogReadSwap(&classIndex,"ClassIdx");
|
||||
s->LogReadLE(&classIndex,"ClassIdx");
|
||||
SetObject(plFactory::Create(classIndex));
|
||||
fWeCreatedIt = true;
|
||||
hsAssert(fCreatable,"plNetMsgCreatableHelper::Peek: Failed to create plCreatable. Invalid ClassIndex?");
|
||||
@ -164,9 +164,9 @@ int plNetMsgStreamHelper::Poke(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
if ( !(peekOptions & plNetMessage::kDontCompress) )
|
||||
Compress();
|
||||
stream->WriteSwap(fUncompressedSize);
|
||||
stream->WriteSwap(fCompressionType);
|
||||
stream->WriteSwap(fStreamLen);
|
||||
stream->WriteLE(fUncompressedSize);
|
||||
stream->WriteLE(fCompressionType);
|
||||
stream->WriteLE(fStreamLen);
|
||||
stream->Write(fStreamLen, fStreamBuf);
|
||||
return stream->GetPosition();
|
||||
}
|
||||
@ -174,9 +174,9 @@ int plNetMsgStreamHelper::Poke(hsStream* stream, UInt32 peekOptions)
|
||||
int plNetMsgStreamHelper::Peek(hsStream* stream, const UInt32 peekOptions)
|
||||
{
|
||||
stream->LogSubStreamStart("Stream Helper");
|
||||
stream->LogReadSwap(&fUncompressedSize,"UncompressedSize");
|
||||
stream->LogReadSwap(&fCompressionType,"CompressionType");
|
||||
stream->LogReadSwap(&fStreamLen,"StreamLen");
|
||||
stream->LogReadLE(&fUncompressedSize,"UncompressedSize");
|
||||
stream->LogReadLE(&fCompressionType,"CompressionType");
|
||||
stream->LogReadLE(&fStreamLen,"StreamLen");
|
||||
|
||||
if (fStreamLen) // stream data exists
|
||||
{
|
||||
@ -191,7 +191,7 @@ int plNetMsgStreamHelper::Peek(hsStream* stream, const UInt32 peekOptions)
|
||||
}
|
||||
else
|
||||
{
|
||||
stream->ReadSwap(&fStreamType); // never compressed, set by reading directly from stream
|
||||
stream->ReadLE(&fStreamType); // never compressed, set by reading directly from stream
|
||||
stream->LogSkip(fStreamLen-sizeof(fStreamType),"SkippedStreamHelper");
|
||||
}
|
||||
}
|
||||
@ -205,11 +205,11 @@ void plNetMsgStreamHelper::ReadVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.Read(s);
|
||||
|
||||
if (contentFlags.IsBitSet(kUncompressedSize))
|
||||
s->ReadSwap(&fUncompressedSize);
|
||||
s->ReadLE(&fUncompressedSize);
|
||||
if (contentFlags.IsBitSet(kCompressionType))
|
||||
s->ReadSwap(&fCompressionType);
|
||||
s->ReadLE(&fCompressionType);
|
||||
if (contentFlags.IsBitSet(kStreamLen))
|
||||
s->ReadSwap(&fStreamLen);
|
||||
s->ReadLE(&fStreamLen);
|
||||
if (contentFlags.IsBitSet(kStreamBuf))
|
||||
{
|
||||
if (!fStreamBuf)
|
||||
@ -227,9 +227,9 @@ void plNetMsgStreamHelper::WriteVersion(hsStream* s, hsResMgr* mgr)
|
||||
contentFlags.SetBit(kStreamBuf);
|
||||
contentFlags.Write(s);
|
||||
|
||||
s->WriteSwap(fUncompressedSize);
|
||||
s->WriteSwap(fCompressionType);
|
||||
s->WriteSwap(fStreamLen);
|
||||
s->WriteLE(fUncompressedSize);
|
||||
s->WriteLE(fCompressionType);
|
||||
s->WriteLE(fStreamLen);
|
||||
s->Write(fStreamLen,fStreamBuf);
|
||||
}
|
||||
|
||||
@ -414,7 +414,7 @@ void plNetMsgObjectListHelper::Reset()
|
||||
int plNetMsgObjectListHelper::Poke(hsStream* stream, UInt32 peekOptions)
|
||||
{
|
||||
Int16 num = GetNumObjects();
|
||||
stream->WriteSwap(num);
|
||||
stream->WriteLE(num);
|
||||
int i;
|
||||
for( i=0 ;i<num ;i++ )
|
||||
{
|
||||
@ -430,7 +430,7 @@ int plNetMsgObjectListHelper::Peek(hsStream* stream, const UInt32 peekOptions)
|
||||
|
||||
stream->LogSubStreamStart("push me");
|
||||
Int16 num;
|
||||
stream->LogReadSwap(&num,"ObjectListHelper Num");
|
||||
stream->LogReadLE(&num,"ObjectListHelper Num");
|
||||
|
||||
int i;
|
||||
for( i=0 ;i<num ;i++ )
|
||||
@ -454,7 +454,7 @@ plNetMsgMemberInfoHelper::plNetMsgMemberInfoHelper()
|
||||
int plNetMsgMemberInfoHelper::Peek(hsStream* s, const UInt32 peekOptions)
|
||||
{
|
||||
s->LogSubStreamStart("push me");
|
||||
s->LogReadSwap(&fFlags,"MemberInfoHelper Flags");
|
||||
s->LogReadLE(&fFlags,"MemberInfoHelper Flags");
|
||||
fClientGuid.Read( s, nil );
|
||||
fAvatarUoid.Read(s);
|
||||
s->LogSubStreamEnd();
|
||||
@ -463,7 +463,7 @@ int plNetMsgMemberInfoHelper::Peek(hsStream* s, const UInt32 peekOptions)
|
||||
|
||||
int plNetMsgMemberInfoHelper::Poke(hsStream* s, const UInt32 peekOptions)
|
||||
{
|
||||
s->WriteSwap(fFlags);
|
||||
s->WriteLE(fFlags);
|
||||
fClientGuid.Write( s, nil );
|
||||
fAvatarUoid.Write(s);
|
||||
return s->GetPosition();
|
||||
@ -484,7 +484,7 @@ int plNetMsgMemberListHelper::Peek(hsStream* stream, const UInt32 peekOptions)
|
||||
{
|
||||
Int16 numMembers;
|
||||
stream->LogSubStreamStart("push me");
|
||||
stream->LogReadSwap(&numMembers,"MemberListHelper NumMembers");
|
||||
stream->LogReadLE(&numMembers,"MemberListHelper NumMembers");
|
||||
fMembers.clear();
|
||||
int i;
|
||||
for(i=0;i<numMembers;i++)
|
||||
@ -500,7 +500,7 @@ int plNetMsgMemberListHelper::Peek(hsStream* stream, const UInt32 peekOptions)
|
||||
int plNetMsgMemberListHelper::Poke(hsStream* stream, const UInt32 peekOptions)
|
||||
{
|
||||
Int16 numMembers = (Int16)GetNumMembers();
|
||||
stream->WriteSwap(numMembers);
|
||||
stream->WriteLE(numMembers);
|
||||
|
||||
int i;
|
||||
for(i=0;i<numMembers;i++)
|
||||
@ -523,14 +523,14 @@ int plNetMsgReceiversListHelper::Peek(hsStream* stream, const UInt32 peekOptions
|
||||
{
|
||||
UInt8 numIDs;
|
||||
stream->LogSubStreamStart("push me");
|
||||
stream->LogReadSwap(&numIDs,"ReceiversListHelper NumIDs");
|
||||
stream->LogReadLE(&numIDs,"ReceiversListHelper NumIDs");
|
||||
|
||||
fPlayerIDList.clear();
|
||||
int i;
|
||||
for(i=0;i<numIDs;i++)
|
||||
{
|
||||
UInt32 ID;
|
||||
stream->LogReadSwap(&ID,"ReceiversListHelper ID");
|
||||
stream->LogReadLE(&ID,"ReceiversListHelper ID");
|
||||
AddReceiverPlayerID(ID);
|
||||
}
|
||||
stream->LogSubStreamEnd();
|
||||
@ -540,11 +540,11 @@ int plNetMsgReceiversListHelper::Peek(hsStream* stream, const UInt32 peekOptions
|
||||
int plNetMsgReceiversListHelper::Poke(hsStream* stream, const UInt32 peekOptions)
|
||||
{
|
||||
UInt8 numIDs = (UInt8)GetNumReceivers();
|
||||
stream->WriteSwap(numIDs);
|
||||
stream->WriteLE(numIDs);
|
||||
|
||||
int i;
|
||||
for(i=0;i<numIDs;i++)
|
||||
stream->WriteSwap(GetReceiverPlayerID(i));
|
||||
stream->WriteLE(GetReceiverPlayerID(i));
|
||||
|
||||
return stream->GetPosition();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user