- bugfixes for passing from one scenario into another when keeping faction state
This commit is contained in:
parent
a7cfcc1d99
commit
762699ef88
|
@ -1203,6 +1203,7 @@ void Game::update() {
|
||||||
gameCamera.setCalculatedDefault(map->getMaxMapHeight()+13.0f);
|
gameCamera.setCalculatedDefault(map->getMaxMapHeight()+13.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
scriptManager.init(&world, &gameCamera);
|
||||||
renderer.initGame(this);
|
renderer.initGame(this);
|
||||||
|
|
||||||
//sounds
|
//sounds
|
||||||
|
|
|
@ -1331,6 +1331,8 @@ void World::initUnitsForScenario() {
|
||||||
int startLocationIndex= f->getStartLocationIndex();
|
int startLocationIndex= f->getStartLocationIndex();
|
||||||
|
|
||||||
if(placeUnit(map.getStartLocation(startLocationIndex), generationArea, unit, true)) {
|
if(placeUnit(map.getStartLocation(startLocationIndex), generationArea, unit, true)) {
|
||||||
|
map.putUnitCells(unit, unit->getPos());
|
||||||
|
unit->setCurrSkill(scStop);
|
||||||
//unit->create(true);
|
//unit->create(true);
|
||||||
//unit->born();
|
//unit->born();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user