Skip to content

Commit

Permalink
Remove unused ver parameter of MACRO_INTERFACE
Browse files Browse the repository at this point in the history
(cherry picked from ddnet commit 5aa9003180a0f29f109e9aa5339aa52d3dce56b9)
  • Loading branch information
Robyt3 authored and Kaffeine committed Jul 9, 2024
1 parent 5c712db commit 649e2e5
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/engine/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class IConfigManager : public IInterface
{
MACRO_INTERFACE("config", 0)
MACRO_INTERFACE("config")
public:
typedef void (*SAVECALLBACKFUNC)(IConfigManager *pConfig, void *pUserData);

Expand Down
2 changes: 1 addition & 1 deletion src/engine/console.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static const ColorRGBA gs_ConsoleDefaultColor(1, 1, 1, 1);
enum LEVEL : char;
class IConsole : public IInterface
{
MACRO_INTERFACE("console", 0)
MACRO_INTERFACE("console")
public:
// TODO: rework/cleanup
enum
Expand Down
6 changes: 3 additions & 3 deletions src/engine/demo.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct CMapInfo

class IDemoPlayer : public IInterface
{
MACRO_INTERFACE("demoplayer", 0)
MACRO_INTERFACE("demoplayer")
public:
class CInfo
{
Expand Down Expand Up @@ -100,7 +100,7 @@ class IDemoPlayer : public IInterface

class IDemoRecorder : public IInterface
{
MACRO_INTERFACE("demorecorder", 0)
MACRO_INTERFACE("demorecorder")
public:
~IDemoRecorder() {}
virtual bool IsRecording() const = 0;
Expand All @@ -111,7 +111,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;
};
Expand Down
2 changes: 1 addition & 1 deletion src/engine/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CHostLookup : public IJob

class IEngine : public IInterface
{
MACRO_INTERFACE("engine", 0)
MACRO_INTERFACE("engine")

protected:
class CJobPool m_JobPool;
Expand Down
4 changes: 2 additions & 2 deletions src/engine/graphics.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ typedef std::function<bool(uint32_t &Width, uint32_t &Height, uint32_t &Format,

class IGraphics : public IInterface
{
MACRO_INTERFACE("graphics", 0)
MACRO_INTERFACE("graphics")
protected:
int m_ScreenWidth;
int m_ScreenHeight;
Expand Down Expand Up @@ -521,7 +521,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;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/http.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class IHttpRequest

class IHttp : public IInterface
{
MACRO_INTERFACE("http", 0)
MACRO_INTERFACE("http")

public:
virtual void Run(std::shared_ptr<IHttpRequest> pRequest) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class IInterface
virtual ~IInterface() {}
};

#define MACRO_INTERFACE(Name, ver) \
#define MACRO_INTERFACE(Name) \
public: \
static const char *InterfaceName() { return Name; } \
\
Expand Down
4 changes: 2 additions & 2 deletions src/engine/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ enum

class IMap : public IInterface
{
MACRO_INTERFACE("map", 0)
MACRO_INTERFACE("map")
public:
virtual void *GetData(int Index) = 0;
virtual int GetDataSize(int Index) const = 0;
Expand All @@ -30,7 +30,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;
Expand Down
4 changes: 2 additions & 2 deletions src/engine/masterserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class IMasterServer : public IInterface
{
MACRO_INTERFACE("masterserver", 0)
MACRO_INTERFACE("masterserver")
public:

enum
Expand All @@ -30,7 +30,7 @@ class IMasterServer : public IInterface

class IEngineMasterServer : public IMasterServer
{
MACRO_INTERFACE("enginemasterserver", 0)
MACRO_INTERFACE("enginemasterserver")
public:
};

Expand Down
4 changes: 2 additions & 2 deletions src/engine/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ enum

class IServer : public IInterface
{
MACRO_INTERFACE("server", 0)
MACRO_INTERFACE("server")
protected:
int m_CurrentGameTick;
int m_TickSpeed;
Expand Down Expand Up @@ -449,7 +449,7 @@ class IServer : public IInterface

class IGameServer : public IInterface
{
MACRO_INTERFACE("gameserver", 0)
MACRO_INTERFACE("gameserver")
protected:
public:
virtual void OnInit() = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enum

class IStorage : public IInterface
{
MACRO_INTERFACE("storage", 0)
MACRO_INTERFACE("storage")
public:
enum
{
Expand Down

0 comments on commit 649e2e5

Please sign in to comment.