fix missing file in intro, few tweaks for animation speed in spritesheets

This commit is contained in:
Sebastian Krzyszkowiak 2012-05-03 19:59:53 +02:00
parent 8abc4a6763
commit 7c6b0a0044
2 changed files with 3 additions and 3 deletions

View file

@ -193,7 +193,7 @@ void Intro_Preload(struct Game *game) {
game->intro.anim = 0;
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("levels/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/derpy/walk.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[4] = LoadScaledBitmap("about/letter.png", al_get_display_width(game->display)*0.3125*3, al_get_display_height(game->display)*0.63*3);

View file

@ -265,9 +265,9 @@ void Level_Draw(struct Game *game) {
al_set_target_bitmap(game->level.derpy);
al_clear_to_color(al_map_rgba(0,0,0,0));
al_draw_bitmap_region(*(game->level.derpy_sheet),al_get_bitmap_width(game->level.derpy)*(game->level.sheet_pos%game->level.sheet_cols),al_get_bitmap_height(game->level.derpy)*(game->level.sheet_pos/game->level.sheet_cols),al_get_bitmap_width(game->level.derpy), al_get_bitmap_height(game->level.derpy),0,0,0);
if (game->level.sheet_speed) {
if ((game->level.sheet_speed) && (game->level.sheet_speed_modifier)) {
game->level.sheet_tmp+=tps(game, 60);
if (game->level.sheet_tmp >= game->level.sheet_speed) {
if (game->level.sheet_tmp >= game->level.sheet_speed/game->level.sheet_speed_modifier) {
game->level.sheet_pos++;
game->level.sheet_tmp = 0;
}