mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 10:37:41 -04: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:
@ -2301,10 +2301,10 @@ public:
|
||||
if ( ageInfoStream && nPlayersStream )
|
||||
{
|
||||
UInt16 nAgeInfoEntries;
|
||||
ageInfoStream->GetStream()->ReadSwap( &nAgeInfoEntries );
|
||||
ageInfoStream->GetStream()->ReadLE( &nAgeInfoEntries );
|
||||
|
||||
UInt16 nPlayerCountEntries;
|
||||
nPlayersStream->GetStream()->ReadSwap( &nPlayerCountEntries );
|
||||
nPlayersStream->GetStream()->ReadLE( &nPlayerCountEntries );
|
||||
|
||||
hsAssert( nAgeInfoEntries==nPlayerCountEntries, "huh?" );
|
||||
|
||||
@ -2316,7 +2316,7 @@ public:
|
||||
plAgeInfoStruct ageInfo;
|
||||
UInt32 nPlayers;
|
||||
ageInfo.Read( ageInfoStream->GetStream(), nil );
|
||||
nPlayersStream->GetStream()->ReadSwap( &nPlayers );
|
||||
nPlayersStream->GetStream()->ReadLE( &nPlayers );
|
||||
PyObject* t = PyTuple_New(2);
|
||||
PyTuple_SetItem(t, 0, pyAgeInfoStruct::New(&ageInfo));
|
||||
PyTuple_SetItem(t, 1, PyLong_FromUnsignedLong(nPlayers));
|
||||
|
@ -2942,7 +2942,7 @@ void plPythonFileMod::Read(hsStream* stream, hsResMgr* mgr)
|
||||
fPythonFile = stream->ReadSafeString();
|
||||
|
||||
// then read in the list of receivers that want to be notified
|
||||
int nRcvs = stream->ReadSwap32();
|
||||
int nRcvs = stream->ReadLE32();
|
||||
fReceivers.Reset();
|
||||
int m;
|
||||
for( m=0; m<nRcvs; m++ )
|
||||
@ -2951,7 +2951,7 @@ void plPythonFileMod::Read(hsStream* stream, hsResMgr* mgr)
|
||||
}
|
||||
|
||||
// then read in the list of parameters
|
||||
int nParms = stream->ReadSwap32();
|
||||
int nParms = stream->ReadLE32();
|
||||
fParameters.SetCountAndZero(nParms);
|
||||
int i;
|
||||
for( i=0; i<nParms; i++ )
|
||||
@ -2969,13 +2969,13 @@ void plPythonFileMod::Write(hsStream* stream, hsResMgr* mgr)
|
||||
stream->WriteSafeString(fPythonFile);
|
||||
|
||||
// then write out the list of receivers that want to be notified
|
||||
stream->WriteSwap32(fReceivers.GetCount());
|
||||
stream->WriteLE32(fReceivers.GetCount());
|
||||
int m;
|
||||
for( m=0; m<fReceivers.GetCount(); m++ )
|
||||
mgr->WriteKey(stream, fReceivers[m]);
|
||||
|
||||
// then write out the list of parameters
|
||||
stream->WriteSwap32(fParameters.GetCount());
|
||||
stream->WriteLE32(fParameters.GetCount());
|
||||
int i;
|
||||
for( i=0; i<fParameters.GetCount(); i++ )
|
||||
fParameters[i].Write(stream,mgr);
|
||||
|
@ -144,7 +144,7 @@ bool plPythonPack::Open()
|
||||
delete [] tempFilename;
|
||||
|
||||
// read the index data
|
||||
int numFiles = fPackStream->ReadSwap32();
|
||||
int numFiles = fPackStream->ReadLE32();
|
||||
UInt32 streamIndex = (UInt32)(fPackStreams.size());
|
||||
for (int i = 0; i < numFiles; i++)
|
||||
{
|
||||
@ -152,7 +152,7 @@ bool plPythonPack::Open()
|
||||
char* buf = fPackStream->ReadSafeString();
|
||||
std::string pythonName = buf; // reading a "string" from a hsStream directly into a stl string causes memory loss
|
||||
delete [] buf;
|
||||
UInt32 offset = fPackStream->ReadSwap32();
|
||||
UInt32 offset = fPackStream->ReadLE32();
|
||||
|
||||
plPackOffsetInfo offsetInfo;
|
||||
offsetInfo.fOffset = offset;
|
||||
@ -209,7 +209,7 @@ PyObject* plPythonPack::OpenPacked(const char* fileName)
|
||||
|
||||
fPackStream->SetPosition(offsetInfo.fOffset);
|
||||
|
||||
Int32 size = fPackStream->ReadSwap32();
|
||||
Int32 size = fPackStream->ReadLE32();
|
||||
if (size > 0)
|
||||
{
|
||||
char *buf = TRACKED_NEW char[size];
|
||||
|
@ -356,32 +356,32 @@ public:
|
||||
{
|
||||
SetToNone();
|
||||
|
||||
fID = stream->ReadSwap32();
|
||||
fValueType = stream->ReadSwap32();
|
||||
fID = stream->ReadLE32();
|
||||
fValueType = stream->ReadLE32();
|
||||
|
||||
// read the different types of data
|
||||
int count;
|
||||
switch ( fValueType )
|
||||
{
|
||||
case kInt:
|
||||
datarecord.fIntNumber = stream->ReadSwap32();
|
||||
datarecord.fIntNumber = stream->ReadLE32();
|
||||
break;
|
||||
|
||||
case kFloat:
|
||||
stream->ReadSwap(&datarecord.fFloatNumber);
|
||||
stream->ReadLE(&datarecord.fFloatNumber);
|
||||
break;
|
||||
|
||||
case kBoolean:
|
||||
datarecord.fBool = stream->ReadSwap32();
|
||||
datarecord.fBool = stream->ReadLE32();
|
||||
break;
|
||||
|
||||
case kString:
|
||||
case kAnimationName:
|
||||
count = stream->ReadSwap32();
|
||||
count = stream->ReadLE32();
|
||||
if ( count != 0 )
|
||||
{
|
||||
datarecord.fString = TRACKED_NEW char[count+1];
|
||||
stream->ReadSwap(count,datarecord.fString);
|
||||
stream->ReadLE(count,datarecord.fString);
|
||||
}
|
||||
else
|
||||
datarecord.fString = nil;
|
||||
@ -412,20 +412,20 @@ public:
|
||||
void Write(hsStream * stream, hsResMgr* mgr)
|
||||
{
|
||||
int count;
|
||||
stream->WriteSwap32(fID);
|
||||
stream->WriteSwap32(fValueType);
|
||||
stream->WriteLE32(fID);
|
||||
stream->WriteLE32(fValueType);
|
||||
switch ( fValueType )
|
||||
{
|
||||
case kInt:
|
||||
stream->WriteSwap32(datarecord.fIntNumber);
|
||||
stream->WriteLE32(datarecord.fIntNumber);
|
||||
break;
|
||||
|
||||
case kFloat:
|
||||
stream->WriteSwap(datarecord.fFloatNumber);
|
||||
stream->WriteLE(datarecord.fFloatNumber);
|
||||
break;
|
||||
|
||||
case kBoolean:
|
||||
stream->WriteSwap32(datarecord.fBool);
|
||||
stream->WriteLE32(datarecord.fBool);
|
||||
break;
|
||||
|
||||
case kString:
|
||||
@ -434,9 +434,9 @@ public:
|
||||
count = hsStrlen(datarecord.fString)+1;
|
||||
else
|
||||
count = 0;
|
||||
stream->WriteSwap(count);
|
||||
stream->WriteLE(count);
|
||||
if ( count != 0 )
|
||||
stream->WriteSwap(count,datarecord.fString);
|
||||
stream->WriteLE(count,datarecord.fString);
|
||||
break;
|
||||
|
||||
case kSceneObject:
|
||||
|
Reference in New Issue
Block a user