Browse Source

Remove workaround fix for resource prefix path in Urho3DPlayer too.
[ccache clear]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
0a88fdbc21
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp
  2. 1 1
      Source/Urho3D/Engine/Engine.cpp

+ 1 - 1
Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -124,7 +124,7 @@ void Urho3DPlayer::Setup()
     // The first entry is an empty path which will be substituted with program/bin directory -- this entry is for binary when it is still in build tree
     // The second entry is a relative path from the installed program/bin directory to the asset directory -- this entry is for binary when it is in the Urho3D SDK installation location
     if (!engineParameters_.Contains("ResourcePrefixPaths"))
-        engineParameters_["ResourcePrefixPaths"] = " ;../share/Urho3D/Resources";
+        engineParameters_["ResourcePrefixPaths"] = ";../share/Urho3D/Resources";
 }
 
 void Urho3DPlayer::Start()

+ 1 - 1
Source/Urho3D/Engine/Engine.cpp

@@ -212,7 +212,7 @@ bool Engine::Initialize(const VariantMap& parameters)
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
 
-    Vector<String> resourcePrefixPaths = GetParameter(parameters, "ResourcePrefixPaths", "").GetString().Split(';', true);
+    Vector<String> resourcePrefixPaths = GetParameter(parameters, "ResourcePrefixPaths", String::EMPTY).GetString().Split(';', true);
     for (unsigned i = 0; i < resourcePrefixPaths.Size(); ++i)
         resourcePrefixPaths[i] = AddTrailingSlash(
             IsAbsolutePath(resourcePrefixPaths[i]) ? resourcePrefixPaths[i] : fileSystem->GetProgramDir() + resourcePrefixPaths[i]);