edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 09:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge b9cb2d2e00 into bf5add67ec

Browse source
This commit is contained in:
Marmare314 2024-09-13 19:14:01 +02:00 committed by GitHub
parent bf5add67ec b9cb2d2e00
commit 54a34151f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/game/editor/auto_map.cpp
View file

@ -45,7 +45,7 @@ CAutoMapper::CAutoMapper(CEditor *pEditor)
OnInit(pEditor);
}
void CAutoMapper::Load(const char *pTileName)
void CAutoMapper::Load(const char *pTileName, bool Include)
{
char aPath[IO_MAX_PATH_LENGTH];
str_format(aPath, sizeof(aPath), "editor/automap/%s.rules", pTileName);
@ -53,6 +53,9 @@ void CAutoMapper::Load(const char *pTileName)
if(!LineReader.OpenFile(Storage()->OpenFile(aPath, IOFLAG_READ, IStorage::TYPE_ALL)))
{
char aBuf[IO_MAX_PATH_LENGTH + 32];
if(Include)
str_format(aBuf, sizeof(aBuf), "failed to include %s", aPath);
else
str_format(aBuf, sizeof(aBuf), "failed to load %s", aPath);
Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
return;
@ -331,6 +334,20 @@ void CAutoMapper::Load(const char *pTileName)
{
pCurrentRun->m_AutomapCopy = false;
}
else if(str_startswith(pLine, "Include "))
{
pLine += str_length("Include ");
char aName[512];
str_copy(aName, pLine, minimum<int>(sizeof(aName), str_length(pLine) + 1));
if(str_comp(aName, pTileName) != 0)
Load(aName, true);
pCurrentConf = nullptr;
pCurrentRun = nullptr;
pCurrentIndex = nullptr;
}
}
}
@ -383,9 +400,13 @@ void CAutoMapper::Load(const char *pTileName)
}
char aBuf[IO_MAX_PATH_LENGTH + 16];
if(Include)
str_format(aBuf, sizeof(aBuf), "included %s", aPath);
else
str_format(aBuf, sizeof(aBuf), "loaded %s", aPath);
Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
if(!Include)
m_FileLoaded = true;
}

2
src/game/editor/auto_map.h
View file

@ -59,7 +59,7 @@ class CAutoMapper : public CEditorComponent
public:
explicit CAutoMapper(CEditor *pEditor);
void Load(const char *pTileName);
void Load(const char *pTileName, bool Include = false);
void ProceedLocalized(class CLayerTiles *pLayer, int ConfigId, int Seed = 0, int X = 0, int Y = 0, int Width = -1, int Height = -1);
void Proceed(class CLayerTiles *pLayer, int ConfigId, int Seed = 0, int SeedOffsetX = 0, int SeedOffsetY = 0);