add recording of Twilight's letter by Emichwan88

This commit is contained in:
Sebastian Krzyszkowiak 2012-07-12 18:54:32 +02:00
parent 3e187eeb98
commit 9a8264802a
3 changed files with 21 additions and 10 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.5.81, 2012-07-10T19:09:03. -->
<!-- Written by Qt Creator 2.5.81, 2012-07-12T18:07:41. -->
<qtcreator>
<data>
<variable>GenericProjectManager.GenericProject.Toolchain</variable>

View file

@ -112,17 +112,17 @@ void About_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
draw_text("Voices:");
/*draw_text(" - BaldDumboRat");
draw_text(" Derpy Hooves");*/
draw_text(" - Meredith Sims");
draw_text(" http://emichwan88.tumblr.com/");
draw_text(" - MEMJ0123");
draw_text(" http://memj0123.tumblr.com/");
draw_text(" Princess Celestia");
draw_text(" - Meredith Sims (Emichwan88)");
draw_text(" http://www.youtube.com/Emichwan88");
draw_text(" Fluttershy");
draw_text(" Twilight Sparkle");
draw_text(" Fluttershy");
/*draw_text(" - Hnilmik");
draw_text(" Rarity");
draw_text(" - Karen VO");
draw_text(" Applejack");*/
draw_text(" - MEMJ0123");
draw_text(" http://memj0123.tumblr.com/");
draw_text(" Princess Celestia");
/* draw_text(" - Erica Mendez");
draw_text(" Rainbow Dash");
draw_text(" - Emily Fajardo");
@ -151,12 +151,12 @@ void About_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
draw_text(" http://www.soundjay.com/");
draw_text("");
draw_text("Other graphics:");
draw_text(" - CptOfTheFriendship");
draw_text(" http://cptofthefriendship.deviantart.com/");
draw_text(" - hombre0");
draw_text(" http://hombre0.deviantart.com/");
draw_text(" - Siobhan Brewer");
draw_text(" http://boxdrink.deviantart.com/");
draw_text(" - CptOfTheFriendship");
draw_text(" http://cptofthefriendship.deviantart.com/");
draw_text("");
draw_text("Super Derpy: Muffin Attack comes");
draw_text("with ABSOLUTELY NO WARRANTY.");

View file

@ -209,16 +209,27 @@ bool Stop(struct Game *game, struct TM_Action *action, enum TM_ActionState state
bool Letter(struct Game *game, struct TM_Action *action, enum TM_ActionState state) {
if (state == TM_ACTIONSTATE_INIT) action->arguments = NULL;
if (state == TM_ACTIONSTATE_DESTROY) {
ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next;
al_set_audio_stream_playing(*stream, false);
al_destroy_audio_stream(*stream);
}
if (state != TM_ACTIONSTATE_RUNNING) return false;
if (!action->arguments) {
action->arguments = TM_AddToArgs(action->arguments, malloc(sizeof(float)));
float* f = (float*)action->arguments->value;
*f = 0;
action->arguments->next = TM_AddToArgs(action->arguments, malloc(sizeof(ALLEGRO_AUDIO_STREAM*)));
ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next;
*stream = al_load_audio_stream("data/levels/letter.flac", 4, 1024);
al_attach_audio_stream_to_mixer(*stream, game->audio.voice);
al_set_audio_stream_playing(*stream, true);
al_set_audio_stream_gain(*stream, 1.75);
}
float* f = (float*)action->arguments->value;
*f+=tps(game,350);
if (*f>255) *f=255;
al_draw_tinted_bitmap(game->level.letter, al_map_rgba(*f,*f,*f,*f), (al_get_display_width(game->display)-al_get_bitmap_width(game->level.letter))/2.0, al_get_bitmap_height(game->level.letter)*-0.05, 0);
al_draw_tinted_bitmap(game->level.letter, al_map_rgba(*f,*f,*f,*f), (al_get_display_width(game->display)-al_get_bitmap_width(game->level.letter))/2.0, al_get_bitmap_height(game->level.letter)*-0.05, 0);
struct ALLEGRO_KEYBOARD_STATE keyboard;
al_get_keyboard_state(&keyboard);
if (al_key_down(&keyboard, ALLEGRO_KEY_ENTER)) {