diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-04-15 21:00:34 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-04-15 21:00:34 +0200 |
| commit | a5695934109559c57eae807a581cdc7f754764c1 (patch) | |
| tree | 64f5ad5e2042dd0e2ebb4995b2e78de28af9f54e /src/openvic-simulation/dataloader | |
| parent | 8f97145e9570a9b728010a818137cb31a51fd5f6 (diff) | |
| parent | b358fc0d4250178fbb44fc6b00cf4e39aa870064 (diff) | |
Merge pull request #156 from OpenVicProject/gfx-actor
GFX::Actor rework + default GraphicalCultureType + default unit colours
Diffstat (limited to 'src/openvic-simulation/dataloader')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index e13bc23..f99417f 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -280,8 +280,7 @@ bool Dataloader::_load_interface_files(UIManager& ui_manager) const { return ui_manager.load_gfx_file(parse_defines(file).get_file_node()); } ); - ui_manager.lock_sprites(); - ui_manager.lock_fonts(); + ui_manager.lock_gfx_registries(); /* Hard-coded GUI file names, might be replaced with a dynamic system but everything should still be loaded on startup. */ static const std::vector<std::string_view> gui_files { |