From 1f5acc66c97b66438d8623761dc5d28c0be6f72d Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 2 Jan 2025 10:07:15 -0500 Subject: [PATCH] remove unnecessary whitespace and comments in room_object and sprite files --- src/app/zelda3/dungeon/room_object.cc | 4 ---- src/app/zelda3/dungeon/room_object.h | 3 --- src/app/zelda3/sprite/overlord.h | 4 ++-- src/app/zelda3/sprite/sprite.cc | 10 ++-------- src/app/zelda3/sprite/sprite.h | 3 --- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/app/zelda3/dungeon/room_object.cc b/src/app/zelda3/dungeon/room_object.cc index 796bbe91..a6a3a2b3 100644 --- a/src/app/zelda3/dungeon/room_object.cc +++ b/src/app/zelda3/dungeon/room_object.cc @@ -3,7 +3,6 @@ namespace yaze { namespace zelda3 { - ObjectOption operator|(ObjectOption lhs, ObjectOption rhs) { return static_cast(static_cast(lhs) | static_cast(rhs)); @@ -130,8 +129,5 @@ void RoomObject::DrawTile(gfx::Tile16 t, int xx, int yy, } } - - } // namespace zelda3 - } // namespace yaze diff --git a/src/app/zelda3/dungeon/room_object.h b/src/app/zelda3/dungeon/room_object.h index f6a33d3a..4b2cf8c4 100644 --- a/src/app/zelda3/dungeon/room_object.h +++ b/src/app/zelda3/dungeon/room_object.h @@ -201,10 +201,7 @@ class Subtype3 : public RoomObject { } }; - - } // namespace zelda3 - } // namespace yaze #endif // YAZE_APP_ZELDA3_DUNGEON_ROOM_OBJECT_H diff --git a/src/app/zelda3/sprite/overlord.h b/src/app/zelda3/sprite/overlord.h index e559eccf..04801a45 100644 --- a/src/app/zelda3/sprite/overlord.h +++ b/src/app/zelda3/sprite/overlord.h @@ -36,6 +36,6 @@ static const std::string kOverlordNames[] = { }; } -} // namespace yaze +} // namespace yaze -#endif // YAZE_APP_ZELDA3_SPRITE_OVERLORD_H +#endif // YAZE_APP_ZELDA3_SPRITE_OVERLORD_H diff --git a/src/app/zelda3/sprite/sprite.cc b/src/app/zelda3/sprite/sprite.cc index 32c2d1ec..f2c40731 100644 --- a/src/app/zelda3/sprite/sprite.cc +++ b/src/app/zelda3/sprite/sprite.cc @@ -1,6 +1,7 @@ #include "sprite.h" -#include "app/zelda3/overworld/overworld.h" +#include +#include namespace yaze { namespace zelda3 { @@ -16,13 +17,6 @@ void Sprite::UpdateCoordinates(int map_x, int map_y) { map_y_ = map_y; } -void Sprite::UpdateBoundaryBox() { - lower_x_ = 1; - lower_y_ = 1; - higher_x_ = 15; - higher_x_ = 15; -} - void Sprite::Draw() { uint8_t x = nx_; uint8_t y = ny_; diff --git a/src/app/zelda3/sprite/sprite.h b/src/app/zelda3/sprite/sprite.h index c0a8896b..58f17438 100644 --- a/src/app/zelda3/sprite/sprite.h +++ b/src/app/zelda3/sprite/sprite.h @@ -325,7 +325,6 @@ class Sprite : public GameEntity { map_y_ = map_y; preview_gfx_.resize(64 * 64, 0xFF); } - void UpdateBoundaryBox(); void Draw(); void DrawSpriteTile(int x, int y, int srcx, int srcy, int pal, @@ -333,8 +332,6 @@ class Sprite : public GameEntity { int sizex = 2, int sizey = 2); void UpdateMapProperties(uint16_t map_id) override; - - // New methods void UpdateCoordinates(int map_x, int map_y); auto PreviewGraphics() const { return preview_gfx_; }