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

refactor overworld data

Browse Source
This commit is contained in:
scawful
2022-06-22 23:13:51 -04:00
parent 02a836caeb
commit 377c548f73
4 changed files with 138 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,15 +19,12 @@ namespace zelda3 {
class Overworld {
public:
Overworld() = default;
~Overworld();
void Load(app::rom::ROM& rom, uchar* allGfxPtr);
inline auto GetTiles16() const { return tiles16; }
inline auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
inline auto GetMapBlockset16Ptr() { return mapblockset16; }
uchar* overworldMapPointer = new uchar[0x40000];
std::shared_ptr<uchar[]> overworldMapPointer = std::make_shared<uchar>(0x40000);
gfx::Bitmap overworldMapBitmap;
private:
@@ -43,17 +40,14 @@ class Overworld {
bool isLoaded = false;
uchar mapParent[160];
ushort** allmapsTilesLW; // 64 maps * (32*32 tiles)
ushort** allmapsTilesDW; // 64 maps * (32*32 tiles)
ushort** allmapsTilesSP; // 32 maps * (32*32 tiles)
std::vector<ushort> tileLeftEntrance;
std::vector<ushort> tileRightEntrance;
std::vector<std::vector<ushort>> allmapsTilesLW; // 64 maps * (32*32 tiles)
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;
uchar* mapblockset16 = new uchar[1048576];
uchar* currentOWgfx16Ptr = new uchar[(128 * 512) / 2];
SDL_Texture* overworld_map_texture;
std::shared_ptr<uchar[]> mapblockset16 = std::make_shared<uchar>(1048576);
std::shared_ptr<uchar[]> currentOWgfx16Ptr =
std::make_shared<uchar>((128 * 512) / 2);
std::vector<gfx::Tile16> tiles16;
std::vector<gfx::Tile32> tiles32;