Changed: #825 Remove all warning when compiling Ryzom on Linux
This commit is contained in:
parent
929f5a3b8d
commit
1f1981e0ad
19 changed files with 49 additions and 34 deletions
|
@ -1396,7 +1396,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(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(), beh.Behaviour);
|
||||||
|
|
||||||
// Add in right stage.
|
// Add in right stage.
|
||||||
_Stages.addStage(gameCycle, PROPERTY_BEHAVIOUR, prop);
|
_Stages.addStage(gameCycle, PROPERTY_BEHAVIOUR, prop);
|
||||||
|
@ -2219,7 +2219,11 @@ void CCharacterCL::endAnimTransition()
|
||||||
// If the animation is a rotation, set the character direction he should have at the end of the animation.
|
// If the animation is a rotation, set the character direction he should have at the end of the animation.
|
||||||
if(_CurrentState->Rotation)
|
if(_CurrentState->Rotation)
|
||||||
{
|
{
|
||||||
if(isUser()) nldebug("<CCharacterCL::endAnimTransition> rotation : set dir as end anim dir");
|
if(isUser())
|
||||||
|
{
|
||||||
|
nldebug("<CCharacterCL::endAnimTransition> rotation : set dir as end anim dir");
|
||||||
|
}
|
||||||
|
|
||||||
dir(dirEndAnim());
|
dir(dirEndAnim());
|
||||||
}
|
}
|
||||||
// Fit the current direction to the target when attacking.
|
// Fit the current direction to the target when attacking.
|
||||||
|
@ -4173,6 +4177,8 @@ void CCharacterCL::performCurrentAttackEnd(const CBehaviourContext &bc, bool dir
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if object has a list of cast rays, then we assume it is a static object (like guard towers)
|
// if object has a list of cast rays, then we assume it is a static object (like guard towers)
|
||||||
|
@ -4671,7 +4677,7 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual
|
||||||
|
|
||||||
// INFO : display some debug informations.
|
// INFO : display some debug informations.
|
||||||
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(behaviour.Behaviour).c_str());
|
nlinfo("CH:applyBeh:%d: '%d(%s)'", _Slot, behaviour.Behaviour, behaviourToString((EBehaviour)behaviour.Behaviour).c_str());
|
||||||
|
|
||||||
|
|
||||||
// ***** Apply the behaviour according to type
|
// ***** Apply the behaviour according to type
|
||||||
|
@ -4730,6 +4736,8 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual
|
||||||
case MBEHAV::CAST_MIX_LINK:
|
case MBEHAV::CAST_MIX_LINK:
|
||||||
endCast(behaviour, previousBehaviour);
|
endCast(behaviour, previousBehaviour);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
// DeltaHP
|
// DeltaHP
|
||||||
applyBehaviourFlyingHPs(bc, behaviour, targetHitDates);
|
applyBehaviourFlyingHPs(bc, behaviour, targetHitDates);
|
||||||
|
@ -6668,7 +6676,9 @@ ADD_METHOD(void CCharacterCL::updatePos(const TTime ¤tTimeInMs, CEntityCL
|
||||||
// Else : There is no move.
|
// Else : There is no move.
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
CHECK(posInStage==false && dist2Dest()<=0.0);
|
CHECK(posInStage==false && dist2Dest()<=0.0);
|
||||||
|
}
|
||||||
|
|
||||||
// If there is no position in the next stage and the stage should be done already.
|
// If there is no position in the next stage and the stage should be done already.
|
||||||
if(!_Stages._StageSet.empty() && !posInStage && !stageReach && !allToFirstPos && ((_LastFrameTime+loopTimeStep) >= stageTime))
|
if(!_Stages._StageSet.empty() && !posInStage && !stageReach && !allToFirstPos && ((_LastFrameTime+loopTimeStep) >= stageTime))
|
||||||
|
@ -6682,7 +6692,7 @@ ADD_METHOD(void CCharacterCL::updatePos(const TTime ¤tTimeInMs, CEntityCL
|
||||||
if(loopTimeStep < 0.0)
|
if(loopTimeStep < 0.0)
|
||||||
loopTimeStep = 0.0;
|
loopTimeStep = 0.0;
|
||||||
//
|
//
|
||||||
// \todo GUIGUI : ajuster le timeOffset comme on arrete la boucle avant l'heure
|
// \todo GUIGUI : adjust timeOffset, because we stopped the loop before
|
||||||
//
|
//
|
||||||
// Stage complete.
|
// Stage complete.
|
||||||
stageReach = true;
|
stageReach = true;
|
||||||
|
|
|
@ -139,7 +139,10 @@ void CSeasonFXSheet::build(const NLGEORGES::UFormElm &item, NLMISC::CSheetId par
|
||||||
NLMISC::clamp(MinDuration, 0.f, CycleDuration /*- startHourMaxInterval*/);
|
NLMISC::clamp(MinDuration, 0.f, CycleDuration /*- startHourMaxInterval*/);
|
||||||
NLMISC::clamp(MaxDuration, 0.f, CycleDuration /*- startHourMaxInterval*/);
|
NLMISC::clamp(MaxDuration, 0.f, CycleDuration /*- startHourMaxInterval*/);
|
||||||
|
|
||||||
if (!ok) nldebug("Key not found.");
|
if (!ok)
|
||||||
|
{
|
||||||
|
nldebug("Key not found.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//=======================================================
|
//=======================================================
|
||||||
|
@ -210,10 +213,11 @@ void CPlantSheet::build(const NLGEORGES::UFormElm &item)
|
||||||
{
|
{
|
||||||
if(!(item.getValueByName(_ShapeName, "3D.Shape") &&
|
if(!(item.getValueByName(_ShapeName, "3D.Shape") &&
|
||||||
item.getValueByName(_MaxDist, "3D.MaxDist") &&
|
item.getValueByName(_MaxDist, "3D.MaxDist") &&
|
||||||
item.getValueByName(_CoarseMeshDist, "3D.CoarseMeshDist")
|
item.getValueByName(_CoarseMeshDist, "3D.CoarseMeshDist")))
|
||||||
)
|
{
|
||||||
)
|
nldebug("Key not found.");
|
||||||
nldebug("Key not found.");
|
}
|
||||||
|
|
||||||
// serial fxs by season
|
// serial fxs by season
|
||||||
SeasonFX[EGSPD::CSeason::Spring].build(item, Id, "3D.SpringFX.");
|
SeasonFX[EGSPD::CSeason::Spring].build(item, Id, "3D.SpringFX.");
|
||||||
SeasonFX[EGSPD::CSeason::Summer].build(item, Id, "3D.SummerFX.");
|
SeasonFX[EGSPD::CSeason::Summer].build(item, Id, "3D.SummerFX.");
|
||||||
|
|
|
@ -890,7 +890,7 @@ NLMISC_COMMAND(db, "Modify Database","<Property> <Value>")
|
||||||
static bool talkInChan(uint32 nb,std::vector<std::string>args)
|
static bool talkInChan(uint32 nb,std::vector<std::string>args)
|
||||||
{
|
{
|
||||||
uint32 maxChans = CChatGroup::MaxDynChanPerPlayer;
|
uint32 maxChans = CChatGroup::MaxDynChanPerPlayer;
|
||||||
if (nb<0||nb>=maxChans)
|
if (nb>=maxChans)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct CChatWindowDesc
|
||||||
ucstring Title; // unique title for the window
|
ucstring Title; // unique title for the window
|
||||||
std::string FatherContainer; // name of the father container. If empty, the chat box must be added manually in the hierarchy
|
std::string FatherContainer; // name of the father container. If empty, the chat box must be added manually in the hierarchy
|
||||||
std::string ChatTemplate; // Template for the chat interface, or "" to use the default one
|
std::string ChatTemplate; // Template for the chat interface, or "" to use the default one
|
||||||
TTemplateParams ChatTemplateParams; // optional tempalte parameters
|
TTemplateParams ChatTemplateParams; // optional template parameters
|
||||||
sint InsertPosition; // [optional] -1 if the chat box should be inserted at the end of the container list, or the index otherwise
|
sint InsertPosition; // [optional] -1 if the chat box should be inserted at the end of the container list, or the index otherwise
|
||||||
bool ParentBlink; // [optional] when true, make the parent group blink
|
bool ParentBlink; // [optional] when true, make the parent group blink
|
||||||
bool Savable; // should the position of the chat box be saved between session ? Default is false
|
bool Savable; // should the position of the chat box be saved between session ? Default is false
|
||||||
|
|
|
@ -2475,13 +2475,12 @@ void CGroupHTML::setTitle (const ucstring &title)
|
||||||
CInterfaceElement *parent = getParent();
|
CInterfaceElement *parent = getParent();
|
||||||
if (parent)
|
if (parent)
|
||||||
{
|
{
|
||||||
if (parent = parent->getParent())
|
parent = parent->getParent();
|
||||||
|
|
||||||
|
CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
|
||||||
|
if (container)
|
||||||
{
|
{
|
||||||
CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
|
container->setUCTitle (title);
|
||||||
if (container)
|
|
||||||
{
|
|
||||||
container->setUCTitle (title);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ class CNPCMissionGiverDesc
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
CNPCMissionGiverDesc() : _MissionGiverState(NPC_ICON::AwaitingFirstData), _IsDescTransient(true), _HasChanged(false)
|
CNPCMissionGiverDesc() : _MissionGiverState(NPC_ICON::AwaitingFirstData), _LastUpdateTimestamp(0), _IsDescTransient(true), _HasChanged(false)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// Current assignment operator: bitwise copy
|
// Current assignment operator: bitwise copy
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
#include "../../far_tp.h"
|
#include "../../far_tp.h"
|
||||||
#include "../../net_manager.h"
|
#include "../../net_manager.h"
|
||||||
|
|
||||||
#include "zlib.h"
|
#include <zlib.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -220,10 +220,16 @@ void releaseMainLoopReselect()
|
||||||
|
|
||||||
// Remove all entities.
|
// Remove all entities.
|
||||||
if (Driver)
|
if (Driver)
|
||||||
|
{
|
||||||
nldebug("RCSR1: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
nldebug("RCSR1: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
||||||
|
}
|
||||||
|
|
||||||
EntitiesMngr.release();
|
EntitiesMngr.release();
|
||||||
|
|
||||||
if (Driver)
|
if (Driver)
|
||||||
|
{
|
||||||
nldebug("RCSR2: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
nldebug("RCSR2: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
||||||
|
}
|
||||||
|
|
||||||
// Reset Fx manager (must be done after EntitiesMngr.release()) Important because may still point to 3D elements
|
// Reset Fx manager (must be done after EntitiesMngr.release()) Important because may still point to 3D elements
|
||||||
FXMngr.reset();
|
FXMngr.reset();
|
||||||
|
@ -266,11 +272,17 @@ void releaseMainLoopReselect()
|
||||||
// Release the Entities Animation Manager (Yoyo: fuckingly important because keep a pointer
|
// Release the Entities Animation Manager (Yoyo: fuckingly important because keep a pointer
|
||||||
// on a _PlayListManager that is created from Scene)
|
// on a _PlayListManager that is created from Scene)
|
||||||
if (Driver)
|
if (Driver)
|
||||||
|
{
|
||||||
nldebug("RCSR3: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
nldebug("RCSR3: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
||||||
|
}
|
||||||
|
|
||||||
CEntityAnimationManager::delInstance();
|
CEntityAnimationManager::delInstance();
|
||||||
EAM= NULL;
|
EAM= NULL;
|
||||||
|
|
||||||
if (Driver)
|
if (Driver)
|
||||||
|
{
|
||||||
nldebug("RCSR4: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
nldebug("RCSR4: %u textures", Driver->getTotalAsyncTextureSizeAsked());
|
||||||
|
}
|
||||||
|
|
||||||
// Not necessary I think because owns only static data (string + function ptrs)
|
// Not necessary I think because owns only static data (string + function ptrs)
|
||||||
// --releaseContextualCursor();
|
// --releaseContextualCursor();
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
/* 7zAlloc.c */
|
/* 7zAlloc.c */
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "7zAlloc.h"
|
#include "7zAlloc.h"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
/* 7zBuffer.c */
|
/* 7zBuffer.c */
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
|
|
||||||
#include "7zBuffer.h"
|
#include "7zBuffer.h"
|
||||||
#include "7zAlloc.h"
|
#include "7zAlloc.h"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
/* 7zCrc.c */
|
/* 7zCrc.c */
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
#include "7zCrc.h"
|
#include "7zCrc.h"
|
||||||
|
|
||||||
#define kCrcPoly 0xEDB88320
|
#define kCrcPoly 0xEDB88320
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
#ifndef __COMMON_TYPES_H
|
#ifndef __COMMON_TYPES_H
|
||||||
#define __COMMON_TYPES_H
|
#define __COMMON_TYPES_H
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
|
|
||||||
#ifndef _7ZIP_BYTE_DEFINED
|
#ifndef _7ZIP_BYTE_DEFINED
|
||||||
#define _7ZIP_BYTE_DEFINED
|
#define _7ZIP_BYTE_DEFINED
|
||||||
typedef unsigned char Byte;
|
typedef unsigned char Byte;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
/* LzmaRamDecode.c */
|
/* LzmaRamDecode.c */
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
#include "LzmaRamDecode.h"
|
#include "LzmaRamDecode.h"
|
||||||
#ifdef _SZ_ONE_DIRECTORY
|
#ifdef _SZ_ONE_DIRECTORY
|
||||||
#include "LzmaDecode.h"
|
#include "LzmaDecode.h"
|
||||||
|
|
|
@ -10,8 +10,6 @@ This file is part of LZMA SDK 4.40 (2006-05-01)
|
||||||
#ifndef __LZMATYPES_H
|
#ifndef __LZMATYPES_H
|
||||||
#define __LZMATYPES_H
|
#define __LZMATYPES_H
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
|
||||||
|
|
||||||
#ifndef _7ZIP_BYTE_DEFINED
|
#ifndef _7ZIP_BYTE_DEFINED
|
||||||
#define _7ZIP_BYTE_DEFINED
|
#define _7ZIP_BYTE_DEFINED
|
||||||
typedef unsigned char Byte;
|
typedef unsigned char Byte;
|
||||||
|
|
|
@ -85,7 +85,7 @@ private:
|
||||||
void CGenericRequestIdRegister::pushRequestId(uint32 requestId,const std::string& fileName)
|
void CGenericRequestIdRegister::pushRequestId(uint32 requestId,const std::string& fileName)
|
||||||
{
|
{
|
||||||
// check for out of order entries in the request list
|
// check for out of order entries in the request list
|
||||||
BOMB_IF(!_RequestIds.empty() && uint32(requestId-_RequestIds.back().RequestId)<0,"Ignoring out of order request id in generic callback registration for file "+CSString(fileName).quote(),return);
|
BOMB_IF(!_RequestIds.empty() && ((sint32)requestId-(sint32)_RequestIds.back().RequestId)<0,"Ignoring out of order request id in generic callback registration for file "+CSString(fileName).quote(),return);
|
||||||
|
|
||||||
// setup a new record for this request id / file name pair
|
// setup a new record for this request id / file name pair
|
||||||
SRequestId theNewRequestId;
|
SRequestId theNewRequestId;
|
||||||
|
|
|
@ -174,7 +174,7 @@ uint32 CBackupInterfaceSingleton::pushGenericAckCallback(NLMISC::CSmartPtr<IBack
|
||||||
++_Counter;
|
++_Counter;
|
||||||
if (!_GenericResponses.empty())
|
if (!_GenericResponses.empty())
|
||||||
{
|
{
|
||||||
nlassert((_GenericResponses.front().first-requestId)<0);
|
nlassert(((sint32)_GenericResponses.front().first-(sint32)requestId)<0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we have no callback then just return the generated request Id...
|
// if we have no callback then just return the generated request Id...
|
||||||
|
|
|
@ -46,7 +46,7 @@ static std::string pactTypeStrings[]=
|
||||||
|
|
||||||
const std::string& toString (EPactNature pactNature)
|
const std::string& toString (EPactNature pactNature)
|
||||||
{
|
{
|
||||||
if (pactNature >= sizeof(pactNatureStrings)/sizeof(string) )
|
if ((uint)pactNature >= sizeof(pactNatureStrings)/sizeof(string) )
|
||||||
{
|
{
|
||||||
nlwarning("<toString (EPactNature pactNature) : invalid pact nature %d",pactNature);
|
nlwarning("<toString (EPactNature pactNature) : invalid pact nature %d",pactNature);
|
||||||
return pactNatureStrings[(uint)Unknown];
|
return pactNatureStrings[(uint)Unknown];
|
||||||
|
@ -56,7 +56,7 @@ const std::string& toString (EPactNature pactNature)
|
||||||
|
|
||||||
const std::string& toString (EPactType pactType)
|
const std::string& toString (EPactType pactType)
|
||||||
{
|
{
|
||||||
if (pactType >= sizeof(pactTypeStrings)/sizeof(string) )
|
if ((uint)pactType >= sizeof(pactTypeStrings)/sizeof(string) )
|
||||||
{
|
{
|
||||||
nlwarning("<toString (EPactType pactType) : invalid pact type %d",pactType);
|
nlwarning("<toString (EPactType pactType) : invalid pact type %d",pactType);
|
||||||
return pactTypeStrings[(uint)UnknownType];
|
return pactTypeStrings[(uint)UnknownType];
|
||||||
|
|
|
@ -962,7 +962,7 @@ bool CPersistentDataRecord::fromXML(const std::string& s)
|
||||||
// we have a buffer of xml-like blocks so we're going to start by chunking it up (from the back)
|
// we have a buffer of xml-like blocks so we're going to start by chunking it up (from the back)
|
||||||
vector<CSString> clauses;
|
vector<CSString> clauses;
|
||||||
bool clauseOpen=false;
|
bool clauseOpen=false;
|
||||||
uint32 clauseEnd;
|
uint32 clauseEnd = 0;
|
||||||
for (uint32 i=len;i--;)
|
for (uint32 i=len;i--;)
|
||||||
{
|
{
|
||||||
switch(buff[i])
|
switch(buff[i])
|
||||||
|
|
Loading…
Reference in a new issue