diff --git a/src/nostalgia/common/bounds.hpp b/src/nostalgia/common/bounds.hpp index e9e33cc1..47944c60 100644 --- a/src/nostalgia/common/bounds.hpp +++ b/src/nostalgia/common/bounds.hpp @@ -39,7 +39,7 @@ class Bounds { template ox::Error ioOp(T *io, Bounds *obj) { ox::Error err = 0; - io->setFields(4); + io->setTypeInfo("nostalgia::common::Bounds", 4); err |= io->op("x", &obj->x); err |= io->op("y", &obj->y); err |= io->op("width", &obj->width); diff --git a/src/nostalgia/common/point.hpp b/src/nostalgia/common/point.hpp index 027c97e0..0eb76daf 100644 --- a/src/nostalgia/common/point.hpp +++ b/src/nostalgia/common/point.hpp @@ -61,7 +61,7 @@ class Point { template ox::Error ioOp(T *io, Point *obj) { ox::Error err = 0; - io->setFields(2); + io->setTypeInfo("nostalgia::common::Bounds", 2); err |= io->op("x", &obj->x); err |= io->op("y", &obj->y); return err; diff --git a/src/nostalgia/world/world.hpp b/src/nostalgia/world/world.hpp index eab840ae..e45c3531 100644 --- a/src/nostalgia/world/world.hpp +++ b/src/nostalgia/world/world.hpp @@ -14,8 +14,7 @@ #include #include -namespace nostalgia { -namespace world { +namespace nostalgia::world { struct Tile { uint8_t bgTile = 0; @@ -62,7 +61,7 @@ struct Zone { template ox::Error ioOpRead(T *io, Zone *obj) { ox::Error err = 0; - io->setFields(Zone::FIELDS); + io->setTypeInfo("nostalgia::world::Zone", Zone::FIELDS); err |= io->op("bounds", &obj->m_bounds); return err; } @@ -70,7 +69,7 @@ ox::Error ioOpRead(T *io, Zone *obj) { template ox::Error ioOpWrite(T *io, Zone *obj) { ox::Error err = 0; - io->setFields(Zone::FIELDS); + io->setTypeInfo("nostalgia::world::Zone", Zone::FIELDS); err |= io->op("bounds", &obj->m_bounds); return err; } @@ -98,16 +97,15 @@ struct Region { template ox::Error ioOpRead(T *io, Region *obj) { ox::Error err = 0; - io->setTypeInfo("nostalgia::world::Tile", Region::FIELDS); + io->setTypeInfo("nostalgia::World::Region", Region::FIELDS); return err; } template ox::Error ioOpWrite(T *io, Region *obj) { ox::Error err = 0; - io->setTypeInfo("nostalgia::world::Tile", Region::FIELDS); + io->setTypeInfo("nostalgia::World::Region", Region::FIELDS); return err; } } -}