# HG changeset patch # User SamuXarick <43006711+SamuXarick@users.noreply.github.com> # Date 2023-02-01 22:35:51 # Node ID c3615a5ab984fc48ceeed344a25ff6885910f97e # Parent 56f5d0fcc91ce4f6cb0fe3e8161e85b9bb746731 Fix: [Script] Incorrect value for GOAL_INVALID (#10436) * Fix: [Script] Incorrect value for GOAL_INVALID * Cleanup: Remove unused static variable diff --git a/src/goal_type.h b/src/goal_type.h --- a/src/goal_type.h +++ b/src/goal_type.h @@ -32,8 +32,7 @@ enum GoalType : byte { GT_STORY_PAGE, ///< Destination is a story page }; -typedef uint32 GoalTypeID; ///< Contains either tile, industry ID, town ID or company ID (or INVALID_GOALTYPE) -static const GoalTypeID INVALID_GOALTYPE = 0xFFFFFFFF; ///< Invalid/unknown index of GoalType +typedef uint32 GoalTypeID; ///< Contains either tile, industry ID, town ID, company ID, or story page ID typedef uint16 GoalID; ///< ID of a goal struct Goal; diff --git a/src/script/api/script_goal.hpp b/src/script/api/script_goal.hpp --- a/src/script/api/script_goal.hpp +++ b/src/script/api/script_goal.hpp @@ -28,9 +28,9 @@ public: /** * The goal IDs. */ - enum GoalID { + enum GoalID : uint16 { /* Note: these values represent part of the in-game GoalID enum */ - GOAL_INVALID = ::INVALID_GOALTYPE, ///< An invalid goal id. + GOAL_INVALID = ::INVALID_GOAL, ///< An invalid goal id. }; /**