Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion commonTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#include "common.h"
#include "SpriteColors.h"

#include "df/coord.h"
#include "df/enabler.h"
#include "df/graphic.h"

Expand Down Expand Up @@ -92,8 +94,9 @@ struct Crd3D {

struct OptCrd3D : public std::optional<Crd3D>
{
using coord_t = decltype(df::coord::x);
operator df::coord() const {
return has_value() ? df::coord{ uint16_t(value().x), uint16_t(value().y), uint16_t(value().z) } : df::coord{};
return has_value() ? df::coord{ static_cast<coord_t>(value().x), static_cast<coord_t>(value().y), static_cast<coord_t>(value().z) } : df::coord{};
}
OptCrd3D() {};
OptCrd3D(const df::coord& c) {
Expand Down
Loading