Replace deprecated PHYSFS_addToSearchPath calls with PHYSFS_mount.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-22 17:48:32 -04:00
parent 1aaa8737ab
commit aac4b3487a
4 changed files with 8 additions and 7 deletions
@@ -3802,6 +3802,7 @@
LOVE_NOMPG123,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
ios/include,
@@ -3843,6 +3844,7 @@
LOVE_NO_MODPLUG,
LOVE_NOMPG123,
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
ios/include,
@@ -3885,6 +3887,7 @@
LOVE_NO_MODPLUG,
LOVE_NOMPG123,
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
ios/include,
+3 -3
View File
@@ -174,7 +174,7 @@ bool Filesystem::setIdentity(const char *ident, bool appendToPath)
// Try to add the save directory to the search path.
// (No error on fail, it means that the path doesn't exist).
PHYSFS_addToSearchPath(save_path_full.c_str(), appendToPath);
PHYSFS_mount(save_path_full.c_str(), nullptr, appendToPath);
// HACK: This forces setupWriteDirectory to be called the next time a file
// is opened for writing - otherwise it won't be called at all if it was
@@ -199,7 +199,7 @@ bool Filesystem::setSource(const char *source)
return false;
// Add the directory.
if (!PHYSFS_addToSearchPath(source, 1))
if (!PHYSFS_mount(source, nullptr, 1))
return false;
// Save the game source.
@@ -260,7 +260,7 @@ bool Filesystem::setupWriteDirectory()
return false;
// Add the directory. (Will not be readded if already present).
if (!PHYSFS_addToSearchPath(save_path_full.c_str(), 0))
if (!PHYSFS_mount(save_path_full.c_str(), nullptr, 0))
{
PHYSFS_setWriteDir(nullptr); // Clear the write directory in case of error.
return false;
+1 -1
View File
@@ -33,7 +33,7 @@ Quad::Quad(const Quad::Viewport &v, float sw, float sh)
: sw(sw)
, sh(sh)
{
memset(vertices, 255, sizeof(Vertex) * NUM_VERTICES);
memset(vertices, 255, sizeof(Vertex) * 4);
refresh(v, sw, sh);
}
+1 -3
View File
@@ -40,8 +40,6 @@ public:
float w, h;
};
static const size_t NUM_VERTICES = 4;
Quad(const Viewport &v, float sw, float sh);
virtual ~Quad();
@@ -53,7 +51,7 @@ public:
private:
Vertex vertices[NUM_VERTICES];
Vertex vertices[4];
Viewport viewport;
float sw;