diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-30 11:59:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-30 11:59:33 -0300 |
| commit | b4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (patch) | |
| tree | 67551f833464dc31c7d48e68e93b68c161e404b2 /core/io | |
| parent | 4613a3f2c0d8f060cac610e2a7a401aee2ece78f (diff) | |
| parent | 55b34e05b3d735a84e1af9833e19c0b816c18252 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/file_access_encrypted.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 29f27dcbda..65b1ca5207 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -5,10 +5,12 @@ #include "print_string.h" #define COMP_MAGIC 0x43454447 +#include "core/variant.h" +#include <stdio.h> Error FileAccessEncrypted::open_and_parse(FileAccess *p_base,const Vector<uint8_t>& p_key,Mode p_mode) { - print_line("open and parse!"); + //print_line("open and parse!"); ERR_FAIL_COND_V(file!=NULL,ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(p_key.size()!=32,ERR_INVALID_PARAMETER); |