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

more member name cleanup

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2018-12-18 14:29:36 +01:00
parent 492aa79a6b
commit 1b9b16cf15
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Doxyfile
View file

@ -561,7 +561,7 @@ INLINE_INFO = YES
# name. If set to NO, the members will appear in declaration order. # name. If set to NO, the members will appear in declaration order.
# The default value is: YES. # 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 # 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 # descriptions of file, namespace and class members alphabetically by member

2
src/gamestate.c
View file

@ -68,7 +68,7 @@ SYMBOL_EXPORT void LoadGamestate(struct Game* game, const char* name) {
} else { } else {
gs = AddNewGamestate(game, name); gs = AddNewGamestate(game, name);
gs->pending_load = true; gs->pending_load = true;
gs->showLoading = true; gs->show_loading = true;
} }
PrintConsole(game, "Gamestate \"%s\" marked to be LOADED.", name); PrintConsole(game, "Gamestate \"%s\" marked to be LOADED.", name);
} }

2
src/gamestate.h
View file

@ -47,7 +47,7 @@ struct Gamestate {
bool loaded, pending_load, pending_unload; bool loaded, pending_load, pending_unload;
bool started, pending_start, pending_stop; bool started, pending_start, pending_stop;
bool frozen; bool frozen;
bool showLoading; bool show_loading;
bool paused; bool paused;
bool fromlib; bool fromlib;
bool open; bool open;

2
src/internal.c
View file

@ -376,7 +376,7 @@ SYMBOL_INTERNAL struct Gamestate* AllocateGamestate(struct Game* game, const cha
tmp->progress_count = 0; tmp->progress_count = 0;
tmp->open = false; tmp->open = false;
tmp->fb = NULL; tmp->fb = NULL;
tmp->showLoading = true; tmp->show_loading = true;
tmp->data = NULL; tmp->data = NULL;
return tmp; return tmp;
} }

2
src/libsuperderpy.c
View file

@ -352,7 +352,7 @@ SYMBOL_EXPORT int libsuperderpy_start(struct Game* game) {
struct Gamestate* tmp = game->_priv.gamestates; struct Gamestate* tmp = game->_priv.gamestates;
while (tmp) { while (tmp) {
// don't show loading screen on init if requested // 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; tmp = tmp->next;
} }
} }

8
src/mainloop.c
View file

@ -224,7 +224,7 @@ static inline bool MainloopTick(struct Game* game) {
} }
if (tmp->pending_load) { if (tmp->pending_load) {
al_stop_timer(game->_priv.timer); 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); (*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); al_run_detached_thread(GamestateLoadingThread, &data);
while (game->_priv.loading.in_progress) { while (game->_priv.loading.in_progress) {
double delta = al_get_time() - game->_priv.loading.time; double delta = al_get_time() - game->_priv.loading.time;
if (tmp->showLoading) { if (tmp->show_loading) {
game->loading.shown = true; game->loading.shown = true;
(*game->_priv.loading.gamestate->api->logic)(game, game->_priv.loading.gamestate->data, delta); (*game->_priv.loading.gamestate->api->logic)(game, game->_priv.loading.gamestate->data, delta);
DrawGamestates(game); DrawGamestates(game);
@ -302,11 +302,11 @@ static inline bool MainloopTick(struct Game* game) {
tmp->loaded = true; tmp->loaded = true;
tmp->pending_load = false; tmp->pending_load = false;
} }
if (tmp->showLoading) { if (tmp->show_loading) {
(*game->_priv.loading.gamestate->api->stop)(game, game->_priv.loading.gamestate->data); (*game->_priv.loading.gamestate->api->stop)(game, game->_priv.loading.gamestate->data);
game->loading.shown = false; game->loading.shown = false;
} }
tmp->showLoading = true; tmp->show_loading = true;
al_resume_timer(game->_priv.timer); al_resume_timer(game->_priv.timer);
game->_priv.timestamp = al_get_time(); game->_priv.timestamp = al_get_time();
} }