libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Added missing logic for copying foreground to background in R2R scene 1100

Browse Source
This commit is contained in:
Paul Gilbert 2013-08-11 14:10:24 -04:00
parent 43b729cae8
commit 9d9833537f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/tsage/core.cpp
View File

@ -2762,8 +2762,8 @@ void BackgroundSceneObject::setup2(int visage, int stripFrameNum, int frameNum,
fixPriority(priority);
}
void BackgroundSceneObject::proc27() {
warning("STUB: BackgroundSceneObject::proc27()");
void BackgroundSceneObject::copySceneToBackground() {
GLOBALS._sceneManager._scene->_backSurface.copyFrom(g_globals->gfxManager().getSurface(), 0, 0);
}
/*--------------------------------------------------------------------------*/

2
engines/tsage/core.h
View File

@ -613,7 +613,7 @@ public:
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void draw();
void setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY, int priority, int32 arg10);
void proc27();
static void copySceneToBackground();
};
class SceneText : public SceneObject {

2
engines/tsage/ringworld2/ringworld2_logic.cpp
View File

@ -2066,7 +2066,7 @@ void AnimationPlayer::close() {
_field38 = 0;
if (g_globals != NULL)
R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr - 1, 0);
R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0);
}
void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) {

4
engines/tsage/ringworld2/ringworld2_scenes1.cpp
View File

@ -1062,7 +1062,7 @@ void Scene1100::signal() {
setAction(&_sequenceManager1, this, 1105, &R2_GLOBALS._player, &_actor10, &_actor11, &_actor18, NULL);
break;
case 9:
_object1.proc27();
_object1.copySceneToBackground();
_actor15.postInit();
_actor15.setup(1103, 2, 1);
@ -1076,7 +1076,7 @@ void Scene1100::signal() {
_actor13.setAction(&_sequenceManager2, this, 1108, &_actor13, NULL);
break;
case 11: {
setAction(&_sequenceManager1, this, 1116, &_actor11, &_actor10, &_actor12, NULL);
setAction(&_sequenceManager1, this, 1106, &_actor11, &_actor10, &_actor12, NULL);
R2_GLOBALS._player._effect = 5;
R2_GLOBALS._player.setup(1102, 3, 2);
R2_GLOBALS._player.setPosition(Common::Point(-50, 131));