[Scummvm-cvs-logs] scummvm master -> 4aac2579368104870dd410995d34c7e020cb1583
dreammaster
dreammaster at scummvm.org
Thu Sep 19 04:22:35 CEST 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f9f4f4eb17 TSAGE: Renamings for R2R elevator shaft
4aac257936 TSAGE: Generalised saving of R2R walk regions resource
Commit: f9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88
https://github.com/scummvm/scummvm/commit/f9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-09-18T19:20:24-07:00
Commit Message:
TSAGE: Renamings for R2R elevator shaft
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes1.cpp
engines/tsage/ringworld2/ringworld2_scenes1.h
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index aab6c8a..44d2bad 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -12917,9 +12917,10 @@ void Scene1900::signal() {
}
/*--------------------------------------------------------------------------
- * Scene 1925 -
+ * Scene 1925 - Spill Mountains Elevator Shaft
*
*--------------------------------------------------------------------------*/
+
Scene1925::Scene1925() {
_field9B8 = 0;
for (int i = 0; i < 5; i++)
@@ -12934,7 +12935,7 @@ void Scene1925::synchronize(Serializer &s) {
s.syncAsSint16LE(_levelResNum[i]);
}
-bool Scene1925::Hotspot2::startAction(CursorType action, Event &event) {
+bool Scene1925::Button::startAction(CursorType action, Event &event) {
Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
if (action != CURSOR_USE)
@@ -13092,7 +13093,7 @@ void Scene1925::changeLevel(bool upFlag) {
break;
case 3:
loadScene(_levelResNum[4]);
- _item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
+ _button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
_actor1.setDetails(1925, 0, 1, 2, 2, (SceneItem *) NULL);
_actor1.show();
break;
@@ -13101,7 +13102,7 @@ void Scene1925::changeLevel(bool upFlag) {
// No break on purpose
default:
loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]);
- R2_GLOBALS._sceneItems.remove(&_item2);
+ R2_GLOBALS._sceneItems.remove(&_button);
R2_GLOBALS._sceneItems.remove(&_actor1);
_actor1.hide();
break;
@@ -13140,7 +13141,7 @@ void Scene1925::postInit(SceneObjectList *OwnerList) {
break;
case 3:
_actor1.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
- _item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
+ _button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
// No break on purpose
case -3:
_exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 82895c7..fbc1f15 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -1011,7 +1011,7 @@ public:
};
class Scene1925 : public SceneExt {
- class Hotspot2 : public NamedHotspot {
+ class Button : public NamedHotspot {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -1038,7 +1038,7 @@ class Scene1925 : public SceneExt {
};
public:
NamedHotspot _item1;
- Hotspot2 _item2;
+ Button _button;
Hotspot3 _item3;
SceneActor _actor1;
ExitUp _exitUp;
Commit: 4aac2579368104870dd410995d34c7e020cb1583
https://github.com/scummvm/scummvm/commit/4aac2579368104870dd410995d34c7e020cb1583
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-09-18T19:21:50-07:00
Commit Message:
TSAGE: Generalised saving of R2R walk regions resource
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
engines/tsage/ringworld2/ringworld2_scenes2.cpp
engines/tsage/scenes.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index a607ebe..6f5dbd0 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -162,6 +162,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
// Spill Mountains Elevator Exit
return new Scene1900();
case 1925:
+ // Spill Mountains Elevator Shaft
return new Scene1925();
case 1945:
return new Scene1945();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index cc50de0..9fa64b3 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1030,12 +1030,6 @@ void Scene2000::process(Event &event) {
void Scene2000::synchronize(Serializer &s) {
SceneExt::synchronize(s);
- // Synchronise active walk regions
- int regionsId = R2_GLOBALS._walkRegions._resNum;
- s.syncAsUint16LE(regionsId);
- if (s.isLoading())
- R2_GLOBALS._walkRegions.load(regionsId);
-
s.syncAsByte(_exitingFlag);
s.syncAsSint16LE(_mazePlayerMode);
}
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 774a527..23623b1 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -247,6 +247,14 @@ void SceneManager::listenerSynchronize(Serializer &s) {
}
}
+ // Walk regions loading
+ if (g_vm->getGameID() == GType_Ringworld2) {
+ int walkRegionsId = GLOBALS._walkRegions._resNum;
+ s.syncAsSint16LE(walkRegionsId);
+ if (s.isLoading())
+ GLOBALS._walkRegions.load(walkRegionsId);
+ }
+
g_globals->_sceneManager._scrollerRect.synchronize(s);
SYNC_POINTER(g_globals->_scrollFollower);
s.syncAsSint16LE(_loadMode);
More information about the Scummvm-git-logs
mailing list