diff --git a/code/nel/src/3d/animation.cpp b/code/nel/src/3d/animation.cpp index 8cd51cc46..9cfd3f26b 100644 --- a/code/nel/src/3d/animation.cpp +++ b/code/nel/src/3d/animation.cpp @@ -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); diff --git a/code/nel/src/3d/animation_set.cpp b/code/nel/src/3d/animation_set.cpp index 79f59b565..94946799b 100644 --- a/code/nel/src/3d/animation_set.cpp +++ b/code/nel/src/3d/animation_set.cpp @@ -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); diff --git a/code/nel/src/3d/lod_character_shape.cpp b/code/nel/src/3d/lod_character_shape.cpp index 24e87baa8..09aded766 100644 --- a/code/nel/src/3d/lod_character_shape.cpp +++ b/code/nel/src/3d/lod_character_shape.cpp @@ -264,9 +264,9 @@ void CLodCharacterShapeBuild::compile(const std::vector &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: diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp index db86191b4..64b669fc4 100644 --- a/code/nel/src/3d/packed_world.cpp +++ b/code/nel/src/3d/packed_world.cpp @@ -152,7 +152,7 @@ void CPackedWorld::getZones(std::vector &zones) void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialVersion(1); - f.serialCheck((uint32) "OWPA"); + f.serialCheck((uint32) 'OWPA'); f.serialCont(ZoneNames); } diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp index 668db58a1..f066b6f3c 100644 --- a/code/nel/src/3d/ps_located.cpp +++ b/code/nel/src/3d/ps_located.cpp @@ -73,7 +73,7 @@ CPSLocated::CPSLocated() : /*_MaxNumFaces(0),*/ _ParametricMotion(false), _TriggerOnDeath(false), _LastForever(true), - _TriggerID((uint32) "NONE"), + _TriggerID((uint32) 'NONE'), _NonIntegrableForceNbRefs(0), _NumIntegrableForceWithDifferentBasis(0) { diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp index e9f98ab04..7cfa56b02 100644 --- a/code/nel/src/3d/scene_group.cpp +++ b/code/nel/src/3d/scene_group.cpp @@ -405,7 +405,7 @@ void CInstanceGroup::serial (NLMISC::IStream& f) * ***********************************************/ // Serial a header - f.serialCheck ((uint32)"TPRG"); + f.serialCheck ((uint32)'TPRG'); /* Version 5: diff --git a/code/nel/src/3d/shape.cpp b/code/nel/src/3d/shape.cpp index dbb099b64..adc610827 100644 --- a/code/nel/src/3d/shape.cpp +++ b/code/nel/src/3d/shape.cpp @@ -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); diff --git a/code/nel/src/3d/skeleton_weight.cpp b/code/nel/src/3d/skeleton_weight.cpp index e5962b66d..4668a005a 100644 --- a/code/nel/src/3d/skeleton_weight.cpp +++ b/code/nel/src/3d/skeleton_weight.cpp @@ -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); diff --git a/code/nel/src/3d/tile_far_bank.cpp b/code/nel/src/3d/tile_far_bank.cpp index 4aa95f872..75a758560 100644 --- a/code/nel/src/3d/tile_far_bank.cpp +++ b/code/nel/src/3d/tile_far_bank.cpp @@ -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); diff --git a/code/nel/src/3d/vegetable_shape.cpp b/code/nel/src/3d/vegetable_shape.cpp index f10591bf9..0b8697d63 100644 --- a/code/nel/src/3d/vegetable_shape.cpp +++ b/code/nel/src/3d/vegetable_shape.cpp @@ -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); diff --git a/code/nel/src/3d/zone.cpp b/code/nel/src/3d/zone.cpp index 5b923af56..4acca80f5 100644 --- a/code/nel/src/3d/zone.cpp +++ b/code/nel/src/3d/zone.cpp @@ -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"); diff --git a/code/nel/src/ligo/ligo_material.cpp b/code/nel/src/ligo/ligo_material.cpp index a51dd3171..643629648 100644 --- a/code/nel/src/ligo/ligo_material.cpp +++ b/code/nel/src/ligo/ligo_material.cpp @@ -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); diff --git a/code/nel/src/ligo/transition.cpp b/code/nel/src/ligo/transition.cpp index 4b90c9078..b13c4f566 100644 --- a/code/nel/src/ligo/transition.cpp +++ b/code/nel/src/ligo/transition.cpp @@ -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); diff --git a/code/nel/src/ligo/zone_region.cpp b/code/nel/src/ligo/zone_region.cpp index 71f4c06c2..ad65aec8e 100644 --- a/code/nel/src/ligo/zone_region.cpp +++ b/code/nel/src/ligo/zone_region.cpp @@ -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"); diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/code/nel/src/pacs/primitive_block_pacs.cpp index 14dd2764b..0681d2eea 100644 --- a/code/nel/src/pacs/primitive_block_pacs.cpp +++ b/code/nel/src/pacs/primitive_block_pacs.cpp @@ -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); diff --git a/code/ryzom/client/src/string_manager_client.h b/code/ryzom/client/src/string_manager_client.h index 7be20d5bb..89e05acd0 100644 --- a/code/ryzom/client/src/string_manager_client.h +++ b/code/ryzom/client/src/string_manager_client.h @@ -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);