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

[mgerhardy]

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:
cdb198ade2 TWINE: fixed protopack inventory action body


Commit: cdb198ade2db2311eb1e54c437037f5eb0e7db02
    https://github.com/scummvm/scummvm/commit/cdb198ade2db2311eb1e54c437037f5eb0e7db02
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-06-12T19:47:48+02:00

Commit Message:
TWINE: fixed protopack inventory action body

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


diff --git a/engines/twine/renderer/redraw.cpp b/engines/twine/renderer/redraw.cpp
index b47809f72e1..69c476c674f 100644
--- a/engines/twine/renderer/redraw.cpp
+++ b/engines/twine/renderer/redraw.cpp
@@ -362,9 +362,9 @@ void Redraw::processDrawListActors(const DrawListStruct &drawCmd, bool bgRedraw)
 	if (_engine->_interface->setClip(renderRect)) {
 		actor->_dynamicFlags.bIsDrawn = 1;
 
-		const int32 tempX = (actor->_pos.x + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+		const int32 tempX = (actor->_pos.x + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 		int32 tempY = actor->_pos.y / SIZE_BRICK_Y;
-		const int32 tempZ = (actor->_pos.z + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+		const int32 tempZ = (actor->_pos.z + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 		if (actor->brickShape() != ShapeType::kNone) {
 			tempY++;
 		}
@@ -417,14 +417,14 @@ void Redraw::processDrawListActorSprites(const DrawListStruct &drawCmd, bool bgR
 		actor->_dynamicFlags.bIsDrawn = 1;
 
 		if (actor->_staticFlags.bUsesClipping) {
-			const int32 tmpX = (actor->_animStep.x + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+			const int32 tmpX = (actor->_animStep.x + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 			const int32 tmpY = actor->_animStep.y / SIZE_BRICK_Y;
-			const int32 tmpZ = (actor->_animStep.z + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+			const int32 tmpZ = (actor->_animStep.z + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 			_engine->_grid->drawOverSpriteActor(tmpX, tmpY, tmpZ);
 		} else {
-			const int32 tmpX = (actor->_pos.x + actor->_boundingBox.maxs.x + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+			const int32 tmpX = (actor->_pos.x + actor->_boundingBox.maxs.x + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 			int32 tmpY = actor->_pos.y / SIZE_BRICK_Y;
-			const int32 tmpZ = (actor->_pos.z + actor->_boundingBox.maxs.z + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+			const int32 tmpZ = (actor->_pos.z + actor->_boundingBox.maxs.z + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 			if (actor->brickShape() != ShapeType::kNone) {
 				tmpY++;
 			}
@@ -468,9 +468,9 @@ void Redraw::processDrawListExtras(const DrawListStruct &drawCmd) {
 	}
 
 	if (_engine->_interface->setClip(renderRect)) {
-		const int32 tmpX = (extra->pos.x + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+		const int32 tmpX = (extra->pos.x + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 		const int32 tmpY = extra->pos.y / SIZE_BRICK_Y;
-		const int32 tmpZ = (extra->pos.z + SIZE_BRICK_Y) / SIZE_BRICK_XZ;
+		const int32 tmpZ = (extra->pos.z + DEMI_BRICK_XZ) / SIZE_BRICK_XZ;
 
 		_engine->_grid->drawOverModelActor(tmpX, tmpY, tmpZ);
 		addRedrawArea(_engine->_interface->_clip);
diff --git a/engines/twine/scene/grid.cpp b/engines/twine/scene/grid.cpp
index d62ba879ee4..f4adaa87b67 100644
--- a/engines/twine/scene/grid.cpp
+++ b/engines/twine/scene/grid.cpp
@@ -65,7 +65,7 @@ void Grid::init(int32 w, int32 h) {
 	_brickInfoBuffer = (int16 *)malloc(_brickInfoBufferSize);
 }
 
-void Grid::copyGridMask(int32 index, int32 x, int32 y, const Graphics::ManagedSurface &buffer) {
+void Grid::copyGridMask(int32 index, int32 x, int32 y, const Graphics::ManagedSurface &buffer) { // CopyMask
 	if (_engine->_debugGrid->_disableGridRendering) {
 		return;
 	}
@@ -182,7 +182,7 @@ void Grid::drawOverModelActor(int32 x, int32 y, int32 z) {
 	}
 }
 
-void Grid::drawOverSpriteActor(int32 x, int32 y, int32 z) {
+void Grid::drawOverSpriteActor(int32 x, int32 y, int32 z) { // DrawOverBrick3
 	const int32 copyBlockPhysLeft = ((_engine->_interface->_clip.left + 24) / 24) - 1;
 	const int32 copyBlockPhysRight = (_engine->_interface->_clip.right + 24) / 24;
 
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 8db49789640..a7fa8c993d6 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -689,7 +689,7 @@ void TwinEEngine::processInventoryAction() {
 		break;
 	}
 	case kiProtoPack:
-		if (_gameState->hasItem(InventoryItems::kiBookOfBu)) {
+		if (_gameState->hasItem(InventoryItems::kSendellsMedallion)) {
 			_scene->_sceneHero->_genBody = BodyType::btNormal;
 		} else {
 			_scene->_sceneHero->_genBody = BodyType::btTunic;