sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIXED] merge errors

Browse Source
This commit is contained in:
Menno
2021-05-28 10:10:58 +02:00
parent 942ddf24d8
commit 820c5a2eb0
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scenes/startupScene.h
View File

@@ -6,10 +6,10 @@ private:
int menuIndex;
public:
virtual void start() override;
virtual void stop() override;
virtual void render() override;
virtual void update(GLFWwindow* window) override;
virtual void onKey(int key, int scancode, int action, int mods) override;
void start() override;
void stop() override;
void render() override;
void update(GLFWwindow* window) override;
void onKey(int key, int scancode, int action, int mods) override;
};