diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-05-24 12:32:37 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-05-24 12:32:37 +0200 |
| commit | 0a1a50cde54fee469bc0069978cd27a2bd1a2fb0 (patch) | |
| tree | 2ba58efbe0ff3cfdc6f73b7a9e0bfab399d5e0d3 /extension/src/LoadGameCompatibility.cpp | |
| parent | ac36a373139e3e815f70720b37d4ffc8d9062df9 (diff) | |
| parent | d6db91738ceee5cce9e7b7efc32bec89a83fa790 (diff) | |
Merge pull request #124 from OpenVicProject/bug-fixes
Date fix + string fix + Logger queue
Diffstat (limited to 'extension/src/LoadGameCompatibility.cpp')
| -rw-r--r-- | extension/src/LoadGameCompatibility.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extension/src/LoadGameCompatibility.cpp b/extension/src/LoadGameCompatibility.cpp index 29b773e..96c165b 100644 --- a/extension/src/LoadGameCompatibility.cpp +++ b/extension/src/LoadGameCompatibility.cpp @@ -76,7 +76,7 @@ Error GameSingleton::_load_province_identifier_file_compatibility_mode(String co Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& terrain_image_path, String const& terrain_texturesheet_path) { // Read BMP's palette to determine terrain variant colours which texture they're associated with BMP bmp; - if (bmp.open(godot_to_c_string(terrain_image_path)) != SUCCESS || bmp.read_header() != SUCCESS || bmp.read_palette() != SUCCESS) { + if (bmp.open(godot_to_std_string(terrain_image_path).c_str()) != SUCCESS || bmp.read_header() != SUCCESS || bmp.read_palette() != SUCCESS) { UtilityFunctions::push_error("Failed to read BMP palette from compatibility mode terrain image: ", terrain_image_path); return FAILED; } |