diff options
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/dir_access.cpp | 7 | ||||
| -rw-r--r-- | core/os/file_access.h | 3 | ||||
| -rw-r--r-- | core/os/os.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index 1941b8260..330a9153e 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -301,8 +301,8 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) { FileAccess *fsrc = FileAccess::open(p_from, FileAccess::READ, &err); if (err) { - - ERR_FAIL_COND_V(err, err); + ERR_PRINTS("Failed to open " + p_from); + return err; } FileAccess *fdst = FileAccess::open(p_to, FileAccess::WRITE, &err); @@ -310,7 +310,8 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) { fsrc->close(); memdelete(fsrc); - ERR_FAIL_COND_V(err, err); + ERR_PRINTS("Failed to open " + p_to); + return err; } fsrc->seek_end(0); diff --git a/core/os/file_access.h b/core/os/file_access.h index 5d10c1a9a..c4635fdfb 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -89,6 +89,9 @@ public: virtual void close() = 0; ///< close a file virtual bool is_open() const = 0; ///< true when file is open + virtual String get_path() const { return ""; } /// returns the path for the current open file + virtual String get_path_absolute() const { return ""; } /// returns the absolute path for the current open file + virtual void seek(size_t p_position) = 0; ///< seek to a given position virtual void seek_end(int64_t p_position = 0) = 0; ///< seek from the end of file virtual size_t get_position() const = 0; ///< get position in the file diff --git a/core/os/os.h b/core/os/os.h index f8033c254..5a2c99878 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -46,7 +46,8 @@ enum VideoDriver { VIDEO_DRIVER_GLES3, - VIDEO_DRIVER_GLES2 + VIDEO_DRIVER_GLES2, + VIDEO_DRIVER_MAX, }; class OS { |