[Scummvm-git-logs] scummvm master -> eca9fcdc1e158ac39b5fafafb32821ec645098cd

mgerhardy martin.gerhardy at gmail.com
Mon Mar 15 22:16:29 UTC 2021


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:
eca9fcdc1e TWINE: enable code again


Commit: eca9fcdc1e158ac39b5fafafb32821ec645098cd
    https://github.com/scummvm/scummvm/commit/eca9fcdc1e158ac39b5fafafb32821ec645098cd
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-03-15T23:16:16+01:00

Commit Message:
TWINE: enable code again

error introduced in 70fd4f428d9ed5ba1f71bb02f35b8fae7fccb410

Changed paths:
    engines/twine/renderer/redraw.cpp


diff --git a/engines/twine/renderer/redraw.cpp b/engines/twine/renderer/redraw.cpp
index 1022cbd3dc..3fba8ebec8 100644
--- a/engines/twine/renderer/redraw.cpp
+++ b/engines/twine/renderer/redraw.cpp
@@ -220,8 +220,8 @@ int32 Redraw::fillActorDrawingList(bool bgRedraw) {
 
 			// if actor is above another actor
 			if (actor->standOn != -1) {
-				//const ActorStruct *standOnActor = _engine->_scene->getActor(actor->standOn);
-				//tmpVal = standOnActor->pos.x - _engine->_grid->camera.x + standOnActor->pos.z - _engine->_grid->camera.z + 2;
+				const ActorStruct *standOnActor = _engine->_scene->getActor(actor->standOn);
+				tmpVal = standOnActor->pos.x - _engine->_grid->camera.x + standOnActor->pos.z - _engine->_grid->camera.z + 2;
 			}
 
 			if (actor->staticFlags.bIsSpriteActor) {




More information about the Scummvm-git-logs mailing list