diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /engines/tsage/ringworld | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'engines/tsage/ringworld')
| -rw-r--r-- | engines/tsage/ringworld/ringworld_scenes3.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp index 0e4ccd1269..b2ed986331 100644 --- a/engines/tsage/ringworld/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld/ringworld_scenes3.cpp @@ -2179,6 +2179,7 @@ Scene2120::Scene2120(): Scene() { _prevDbMode = 0; _visageVisable = false; _subjectIndex = 0; + _lineOffset = 0; } void Scene2120::postInit(SceneObjectList *OwnerList) { @@ -3690,8 +3691,8 @@ void Scene2230::Hotspot12::doAction(int action) { /*--------------------------------------------------------------------------*/ -Scene2230::Scene2230() : - _hotspot9(0, CURSOR_LOOK, 2230, 16, CURSOR_USE, 2230, 18, LIST_END) { +Scene2230::Scene2230() : _hotspot9(0, CURSOR_LOOK, 2230, 16, CURSOR_USE, 2230, 18, LIST_END) { + _field30A = 0; } void Scene2230::postInit(SceneObjectList *OwnerList) { @@ -4877,6 +4878,7 @@ Scene2310::Scene2310() { _rectList[4].set(199, 70, 215, 140); _wireIndex = 5; + _pageIndex = 0; } void Scene2310::postInit(SceneObjectList *OwnerList) { |