PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-05 00:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

internal: Improve current_gamestate handling

Browse source 
Make sure that it's set to the loading gamestate when appropriate,
and NULL it afterwards.
This commit is contained in:
Sebastian Krzyszkowiak 2022-07-17 19:59:40 +02:00
parent 992d827daf
commit 6f03021d9e
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/internal.c
View file

@ -47,6 +47,7 @@ SYMBOL_INTERNAL void SimpleCompositor(struct Game* game) {
SYMBOL_INTERNAL void DrawGamestates(struct Game* game) {
struct Gamestate* tmp = game->_priv.gamestates;
while (tmp) {
if (tmp->loaded && tmp->started && tmp->api->predraw) {
game->_priv.current_gamestate = tmp;
@ -55,8 +56,10 @@ SYMBOL_INTERNAL void DrawGamestates(struct Game* game) {
tmp = tmp->next;
}
if (game->loading.shown && game->_priv.loading.gamestate->api->predraw) {
game->_priv.current_gamestate = game->_priv.loading.gamestate;
game->_priv.loading.gamestate->api->predraw(game, game->_priv.loading.gamestate->data);
}
game->_priv.current_gamestate = NULL;
if (!game->_priv.params.disable_bg_clear && !game->_priv.params.handlers.compositor && !game->_priv.params.handlers.predraw) {
ClearScreen(game);
@ -92,6 +95,8 @@ SYMBOL_INTERNAL void DrawGamestates(struct Game* game) {
game->_priv.loading.gamestate->api->draw(game, game->_priv.loading.gamestate->data);
}
game->_priv.current_gamestate = NULL;
al_set_target_backbuffer(game->display);
ALLEGRO_TRANSFORM t;
@ -132,6 +137,7 @@ SYMBOL_INTERNAL void LogicGamestates(struct Game* game, double delta) {
}
tmp = tmp->next;
}
game->_priv.current_gamestate = NULL;
if (game->_priv.params.handlers.postlogic) {
game->_priv.params.handlers.postlogic(game, delta);
}
@ -150,8 +156,10 @@ SYMBOL_INTERNAL void ReloadGamestates(struct Game* game) {
tmp = tmp->next;
}
if (game->_priv.loading.gamestate->api->reload) {
game->_priv.current_gamestate = game->_priv.loading.gamestate;
game->_priv.loading.gamestate->api->reload(game, game->_priv.loading.gamestate->data);
}
game->_priv.current_gamestate = NULL;
}
SYMBOL_INTERNAL void EventGamestates(struct Game* game, ALLEGRO_EVENT* ev) {
@ -163,6 +171,7 @@ SYMBOL_INTERNAL void EventGamestates(struct Game* game, ALLEGRO_EVENT* ev) {
}
tmp = tmp->next;
}
game->_priv.current_gamestate = NULL;
}
SYMBOL_INTERNAL void FreezeGamestates(struct Game* game) {