diff --git a/desktop_version/src/CustomLevels.h b/desktop_version/src/CustomLevels.h index 75a55385..3fc9a0ec 100644 --- a/desktop_version/src/CustomLevels.h +++ b/desktop_version/src/CustomLevels.h @@ -9,53 +9,53 @@ 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; }; #define ROOM_PROPERTIES \ - FOREACH_PROP(tileset, int) \ - FOREACH_PROP(tilecol, int) \ - FOREACH_PROP(roomname, std::string) \ - FOREACH_PROP(warpdir, int) \ - FOREACH_PROP(platx1, int) \ - FOREACH_PROP(platy1, int) \ - FOREACH_PROP(platx2, int) \ - FOREACH_PROP(platy2, int) \ - FOREACH_PROP(platv, int) \ - FOREACH_PROP(enemyx1, int) \ - FOREACH_PROP(enemyy1, int) \ - FOREACH_PROP(enemyx2, int) \ - FOREACH_PROP(enemyy2, int) \ - FOREACH_PROP(enemytype, int) \ - FOREACH_PROP(directmode, int) + FOREACH_PROP(tileset, int) \ + FOREACH_PROP(tilecol, int) \ + FOREACH_PROP(roomname, std::string) \ + FOREACH_PROP(warpdir, int) \ + FOREACH_PROP(platx1, int) \ + FOREACH_PROP(platy1, int) \ + FOREACH_PROP(platx2, int) \ + FOREACH_PROP(platy2, int) \ + FOREACH_PROP(platv, int) \ + FOREACH_PROP(enemyx1, int) \ + FOREACH_PROP(enemyy1, int) \ + FOREACH_PROP(enemyx2, int) \ + FOREACH_PROP(enemyy2, int) \ + FOREACH_PROP(enemytype, int) \ + FOREACH_PROP(directmode, int) class edlevelclass{ public: - edlevelclass(void); + edlevelclass(void); #define FOREACH_PROP(NAME, TYPE) TYPE NAME; - ROOM_PROPERTIES + ROOM_PROPERTIES #undef FOREACH_PROP }; 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; }; @@ -63,102 +63,102 @@ extern std::vector edentity; class EditorData { - public: + public: - static EditorData& GetInstance(void) - { - static EditorData instance; // Guaranteed to be destroyed. - // Instantiated on first use. - return instance; - } + static EditorData& GetInstance(void) + { + 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 modifier; }; class customlevelclass { public: - customlevelclass(void); - std::string Desc1; - std::string Desc2; - std::string Desc3; - std::string website; - - std::vector ListOfMetaData; - - void loadZips(void); - void getDirectoryData(void); - bool getLevelMetaData(std::string& filename, LevelMetaData& _data ); - - void reset(void); - const int* loadlevel(int rxi, int ryi); - - int gettileidx( - const int rx, - const int ry, - const int x, - const int y - ); - void settile( - const int rx, - const int ry, - const int x, - const int y, - const int t - ); - int gettile( - const int rx, - const int ry, - const int x, - const int y - ); - int getabstile(const int x, const int y); - - int getroompropidx(const int rx, const int ry); - const edlevelclass* getroomprop(const int rx, const int ry); + customlevelclass(void); + std::string Desc1; + std::string Desc2; + std::string Desc3; + std::string website; + + std::vector ListOfMetaData; + + void loadZips(void); + void getDirectoryData(void); + bool getLevelMetaData(std::string& filename, LevelMetaData& _data ); + + void reset(void); + const int* loadlevel(int rxi, int ryi); + + int gettileidx( + const int rx, + const int ry, + const int x, + const int y + ); + void settile( + const int rx, + const int ry, + const int x, + const int y, + const int t + ); + int gettile( + const int rx, + const int ry, + const int x, + const int y + ); + int getabstile(const int x, const int y); + + int getroompropidx(const int rx, const int ry); + const edlevelclass* getroomprop(const int rx, const int ry); #define FOREACH_PROP(NAME, TYPE) \ - void setroom##NAME(const int rx, const int ry, const TYPE NAME); - ROOM_PROPERTIES + void setroom##NAME(const int rx, const int ry, const TYPE NAME); + ROOM_PROPERTIES #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 - bool save(std::string& _path); + bool save(std::string& _path); #endif - void generatecustomminimap(void); - - int findtrinket(int t); - int findcrewmate(int t); - int findwarptoken(int t); - void findstartpoint(void); - int getlevelcol(const int tileset, const int tilecol); - int getenemycol(int t); - - //Colouring stuff - int getwarpbackground(int rx, int ry); - - static const int maxwidth = 20, maxheight = 20; //Special; the physical max the engine allows - static const int numrooms = maxwidth * maxheight; - int contents[40 * 30 * numrooms]; - int vmult[30 * maxheight]; - int numtrinkets(void); - int numcrewmates(void); - edlevelclass level[numrooms]; //Maxwidth*maxheight - - int levmusic; - int mapwidth, mapheight; //Actual width and height of stage - - int version; - - Uint32 getonewaycol(const int rx, const int ry); - Uint32 getonewaycol(void); - bool onewaycol_override; + void generatecustomminimap(void); + + int findtrinket(int t); + int findcrewmate(int t); + int findwarptoken(int t); + void findstartpoint(void); + int getlevelcol(const int tileset, const int tilecol); + int getenemycol(int t); + + //Colouring stuff + int getwarpbackground(int rx, int ry); + + static const int maxwidth = 20, maxheight = 20; //Special; the physical max the engine allows + static const int numrooms = maxwidth * maxheight; + int contents[40 * 30 * numrooms]; + int vmult[30 * maxheight]; + int numtrinkets(void); + int numcrewmates(void); + edlevelclass level[numrooms]; //Maxwidth*maxheight + + int levmusic; + int mapwidth, mapheight; //Actual width and height of stage + + int version; + + Uint32 getonewaycol(const int rx, const int ry); + Uint32 getonewaycol(void); + bool onewaycol_override; }; #ifndef CL_DEFINITION