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 on Linux

Browse source
This commit is contained in:
kervala 2010-06-11 11:20:51 +02:00
parent ba7a439778
commit 4515147593
12 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2291,6 +2291,8 @@ void CCharacterCL::endAnimTransition()
dir(front());
*/
break;
default:
break;
}
// Change the current mode.
if ( _ModeWanted != MBEHAV::UNKNOWN_MODE )
@ -2658,6 +2660,8 @@ KeyChosen:
else
nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnMoveRight '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnMoveRight).c_str());
break;
default:
break;
}
// On Rotation/About Face
@ -2684,6 +2688,8 @@ KeyChosen:
else
nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnRightRotation '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnRightRotation).c_str());
break;
default:
break;
}
// Max Loop
@ -2729,6 +2735,8 @@ KeyChosen:
else
nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnBigBendRight '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnBigBendRight).c_str());
break;
default:
break;
}
// If the animation change according to a high speed and speed high enough or oo.
@ -3084,6 +3092,7 @@ KeyChosen:
case MAGICFX::CastLoop: afs = &_CurrentAttack->AttackLoopFX; break;
case MAGICFX::CastEnd: afs = &_CurrentAttack->AttackEndFX; break;
case MAGICFX::CastFail: afs = &_CurrentAttack->AttackFailFX; break;
default: break;
}
playCastFX(afs, _CurrentAttackInfo.Intensity);
}
@ -3444,6 +3453,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
case OnMoveRight:
setAnim(_CurrentState->OnMoveRight);
return;
default:
break;
}
// ON ROTATION
@ -3458,6 +3469,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
case OnRotRight:
setAnim(CAnimationStateSheet::Idle);
return;
default:
break;
}
// ON BAD HEADING
@ -3475,6 +3488,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
case OnBendRight:
setAnim(_CurrentState->MoveState);
return;
default:
break;
}
// \todo GUIGUI : changer de place cette partie je pense.
@ -3640,6 +3655,8 @@ void CCharacterCL::beginCast(const MBEHAV::CBehaviour &behaviour)
case MBEHAV::CAST_STUN:
setAnim(CAnimationStateSheet::StunCastInit);
break;
default:
break;
}
}// beginCast //
@ -3746,6 +3763,8 @@ void CCharacterCL::endCast(const MBEHAV::CBehaviour &behaviour, const MBEHAV::CB
case MBEHAV::CAST_MIX_LINK:
setAnim(CAnimationStateSheet::MixedCastLink);
break;
default:
break;
}
}
break;
@ -4443,8 +4462,9 @@ bool CCharacterCL::isCurrentBehaviourAttackEnd() const
case MBEHAV::POWERFUL_ATTACK:
case MBEHAV::AREA_ATTACK:
return true;
default:
return false;
}
return false;
}
@ -4627,6 +4647,8 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual
case RANGE_ATTACK:
combatAnimState= CAnimationStateSheet::Attack1;
break;
default:
break;
}
}
}
@ -9151,6 +9173,8 @@ void CCharacterCL::CWornItem::startAttackFX(NL3D::USkeleton skeleton, uint inten
else
stickPoint = "box_arme_gauche";
break;
default:
break;
}
}
if (stickPoint)

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

@ -233,7 +233,7 @@ public:
void sheetId(const NLMISC::CSheetId &id) {_SheetId = id;}
/// Return the persistent NPC alias of entity (0 if N/A).
const uint32 npcAlias() const {return _NPCAlias; }
uint32 npcAlias() const {return _NPCAlias; }
/// Set the persistent NPC alias of the entity.
void npcAlias(uint32 alias) {_NPCAlias = alias; }
@ -411,7 +411,7 @@ public:
/// Return the entity current behaviour.
const MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
/**
* Show or Hide the entity.

2
code/ryzom/client/src/interface_v3/action_handler_item.cpp
View file

@ -167,7 +167,7 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
// ********************************************************************************************
void CInterfaceItemEdition::CItemEditionWindow::update()
{
if(_CurrItemSheet && (ItemSheet != _CurrItemSheet->getSheetId()))
if(_CurrItemSheet && ((sint32)ItemSheet != _CurrItemSheet->getSheetId()))
{
end();
}

4
code/ryzom/client/src/interface_v3/chat_filter.h
View file

@ -81,7 +81,7 @@ private:
virtual void chatWindowRemoved(CChatWindow *cw);
//
// copy not supported
CChatInputFilter(const CChatInputFilter &/* other */) { nlassert(0); }
CChatInputFilter(const CChatInputFilter &/* other */):NLMISC::CRefCount() { nlassert(0); }
CChatInputFilter &operator=(const CChatInputFilter &/* other */) { nlassert(0); return *this; }
};
@ -157,7 +157,7 @@ private:
void chatWindowRemoved(CChatWindow *cw);
void msgEntered(const ucstring &msg, CChatWindow *chatWindow);
// copy not supported
CChatTargetFilter(const CChatTargetFilter &/* other */) { nlassert(0); }
CChatTargetFilter(const CChatTargetFilter &/* other */):NLMISC::CRefCount() { nlassert(0); }
CChatTargetFilter& operator=(const CChatTargetFilter &/* other */) { nlassert(0); return *this; }
};

4
code/ryzom/client/src/interface_v3/group_compas.cpp
View file

@ -230,7 +230,7 @@ void CGroupCompas::draw()
//
const NLMISC::CVectorD &userPosD = UserEntity->pos();
NLMISC::CVector userPos((float) userPosD.x, (float) userPosD.y, (float) userPosD.z);
NLMISC::CVector2f targetPos;
NLMISC::CVector2f targetPos(0.f, 0.f);
// if a position tracker is provided, use it
CCompassTarget displayedTarget = _Target;
@ -807,7 +807,7 @@ void CGroupCompasMenu::setActive (bool state)
uint nbUserLandMarks = std::min( uint(currCont->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks() );
for(k = 0; k < nbUserLandMarks; ++k)
{
if (currCont->UserLandMarks[k].Type >= 0 && currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount)
if (currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount)
{
CCompassTarget ct;
ct.setType(CCompassTarget::UserLandMark);

1
code/ryzom/client/src/interface_v3/group_map.cpp
View file

@ -634,6 +634,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
case EGSPD::CPeople::Matis: loadLandmarkInfo(cur, "home_matis", _HomeLMOptions); break;
case EGSPD::CPeople::Zorai: loadLandmarkInfo(cur, "home_zorai", _HomeLMOptions); break;
case EGSPD::CPeople::Tryker: loadLandmarkInfo(cur, "home_tryker", _HomeLMOptions); break;
default: break;
}
loadLandmarkInfo(cur, "respawn", _RespawnLMOptions);
// animal landmark

2
code/ryzom/client/src/interface_v3/lua_helper.h
View file

@ -354,7 +354,7 @@ private:
private:
// this object isn't intended to be copied
CLuaState(const CLuaState &/* other */) { nlassert(0); }
CLuaState(const CLuaState &/* other */):NLMISC::CRefCount() { nlassert(0); }
CLuaState &operator=(const CLuaState &/* other */) { nlassert(0); return *this; }
void executeScriptInternal(const std::string &code, const std::string &dbgSrc, int numRet = 0);

11
code/ryzom/client/src/interface_v3/macrocmd_key.cpp
View file

@ -611,16 +611,19 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
// Get ith param (params are nameOfParam=argumentOfAction strings separated by |)
// except for the last real param (which can then contains | chars) if it is the last param
if ((curStr.find('|') == string::npos) ||
((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1)))
string::size_type pos = curStr.find('|');
if ((pos == string::npos) ||
(((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1))))
{
sTmp = curStr;
curStr = "";
}
else
{
sTmp = curStr.substr(0,curStr.find('|'));
curStr = curStr.substr(curStr.find('|')+1,curStr.size());
sTmp = curStr.substr(0, pos);
curStr = curStr.substr(pos+1, curStr.size());
}
// Remove 'name='

10
code/ryzom/client/src/interface_v3/people_interraction.cpp
View file

@ -289,13 +289,17 @@ void CChatStdInput::registerListeningWindow(CChatWindow *cw)
Universe.addListeningWindow(cw);
}
//===========================================================================================================
CPeopleInterraction::CPeopleInterraction() : SystemInfo(NULL),
CPeopleInterraction::CPeopleInterraction() : Region(NULL),
Universe(NULL),
TeamChat(NULL),
GuildChat(NULL),
CurrPartyChatID(0),
SystemInfo(NULL),
TellWindow(NULL),
DebugInfo(NULL),
YuboChat(NULL)
YuboChat(NULL),
CurrPartyChatID(0)
{
for(uint i=0;i<CChatGroup::MaxDynChanPerPlayer;i++)
{

2
code/ryzom/client/src/property_decoder.h
View file

@ -53,7 +53,7 @@ private:
class CEntityEntry
{
public:
CEntityEntry() : EntryUsed(false), PosIsRelative(false), AssociationBits(0) {}
CEntityEntry() : AssociationBits(0), EntryUsed(false), PosIsRelative(false), PosIsInterior(false) {}
CLFECOMMON::TSheetId Sheet;
uint16 AssociationBits;
bool EntryUsed;

2
code/ryzom/common/src/game_share/mode_and_behaviour.h
View file

@ -318,7 +318,7 @@ namespace MBEHAV
}
/// Cons cast into behaviour enum
operator const EBehaviour () const
operator EBehaviour () const
{
return (EBehaviour)Behaviour8;
}

2
code/ryzom/common/src/game_share/xml_auto_ptr.h
View file

@ -34,7 +34,7 @@ public:
operator std::string() const { return std::string(_Value); }
bool operator ! () const { return _Value == NULL; }
operator const unsigned char *() const { return (const unsigned char *) _Value; }
const char operator * () const { nlassert(_Value); return *_Value; }
char operator * () const { nlassert(_Value); return *_Value; }
/// NB : This remove previous owned pointer with xmlFree
CXMLAutoPtr &operator = (const char *other)
{