[Scummvm-cvs-logs] scummvm master -> fee917cc052a2b7bb086a8d14ba8313bc8e75fa6
dreammaster
dreammaster at scummvm.org
Thu Dec 8 05:17:03 CET 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
46ee76b1b4 TSAGE: Fix objects in R2R scene 2425 to properly call base methods
eb862627f4 TSAGE: Bugfix initialisation of R2R scene 2425 that caused crashes when clicking on items
fee917cc05 TSAGE: Fix crash in R2R fallback scene display method
Commit: 46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2
https://github.com/scummvm/scummvm/commit/46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-07T19:47:46-08:00
Commit Message:
TSAGE: Fix objects in R2R scene 2425 to properly call base methods
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes2.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 46c6261..bc431f2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1300,9 +1300,9 @@ bool Scene2425::Item1::startAction(CursorType action, Event &event) {
} else if (action == R2_37) {
R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
- return startAction(R2_STEPPING_DISKS, event);
+ return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
} else
- return startAction(action, event);
+ return NamedHotspot::startAction(action, event);
}
bool Scene2425::Item2::startAction(CursorType action, Event &event) {
@@ -1317,16 +1317,16 @@ bool Scene2425::Item2::startAction(CursorType action, Event &event) {
} else if (action == R2_37) {
R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
- return startAction(R2_STEPPING_DISKS, event);
+ return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
} else
- return startAction(action, event);
+ return NamedHotspot::startAction(action, event);
}
bool Scene2425::Item3::startAction(CursorType action, Event &event) {
Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
if (action != R2_37)
- return startAction(action, event);
+ return NamedHotspot::startAction(action, event);
else {
R2_GLOBALS._player.disableControl();
if (R2_GLOBALS.getFlag(84)) {
@@ -1343,11 +1343,11 @@ bool Scene2425::Item3::startAction(CursorType action, Event &event) {
bool Scene2425::Item4::startAction(CursorType action, Event &event) {
if (action != R2_37)
- return startAction(action, event);
+ return NamedHotspot::startAction(action, event);
else {
R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
- return startAction(R2_STEPPING_DISKS, event);
+ return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
}
}
@@ -1357,21 +1357,21 @@ bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
R2_GLOBALS._events.setCursor(R2_37);
return true;
} else {
- return startAction(action, event);
+ return SceneActor::startAction(action, event);
}
} else if (R2_GLOBALS._events.getCursor() == R2_37)
return false;
else
- return startAction(action, event);
+ return SceneActor::startAction(action, event);
}
bool Scene2425::Actor2::startAction(CursorType action, Event &event) {
if (action != R2_37)
- return startAction(action, event);
+ return SceneActor::startAction(action, event);
else {
R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
- return startAction(R2_STEPPING_DISKS, event);
+ return SceneActor::startAction(R2_STEPPING_DISKS, event);
}
}
Commit: eb862627f41d49e1811872c855f1a76616645c11
https://github.com/scummvm/scummvm/commit/eb862627f41d49e1811872c855f1a76616645c11
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-07T20:03:53-08:00
Commit Message:
TSAGE: Bugfix initialisation of R2R scene 2425 that caused crashes when clicking on items
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes2.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index bc431f2..c162638 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1441,7 +1441,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
_actor3._lookLineNum = 3;
_actor3._talkLineNum = -1;
_actor3._useLineNum = 6;
- g_globals->_sceneItems.addItems(&_actor3, this);
+ g_globals->_sceneItems.push_back(&_actor3);
_item3.setDetails(12, 2425, 7, -1, 9);
_item4.setDetails(Rect(0, 0, 320, 200), 2425, 0, -1, -1, 1, NULL);
Commit: fee917cc052a2b7bb086a8d14ba8313bc8e75fa6
https://github.com/scummvm/scummvm/commit/fee917cc052a2b7bb086a8d14ba8313bc8e75fa6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-07T20:16:00-08:00
Commit Message:
TSAGE: Fix crash in R2R fallback scene display method
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 19b4bb6..e740e14 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -244,14 +244,16 @@ void SceneExt::loadScene(int sceneNum) {
bool SceneExt::display(CursorType action) {
switch (action) {
+ case CURSOR_CROSSHAIRS:
+ return false;
case CURSOR_LOOK:
- SceneItem::display2(9000, R2_GLOBALS._randomSource.getRandomNumber(2));
+ SceneItem::display2(1, R2_GLOBALS._randomSource.getRandomNumber(4));
break;
case CURSOR_USE:
- SceneItem::display2(9000, R2_GLOBALS._randomSource.getRandomNumber(2) + 6);
+ SceneItem::display2(1, R2_GLOBALS._randomSource.getRandomNumber(4) + 5);
break;
case CURSOR_TALK:
- SceneItem::display2(9000, R2_GLOBALS._randomSource.getRandomNumber(2) + 3);
+ SceneItem::display2(1, R2_GLOBALS._randomSource.getRandomNumber(4) + 10);
break;
default:
return false;
More information about the Scummvm-git-logs
mailing list