diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 15:54:17 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 15:54:17 +0100 |
| commit | 8d53634e2f47a616ff90f114fe1afbc2ba4df094 (patch) | |
| tree | 5a5e11e9c54c845a5dd570bb76aa73724acc5dd9 /src/crepe/api/Text.cpp | |
| parent | 0524c68cc4eb9fbd36c17ed4f5d8152cac2f977b (diff) | |
| parent | a8ccf7fe8662086bb223aa4eafd0f85e717d16cf (diff) | |
Merge branch 'master' into niels/UI
Diffstat (limited to 'src/crepe/api/Text.cpp')
| -rw-r--r-- | src/crepe/api/Text.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index 2e248de..9d57abd 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -6,10 +6,8 @@ using namespace crepe; Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, - const std::string & font_family, const Data & data, const std::string & text, - std::optional<Asset> font) + const std::string & font_family, const Data & data, const std::string & text) : UIObject(id, dimensions, offset), text(text), data(data), - font_family(font_family), - font(font) {} + font_family(font_family) {} |