diff options
author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-12-16 21:49:15 +0100 |
---|---|---|
committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-12-16 21:49:15 +0100 |
commit | 58c57578cae755422c35acfbbdf9ad399b4fd826 (patch) | |
tree | f8d5cb8a594a2dd247f5c71a8681c6e48389d272 /src/crepe | |
parent | 9f3af4431853288c6e1ec0ff5b8f5bb0e6379b66 (diff) |
very illegal commit do not push
Diffstat (limited to 'src/crepe')
-rw-r--r-- | src/crepe/api/Script.h | 3 | ||||
-rw-r--r-- | src/crepe/facade/FontFacade.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h index 668e5d1..ee45b8d 100644 --- a/src/crepe/api/Script.h +++ b/src/crepe/api/Script.h @@ -156,6 +156,7 @@ private: void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel); protected: + OptionalRef<Mediator> mediator; // NOTE: This must be the only constructor on Script, see "Late references" below Script() = default; //! Only \c BehaviorScript instantiates Script @@ -190,7 +191,7 @@ private: //! Reference to parent component OptionalRef<bool> active; //! Mediator reference - OptionalRef<Mediator> mediator; + //! \} private: diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp index 708b2ff..a63b022 100644 --- a/src/crepe/facade/FontFacade.cpp +++ b/src/crepe/facade/FontFacade.cpp @@ -16,7 +16,7 @@ Asset FontFacade::get_font_asset(const string font_family) { if (pattern == NULL) { throw runtime_error("Failed to create font pattern."); } - + // Default configuration FcConfig * config = FcConfigGetCurrent(); if (config == NULL) { @@ -43,7 +43,7 @@ Asset FontFacade::get_font_asset(const string font_family) { } // Convert the file path to a string - string font_file_path(reinterpret_cast<const char *>(file_path)); + string font_file_path = reinterpret_cast<const char *>(file_path); FcPatternDestroy(matched_pattern); FcFini(); return Asset(font_file_path); |