diff --git a/platform/msvc2008/love.vcproj b/platform/msvc2008/love.vcproj
index afa6061ac..759aa8dea 100644
--- a/platform/msvc2008/love.vcproj
+++ b/platform/msvc2008/love.vcproj
@@ -602,6 +602,10 @@
RelativePath="..\..\src\modules\filesystem\File.h"
>
+
+
@@ -633,30 +637,6 @@
RelativePath="..\..\src\modules\filesystem\physfs\File.h"
>
-
-
-
-
-
-
-
-
-
-
@@ -3285,6 +3265,14 @@
RelativePath="..\..\src\common\Matrix.h"
>
+
+
+
+
diff --git a/src/common/MemoryData.cpp b/src/common/MemoryData.cpp
index 01f512c4b..ee7ebaccd 100644
--- a/src/common/MemoryData.cpp
+++ b/src/common/MemoryData.cpp
@@ -18,16 +18,13 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
-#ifndef LOVE_DATA_H
-#define LOVE_DATA_H
-
// LOVE
-#include "Object.h"
+#include "MemoryData.h"
namespace love
{
- MemoryData::MemoryData(const void * data)
+ MemoryData::MemoryData(void * data, int size)
: data(data), size(size)
{
}
@@ -47,7 +44,4 @@ namespace love
return size;
}
-
} // love
-
-#endif // LOVE_DATA_H
\ No newline at end of file
diff --git a/src/common/MemoryData.h b/src/common/MemoryData.h
index 118ffef48..bf45ae23f 100644
--- a/src/common/MemoryData.h
+++ b/src/common/MemoryData.h
@@ -26,14 +26,14 @@
namespace love
{
- class Memory : public Data
+ class MemoryData : public Data
{
private:
void * data;
int size;
public:
- MemoryData(const void * data, int size);
+ MemoryData(void * data, int size);
virtual ~MemoryData();
// Implements Data.
diff --git a/src/modules/filesystem/physfs/FileData.cpp b/src/modules/filesystem/FileData.cpp
similarity index 98%
rename from src/modules/filesystem/physfs/FileData.cpp
rename to src/modules/filesystem/FileData.cpp
index 45b6da8c7..f406e0b5b 100644
--- a/src/modules/filesystem/physfs/FileData.cpp
+++ b/src/modules/filesystem/FileData.cpp
@@ -26,8 +26,6 @@
namespace love
{
namespace filesystem
-{
-namespace physfs
{
FileData::FileData(int size, const std::string & filename)
: data(new char[size]), size(size), filename(filename)
@@ -61,6 +59,5 @@ namespace physfs
return extension;
}
-} // physfs
} // filesystem
} // love
diff --git a/src/modules/filesystem/FileData.h b/src/modules/filesystem/FileData.h
index 996672bc7..3e2452564 100644
--- a/src/modules/filesystem/FileData.h
+++ b/src/modules/filesystem/FileData.h
@@ -22,10 +22,8 @@
#define LOVE_FILESYSTEM_FILE_DATA_H
// LOVE
-#include
-
-// STD
#include
+#include
namespace love
{
@@ -34,24 +32,31 @@ namespace filesystem
class FileData : public Data
{
private:
+
+ // The actual data.
+ char * data;
+
+ // Size of the data.
+ int size;
+
+ // The filename used for error purposes.
+ std::string filename;
+
+ // The extension (without dot). Used to identify file type.
+ std::string extension;
+
public:
- /**
- * Destructor.
- **/
- virtual ~FileData(){};
+ FileData(int size, const std::string & filename);
- /**
- * Gets a filename for this FileData.
- * @return The filename for this FileData, with extension.
- **/
- virtual const std::string & getFilename() const = 0;
+ virtual ~FileData();
- /**
- * Gets the file extension for this FileData, or empty string if none.
- * @return The file extension for this FileData (without the dot).
- **/
- virtual const std::string & getExtension() const = 0;
+ // Implements Data.
+ void * getData() const;
+ int getSize() const;
+
+ const std::string & getFilename() const;
+ const std::string & getExtension() const;
}; // FileData
diff --git a/src/modules/filesystem/physfs/File.cpp b/src/modules/filesystem/physfs/File.cpp
index 6237c7d34..1a826fab7 100644
--- a/src/modules/filesystem/physfs/File.cpp
+++ b/src/modules/filesystem/physfs/File.cpp
@@ -25,7 +25,7 @@
// LOVE
#include "Filesystem.h"
-#include "FileData.h"
+#include
namespace love
{
diff --git a/src/modules/filesystem/physfs/FileData.h b/src/modules/filesystem/physfs/FileData.h
deleted file mode 100644
index f873c7fc8..000000000
--- a/src/modules/filesystem/physfs/FileData.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-* Copyright (c) 2006-2009 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty. In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#ifndef LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
-#define LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
-
-// LOVE
-#include
-
-namespace love
-{
-namespace filesystem
-{
-namespace physfs
-{
- class FileData : public love::filesystem::FileData
- {
- private:
-
- // The actual data.
- char * data;
-
- // Size of the data.
- int size;
-
- // The filename used for error purposes.
- std::string filename;
-
- // The extension (without dot). Used to identify file type.
- std::string extension;
-
- public:
-
- FileData(int size, const std::string & filename);
-
- virtual ~FileData();
-
- // Implements Data.
- void * getData() const;
- int getSize() const;
-
- const std::string & getFilename() const;
- const std::string & getExtension() const;
-
- }; // FileData
-
-} // physfs
-} // filesystem
-} // love
-
-#endif // LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
\ No newline at end of file
diff --git a/src/modules/filesystem/physfs/Filesystem.h b/src/modules/filesystem/physfs/Filesystem.h
index ac506dc03..109806035 100644
--- a/src/modules/filesystem/physfs/Filesystem.h
+++ b/src/modules/filesystem/physfs/Filesystem.h
@@ -30,10 +30,8 @@
#include
#include
#include
-
-// Module
+#include
#include "File.h"
-#include "FileData.h"
// For great CWD. (Current Working Directory)
// Using this instead of boost::filesystem which totally
diff --git a/src/modules/filesystem/physfs/wrap_FileData.h b/src/modules/filesystem/physfs/wrap_FileData.h
index 31004081b..a392b79b9 100644
--- a/src/modules/filesystem/physfs/wrap_FileData.h
+++ b/src/modules/filesystem/physfs/wrap_FileData.h
@@ -24,7 +24,7 @@
// LOVE
#include
-#include "FileData.h"
+#include
namespace love
{
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index 4b7535cb8..1b66637e5 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -400,8 +400,8 @@ namespace opengl
return new Frame(x, y, w, h, sw, sh);
}
- Font * Graphics::newFont(love::filesystem::File * file, int size)
- {
+ Font * Graphics::newFont(love::filesystem::File * file, int size)
+ {
Font * font = new TrueTypeFont(file, size);
// Load it and check for errors.
@@ -411,7 +411,7 @@ namespace opengl
return 0;
}
- return font;
+ return font;
}
Font * Graphics::newImageFont(Image * image, const char * glyphs, float spacing)
diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h
index 9463277c8..e9d6b2c4d 100644
--- a/src/modules/graphics/opengl/Graphics.h
+++ b/src/modules/graphics/opengl/Graphics.h
@@ -244,7 +244,7 @@ namespace opengl
/**
* Creates a Font object.
**/
- Font * newFont(love::filesystem::File * file, int size = 12);
+ Font * newFont(love::filesystem::File * file, int size);
/**
* Creates an ImageFont object.
diff --git a/src/resources/Vera.ttf b/src/resources/Vera.ttf
deleted file mode 100644
index 58cd6b5e6..000000000
Binary files a/src/resources/Vera.ttf and /dev/null differ