drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

Rename build-rom to gba-pkg

Browse Source
This commit is contained in:
Gary Talent
2017-10-14 19:38:10 -05:00
parent 9f2441bc82
commit 591c738730
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nostalgia/world/world.cpp
View File

@ -11,11 +11,9 @@
namespace nostalgia {
namespace world {
Zone::Zone() {
m_bounds.x = -1;
m_bounds.y = -1;
m_bounds.width = -1;
m_bounds.height = -1;
Zone::Zone(common::Bounds bnds) {
const auto size = bnds.width * bnds.height;
m_tiles = new TileDef[size];
}
void Zone::draw(core::Context *ctx) {
@ -25,16 +23,12 @@ size_t Zone::size() {
return sizeof(Zone) + m_bounds.width * m_bounds.height * sizeof(TileDef);
}
TileDef *Zone::tiles() {
return (TileDef*) (this + 1);
}
TileDef *Zone::tile(int row, int column) {
return &tiles()[row * m_bounds.width + column];
return &m_tiles[row * m_bounds.width + column];
}
void Zone::setTile(int row, int column, TileDef *td) {
tiles()[row * m_bounds.width + column] = *td;
m_tiles[row * m_bounds.width + column] = *td;
}
}

9
src/nostalgia/world/world.hpp
View File

@ -29,6 +29,10 @@ ox::Error ioOp(T *io, TileDef *obj) {
}
struct RegionDef {
uint32_t tileSheetInodes[20];
};
struct ZoneDef {
int32_t width = 0;
int32_t height = 0;
@ -38,17 +42,16 @@ class Zone {
private:
common::Bounds m_bounds;
TileDef *m_tiles = nullptr;
public:
Zone();
Zone(common::Bounds bnds);
void draw(core::Context *ctx);
size_t size();
TileDef *tiles();
TileDef *tile(int row, int column);
void setTile(int row, int column, TileDef *td);