Skip to content

Commit cc580a6

Browse files
committed
Rename "autocomplete nicks" to "nick completion"
1 parent bb53835 commit cc580a6

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

MTA10/core/CChat.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void CChat::LoadCVars ( void )
124124
CVARS_GET ( "chat_line_life", (unsigned int &)m_ulChatLineLife );
125125
CVARS_GET ( "chat_line_fade_out", (unsigned int &)m_ulChatLineFadeOut );
126126
CVARS_GET ( "chat_font", (unsigned int &)Font ); SetChatFont ( (eChatFont)Font );
127-
CVARS_GET ( "chat_autocomplete", m_bAutocomplete );
127+
CVARS_GET ( "chat_nickcompletion", m_bNickCompletion );
128128

129129
// Modify default chat box to be like 'Transparent' preset
130130
SString strFlags;
@@ -600,7 +600,7 @@ bool CChat::CharacterKeyHandler ( CGUIKeyEventArgs KeyboardArgs )
600600
case VK_TAB:
601601
{
602602

603-
if ( m_bAutocomplete && m_strInputText.size () > 0 )
603+
if ( m_bNickCompletion && m_strInputText.size () > 0 )
604604
{
605605
bool bSuccess = false;
606606

MTA10/core/CChat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ class CChat
298298
int m_iReportCount;
299299
CTickCount m_lastRenderTargetCreationFail;
300300

301-
bool m_bAutocomplete;
301+
bool m_bNickCompletion;
302302
};
303303

304304
#endif

MTA10/core/CClientVariables.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void CClientVariables::LoadDefaults ( void )
285285
DEFAULT ( "chat_line_life", 12000 ); // chatbox line life time
286286
DEFAULT ( "chat_line_fade_out", 3000 ); // chatbox line fade out time
287287
DEFAULT ( "chat_use_cegui", false ); // chatbox uses cegui
288-
DEFAULT ( "chat_autocomplete", true ); // Enable autocomplete for nicknames in chatbox?
288+
DEFAULT ( "chat_nickcompletion", true ); // chatbox nick completion
289289
DEFAULT ( "text_scale", 1.0f ); // text scale
290290
DEFAULT ( "invert_mouse", false ); // mouse inverting
291291
DEFAULT ( "fly_with_mouse", false ); // flying with mouse controls

MTA10/core/CSettings.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,10 +1146,10 @@ void CSettings::CreateGUI ( void )
11461146
m_pChatCssBackground->GetPosition ( vecTemp );
11471147
m_pChatCssBackground->AutoSize ( NULL, 20.0f );
11481148

1149-
m_pChatAutocomplete = reinterpret_cast < CGUICheckBox* > ( pManager->CreateCheckBox ( pTabInterface, _( "Nickname autocomplete with TAB" ) ) );
1150-
m_pChatAutocomplete->SetPosition ( CVector2D ( vecTemp.fX, vecTemp.fY + 20.0f ) );
1151-
m_pChatAutocomplete->GetPosition ( vecTemp );
1152-
m_pChatAutocomplete->AutoSize ( NULL, 20.0f );
1149+
m_pChatNickCompletion = reinterpret_cast < CGUICheckBox* > ( pManager->CreateCheckBox ( pTabInterface, _( "Nickname completion using the \"Tab\" key" ) ) );
1150+
m_pChatNickCompletion->SetPosition ( CVector2D ( vecTemp.fX, vecTemp.fY + 20.0f ) );
1151+
m_pChatNickCompletion->GetPosition ( vecTemp );
1152+
m_pChatNickCompletion->AutoSize ( NULL, 20.0f );
11531153
}
11541154

11551155
/**
@@ -2976,7 +2976,7 @@ void CSettings::LoadData ( void )
29762976
CVARS_GET ( "chat_width", strVar ); m_pChatWidth->SetText ( strVar.c_str () );
29772977
CVARS_GET ( "chat_css_style_text", bVar ); m_pChatCssText->SetSelected ( bVar );
29782978
CVARS_GET ( "chat_css_style_background", bVar ); m_pChatCssBackground->SetSelected ( bVar );
2979-
CVARS_GET ( "chat_autocomplete", bVar ); m_pChatAutocomplete->SetSelected ( bVar );
2979+
CVARS_GET ( "chat_nickcompletion", bVar ); m_pChatNickCompletion->SetSelected ( bVar );
29802980

29812981
{
29822982
int iVar;
@@ -3271,7 +3271,7 @@ void CSettings::SaveData ( void )
32713271
CVARS_SET ( "chat_width", m_pChatWidth->GetText () );
32723272
CVARS_SET ( "chat_css_style_text", m_pChatCssText->GetSelected () );
32733273
CVARS_SET ( "chat_css_style_background", m_pChatCssBackground->GetSelected () );
3274-
CVARS_SET ( "chat_autocomplete", m_pChatAutocomplete->GetSelected () );
3274+
CVARS_SET ( "chat_nickcompletion", m_pChatNickCompletion->GetSelected () );
32753275
CVARS_SET ( "chat_line_life", GetMilliseconds ( m_pChatLineLife ) );
32763276
CVARS_SET ( "chat_line_fade_out", GetMilliseconds ( m_pChatLineFadeout ) );
32773277

MTA10/core/CSettings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class CSettings
321321
CGUIEdit* m_pChatWidth;
322322

323323
CGUICheckBox* m_pChatCssBackground;
324-
CGUICheckBox* m_pChatAutocomplete;
324+
CGUICheckBox* m_pChatNickCompletion;
325325
CGUICheckBox* m_pChatCssText;
326326
CGUIEdit* m_pChatLineLife;
327327
CGUIEdit* m_pChatLineFadeout;

MTA10/mods/deathmatch/CClient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ bool CClient::HandleException ( CExceptionInformation* pExceptionInformation )
281281
{
282282
#ifndef MTA_DEBUG
283283
#ifndef MTA_ALLOW_DEBUG
284-
// Let the clientgame write its dump, then make the core terminte our process
284+
// Let the clientgame write its dump, then make the core terminate our process
285285
if ( g_pClientGame && pExceptionInformation )
286286
{
287287
g_pClientGame->HandleException ( pExceptionInformation );
@@ -311,4 +311,4 @@ void CClient::GetPlayerNames ( std::vector<SString> &vPlayerNames )
311311
vPlayerNames.push_back ( strPlayerName );
312312
}
313313
}
314-
};
314+
}

0 commit comments

Comments
 (0)