From bedba9deb5934237bf520f0a5c5923aea5ad20c5 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 29 Sep 2012 03:44:36 +0200 Subject: [PATCH] cosmetics and docs --- src/levels/actions.c | 19 ++++++------------- src/timeline.c | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/levels/actions.c b/src/levels/actions.c index aa1c744..f976edf 100644 --- a/src/levels/actions.c +++ b/src/levels/actions.c @@ -180,32 +180,25 @@ bool Letter(struct Game *game, struct TM_Action *action, enum TM_ActionState sta al_set_audio_stream_playing(*stream, false); al_set_audio_stream_gain(*stream, 2.00); action->arguments->next->next = NULL; - } - else if (state == TM_ACTIONSTATE_DESTROY) { + } else if (state == TM_ACTIONSTATE_DESTROY) { ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; al_set_audio_stream_playing(*stream, false); al_destroy_audio_stream(*stream); free(action->arguments->next->value); free(action->arguments->value); TM_DestroyArgs(action->arguments); - } - else if (state == TM_ACTIONSTATE_DRAW) { + } else if (state == TM_ACTIONSTATE_DRAW) { float* f = (float*)action->arguments->value; al_draw_tinted_bitmap(game->level.letter, al_map_rgba(*f,*f,*f,*f), (game->viewportWidth-al_get_bitmap_width(game->level.letter))/2.0, al_get_bitmap_height(game->level.letter)*-0.05, 0); return false; - } - else if (state == TM_ACTIONSTATE_PAUSE) { + } else if (state == TM_ACTIONSTATE_PAUSE) { ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; al_set_audio_stream_playing(*stream, false); - } else if (state == TM_ACTIONSTATE_RESUME) { + } else if ((state == TM_ACTIONSTATE_RESUME) || (state == TM_ACTIONSTATE_START)) { ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; al_set_audio_stream_playing(*stream, true); - } - else if (state == TM_ACTIONSTATE_START) { - ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; - al_set_audio_stream_playing(*stream, true); - } - else if (state != TM_ACTIONSTATE_RUNNING) return false; + } else if (state != TM_ACTIONSTATE_RUNNING) return false; + float* f = (float*)action->arguments->value; *f+=5; if (*f>255) *f=255; diff --git a/src/timeline.c b/src/timeline.c index cd2003b..ae8cb89 100644 --- a/src/timeline.c +++ b/src/timeline.c @@ -25,7 +25,6 @@ unsigned int lastid; struct Game* game = NULL; struct TM_Action *queue, *background; -// TODO: consider moving globals to some structure void TM_Init(struct Game* g) { PrintConsole(g, "Timeline Manager: init");