mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Fix mixed indentation in editor.h
Some of the file was indented with two spaces and the rest indented with tabs. It feels like two different people worked on the file, one more than the other. Since most of it uses two spaces, I'll just replace the tabs with two spaces.
This commit is contained in:
parent
e7b39757a4
commit
628eb7b7bf
1 changed files with 37 additions and 37 deletions
|
@ -9,39 +9,39 @@
|
||||||
|
|
||||||
class edentities{
|
class edentities{
|
||||||
public:
|
public:
|
||||||
int x, y, t;
|
int x, y, t;
|
||||||
//parameters
|
//parameters
|
||||||
int p1, p2, p3, p4, p5, p6;
|
int p1, p2, p3, p4, p5, p6;
|
||||||
std::string scriptname;
|
std::string scriptname;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class edlevelclass{
|
class edlevelclass{
|
||||||
public:
|
public:
|
||||||
edlevelclass();
|
edlevelclass();
|
||||||
int tileset, tilecol;
|
int tileset, tilecol;
|
||||||
std::string roomname;
|
std::string roomname;
|
||||||
int warpdir;
|
int warpdir;
|
||||||
int platx1, platy1, platx2, platy2, platv;
|
int platx1, platy1, platx2, platy2, platv;
|
||||||
int enemyx1, enemyy1, enemyx2, enemyy2, enemytype;
|
int enemyx1, enemyy1, enemyx2, enemyy2, enemytype;
|
||||||
int directmode;
|
int directmode;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct LevelMetaData
|
struct LevelMetaData
|
||||||
{
|
{
|
||||||
std::string title;
|
std::string title;
|
||||||
std::string creator;
|
std::string creator;
|
||||||
std::string Desc1;
|
std::string Desc1;
|
||||||
std::string Desc2;
|
std::string Desc2;
|
||||||
std::string Desc3;
|
std::string Desc3;
|
||||||
std::string website;
|
std::string website;
|
||||||
std::string filename;
|
std::string filename;
|
||||||
|
|
||||||
std::string modifier;
|
std::string modifier;
|
||||||
std::string timeCreated;
|
std::string timeCreated;
|
||||||
std::string timeModified;
|
std::string timeModified;
|
||||||
|
|
||||||
int version;
|
int version;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -49,29 +49,29 @@ extern std::vector<edentities> edentity;
|
||||||
|
|
||||||
class EditorData
|
class EditorData
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static EditorData& GetInstance()
|
static EditorData& GetInstance()
|
||||||
{
|
{
|
||||||
static EditorData instance; // Guaranteed to be destroyed.
|
static EditorData instance; // Guaranteed to be destroyed.
|
||||||
// Instantiated on first use.
|
// Instantiated on first use.
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string title;
|
std::string title;
|
||||||
std::string creator;
|
std::string creator;
|
||||||
|
|
||||||
std::string modifier;
|
std::string modifier;
|
||||||
std::string timeCreated;
|
std::string timeCreated;
|
||||||
std::string timeModified;
|
std::string timeModified;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|
||||||
EditorData()
|
EditorData()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ class editorclass{
|
||||||
std::string Desc1;
|
std::string Desc1;
|
||||||
std::string Desc2;
|
std::string Desc2;
|
||||||
std::string Desc3;
|
std::string Desc3;
|
||||||
std::string website;
|
std::string website;
|
||||||
|
|
||||||
std::vector<std::string> directoryList;
|
std::vector<std::string> directoryList;
|
||||||
std::vector<LevelMetaData> ListOfMetaData;
|
std::vector<LevelMetaData> ListOfMetaData;
|
||||||
|
|
Loading…
Reference in a new issue