dmuratshin 9 years ago
parent
commit
82938c9a67
6 changed files with 14 additions and 13 deletions
  1. 1 0
      .gitignore
  2. BIN
      libs/SDL2.dll
  3. BIN
      libs/SDL2.lib
  4. BIN
      libs/SDL2main.lib
  5. 11 11
      oxygine/src/res/Resources.cpp
  6. 2 2
      oxygine/src/res/Resources.h

+ 1 - 0
.gitignore

@@ -64,3 +64,4 @@ build
 .DS_Store
 *.VC.db
 *.VC.VC.opendb
+oxygine/SDL/win32/oxygine.vcxproj.user

BIN
libs/SDL2.dll


BIN
libs/SDL2.lib


BIN
libs/SDL2main.lib


+ 11 - 11
oxygine/src/res/Resources.cpp

@@ -127,10 +127,10 @@ namespace oxygine
         __freeName();
     }
 
-	bool Resources::isEmpty() const
-	{
-		return _docs.empty();
-	}
+    bool Resources::isEmpty() const
+    {
+        return _docs.empty();
+    }
 
     void Resources::updateName(const std::string& filename)
     {
@@ -183,12 +183,12 @@ namespace oxygine
         int sz = file::read(xmlFile, fb);
 
 
-		if (!sz)
-		{
-			log::error("can't load xml file: '%s'", xmlFile.c_str());
-			OX_ASSERT(!"can't find xml file");
-			return false;
-		}
+        if (!sz)
+        {
+            log::error("can't load xml file: '%s'", xmlFile.c_str());
+            OX_ASSERT(!"can't find xml file");
+            return false;
+        }
 
         FS_LOG("step1");
 
@@ -287,7 +287,7 @@ namespace oxygine
         }
 
         FS_LOG("xml loaded");
-		return true;
+        return true;
     }
 
     void Resources::collect(resources& r)

+ 2 - 2
oxygine/src/res/Resources.h

@@ -92,8 +92,8 @@ namespace oxygine
         /**Completely deletes all loaded resources*/
         void free();
 
-		/**Does it have any loaded xmls*/
-		bool isEmpty() const;
+        /**Does it have any loaded xmls*/
+        bool isEmpty() const;
 
         /** get resource by id, no case sensitive
         @param resource id