scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename OverworldEntity to GameEntity for shared code between dungeon and overworld sprites

Browse Source
This commit is contained in:
scawful
2024-08-24 23:56:49 -04:00
parent b1f231612d
commit 47b12526e7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/zelda3/common.h
View File

@@ -25,10 +25,10 @@ struct OWMapTiles {
using OWMapTiles = struct OWMapTiles; using OWMapTiles = struct OWMapTiles;
/** /**
* @class OverworldEntity * @class GameEntity
* @brief Base class for all overworld entities. * @brief Base class for all overworld and dungeon entities.
*/ */
class OverworldEntity { class GameEntity {
public: public:
enum EntityType { enum EntityType {
kEntrance = 0, kEntrance = 0,
@@ -38,8 +38,9 @@ class OverworldEntity {
kTransport = 4, kTransport = 4,
kMusic = 5, kMusic = 5,
kTilemap = 6, kTilemap = 6,
kProperties = 7 kProperties = 7,
} type_; kDungeonSprite = 8,
} entity_type_;
int x_; int x_;
int y_; int y_;
int game_x_; int game_x_;
@@ -50,7 +51,7 @@ class OverworldEntity {
auto set_x(int x) { x_ = x; } auto set_x(int x) { x_ = x; }
auto set_y(int y) { y_ = y; } auto set_y(int y) { y_ = y; }
OverworldEntity() = default; GameEntity() = default;
virtual void UpdateMapProperties(uint16_t map_id) = 0; virtual void UpdateMapProperties(uint16_t map_id) = 0;
}; };