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

This is Super Derpy: Muffin Attack 0.1a

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-07-13 11:05:38 +02:00
parent 3d9fb8c66a
commit 533410baee
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-07-13 Sebastian Krzyszkowiak <dos@dosowisko.net>
* src/levels/actions.c: fix crash on displaying letter from Twilight
2012-07-12 Sebastian Krzyszkowiak <dos@dosowisko.net> 2012-07-12 Sebastian Krzyszkowiak <dos@dosowisko.net>
* SuperDerpy.sh, doc/html/about_8c.html, doc/html/about_8h.html, * SuperDerpy.sh, doc/html/about_8c.html, doc/html/about_8h.html,

4
SuperDerpy.creator.user
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.5.81, 2012-07-12T18:07:41. --> <!-- Written by Qt Creator 2.5.81, 2012-07-13T13:49:15. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>GenericProjectManager.GenericProject.Toolchain</variable> <variable>GenericProjectManager.GenericProject.Toolchain</variable>
@ -60,7 +60,7 @@
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericTarget</value> <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericTarget</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="GenericProjectManager.GenericBuildConfiguration.BuildDirectory">/home/dos/git/SuperDerpy</value> <value type="QString" key="GenericProjectManager.GenericBuildConfiguration.BuildDirectory">/home/dos/git/SuperDerpy</value>
<value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:{2a0f2a2f-6b3a-4e88-a8f0-c4e642a21298}</value> <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:{2a0f2a2f-6b3a-4e88-a8f0-c4e642a21298}</value>

4
src/about.c
View file

@ -93,7 +93,7 @@ void About_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
al_set_target_bitmap(game->about.text_bitmap); al_set_target_bitmap(game->about.text_bitmap);
al_clear_to_color(al_map_rgba(0,0,0,0)); al_clear_to_color(al_map_rgba(0,0,0,0));
al_draw_text(game->about.font, al_map_rgb(0,0,0), 0.5*al_get_bitmap_width(game->about.text_bitmap), 0.015*al_get_bitmap_height(game->about.text_bitmap), ALLEGRO_ALIGN_CENTRE, "Super Derpy: Muffin Attack"); al_draw_text(game->about.font, al_map_rgb(0,0,0), 0.5*al_get_bitmap_width(game->about.text_bitmap), 0.015*al_get_bitmap_height(game->about.text_bitmap), ALLEGRO_ALIGN_CENTRE, "Super Derpy: Muffin Attack");
al_draw_text(game->about.font, al_map_rgb(0,0,0), 0.5*al_get_bitmap_width(game->about.text_bitmap), 0.035*al_get_bitmap_height(game->about.text_bitmap), ALLEGRO_ALIGN_CENTRE, "Version 0.1 (prealpha)"); al_draw_text(game->about.font, al_map_rgb(0,0,0), 0.5*al_get_bitmap_width(game->about.text_bitmap), 0.035*al_get_bitmap_height(game->about.text_bitmap), ALLEGRO_ALIGN_CENTRE, "Version 0.1a (Development Preview)");
float y=0.07; float y=0.07;
void draw_text(char* text) { void draw_text(char* text) {
@ -113,7 +113,7 @@ void About_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
/*draw_text(" - BaldDumboRat"); /*draw_text(" - BaldDumboRat");
draw_text(" Derpy Hooves");*/ draw_text(" Derpy Hooves");*/
draw_text(" - MEMJ0123"); draw_text(" - MEMJ0123");
draw_text(" http://memj0123.tumblr.com/"); draw_text(" http://www.youtube.com/user/MEMJ0123");
draw_text(" Princess Celestia"); draw_text(" Princess Celestia");
draw_text(" - Meredith Sims (Emichwan88)"); draw_text(" - Meredith Sims (Emichwan88)");
draw_text(" http://www.youtube.com/Emichwan88"); draw_text(" http://www.youtube.com/Emichwan88");

8
src/levels/actions.c
View file

@ -213,18 +213,22 @@ bool Letter(struct Game *game, struct TM_Action *action, enum TM_ActionState sta
ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value;
al_set_audio_stream_playing(*stream, false); al_set_audio_stream_playing(*stream, false);
al_destroy_audio_stream(*stream); al_destroy_audio_stream(*stream);
free(action->arguments->next->value);
free(action->arguments->value);
TM_DestroyArgs(action->arguments);
} }
if (state != TM_ACTIONSTATE_RUNNING) return false; if (state != TM_ACTIONSTATE_RUNNING) return false;
if (!action->arguments) { if (!action->arguments) {
action->arguments = TM_AddToArgs(action->arguments, malloc(sizeof(float))); action->arguments = TM_AddToArgs(action->arguments, malloc(sizeof(float)));
float* f = (float*)action->arguments->value; float* f = (float*)action->arguments->value;
*f = 0; *f = 0;
action->arguments->next = TM_AddToArgs(action->arguments, malloc(sizeof(ALLEGRO_AUDIO_STREAM*))); action->arguments = TM_AddToArgs(action->arguments, malloc(sizeof(ALLEGRO_AUDIO_STREAM*)));
ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value; ALLEGRO_AUDIO_STREAM** stream = (ALLEGRO_AUDIO_STREAM**)action->arguments->next->value;
*stream = al_load_audio_stream("data/levels/letter.flac", 4, 1024); *stream = al_load_audio_stream("data/levels/letter.flac", 4, 1024);
al_attach_audio_stream_to_mixer(*stream, game->audio.voice); al_attach_audio_stream_to_mixer(*stream, game->audio.voice);
al_set_audio_stream_playing(*stream, true); al_set_audio_stream_playing(*stream, true);
al_set_audio_stream_gain(*stream, 1.75); al_set_audio_stream_gain(*stream, 2.00);
action->arguments->next->next = NULL;
} }
float* f = (float*)action->arguments->value; float* f = (float*)action->arguments->value;
*f+=tps(game,350); *f+=tps(game,350);