From e63a871363971d90852e5aaad216e27244a96934 Mon Sep 17 00:00:00 2001 From: Japa Date: Wed, 31 Jan 2018 10:11:43 +0530 Subject: [PATCH] use the vmethod for getting improvement images. --- library/xml | 2 +- plugins/remotefortressreader/item_reader.cpp | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/library/xml b/library/xml index ef5b1c8f0..2b7ef6fde 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit ef5b1c8f037a6240acdd3957fb7b6b9de529c5e2 +Subproject commit 2b7ef6fdeb87cc63eb56d57d5b6b220176840404 diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp index 2acda8aef..933abc501 100644 --- a/plugins/remotefortressreader/item_reader.cpp +++ b/plugins/remotefortressreader/item_reader.cpp @@ -106,13 +106,6 @@ void CopyImage(const df::art_image * image, ArtImage * netImage) void CopyImage(df::art_image_ref imageRef, ArtImage * netImage) { - GET_IMAGE getImage = reinterpret_cast(Core::getInstance().vinfo->getAddress("rfr_get_art_image")); - if (getImage) - { - int16_t subid = -1; - CopyImage(getImage(world, &imageRef, &subid), netImage); - } - else { for (int i = 0; i < world->art_image_chunks.size(); i++) { @@ -402,7 +395,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem) case df::enums::improvement_type::ART_IMAGE: { VIRTUAL_CAST_VAR(artImage, df::itemimprovement_art_imagest, improvement); - CopyImage(artImage->image, netImp->mutable_image()); + CopyImage(artImage->getImage(DfItem), netImp->mutable_image()); break; } case df::enums::improvement_type::COVERED: