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

cleaning up mess in data directory

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-04-30 00:55:27 +02:00
parent 9f8b3a3acd
commit 0ed5b9495c
7 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/about.c
View file

@ -64,9 +64,9 @@ int About_Keydown(struct Game *game, ALLEGRO_EVENT *ev) {
void About_Preload(struct Game *game) { void About_Preload(struct Game *game) {
game->about.image =LoadScaledBitmap("table.png", al_get_display_width(game->display), al_get_display_height(game->display)); game->about.image =LoadScaledBitmap("table.png", al_get_display_width(game->display), al_get_display_height(game->display));
game->about.letter = LoadScaledBitmap("letter.png", al_get_display_width(game->display), al_get_display_height(game->display) ); game->about.letter = LoadScaledBitmap("about/letter.png", al_get_display_width(game->display), al_get_display_height(game->display) );
game->about.sample = al_load_sample( "data/about.flac" ); game->about.sample = al_load_sample( "data/about/about.flac" );
game->about.music = al_create_sample_instance(game->about.sample); game->about.music = al_create_sample_instance(game->about.sample);
al_attach_sample_instance_to_mixer(game->about.music, game->audio.music); al_attach_sample_instance_to_mixer(game->about.music, game->audio.music);

12
src/intro.c
View file

@ -190,15 +190,15 @@ void Intro_Preload(struct Game *game) {
game->intro.in_animation = false; game->intro.in_animation = false;
game->intro.anim = 0; game->intro.anim = 0;
game->intro.animsprites[0] = LoadScaledBitmap("discord.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3); game->intro.animsprites[0] = LoadScaledBitmap("intro/discord.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);
game->intro.animsprites[1] = LoadScaledBitmap("derpcycle.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3); game->intro.animsprites[1] = LoadScaledBitmap("levels/derpcycle.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);
game->intro.animsprites[2] = LoadScaledBitmap("zombie.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3); game->intro.animsprites[2] = LoadScaledBitmap("intro/zombie.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);
game->intro.animsprites[3] = LoadScaledBitmap("loading.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3); game->intro.animsprites[3] = LoadScaledBitmap("loading.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);
game->intro.animsprites[4] = LoadScaledBitmap("letter.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3); game->intro.animsprites[4] = LoadScaledBitmap("about/letter.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);
game->intro.table_bitmap =LoadScaledBitmap("paper.png", al_get_display_width(game->display), al_get_display_height(game->display)); game->intro.table_bitmap =LoadScaledBitmap("intro/paper.png", al_get_display_width(game->display), al_get_display_height(game->display));
game->intro.sample = al_load_sample( "data/intro.flac" ); game->intro.sample = al_load_sample( "data/intro/intro.flac" );
game->intro.music = al_create_sample_instance(game->intro.sample); game->intro.music = al_create_sample_instance(game->intro.sample);
al_attach_sample_instance_to_mixer(game->intro.music, game->audio.music); al_attach_sample_instance_to_mixer(game->intro.music, game->audio.music);

15
src/level.c
View file

@ -286,14 +286,15 @@ void Level_Load(struct Game *game) {
TM_AddDelay(500); TM_AddDelay(500);
TM_AddQueuedBackgroundAction(&Accelerate, NULL, 0, "accelerate"); TM_AddQueuedBackgroundAction(&Accelerate, NULL, 0, "accelerate");
TM_AddAction(&Fly, NULL, "fly"); TM_AddAction(&Fly, NULL, "fly");
/*
// Derpy walks in... (background - owl)
// Derpy reads a letter
// Letter on screen
// Derpy: fly! (background - accelerate)
*/
/* first part gameplay goes here */ /* first part gameplay goes here */
/* actions for generating obstracles should go here
* probably as regular actions. When one ends, harder one
* begins. After last one part with muffins starts.
* Should obstracles themselves be handled as objects
* on timeline? (probably not). Hmm... */
TM_AddDelay(60*1000); TM_AddDelay(60*1000);
/* /*
@ -373,7 +374,7 @@ void Level_UnloadBitmaps(struct Game *game) {
} }
void Level_PreloadBitmaps(struct Game *game) { void Level_PreloadBitmaps(struct Game *game) {
game->level.derpy_walkcycle = LoadScaledBitmap("derpcycle.png", al_get_display_width(game->display)*0.1953125*6, al_get_display_height(game->display)*0.25*4); game->level.derpy_walkcycle = LoadScaledBitmap("levels/derpcycle.png", al_get_display_width(game->display)*0.1953125*6, al_get_display_height(game->display)*0.25*4);
game->level.derpy = al_create_bitmap(al_get_display_width(game->display)*0.1953125, al_get_display_height(game->display)*0.25); game->level.derpy = al_create_bitmap(al_get_display_width(game->display)*0.1953125, al_get_display_height(game->display)*0.25);
if (game->level.current_level!=1) Moonwalk_PreloadBitmaps(game); if (game->level.current_level!=1) Moonwalk_PreloadBitmaps(game);
else { else {

6
src/map.c
View file

@ -109,10 +109,10 @@ void Map_Preload(struct Game *game) {
sprintf(filename, "map/highlight%d.png", game->map.available); sprintf(filename, "map/highlight%d.png", game->map.available);
game->map.highlight = LoadScaledBitmap(filename, al_get_display_width(game->display), al_get_display_height(game->display)); game->map.highlight = LoadScaledBitmap(filename, al_get_display_width(game->display), al_get_display_height(game->display));
game->map.arrow = al_load_bitmap( "data/arrow.png" ); game->map.arrow = al_load_bitmap( "data/map/arrow.png" );
game->map.click_sample = al_load_sample( "data/click.flac" ); game->map.click_sample = al_load_sample( "data/menu/click.flac" );
game->map.sample = al_load_sample( "data/map.flac" ); game->map.sample = al_load_sample( "data/map/map.flac" );
game->map.music = al_create_sample_instance(game->map.sample); game->map.music = al_create_sample_instance(game->map.sample);
al_attach_sample_instance_to_mixer(game->map.music, game->audio.music); al_attach_sample_instance_to_mixer(game->map.music, game->audio.music);

20
src/menu.c
View file

@ -148,19 +148,19 @@ void Menu_Preload(struct Game *game) {
game->menu.options.width = game->width; game->menu.options.width = game->width;
game->menu.options.height = game->height; game->menu.options.height = game->height;
game->menu.loaded = true; game->menu.loaded = true;
game->menu.image = LoadScaledBitmap( "menu.png", al_get_display_width(game->display), al_get_display_height(game->display)*0.45); game->menu.image = LoadScaledBitmap( "menu/menu.png", al_get_display_width(game->display), al_get_display_height(game->display)*0.45);
game->menu.mountain = LoadScaledBitmap( "mountain.png", al_get_display_width(game->display)*0.055, al_get_display_height(game->display)/9 ); game->menu.mountain = LoadScaledBitmap( "menu/mountain.png", al_get_display_width(game->display)*0.055, al_get_display_height(game->display)/9 );
game->menu.cloud = LoadScaledBitmap( "cloud.png", al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.25 ); game->menu.cloud = LoadScaledBitmap( "menu/cloud.png", al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.25 );
game->menu.cloud2 = LoadScaledBitmap( "cloud2.png", al_get_display_width(game->display)*0.2, al_get_display_height(game->display)*0.1 ); game->menu.cloud2 = LoadScaledBitmap( "menu/cloud2.png", al_get_display_width(game->display)*0.2, al_get_display_height(game->display)*0.1 );
game->menu.pinkcloud = LoadScaledBitmap( "pinkcloud.png", al_get_display_width(game->display)*0.33125, al_get_display_height(game->display)*0.8122); game->menu.pinkcloud = LoadScaledBitmap( "menu/pinkcloud.png", al_get_display_width(game->display)*0.33125, al_get_display_height(game->display)*0.8122);
al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP); al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP);
game->menu.rain = al_load_bitmap( "data/rain.png" ); game->menu.rain = al_load_bitmap( "data/menu/rain.png" );
game->menu.pie = al_load_bitmap( "data/pie.png" ); game->menu.pie = al_load_bitmap( "data/menu/pie.png" );
al_set_new_bitmap_flags(ALLEGRO_MAG_LINEAR | ALLEGRO_MIN_LINEAR); al_set_new_bitmap_flags(ALLEGRO_MAG_LINEAR | ALLEGRO_MIN_LINEAR);
game->menu.sample = al_load_sample( "data/menu.flac" ); game->menu.sample = al_load_sample( "data/menu/menu.flac" );
game->menu.rain_sample = al_load_sample( "data/rain.flac" ); game->menu.rain_sample = al_load_sample( "data/menu/rain.flac" );
game->menu.click_sample = al_load_sample( "data/click.flac" ); game->menu.click_sample = al_load_sample( "data/menu/click.flac" );
game->menu.mountain_position = al_get_display_width(game->display)*0.7; game->menu.mountain_position = al_get_display_width(game->display)*0.7;
game->menu.music = al_create_sample_instance(game->menu.sample); game->menu.music = al_create_sample_instance(game->menu.sample);

4
src/moonwalk.c
View file

@ -79,7 +79,7 @@ int Moonwalk_Keydown(struct Game *game, ALLEGRO_EVENT *ev) {
void Moonwalk_PreloadBitmaps(struct Game *game) { void Moonwalk_PreloadBitmaps(struct Game *game) {
game->level.moonwalk.image =LoadScaledBitmap("table.png", al_get_display_width(game->display), al_get_display_height(game->display)); game->level.moonwalk.image =LoadScaledBitmap("table.png", al_get_display_width(game->display), al_get_display_height(game->display));
game->level.derpy_walkcycle = LoadScaledBitmap("derpcycle.png", al_get_display_width(game->display)*0.1953125*6, al_get_display_height(game->display)*0.25*4); game->level.derpy_walkcycle = LoadScaledBitmap("levels/derpcycle.png", al_get_display_width(game->display)*0.1953125*6, al_get_display_height(game->display)*0.25*4);
game->level.derpy = al_create_bitmap(al_get_display_width(game->display)*0.1953125, al_get_display_height(game->display)*0.25); game->level.derpy = al_create_bitmap(al_get_display_width(game->display)*0.1953125, al_get_display_height(game->display)*0.25);
@ -93,7 +93,7 @@ void Moonwalk_PreloadBitmaps(struct Game *game) {
void Moonwalk_Preload(struct Game *game) { void Moonwalk_Preload(struct Game *game) {
PrintConsole(game, "Initializing level %d...", game->level.current_level); PrintConsole(game, "Initializing level %d...", game->level.current_level);
game->level.sample = al_load_sample( "data/moonwalk.flac" ); game->level.sample = al_load_sample( "data/levels/moonwalk.flac" );
game->level.music = al_create_sample_instance(game->level.sample); game->level.music = al_create_sample_instance(game->level.sample);
al_attach_sample_instance_to_mixer(game->level.music, game->audio.music); al_attach_sample_instance_to_mixer(game->level.music, game->audio.music);
al_set_sample_instance_playmode(game->level.music, ALLEGRO_PLAYMODE_LOOP); al_set_sample_instance_playmode(game->level.music, ALLEGRO_PLAYMODE_LOOP);

2
src/pause.c
View file

@ -60,7 +60,7 @@ int Pause_Keydown(struct Game *game, ALLEGRO_EVENT *ev) {
void Pause_Preload(struct Game* game) { void Pause_Preload(struct Game* game) {
game->pause.bitmap = NULL; game->pause.bitmap = NULL;
game->pause.derpy = LoadScaledBitmap("derpy_pause.png", al_get_display_width(game->display)*0.53, al_get_display_height(game->display)*0.604); game->pause.derpy = LoadScaledBitmap("levels/derpy_pause.png", al_get_display_width(game->display)*0.53, al_get_display_height(game->display)*0.604);
PrintConsole(game,"Pause preloaded."); PrintConsole(game,"Pause preloaded.");
if (!game->menu.loaded) { if (!game->menu.loaded) {
PrintConsole(game,"Pause: Preloading GAMESTATE_MENU..."); PrintConsole(game,"Pause: Preloading GAMESTATE_MENU...");