6 files changed, 28 insertions, 0 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp
index bcd4197e11..29f27dcbda 100644
--- a/core/io/file_access_encrypted.cpp
+++ b/core/io/file_access_encrypted.cpp
@@ -25,6 +25,7 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base,const Vector<uint8_
 
 	} else if (p_mode==MODE_READ) {
 
+		writing=false;
 		key=p_key;
 		uint32_t magic = p_base->get_32();
 		print_line("MAGIC: "+itos(magic));
@@ -278,6 +279,10 @@ uint64_t FileAccessEncrypted::_get_modified_time(const String& p_file){
 FileAccessEncrypted::FileAccessEncrypted() {
 
 	file=NULL;
+	pos=0;
+	eofed=false;
+	mode=MODE_MAX;
+	writing=false;
 }
 
 
diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp
index 6a28fa9dae..e2cb300ebc 100644
--- a/core/io/file_access_pack.cpp
+++ b/core/io/file_access_pack.cpp
@@ -443,6 +443,11 @@ bool DirAccessPack::file_exists(String p_file){
 	return current->files.has(p_file);
 }
 
+bool DirAccessPack::dir_exists(String p_dir) {
+
+	return current->subdirs.has(p_dir);
+}
+
 Error DirAccessPack::make_dir(String p_dir){
 
 	return ERR_UNAVAILABLE;
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
index 07ce8cbaf8..a4c750bf3c 100644
--- a/core/io/file_access_pack.h
+++ b/core/io/file_access_pack.h
@@ -190,6 +190,7 @@ public:
 
 
 	virtual bool file_exists(String p_file);
+	virtual bool dir_exists(String p_dir);
 
 	virtual Error make_dir(String p_dir);
 
diff --git a/core/io/ip.cpp b/core/io/ip.cpp
index 503a009444..d2a685f6b0 100644
--- a/core/io/ip.cpp
+++ b/core/io/ip.cpp
@@ -188,6 +188,18 @@ void IP::erase_resolve_item(ResolverID p_id) {
 }
 
 
+Array IP::_get_local_addresses() const {
+
+	Array addresses;
+	List<IP_Address> ip_addresses;
+	get_local_addresses(&ip_addresses);
+	for(List<IP_Address>::Element *E=ip_addresses.front();E;E=E->next()) {
+		addresses.push_back(E->get());
+	}
+
+	return addresses;
+}
+
 void IP::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("resolve_hostname","host"),&IP::resolve_hostname);
@@ -195,6 +207,7 @@ void IP::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_resolve_item_status","id"),&IP::get_resolve_item_status);
 	ObjectTypeDB::bind_method(_MD("get_resolve_item_address","id"),&IP::get_resolve_item_address);
 	ObjectTypeDB::bind_method(_MD("erase_resolve_item","id"),&IP::erase_resolve_item);
+	ObjectTypeDB::bind_method(_MD("get_local_addresses"),&IP::_get_local_addresses);
 
 	BIND_CONSTANT( RESOLVER_STATUS_NONE );
 	BIND_CONSTANT( RESOLVER_STATUS_WAITING );
diff --git a/core/io/ip.h b/core/io/ip.h
index f1ef5fe794..0181dc7d12 100644
--- a/core/io/ip.h
+++ b/core/io/ip.h
@@ -66,16 +66,19 @@ protected:
 	static void _bind_methods();
 
 	virtual IP_Address _resolve_hostname(const String& p_hostname)=0;
+	Array _get_local_addresses() const;
 
 	static IP* (*_create)();
 public:
 
 
+
 	IP_Address resolve_hostname(const String& p_hostname);
 	// async resolver hostname
 	ResolverID resolve_hostname_queue_item(const String& p_hostname);
 	ResolverStatus get_resolve_item_status(ResolverID p_id) const;
 	IP_Address get_resolve_item_address(ResolverID p_id) const;
+	virtual void get_local_addresses(List<IP_Address> *r_addresses) const=0;
 	void erase_resolve_item(ResolverID p_id);
 
 	static IP* get_singleton();
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp
index f67a10df2e..37fc9c4a0a 100644
--- a/core/io/packet_peer.cpp
+++ b/core/io/packet_peer.cpp
@@ -112,6 +112,7 @@ void PacketPeer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("get_var"),&PacketPeer::_bnd_get_var);
 	ObjectTypeDB::bind_method(_MD("put_var", "var:Variant"),&PacketPeer::put_var);
+	ObjectTypeDB::bind_method(_MD("get_available_packet_count"),&PacketPeer::get_available_packet_count);
 };
 
 /***************/