diff options
| author | Rémi Verschelde | 2017-09-20 13:22:47 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-20 13:22:47 +0200 |
| commit | 372cdc20705dab7c2227b89d8bc4d425ffd3e8a4 (patch) | |
| tree | a8811a50265edd940b00e12b9bd522e3e9b4694e /drivers/windows | |
| parent | ecd226c6a751f8a20766363fd1f2e1e0e2da8fba (diff) | |
| parent | 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 (diff) | |
| download | godot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.gz godot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.zst godot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.zip | |
Merge pull request #11153 from letheed/rename-pos
Rename pos/rot/loc/scl
Diffstat (limited to '')
| -rw-r--r-- | drivers/windows/file_access_windows.cpp | 6 | ||||
| -rw-r--r-- | drivers/windows/file_access_windows.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index fe2069089..d128b5824 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -156,7 +156,7 @@ void FileAccessWindows::seek_end(int64_t p_position) { if (fseek(f, p_position, SEEK_END)) check_errors(); } -size_t FileAccessWindows::get_pos() const { +size_t FileAccessWindows::get_position() const { size_t aux_position = 0; aux_position = ftell(f); @@ -169,9 +169,9 @@ size_t FileAccessWindows::get_len() const { ERR_FAIL_COND_V(!f, 0); - size_t pos = get_pos(); + size_t pos = get_position(); fseek(f, 0, SEEK_END); - int size = get_pos(); + int size = get_position(); fseek(f, pos, SEEK_SET); return size; diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h index 6956e7855..15cbdca73 100644 --- a/drivers/windows/file_access_windows.h +++ b/drivers/windows/file_access_windows.h @@ -54,7 +54,7 @@ public: virtual void seek(size_t p_position); ///< seek to a given position virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file - virtual size_t get_pos() const; ///< get position in the file + virtual size_t get_position() const; ///< get position in the file virtual size_t get_len() const; ///< get size of the file virtual bool eof_reached() const; ///< reading passed EOF |