Merge branch 'ddnet' into chillerbot

.github/workflows/build.yml

@@ -56,7 +56,6 @@ jobs:
     - name: Prepare Linux (non-fancy)
       if: ${{ contains(matrix.os, 'ubuntu') && !matrix.fancy }}
       run: |
-        rustup default 1.48.0
         sudo rm -rf /var/lib/mysql/ /var/run/mysqld
         sudo mkdir /var/lib/mysql/ /var/run/mysqld/
         sudo chown mysql:mysql /var/lib/mysql/ /var/run/mysqld/

CMakeLists.txt

@@ -1933,6 +1933,7 @@ set_src(ENGINE_SHARED GLOB_RECURSE src/engine/shared
   assertion_logger.h
   chillerbot/langparser.cpp
   chillerbot/langparser.h
+  chillerbot/variables.h
   compression.cpp
   compression.h
   config.cpp
@@ -2043,7 +2044,6 @@ set_src(GAME_SHARED GLOB src/game
   teamscore.cpp
   teamscore.h
   tuning.h
-  variables.h
   version.h
   voting.h
 )

data/languages/simplified_chinese.txt

@@ -35,6 +35,7 @@
 # 2023-05-21 RemakePower
 # 2023-07-20 By
 # 2023-08-11 By
+# 2023-11-25 By
 ##### /authors #####
 
 ##### translated strings #####
@@ -1715,76 +1716,76 @@ 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"
 
 Go back the specified duration
-== 
+== 快退指定时长
 
 [Demo player duration]
 %d min.
-== 
+== %d 分
 
 [Demo player duration]
 %d sec.
-== 
+== %d 秒
 
 Change the skip duration
-== 
+== 变更指定时长
 
 Go forward the specified duration
-== 
+== 快进指定时长
 
 Render cut to video
-== 
+== 渲染裁剪部分
 
 No demo selected
-== 
+== 未选择回放
 
 Created
-== 
+== 创建日期
 
 Netversion
-== 
+== Netversion
 
 [Demo details]
 map not included
-== 
+== 未包含地图
 
 Ghosts directory
-== 
+== 影子目录
 
 Activate all
-== 
+== 全部启用
 
 Deactivate all
-== 
+== 全部停用
 
 Enable ghost
-== 
+== 启用影子
 
 Only save improvements
-== 
+== 只保存更佳记录
 
 Regular background color
-== 
+== 原图层背景颜色
 
 Entities background color
-== 
+== 实体层背景颜色

data/languages/traditional_chinese.txt

@@ -24,6 +24,7 @@
 # 2023-05-25 cheeser0613
 # 2023-07-20 By
 # 2023-08-11 By
+# 2023-11-25 By
 ##### /authors #####
 
 ##### translated strings #####
@@ -698,7 +699,7 @@ Check now
 == 檢查更新
 
 Loading DDNet Client
-== 載入 DDNet 客戶端中...
+== 正在載入 DDNet 客戶端
 
 Browser
 == 瀏覽
@@ -1349,7 +1350,7 @@ Connected
 == 連接成功
 
 Loading map file from storage
-== 正在從硬盤中加載地圖檔案
+== 正在從硬盤中載入地圖檔案
 
 Why are you slowmo replaying to read this?
 == 所以你爲什麽要慢速回放來看這個？
@@ -1376,16 +1377,16 @@ Requesting to join the game
 == 正在請求加入游戲
 
 Loading menu images
-== 正在加載主菜單圖片
+== 正在載入主菜單圖片
 
 Loading demo files
-== 正在加載回放檔案
+== 正在載入回放檔案
 
 Loading ghost files
-== 正在加載影子檔案
+== 正在載入影子檔案
 
 Loading skin files
-== 正在加載外觀檔案
+== 正在載入外觀檔案
 
 Appearance
 == 游戲界面
@@ -1439,13 +1440,13 @@ A Tee
 == 其他玩家
 
 Loading assets
-== 正在加載材質
+== 正在載入材質
 
 Loading race demo files
-== 正在加載回放檔案
+== 正在載入回放檔案
 
 Loading sound files
-== 正在加載聲音檔案
+== 正在載入聲音檔案
 
 Play the current demo
 == 播放回放
@@ -1641,22 +1642,22 @@ No server selected
 == 未選擇伺服器
 
 Mark the beginning of a cut (right click to reset)
-== 標記裁剪起點 (右鍵重置)
+== 標記裁切起點 (右鍵重置)
 
 Mark the end of a cut (right click to reset)
-== 標記裁剪終點 (右鍵重置)
+== 標記裁切終點 (右鍵重置)
 
 Close the demo player
 == 關閉回放
 
 Export demo cut
-== 另存裁剪部分
+== 另存裁切部分
 
 Cut interval
-== 裁剪區間
+== 裁切區間
 
 Cut length
-== 裁剪長度
+== 裁切長度
 
 Axis
 == 軸
@@ -1704,76 +1705,76 @@ 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"
 
 Go back the specified duration
-== 
+== 倒轉指定時長
 
 [Demo player duration]
 %d min.
-== 
+== %d 分
 
 [Demo player duration]
 %d sec.
-== 
+== %d 秒
 
 Change the skip duration
-== 
+== 變更指定時長
 
 Go forward the specified duration
-== 
+== 快轉指定時長
 
 Render cut to video
-== 
+== 渲染裁切部分
 
 No demo selected
-== 
+== 未選擇回放
 
 Created
-== 
+== 建立日期
 
 Netversion
-== 
+== Netversion
 
 [Demo details]
 map not included
-== 
+== 未包含地圖
 
 Ghosts directory
-== 
+== 影子目錄
 
 Activate all
-== 
+== 全部啟用
 
 Deactivate all
-== 
+== 全部停用
 
 Enable ghost
-== 
+== 啟用影子
 
 Only save improvements
-== 
+== 只保存更佳記錄
 
 Regular background color
-== 
+== 原圖層背景顏色
 
 Entities background color
-== 
+== 實體層背景顏色

scripts/check_config_variables.py

@@ -46,7 +46,7 @@ def find_config_variables(config_variables):
 	return variables_not_found
 
 def main():
-	lines = read_all_lines('src/game/variables.h') + read_all_lines('src/engine/shared/config_variables.h')
+	lines = read_all_lines('src/engine/shared/config_variables.h')
 	config_variables = parse_config_variables(lines)
 	config_variables_not_found = find_config_variables(config_variables)
 	for variable_code in config_variables_not_found:

src/engine/client/serverbrowser.cpp

@@ -657,7 +657,7 @@ void CServerBrowser::SetLatency(NETADDR Addr, int Latency)
 CServerBrowser::CServerEntry *CServerBrowser::Add(const NETADDR *pAddrs, int NumAddrs)
 {
 	// create new pEntry
-	CServerEntry *pEntry = (CServerEntry *)m_ServerlistHeap.Allocate(sizeof(CServerEntry));
+	CServerEntry *pEntry = m_ServerlistHeap.Allocate<CServerEntry>();
 	mem_zero(pEntry, sizeof(CServerEntry));
 
 	// set the info

src/engine/console.h

@@ -126,7 +126,9 @@ class IConsole : public IInterface
 
 	// DDRace
 
-	bool m_Cheated;
+	virtual bool Cheated() const = 0;
+
+	virtual int FlagMask() const = 0;
 	virtual void SetFlagMask(int FlagMask) = 0;
 };
 

src/engine/server.h

@@ -204,6 +204,7 @@ class IServer : public IInterface
 	virtual void GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pSha256, int *pMapCrc) = 0;
 
 	virtual bool WouldClientNameChange(int ClientID, const char *pNameRequest) = 0;
+	virtual bool WouldClientClanChange(int ClientID, const char *pClanRequest) = 0;
 	virtual void SetClientName(int ClientID, const char *pName) = 0;
 	virtual void SetClientClan(int ClientID, const char *pClan) = 0;
 	virtual void SetClientCountry(int ClientID, int Country) = 0;