Merge branch 'static-game-try-1'

This commit is contained in:
Sandro Sobczyński
2020-11-04 13:21:08 +01:00
29 changed files with 224 additions and 235 deletions
+3 -2
View File
@@ -24,12 +24,12 @@ class Engine
{
public:
Engine(const ScreenSettings &screen);
Engine();
~Engine();
void init(Game *t_game, u32 t_gifPacketSize);
void setDefaultScreen();
void setScreen(ScreenSettings &t_settings);
Renderer *renderer;
Audio audio;
ScreenSettings screen;
@@ -37,9 +37,10 @@ public:
float fps;
private:
void firePS2();
u8 fpsDelayer;
Timer timer;
u8 isInitialized, isScreenInitialized;
u8 isInitialized;
void gameLoop();
Game *game;
s32 mainThreadId;