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

fix rest fadeloops

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-05-04 03:17:18 +02:00
parent 339b8a9be8
commit 763fd3e2f8
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/about.c
View file

@ -183,7 +183,7 @@ 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_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_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)); al_set_target_bitmap(al_get_backbuffer(game->display));
int fadeloop; float fadeloop;
if (game->about.fadeloop!=0) if (game->about.fadeloop!=0)
for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){ for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); al_wait_for_event(game->event_queue, &ev);

4
src/intro.c
View file

@ -167,7 +167,7 @@ void Intro_Draw(struct Game *game) {
void Intro_Load(struct Game *game) { void Intro_Load(struct Game *game) {
al_play_sample_instance(game->intro.music); al_play_sample_instance(game->intro.music);
ALLEGRO_EVENT ev; ALLEGRO_EVENT ev;
int fadeloop; float fadeloop;
for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){ for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); 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); al_draw_tinted_bitmap(game->intro.table,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
@ -243,7 +243,7 @@ void Intro_Unload(struct Game *game) {
al_destroy_audio_stream(game->intro.audiostream); al_destroy_audio_stream(game->intro.audiostream);
} }
ALLEGRO_EVENT ev; ALLEGRO_EVENT ev;
int fadeloop; float fadeloop;
for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){ for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); al_wait_for_event(game->event_queue, &ev);
if (game->intro.in_animation) { if (game->intro.in_animation) {

2
src/level.c
View file

@ -372,7 +372,7 @@ bool Welcome(struct Game *game, struct TM_Action *action, enum TM_ActionState st
} }
else if (state == TM_ACTIONSTATE_RUNNING) { else if (state == TM_ACTIONSTATE_RUNNING) {
/*PrintConsole(game, "WELCOME RUNNING FADE=%f, IN=%d", *in); */ /*PrintConsole(game, "WELCOME RUNNING FADE=%f, IN=%d", *in); */
int fade = *tmp; float fade = *tmp;
if (fade>255) fade=255; if (fade>255) fade=255;
if (*tmp > 2048) { *tmp=255; *in=false; } if (*tmp > 2048) { *tmp=255; *in=false; }
al_draw_tinted_bitmap(game->level.welcome, al_map_rgba_f(fade/255.0,fade/255.0,fade/255.0,fade/255.0), 0, 0, 0); al_draw_tinted_bitmap(game->level.welcome, al_map_rgba_f(fade/255.0,fade/255.0,fade/255.0,fade/255.0), 0, 0, 0);

4
src/map.c
View file

@ -59,7 +59,7 @@ void Map_Draw(struct Game *game) {
void Map_Load(struct Game *game) { void Map_Load(struct Game *game) {
al_play_sample_instance(game->map.music); al_play_sample_instance(game->map.music);
ALLEGRO_EVENT ev; ALLEGRO_EVENT ev;
int fadeloop; float fadeloop;
for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){ for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); 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); al_draw_tinted_bitmap(game->map.map,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
@ -140,7 +140,7 @@ void Map_Preload(struct Game *game) {
void Map_Unload(struct Game *game) { void Map_Unload(struct Game *game) {
ALLEGRO_EVENT ev; ALLEGRO_EVENT ev;
int fadeloop; float fadeloop;
for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){ for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); 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); al_draw_tinted_bitmap(game->map.map, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);

4
src/moonwalk.c
View file

@ -63,7 +63,7 @@ void Moonwalk_Load(struct Game *game) {
game->level.moonwalk.derpy_pos = -0.2; game->level.moonwalk.derpy_pos = -0.2;
al_play_sample_instance(game->level.music); al_play_sample_instance(game->level.music);
ALLEGRO_EVENT ev; ALLEGRO_EVENT ev;
int fadeloop; float fadeloop;
for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){ for(fadeloop=0; fadeloop<256; fadeloop+=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); al_wait_for_event(game->event_queue, &ev);
al_draw_tinted_bitmap(game->level.moonwalk.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0); al_draw_tinted_bitmap(game->level.moonwalk.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
@ -118,7 +118,7 @@ void Moonwalk_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_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_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)); al_set_target_bitmap(al_get_backbuffer(game->display));
int fadeloop; float fadeloop;
for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){ for(fadeloop=255; fadeloop>=0; fadeloop-=tps(game, 600)){
al_wait_for_event(game->event_queue, &ev); al_wait_for_event(game->event_queue, &ev);
al_draw_tinted_bitmap(game->level.moonwalk.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0); al_draw_tinted_bitmap(game->level.moonwalk.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);