Skip to content

Commit 4ea7b4c

Browse files
ChillerDragonChillerDragon
committed
Merge branch 'ddnet' into chillerbot
2 parents 0ce841f + 55098cd commit 4ea7b4c

File tree

11 files changed

+94
-62
lines changed

11 files changed

+94
-62
lines changed

‎data/languages/belarusian.txt

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# Chill & PoKeMoN 2023-03-31 16:00:00
66
# Chill & PoKeMoN 2023-07-02 00:54:00
77
# Chill [TD] & PoKeMoN [TD] 2023-09-22 17:49:00
8+
# Chill [TD] & PoKeMoN [TD] 2023-11-14 12:42:00
89
#
910
##### /authors #####
1011

@@ -796,7 +797,7 @@ Are you sure that you want to remove the clan '%s' from your friends list?
796797
== Вы ўпэўненыя што хочаце выдаліць клан '%s' са спіса вашых сяброў?
797798

798799
Please use a different filename
799-
==
800+
== Калі ласка, выкарыстайце іншае імя файла
800801

801802
File already exists, do you want to overwrite it?
802803
== Файл ужо існуе, ці вы хочаце перазапісаць яго?
@@ -1699,56 +1700,56 @@ Moved ingame
16991700
== Перамешчаны ў гульні
17001701

17011702
Error playing demo
1702-
==
1703+
== Памылка прайгравання дэма
17031704

17041705
Some map images could not be loaded. Check the local console for details.
1705-
==
1706+
== Некаторыя відарысы карты немагчыма спампаваць. Для атрымання дэталей праверце лакальную кансоль.
17061707

17071708
Some map sounds could not be loaded. Check the local console for details.
1708-
==
1709+
== Некаторыя гукі карты немагчыма спампаваць. Для атрымання дэталей праверце лакальную кансоль.
17091710

17101711
Loading menu themes
1711-
==
1712+
== Спампоўка тэм меню
17121713

17131714
Render complete
1714-
==
1715+
== Рэндэр завершаны
17151716

17161717
Videos directory
1717-
==
1718+
== Тэчка відэа
17181719

17191720
Video was saved to '%s'
1720-
==
1721+
== Відэа было захавана ў '%s'
17211722

17221723
No demo selected
1723-
==
1724+
== Дэма не выбрана
17241725

17251726
Created
1726-
==
1727+
== Створана
17271728

17281729
Netversion
1729-
==
1730+
== Сеткавая версія
17301731

17311732
[Demo details]
17321733
map not included
1733-
==
1734+
== карта не ўключана
17341735

17351736
Ghosts directory
1736-
==
1737+
== Тэчка прывідаў
17371738

17381739
Activate all
1739-
==
1740+
== Актываваць усе
17401741

17411742
Deactivate all
1742-
==
1743+
== Дэактываваць усе
17431744

17441745
Enable ghost
1745-
==
1746+
== Уключыць прывід
17461747

17471748
Only save improvements
1748-
==
1749+
== Захоўваць толькі паляпшэнні
17491750

17501751
Regular background color
1751-
==
1752+
== Колер звычайнага фону
17521753

17531754
Entities background color
1754-
==
1755+
== Колер фону энтыты

‎data/languages/russian.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# unban 2023-03-10 21:50:50
1919
# eblan 2023-08-07 14:27:00
2020
# kaban 2023-9-21 19:00:00
21+
# ByFox 2023-11-14 11:24:00
2122
##### /authors #####
2223

2324
##### translated strings #####
@@ -614,7 +615,7 @@ DDNet Client needs to be restarted to complete update!
614615
== Перезапустите DDNet Client для завершения обновления!
615616

616617
Please use a different filename
617-
==
618+
== Пожалуйста, используйте другое имя файла
618619

619620
Show others
620621
== Показывать остальных
@@ -1752,16 +1753,16 @@ Activate all
17521753
== Активировать все
17531754

17541755
Deactivate all
1755-
==
1756+
== Отключить все
17561757

17571758
Enable ghost
1758-
==
1759+
== Включить привидение
17591760

17601761
Only save improvements
1761-
==
1762+
== Сохранять только улучшения
17621763

17631764
Regular background color
1764-
==
1765+
== Обычный цвет фона
17651766

17661767
Entities background color
1767-
==
1768+
== Цвет фона сущностей

‎data/languages/spanish.txt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ Ok
279279
== Aceptar
280280

281281
Parent Folder
282-
== Directorio padre
282+
== Carpeta principal
283283

284284
Password
285285
== Contraseña
@@ -674,7 +674,7 @@ Markers
674674
== Marcadores
675675

676676
Length
677-
== Longitud
677+
== Duración
678678

679679
Date
680680
== Fecha
@@ -869,7 +869,7 @@ Save the best demo of each race
869869
== Guardar la mejor demo de cada carrera
870870

871871
Default length
872-
== Longitud predeterminada
872+
== Duración predeterminada
873873

874874
Enable replays
875875
== Habilitar repeticiones
@@ -1718,56 +1718,56 @@ Render cut to video
17181718
== Renderizar corte a vídeo
17191719

17201720
Error playing demo
1721-
==
1721+
== Error al reproducir la demo
17221722

17231723
Some map images could not be loaded. Check the local console for details.
1724-
==
1724+
== Algunas imágenes de mapas no se pudieron cargar. Revisa la consola local para más detalles.
17251725

17261726
Some map sounds could not be loaded. Check the local console for details.
1727-
==
1727+
== Algunos sonidos de mapas no se pudieron cargar. Revisa la consola local para más detalles.
17281728

17291729
Loading menu themes
1730-
==
1730+
== Cargando temas del menú
17311731

17321732
Render complete
1733-
==
1733+
== Renderización completada
17341734

17351735
Videos directory
1736-
==
1736+
== Carpeta de videos
17371737

17381738
Video was saved to '%s'
1739-
==
1739+
== El video guardó en '%s'
17401740

17411741
No demo selected
1742-
==
1742+
== Ninguna demo seleccionada
17431743

17441744
Created
1745-
==
1745+
== Creado
17461746

17471747
Netversion
1748-
==
1748+
== Netversion
17491749

17501750
[Demo details]
17511751
map not included
1752-
==
1752+
== mapa no incluido
17531753

17541754
Ghosts directory
1755-
==
1755+
== Carpeta de Fantasmas
17561756

17571757
Activate all
1758-
==
1758+
== Activar todo
17591759

17601760
Deactivate all
1761-
==
1761+
== Desactivar todo
17621762

17631763
Enable ghost
1764-
==
1764+
== Habilitar fantasma
17651765

17661766
Only save improvements
1767-
==
1767+
== Solo guardar las mejoras
17681768

17691769
Regular background color
1770-
==
1770+
== Color del fondo normal
17711771

17721772
Entities background color
1773-
==
1773+
== Color del fondo de entidades

‎src/engine/shared/demo.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ class CDemoPlayer : public IDemoPlayer
122122
class CSnapshotDelta *m_pSnapshotDelta;
123123

124124
bool m_UseVideo;
125+
#if defined(CONF_VIDEORECORDER)
125126
bool m_WasRecording = false;
127+
#endif
126128

127129
enum EReadChunkHeaderResult
128130
{

‎src/game/client/components/binds.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ int CBinds::GetKeyID(const char *pKeyName)
389389
// search for key
390390
for(int i = 0; i < KEY_LAST; i++)
391391
{
392-
if(str_comp(pKeyName, Input()->KeyName(i)) == 0)
392+
if(str_comp_nocase(pKeyName, Input()->KeyName(i)) == 0)
393393
return i;
394394
}
395395

@@ -404,13 +404,13 @@ int CBinds::GetBindSlot(const char *pBindString, int *pModifierCombination)
404404
const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
405405
while(aMod[0] && *(pKey))
406406
{
407-
if(!str_comp(aMod, "shift"))
407+
if(!str_comp_nocase(aMod, "shift"))
408408
*pModifierCombination |= (1 << MODIFIER_SHIFT);
409-
else if(!str_comp(aMod, "ctrl"))
409+
else if(!str_comp_nocase(aMod, "ctrl"))
410410
*pModifierCombination |= (1 << MODIFIER_CTRL);
411-
else if(!str_comp(aMod, "alt"))
411+
else if(!str_comp_nocase(aMod, "alt"))
412412
*pModifierCombination |= (1 << MODIFIER_ALT);
413-
else if(!str_comp(aMod, "gui"))
413+
else if(!str_comp_nocase(aMod, "gui"))
414414
*pModifierCombination |= (1 << MODIFIER_GUI);
415415
else
416416
return 0;

‎src/game/client/components/chat.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ void CChat::Reset()
125125
m_LastChatSend = 0;
126126
m_CurrentLine = 0;
127127
m_IsInputCensored = false;
128+
m_EditingNewLine = true;
129+
mem_zero(m_aCurrentInputText, sizeof(m_aCurrentInputText));
128130
DisableMode();
129131

130132
for(int64_t &LastSoundPlayed : m_aLastSoundPlayed)
@@ -431,6 +433,12 @@ bool CChat::OnInput(const IInput::CEvent &Event)
431433

432434
if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_UP)
433435
{
436+
if(m_EditingNewLine)
437+
{
438+
str_copy(m_aCurrentInputText, m_Input.GetString());
439+
m_EditingNewLine = false;
440+
}
441+
434442
if(m_pHistoryEntry)
435443
{
436444
CHistoryEntry *pTest = m_History.Prev(m_pHistoryEntry);
@@ -450,9 +458,14 @@ bool CChat::OnInput(const IInput::CEvent &Event)
450458
m_pHistoryEntry = m_History.Next(m_pHistoryEntry);
451459

452460
if(m_pHistoryEntry)
461+
{
453462
m_Input.Set(m_pHistoryEntry->m_aText);
454-
else
455-
m_Input.Clear();
463+
}
464+
else if(!m_EditingNewLine)
465+
{
466+
m_Input.Set(m_aCurrentInputText);
467+
m_EditingNewLine = true;
468+
}
456469
}
457470

458471
return true;

‎src/game/client/components/chat.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ class CChat : public CComponent
123123
int64_t m_LastChatSend;
124124
int64_t m_aLastSoundPlayed[CHAT_NUM];
125125
bool m_IsInputCensored;
126+
char m_aCurrentInputText[MAX_LINE_LENGTH];
127+
bool m_EditingNewLine;
126128

127129
static void ConSay(IConsole::IResult *pResult, void *pUserData);
128130
static void ConSayTeam(IConsole::IResult *pResult, void *pUserData);

‎src/game/client/components/menus_settings.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,8 +3088,14 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
30883088
g_Config.m_ClTextEntities ^= 1;
30893089

30903090
if(g_Config.m_ClTextEntities)
3091+
{
3092+
int PreviousSize = g_Config.m_ClTextEntitiesSize;
30913093
UI()->DoScrollbarOption(&g_Config.m_ClTextEntitiesSize, &g_Config.m_ClTextEntitiesSize, &Button, Localize("Size"), 0, 100);
30923094

3095+
if(PreviousSize != g_Config.m_ClTextEntitiesSize)
3096+
m_pClient->m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
3097+
}
3098+
30933099
Left.HSplitTop(20.0f, &Button, &Left);
30943100
Button.VSplitMid(&LeftLeft, &Button);
30953101

0 commit comments

Comments
 (0)