Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove NO_EDITOR/NO_CUSTOM_LEVELS, disable editor on Steam Deck

Browse Source 
This commit removes the `NO_EDITOR` and `NO_CUSTOM_LEVELS` defines,
which cleans up the code a lot, and they weren't really needed anyways.

This commit also disables the editor on the Steam Deck, and adds a
program argument to re-enable the editor, `-enable-editor`.
This commit is contained in:
AllyTally
2023-08-23 14:51:11 -03:00
committed by Misa Elizabeth Kai
parent 880c7ad8e6
commit a537492d9c
20 changed files with 65 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop_version/src/Map.cpp
View File

@@ -124,24 +124,20 @@ const int mapclass::areamap[] = {
int mapclass::getwidth(void)
{
#ifndef NO_CUSTOM_LEVELS
if (custommode)
{
return cl.mapwidth;
}
#endif
return 20;
}
int mapclass::getheight(void)
{
#ifndef NO_CUSTOM_LEVELS
if (custommode)
{
return cl.mapheight;
}
#endif
return 20;
}
@@ -420,7 +416,6 @@ void mapclass::initcustommapdata(void)
{
shinytrinkets.clear();
#if !defined(NO_CUSTOM_LEVELS)
for (size_t i = 0; i < customentities.size(); i++)
{
const CustomEntity& ent = customentities[i];
@@ -431,7 +426,6 @@ void mapclass::initcustommapdata(void)
settrinket(ent.rx, ent.ry);
}
#endif
}
int mapclass::finalat(int x, int y)
@@ -958,7 +952,6 @@ void mapclass::gotoroom(int rx, int ry)
music.niceplay(Music_PREDESTINEDFATEREMIX);
}
}
#if !defined(NO_CUSTOM_LEVELS)
else if (custommode)
{
game.roomx = rx;
@@ -968,7 +961,6 @@ void mapclass::gotoroom(int rx, int ry)
if (game.roomx > 100 + cl.mapwidth-1) game.roomx = 100;
if (game.roomy > 100 + cl.mapheight-1) game.roomy = 100;
}
#endif
else
{
game.roomx = rx;
@@ -1725,7 +1717,6 @@ void mapclass::loadlevel(int rx, int ry)
break;
}
#endif
#if !defined(NO_CUSTOM_LEVELS)
case 12: //Custom level
{
const RoomProperty* const room = cl.getroomprop(rx - 100, ry - 100);
@@ -1961,7 +1952,6 @@ void mapclass::loadlevel(int rx, int ry)
//do the appear/remove roomname here
break;
}
#endif
}
//The room's loaded: now we fill out damage blocks based on the tiles.
if (towermode)