mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Fix mixed indentation in editor.h

Browse source 
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:
Misa 2020-06-11 17:57:04 -07:00 committed by Ethan Lee
parent e7b39757a4
commit 628eb7b7bf
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
desktop_version/src/editor.h
View file

@ -9,39 +9,39 @@
class edentities{
public:
int x, y, t;
//parameters
int p1, p2, p3, p4, p5, p6;
std::string scriptname;
int x, y, t;
//parameters
int p1, p2, p3, p4, p5, p6;
std::string scriptname;
};
class edlevelclass{
public:
edlevelclass();
int tileset, tilecol;
std::string roomname;
int warpdir;
int platx1, platy1, platx2, platy2, platv;
int enemyx1, enemyy1, enemyx2, enemyy2, enemytype;
int directmode;
int tileset, tilecol;
std::string roomname;
int warpdir;
int platx1, platy1, platx2, platy2, platv;
int enemyx1, enemyy1, enemyx2, enemyy2, enemytype;
int directmode;
};
struct LevelMetaData
{
std::string title;
std::string creator;
std::string Desc1;
std::string Desc2;
std::string Desc3;
std::string website;
std::string filename;
std::string title;
std::string creator;
std::string Desc1;
std::string Desc2;
std::string Desc3;
std::string website;
std::string filename;
std::string modifier;
std::string timeCreated;
std::string timeModified;
std::string modifier;
std::string timeCreated;
std::string timeModified;
int version;
int version;
};
@ -49,29 +49,29 @@ extern std::vector<edentities> edentity;
class EditorData
{
public:
public:
static EditorData& GetInstance()
{
static EditorData instance; // Guaranteed to be destroyed.
// Instantiated on first use.
return instance;
}
static EditorData& GetInstance()
{
static EditorData instance; // Guaranteed to be destroyed.
// Instantiated on first use.
return instance;
}
std::string title;
std::string creator;
std::string title;
std::string creator;
std::string modifier;
std::string timeCreated;
std::string timeModified;
std::string modifier;
std::string timeCreated;
std::string timeModified;
private:
EditorData()
{
}
EditorData()
{
}
};
@ -84,7 +84,7 @@ class editorclass{
std::string Desc1;
std::string Desc2;
std::string Desc3;
std::string website;
std::string website;
std::vector<std::string> directoryList;
std::vector<LevelMetaData> ListOfMetaData;