Skip to content

Commit a6a7f91

Browse files
committed
#1935 potential fix for map loadinng deleting attached scripts
1 parent c1139e1 commit a6a7f91

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

game/gamemap.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ void GameMap::loadMapData()
131131

132132
setPriority(static_cast<qint32>(Mainapp::ZOrder::Map));
133133

134-
m_markedFieldsLayer = MemoryManagement::create<oxygine::Actor>();
135-
m_markedFieldsLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::MarkedFields));
136-
addChild(m_markedFieldsLayer);
137-
m_moveArrowLayer = MemoryManagement::create<oxygine::Actor>();
138-
m_moveArrowLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::MoveArrow));
139-
addChild(m_moveArrowLayer);
140-
m_unitsLayer = MemoryManagement::create<oxygine::Actor>();
141-
m_unitsLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::Units));
142-
addChild(m_unitsLayer);
134+
m_markedFieldsLayer = MemoryManagement::create<oxygine::Actor>();
135+
m_markedFieldsLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::MarkedFields));
136+
addChild(m_markedFieldsLayer);
137+
m_moveArrowLayer = MemoryManagement::create<oxygine::Actor>();
138+
m_moveArrowLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::MoveArrow));
139+
addChild(m_moveArrowLayer);
140+
m_unitsLayer = MemoryManagement::create<oxygine::Actor>();
141+
m_unitsLayer->setPriority(static_cast<qint32>(Mainapp::ZOrder::Units));
142+
addChild(m_unitsLayer);
143143

144144
connect(this, &GameMap::sigZoomChanged, this, &GameMap::zoomChanged, Qt::QueuedConnection);
145145
}

mapsupport/refactorMap.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ void GameMap::extendMap(const QString mapFile, GameEnums::Directions direction)
9999
pAi->resetToTurnStart();
100100
}
101101
}
102+
registerMapAtInterpreter();
102103
m_gameRules->resetFogSprites();
103104
m_gameRules->createWeatherSprites();
105+
m_GameScript->init();
104106
Mainapp::getInstance()->continueRendering();
105107
}
106108
}

0 commit comments

Comments
 (0)