Skip to content

Commit

Permalink
Use enum for research item category
Browse files Browse the repository at this point in the history
  • Loading branch information
IntelOrca committed Apr 14, 2023
1 parent 2e787e7 commit a62013c
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/openrct2/scripting/bindings/world/ScResearch.hpp
Expand Up @@ -30,16 +30,6 @@ namespace OpenRCT2::Scripting
{ "finished_all", RESEARCH_STAGE_FINISHED_ALL },
});

static const DukEnumMap<ResearchCategory> ResearchCategoryMap({
{ "transport", ResearchCategory::Transport },
{ "gentle", ResearchCategory::Gentle },
{ "rollercoaster", ResearchCategory::Rollercoaster },
{ "thrill", ResearchCategory::Thrill },
{ "water", ResearchCategory::Water },
{ "shop", ResearchCategory::Shop },
{ "scenery_group", ResearchCategory::SceneryGroup },
});

static const DukEnumMap<Research::EntryType> ResearchEntryTypeMap({
{ "ride", Research::EntryType::Ride },
{ "scenery", Research::EntryType::Scenery },
Expand All @@ -48,7 +38,7 @@ namespace OpenRCT2::Scripting
template<> inline DukValue ToDuk(duk_context* ctx, const ResearchItem& value)
{
DukObject obj(ctx);
obj.Set("category", ResearchCategoryMap[value.category]);
obj.Set("category", EnumValue(value.category));
obj.Set("type", ResearchEntryTypeMap[value.type]);
if (value.type == Research::EntryType::Ride)
{
Expand Down

0 comments on commit a62013c

Please sign in to comment.