aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Compilation warnings

Browse source 
--HG--
branch : hotfix
This commit is contained in:
kervala 2015-02-14 12:41:59 +01:00
parent eb5fecf8ce
commit 3039428094
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; date*= previous->OODeltaTime;
NLMISC::clamp(date, 0,1); NLMISC::clamp(date, 0,1);
date = this->ease(previous, date); date = this->ease(previous, (float)date);
float hb[4]; float hb[4];
this->computeHermiteBasis(date, hb); 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 () const CType* CFormElm::getType ()
{ {
warning (false, "getType", "This node is not an atom."); 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; time_t t = now;
fprintf(fp, "AESReportDate=%s", ::ctime(&t)); 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 // output state of each service
TServiceStates::iterator first(_ServiceStates.begin()), last(_ServiceStates.end()); TServiceStates::iterator first(_ServiceStates.begin()), last(_ServiceStates.end());
for (; first != last; ++first) 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; Message=message;
} }
CMsgAIFeedback(char *msgStr) CMsgAIFeedback(const char *msgStr)
{ {
Message=std::string(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::ShockWaveProtection:
case RM_FABER_STAT_TYPE::PoisonProtection: case RM_FABER_STAT_TYPE::PoisonProtection:
case RM_FABER_STAT_TYPE::ElectricityProtection: case RM_FABER_STAT_TYPE::ElectricityProtection:
if (Protection1 == statType) if (Protection1 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection1Factor; return Protection1Factor;
else if (Protection2 == statType) else if (Protection2 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection2Factor; return Protection2Factor;
else if (Protection3 == statType) else if (Protection3 == (PROTECTION_TYPE::TProtectionType)statType)
return Protection3Factor; return Protection3Factor;
else return 0.0f; else return 0.0f;
case RM_FABER_STAT_TYPE::DesertResistance: 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) && (first - clause.String.begin()) == (sint) clause.Replacements[repCount].InsertPlace)
{ {
// check parameter type // check parameter type
char *subst; const char *subst;
uint paramIndex = clause.Replacements[repCount].ParamIndex; uint paramIndex = clause.Replacements[repCount].ParamIndex;
TParamId &paramId = phrase.Params[paramIndex]->ParamId; TParamId &paramId = phrase.Params[paramIndex]->ParamId;