diff --git a/Doxyfile b/Doxyfile index c369862..a1db5c9 100644 --- a/Doxyfile +++ b/Doxyfile @@ -561,7 +561,7 @@ INLINE_INFO = YES # name. If set to NO, the members will appear in declaration order. # The default value is: YES. -SORT_MEMBER_DOCS = YES +SORT_MEMBER_DOCS = NO # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member diff --git a/src/gamestate.c b/src/gamestate.c index 2332c9d..75eb9c8 100644 --- a/src/gamestate.c +++ b/src/gamestate.c @@ -68,7 +68,7 @@ SYMBOL_EXPORT void LoadGamestate(struct Game* game, const char* name) { } else { gs = AddNewGamestate(game, name); gs->pending_load = true; - gs->showLoading = true; + gs->show_loading = true; } PrintConsole(game, "Gamestate \"%s\" marked to be LOADED.", name); } diff --git a/src/gamestate.h b/src/gamestate.h index 27604eb..1a00da4 100644 --- a/src/gamestate.h +++ b/src/gamestate.h @@ -47,7 +47,7 @@ struct Gamestate { bool loaded, pending_load, pending_unload; bool started, pending_start, pending_stop; bool frozen; - bool showLoading; + bool show_loading; bool paused; bool fromlib; bool open; diff --git a/src/internal.c b/src/internal.c index aefc0df..5f5f61c 100644 --- a/src/internal.c +++ b/src/internal.c @@ -376,7 +376,7 @@ SYMBOL_INTERNAL struct Gamestate* AllocateGamestate(struct Game* game, const cha tmp->progress_count = 0; tmp->open = false; tmp->fb = NULL; - tmp->showLoading = true; + tmp->show_loading = true; tmp->data = NULL; return tmp; } diff --git a/src/libsuperderpy.c b/src/libsuperderpy.c index 7215bf5..c4f4119 100644 --- a/src/libsuperderpy.c +++ b/src/libsuperderpy.c @@ -352,7 +352,7 @@ SYMBOL_EXPORT int libsuperderpy_start(struct Game* game) { struct Gamestate* tmp = game->_priv.gamestates; while (tmp) { // don't show loading screen on init if requested - tmp->showLoading = game->_priv.params.show_loading_on_launch; + tmp->show_loading = game->_priv.params.show_loading_on_launch; tmp = tmp->next; } } diff --git a/src/mainloop.c b/src/mainloop.c index 11b3ebd..b56ee0b 100644 --- a/src/mainloop.c +++ b/src/mainloop.c @@ -224,7 +224,7 @@ static inline bool MainloopTick(struct Game* game) { } if (tmp->pending_load) { al_stop_timer(game->_priv.timer); - if (tmp->showLoading) { + if (tmp->show_loading) { (*game->_priv.loading.gamestate->api->start)(game, game->_priv.loading.gamestate->data); } @@ -252,7 +252,7 @@ static inline bool MainloopTick(struct Game* game) { al_run_detached_thread(GamestateLoadingThread, &data); while (game->_priv.loading.in_progress) { double delta = al_get_time() - game->_priv.loading.time; - if (tmp->showLoading) { + if (tmp->show_loading) { game->loading.shown = true; (*game->_priv.loading.gamestate->api->logic)(game, game->_priv.loading.gamestate->data, delta); DrawGamestates(game); @@ -302,11 +302,11 @@ static inline bool MainloopTick(struct Game* game) { tmp->loaded = true; tmp->pending_load = false; } - if (tmp->showLoading) { + if (tmp->show_loading) { (*game->_priv.loading.gamestate->api->stop)(game, game->_priv.loading.gamestate->data); game->loading.shown = false; } - tmp->showLoading = true; + tmp->show_loading = true; al_resume_timer(game->_priv.timer); game->_priv.timestamp = al_get_time(); }