PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-03-04 09:11:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

exit from the game when last gamestate is unloaded

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-12-26 13:38:15 +01:00
parent 3daa3c714f
commit 3934ca696b
2 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gamestates/disclaimer.c
View file

@ -52,8 +52,6 @@ void* Gamestate_Load(struct Game *game, void (*progress)(struct Game*)) {
data->font_small = al_load_ttf_font(GetDataFilePath("fonts/ShadowsIntoLight.ttf"),game->viewport.height*0.05,0 );
data->font = al_load_ttf_font(GetDataFilePath("fonts/ShadowsIntoLight.ttf"),game->viewport.height*0.065,0 );
if (progress) (*progress)(game);
//PrintConsole(game, "Preloading GAMESTATE_INTRO...");
//Intro_Preload(game, progress);
return data;
}

51
src/main.c
View file

@ -49,19 +49,11 @@ void DrawConsole(struct Game *game) {
game->_priv.fps_count.frames_done++;
}
int counter=0;
void DrawGamestates(struct Game *game) {
/*if (counter<0) {
PrintConsole(game, "logiced %d", abs(counter));
counter=0;
}
counter++;*/
al_clear_to_color(al_map_rgb(0,0,0));
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started)) {
//PrintConsole(game, "drawing %s", tmp->name);
(*tmp->api.Gamestate_Draw)(game, tmp->data);
}
tmp = tmp->next;
@ -69,15 +61,9 @@ void DrawGamestates(struct Game *game) {
}
void LogicGamestates(struct Game *game) {
/*if (counter>0) {
PrintConsole(game, "drawed %d", abs(counter));
counter=0;
}
counter--;*/
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started) && (!tmp->paused)) {
//PrintConsole(game, "logic %s", tmp->name);
(*tmp->api.Gamestate_Logic)(game, tmp->data);
}
tmp = tmp->next;
@ -322,7 +308,7 @@ int main(int argc, char **argv){
LoadGamestate(&game, gamestate);
StartGamestate(&game, gamestate);
//free(gamestate);
free(gamestate);
bool redraw = false;
@ -331,6 +317,8 @@ int main(int argc, char **argv){
if (redraw && al_is_event_queue_empty(game._priv.event_queue)) {
struct Gamestate *tmp = game._priv.gamestates;
bool gameActive = false;
while (tmp) {
if ((tmp->pending_load) && (!tmp->loaded)) {
PrintConsole(&game, "Loading gamestate %s...", tmp->name);
@ -394,9 +382,18 @@ int main(int argc, char **argv){
tmp->pending_start = false;
}
}
if ((tmp->started) || (tmp->pending_start) || (tmp->pending_load)) gameActive = true;
tmp=tmp->next;
}
if (!gameActive) {
PrintConsole(&game, "No gamestates left, exiting...");
break;
}
DrawGamestates(&game);
DrawConsole(&game);
al_flip_display();
@ -451,9 +448,6 @@ int main(int argc, char **argv){
al_save_bitmap(al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP), al_get_backbuffer(game.display));
PrintConsole(&game, "Screenshot stored in %s", al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP));
al_destroy_path(path);
} else if (ev.keyboard.keycode == ALLEGRO_KEY_ESCAPE) {
// TODO: handle shutting down with gamestates correctly (unloading last gamestate)
break;
}
// TODO: redirect keydown events to gamestates
KeydownGamestates(&game, &ev);
@ -475,10 +469,23 @@ int main(int argc, char **argv){
}
game.shuttingdown = true;
// FIXME: proper gamestates unload handling
StopGamestate(&game, gamestate);
UnloadGamestate(&game, gamestate);
free(gamestate);
// in case of reload
struct Gamestate *tmp = game._priv.gamestates;
while (tmp) {
if (tmp->started) {
PrintConsole(&game, "Stopping gamestate %s...", tmp->name);
(*tmp->api.Gamestate_Stop)(&game, tmp->data);
tmp->started = false;
}
if (tmp->loaded) {
PrintConsole(&game, "Unloading gamestate %s...", tmp->name);
(*tmp->api.Gamestate_Unload)(&game, tmp->data);
dlclose(tmp->handle);
tmp->loaded = false;
}
tmp=tmp->next;
}
// TODO: unload loading
al_clear_to_color(al_map_rgb(0,0,0));
PrintConsole(&game, "Shutting down...");