file structure reorganization

This commit is contained in:
Sebastian Krzyszkowiak 2012-02-19 18:10:08 +01:00
parent 1a484f9ecd
commit 888db62f02
8 changed files with 23 additions and 23 deletions

Binary file not shown.

Binary file not shown.

View file

@ -27,7 +27,7 @@ int About_Keydown(struct Game *game, ALLEGRO_EVENT *ev) {
//}
}
void About_Preload(struct Game *game) {
game->about.image = al_load_bitmap( "table.png" );
game->about.image = al_load_bitmap( "data/table.png" );
game->about.fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
al_set_target_bitmap(game->about.fade_bitmap);
al_draw_scaled_bitmap(game->about.image,0,0,al_get_bitmap_width(game->about.image),al_get_bitmap_height(game->about.image),0,0,al_get_display_width(game->display), al_get_display_height(game->display),0);

View file

@ -56,9 +56,9 @@ void Intro_Preload(struct Game *game) {
game->intro.position = 0;
game->intro.page = 0;
game->intro.in_animation = false;
game->intro.table_bitmap = al_load_bitmap( "discord.png" );
game->intro.table_bitmap = al_load_bitmap( "data/discord.png" );
game->intro.table = al_create_bitmap(al_get_display_width(game->display)*4, al_get_display_height(game->display));
game->intro.font = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.045,0 );
game->intro.font = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.045,0 );
al_set_target_bitmap(game->intro.table);
al_draw_scaled_bitmap(game->intro.table_bitmap, 0, 0, al_get_bitmap_width(game->intro.table_bitmap), al_get_bitmap_height(game->intro.table_bitmap), 0, 0, al_get_display_width(game->display), al_get_display_height(game->display), 0);
//game->intro.table_bitmap = al_load_bitmap( "table.png" );

View file

@ -30,7 +30,7 @@ void Loading_Draw(struct Game *game) {
}
void Loading_Load(struct Game *game) {
game->loading.image = al_load_bitmap( "loading.png" );
game->loading.image = al_load_bitmap( "data/loading.png" );
// Scale "Loading" bitmap
game->loading.loading_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));

4
main.c
View file

@ -172,8 +172,8 @@ int main(int argc, char **argv){
}
al_set_window_title(game.display, "Super Derpy: Muffin Attack");
al_hide_mouse_cursor(game.display);
game.font = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game.display)*0.09,0 );
game.font_console = al_load_ttf_font("DejaVuSansMono.ttf",al_get_display_height(game.display)*0.018,0 );
game.font = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game.display)*0.09,0 );
game.font_console = al_load_ttf_font("data/DejaVuSansMono.ttf",al_get_display_height(game.display)*0.018,0 );
game.event_queue = al_create_event_queue();
if(!game.event_queue) {

8
map.c
View file

@ -29,10 +29,10 @@ void Map_Preload(struct Game *game) {
game->map.available = 6;
game->map.selected = game->map.available;
game->map.map = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
game->map.background = al_load_bitmap( "table.png" );
game->map.map_bg = al_load_bitmap( "map/background.png" );
char filename[20] = { };
sprintf(filename, "map/highlight%d.png", game->map.available);
game->map.background = al_load_bitmap( "data/table.png" );
game->map.map_bg = al_load_bitmap( "data/map/background.png" );
char filename[30] = { };
sprintf(filename, "data/map/highlight%d.png", game->map.available);
game->map.highlight = al_load_bitmap( filename );
al_set_target_bitmap(game->map.map);
al_draw_scaled_bitmap(game->map.background,0,0,al_get_bitmap_width(game->map.background),al_get_bitmap_height(game->map.background),0,0,al_get_display_width(game->display), al_get_display_height(game->display),0);

26
menu.c
View file

@ -61,21 +61,21 @@ void Menu_Preload(struct Game *game) {
game->menu.options = false;
//game->menu.image = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
//al_destroy_bitmap(game->menu.image); // ugh...
game->menu.image = al_load_bitmap( "menu.png" );
game->menu.mountain = al_load_bitmap( "mountain.png" );
game->menu.sample = al_load_sample( "menu.wav" );
game->menu.rain_sample = al_load_sample( "rain.wav" );
game->menu.cloud = al_load_bitmap( "cloud.png" );
game->menu.cloud2 = al_load_bitmap( "cloud2.png" );
game->menu.pinkcloud = al_load_bitmap( "pinkcloud.png" );
game->menu.pie = al_load_bitmap( "pie.png" );
game->menu.rain = al_load_bitmap( "rain.png" );
game->menu.image = al_load_bitmap( "data/menu.png" );
game->menu.mountain = al_load_bitmap( "data/mountain.png" );
game->menu.sample = al_load_sample( "data/menu.wav" );
game->menu.rain_sample = al_load_sample( "data/rain.wav" );
game->menu.cloud = al_load_bitmap( "data/cloud.png" );
game->menu.cloud2 = al_load_bitmap( "data/cloud2.png" );
game->menu.pinkcloud = al_load_bitmap( "data/pinkcloud.png" );
game->menu.pie = al_load_bitmap( "data/pie.png" );
game->menu.rain = al_load_bitmap( "data/rain.png" );
game->menu.mountain_position = al_get_display_width(game->display)*0.7;
game->menu.font_title = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.16,0 );
game->menu.font_subtitle = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.08,0 );
game->menu.font = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.05,0 );
game->menu.font_selected = al_load_ttf_font("ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.065,0 );
game->menu.font_title = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.16,0 );
game->menu.font_subtitle = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.08,0 );
game->menu.font = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.05,0 );
game->menu.font_selected = al_load_ttf_font("data/ShadowsIntoLight.ttf",al_get_display_height(game->display)*0.065,0 );
if (!game->menu.sample){
fprintf(stderr, "Audio clip sample not loaded!\n" );