[Scummvm-cvs-logs] scummvm master -> 3ec2ad3e6391980bd0f85c7ff7ce0518168c271e
dreammaster
dreammaster at scummvm.org
Sat Nov 9 02:33:58 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3ec2ad3e63 TSAGE: Removed un-needed mouse boundary rects from Globals
Commit: 3ec2ad3e6391980bd0f85c7ff7ce0518168c271e
https://github.com/scummvm/scummvm/commit/3ec2ad3e6391980bd0f85c7ff7ce0518168c271e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-08T17:33:26-08:00
Commit Message:
TSAGE: Removed un-needed mouse boundary rects from Globals
Changed paths:
engines/tsage/globals.cpp
engines/tsage/globals.h
engines/tsage/ringworld2/ringworld2_scenes0.cpp
engines/tsage/ringworld2/ringworld2_scenes1.cpp
engines/tsage/ringworld2/ringworld2_scenes3.cpp
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index a8ab145..caad2ba 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -478,8 +478,6 @@ void Ringworld2Globals::reset() {
Common::fill(&_paletteMap[0], &_paletteMap[4096], 0);
_fadePaletteFlag = false;
- _v5589E.set(0, 0, 0, 0);
- _v558B6.set(0, 0, 0, 0);
_animationCtr = 0;
_electromagnetChangeAmount = 0;
_electromagnetZoom = 0;
@@ -586,9 +584,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
TsAGE2Globals::synchronize(s);
int i;
- _v5589E.synchronize(s);
- _v558B6.synchronize(s);
-
s.syncAsSint16LE(_animationCtr);
s.syncAsSint16LE(_electromagnetChangeAmount);
s.syncAsSint16LE(_electromagnetZoom);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index b9c8076..c5dc308 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -252,8 +252,6 @@ public:
byte _paletteMap[4096];
int _insetUp;
int _frameEdgeColor;
- Rect _v5589E;
- Rect _v558B6;
int _animationCtr;
int _electromagnetChangeAmount;
int _electromagnetZoom;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b050e8f..c68ab26 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -6293,8 +6293,6 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
loadScene(700);
if (R2_GLOBALS._sceneManager._previousScene == 900)
_sceneBounds = Rect(160, 0, 480, 200);
-
- R2_GLOBALS._v558B6.set(60, 0, 260, 200);
SceneExt::postInit();
_rotation = R2_GLOBALS._scenePalette.addRotation(237, 246, -1);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index c851c57..7d36008 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -547,7 +547,6 @@ void Scene1020::postInit(SceneObjectList *OwnerList) {
_sceneBounds = Rect(160, 0, SCREEN_WIDTH + 160, 200);
R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
- R2_GLOBALS._v558B6.set(160, 0, 160, 161);
R2_GLOBALS._player.postInit();
if (R2_GLOBALS._sceneManager._previousScene == 1010) {
@@ -779,8 +778,6 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
if ((R2_GLOBALS._sceneManager._previousScene == 1000) && (!R2_GLOBALS.getFlag(44))) {
R2_GLOBALS._uiElements._active = false;
- R2_GLOBALS._v5589E.left = 0;
- R2_GLOBALS._v5589E.right = 200;
}
if (R2_GLOBALS._player._characterScene[R2_QUINN] == 1100)
@@ -788,8 +785,6 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
if (R2_GLOBALS._sceneManager._previousScene == -1) {
R2_GLOBALS._uiElements._active = false;
- R2_GLOBALS._v5589E.left = 0;
- R2_GLOBALS._v5589E.right = 200;
}
SceneExt::postInit();
@@ -6896,8 +6891,6 @@ void Scene1337::subD1A48(int arg1) {
void Scene1500::postInit(SceneObjectList *OwnerList) {
loadScene(1500);
R2_GLOBALS._uiElements._active = false;
- R2_GLOBALS._v5589E.top = 0;
- R2_GLOBALS._v5589E.bottom = 200;
setZoomPercents(170, 13, 240, 100);
SceneExt::postInit();
scalePalette(65, 65, 65);
@@ -6956,8 +6949,6 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
}
void Scene1500::remove() {
- R2_GLOBALS._v5589E.top = 3;
- R2_GLOBALS._v5589E.bottom = 168;
R2_GLOBALS._uiElements._active = true;
SceneExt::remove();
@@ -8562,12 +8553,9 @@ void Scene1550::Wall::setupWall(int frameNumber, int strip) {
}
void Scene1550::enterArea() {
- Rect tmpRect;
_walkRegionsId = 0;
_dishMode = 0;
- tmpRect = R2_GLOBALS._v5589E;
-
_wallCorner1.remove();
_westWall.remove();
_northWall.remove();
@@ -9574,8 +9562,6 @@ void Scene1575::postInit(SceneObjectList *OwnerList) {
void Scene1575::remove() {
SceneExt::remove();
- R2_GLOBALS._v5589E.top = 3;
- R2_GLOBALS._v5589E.bottom = 168;
R2_GLOBALS._uiElements._active = true;
}
@@ -10312,7 +10298,6 @@ bool Scene1700::RimTransport::startAction(CursorType action, Event &event) {
Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
R2_GLOBALS._player.disableControl();
- R2_GLOBALS._v558B6.set(80, 0, 240, 200);
scene->_sceneMode = 4;
Common::Point pt(271, 90);
@@ -10593,7 +10578,6 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1700;
R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1700;
- R2_GLOBALS._v558B6.set(20, 0, 320, 200);
enterArea();
_surface.setDetails(1, 1700, 3, -1, -1);
@@ -10916,7 +10900,6 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
loadScene(1750);
R2_GLOBALS._sound1.play(115);
R2_GLOBALS._uiElements._active = false;
- R2_GLOBALS._v5589E.set(0, 0, 320, 200);
SceneExt::postInit();
R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
@@ -11038,8 +11021,6 @@ void Scene1750::remove() {
SceneExt::remove();
R2_GLOBALS._sound1.fadeOut2(NULL);
- R2_GLOBALS._v5589E.top = 3;
- R2_GLOBALS._v5589E.bottom = 168;
R2_GLOBALS._uiElements._active = true;
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index fdaf13b..682a607 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2715,7 +2715,6 @@ void Scene3400::postInit(SceneObjectList *OwnerList) {
loadScene(3400);
_soundFaded = false;
- R2_GLOBALS._v558B6.set(60, 0, 260, 200);
SceneExt::postInit();
R2_GLOBALS._sound1.play(317);
@@ -3550,7 +3549,6 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._uiElements._active = false;
R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
- R2_GLOBALS._v5589E.set(0, 0, 320, 200);
R2_GLOBALS._sound1.play(305);
R2_GLOBALS._player._characterIndex = R2_QUINN;
R2_GLOBALS._player._characterScene[R2_QUINN] = 3500;
@@ -4420,11 +4418,9 @@ bool Scene3600::Protector::startAction(CursorType action, Event &event) {
void Scene3600::postInit(SceneObjectList *OwnerList) {
if (R2_GLOBALS._sceneManager._previousScene == 3600) {
R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
- R2_GLOBALS._v558B6.set(60, 0, 260, 200);
} else {
R2_GLOBALS._scrollFollower = &_steppingDisk;
_sceneBounds = Rect(160, 0, 480, 200);
- R2_GLOBALS._v558B6.set(25, 0, 260, 200);
}
loadScene(3600);
@@ -4778,7 +4774,6 @@ void Scene3600::signal() {
case 3603:
R2_GLOBALS._walkRegions.disableRegion(2);
R2_GLOBALS._walkRegions.disableRegion(7);
- R2_GLOBALS._v558B6.set(60, 0, 260, 200);
_tealSpeaker._displayMode = 1;
_sceneMode = 3321;
_stripManager.start(3321, this);
More information about the Scummvm-git-logs
mailing list