mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-28 15:38:30 +02:00
Code Issues Releases Wiki Activity

Fix number of spaces of indentation of CustomLevels.h

Browse Source 
CustomLevels.h now uses 4-space indents - like all other space-indented
files - instead of 2-space indents. This has bugged me for a while and I
decided to just fix it now.
This commit is contained in:
Misa 2021-02-20 15:43:16 -08:00 committed by Misa Elizabeth Kai
parent a23014350f
commit 86b47878f9
1 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
desktop_version/src/CustomLevels.h
View File

@ -9,53 +9,53 @@
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;
}; };
#define ROOM_PROPERTIES \ #define ROOM_PROPERTIES \
FOREACH_PROP(tileset, int) \ FOREACH_PROP(tileset, int) \
FOREACH_PROP(tilecol, int) \ FOREACH_PROP(tilecol, int) \
FOREACH_PROP(roomname, std::string) \ FOREACH_PROP(roomname, std::string) \
FOREACH_PROP(warpdir, int) \ FOREACH_PROP(warpdir, int) \
FOREACH_PROP(platx1, int) \ FOREACH_PROP(platx1, int) \
FOREACH_PROP(platy1, int) \ FOREACH_PROP(platy1, int) \
FOREACH_PROP(platx2, int) \ FOREACH_PROP(platx2, int) \
FOREACH_PROP(platy2, int) \ FOREACH_PROP(platy2, int) \
FOREACH_PROP(platv, int) \ FOREACH_PROP(platv, int) \
FOREACH_PROP(enemyx1, int) \ FOREACH_PROP(enemyx1, int) \
FOREACH_PROP(enemyy1, int) \ FOREACH_PROP(enemyy1, int) \
FOREACH_PROP(enemyx2, int) \ FOREACH_PROP(enemyx2, int) \
FOREACH_PROP(enemyy2, int) \ FOREACH_PROP(enemyy2, int) \
FOREACH_PROP(enemytype, int) \ FOREACH_PROP(enemytype, int) \
FOREACH_PROP(directmode, int) FOREACH_PROP(directmode, int)
class edlevelclass{ class edlevelclass{
public: public:
edlevelclass(void); edlevelclass(void);
#define FOREACH_PROP(NAME, TYPE) TYPE NAME; #define FOREACH_PROP(NAME, TYPE) TYPE NAME;
ROOM_PROPERTIES ROOM_PROPERTIES
#undef FOREACH_PROP #undef FOREACH_PROP
}; };
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;
}; };
@ -63,102 +63,102 @@ extern std::vector<edentities> edentity;
class EditorData class EditorData
{ {
public: public:
static EditorData& GetInstance(void) static EditorData& GetInstance(void)
{ {
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;
}; };
class customlevelclass class customlevelclass
{ {
public: public:
customlevelclass(void); customlevelclass(void);
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<LevelMetaData> ListOfMetaData; std::vector<LevelMetaData> ListOfMetaData;
void loadZips(void); void loadZips(void);
void getDirectoryData(void); void getDirectoryData(void);
bool getLevelMetaData(std::string& filename, LevelMetaData& _data ); bool getLevelMetaData(std::string& filename, LevelMetaData& _data );
void reset(void); void reset(void);
const int* loadlevel(int rxi, int ryi); const int* loadlevel(int rxi, int ryi);
int gettileidx( int gettileidx(
const int rx, const int rx,
const int ry, const int ry,
const int x, const int x,
const int y const int y
); );
void settile( void settile(
const int rx, const int rx,
const int ry, const int ry,
const int x, const int x,
const int y, const int y,
const int t const int t
); );
int gettile( int gettile(
const int rx, const int rx,
const int ry, const int ry,
const int x, const int x,
const int y const int y
); );
int getabstile(const int x, const int y); int getabstile(const int x, const int y);
int getroompropidx(const int rx, const int ry); int getroompropidx(const int rx, const int ry);
const edlevelclass* getroomprop(const int rx, const int ry); const edlevelclass* getroomprop(const int rx, const int ry);
#define FOREACH_PROP(NAME, TYPE) \ #define FOREACH_PROP(NAME, TYPE) \
void setroom##NAME(const int rx, const int ry, const TYPE NAME); void setroom##NAME(const int rx, const int ry, const TYPE NAME);
ROOM_PROPERTIES ROOM_PROPERTIES
#undef FOREACH_PROP #undef FOREACH_PROP
int absfree(int x, int y); int absfree(int x, int y);
bool load(std::string& _path); bool load(std::string& _path);
#ifndef NO_EDITOR #ifndef NO_EDITOR
bool save(std::string& _path); bool save(std::string& _path);
#endif #endif
void generatecustomminimap(void); void generatecustomminimap(void);
int findtrinket(int t); int findtrinket(int t);
int findcrewmate(int t); int findcrewmate(int t);
int findwarptoken(int t); int findwarptoken(int t);
void findstartpoint(void); void findstartpoint(void);
int getlevelcol(const int tileset, const int tilecol); int getlevelcol(const int tileset, const int tilecol);
int getenemycol(int t); int getenemycol(int t);
//Colouring stuff //Colouring stuff
int getwarpbackground(int rx, int ry); int getwarpbackground(int rx, int ry);
static const int maxwidth = 20, maxheight = 20; //Special; the physical max the engine allows static const int maxwidth = 20, maxheight = 20; //Special; the physical max the engine allows
static const int numrooms = maxwidth * maxheight; static const int numrooms = maxwidth * maxheight;
int contents[40 * 30 * numrooms]; int contents[40 * 30 * numrooms];
int vmult[30 * maxheight]; int vmult[30 * maxheight];
int numtrinkets(void); int numtrinkets(void);
int numcrewmates(void); int numcrewmates(void);
edlevelclass level[numrooms]; //Maxwidth*maxheight edlevelclass level[numrooms]; //Maxwidth*maxheight
int levmusic; int levmusic;
int mapwidth, mapheight; //Actual width and height of stage int mapwidth, mapheight; //Actual width and height of stage
int version; int version;
Uint32 getonewaycol(const int rx, const int ry); Uint32 getonewaycol(const int rx, const int ry);
Uint32 getonewaycol(void); Uint32 getonewaycol(void);
bool onewaycol_override; bool onewaycol_override;
}; };
#ifndef CL_DEFINITION #ifndef CL_DEFINITION