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

namespace housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-06-20 14:10:57 -04:00
parent d878382697
commit 89c5dcfec6
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace Data { namespace zelda3 {
using namespace core; using namespace core;
using namespace gfx; using namespace gfx;
@@ -343,6 +343,6 @@ void Overworld::LoadOverworldMap() {
// owactualMapBitmap.Palette = cp; // owactualMapBitmap.Palette = cp;
} }
} // namespace Data } // namespace zelda3
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

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

@@ -14,7 +14,7 @@
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace Data { namespace zelda3 {
class Overworld { class Overworld {
public: public:
@@ -67,7 +67,7 @@ class Overworld {
void LoadOverworldMap(); void LoadOverworldMap();
}; };
} // namespace Data } // namespace zelda3
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

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

@@ -1,18 +1,17 @@
#include "overworld_map.h" #include "overworld_map.h"
#include "rom.h"
#include "gfx/tile.h" #include "gfx/tile.h"
#include "rom.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace Data { namespace zelda3 {
using namespace core; using namespace core;
using namespace gfx; using namespace gfx;
OverworldMap::OverworldMap(Data::ROM & rom, OverworldMap::OverworldMap(Data::ROM& rom,
const std::vector<gfx::Tile16> tiles16, const std::vector<gfx::Tile16> tiles16, uchar index)
uchar index)
: rom_(rom), index(index), tiles16_(tiles16), parent(index) { : rom_(rom), index(index), tiles16_(tiles16), parent(index) {
if (index != 0x80) { if (index != 0x80) {
if (index <= 150) { if (index <= 150) {
@@ -293,8 +292,8 @@ void OverworldMap::BuildTileset(int gameState) {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
staticgfx[12 + i] = staticgfx[12 + i] =
(uchar)(rom_.GetRawData()[constants::sprite_blockset_pointer + (uchar)(rom_.GetRawData()[constants::sprite_blockset_pointer +
(sprgfx[gameState] * 4) + i] + (sprgfx[gameState] * 4) + i] +
115); 115);
} }
// Main Blocksets // Main Blocksets
@@ -354,6 +353,6 @@ void OverworldMap::BuildTileset(int gameState) {
} }
} }
} // namespace Data } // namespace zelda3
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

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

@@ -3,13 +3,13 @@
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
#include "rom.h"
#include "gfx/bitmap.h" #include "gfx/bitmap.h"
#include "gfx/tile.h" #include "gfx/tile.h"
#include "rom.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace Data { namespace zelda3 {
using ushort = unsigned short; using ushort = unsigned short;
@@ -42,7 +42,7 @@ class OverworldMap {
uchar* currentOWgfx16Ptr = new uchar[(128 * 512) / 2]; uchar* currentOWgfx16Ptr = new uchar[(128 * 512) / 2];
std::vector<gfx::Tile16> tiles16_; std::vector<gfx::Tile16> tiles16_;
OverworldMap(Data::ROM & rom, const std::vector<gfx::Tile16> tiles16, OverworldMap(Data::ROM& rom, const std::vector<gfx::Tile16> tiles16,
uchar index); uchar index);
void BuildMap(uchar* mapParent, int count, int gameState, void BuildMap(uchar* mapParent, int count, int gameState,
ushort** allmapsTilesLW, ushort** allmapsTilesDW, ushort** allmapsTilesLW, ushort** allmapsTilesDW,
@@ -56,9 +56,8 @@ class OverworldMap {
void BuildTiles16Gfx(int count); void BuildTiles16Gfx(int count);
// void ReloadPalettes() { LoadPalette(); } // void ReloadPalettes() { LoadPalette(); }
void CopyTile(int x, int y, int xx, int yy, int offset, void CopyTile(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
gfx::TileInfo tile, uchar* gfx16Pointer, uchar* gfx16Pointer, uchar* gfx8Pointer);
uchar* gfx8Pointer);
void CopyTileToMap(int x, int y, int xx, int yy, int offset, void CopyTileToMap(int x, int y, int xx, int yy, int offset,
gfx::TileInfo tile, uchar* gfx16Pointer, gfx::TileInfo tile, uchar* gfx16Pointer,
uchar* gfx8Pointer); uchar* gfx8Pointer);
@@ -72,6 +71,6 @@ class OverworldMap {
void BuildTileset(int gameState); void BuildTileset(int gameState);
}; };
} // namespace Data } // namespace zelda3
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze