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

fix overworld allocation on smart pointers

Browse Source
This commit is contained in:
Justin Scofield
2022-07-05 22:21:30 -04:00
parent d75169317b
commit fe4b3ca84f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/zelda3/overworld.cc
View File

@@ -29,6 +29,10 @@ void Overworld::Load(app::rom::ROM& rom, uchar* allGfxPtr) {
rom_ = rom; rom_ = rom;
allGfx16Ptr = allGfxPtr; allGfx16Ptr = allGfxPtr;
overworldMapPointer = std::make_shared<uchar[]>(0x40000);
mapblockset16 = std::make_shared<uchar[]>(1048576);
currentOWgfx16Ptr = std::make_shared<uchar[]>((128 * 512) / 2);
AssembleMap32Tiles(); AssembleMap32Tiles();
AssembleMap16Tiles(); AssembleMap16Tiles();
DecompressAllMapTiles(); DecompressAllMapTiles();

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

@@ -24,7 +24,7 @@ class Overworld {
inline auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; } inline auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
inline auto GetMapBlockset16Ptr() { return mapblockset16; } inline auto GetMapBlockset16Ptr() { return mapblockset16; }
std::shared_ptr<uchar[]> overworldMapPointer = std::make_shared<uchar>(0x40000); std::shared_ptr<uchar[]> overworldMapPointer;
gfx::Bitmap overworldMapBitmap; gfx::Bitmap overworldMapBitmap;
private: private:
@@ -45,9 +45,8 @@ class Overworld {
std::vector<std::vector<ushort>> allmapsTilesSP; // 32 maps * (32*32 tiles) std::vector<std::vector<ushort>> allmapsTilesSP; // 32 maps * (32*32 tiles)
uchar* allGfx16Ptr = nullptr; uchar* allGfx16Ptr = nullptr;
std::shared_ptr<uchar[]> mapblockset16 = std::make_shared<uchar>(1048576); std::shared_ptr<uchar[]> mapblockset16;
std::shared_ptr<uchar[]> currentOWgfx16Ptr = std::shared_ptr<uchar[]> currentOWgfx16Ptr;
std::make_shared<uchar>((128 * 512) / 2);
std::vector<gfx::Tile16> tiles16; std::vector<gfx::Tile16> tiles16;
std::vector<gfx::Tile32> tiles32; std::vector<gfx::Tile32> tiles32;