From edbae32ba7f14361572ccfb94218811bb581b649 Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <vladislav.khorev@fishrungames.com>
Date: Thu, 9 May 2013 07:40:49 +0000
Subject: [PATCH] fixing bugs

---
 Salmon Engine/Salmon Engine.vcxproj  | 2 +-
 src/TextureManager/SalmonTexture.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Salmon Engine/Salmon Engine.vcxproj b/Salmon Engine/Salmon Engine.vcxproj
index f2ac4de..1d644c5 100644
--- a/Salmon Engine/Salmon Engine.vcxproj	
+++ b/Salmon Engine/Salmon Engine.vcxproj	
@@ -183,7 +183,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PreprocessorDefinitions>TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;NDEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(LibsPath)\jpeg-9;$(LibsPath)\jpeg-9\vc10</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4503</DisableSpecificWarnings>
     </ClCompile>
     <Link>
diff --git a/src/TextureManager/SalmonTexture.cpp b/src/TextureManager/SalmonTexture.cpp
index dfe1f1e..6af8fe9 100644
--- a/src/TextureManager/SalmonTexture.cpp
+++ b/src/TextureManager/SalmonTexture.cpp
@@ -630,7 +630,11 @@ cardinal TTextureListClass::AddTexture(const std::string& fileName)
 
 cardinal TTextureListClass::AddTexture(const std::string& fileName, std::string texName)
 {
-   
+	if (texName == "")
+	{
+		texName = GetFileName(fileName);
+	}
+	   
 	std::string fullFileName = ST::PathToResources + fileName;
 
 	std::string realFileName;
@@ -645,8 +649,6 @@ cardinal TTextureListClass::AddTexture(const std::string& fileName, std::string
 	}
 
 
-
-
 	return AddTextureDirectly(realFileName, texName);
 }