mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-10 21:00:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into 26-03-28-movie-player

Browse Source
This commit is contained in:
PJB3005
2026-03-29 03:16:24 +02:00
parent b09da82912 880fc5e2f9
commit 2686c8dc81
9 changed files with 95 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dusk/map_loader_definitions.h
+17 -29
View File
@@ -1,79 +1,67 @@
#pragma once
struct RoomEntry {
static constexpr int MAX_POINTS = 70;
u8 roomNo;
s16 roomPoints[MAX_POINTS] = {};
int numPoints;
std::vector<s16> roomPoints = {};
constexpr RoomEntry() : roomNo(0), numPoints(0) {}
constexpr RoomEntry() : roomNo(0) {}
constexpr RoomEntry(const RoomEntry& other) = default;
template <int N>
constexpr RoomEntry(const u8 roomNo, const s16 (&points)[N]) :
roomNo(roomNo), numPoints(N) {
static_assert(N <= MAX_POINTS);
roomNo(roomNo) {
for (int i = 0; i < N; i++) {
roomPoints[i] = points[i];
roomPoints.push_back(points[i]);
}
}
constexpr RoomEntry(const u8 roomNo) :
roomNo(roomNo), numPoints(1) {
roomPoints[0] = 0;
roomNo(roomNo) {
roomPoints.push_back(0);
}
};
struct MapEntry {
static constexpr int MAX_ROOMS = 50;
const char* mapName;
const char* mapFile;
RoomEntry mapRooms[MAX_ROOMS] = {};
int numRooms;
std::vector<RoomEntry> mapRooms = {};
constexpr MapEntry() : mapName(nullptr), mapFile(nullptr), numRooms(0) {}
constexpr MapEntry() : mapName(nullptr), mapFile(nullptr) {}
constexpr MapEntry(const MapEntry& other) = default;
template <int N>
constexpr MapEntry(const char* mapName, const char* mapFile, const RoomEntry (&rooms)[N], const char*) : mapName(mapName),
mapFile(mapFile), numRooms(N) {
static_assert(N <= MAX_ROOMS);
mapFile(mapFile) {
for (int i = 0; i < N; i++) {
mapRooms[i] = rooms[i];
mapRooms.push_back(rooms[i]);
}
}
template <int N>
constexpr MapEntry(const char* mapName, const char* mapFile, const RoomEntry (&rooms)[N]) :
mapName(mapName), mapFile(mapFile), numRooms(N) {
static_assert(N <= MAX_ROOMS);
mapName(mapName), mapFile(mapFile) {
for (int i = 0; i < N; i++) {
mapRooms[i] = rooms[i];
mapRooms.push_back(rooms[i]);
}
}
constexpr MapEntry(const char* mapName, const char* mapFile) : mapName(mapName),
mapFile(mapFile), numRooms(0) {}
mapFile(mapFile) {}
};
struct RegionEntry {
static constexpr int MAX_MAPS = 22;
const char* regionName = nullptr;
int numMaps = 0;
MapEntry maps[MAX_MAPS] = {};
std::vector<MapEntry> maps = {};
template <int N>
constexpr RegionEntry(const char* regionName, const MapEntry (&maps)[N]) : regionName(regionName), numMaps(N) {
static_assert(N <= MAX_MAPS);
constexpr RegionEntry(const char* regionName, const MapEntry (&maps)[N]) : regionName(regionName) {
for (int i = 0; i < N; i++) {
this->maps[i] = maps[i];
this->maps.push_back(maps[i]);
}
}
};
constexpr auto gameRegions = std::to_array({
static const auto gameRegions = std::to_array({
RegionEntry("Hyrule Field", {
MapEntry("Hyrule Field", "F_SP121",
{
include/global.h
+1 -2
View File
@@ -218,7 +218,6 @@ using std::isnan;
#define IS_REF_NONNULL(r) (1)
#endif
#define CRASH(msg) OSPanic(__FILE__, __LINE__, "%s", msg)
#define CRASHF(msg, ...) OSPanic(__FILE__, __LINE__, msg, __VA_ARGS__)
#define CRASH(msg, ...) OSPanic(__FILE__, __LINE__, "%s", msg, ##__VA_ARGS__)
#endif