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

Fixed: Compilation warnings

Browse source
This commit is contained in:
kervala 2015-02-14 12:41:59 +01:00
parent 14046699bc
commit 1ce011be38
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/3d/track_tcb.h
View file

@ -218,7 +218,7 @@ protected:
date*= previous->OODeltaTime;
NLMISC::clamp(date, 0,1);
date = this->ease(previous, date);
date = this->ease(previous, (float)date);
float hb[4];
this->computeHermiteBasis(date, hb);

2
code/nel/src/georges/form_elm.cpp
View file

@ -231,7 +231,7 @@ bool CFormElm::isAtom () const
const CType* CFormElm::getType ()
{
warning (false, "getType", "This node is not an atom.");
return 0;
return NULL;
}
// ***************************************************************************

2
code/ryzom/server/src/admin_modules/aes_module.cpp
View file

@ -573,7 +573,7 @@ namespace ADMIN
time_t t = now;
fprintf(fp, "AESReportDate=%s", ::ctime(&t));
fprintf(fp, "NBService=%u\n", _ServiceStates.size());
fprintf(fp, "NBService=%u\n", (uint)_ServiceStates.size());
// output state of each service
TServiceStates::iterator first(_ServiceStates.begin()), last(_ServiceStates.end());
for (; first != last; ++first)

4
code/ryzom/server/src/ai_share/aids_messages.h
View file

@ -101,12 +101,12 @@ public:
{
}
CMsgAIFeedback(std::string message)
CMsgAIFeedback(const std::string &message)
{
Message=message;
}
CMsgAIFeedback(char *msgStr)
CMsgAIFeedback(const char *msgStr)
{
Message=std::string(msgStr);
}

6
code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
View file

@ -242,11 +242,11 @@ float CItemCraftParameters::getCraftParameterValue( RM_FABER_STAT_TYPE::TRMStatT
case RM_FABER_STAT_TYPE::ShockWaveProtection:
case RM_FABER_STAT_TYPE::PoisonProtection:
case RM_FABER_STAT_TYPE::ElectricityProtection:
if (Protection1 == statType)
if (Protection1 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection1Factor;
else if (Protection2 == statType)
else if (Protection2 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection2Factor;
else if (Protection3 == statType)
else if (Protection3 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection3Factor;
else return 0.0f;
case RM_FABER_STAT_TYPE::DesertResistance:

2
code/ryzom/server/src/input_output_service/string_manager_parser.cpp
View file

@ -650,7 +650,7 @@ bool CStringManager::parseBlock(const ucstring &block, CPhrase &phrase)
&& (first - clause.String.begin()) == (sint) clause.Replacements[repCount].InsertPlace)
{
// check parameter type
char *subst;
const char *subst;
uint paramIndex = clause.Replacements[repCount].ParamIndex;
TParamId &paramId = phrase.Params[paramIndex]->ParamId;