diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-22 13:48:46 +0100 | 
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-22 13:48:46 +0100 | 
| commit | 6a7e06f875d789af0e8f9b5ce0ad24b9eaa96d25 (patch) | |
| tree | 07397ab46e2518fde4140777e2e181cde8ad938e /src/crepe/api/Text.cpp | |
| parent | 296c80edd6727d6808ed0c98c001a8b456f1c037 (diff) | |
| parent | 61148c757a1f742ff09e40e5347e74e638c7371c (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, 4 insertions, 2 deletions
| diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index 4a94180..b24f0ac 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -2,8 +2,10 @@  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) +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 +)  	: UIObject(id, dimensions, offset),  	  text(text),  	  data(data), |