salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing bugs

Browse Source
This commit is contained in:
Vladislav Khorev 2013-05-09 07:40:49 +00:00
parent c657c91851
commit edbae32ba7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Salmon Engine/Salmon Engine.vcxproj
View File

@ -183,7 +183,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PreprocessorDefinitions>TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;NDEBUG</PreprocessorDefinitions> <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> <DisableSpecificWarnings>4503</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>

8
src/TextureManager/SalmonTexture.cpp
View File

@ -630,7 +630,11 @@ cardinal TTextureListClass::AddTexture(const std::string& fileName)
cardinal TTextureListClass::AddTexture(const std::string& fileName, std::string texName) cardinal TTextureListClass::AddTexture(const std::string& fileName, std::string texName)
{ {
if (texName == "")
{
texName = GetFileName(fileName);
}
std::string fullFileName = ST::PathToResources + fileName; std::string fullFileName = ST::PathToResources + fileName;
std::string realFileName; std::string realFileName;
@ -645,8 +649,6 @@ cardinal TTextureListClass::AddTexture(const std::string& fileName, std::string
} }
return AddTextureDirectly(realFileName, texName); return AddTextureDirectly(realFileName, texName);
} }