From 952f621ee272f321939ac8161b9f566496593e2a Mon Sep 17 00:00:00 2001 From: Quietust Date: Wed, 8 Feb 2012 22:35:22 -0600 Subject: [PATCH] Synchronize with df-structures --- library/include/modules/Engravings.h | 4 ++-- library/modules/Engravings.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/include/modules/Engravings.h b/library/include/modules/Engravings.h index 6c80eac7b..d52303f32 100644 --- a/library/include/modules/Engravings.h +++ b/library/include/modules/Engravings.h @@ -49,8 +49,8 @@ struct t_engraving { df::coord pos; df::engraving_flags flags; int8_t tile; - int32_t type; - int16_t subtype; + int32_t art_id; + int16_t art_subid; df::item_quality quality; // Pointer to original object, in case you want to modify it df::engraving *origin; diff --git a/library/modules/Engravings.cpp b/library/modules/Engravings.cpp index c7cbd9452..9fc2c3adf 100644 --- a/library/modules/Engravings.cpp +++ b/library/modules/Engravings.cpp @@ -72,8 +72,8 @@ bool Engravings::copyEngraving(const int32_t index, t_engraving &out) out.pos = out.origin->pos; out.flags = out.origin->flags; out.tile = out.origin->tile; - out.type = out.origin->type; - out.subtype = out.origin->subtype; + out.art_id = out.origin->art_id; + out.art_subid = out.origin->art_subid; out.quality = out.origin->quality; return true; }