From de0045cf1b0a5e20fbf74da192039d344ee8d0c7 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Tue, 21 Feb 2017 00:05:15 -0300
Subject: -renamed globals.h to global_config.cpp (this seems to have caused a
 few modified files) -.pck and .zip exporting redone, seems to be working..

---
 core/io/file_access_memory.cpp     | 2 +-
 core/io/file_access_network.cpp    | 2 +-
 core/io/file_access_pack.cpp       | 6 +++---
 core/io/packet_peer.cpp            | 2 +-
 core/io/resource_format_binary.cpp | 2 +-
 core/io/resource_loader.cpp        | 2 +-
 core/io/resource_saver.cpp         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'core/io')

diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp
index 32eb003228..b4ba14ddc9 100644
--- a/core/io/file_access_memory.cpp
+++ b/core/io/file_access_memory.cpp
@@ -30,7 +30,7 @@
 
 #include "os/dir_access.h"
 #include "os/copymem.h"
-#include "globals.h"
+#include "global_config.h"
 #include "map.h"
 
 static Map<String, Vector<uint8_t> >* files = NULL;
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 7bf750f6e1..d9fdc9cedc 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "file_access_network.h"
 #include "marshalls.h"
-#include "globals.h"
+#include "global_config.h"
 #include "os/os.h"
 #include "io/ip.h"
 
diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp
index d63539a7a5..fa1bebde16 100644
--- a/core/io/file_access_pack.cpp
+++ b/core/io/file_access_pack.cpp
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#define PACK_VERSION 0
+#define PACK_VERSION 1
 
 Error PackedData::add_pack(const String& p_path) {
 
@@ -167,8 +167,8 @@ bool PackedSourcePCK::try_open_pack(const String& p_path) {
 	uint32_t ver_minor = f->get_32();
 	uint32_t ver_rev = f->get_32();
 
-	ERR_EXPLAIN("Pack version newer than supported by engine: "+itos(version));
-	ERR_FAIL_COND_V( version > PACK_VERSION, ERR_INVALID_DATA);
+	ERR_EXPLAIN("Pack version unsupported: "+itos(version));
+	ERR_FAIL_COND_V( version != PACK_VERSION, ERR_INVALID_DATA);
 	ERR_EXPLAIN("Pack created with a newer version of the engine: "+itos(ver_major)+"."+itos(ver_minor)+"."+itos(ver_rev));
 	ERR_FAIL_COND_V( ver_major > VERSION_MAJOR || (ver_major == VERSION_MAJOR && ver_minor > VERSION_MINOR), ERR_INVALID_DATA);
 
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp
index aca095b6a5..cf5883121f 100644
--- a/core/io/packet_peer.cpp
+++ b/core/io/packet_peer.cpp
@@ -29,7 +29,7 @@
 #include "packet_peer.h"
 
 #include "io/marshalls.h"
-#include "globals.h"
+#include "global_config.h"
 /* helpers / binders */
 
 
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 2c02dbcc9b..2d733842fa 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "version.h"
 #include "resource_format_binary.h"
-#include "globals.h"
+#include "global_config.h"
 #include "io/file_access_compressed.h"
 #include "io/marshalls.h"
 #include "os/dir_access.h"
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index b6d28bccfa..c14389eefa 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "resource_loader.h"
 #include "print_string.h"
-#include "globals.h"
+#include "global_config.h"
 #include "path_remap.h"
 #include "os/file_access.h"
 #include "os/os.h"
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp
index 222d3e6bc0..f0bea30051 100644
--- a/core/io/resource_saver.cpp
+++ b/core/io/resource_saver.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "resource_saver.h"
-#include "globals.h"
+#include "global_config.h"
 #include "os/file_access.h"
 #include "script_language.h"
 #include "resource_loader.h"
-- 
cgit v1.2.3