diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-20 13:22:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:22:47 +0200 |
| commit | 372cdc20705dab7c2227b89d8bc4d425ffd3e8a4 (patch) | |
| tree | a8811a50265edd940b00e12b9bd522e3e9b4694e /core/io/file_access_zip.cpp | |
| parent | ecd226c6a751f8a20766363fd1f2e1e0e2da8fba (diff) | |
| parent | 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 (diff) | |
| download | redot-engine-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.gz | |
Merge pull request #11153 from letheed/rename-pos
Rename pos/rot/loc/scl
Diffstat (limited to 'core/io/file_access_zip.cpp')
| -rw-r--r-- | core/io/file_access_zip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp index 8c99ef2983..73b23ac702 100644 --- a/core/io/file_access_zip.cpp +++ b/core/io/file_access_zip.cpp @@ -65,7 +65,7 @@ static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong si static long godot_tell(voidpf opaque, voidpf stream) { FileAccess *f = (FileAccess *)opaque; - return f->get_pos(); + return f->get_position(); }; static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { @@ -76,7 +76,7 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { switch (origin) { case ZLIB_FILEFUNC_SEEK_CUR: - pos = f->get_pos() + offset; + pos = f->get_position() + offset; break; case ZLIB_FILEFUNC_SEEK_END: pos = f->get_len() + offset; @@ -301,7 +301,7 @@ void FileAccessZip::seek_end(int64_t p_position) { unzSeekCurrentFile(zfile, get_len() + p_position); }; -size_t FileAccessZip::get_pos() const { +size_t FileAccessZip::get_position() const { ERR_FAIL_COND_V(!zfile, 0); return unztell(zfile); |