*合并master到minimal分支

1 files changed, 7 insertions, 7 deletions

diff --git a/src/libjin/Filesystem/je_asset_database.cpp b/src/libjin/Filesystem/je_asset_database.cpp
index ac547f0..a8524c5 100644
--- a/src/libjin/Filesystem/je_asset_database.cpp
+++ b/src/libjin/Filesystem/je_asset_database.cpp
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <stdio.h>  /* defines FILENAME_MAX */
 
+#include "../common/je_exception.h"
+
 #include "je_asset_database.h"
 
 namespace JinEngine
@@ -34,14 +36,13 @@ namespace JinEngine
 			}
 		}
 
-		bool AssetDatabase::read(const char* path, Buffer& buffer)
+		void AssetDatabase::read(const char* path, Buffer& buffer)
 		{
             size_t size;
             byte* data = (byte*)smtread(mSmt, path, &size);
-			if (data == nullptr)
-				return false;
+            if (data == nullptr)
+                throw Exception("Could not read file %s.", path);
             buffer.bind(data, size);
-			return true;
 		}
 
         Buffer* read(const char* path)
@@ -73,12 +74,11 @@ namespace JinEngine
 		{
 			return smtexists(mSmt, path) == 0;
 		}
-
+/*
         std::vector<std::string> AssetDatabase::getFiles(const char* path, bool recursive)
         {
-
         }
-
+*/
 	} // namespace Filesystem
 } // namespace JinEngine