diff --git a/src/engine/demo.h b/src/engine/demo.h index 3914d8b08..2bd27eefe 100644 --- a/src/engine/demo.h +++ b/src/engine/demo.h @@ -80,13 +80,6 @@ public: int m_aTimelineMarkers[MAX_TIMELINE_MARKERS]; }; - enum - { - DEMOTYPE_INVALID = 0, - DEMOTYPE_CLIENT, - DEMOTYPE_SERVER, - }; - enum ETickOffset { TICK_CURRENT, // update the current tick again @@ -108,7 +101,6 @@ public: virtual const CInfo *BaseInfo() const = 0; virtual void GetDemoName(char *pBuffer, size_t BufferSize) const = 0; virtual bool GetDemoInfo(class IStorage *pStorage, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo) const = 0; - virtual int GetDemoType() const = 0; }; class IDemoRecorder : public IInterface diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp index edd3e3fa0..df02c9781 100644 --- a/src/engine/shared/demo.cpp +++ b/src/engine/shared/demo.cpp @@ -759,14 +759,6 @@ int CDemoPlayer::Load(class IStorage *pStorage, class IConsole *pConsole, const } } - // get demo type - if(!str_comp(m_Info.m_Header.m_aType, "client")) - m_DemoType = DEMOTYPE_CLIENT; - else if(!str_comp(m_Info.m_Header.m_aType, "server")) - m_DemoType = DEMOTYPE_SERVER; - else - m_DemoType = DEMOTYPE_INVALID; - // save byte offset of map for later use const unsigned MapSize = bytes_be_to_uint(m_Info.m_Header.m_aMapSize); m_MapOffset = io_tell(m_File); @@ -1092,13 +1084,6 @@ bool CDemoPlayer::GetDemoInfo(class IStorage *pStorage, const char *pFilename, i return true; } -int CDemoPlayer::GetDemoType() const -{ - if(m_File) - return m_DemoType; - return DEMOTYPE_INVALID; -} - class CDemoRecordingListener : public CDemoPlayer::IListener { public: diff --git a/src/engine/shared/demo.h b/src/engine/shared/demo.h index 710564760..0a4a9a457 100644 --- a/src/engine/shared/demo.h +++ b/src/engine/shared/demo.h @@ -112,7 +112,6 @@ private: int m_SpeedIndex; CPlaybackInfo m_Info; - int m_DemoType; unsigned char m_aCompressedSnapshotData[CSnapshot::MAX_SIZE]; unsigned char m_aDecompressedSnapshotData[CSnapshot::MAX_SIZE]; unsigned char m_aCurrentSnapshotData[CSnapshot::MAX_SIZE]; @@ -157,7 +156,6 @@ public: void GetDemoName(char *pBuffer, size_t BufferSize) const override; bool GetDemoInfo(class IStorage *pStorage, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo) const override; const char *GetDemoFileName() { return m_aFilename; } - int GetDemoType() const override; int Update(bool RealTime = true);