Move editor automap .rules files to separate subfolder

For better organization of the `data/editor` folder.
This commit is contained in:
Robert Müller 2023-08-19 10:36:29 +02:00
parent 22cc32113b
commit 16bc489afb
18 changed files with 5854 additions and 5849 deletions

View file

@ -1411,14 +1411,25 @@ set(EXPECTED_DATA
countryflags/index.txt
debug_font.png
editor/audio_source.png
editor/automap/basic_freeze.rules
editor/automap/ddmax_freeze.rules
editor/automap/ddnet_tiles.rules
editor/automap/ddnet_walls.rules
editor/automap/desert_main.rules
editor/automap/fadeout.rules
editor/automap/generic_clear.rules
editor/automap/generic_unhookable.rules
editor/automap/generic_unhookable_0.7.rules
editor/automap/grass_main.rules
editor/automap/grass_main_0.7.rules
editor/automap/jungle_main.rules
editor/automap/jungle_midground.rules
editor/automap/round_tiles.rules
editor/automap/water.rules
editor/automap/winter_main.rules
editor/background.png
editor/basic_freeze.rules
editor/checker.png
editor/cursor.png
editor/ddmax_freeze.rules
editor/ddnet_tiles.rules
editor/ddnet_walls.rules
editor/desert_main.rules
editor/entities/DDNet.png
editor/entities/FNG.png
editor/entities/Race.png
@ -1431,23 +1442,12 @@ set(EXPECTED_DATA
editor/entities_clear/fng.png
editor/entities_clear/race.png
editor/entities_clear/vanilla.png
editor/fadeout.rules
editor/front.png
editor/generic_clear.rules
editor/generic_unhookable.rules
editor/generic_unhookable_0.7.rules
editor/grass_main.rules
editor/grass_main_0.7.rules
editor/jungle_main.rules
editor/jungle_midground.rules
editor/round_tiles.rules
editor/speed_arrow.png
editor/speedup.png
editor/switch.png
editor/tele.png
editor/tune.png
editor/water.rules
editor/winter_main.rules
emoticons.png
extras.png
fonts/DejaVuSans.ttf

View file

@ -47,10 +47,15 @@ CAutoMapper::CAutoMapper(CEditor *pEditor)
void CAutoMapper::Load(const char *pTileName)
{
char aPath[IO_MAX_PATH_LENGTH];
str_format(aPath, sizeof(aPath), "editor/%s.rules", pTileName);
str_format(aPath, sizeof(aPath), "editor/automap/%s.rules", pTileName);
IOHANDLE RulesFile = Storage()->OpenFile(aPath, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
if(!RulesFile)
{
char aBuf[IO_MAX_PATH_LENGTH + 32];
str_format(aBuf, sizeof(aBuf), "failed to load %s", aPath);
Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
return;
}
CLineReader LineReader;
LineReader.Init(RulesFile);