- bugfixes for passing from one scenario into another when keeping faction state

source/glest_game/game/game.cpp

@@ -1203,6 +1203,7 @@ void Game::update() {
 					gameCamera.setCalculatedDefault(map->getMaxMapHeight()+13.0f);
 				}
 
+				scriptManager.init(&world, &gameCamera);
 				renderer.initGame(this);
 
 				//sounds

source/glest_game/world/world.cpp

@@ -1331,6 +1331,8 @@ void World::initUnitsForScenario() {
 			int startLocationIndex= f->getStartLocationIndex();
 
 			if(placeUnit(map.getStartLocation(startLocationIndex), generationArea, unit, true)) {
+				map.putUnitCells(unit, unit->getPos());
+				unit->setCurrSkill(scStop);
 				//unit->create(true);
 				//unit->born();
 			}