Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed warning: multi-character character constant [-Wmultichar]

Browse source
This commit is contained in:
Botanic 2013-02-07 12:19:00 -08:00
parent 08176389af
commit cd9f2aa238
19 changed files with 80 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/georges/load_form.h
View file

@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
} }
}; };
*/ */
const uint32 PACKED_SHEET_HEADER = 'PKSH'; const uint32 PACKED_SHEET_HEADER = "PKSH";
const uint32 PACKED_SHEET_VERSION = 5; const uint32 PACKED_SHEET_VERSION = 5;
// This Version may be used if you want to use the serialVersion() system in loadForm() // This Version may be used if you want to use the serialVersion() system in loadForm()
const uint32 PACKED_SHEET_VERSION_COMPATIBLE = 0; const uint32 PACKED_SHEET_VERSION_COMPATIBLE = 0;

4
code/nel/src/3d/animation.cpp
View file

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

6
code/nel/src/3d/animation_set.cpp
View file

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

12
code/nel/src/3d/lod_character_shape.cpp
View file

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

2
code/nel/src/3d/packed_world.cpp
View file

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

2
code/nel/src/3d/ps_located.cpp
View file

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

2
code/nel/src/3d/scene_group.cpp
View file

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

2
code/nel/src/3d/shape.cpp
View file

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

2
code/nel/src/3d/skeleton_weight.cpp
View file

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

4
code/nel/src/3d/tile_far_bank.cpp
View file

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

8
code/nel/src/3d/vegetable_shape.cpp
View file

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

98
code/nel/src/3d/vertex_program_parse.cpp
View file

@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
} }
switch (strValue) switch (strValue)
{ {
case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break; case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break; case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break; case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break;
case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break; case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break; case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break; case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
// texture argument // texture argument
case 'TEX0': case "TEX0":
case 'TEX1': case "TEX1":
case 'TEX2': case "TEX2":
case 'TEX3': case "TEX3":
case 'TEX4': case "TEX4":
case 'TEX5': case "TEX5":
case 'TEX6': case "TEX6":
case 'TEX7': case "TEX7":
operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0'); operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
break; break;
default: default:
@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
// convert to enum // convert to enum
switch(strValue) switch(strValue)
{ {
case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break; case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break; case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break; case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break; case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break; case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break; case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break; case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break; case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break; case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break; case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break; case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break; case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break; case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break; case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break; case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
default: default:
errorOutput = "Can't read index for output register."; errorOutput = "Can't read index for output register.";
return false; return false;
@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
switch (instrStr) switch (instrStr)
{ {
case 'ARL ': case "ARL ":
instr.Opcode = CVPInstruction::ARL; instr.Opcode = CVPInstruction::ARL;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
} }
break; break;
case 'RSQ ': case "RSQ ":
instr.Opcode = CVPInstruction::RSQ; instr.Opcode = CVPInstruction::RSQ;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
} }
break; break;
case 'EXP ': case "EXP ":
case 'EXPP': case "EXPP":
instr.Opcode = CVPInstruction::EXPP; instr.Opcode = CVPInstruction::EXPP;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
}*/ }*/
break; break;
case 'LOG ': case "LOG ":
instr.Opcode = CVPInstruction::LOG; instr.Opcode = CVPInstruction::LOG;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
*/ */
break; break;
case 'RCP ': case "RCP ":
instr.Opcode = CVPInstruction::RCP; instr.Opcode = CVPInstruction::RCP;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
break; break;
///////////////// /////////////////
case 'MOV ': case "MOV ":
instr.Opcode = CVPInstruction::MOV; instr.Opcode = CVPInstruction::MOV;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
break; break;
case 'LIT ': case "LIT ":
instr.Opcode = CVPInstruction::LIT; instr.Opcode = CVPInstruction::LIT;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case 'MAD ': case "MAD ":
instr.Opcode = CVPInstruction::MAD; instr.Opcode = CVPInstruction::MAD;
if (!parseOp4(instr, errorOutput)) return false; if (!parseOp4(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case 'ADD ': case "ADD ":
instr.Opcode = CVPInstruction::ADD; instr.Opcode = CVPInstruction::ADD;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case 'MUL ': case "MUL ":
instr.Opcode = CVPInstruction::MUL; instr.Opcode = CVPInstruction::MUL;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'DP3 ': case "DP3 ":
instr.Opcode = CVPInstruction::DP3; instr.Opcode = CVPInstruction::DP3;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'DP4 ': case "DP4 ":
instr.Opcode = CVPInstruction::DP4; instr.Opcode = CVPInstruction::DP4;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'DST ': case "DST ":
instr.Opcode = CVPInstruction::DST; instr.Opcode = CVPInstruction::DST;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'MIN ': case "MIN ":
instr.Opcode = CVPInstruction::MIN; instr.Opcode = CVPInstruction::MIN;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'MAX ': case "MAX ":
instr.Opcode = CVPInstruction::MAX; instr.Opcode = CVPInstruction::MAX;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'SLT ': case "SLT ":
instr.Opcode = CVPInstruction::SLT; instr.Opcode = CVPInstruction::SLT;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case 'SGE ': case "SGE ":
instr.Opcode = CVPInstruction::SGE; instr.Opcode = CVPInstruction::SGE;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case 'END ': case "END ":
endEncountered = true; endEncountered = true;
return true; return true;
break; break;
@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
// it is not allowed to write to an adress register except for ARL // it is not allowed to write to an adress register except for ARL
if (instrStr != 'ARL ') if (instrStr != "ARL ")
{ {
if (instr.Dest.Type == CVPOperand::AddressRegister) if (instr.Dest.Type == CVPOperand::AddressRegister)
{ {

2
code/nel/src/3d/zone.cpp
View file

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

2
code/nel/src/ligo/ligo_material.cpp
View file

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

2
code/nel/src/ligo/transition.cpp
View file

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

2
code/nel/src/ligo/zone_region.cpp
View file

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

2
code/nel/src/pacs/primitive_block_pacs.cpp
View file

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

2
code/ryzom/client/src/character_cl.cpp
View file

@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
{ {
if(!(*tmpItAttached)->FX.empty()) if(!(*tmpItAttached)->FX.empty())
{ {
if (!(*tmpItAttached)->FX.removeByID('STOP') && !(*tmpItAttached)->FX.removeByID('main')) if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main"))
{ {
(*tmpItAttached)->FX.activateEmitters(false); (*tmpItAttached)->FX.activateEmitters(false);
} }

4
code/ryzom/client/src/string_manager_client.h
View file

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