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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-11-02 21:50:17 +01:00
parent 243b0c5b3b
commit 7ee01e1f2c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1406,7 +1406,7 @@ void CCharacterCL::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &gameC
// New Behaviour Received. // New Behaviour Received.
CBehaviour beh(prop); CBehaviour beh(prop);
if(verboseVP(this)) 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. // Add in right stage.
_Stages.addStage(gameCycle, PROPERTY_BEHAVIOUR, prop); _Stages.addStage(gameCycle, PROPERTY_BEHAVIOUR, prop);
@ -4691,7 +4691,7 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual
// INFO : display some debug information. // INFO : display some debug information.
if((VerboseAnimUser && _Slot==0) || (VerboseAnimSelection && _Slot == UserEntity->selection())) 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 // ***** Apply the behaviour according to type
@ -8330,7 +8330,7 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) /
y += lineStep; y += lineStep;
} }
// Skeleton Ptr // Skeleton Ptr
TextContext->printfAt(x, y, "Skel Ptr: %p", _Skeleton); TextContext->printfAt(x, y, "Skel Ptr: %p", &_Skeleton);
y += lineStep; y += lineStep;
// Animset Ptr // Animset Ptr
TextContext->printfAt(x, y, "AnimSet Ptr: %p", _CurrentAnimSet[MOVE]); TextContext->printfAt(x, y, "AnimSet Ptr: %p", _CurrentAnimSet[MOVE]);

2
code/ryzom/client/src/r2/editor.cpp
View file

@ -7366,7 +7366,7 @@ class CAHR2StopLive : public IActionHandler
{ {
// Now we expect to receive an impulsion FAR_TP to mainland, triggered // 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! // 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(); FarTP.hookNextFarTPForEditor();
} }
// otherwise, let accomplish the FAR_TP to mainland (returnToPreviousSession) // otherwise, let accomplish the FAR_TP to mainland (returnToPreviousSession)