seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-renamed globals.h to global_config.cpp (this seems to have caused a few modified files)

Browse Source 
-.pck and .zip exporting redone, seems to be working..
This commit is contained in:
Juan Linietsky
2017-02-21 00:05:15 -03:00
parent 6e2bf31e5a
commit de0045cf1b
121 changed files with 560 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/file_access_pack.cpp
View File

@ -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);