From 415080ba8fb256d3bc60f69734162b2804e4b20e Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Mon, 12 Sep 2022 20:40:23 +0200
Subject: [PATCH 1/2] =?UTF-8?q?A=C3=B1adidas=20nuevas=20pantallas=20(de=20?=
 =?UTF-8?q?la=207=20a=20la=2010)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/room/01.room           |  50 ++------------------
 data/room/02.room           |   6 +--
 data/room/04.room           |   2 +-
 data/room/04.tmx            |   6 +--
 data/room/07.room           |  92 ++++++++++++++++++++++++++++++++++++
 data/room/07.tmx            |  24 ++++++++++
 data/room/08.room           |  12 +++++
 data/room/08.tmx            |  24 ++++++++++
 data/room/09.room           |  12 +++++
 data/room/09.tmx            |  24 ++++++++++
 data/room/10.room           |  12 +++++
 data/room/10.tmx            |  24 ++++++++++
 media/tilesets/standard.png | Bin 2829 -> 3191 bytes
 source/director.cpp         |   8 ++++
 source/item.cpp             |   2 +-
 source/room.cpp             |   8 ++--
 16 files changed, 248 insertions(+), 58 deletions(-)
 create mode 100644 data/room/07.room
 create mode 100644 data/room/07.tmx
 create mode 100644 data/room/08.room
 create mode 100644 data/room/08.tmx
 create mode 100644 data/room/09.room
 create mode 100644 data/room/09.tmx
 create mode 100644 data/room/10.room
 create mode 100644 data/room/10.tmx

diff --git a/data/room/01.room b/data/room/01.room
index cee5924..e44be9f 100644
--- a/data/room/01.room
+++ b/data/room/01.room
@@ -23,8 +23,8 @@ vy=0.3
 x1=1
 y1=0
 x2=1
-y2=6
-color=red
+y2=5
+color=magenta
 [/enemy]
 
 [enemy]
@@ -40,7 +40,7 @@ x1=5
 y1=9
 x2=22
 y2=9
-color=yellow
+color=white
 [/enemy]
 
 [item]
@@ -48,7 +48,7 @@ tileset=items.png
 tile=1
 x=1
 y=7
-counter=6
+counter=1
 [/item]
 
 [item]
@@ -56,47 +56,5 @@ tileset=items.png
 tile=1
 x=17
 y=8
-counter=7
-[/item]
-
-
-
-[item]
-tileset=items.png
-tile=1
-x=12
-y=12
-counter=1
-[/item]
-
-[item]
-tileset=items.png
-tile=1
-x=13
-y=12
 counter=2
 [/item]
-
-[item]
-tileset=items.png
-tile=1
-x=14
-y=12
-counter=3
-[/item]
-
-[item]
-tileset=items.png
-tile=1
-x=15
-y=12
-counter=4
-[/item]
-
-[item]
-tileset=items.png
-tile=1
-x=16
-y=12
-counter=5
-[/item]
\ No newline at end of file
diff --git a/data/room/02.room b/data/room/02.room
index c878c4a..6b6b044 100644
--- a/data/room/02.room
+++ b/data/room/02.room
@@ -24,12 +24,12 @@ x1=14
 y1=0
 x2=14
 y2=12
-color=magenta
+color=cyan
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=7
 x=19
-y=6
+y=5
 [/item]
\ No newline at end of file
diff --git a/data/room/04.room b/data/room/04.room
index 94391c7..62f1275 100644
--- a/data/room/04.room
+++ b/data/room/04.room
@@ -4,7 +4,7 @@ border=blue
 tileset=standard.png
 roomUp=02.room
 roomDown=0
-roomLeft=0
+roomLeft=07.room
 roomRight=05.room
 
 [tilemap]
diff --git a/data/room/04.tmx b/data/room/04.tmx
index f210a4e..0d6cf7e 100644
--- a/data/room/04.tmx
+++ b/data/room/04.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
@@ -16,8 +16,8 @@
 25,0,0,0,0,229,229,229,229,229,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
 25,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,25,
 25,249,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-22,0,0,0,0,0,289,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,
-22,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,381,0,0,0,0,0,0,381,0,0,0,0,0,0,
+0,0,0,0,0,0,289,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,289,0,0,0,0,0,0,0,0,0,0,0,381,0,0,0,0,0,0,381,0,0,0,0,0,0,
 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25
 </data>
  </layer>
diff --git a/data/room/07.room b/data/room/07.room
new file mode 100644
index 0000000..8804297
--- /dev/null
+++ b/data/room/07.room
@@ -0,0 +1,92 @@
+name=chirping
+bgColor=black
+border=magenta
+tileset=standard.png
+roomUp=0
+roomDown=0
+roomLeft=08.room
+roomRight=04.room
+
+[tilemap]
+07.tmx
+[/tilemap]
+
+[enemy]
+tileset=paco.png
+animation=paco.ani
+width=16
+height=16
+x=4
+y=2
+vx=0
+vy=0.5
+x1=4
+y1=2
+x2=4
+y2=12
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=paco.png
+animation=paco.ani
+width=16
+height=16
+x=9
+y=11
+vx=0
+vy=-0.5
+x1=9
+y1=2
+x2=9
+y2=12
+color=green
+[/enemy]
+
+[enemy]
+tileset=paco.png
+animation=paco.ani
+width=16
+height=16
+x=26
+y=5
+vx=0
+vy=-0.5
+x1=26
+y1=2
+x2=26
+y2=12
+color=white
+[/enemy]
+
+[item]
+tileset=items.png
+tile=10
+x=2
+y=8
+counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=10
+x=2
+y=3
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=10
+x=29
+y=8
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=10
+x=29
+y=3
+counter=4
+[/item]
\ No newline at end of file
diff --git a/data/room/07.tmx b/data/room/07.tmx
new file mode 100644
index 0000000..c22ecac
--- /dev/null
+++ b/data/room/07.tmx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
+ <layer id="1" name="Capa de patrones 1" width="32" height="16">
+  <data encoding="csv">
+73,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,73,
+73,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,73,
+73,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,73,
+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,73,
+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,73,
+73,345,345,345,0,0,345,345,345,0,0,345,345,345,345,345,345,345,345,345,345,0,0,162,345,345,0,0,345,345,345,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,0,73,
+73,345,345,345,0,0,345,345,345,0,0,345,345,345,182,0,0,345,345,345,345,345,345,345,345,345,0,0,345,345,345,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,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,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,
+73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73
+</data>
+ </layer>
+</map>
diff --git a/data/room/08.room b/data/room/08.room
new file mode 100644
index 0000000..f6cb108
--- /dev/null
+++ b/data/room/08.room
@@ -0,0 +1,12 @@
+name=still thinking
+bgColor=black
+border=blue
+tileset=standard.png
+roomUp=0
+roomDown=09.room
+roomLeft=10.room
+roomRight=07.room
+
+[tilemap]
+08.tmx
+[/tilemap]
\ No newline at end of file
diff --git a/data/room/08.tmx b/data/room/08.tmx
new file mode 100644
index 0000000..53e9c15
--- /dev/null
+++ b/data/room/08.tmx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
+ <layer id="1" name="Capa de patrones 1" width="32" height="16">
+  <data encoding="csv">
+33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
+33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
+33,33,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,33,33,
+33,33,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,
+33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,341,341,341,0,0,0,0,0,0,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,33,33,33,33,33,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,33,33,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,33,33,
+33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,162,0,0,0,0,0,0,33,33,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,33,33,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,33,33,
+33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,33,33,
+33,33,351,351,351,0,0,351,351,351,351,351,0,0,351,351,351,351,351,351,0,0,0,0,0,0,0,0,0,0,33,33,
+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,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,0,0,
+351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,0,0,351,351,351,351,351,351,351,351,351,351,351,351
+</data>
+ </layer>
+</map>
diff --git a/data/room/09.room b/data/room/09.room
new file mode 100644
index 0000000..46194eb
--- /dev/null
+++ b/data/room/09.room
@@ -0,0 +1,12 @@
+name=slope test
+bgColor=blue
+border=blue
+tileset=standard.png
+roomUp=08.room
+roomDown=0
+roomLeft=0
+roomRight=0
+
+[tilemap]
+09.tmx
+[/tilemap]
\ No newline at end of file
diff --git a/data/room/09.tmx b/data/room/09.tmx
new file mode 100644
index 0000000..0e80816
--- /dev/null
+++ b/data/room/09.tmx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
+ <layer id="1" name="Capa de patrones 1" width="32" height="16">
+  <data encoding="csv">
+54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,0,0,0,163,54,54,54,54,54,54,54,54,54,54,54,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
+54,0,0,0,0,163,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,54,
+54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
+</data>
+ </layer>
+</map>
diff --git a/data/room/10.room b/data/room/10.room
new file mode 100644
index 0000000..9dbbd8e
--- /dev/null
+++ b/data/room/10.room
@@ -0,0 +1,12 @@
+name=welcome to the jail
+bgColor=black
+border=black
+tileset=standard.png
+roomUp=0
+roomDown=0
+roomLeft=0
+roomRight=08.room
+
+[tilemap]
+10.tmx
+[/tilemap]
\ No newline at end of file
diff --git a/data/room/10.tmx b/data/room/10.tmx
new file mode 100644
index 0000000..f60dfa8
--- /dev/null
+++ b/data/room/10.tmx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
+ <layer id="1" name="Capa de patrones 1" width="32" height="16">
+  <data encoding="csv">
+94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,127,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,127,0,127,0,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,127,0,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,127,127,127,0,127,0,127,0,127,0,127,127,127,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94
+</data>
+ </layer>
+</map>
diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png
index d014b3402f346f9109ee9a713ace5cd611b0f9df..316e2fada5d152cfa21ac84562bbcdec9843eae0 100644
GIT binary patch
delta 3174
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
M07*qoM6N<$g8U&Hi2wiq

delta 2809
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

diff --git a/source/director.cpp b/source/director.cpp
index b0a1a09..7a63d40 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -356,12 +356,20 @@ bool Director::setFileList()
 	asset->add("/data/room/04.room", room);
 	asset->add("/data/room/05.room", room);
 	asset->add("/data/room/06.room", room);
+	asset->add("/data/room/07.room", room);
+	asset->add("/data/room/08.room", room);
+	asset->add("/data/room/09.room", room);
+	asset->add("/data/room/10.room", room);
 	asset->add("/data/room/01.tmx", room);
 	asset->add("/data/room/02.tmx", room);
 	asset->add("/data/room/03.tmx", room);
 	asset->add("/data/room/04.tmx", room);
 	asset->add("/data/room/05.tmx", room);
 	asset->add("/data/room/06.tmx", room);
+	asset->add("/data/room/07.tmx", room);
+	asset->add("/data/room/08.tmx", room);
+	asset->add("/data/room/09.tmx", room);
+	asset->add("/data/room/10.tmx", room);
 
 	asset->add("/media/tilesets/standard.png", bitmap);
 
diff --git a/source/item.cpp b/source/item.cpp
index 9f9b72b..9026605 100644
--- a/source/item.cpp
+++ b/source/item.cpp
@@ -14,7 +14,7 @@ Item::Item(item_t item)
     sprite = new Sprite(item.x, item.y, 8, 8, texture, renderer);
 
     // Inicia variables
-    sprite->setSpriteClip(item.tile * 8, 0, 8, 8);
+    sprite->setSpriteClip((item.tile % 10) * 8, (item.tile / 10) * 8, 8, 8);
     collider = sprite->getRect();
     colorChangeSpeed = 4;
     counter = item.counter * colorChangeSpeed;
diff --git a/source/room.cpp b/source/room.cpp
index b19f6c3..7a77d2a 100644
--- a/source/room.cpp
+++ b/source/room.cpp
@@ -612,8 +612,8 @@ tile_e Room::getTile(SDL_Point point)
             return t_slope_l;
         }
 
-        // Las filas 10-14 son de tiles t_passable
-        if ((tilemap[pos] >= 10 * tilesetWidth) && (tilemap[pos] < 15 * tilesetWidth))
+        // Las filas 10-18 son de tiles t_passable
+        if ((tilemap[pos] >= 10 * tilesetWidth) && (tilemap[pos] < 19 * tilesetWidth))
         {
             return t_passable;
         }
@@ -648,8 +648,8 @@ tile_e Room::getTile(int index)
             return t_slope_l;
         }
 
-        // Las filas 10-14 son de tiles t_passable
-        if ((tilemap[index] >= 10 * tilesetWidth) && (tilemap[index] < 15 * tilesetWidth))
+        // Las filas 10-18 son de tiles t_passable
+        if ((tilemap[index] >= 10 * tilesetWidth) && (tilemap[index] < 19 * tilesetWidth))
         {
             return t_passable;
         }

From 0684a0f0c1a51cfc12e5c53e32686ef0d9ec84f2 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Mon, 12 Sep 2022 20:45:44 +0200
Subject: [PATCH 2/2] =?UTF-8?q?A=C3=B1adida=20tecla=20para=20activar/desac?=
 =?UTF-8?q?tivar=20el=20borde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/room/01.room |  2 +-
 data/room/02.room |  2 +-
 data/room/10.room |  2 +-
 source/game.cpp   |  5 +++++
 source/screen.cpp | 14 ++++++--------
 source/screen.h   |  2 --
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/data/room/01.room b/data/room/01.room
index e44be9f..d1eb5c1 100644
--- a/data/room/01.room
+++ b/data/room/01.room
@@ -1,6 +1,6 @@
 name=void main
 bgColor=black
-border=red
+border=yellow
 tileset=standard.png
 roomUp=0
 roomDown=0
diff --git a/data/room/02.room b/data/room/02.room
index 6b6b044..af5a6de 100644
--- a/data/room/02.room
+++ b/data/room/02.room
@@ -1,6 +1,6 @@
 name=case switch
 bgColor=black
-border=green
+border=cyan
 tileset=standard.png
 roomUp=0
 roomDown=04.room
diff --git a/data/room/10.room b/data/room/10.room
index 9dbbd8e..7bb46bb 100644
--- a/data/room/10.room
+++ b/data/room/10.room
@@ -1,6 +1,6 @@
 name=welcome to the jail
 bgColor=black
-border=black
+border=bright_magenta
 tileset=standard.png
 roomUp=0
 roomDown=0
diff --git a/source/game.cpp b/source/game.cpp
index 3db4ed1..3866f1e 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -102,6 +102,11 @@ void Game::checkEventHandler()
 				board.music ? JA_ResumeMusic() : JA_PauseMusic();
 				break;
 
+			case SDL_SCANCODE_B:
+				screen->switchBorder();
+				reLoadTextures();
+				break;
+
 			case SDL_SCANCODE_F:
 				screen->switchVideoMode();
 				reLoadTextures();
diff --git a/source/screen.cpp b/source/screen.cpp
index ee0c164..69ea685 100644
--- a/source/screen.cpp
+++ b/source/screen.cpp
@@ -15,8 +15,6 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options, i
 
     // Define el color del borde para el modo de pantalla completa
     borderColor = {0x00, 0x00, 0x00};
-    borderEnabled = options->borderEnabled;
-    borderSize = options->borderSize;
 
     // Crea la textura donde se dibujan los graficos del juego
     gameCanvas = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, gameCanvasWidth, gameCanvasHeight);
@@ -80,10 +78,10 @@ void Screen::setVideoMode(int fullScreenMode)
     // Si está activo el modo ventana quita el borde
     if (fullScreenMode == 0)
     {
-        if (borderEnabled)
+        if (options->borderEnabled)
         {
-            const int incWidth = gameCanvasWidth * borderSize;
-            const int incHeight = gameCanvasHeight * borderSize;
+            const int incWidth = gameCanvasWidth * options->borderSize;
+            const int incHeight = gameCanvasHeight * options->borderSize;
             screenWidth = gameCanvasWidth + incWidth;
             screenHeight = gameCanvasHeight + incHeight;
             dest = {0 + (incWidth / 2), 0 + (incHeight / 2), gameCanvasWidth, gameCanvasHeight};
@@ -192,18 +190,18 @@ void Screen::setBlendMode(SDL_BlendMode blendMode)
 // Establece el tamaño del borde
 void Screen::setBorderSize(float s)
 {
-    borderSize = s;
+    options->borderSize = s;
 }
 
 // Establece si se ha de ver el borde en el modo ventana
 void Screen::setBorderEnabled(bool value)
 {
-    borderEnabled = value;
+    options->borderEnabled = value;
 }
 
 // Cambia entre borde visible y no visible
 void Screen::switchBorder()
 {
-    borderEnabled = !borderEnabled;
+    options->borderEnabled = !options->borderEnabled;
     setVideoMode(0);
 }
\ No newline at end of file
diff --git a/source/screen.h b/source/screen.h
index aa013ee..6c0f7ab 100644
--- a/source/screen.h
+++ b/source/screen.h
@@ -32,8 +32,6 @@ private:
 	anchor_t anchor;	  // Variable con los anclajes de la pantalla
 	SDL_Rect dest;		  // Coordenadas donde se va a dibujar la textura del juego sobre la pantalla o ventana
 	color_t borderColor;  // Color del borde añadido a la textura de juego para rellenar la pantalla
-	bool borderEnabled;	  // Indica si ha de mostrar el borde en el modo de ventana
-	float borderSize;	  // Porcentaje de borde que se añade a lo ventana
 
 public:
 	// Constructor