From 051ead7e6e3f73f6a073ae9d2d19b327b9e4ce5c Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 2 Nov 2010 21:50:17 +0100 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/ryzom/client/src/character_cl.cpp | 6 +++--- code/ryzom/client/src/r2/editor.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 8edc071c9..37260665b 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -1406,7 +1406,7 @@ void CCharacterCL::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &gameC // New Behaviour Received. CBehaviour beh(prop); if(verboseVP(this)) - nlinfo("(%05d,%03d) CH::updateVPBeha:%d: '%s(%d)' received.", sint32(T1%100000), NetMngr.getCurrentServerTick(), _Slot, behaviourToString((EBehaviour)beh.Behaviour).c_str(), beh.Behaviour); + nlinfo("(%05d,%03d) CH::updateVPBeha:%d: '%s(%d)' received.", sint32(T1%100000), NetMngr.getCurrentServerTick(), _Slot, behaviourToString((EBehaviour)beh.Behaviour).c_str(), (sint)beh.Behaviour); // Add in right stage. _Stages.addStage(gameCycle, PROPERTY_BEHAVIOUR, prop); @@ -4691,7 +4691,7 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual // INFO : display some debug information. if((VerboseAnimUser && _Slot==0) || (VerboseAnimSelection && _Slot == UserEntity->selection())) - nlinfo("CH:applyBeh:%d: '%d(%s)'", _Slot, behaviour.Behaviour, behaviourToString((EBehaviour)behaviour.Behaviour).c_str()); + nlinfo("CH:applyBeh:%d: '%d(%s)'", _Slot, (sint)behaviour.Behaviour, behaviourToString((EBehaviour)behaviour.Behaviour).c_str()); // ***** Apply the behaviour according to type @@ -8330,7 +8330,7 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) / y += lineStep; } // Skeleton Ptr - TextContext->printfAt(x, y, "Skel Ptr: %p", _Skeleton); + TextContext->printfAt(x, y, "Skel Ptr: %p", &_Skeleton); y += lineStep; // Animset Ptr TextContext->printfAt(x, y, "AnimSet Ptr: %p", _CurrentAnimSet[MOVE]); diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index bb7679f07..b58e9262f 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -7366,7 +7366,7 @@ class CAHR2StopLive : public IActionHandler { // Now we expect to receive an impulsion FAR_TP to mainland, triggered // by the DSS. We'll disobey it by FarTPing to the Edition session instead! - nldebug( "Will return to editing session %u", R2::getEditor().getDMC().getEditionModule().getEditSessionLink() ); + nldebug( "Will return to editing session %u", R2::getEditor().getDMC().getEditionModule().getEditSessionLink().asInt() ); FarTP.hookNextFarTPForEditor(); } // otherwise, let accomplish the FAR_TP to mainland (returnToPreviousSession)