From e6b3d5ea13346ed5d981ae7e66053ad15ee3c7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Sun, 23 Oct 2022 22:55:17 +0200
Subject: [PATCH] Retocando mapas

---
 data/room/08.tmx                 | 8 ++++----
 data/room/09.tmx                 | 2 +-
 data/room/10.tmx                 | 2 +-
 data/room/50.room                | 4 ++--
 data/room/50.tmx                 | 2 +-
 source/common/animatedsprite.cpp | 2 +-
 source/credits.cpp               | 2 +-
 todo.txt                         | 1 +
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/data/room/08.tmx b/data/room/08.tmx
index a7a9250..b1554f3 100644
--- a/data/room/08.tmx
+++ b/data/room/08.tmx
@@ -7,10 +7,10 @@
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,82,
-82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,82,
-82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,306,0,0,0,0,0,0,0,0,82,
-82,0,0,0,0,306,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
-82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
+82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,82,
+82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,306,306,0,0,0,306,0,0,0,0,0,82,
+82,0,0,0,0,306,0,0,0,0,306,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
+82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,0,82,
 82,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82,
diff --git a/data/room/09.tmx b/data/room/09.tmx
index 57f1e6c..d60a667 100644
--- a/data/room/09.tmx
+++ b/data/room/09.tmx
@@ -11,7 +11,7 @@
 17,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17,
 17,0,0,0,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,0,0,0,17,
 17,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,0,305,0,0,0,0,0,0,17,
+17,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,0,17,
 17,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17,
 17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
 17,0,0,0,0,305,305,529,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17,
diff --git a/data/room/10.tmx b/data/room/10.tmx
index fa426db..c56bfe1 100644
--- a/data/room/10.tmx
+++ b/data/room/10.tmx
@@ -17,7 +17,7 @@
 86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,204,86,86,
+86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,86,86,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,0,0,86,86,86,86
 </data>
  </layer>
diff --git a/data/room/50.room b/data/room/50.room
index e5a5f01..d613cfd 100644
--- a/data/room/50.room
+++ b/data/room/50.room
@@ -44,7 +44,7 @@ color=yellow
 tileset=items.png
 tile=1
 x=4
-y=11
+y=9
 counter=1
 [/item]
 
@@ -52,7 +52,7 @@ counter=1
 tileset=items.png
 tile=1
 x=25
-y=11
+y=9
 counter=2
 [/item]
 
diff --git a/data/room/50.tmx b/data/room/50.tmx
index 8851baa..0aa3917 100644
--- a/data/room/50.tmx
+++ b/data/room/50.tmx
@@ -9,7 +9,7 @@
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-42,64,64,64,64,64,0,0,0,0,445,445,445,0,0,0,445,445,445,0,0,0,0,64,64,64,64,64,64,64,64,42,
+42,64,64,64,64,64,0,0,0,0,437,437,437,0,0,0,437,437,437,0,0,0,0,64,64,64,64,64,64,64,64,42,
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
 42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
diff --git a/source/common/animatedsprite.cpp b/source/common/animatedsprite.cpp
index a218957..be57dbc 100644
--- a/source/common/animatedsprite.cpp
+++ b/source/common/animatedsprite.cpp
@@ -189,7 +189,7 @@ bool AnimatedSprite::loadFromFile(std::string filePath)
 	if (file.good())
 	{
 		// Procesa el fichero linea a linea
-		std::cout << "Loading animation from file: " << filePath.c_str() << std::endl;
+		std::cout << "Animation loaded: " << filename << std::endl;
 		while (std::getline(file, line))
 		{
 			// Si la linea contiene el texto [animation] se realiza el proceso de carga de una animación
diff --git a/source/credits.cpp b/source/credits.cpp
index 939594c..7a069a7 100644
--- a/source/credits.cpp
+++ b/source/credits.cpp
@@ -194,7 +194,7 @@ void Credits::render()
 	SDL_RenderCopy(renderer, textTexture, nullptr, nullptr);
 
 	// Dibuja la textura que cubre el texto
-	const int offset = std::min(counter / 4, 192 / 2);
+	const int offset = std::min(counter / 8, 192 / 2);
 	SDL_Rect rect = {0, offset * 2, 256, 192};
 	SDL_RenderCopy(renderer, coverTexture, nullptr, &rect);
 
diff --git a/todo.txt b/todo.txt
index 00bec21..83b1a52 100644
--- a/todo.txt
+++ b/todo.txt
@@ -53,6 +53,7 @@ x (B) Así como no necesitar lo de frames per row
 (B) Si no se passa parametro, el fichero ani se deduce del png (y si no hay?)
 x (C) Que no cree la ventana y luego añada el borde
 (A) Las vidas del marcador no estan animadas. No cambian de frame
+(A) Mejorar las cintas. no permitir saltar hacia atras
 
 
 ## TEMAS