Backed out changeset: 57d8f3733daf

This commit is contained in:
Botanic 2013-02-08 03:08:42 -08:00
parent 2067d66b15
commit ab4b8922a6
16 changed files with 29 additions and 29 deletions

View file

@ -89,8 +89,8 @@ void CAnimation::serial (NLMISC::IStream& f)
nlassert(_IdByChannelId.empty());
// Serial a header
f.serialCheck ((uint32)"_LEN");
f.serialCheck ((uint32)"MINA");
f.serialCheck ((uint32)'_LEN');
f.serialCheck ((uint32)'MINA');
// Serial a version
sint version=f.serialVersion (2);

View file

@ -185,9 +185,9 @@ void CAnimationSet::serial (NLMISC::IStream& f)
nlassert(!_AnimHeaderOptimisation);
// Serial an header
f.serialCheck ((uint32)"_LEN");
f.serialCheck ((uint32)"MINA");
f.serialCheck ((uint32)"TES_");
f.serialCheck ((uint32)'_LEN');
f.serialCheck ((uint32)'MINA');
f.serialCheck ((uint32)'TES_');
// Serial a version
uint ver= f.serialVersion (1);

View file

@ -264,9 +264,9 @@ void CLodCharacterShapeBuild::compile(const std::vector<bool> &triangleSelection
void CLodCharacterShapeBuild::serial(NLMISC::IStream &f)
{
// NEL_CLODBULD
f.serialCheck((uint32)"_LEN");
f.serialCheck((uint32)"DOLC");
f.serialCheck((uint32)"DLUB");
f.serialCheck((uint32)'_LEN');
f.serialCheck((uint32)'DOLC');
f.serialCheck((uint32)'DLUB');
/*
Version 1:
@ -525,9 +525,9 @@ void CLodCharacterShape::CBoneInfluence::serial(NLMISC::IStream &f)
void CLodCharacterShape::serial(NLMISC::IStream &f)
{
// NEL_CLODSHAP
f.serialCheck((uint32)"_LEN");
f.serialCheck((uint32)"DOLC");
f.serialCheck((uint32)"PAHS");
f.serialCheck((uint32)'_LEN');
f.serialCheck((uint32)'DOLC');
f.serialCheck((uint32)'PAHS');
/*
Version 1:

View file

@ -152,7 +152,7 @@ void CPackedWorld::getZones(std::vector<TPackedZoneBaseSPtr> &zones)
void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
{
f.serialVersion(1);
f.serialCheck((uint32) "OWPA");
f.serialCheck((uint32) 'OWPA');
f.serialCont(ZoneNames);
}

View file

@ -73,7 +73,7 @@ CPSLocated::CPSLocated() : /*_MaxNumFaces(0),*/
_ParametricMotion(false),
_TriggerOnDeath(false),
_LastForever(true),
_TriggerID((uint32) "NONE"),
_TriggerID((uint32) 'NONE'),
_NonIntegrableForceNbRefs(0),
_NumIntegrableForceWithDifferentBasis(0)
{

View file

@ -405,7 +405,7 @@ void CInstanceGroup::serial (NLMISC::IStream& f)
* ***********************************************/
// Serial a header
f.serialCheck ((uint32)"TPRG");
f.serialCheck ((uint32)'TPRG');
/*
Version 5:

View file

@ -116,7 +116,7 @@ IShape* CShapeStream::getShapePointer () const
void CShapeStream::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
{
// First, serial an header or checking if it is correct
f.serialCheck ((uint32)"PAHS");
f.serialCheck ((uint32)'PAHS');
// Then, serial the shape
f.serialPolyPtr (_Shape);

View file

@ -60,7 +60,7 @@ void CSkeletonWeight::build (const TNodeArray& array)
void CSkeletonWeight::serial (NLMISC::IStream& f)
{
// Serial a header
f.serialCheck ((uint32)"TWKS");
f.serialCheck ((uint32)'TWKS');
// Serial a version number
(void)f.serialVersion (0);

View file

@ -104,8 +104,8 @@ const sint CTileFarBank::_Version=0x0;
void CTileFarBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
{
// Write/Check "FAR_BANK" in header of the stream
f.serialCheck ((uint32)"_RAF");
f.serialCheck ((uint32)"KNAB");
f.serialCheck ((uint32)'_RAF');
f.serialCheck ((uint32)'KNAB');
// Serial version
(void)f.serialVersion(_Version);

View file

@ -192,10 +192,10 @@ void CVegetableShape::serial(NLMISC::IStream &f)
- BestSidedPreComputeLighting
*/
sint ver= f.serialVersion(1);
f.serialCheck((uint32)"_LEN");
f.serialCheck((uint32)"GEV_");
f.serialCheck((uint32)"BATE");
f.serialCheck((uint32)"__EL");
f.serialCheck((uint32)'_LEN');
f.serialCheck((uint32)'GEV_');
f.serialCheck((uint32)'BATE');
f.serialCheck((uint32)'__EL');
f.serial(Lighted);
f.serial(DoubleSided);

View file

@ -458,7 +458,7 @@ void CZone::serial(NLMISC::IStream &f)
throw EOlderStream(f);
}
f.serialCheck((uint32)"ENOZ");
f.serialCheck((uint32)'ENOZ');
f.xmlSerial (ZoneId, "ZONE_ID");
f.xmlSerial (ZoneBB, "BB");

View file

@ -80,7 +80,7 @@ void CMaterial::serial (NLMISC::IStream &s)
s.xmlPush ("LIGO_MATERIAL");
// Serial the header
s.serialCheck ((uint32)"TMOL");
s.serialCheck ((uint32)'TMOL');
// Serial the version
/*sint ver =*/ s.serialVersion (0);

View file

@ -199,7 +199,7 @@ void CTransition::serial (NLMISC::IStream &s)
s.xmlPush ("LIGO_TRANSITION");
// Serial the header
s.serialCheck ((uint32)"STGL");
s.serialCheck ((uint32)'STGL');
// Serial the version
/*sint ver =*/ s.serialVersion (0);

View file

@ -153,7 +153,7 @@ void CZoneRegion::serial (NLMISC::IStream &f)
f.xmlPush ("LAND");
sint32 version = f.serialVersion (1);
f.serialCheck ((uint32)"DNAL");
f.serialCheck ((uint32)'DNAL');
f.xmlSerial (_MinX, "MIN_X");
f.xmlSerial (_MinY, "MIN_Y");

View file

@ -85,7 +85,7 @@ void CPrimitiveBlock::serial (NLMISC::IStream &s)
s.xmlPush ("PRIMITIVE_BLOCK");
// Serial checks
s.serialCheck ((uint32)"KBRP");
s.serialCheck ((uint32)'KBRP');
// Serial the version
(void)s.serialVersion (0);

View file

@ -341,8 +341,8 @@ private:
void serial(NLMISC::IStream &f)
{
f.serialCheck((uint32)"_RTS");
f.serialCheck((uint32)"KCAP");
f.serialCheck((uint32)'_RTS');
f.serialCheck((uint32)'KCAP');
f.serialVersion(0);
f.serial(PackedVersion);
f.serial(LanguageCode);