summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorFredia Huya-Kouadio <fhuyakou@gmail.com>2022-07-25 15:47:31 -0700
committerFredia Huya-Kouadio <fhuyakou@gmail.com>2022-07-26 07:44:08 -0700
commit9679c67904b4714e3f3166fbc7174347f1038bc4 (patch)
tree37ba4aa30bbff140e08c9e780a48d8a57ed07a57 /core
parentc3dc887c410c5fa01eba197acba3afd8ce357ada (diff)
Address remaining scoped storage regressions
- Accelerate common path used to check the storage scope for a given path - Update the logic for the `get_as_text()` method - previous logic loads the content of a text file one byte at a time
Diffstat (limited to 'core')
-rw-r--r--core/core_bind.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index 26ecd41353..cb57cd7057 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -1220,16 +1220,10 @@ Vector<uint8_t> File::get_buffer(int64_t p_length) const {
String File::get_as_text() const {
ERR_FAIL_COND_V_MSG(f.is_null(), String(), "File must be opened before use, or is lacking read-write permission.");
- String text;
uint64_t original_pos = f->get_position();
const_cast<FileAccess *>(*f)->seek(0);
- String l = get_line();
- while (!eof_reached()) {
- text += l + "\n";
- l = get_line();
- }
- text += l;
+ String text = f->get_as_utf8_string();
const_cast<FileAccess *>(*f)->seek(original_pos);