drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia/world] Cleanup field counts for models

Browse Source
This commit is contained in:
Gary Talent 2019-03-13 20:22:08 -05:00
parent e31f51648c
commit 9e55e5f63c
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,9 +13,6 @@ namespace nostalgia::world {
using namespace common;
using namespace core;
const int Zone::FIELDS = 1;
Zone::Zone(Context *ctx, Bounds bnds, InodeId_t tileSheet) {
const auto size = bnds.width * bnds.height;
m_tiles = new Tile[size];

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

@ -17,6 +17,8 @@
namespace nostalgia::world {
struct Tile {
static constexpr auto Fields = 3;
uint8_t bgTile = 0;
uint8_t type = 0;
void *occupant = nullptr;
@ -25,7 +27,7 @@ struct Tile {
template<typename T>
ox::Error ioOpRead(T *io, Tile *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Tile", 2);
io->setTypeInfo("nostalgia::world::Tile", Tile::Fields);
err |= io->op("bgTile", &obj->bgTile);
err |= io->op("type", &obj->type);
return err;
@ -41,7 +43,7 @@ struct Zone {
friend ox::Error ioOpWrite(T*, Zone*);
protected:
static const int FIELDS;
static constexpr auto Fields = 2;
common::Bounds m_bounds;
Tile *m_tiles = nullptr;
@ -61,7 +63,7 @@ struct Zone {
template<typename T>
ox::Error ioOpRead(T *io, Zone *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Zone", Zone::FIELDS);
io->setTypeInfo("nostalgia::world::Zone", Zone::Fields);
err |= io->op("bounds", &obj->m_bounds);
return err;
}
@ -69,7 +71,7 @@ ox::Error ioOpRead(T *io, Zone *obj) {
template<typename T>
ox::Error ioOpWrite(T *io, Zone *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Zone", Zone::FIELDS);
io->setTypeInfo("nostalgia::world::Zone", Zone::Fields);
err |= io->op("bounds", &obj->m_bounds);
return err;
}
@ -83,11 +85,8 @@ struct Region {
template<typename T>
friend ox::Error ioOpWrite(T*, Region*);
enum {
FIELDS = 1
};
protected:
static constexpr auto Fields = 1;
ox::Vector<Zone*> m_zones;
public:
@ -97,14 +96,14 @@ struct Region {
template<typename T>
ox::Error ioOpRead(T *io, Region *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::World::Region", Region::FIELDS);
io->setTypeInfo("nostalgia::World::Region", Region::Fields);
return err;
}
template<typename T>
ox::Error ioOpWrite(T *io, Region *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::World::Region", Region::FIELDS);
io->setTypeInfo("nostalgia::World::Region", Region::Fields);
return err;
}