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

add dungeon.h to incl

Browse Source
This commit is contained in:
scawful
2024-10-07 07:59:38 -04:00
parent 1bc3188f1b
commit 3be53b9e53
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/zelda3/dungeon/room.cc
View File

@@ -11,6 +11,7 @@
#include "app/rom.h"
#include "app/zelda3/dungeon/room_object.h"
#include "app/zelda3/sprite/sprite.h"
#include "incl/dungeon.h"
namespace yaze {
namespace app {

16
src/app/zelda3/dungeon/room.h
View File

@@ -15,6 +15,7 @@
#include "app/rom.h"
#include "app/zelda3/dungeon/room_object.h"
#include "app/zelda3/sprite/sprite.h"
#include "incl/dungeon.h"
namespace yaze {
namespace app {
@@ -96,19 +97,6 @@ class DungeonDestination {
uint8_t TargetLayer = 0;
};
struct object_door {
object_door() = default;
object_door(short id, uint8_t x, uint8_t y, uint8_t size, uint8_t layer)
: id_(id), x_(x), y_(y), size_(size), layer_(layer) {}
short id_;
uint8_t x_;
uint8_t y_;
uint8_t size_;
uint8_t type_;
uint8_t layer_;
};
struct ChestData {
ChestData() = default;
ChestData(uchar i, bool s) : id_(i), size_(s){};
@@ -658,4 +646,4 @@ constexpr std::string_view kEntranceNames[] = {
} // namespace app
} // namespace yaze
#endif
#endif

27
src/incl/dungeon.h Normal file
View File

@@ -0,0 +1,27 @@
#ifndef YAZE_BASE_DUNGEON_H_
#define YAZE_BASE_DUNGEON_H_
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
struct object_door {
object_door() = default;
object_door(short id, uint8_t x, uint8_t y, uint8_t size, uint8_t layer)
: id_(id), x_(x), y_(y), size_(size), layer_(layer) {}
short id_;
uint8_t x_;
uint8_t y_;
uint8_t size_;
uint8_t type_;
uint8_t layer_;
};
#ifdef __cplusplus
}
#endif
#endif // YAZE_BASE_DUNGEON_H_