From cb25c89ccddc404b0ff00af2cb9a733f332a19c7 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 2 Jan 2016 17:04:45 +0100 Subject: [PATCH] Fixed: Typos --- code/nel/src/gui/group_editbox.cpp | 1 - code/nel/tools/3d/tga_2_dds/tga2dds.cpp | 2 +- .../src/entities_game_service/guild_manager/fame_manager.h | 2 +- .../guild_manager/guild_member_module.cpp | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/nel/src/gui/group_editbox.cpp b/code/nel/src/gui/group_editbox.cpp index c96c27b46..48347aed1 100644 --- a/code/nel/src/gui/group_editbox.cpp +++ b/code/nel/src/gui/group_editbox.cpp @@ -953,7 +953,6 @@ namespace NLGUI maxPos = _CursorPos; } - nlinfo("%d, %d", minPos, maxPos); if (replace) { _InputString = _InputString.substr(0, minPos) + toAdd + _InputString.substr(maxPos); diff --git a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp index 34b47735f..6e235a3f1 100644 --- a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp +++ b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp @@ -513,7 +513,7 @@ int main(int argc, char **argv) std::string::size_type pos = inputFileName.rfind("."); if (pos == std::string::npos) { - // name whithout extension + // name without extension userColorFileName = inputFileName + "_usercolor"; } else diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h index cdaf8d92f..c42b82adc 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h +++ b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h @@ -143,7 +143,7 @@ public: // Fame system // These take clans as parameters, restricted by call. // These return the proper fame values, or NO_FAME if there's an error. - // - GgtStartFame: playerClan must be a Civilization, targetClan must be any non-neutral clan + // - getStartFame: playerClan must be a Civilization, targetClan must be any non-neutral clan sint32 getStartFame(PVP_CLAN::TPVPClan playerClan, PVP_CLAN::TPVPClan targetClan); // - getMaxFameByClan: playerClan must be Neutral or the same type (Cult or Clan) as targetClan, // targetClan must be any non-neutral clan. diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp index f38f9d170..3e2ab2f6c 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp @@ -339,7 +339,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction ); params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) ); params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.first); - invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params); + invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params); return; } @@ -348,7 +348,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction ); params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) ); params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.second); - invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params); + invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params); return; }