From 84701dfca3a32029074d1cca341fec9e90bd74e4 Mon Sep 17 00:00:00 2001 From: Botanic Date: Thu, 7 Feb 2013 15:04:28 -0800 Subject: [PATCH] fixed load form and character_cl --- code/nel/include/nel/georges/load_form.h | 2 +- code/ryzom/client/src/character_cl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h index df4f93fb9..6bf6c83c3 100644 --- a/code/nel/include/nel/georges/load_form.h +++ b/code/nel/include/nel/georges/load_form.h @@ -109,7 +109,7 @@ struct TLoadFormDicoEntry } }; */ -const uint32 PACKED_SHEET_HEADER = "PKSH"; +const uint32 PACKED_SHEET_HEADER = 'PKSH'; const uint32 PACKED_SHEET_VERSION = 5; // This Version may be used if you want to use the serialVersion() system in loadForm() const uint32 PACKED_SHEET_VERSION_COMPATIBLE = 0; diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 52bf10cd5..2f947e198 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX) { 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); }