From 63c7b69b5b5a9503b378185bf56b768e1c740d51 Mon Sep 17 00:00:00 2001 From: JapaMala Date: Sat, 2 May 2020 14:38:55 -0700 Subject: [PATCH] Change item improvement type to bare ints. --- plugins/proto/RemoteFortressReader.proto | 19 +------------------ plugins/remotefortressreader/item_reader.cpp | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto index 864cdba1a..8255f91cd 100644 --- a/plugins/proto/RemoteFortressReader.proto +++ b/plugins/proto/RemoteFortressReader.proto @@ -963,30 +963,13 @@ message Language repeated ShapeDescriptior shapes = 1; } -enum ImprovementType -{ - ART_IMAGE = 0; - COVERED = 1; - RINGS_HANGING = 2; - BANDS = 3; - SPIKES = 4; - ITEMSPECIFIC = 5; - THREAD = 6; - CLOTH = 7; - SEWN_IMAGE = 8; - PAGES = 9; - ILLUSTRATION = 10; - INSTRUMENT_PIECE = 11; - WRITING = 12; -} - message ItemImprovement { optional MatPair material = 1; - optional ImprovementType type = 2; optional int32 shape = 3; optional int32 specific_type= 4; optional ArtImage image = 5; + optional int32 type = 6; } enum ArtImageElementType diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp index 620e06310..56ec9019b 100644 --- a/plugins/remotefortressreader/item_reader.cpp +++ b/plugins/remotefortressreader/item_reader.cpp @@ -450,7 +450,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem) auto netImp = NetItem->add_improvements(); - netImp->set_type((ImprovementType)impType); + netImp->set_type(impType); auto mat = netImp->mutable_material(); mat->set_mat_type(improvement->mat_type);