mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-15 22:28:10 +00:00
This commit is contained in:
parent
699a28de60
commit
d2843da224
@ -3365,8 +3365,8 @@ void SceneHandler::postInit(SceneObjectList *OwnerList) {
|
||||
_globals->_inventory._scanner._sceneNumber = 1;
|
||||
_globals->_inventory._ring._sceneNumber = 1;
|
||||
|
||||
// Currently hardcoded for first game room. Should be scene 1000 for title screen
|
||||
_globals->_sceneManager.setNewScene(30);
|
||||
// Switch to the title screen
|
||||
_globals->_sceneManager.setNewScene(1000);
|
||||
}
|
||||
|
||||
void SceneHandler::process(Event &event) {
|
||||
|
@ -253,6 +253,7 @@ void Scene1000::Action3::zoom(bool up) {
|
||||
void Scene1000::postInit(SceneObjectList *OwnerList) {
|
||||
Scene::postInit();
|
||||
setZoomPercents(0, 100, 200, 100);
|
||||
loadScene(1000);
|
||||
|
||||
if (_globals->_sceneManager._previousScene == 2000) {
|
||||
setZoomPercents(150, 10, 180, 100);
|
||||
@ -304,8 +305,6 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
|
||||
|
||||
setAction(&_action3);
|
||||
}
|
||||
|
||||
loadScene(1000);
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
|
@ -232,7 +232,6 @@ Scene::Scene(): _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
|
||||
}
|
||||
|
||||
Scene::~Scene() {
|
||||
// TODO: Delete the obj11C object
|
||||
}
|
||||
|
||||
void Scene::synchronise(Serialiser &s) {
|
||||
|
Loading…
Reference in New Issue
Block a user