1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00

remove other pr

This commit is contained in:
Laserlicht
2023-10-07 23:49:58 +02:00
parent be2b3afe48
commit 3c647334b0

View File

@@ -23,7 +23,6 @@ public:
virtual bool nextFrame()=0; virtual bool nextFrame()=0;
virtual void show(int x, int y, SDL_Surface *dst, bool update = true)=0; virtual void show(int x, int y, SDL_Surface *dst, bool update = true)=0;
virtual void redraw(int x, int y, SDL_Surface *dst, bool update = true)=0; //reblits buffer virtual void redraw(int x, int y, SDL_Surface *dst, bool update = true)=0; //reblits buffer
virtual VideoPath videoName()=0;
virtual bool wait()=0; virtual bool wait()=0;
virtual int curFrame() const =0; virtual int curFrame() const =0;
virtual int frameCount() const =0; virtual int frameCount() const =0;
@@ -48,7 +47,6 @@ public:
void redraw( int x, int y, SDL_Surface *dst, bool update = true ) override {}; void redraw( int x, int y, SDL_Surface *dst, bool update = true ) override {};
void show( int x, int y, SDL_Surface *dst, bool update = true ) override {}; void show( int x, int y, SDL_Surface *dst, bool update = true ) override {};
bool nextFrame() override {return false;}; bool nextFrame() override {return false;};
VideoPath videoName() override {return VideoPath();};
void close() override {}; void close() override {};
bool wait() override {return false;}; bool wait() override {return false;};
bool open(const VideoPath & name, bool scale = false) override {return false;}; bool open(const VideoPath & name, bool scale = false) override {return false;};
@@ -110,8 +108,6 @@ public:
std::pair<std::unique_ptr<ui8 []>, si64> getAudio(const VideoPath & videoToOpen) override; std::pair<std::unique_ptr<ui8 []>, si64> getAudio(const VideoPath & videoToOpen) override;
VideoPath videoName() override {return fname;};
//TODO: //TODO:
bool wait() override {return false;}; bool wait() override {return false;};
int curFrame() const override {return -1;}; int curFrame() const override {return -1;};