Changed: #825 Remove all warnings when compiling Ryzom

This commit is contained in:
kervala 2010-09-20 21:58:24 +02:00
parent aaa533604f
commit 7c4d179395
26 changed files with 26 additions and 160 deletions

View file

@ -1973,7 +1973,7 @@ void CPSConstraintMesh::newElement(const CPSEmitterInfo &info)
NL_PS_FUNC(CPSConstraintMesh_newElement)
newSizeElement(info);
newPlaneBasisElement(info);
// TODO : avoid code cuplication with CPSFace ...
// TODO : avoid code duplication with CPSFace ...
const uint32 nbConf = (uint32)_PrecompBasis.size();
if (nbConf) // do we use precomputed basis ?
{

View file

@ -2326,9 +2326,9 @@ namespace NLNET
// recall the dump for the module class
NLMISC_CLASS_COMMAND_CALL_BASE(CModuleBase, dump);
log.displayNL("------------------------------");
log.displayNL("-----------------------------");
log.displayNL("Dumping gateway information :");
log.displayNL("------------------------------");
log.displayNL("-----------------------------");
log.displayNL("The gateway has %u locally plugged module :", _PluggedModules.getAToBMap().size());
{

View file

@ -271,13 +271,6 @@ public:
/*
* CSurfElement methods
*
*
*
*
*
*
*
*
*/
@ -401,21 +394,9 @@ CAABBox NLPACS::CSurfElement::getBBox() const
return box;
}
/*
* CComputableSurfaceBorder methods implementation
*
*
*
*
*
*
*
*
*/
void NLPACS::CComputableSurfaceBorder::dump()
@ -502,34 +483,9 @@ void NLPACS::CComputableSurfaceBorder::smooth(float val)
nlinfo("smoothed border %d-%d: %d -> %d", Left, Right, before, after);
}
/*
* CComputableSurface methods implementation
*
*
*
*
*
*
*
*
*/
void NLPACS::CComputableSurface::followBorder(CZoneTessellation *zoneTessel, CSurfElement *first, uint edge, uint sens, vector<CVector> &vstore, bool &loop)
{

View file

@ -144,4 +144,4 @@ bool operator < (const CAttackIDSheet::CSpellInfo &lhs, const CAttackIDSheet::CS
if (lhs.Mode != rhs.Mode) return lhs.Mode < rhs.Mode;
if (lhs.ID != rhs.ID) return lhs.ID < rhs.ID;
return false;
}
}

View file

@ -86,6 +86,7 @@ const char *CBodyToBoneSheet::getBoneName(BODY::TBodyPart part, BODY::TSide side
case BODY::HHands: return ClientSheetsStrings.get(side == BODY::Left ? LeftHand : RightHand);
case BODY::HLegs: return ClientSheetsStrings.get(side == BODY::Left ? LeftLeg : RightLeg);
case BODY::HFeet: return ClientSheetsStrings.get(side == BODY::Left ? LeftFoot : RightFoot);
default: return NULL;
default: break;
}
}
return NULL;
}

View file

@ -1454,5 +1454,3 @@ void CFarTP::farTPmainLoop()
if(welcomeWindow)
initWelcomeWindow();
}

View file

@ -682,4 +682,4 @@ NLMISC_COMMAND( viewSourcePos, "", "" )
ViewedSource->displayInscenePos();
}
return true;
}*/
}*/

View file

@ -158,4 +158,4 @@ private:
#endif // GRAPH_H
/* End of graph.h */
/* End of graph.h */

View file

@ -1038,4 +1038,4 @@ NLMISC_COMMAND(gfxStopAll, "gfxStopAll", "<>")
return true;
}
#endif
#endif

View file

@ -157,4 +157,3 @@ EGSPD::CPeople::TPeople CHairSet::getPeopleFromHairItemID(uint id) const
}
return EGSPD::CPeople::EndPeople;
}

View file

@ -2088,6 +2088,7 @@ bool SBagOptions::canDisplay(CDBCtrlSheet *pCS) const
if (pIS->Id.toString().substr(0, 6) == "rpjob_")
bDisplay = false;
}
return bDisplay;
}

View file

@ -617,8 +617,8 @@ int CLuaIHM::luaMethodCall(lua_State *ls)
//
state->remove(1); // remove 'self' reference from parameters stack
//
int numResults = 0;
int initialStackSize = state->getTop();
sint numResults = 0;
sint initialStackSize = state->getTop();
try
{
// call the actual method

View file

@ -276,4 +276,4 @@ private:
CCDBNodeLeaf *_RoleMasterRaceDB;
};
#endif
#endif

View file

@ -1029,9 +1029,7 @@ sint32 CViewRenderer::getTextureIdFromName (const string &sName) const
return -1;
// convert to lowCase
static string nameLwr;
nameLwr= sName;
strlwr(nameLwr);
static string nameLwr = toLower(sName);
string::size_type stripPng = nameLwr.find(".png");
if (stripPng != string::npos)
{

View file

@ -1935,7 +1935,7 @@ void CViewText::CWord::build(const ucstring &text, uint numSpaces/*=0*/)
// ***************************************************************************
void CViewText::removeEndSpaces()
{
int i = (int)_Text.size()-1;
sint i = (sint)_Text.size()-1;
while ((i>=0) && ((_Text[i] < 0x20) || (_Text[i] == ' ')))
{
i--;

View file

@ -580,4 +580,4 @@ void CLightCycleManager::setupDayToNightLight(NL3D::UScene &scene, const CDirLig
scene
);
}
}
}

View file

@ -653,8 +653,9 @@ bool isUserColorSupported(const CPlayerSheet &playerSheet, SLOTTYPE::EVisualSlot
case SLOTTYPE::FEET_SLOT: return isUserColorSupported(playerSheet.Feet);
case SLOTTYPE::RIGHT_HAND_SLOT: return isUserColorSupported(playerSheet.ObjectInRightHand);
case SLOTTYPE::LEFT_HAND_SLOT: return isUserColorSupported(playerSheet.ObjectInLeftHand);
default: return false;
default: break;
}
return false;
}// isUserColorSupported //
@ -1078,9 +1079,7 @@ void setCase (ucstring &str, TCaseMode mode)
}
}
break;
case CaseNormal:
break;
case CaseCount:
default:
break;
}
}

View file

@ -495,4 +495,4 @@ NLMISC_COMMAND(queryMissionGiverData, "Query mission giver data for the specifie
#endif
//#pragma optimize ("", on)
//#pragma optimize ("", on)

View file

@ -316,4 +316,4 @@ void CPrecipitation::drawClipGrid(NL3D::UDriver &drv) const
{
if (!_ClipGrid) return;
_ClipGrid->display(drv);
}
}

View file

@ -127,4 +127,4 @@ public:
#endif // NL_PROPERTY_DECODER_H
/* End of property_decoder.h */
/* End of property_decoder.h */

View file

@ -558,4 +558,4 @@ void CRosace::swap()
{
if(valide())
_Contexts[_Selected].next();
}// swap //
}// swap //

View file

@ -1508,7 +1508,6 @@ void CSoundManager::stopEventMusic(const string &fileName, uint xFadeTime)
if(_AudioMixer)
{
// if the event music is the one currently played, or if empty fileName
if(fileName.empty() || nlstricmp(_EventMusicPlayed,fileName)==0)
{
// stop the music
@ -1851,4 +1850,3 @@ bool CMaterialStepSounds::getSounds( TMoveType moveType, bool soft, vector<strin
return true;
} // getSounds //*/

View file

@ -1660,4 +1660,4 @@ void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const ucstrin
}
} // namespace STRING_MANAGER
} // namespace STRING_MANAGER

View file

@ -1153,25 +1153,3 @@ NLMISC_COMMAND(setMaxNumTimedFXs, "set the max number of timed fx that are visib
CTimedFXManager::getInstance().setMaxNumFXInstances(maxNumInstances);
return true;
}

View file

@ -283,65 +283,3 @@ public:
#endif

View file

@ -63,4 +63,4 @@ private:
#endif
#endif