From 665873a2f8f75cb82bab9d86ac4c57cea6859668 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 20 Sep 2010 21:58:24 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- code/nel/src/3d/ps_mesh.cpp | 2 +- code/nel/src/net/module_gateway.cpp | 4 +- .../nel/tools/pacs/build_rbank/build_surf.cpp | 44 ------------- .../src/client_sheets/attack_id_sheet.cpp | 2 +- .../src/client_sheets/body_to_bone_sheet.cpp | 5 +- code/ryzom/client/src/far_tp.cpp | 2 - code/ryzom/client/src/forage_source_cl.cpp | 2 +- code/ryzom/client/src/graph.h | 2 +- code/ryzom/client/src/ground_fx_manager.cpp | 2 +- code/ryzom/client/src/hair_set.cpp | 1 - .../src/interface_v3/inventory_manager.cpp | 1 + .../ryzom/client/src/interface_v3/lua_ihm.cpp | 4 +- .../client/src/interface_v3/obs_huge_list.h | 2 +- .../client/src/interface_v3/view_renderer.cpp | 4 +- .../client/src/interface_v3/view_text.cpp | 2 +- code/ryzom/client/src/light_cycle_manager.cpp | 2 +- code/ryzom/client/src/misc.cpp | 7 +-- code/ryzom/client/src/npc_icon.cpp | 2 +- code/ryzom/client/src/precipitation.cpp | 2 +- code/ryzom/client/src/property_decoder.h | 2 +- code/ryzom/client/src/rosace.cpp | 2 +- code/ryzom/client/src/sound_manager.cpp | 2 - .../client/src/string_manager_client.cpp | 2 +- code/ryzom/client/src/timed_fx_manager.cpp | 22 ------- code/ryzom/client/src/timed_fx_manager.h | 62 ------------------- code/ryzom/client/src/water_env_map_rdr.h | 2 +- 26 files changed, 26 insertions(+), 160 deletions(-) diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp index 514145922..ca354b09d 100644 --- a/code/nel/src/3d/ps_mesh.cpp +++ b/code/nel/src/3d/ps_mesh.cpp @@ -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 ? { diff --git a/code/nel/src/net/module_gateway.cpp b/code/nel/src/net/module_gateway.cpp index e6c9f9cf8..3a608413f 100644 --- a/code/nel/src/net/module_gateway.cpp +++ b/code/nel/src/net/module_gateway.cpp @@ -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()); { diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/code/nel/tools/pacs/build_rbank/build_surf.cpp index 8ab88a9eb..2fe909cb8 100644 --- a/code/nel/tools/pacs/build_rbank/build_surf.cpp +++ b/code/nel/tools/pacs/build_rbank/build_surf.cpp @@ -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 &vstore, bool &loop) { diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp index 0780d76d2..8a11114f3 100644 --- a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp @@ -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; -} \ No newline at end of file +} diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp index 105378b26..77dc1c4e1 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp @@ -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; } -} \ No newline at end of file + return NULL; +} diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp index 20c553e4c..5edcce264 100644 --- a/code/ryzom/client/src/far_tp.cpp +++ b/code/ryzom/client/src/far_tp.cpp @@ -1454,5 +1454,3 @@ void CFarTP::farTPmainLoop() if(welcomeWindow) initWelcomeWindow(); } - - diff --git a/code/ryzom/client/src/forage_source_cl.cpp b/code/ryzom/client/src/forage_source_cl.cpp index a70e53437..2f0aa8dda 100644 --- a/code/ryzom/client/src/forage_source_cl.cpp +++ b/code/ryzom/client/src/forage_source_cl.cpp @@ -682,4 +682,4 @@ NLMISC_COMMAND( viewSourcePos, "", "" ) ViewedSource->displayInscenePos(); } return true; -}*/ \ No newline at end of file +}*/ diff --git a/code/ryzom/client/src/graph.h b/code/ryzom/client/src/graph.h index b16f3a62a..9f3ebad2f 100644 --- a/code/ryzom/client/src/graph.h +++ b/code/ryzom/client/src/graph.h @@ -158,4 +158,4 @@ private: #endif // GRAPH_H -/* End of graph.h */ \ No newline at end of file +/* End of graph.h */ diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/code/ryzom/client/src/ground_fx_manager.cpp index 18fd41fe0..92267dd2a 100644 --- a/code/ryzom/client/src/ground_fx_manager.cpp +++ b/code/ryzom/client/src/ground_fx_manager.cpp @@ -1038,4 +1038,4 @@ NLMISC_COMMAND(gfxStopAll, "gfxStopAll", "<>") return true; } -#endif \ No newline at end of file +#endif diff --git a/code/ryzom/client/src/hair_set.cpp b/code/ryzom/client/src/hair_set.cpp index 3860651ba..5afd7ba99 100644 --- a/code/ryzom/client/src/hair_set.cpp +++ b/code/ryzom/client/src/hair_set.cpp @@ -157,4 +157,3 @@ EGSPD::CPeople::TPeople CHairSet::getPeopleFromHairItemID(uint id) const } return EGSPD::CPeople::EndPeople; } - diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp index 2fe27b70a..84319306c 100644 --- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp +++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp @@ -2088,6 +2088,7 @@ bool SBagOptions::canDisplay(CDBCtrlSheet *pCS) const if (pIS->Id.toString().substr(0, 6) == "rpjob_") bDisplay = false; } + return bDisplay; } diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp index 07e692fef..01186668e 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp @@ -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 diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.h b/code/ryzom/client/src/interface_v3/obs_huge_list.h index fe2fba4f2..3c19be480 100644 --- a/code/ryzom/client/src/interface_v3/obs_huge_list.h +++ b/code/ryzom/client/src/interface_v3/obs_huge_list.h @@ -276,4 +276,4 @@ private: CCDBNodeLeaf *_RoleMasterRaceDB; }; -#endif \ No newline at end of file +#endif diff --git a/code/ryzom/client/src/interface_v3/view_renderer.cpp b/code/ryzom/client/src/interface_v3/view_renderer.cpp index a2b38c3f5..2eb00c5fa 100644 --- a/code/ryzom/client/src/interface_v3/view_renderer.cpp +++ b/code/ryzom/client/src/interface_v3/view_renderer.cpp @@ -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) { diff --git a/code/ryzom/client/src/interface_v3/view_text.cpp b/code/ryzom/client/src/interface_v3/view_text.cpp index 2ab27e55c..2a84e213a 100644 --- a/code/ryzom/client/src/interface_v3/view_text.cpp +++ b/code/ryzom/client/src/interface_v3/view_text.cpp @@ -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--; diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/code/ryzom/client/src/light_cycle_manager.cpp index 3a3d1863b..ef12dc096 100644 --- a/code/ryzom/client/src/light_cycle_manager.cpp +++ b/code/ryzom/client/src/light_cycle_manager.cpp @@ -580,4 +580,4 @@ void CLightCycleManager::setupDayToNightLight(NL3D::UScene &scene, const CDirLig scene ); } -} \ No newline at end of file +} diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp index 4e9281584..bd45482b6 100644 --- a/code/ryzom/client/src/misc.cpp +++ b/code/ryzom/client/src/misc.cpp @@ -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; } } diff --git a/code/ryzom/client/src/npc_icon.cpp b/code/ryzom/client/src/npc_icon.cpp index 99d0ed515..4857a7ad0 100644 --- a/code/ryzom/client/src/npc_icon.cpp +++ b/code/ryzom/client/src/npc_icon.cpp @@ -495,4 +495,4 @@ NLMISC_COMMAND(queryMissionGiverData, "Query mission giver data for the specifie #endif -//#pragma optimize ("", on) \ No newline at end of file +//#pragma optimize ("", on) diff --git a/code/ryzom/client/src/precipitation.cpp b/code/ryzom/client/src/precipitation.cpp index 472d76598..782c476ff 100644 --- a/code/ryzom/client/src/precipitation.cpp +++ b/code/ryzom/client/src/precipitation.cpp @@ -316,4 +316,4 @@ void CPrecipitation::drawClipGrid(NL3D::UDriver &drv) const { if (!_ClipGrid) return; _ClipGrid->display(drv); -} \ No newline at end of file +} diff --git a/code/ryzom/client/src/property_decoder.h b/code/ryzom/client/src/property_decoder.h index 0dd3fa413..7ce83c684 100644 --- a/code/ryzom/client/src/property_decoder.h +++ b/code/ryzom/client/src/property_decoder.h @@ -127,4 +127,4 @@ public: #endif // NL_PROPERTY_DECODER_H -/* End of property_decoder.h */ \ No newline at end of file +/* End of property_decoder.h */ diff --git a/code/ryzom/client/src/rosace.cpp b/code/ryzom/client/src/rosace.cpp index 5f6c038a7..759fa20a0 100644 --- a/code/ryzom/client/src/rosace.cpp +++ b/code/ryzom/client/src/rosace.cpp @@ -558,4 +558,4 @@ void CRosace::swap() { if(valide()) _Contexts[_Selected].next(); -}// swap // \ No newline at end of file +}// swap // diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index 47916f5fc..762eeb298 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -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