From 61e62a625c32713a97373b154b03a10abc47e53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Sun, 11 Sep 2022 11:10:38 +0200 Subject: [PATCH] cafe --- media/player/{player01.ani => player.ani} | 0 media/player/{player01.png => player.png} | Bin media/player/player2.ani | 24 ++++++++++++++++++++++ media/player/player2.png | Bin 0 -> 314 bytes source/director.cpp | 4 ++-- source/game.cpp | 4 ++-- source/scoreboard.cpp | 4 ++-- 7 files changed, 30 insertions(+), 6 deletions(-) rename media/player/{player01.ani => player.ani} (100%) rename media/player/{player01.png => player.png} (100%) create mode 100644 media/player/player2.ani create mode 100644 media/player/player2.png diff --git a/media/player/player01.ani b/media/player/player.ani similarity index 100% rename from media/player/player01.ani rename to media/player/player.ani diff --git a/media/player/player01.png b/media/player/player.png similarity index 100% rename from media/player/player01.png rename to media/player/player.png diff --git a/media/player/player2.ani b/media/player/player2.ani new file mode 100644 index 0000000..35dc70d --- /dev/null +++ b/media/player/player2.ani @@ -0,0 +1,24 @@ +frames_per_row=8 +frame_width=8 +frame_height=16 + +[animation] +name=stand +speed=8 +loop=0 +frames=0 +[/animation] + +[animation] +name=walk +speed=8 +loop=0 +frames=0,1,2,3,4,5,6,7 +[/animation] + +[animation] +name=walk_menu +speed=0 +loop=0 +frames=0,1,2,3,4,5,6,7 +[/animation] \ No newline at end of file diff --git a/media/player/player2.png b/media/player/player2.png new file mode 100644 index 0000000000000000000000000000000000000000..3e33e36ce7f836f2cd38b3d86570d81ce5bb825f GIT binary patch literal 314 zcmV-A0mc4_P)Px#^hrcPR9J=OR?!l}APAHF|3ABzwU>(#PDS}o2wbqJjGqclq^T=-p zw}XEb!bPy)RQ~TPps-OdbEop%a`F1ZZk}z_-<#!|9^eVp_f>udtc}*5K1@Ic@;+_C zN+L^v1mGde%)F9P<;i*sF49N-J)P2`??`_qfDeK2xC}D-6&pM(+Ni6+dU*w+V34;D z6hE8Lk%VI$8T&?$PSwW0!n4g&`cxBCcbUtMH&%Q!`Z6($a*<8add("/media/enemies/sigmasua.png", bitmap); asset->add("/media/enemies/sigmasua.ani", data); - asset->add("/media/player/player01.png", bitmap); - asset->add("/media/player/player01.ani", data); + asset->add("/media/player/player.png", bitmap); + asset->add("/media/player/player.ani", data); asset->add("/media/items/items.png", bitmap); diff --git a/source/game.cpp b/source/game.cpp index 062f08c..cf137c8 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -23,7 +23,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D scoreboard = new ScoreBoard(renderer, asset, &playerLives, &itemsPicked, &clock); itemTracker = new ItemTracker(); room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked, debug); - player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room, debug); + player = new Player(spawnPoint, asset->get("player.png"), asset->get("player.ani"), renderer, asset, input, room, debug); eventHandler = new SDL_Event(); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); music = JA_LoadMusic(asset->get("game.ogg").c_str()); @@ -318,7 +318,7 @@ void Game::killPlayer() // Crea la nueva habitación y el nuevo jugador room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked, debug); - player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room, debug); + player = new Player(spawnPoint, asset->get("player.png"), asset->get("player.ani"), renderer, asset, input, room, debug); } // Recarga todas las texturas diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index 77dedce..4a05a93 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -13,8 +13,8 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, int *lives, int *it this->clock = clock; // Reserva memoria para los objetos - texture = new LTexture(renderer, asset->get("player01.png")); - sprite = new AnimatedSprite(texture, renderer, asset->get("player01.ani")); + texture = new LTexture(renderer, asset->get("player.png")); + sprite = new AnimatedSprite(texture, renderer, asset->get("player.ani")); sprite->setCurrentAnimation("walk_menu"); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer);