Merge branch 'ddnet' into chillerbot

chillerbot · Nov 30, 2023 · fb9f2a7 · fb9f2a7
2 parents c530424 + 1cf80ed
commit fb9f2a7
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 43 deletions.
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
@@ -804,7 +804,7 @@ Pause
 == Пауза
 
 Kill
-== Суицид
+== Респаун
 
 Zoom in
 == Приблизить
@@ -933,7 +933,7 @@ Deaths
 == Смерти
 
 Suicides
-== Суицидов
+== Респауны
 
 Ratio
 == Соотношение

diff --git a/src/engine/antibot.h b/src/engine/antibot.h
@@ -5,7 +5,7 @@
 
 class IAntibot : public IInterface
 {
-	MACRO_INTERFACE("antibot", 0)
+	MACRO_INTERFACE("antibot")
 public:
 	virtual void RoundStart(class IGameServer *pGameServer) = 0;
 	virtual void RoundEnd() = 0;
@@ -29,7 +29,7 @@ class IAntibot : public IInterface
 
 class IEngineAntibot : public IAntibot
 {
-	MACRO_INTERFACE("engineantibot", 0)
+	MACRO_INTERFACE("engineantibot")
 public:
 	virtual void Init() = 0;
 

diff --git a/src/engine/client.h b/src/engine/client.h
@@ -31,7 +31,7 @@ struct CChecksumData;
 
 class IClient : public IInterface
 {
-	MACRO_INTERFACE("client", 0)
+	MACRO_INTERFACE("client")
 public:
 	/* Constants: Client States
 		STATE_OFFLINE - The client is offline.
@@ -307,7 +307,7 @@ class IClient : public IInterface
 
 class IGameClient : public IInterface
 {
-	MACRO_INTERFACE("gameclient", 0)
+	MACRO_INTERFACE("gameclient")
 protected:
 public:
 	virtual void OnConsoleInit() = 0;

diff --git a/src/engine/config.h b/src/engine/config.h
@@ -7,7 +7,7 @@
 
 class IConfigManager : public IInterface
 {
-	MACRO_INTERFACE("config", 0)
+	MACRO_INTERFACE("config")
 public:
 	typedef void (*SAVECALLBACKFUNC)(IConfigManager *pConfig, void *pUserData);
 

diff --git a/src/engine/console.h b/src/engine/console.h
@@ -16,7 +16,7 @@ struct CChecksumData;
 
 class IConsole : public IInterface
 {
-	MACRO_INTERFACE("console", 0)
+	MACRO_INTERFACE("console")
 public:
 	//	TODO: rework/cleanup
 	enum
@@ -34,8 +34,6 @@ class IConsole : public IInterface
 		TEMPCMD_HELP_LENGTH = 192,
 		TEMPCMD_PARAMS_LENGTH = 96,
 
-		MAX_PRINT_CB = 4,
-
 		CLIENT_ID_GAME = -2,
 		CLIENT_ID_NO_GAME = -3,
 	};

diff --git a/src/engine/demo.h b/src/engine/demo.h
@@ -64,7 +64,7 @@ struct CMapInfo
 
 class IDemoPlayer : public IInterface
 {
-	MACRO_INTERFACE("demoplayer", 0)
+	MACRO_INTERFACE("demoplayer")
 public:
 	class CInfo
 	{
@@ -105,7 +105,7 @@ class IDemoPlayer : public IInterface
 
 class IDemoRecorder : public IInterface
 {
-	MACRO_INTERFACE("demorecorder", 0)
+	MACRO_INTERFACE("demorecorder")
 public:
 	virtual ~IDemoRecorder() {}
 	virtual bool IsRecording() const = 0;
@@ -116,7 +116,7 @@ class IDemoRecorder : public IInterface
 
 class IDemoEditor : public IInterface
 {
-	MACRO_INTERFACE("demoeditor", 0)
+	MACRO_INTERFACE("demoeditor")
 public:
 	virtual void Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) = 0;
 };

diff --git a/src/engine/discord.h b/src/engine/discord.h
@@ -5,7 +5,7 @@
 
 class IDiscord : public IInterface
 {
-	MACRO_INTERFACE("discord", 0)
+	MACRO_INTERFACE("discord")
 public:
 	virtual void Update() = 0;
 

diff --git a/src/engine/editor.h b/src/engine/editor.h
@@ -6,7 +6,7 @@
 
 class IEditor : public IInterface
 {
-	MACRO_INTERFACE("editor", 0)
+	MACRO_INTERFACE("editor")
 public:
 	virtual ~IEditor() {}
 	virtual void Init() = 0;

diff --git a/src/engine/engine.h b/src/engine/engine.h
@@ -11,7 +11,7 @@ class ILogger;
 
 class IEngine : public IInterface
 {
-	MACRO_INTERFACE("engine", 0)
+	MACRO_INTERFACE("engine")
 
 protected:
 	class CJobPool m_JobPool;

diff --git a/src/engine/favorites.h b/src/engine/favorites.h
@@ -12,7 +12,7 @@ class IConfigManager;
 
 class IFavorites : public IInterface
 {
-	MACRO_INTERFACE("favorites", 0)
+	MACRO_INTERFACE("favorites")
 
 protected:
 	virtual void OnConfigSave(IConfigManager *pConfigManager) = 0;

diff --git a/src/engine/friends.h b/src/engine/friends.h
@@ -17,7 +17,7 @@ struct CFriendInfo
 
 class IFriends : public IInterface
 {
-	MACRO_INTERFACE("friends", 0)
+	MACRO_INTERFACE("friends")
 public:
 	enum
 	{

diff --git a/src/engine/ghost.h b/src/engine/ghost.h
@@ -17,7 +17,7 @@ class CGhostInfo
 
 class IGhostRecorder : public IInterface
 {
-	MACRO_INTERFACE("ghostrecorder", 0)
+	MACRO_INTERFACE("ghostrecorder")
 public:
 	virtual ~IGhostRecorder() {}
 
@@ -30,7 +30,7 @@ class IGhostRecorder : public IInterface
 
 class IGhostLoader : public IInterface
 {
-	MACRO_INTERFACE("ghostloader", 0)
+	MACRO_INTERFACE("ghostloader")
 public:
 	virtual ~IGhostLoader() {}
 

diff --git a/src/engine/graphics.h b/src/engine/graphics.h
@@ -232,7 +232,7 @@ typedef std::function<bool(uint32_t &Width, uint32_t &Height, CImageInfo::EImage
 
 class IGraphics : public IInterface
 {
-	MACRO_INTERFACE("graphics", 0)
+	MACRO_INTERFACE("graphics")
 protected:
 	int m_ScreenWidth;
 	int m_ScreenHeight;
@@ -547,7 +547,7 @@ class IGraphics : public IInterface
 
 class IEngineGraphics : public IGraphics
 {
-	MACRO_INTERFACE("enginegraphics", 0)
+	MACRO_INTERFACE("enginegraphics")
 public:
 	virtual int Init() = 0;
 	virtual void Shutdown() override = 0;

diff --git a/src/engine/input.h b/src/engine/input.h
@@ -10,7 +10,7 @@ extern const char g_aaKeyStrings[g_MaxKeys][20];
 
 class IInput : public IInterface
 {
-	MACRO_INTERFACE("input", 0)
+	MACRO_INTERFACE("input")
 public:
 	enum
 	{
@@ -141,7 +141,7 @@ class IInput : public IInterface
 
 class IEngineInput : public IInput
 {
-	MACRO_INTERFACE("engineinput", 0)
+	MACRO_INTERFACE("engineinput")
 public:
 	virtual void Init() = 0;
 	virtual void Shutdown() override = 0;

diff --git a/src/engine/kernel.h b/src/engine/kernel.h
@@ -24,7 +24,7 @@ class IInterface
 	virtual ~IInterface() {}
 };
 
-#define MACRO_INTERFACE(Name, ver) \
+#define MACRO_INTERFACE(Name) \
 public: \
 	static const char *InterfaceName() { return Name; } \
 \

diff --git a/src/engine/map.h b/src/engine/map.h
@@ -13,7 +13,7 @@ enum
 
 class IMap : public IInterface
 {
-	MACRO_INTERFACE("map", 0)
+	MACRO_INTERFACE("map")
 public:
 	virtual int GetDataSize(int Index) const = 0;
 	virtual void *GetData(int Index) = 0;
@@ -32,7 +32,7 @@ class IMap : public IInterface
 
 class IEngineMap : public IMap
 {
-	MACRO_INTERFACE("enginemap", 0)
+	MACRO_INTERFACE("enginemap")
 public:
 	virtual bool Load(const char *pMapName) = 0;
 	virtual void Unload() = 0;

diff --git a/src/engine/server.h b/src/engine/server.h
@@ -26,7 +26,7 @@ enum
 
 class IServer : public IInterface
 {
-	MACRO_INTERFACE("server", 0)
+	MACRO_INTERFACE("server")
 protected:
 	int m_CurrentGameTick;
 
@@ -274,7 +274,7 @@ class IServer : public IInterface
 
 class IGameServer : public IInterface
 {
-	MACRO_INTERFACE("gameserver", 0)
+	MACRO_INTERFACE("gameserver")
 protected:
 public:
 	// `pPersistentData` may be null if this is the first time `IGameServer`

diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h
@@ -247,7 +247,7 @@ class IFilterList
 
 class IServerBrowser : public IInterface
 {
-	MACRO_INTERFACE("serverbrowser", 0)
+	MACRO_INTERFACE("serverbrowser")
 public:
 	/* Constants: Server Browser Sorting
 		SORT_NAME - Sort by name.

diff --git a/src/engine/sound.h b/src/engine/sound.h
@@ -8,7 +8,7 @@
 
 class ISound : public IInterface
 {
-	MACRO_INTERFACE("sound", 0)
+	MACRO_INTERFACE("sound")
 public:
 	enum
 	{
@@ -109,7 +109,7 @@ class ISound : public IInterface
 
 class IEngineSound : public ISound
 {
-	MACRO_INTERFACE("enginesound", 0)
+	MACRO_INTERFACE("enginesound")
 public:
 	virtual int Init() = 0;
 	virtual int Update() = 0;

diff --git a/src/engine/steam.h b/src/engine/steam.h
@@ -5,7 +5,7 @@
 
 class ISteam : public IInterface
 {
-	MACRO_INTERFACE("steam", 0)
+	MACRO_INTERFACE("steam")
 public:
 	// Returns NULL if the name cannot be determined.
 	virtual const char *GetPlayerName() = 0;

diff --git a/src/engine/storage.h b/src/engine/storage.h
@@ -17,7 +17,7 @@ enum
 
 class IStorage : public IInterface
 {
-	MACRO_INTERFACE("storage", 0)
+	MACRO_INTERFACE("storage")
 public:
 	enum
 	{

diff --git a/src/engine/textrender.h b/src/engine/textrender.h
@@ -254,7 +254,7 @@ struct STextSizeProperties
 
 class ITextRender : public IInterface
 {
-	MACRO_INTERFACE("textrender", 0)
+	MACRO_INTERFACE("textrender")
 public:
 	virtual void SetCursor(CTextCursor *pCursor, float x, float y, float FontSize, int Flags) const = 0;
 	virtual void MoveCursor(CTextCursor *pCursor, float x, float y) const = 0;
@@ -315,7 +315,7 @@ class ITextRender : public IInterface
 
 class IEngineTextRender : public ITextRender
 {
-	MACRO_INTERFACE("enginetextrender", 0)
+	MACRO_INTERFACE("enginetextrender")
 public:
 	virtual void Init() = 0;
 	virtual void Shutdown() override = 0;

diff --git a/src/engine/updater.h b/src/engine/updater.h
@@ -5,7 +5,7 @@
 
 class IUpdater : public IInterface
 {
-	MACRO_INTERFACE("updater", 0)
+	MACRO_INTERFACE("updater")
 public:
 	enum
 	{

diff --git a/src/game/client/components/background.h b/src/game/client/components/background.h
@@ -15,7 +15,7 @@ class CMapImages;
 
 class CBackgroundEngineMap : public CMap
 {
-	MACRO_INTERFACE("background_enginemap", 0)
+	MACRO_INTERFACE("background_enginemap")
 };
 
 class CBackground : public CMapLayers

diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp
@@ -254,11 +254,11 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 					{
 						char *pEntry = m_History.Allocate(m_Input.GetLength() + 1);
 						str_copy(pEntry, m_Input.GetString(), m_Input.GetLength() + 1);
-						// print out the user's commands before they get run
-						char aBuf[256];
-						str_format(aBuf, sizeof(aBuf), "> %s", m_Input.GetString());
-						m_pGameConsole->PrintLine(m_Type, aBuf);
 					}
+					// print out the user's commands before they get run
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "> %s", m_Input.GetString());
+					m_pGameConsole->PrintLine(m_Type, aBuf);
 				}
 				ExecuteLine(m_Input.GetString());
 				m_Input.Clear();

diff --git a/src/game/client/components/menu_background.h b/src/game/client/components/menu_background.h
@@ -11,7 +11,7 @@
 
 class CMenuMap : public CBackgroundEngineMap
 {
-	MACRO_INTERFACE("menu_enginemap", 0)
+	MACRO_INTERFACE("menu_enginemap")
 };
 
 // themes