Merge branch 'ddnet' into chillerbot

chillerbot · Nov 16, 2023 · 4ea7b4c · 4ea7b4c
2 parents 0ce841f + 55098cd
commit 4ea7b4c
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 62 deletions.
diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt
@@ -5,6 +5,7 @@
 # Chill & PoKeMoN 2023-03-31 16:00:00
 # Chill & PoKeMoN 2023-07-02 00:54:00
 # Chill [TD] & PoKeMoN [TD] 2023-09-22 17:49:00
+# Chill [TD] & PoKeMoN [TD] 2023-11-14 12:42:00
 # 
 ##### /authors #####
 
@@ -796,7 +797,7 @@ Are you sure that you want to remove the clan '%s' from your friends list?
 == Вы ўпэўненыя што хочаце выдаліць клан '%s' са спіса вашых сяброў?
 
 Please use a different filename
-== 
+== Калі ласка, выкарыстайце іншае імя файла
 
 File already exists, do you want to overwrite it?
 == Файл ужо існуе, ці вы хочаце перазапісаць яго?
@@ -1699,56 +1700,56 @@ Moved ingame
 == Перамешчаны ў гульні
 
 Error playing demo
-== 
+== Памылка прайгравання дэма
 
 Some map images could not be loaded. Check the local console for details.
-== 
+== Некаторыя відарысы карты немагчыма спампаваць. Для атрымання дэталей праверце лакальную кансоль.
 
 Some map sounds could not be loaded. Check the local console for details.
-== 
+== Некаторыя гукі карты немагчыма спампаваць. Для атрымання дэталей праверце лакальную кансоль.
 
 Loading menu themes
-== 
+== Спампоўка тэм меню
 
 Render complete
-== 
+== Рэндэр завершаны
 
 Videos directory
-== 
+== Тэчка відэа
 
 Video was saved to '%s'
-== 
+== Відэа было захавана ў '%s'
 
 No demo selected
-== 
+== Дэма не выбрана
 
 Created
-== 
+== Створана
 
 Netversion
-== 
+== Сеткавая версія
 
 [Demo details]
 map not included
-== 
+== карта не ўключана
 
 Ghosts directory
-== 
+== Тэчка прывідаў
 
 Activate all
-== 
+== Актываваць усе
 
 Deactivate all
-== 
+== Дэактываваць усе
 
 Enable ghost
-== 
+== Уключыць прывід
 
 Only save improvements
-== 
+== Захоўваць толькі паляпшэнні
 
 Regular background color
-== 
+== Колер звычайнага фону
 
 Entities background color
-== 
+== Колер фону энтыты
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
@@ -18,6 +18,7 @@
 # unban 2023-03-10 21:50:50
 # eblan 2023-08-07 14:27:00
 # kaban 2023-9-21 19:00:00
+# ByFox 2023-11-14 11:24:00
 ##### /authors #####
 
 ##### translated strings #####
@@ -614,7 +615,7 @@ DDNet Client needs to be restarted to complete update!
 == Перезапустите DDNet Client для завершения обновления!
 
 Please use a different filename
-== 
+== Пожалуйста, используйте другое имя файла
 
 Show others
 == Показывать остальных
@@ -1752,16 +1753,16 @@ Activate all
 == Активировать все
 
 Deactivate all
-== 
+== Отключить все
 
 Enable ghost
-== 
+== Включить привидение
 
 Only save improvements
-== 
+== Сохранять только улучшения
 
 Regular background color
-== 
+== Обычный цвет фона
 
 Entities background color
-== 
+== Цвет фона сущностей
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
@@ -279,7 +279,7 @@ Ok
 == Aceptar
 
 Parent Folder
-== Directorio padre
+== Carpeta principal
 
 Password
 == Contraseña
@@ -674,7 +674,7 @@ Markers
 == Marcadores
 
 Length
-== Longitud
+== Duración
 
 Date
 == Fecha
@@ -869,7 +869,7 @@ Save the best demo of each race
 == Guardar la mejor demo de cada carrera
 
 Default length
-== Longitud predeterminada
+== Duración predeterminada
 
 Enable replays
 == Habilitar repeticiones
@@ -1718,56 +1718,56 @@ Render cut to video
 == Renderizar corte a vídeo
 
 Error playing demo
-== 
+== Error al reproducir la demo
 
 Some map images could not be loaded. Check the local console for details.
-== 
+== Algunas imágenes de mapas no se pudieron cargar. Revisa la consola local para más detalles.
 
 Some map sounds could not be loaded. Check the local console for details.
-== 
+== Algunos sonidos de mapas no se pudieron cargar. Revisa la consola local para más detalles.
 
 Loading menu themes
-== 
+== Cargando temas del menú
 
 Render complete
-== 
+== Renderización completada
 
 Videos directory
-== 
+== Carpeta de videos
 
 Video was saved to '%s'
-== 
+== El video guardó en '%s'
 
 No demo selected
-== 
+== Ninguna demo seleccionada
 
 Created
-== 
+== Creado
 
 Netversion
-== 
+== Netversion
 
 [Demo details]
 map not included
-== 
+== mapa no incluido
 
 Ghosts directory
-== 
+== Carpeta de Fantasmas
 
 Activate all
-== 
+== Activar todo
 
 Deactivate all
-== 
+== Desactivar todo
 
 Enable ghost
-== 
+== Habilitar fantasma
 
 Only save improvements
-== 
+== Solo guardar las mejoras
 
 Regular background color
-== 
+== Color del fondo normal
 
 Entities background color
-== 
+== Color del fondo de entidades
diff --git a/src/engine/shared/demo.h b/src/engine/shared/demo.h
@@ -122,7 +122,9 @@ class CDemoPlayer : public IDemoPlayer
  class CSnapshotDelta *m_pSnapshotDelta;
 
  bool m_UseVideo;
+#if defined(CONF_VIDEORECORDER)
  bool m_WasRecording = false;
+#endif
 
  enum EReadChunkHeaderResult
  {

diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp
@@ -389,7 +389,7 @@ int CBinds::GetKeyID(const char *pKeyName)
  // search for key
  for(int i = 0; i < KEY_LAST; i++)
  {
- if(str_comp(pKeyName, Input()->KeyName(i)) == 0)
+ if(str_comp_nocase(pKeyName, Input()->KeyName(i)) == 0)
  return i;
  }
 
@@ -404,13 +404,13 @@ int CBinds::GetBindSlot(const char *pBindString, int *pModifierCombination)
  const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
  while(aMod[0] && *(pKey))
  {
- if(!str_comp(aMod, "shift"))
+ if(!str_comp_nocase(aMod, "shift"))
  *pModifierCombination |= (1 << MODIFIER_SHIFT);
- else if(!str_comp(aMod, "ctrl"))
+ else if(!str_comp_nocase(aMod, "ctrl"))
  *pModifierCombination |= (1 << MODIFIER_CTRL);
- else if(!str_comp(aMod, "alt"))
+ else if(!str_comp_nocase(aMod, "alt"))
  *pModifierCombination |= (1 << MODIFIER_ALT);
- else if(!str_comp(aMod, "gui"))
+ else if(!str_comp_nocase(aMod, "gui"))
  *pModifierCombination |= (1 << MODIFIER_GUI);
  else
  return 0;

diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
@@ -125,6 +125,8 @@ void CChat::Reset()
  m_LastChatSend = 0;
  m_CurrentLine = 0;
  m_IsInputCensored = false;
+ m_EditingNewLine = true;
+ mem_zero(m_aCurrentInputText, sizeof(m_aCurrentInputText));
  DisableMode();
 
  for(int64_t &LastSoundPlayed : m_aLastSoundPlayed)
@@ -431,6 +433,12 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 
  if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_UP)
  {
+ if(m_EditingNewLine)
+ {
+ str_copy(m_aCurrentInputText, m_Input.GetString());
+ m_EditingNewLine = false;
+ }
+
  if(m_pHistoryEntry)
  {
  CHistoryEntry *pTest = m_History.Prev(m_pHistoryEntry);
@@ -450,9 +458,14 @@ bool CChat::OnInput(const IInput::CEvent &Event)
  m_pHistoryEntry = m_History.Next(m_pHistoryEntry);
 
  if(m_pHistoryEntry)
+ {
  m_Input.Set(m_pHistoryEntry->m_aText);
- else
- m_Input.Clear();
+ }
+ else if(!m_EditingNewLine)
+ {
+ m_Input.Set(m_aCurrentInputText);
+ m_EditingNewLine = true;
+ }
  }
 
  return true;

diff --git a/src/game/client/components/chat.h b/src/game/client/components/chat.h
@@ -123,6 +123,8 @@ class CChat : public CComponent
  int64_t m_LastChatSend;
  int64_t m_aLastSoundPlayed[CHAT_NUM];
  bool m_IsInputCensored;
+ char m_aCurrentInputText[MAX_LINE_LENGTH];
+ bool m_EditingNewLine;
 
  static void ConSay(IConsole::IResult *pResult, void *pUserData);
  static void ConSayTeam(IConsole::IResult *pResult, void *pUserData);

diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
@@ -3088,8 +3088,14 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
  g_Config.m_ClTextEntities ^= 1;
 
  if(g_Config.m_ClTextEntities)
+ {
+ int PreviousSize = g_Config.m_ClTextEntitiesSize;
  UI()->DoScrollbarOption(&g_Config.m_ClTextEntitiesSize, &g_Config.m_ClTextEntitiesSize, &Button, Localize("Size"), 0, 100);
 
+ if(PreviousSize != g_Config.m_ClTextEntitiesSize)
+ m_pClient->m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
+ }
+
  Left.HSplitTop(20.0f, &Button, &Left);
  Button.VSplitMid(&LeftLeft, &Button);