From 576a206f00e6b63d173cba6d5cf78b1bd37e33a6 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Wed, 29 Feb 2012 12:16:11 +0100 Subject: [PATCH] don't require C99 standard --- Makefile | 2 +- src/about.c | 6 ++++-- src/config.c | 4 +++- src/intro.c | 6 ++++-- src/level.c | 6 ++++-- src/loading.c | 51 ++++++++++++++++++++++++++------------------------- src/map.c | 6 ++++-- src/menu.c | 6 ++++-- 8 files changed, 50 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index fc6122d..7add0db 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ IDIR =. CC=gcc -CFLAGS=-I$(IDIR) -std=gnu99 -Wall -DDEBUG -g +CFLAGS=-I$(IDIR) -Wall -g SRCDIR=src ODIR=obj diff --git a/src/about.c b/src/about.c index c8af872..a907bfe 100644 --- a/src/about.c +++ b/src/about.c @@ -22,7 +22,8 @@ void About_Draw(struct Game *game) { void About_Load(struct Game *game) { if (game->music) al_play_sample(game->about.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL); ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->about.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); DrawConsole(game); @@ -126,7 +127,8 @@ void About_Unload(struct Game *game) { al_draw_scaled_bitmap(game->about.letter,0,0,al_get_bitmap_width(game->about.letter),al_get_bitmap_height(game->about.letter),0,0,al_get_display_width(game->display), al_get_display_height(game->display),0); al_draw_bitmap_region(game->about.text_bitmap, 0, game->about.x*al_get_bitmap_height(game->about.text_bitmap), al_get_bitmap_width(game->about.text_bitmap), al_get_display_height(game->display)*0.8, al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.1, 0); al_set_target_bitmap(al_get_backbuffer(game->display)); - for(int fadeloop=255; fadeloop>=0; fadeloop-=10){ + int fadeloop; + for(fadeloop=255; fadeloop>=0; fadeloop-=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->about.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0); DrawConsole(game); diff --git a/src/config.c b/src/config.c index 2129f90..c85cedf 100644 --- a/src/config.c +++ b/src/config.c @@ -28,6 +28,7 @@ #include #include #include +#include "config.h" /*! \brief One config option in list of options. */ struct ConfigOption { @@ -86,7 +87,8 @@ void InitConfig() { new->value = malloc(sizeof(char)*255); new->value[0] = '\0'; new->next = NULL; - for (int i=0; imusic) al_play_sample(game->intro.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL); ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->intro.table,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); DrawConsole(game); @@ -132,7 +133,8 @@ void Intro_Preload(struct Game *game) { void Intro_Unload(struct Game *game) { ALLEGRO_EVENT ev; - for(int fadeloop=255; fadeloop>=0; fadeloop-=10){ + int fadeloop; + for(fadeloop=255; fadeloop>=0; fadeloop-=10){ al_wait_for_event(game->event_queue, &ev); if (game->intro.in_animation) al_draw_tinted_bitmap(game->intro.table, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), -1*(game->intro.page)*al_get_display_width(game->display) + (cos(((-1*((game->intro.position)%al_get_display_width(game->display)))/(float)al_get_display_width(game->display))*(3.1415))/2.0)*al_get_display_width(game->display) + al_get_display_width(game->display)/2.0, 0, 0); //al_get_display_height(game->display)*((game->intro.position/3.0)/(float)al_get_display_width(game->display)), 0); diff --git a/src/level.c b/src/level.c index 2b4ba61..a13363c 100644 --- a/src/level.c +++ b/src/level.c @@ -33,7 +33,8 @@ void Level_Draw(struct Game *game) { void Level_Load(struct Game *game) { if (game->music) al_play_sample(game->level.sample, 0.75, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL); ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->level.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); DrawConsole(game); @@ -85,7 +86,8 @@ void Level_Unload(struct Game *game) { al_draw_textf(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/2.2, ALLEGRO_ALIGN_CENTRE, "Level %d: Not implemented yet!", game->level.current_level); al_draw_text(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/1.8, ALLEGRO_ALIGN_CENTRE, "Have some moonwalk instead."); al_set_target_bitmap(al_get_backbuffer(game->display)); - for(int fadeloop=255; fadeloop>=0; fadeloop-=10){ + int fadeloop; + for(fadeloop=255; fadeloop>=0; fadeloop-=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->level.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0); DrawConsole(game); diff --git a/src/loading.c b/src/loading.c index 83480d7..71f6fba 100644 --- a/src/loading.c +++ b/src/loading.c @@ -5,33 +5,34 @@ #include "loading.h" void Loading_Draw(struct Game *game) { - ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ - al_wait_for_event(game->event_queue, &ev); - al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); - DrawConsole(game); - al_flip_display(); - } - - al_draw_bitmap(game->loading.loading_bitmap,0,0,0); - - al_stop_timer(game->timer); - - PreloadGameState(game); - - al_start_timer(game->timer); - - for(int fadeloop=255; fadeloop>0; fadeloop-=10){ - al_wait_for_event(game->event_queue, &ev); - al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); - DrawConsole(game); - al_flip_display(); - } - al_clear_to_color(al_map_rgb(0,0,0)); + ALLEGRO_EVENT ev; + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ + al_wait_for_event(game->event_queue, &ev); + al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); DrawConsole(game); al_flip_display(); - //al_rest(0.2); - LoadGameState(game); + } + + al_draw_bitmap(game->loading.loading_bitmap,0,0,0); + + al_stop_timer(game->timer); + + PreloadGameState(game); + + al_start_timer(game->timer); + + for(fadeloop=255; fadeloop>0; fadeloop-=10){ + al_wait_for_event(game->event_queue, &ev); + al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); + DrawConsole(game); + al_flip_display(); + } + al_clear_to_color(al_map_rgb(0,0,0)); + DrawConsole(game); + al_flip_display(); + //al_rest(0.2); + LoadGameState(game); } void Loading_Load(struct Game *game) { diff --git a/src/map.c b/src/map.c index 611de0d..ec54646 100644 --- a/src/map.c +++ b/src/map.c @@ -43,7 +43,8 @@ void Map_Draw(struct Game *game) { void Map_Load(struct Game *game) { if (game->music) al_play_sample(game->map.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL); ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->map.map,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); DrawConsole(game); @@ -114,7 +115,8 @@ void Map_Preload(struct Game *game) { void Map_Unload(struct Game *game) { game->level.current_level = game->map.selected; ALLEGRO_EVENT ev; - for(int fadeloop=255; fadeloop>=0; fadeloop-=10){ + int fadeloop; + for(fadeloop=255; fadeloop>=0; fadeloop-=10){ al_wait_for_event(game->event_queue, &ev); al_draw_tinted_bitmap(game->map.map, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0); DrawConsole(game); diff --git a/src/menu.c b/src/menu.c index bae36ef..c3e38ca 100644 --- a/src/menu.c +++ b/src/menu.c @@ -150,7 +150,8 @@ void Menu_Unload(struct Game *game) { game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)); ALLEGRO_EVENT ev; - for(int fadeloop=255; fadeloop>=0; fadeloop-=10){ + int fadeloop; + for(fadeloop=255; fadeloop>=0; fadeloop-=10){ if ((game->menu.draw_while_fading) || (fadeloop==255)) { Menu_Draw(game); al_set_target_bitmap(game->menu.menu_fade_bitmap); @@ -190,7 +191,8 @@ void Menu_Load(struct Game *game) { game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)); ALLEGRO_EVENT ev; - for(int fadeloop=0; fadeloop<256; fadeloop+=10){ + int fadeloop; + for(fadeloop=0; fadeloop<256; fadeloop+=10){ if ((game->menu.draw_while_fading) || (fadeloop==0)) { Menu_Draw(game); al_set_target_bitmap(game->menu.menu_fade_bitmap);