edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conform to style

Browse source
This commit is contained in:
patiga 2020-10-05 19:59:48 +02:00
parent d123d928b4
commit 09a9ca9699
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/editor/io.cpp
View file

@ -440,7 +440,8 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
df.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item); df.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
// save auto mapper of each tile layer (not physics layer) // save auto mapper of each tile layer (not physics layer)
if(!Item.m_Flags) { if(!Item.m_Flags)
{
CMapItemAutoMapperConfig ItemAutomapper; CMapItemAutoMapperConfig ItemAutomapper;
ItemAutomapper.m_Version = CMapItemAutoMapperConfig::CURRENT_VERSION; ItemAutomapper.m_Version = CMapItemAutoMapperConfig::CURRENT_VERSION;
ItemAutomapper.m_GroupId = GroupCount; ItemAutomapper.m_GroupId = GroupCount;
@ -1285,11 +1286,13 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
if(pItem->m_GroupId >= 0 && pItem->m_GroupId < m_lGroups.size() && if(pItem->m_GroupId >= 0 && pItem->m_GroupId < m_lGroups.size() &&
pItem->m_LayerId >= 0 && pItem->m_LayerId < m_lGroups[pItem->m_GroupId]->m_lLayers.size()) { pItem->m_LayerId >= 0 && pItem->m_LayerId < m_lGroups[pItem->m_GroupId]->m_lLayers.size()) {
CLayer *pLayer = m_lGroups[pItem->m_GroupId]->m_lLayers[pItem->m_LayerId]; CLayer *pLayer = m_lGroups[pItem->m_GroupId]->m_lLayers[pItem->m_LayerId];
if (pLayer->m_Type == LAYERTYPE_TILES) { if (pLayer->m_Type == LAYERTYPE_TILES)
{
CLayerTiles *pLayer = (CLayerTiles *)m_lGroups[pItem->m_GroupId]->m_lLayers[pItem->m_LayerId]; CLayerTiles *pLayer = (CLayerTiles *)m_lGroups[pItem->m_GroupId]->m_lLayers[pItem->m_LayerId];
// only load auto mappers for tile layers (not physics layers) // only load auto mappers for tile layers (not physics layers)
if (!(pLayer->m_Game || pLayer->m_Tele || pLayer->m_Speedup || if (!(pLayer->m_Game || pLayer->m_Tele || pLayer->m_Speedup ||
pLayer->m_Front || pLayer->m_Switch || pLayer->m_Tune)) { pLayer->m_Front || pLayer->m_Switch || pLayer->m_Tune))
{
pLayer->m_AutoMapperConfig = pItem->m_AutomapperConfig; pLayer->m_AutoMapperConfig = pItem->m_AutomapperConfig;
pLayer->m_Seed = pItem->m_AutomapperSeed; pLayer->m_Seed = pItem->m_AutomapperSeed;
pLayer->m_AutoAutoMap = !!(pItem->m_Flags & CMapItemAutoMapperConfig::FLAG_AUTOMATIC); pLayer->m_AutoAutoMap = !!(pItem->m_Flags & CMapItemAutoMapperConfig::FLAG_AUTOMATIC);