summaryrefslogtreecommitdiff
path: root/core/io/file_access_encrypted.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-04-29 22:57:49 +0200
committerGitHub <noreply@github.com>2017-04-29 22:57:49 +0200
commitde7eba887e9fe940dac0958836fa8fb778628d2a (patch)
tree93b80fde60db3117b649190daa7918105a4d4e11 /core/io/file_access_encrypted.cpp
parentea9dd6c0c1997b2c6d8bba6caa1da965ef40804f (diff)
parentd4029aa51a0f0bce5dc73885af74b592e3aa33b7 (diff)
Merge pull request #8572 from akien-mga/thirdparty
Moving more thirdparty stuff (minizip, some single-file external libs) to the thirdparty directory
Diffstat (limited to 'core/io/file_access_encrypted.cpp')
-rw-r--r--core/io/file_access_encrypted.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp
index 2625e5fe34..f2b33a01bb 100644
--- a/core/io/file_access_encrypted.cpp
+++ b/core/io/file_access_encrypted.cpp
@@ -28,15 +28,18 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "file_access_encrypted.h"
-#include "aes256.h"
-#include "md5.h"
+
+#include "core/variant.h"
#include "os/copymem.h"
#include "print_string.h"
-#define COMP_MAGIC 0x43454447
-#include "core/variant.h"
+#include "thirdparty/misc/aes256.h"
+#include "thirdparty/misc/md5.h"
+
#include <stdio.h>
+#define COMP_MAGIC 0x43454447
+
Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8_t> &p_key, Mode p_mode) {
//print_line("open and parse!");