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

overworld housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-07-11 21:37:20 -04:00
parent bd44cc2c96
commit 56c81ae97e
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/zelda3/overworld.h
View File

@@ -19,14 +19,11 @@ namespace zelda3 {
class Overworld {
public:
void Load(ROM& rom, uchar* allGfxPtr);
void Load(ROM& rom);
auto GetTiles16() const { return tiles16; }
auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
auto GetMapBlockset16Ptr() { return mapblockset16; }
std::shared_ptr<uchar[]> overworldMapPointer;
gfx::Bitmap overworldMapBitmap;
private:
ushort GenerateTile32(int i, int k, int dimension);
void AssembleMap32Tiles();
@@ -44,7 +41,6 @@ class Overworld {
std::vector<std::vector<ushort>> allmapsTilesDW; // 64 maps * (32*32 tiles)
std::vector<std::vector<ushort>> allmapsTilesSP; // 32 maps * (32*32 tiles)
uchar* allGfx16Ptr = nullptr;
std::shared_ptr<uchar[]> mapblockset16;
std::shared_ptr<uchar[]> currentOWgfx16Ptr;
@@ -53,6 +49,9 @@ class Overworld {
std::vector<gfx::Tile32> map16tiles;
std::vector<OverworldMap> overworld_maps_;
gfx::Bitmap overworldMapBitmap;
std::shared_ptr<uchar[]> overworldMapPointer;
const int map32address[4] = {
core::constants::map32TilesTL, core::constants::map32TilesTR,
core::constants::map32TilesBL, core::constants::map32TilesBR};