Merge branch 'master' of github.com:okamstudio/godot

3 files changed, 9 insertions, 1 deletions

diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index 452d791d9..5f5186543 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -161,6 +161,7 @@ String DirAccessUnix::get_next() {
 
 	}
 
+	_cishidden=(fname!="." && fname!=".." && fname.begins_with("."));
 
 
 
@@ -173,6 +174,11 @@ bool DirAccessUnix::current_is_dir() const {
 	return _cisdir;
 }
 
+bool DirAccessUnix::current_is_hidden() const {
+
+	return _cishidden;
+}
+
 
 void DirAccessUnix::list_dir_end() {
 
diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h
index 119cb5c3f..f6089ccfe 100644
--- a/drivers/unix/dir_access_unix.h
+++ b/drivers/unix/dir_access_unix.h
@@ -50,12 +50,14 @@ class DirAccessUnix : public DirAccess {
 	
 	String current_dir;
 	bool _cisdir;
+	bool _cishidden;
 	
 public:
 	
 	virtual bool list_dir_begin(); ///< This starts dir listing
 	virtual String get_next();
 	virtual bool current_is_dir() const;
+	virtual bool current_is_hidden() const;
 	
 	virtual void list_dir_end(); ///< 
 	
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
index 7f8552685..2f91eee90 100644
--- a/drivers/unix/file_access_unix.cpp
+++ b/drivers/unix/file_access_unix.cpp
@@ -74,7 +74,7 @@ Error FileAccessUnix::_open(const String& p_path, int p_mode_flags) {
 	else if (p_mode_flags==WRITE)
 		mode_string="wb";
 	else if (p_mode_flags==READ_WRITE)
-		mode_string="wb+";
+		mode_string="rb+";
 	else
 		return ERR_INVALID_PARAMETER;