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

Remove rom namespace

Browse Source
This commit is contained in:
scawful
2022-07-09 22:52:07 -04:00
parent 31f1850800
commit 982cc789fe
10 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ static TileInfo GetTilesInfo(ushort tile) {
return TileInfo(tid, p, v, h, o);
}
void Overworld::Load(app::rom::ROM& rom, uchar* allGfxPtr) {
void Overworld::Load(ROM& rom, uchar* allGfxPtr) {
rom_ = rom;
allGfx16Ptr = allGfxPtr;

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

@@ -19,7 +19,7 @@ namespace zelda3 {
class Overworld {
public:
void Load(app::rom::ROM& rom, uchar* allGfxPtr);
void Load(ROM& rom, uchar* allGfxPtr);
auto GetTiles16() const { return tiles16; }
auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
auto GetMapBlockset16Ptr() { return mapblockset16; }
@@ -35,7 +35,7 @@ class Overworld {
void FetchLargeMaps();
void LoadOverworldMap();
app::rom::ROM rom_;
ROM rom_;
int gameState = 1;
bool isLoaded = false;
uchar mapParent[160];

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

@@ -14,8 +14,8 @@ namespace zelda3 {
using namespace core;
using namespace gfx;
OverworldMap::OverworldMap(app::rom::ROM& rom,
const std::vector<gfx::Tile16>& tiles16, int index_)
OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
int index_)
: parent_(index_), index_(index_), rom_(rom), tiles16_(tiles16) {
if (index_ != 0x80 && index_ <= 150 &&
rom_.data()[constants::overworldMapSize + (index_ & 0x3F)] != 0) {

4
src/app/zelda3/overworld_map.h
View File

@@ -30,14 +30,14 @@ class OverworldMap {
uchar* currentOWgfx16Ptr_ = nullptr;
uchar* allGfx16Ptr_ = nullptr;
app::rom::ROM rom_;
ROM rom_;
gfx::Bitmap gfxBitmap;
std::vector<gfx::Tile16> tiles16_;
uchar* staticgfx = new uchar[16];
std::vector<std::vector<ushort>> tiles_used_;
OverworldMap(app::rom::ROM& rom, const std::vector<gfx::Tile16>& tiles16,
OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
int index);
void BuildMap(uchar* mapParent, int count, int gameState,
std::vector<std::vector<ushort>>& allmapsTilesLW,