From 9c24dd6fbe505a9fbfe810470ce6f2a48613f360 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Mar 2023 22:48:25 +0200 Subject: a --- scenery/scenery.json | 7 +++++++ scenery/table.json | 52 +++++++++++++++++++++++----------------------------- src/character.cpp | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/scenery/scenery.json b/scenery/scenery.json index 270674a3..93df5f7b 100644 --- a/scenery/scenery.json +++ b/scenery/scenery.json @@ -13,6 +13,13 @@ "pass-mode": "pass", "offset": "0 x -32" }, + { + "name": "table0", + "type": "generic", + "atlas-name": "table", + "bbox-offset": "0 x 0", + "bbox-size": "60 x 115" + }, { "name": "bench1", "type": "generic", diff --git a/scenery/table.json b/scenery/table.json index 0609afe1..59b2d59b 100644 --- a/scenery/table.json +++ b/scenery/table.json @@ -1,31 +1,25 @@ { - "fps": 24, - "groups": [ - { - "frames": [ - { - "ground": "90 x 88", - "size": "180 x 164" - } - ], - "ground": "959 x 712", - "name": "n" - }, - { - "mirror-from": "n", - "name": "w", - "offset": [ - 0, - 0, - 0 - ] - } - ], - "nframes": 1, - "object_name": "table", - "pixel_size": "180 x 164", - "scale": [ - "width", - 180 - ] + "groups": [ + { + "frames": [ + { + "ground": "90 x 88", + "size": "180 x 164" + } + ], + "ground": "959 x 712", + "name": "n" + }, + { + "mirror-from": "n", + "name": "w" + } + ], + "nframes": 1, + "object_name": "table", + "pixel_size": "180 x 164", + "scale": [ + "width", + 180 + ] } diff --git a/src/character.cpp b/src/character.cpp index 4812c1f6..7934d1b3 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -212,7 +212,7 @@ character::character(object_id id, struct chunk& c, const character_proto& proto if (!atlas) atlas = loader.anim_atlas("npc-walk", loader.ANIM_PATH); fm_soft_assert(atlas->check_rotation(r)); - entity::set_bbox_(offset, bbox_offset, Vector2ub(iTILE_SIZE2/2), pass); + entity::set_bbox_(offset, bbox_offset, Vector2ub(iTILE_SIZE2/4), pass); } } // namespace floormat -- cgit v1.2.3