Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Typos

Browse source
This commit is contained in:
kervala 2016-01-02 17:04:45 +01:00
parent 8490d64622
commit 61457e575e
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/gui/group_editbox.cpp
View file

@ -953,7 +953,6 @@ namespace NLGUI
maxPos = _CursorPos; maxPos = _CursorPos;
} }
nlinfo("%d, %d", minPos, maxPos);
if (replace) if (replace)
{ {
_InputString = _InputString.substr(0, minPos) + toAdd + _InputString.substr(maxPos); _InputString = _InputString.substr(0, minPos) + toAdd + _InputString.substr(maxPos);

2
code/nel/tools/3d/tga_2_dds/tga2dds.cpp
View file

@ -513,7 +513,7 @@ int main(int argc, char **argv)
std::string::size_type pos = inputFileName.rfind("."); std::string::size_type pos = inputFileName.rfind(".");
if (pos == std::string::npos) if (pos == std::string::npos)
{ {
// name whithout extension // name without extension
userColorFileName = inputFileName + "_usercolor"; userColorFileName = inputFileName + "_usercolor";
} }
else else

2
code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h
View file

@ -143,7 +143,7 @@ public:
// Fame system // Fame system
// These take clans as parameters, restricted by call. // These take clans as parameters, restricted by call.
// These return the proper fame values, or NO_FAME if there's an error. // 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); sint32 getStartFame(PVP_CLAN::TPVPClan playerClan, PVP_CLAN::TPVPClan targetClan);
// - getMaxFameByClan: playerClan must be Neutral or the same type (Cult or Clan) as targetClan, // - getMaxFameByClan: playerClan must be Neutral or the same type (Cult or Clan) as targetClan,
// targetClan must be any non-neutral clan. // targetClan must be any non-neutral clan.

4
code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp
View file

@ -339,7 +339,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil
SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction ); SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction );
params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) ); params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) );
params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.first); params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.first);
invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params); invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params);
return; return;
} }
@ -348,7 +348,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil
SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction ); SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction );
params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) ); params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) );
params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.second); params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.second);
invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params); invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params);
return; return;
} }