From 7263242bd6373603ca95b5cb6d769a383a71e4b5 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Wed, 24 Jul 2024 19:58:59 +0200
Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Redu=C3=AFt=20el=20bounding=20box?=
 =?UTF-8?q?=20de=20l'heroi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/rooms/09.txt | 195 +++++++++++++++++++++++-----------------------
 source/actor.cpp  |   2 +-
 2 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/data/rooms/09.txt b/data/rooms/09.txt
index 7838e55..cdeef88 100644
--- a/data/rooms/09.txt
+++ b/data/rooms/09.txt
@@ -7,22 +7,12 @@ door-texture: 0
 under-door-texture: 0
 
 actor{
-    name: TAULETA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 0 0 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: BOX05
+    name: KALLAX-A03
     bmp: altres.gif
-    bmp-rect: 128 0 20 42
-    bmp-offset: -5 46
-    pos: 0 0 4
-    size: 8 8 8
+    bmp-rect: 72 48 24 27
+    bmp-offset: 0 31
+    pos: 0 16 0
+    size: 4 8 8
     movement: CW
 }
 
@@ -31,17 +21,7 @@ actor{
     bmp: altres.gif
     bmp-rect: 0 48 24 27
     bmp-offset: 0 31
-    pos: 0 8 0
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A03
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 0
+    pos: 0 32 0
     size: 4 8 8
     movement: CW
 }
@@ -80,16 +60,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 16 24 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: KALLAX-A07
     bmp: altres.gif
@@ -102,6 +72,72 @@ actor{
     movement: CW
 }
 
+actor{
+    name: KALLAX-A08
+    bmp: altres.gif
+    bmp-rect: 24 48 24 27
+    bmp-offset: -8 31
+    pos: 32 0 0
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A06
+    bmp: altres.gif
+    bmp-rect: 72 48 24 27
+    bmp-offset: -8 31
+    pos: 24 0 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A09
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: -8 31
+    pos: 32 0 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: TAULETA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 40 0 0
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: BOX05
+    bmp: altres.gif
+    bmp-rect: 128 0 20 42
+    bmp-offset: -5 46
+    pos: 40 0 4
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX01
+    bmp: caixes.gif
+    bmp-rect: 128 32 32 32
+    bmp-offset: 0 32
+    pos: 16 24 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX02
     bmp: caixes.gif
@@ -114,14 +150,34 @@ actor{
 }
 
 actor{
-    name: KALLAX-A08
+    name: KALLAX-A02
+    bmp: altres.gif
+    bmp-rect: 48 48 24 27
+    bmp-offset: 0 31
+    pos: 0 16 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A01
     bmp: altres.gif
     bmp-rect: 24 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 0
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
+    bmp-offset: 0 31
+    pos: 0 32 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 128 0 32 32
+    bmp-offset: 0 32
+    pos: 16 24 8
+    size: 8 8 2
+    flags: PUSHABLE 
+    react-push: XP 
     movement: CW
 }
 
@@ -138,49 +194,6 @@ actor{
     movement: X
 }
 
-actor{
-    name: KALLAX-A01
-    bmp: altres.gif
-    bmp-rect: 24 48 24 27
-    bmp-offset: 0 31
-    pos: 0 8 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A02
-    bmp: altres.gif
-    bmp-rect: 48 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 128 0 32 32
-    bmp-offset: 0 32
-    pos: 16 24 8
-    size: 8 8 8
-    react-push: XP 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A06
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: -8 31
-    pos: 24 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
 actor{
     name: BOX04
     bmp: caixes.gif
@@ -193,15 +206,3 @@ actor{
     react-push: XP 
     movement: CW
 }
-
-actor{
-    name: KALLAX-A09
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
diff --git a/source/actor.cpp b/source/actor.cpp
index e36a144..7e44fd3 100644
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -1345,7 +1345,7 @@ namespace actor
 
         void init(const bool complete)
         {
-            actor::actor_t *hero = actor::create("HERO", {16,32,8}, {8,8,12}, "test.gif", {0,32,20,32}, {-6,38});
+            actor::actor_t *hero = actor::create("HERO", {16,32,8}, {6,6,12}, "test.gif", {0,32,20,32}, {-6,38});
             hero->flags = FLAG_HERO | FLAG_PUSHABLE | FLAG_GRAVITY | FLAG_ORIENTABLE | FLAG_ANIMATED;
             actor::setDirty(hero, true);