diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h index 53fd58ed8..1a9a759f9 100644 --- a/code/nel/include/nel/georges/load_form.h +++ b/code/nel/include/nel/georges/load_form.h @@ -1245,7 +1245,7 @@ void loadFormNoPackedSheet (const std::vector &sheetFilters, std::m NLMISC::CSheetId::buildIdVector(sheetIds, filenames, sheetFilters[i]); - // if there s no file, nothing to do + // if there's no file, nothing to do if (sheetIds.empty()) return; diff --git a/code/nel/include/nel/net/varpath.h b/code/nel/include/nel/net/varpath.h index 75e466a9b..7109b7d19 100644 --- a/code/nel/include/nel/net/varpath.h +++ b/code/nel/include/nel/net/varpath.h @@ -34,7 +34,7 @@ public: void display (); - /// returns true if there s no more . in the path + /// returns true if there's no more . in the path bool isFinal (); bool empty () diff --git a/code/nel/samples/net/login_system/frontend_service.cpp b/code/nel/samples/net/login_system/frontend_service.cpp index 0cfbf04fc..189bbaf67 100644 --- a/code/nel/samples/net/login_system/frontend_service.cpp +++ b/code/nel/samples/net/login_system/frontend_service.cpp @@ -206,6 +206,6 @@ public: /* * Declare a service with the class CFrontEndService, the names "FS" (short) and "frontend_service" (long). - * The port is dynamically find and there s no callback array. + * The port is dynamically find and there's no callback array. */ NLNET_SERVICE_MAIN (CFrontEndService, "FS", "frontend_service", 0, EmptyCallbackArray, NL_LS_CFG, "") diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp index 7b714de1d..ef22eb508 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp @@ -185,7 +185,7 @@ void CVertexArrayRangeNVidia::enable() _Driver->_NVCurrentVARSize= _VertexArraySize; _Driver->_NVCurrentVARPtr= _VertexArrayPtr; } - // enable VAR. NB: flush is unesufull, so don't flush if extension is OK + // enable VAR. NB: flush is useless, so don't flush if extension is OK glEnableClientState(_Driver->_Extensions.NVStateVARWithoutFlush); _Driver->_CurrentVertexArrayRange= this; } @@ -200,7 +200,7 @@ void CVertexArrayRangeNVidia::disable() if(_Driver->_CurrentVertexArrayRange!=NULL) { // just disable the state, don't change VAR ptr setup. - // NB: flush is unesufull, so don't flush if extension is OK + // NB: flush is useless, so don't flush if extension is OK glDisableClientState(_Driver->_Extensions.NVStateVARWithoutFlush); _Driver->_CurrentVertexArrayRange= NULL; } diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 643b30599..fb9a9c6f5 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -356,7 +356,7 @@ uint32 humanReadableToBytes (const string &str) if (str.size()<3) return res; - // there s no break and it's **normal** + // there's no break and it's **normal** switch (str[str.size()-2]) { case 'G': res *= 1024; diff --git a/code/nel/src/net/unified_network.cpp b/code/nel/src/net/unified_network.cpp index 763ce68eb..8a1a87b85 100644 --- a/code/nel/src/net/unified_network.cpp +++ b/code/nel/src/net/unified_network.cpp @@ -130,7 +130,7 @@ void uNetUnregistrationBroadcast(const string &name, TServiceId sid, const vecto } // - // It's the first connection that added the _NamedCnx so if there s no connection, no need to + // It's the first connection that added the _NamedCnx so if there's no connection, no need to // remove entry in _NamedCnx // diff --git a/code/nel/tools/georges/georges2csv/georges2csv.cpp b/code/nel/tools/georges/georges2csv/georges2csv.cpp index b236508bc..d69216f5e 100644 --- a/code/nel/tools/georges/georges2csv/georges2csv.cpp +++ b/code/nel/tools/georges/georges2csv/georges2csv.cpp @@ -327,7 +327,7 @@ void scanFiles(const CSString &filespec) buildFileVector(filenames, filespec); - // if there s no file, nothing to do + // if there's no file, nothing to do if (filenames.empty()) return; diff --git a/code/ryzom/common/src/game_share/bnp_patch.h b/code/ryzom/common/src/game_share/bnp_patch.h index b5bb9ec30..74a1f9391 100644 --- a/code/ryzom/common/src/game_share/bnp_patch.h +++ b/code/ryzom/common/src/game_share/bnp_patch.h @@ -14,17 +14,6 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifndef RY_BNP_PATCH_H -#define RY_BNP_PATCH_H - -/** bnp_patch.h - - $id$ - - The set of classes used by patch systems (both generation and application) - -*/ - #ifndef BNP_PATCH_H #define BNP_PATCH_H @@ -469,8 +458,4 @@ private: // //#endif - - -#endif - #endif diff --git a/code/ryzom/common/src/game_share/mirrored_data_set.cpp b/code/ryzom/common/src/game_share/mirrored_data_set.cpp index ce18dedbb..c47c70563 100644 --- a/code/ryzom/common/src/game_share/mirrored_data_set.cpp +++ b/code/ryzom/common/src/game_share/mirrored_data_set.cpp @@ -1066,9 +1066,9 @@ void CMirroredDataSet::serialOutMirrorInfo( NLNET::CMessage& msgout ) inline bool CMirroredDataSet::entityMatchesFilter ( const NLMISC::CEntityId& entityId, TDataSetIndex entityIndex, uint8 onlyEntityType, uint8 onlyCreatorId, uint8 onlyDynamicId, bool hideUndeclared ) const { return (((onlyEntityType == 0xFF) || (entityId.getType() == onlyEntityType)) && - ((onlyCreatorId == 0xFF) || (entityId.getCreatorId() == onlyCreatorId)) && - ((onlyDynamicId == 0xFF) || (entityId.getDynamicId() == onlyDynamicId)) && - ((!hideUndeclared) || _PropertyContainer.EntityIdArray.isOnline( entityIndex ))); + ((onlyCreatorId == 0xFF) || (entityId.getCreatorId() == onlyCreatorId)) && + ((onlyDynamicId == 0xFF) || (entityId.getDynamicId() == onlyDynamicId)) && + ((!hideUndeclared) || _PropertyContainer.EntityIdArray.isOnline( entityIndex ))); } diff --git a/code/ryzom/common/src/game_share/small_string_manager.h b/code/ryzom/common/src/game_share/small_string_manager.h index 3556d97fd..89cecbe9e 100644 --- a/code/ryzom/common/src/game_share/small_string_manager.h +++ b/code/ryzom/common/src/game_share/small_string_manager.h @@ -16,11 +16,6 @@ #ifndef SMALL_STRING_MANAGER_H #define SMALL_STRING_MANAGER_H -/** \file small_string_manager.h - * - * $id$ - * - */ #include "nel/misc/types_nl.h"