[Scummvm-git-logs] scummvm master -> 0c21e1fac2ee8dd869d2b24a6fccfcc558b2e265

[mgerhardy]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
83d7494bbf TWINE: comment
d7043700c0 TWINE: fixed position of drawSelectableCharacter
db604307f7 TWINE: reduced visibility
0c21e1fac2 TWINE: fixed logic in renderLocations according to disassembly


Commit: 83d7494bbf6d5c8a957d46b1b1453c4489d758ea
    https://github.com/scummvm/scummvm/commit/83d7494bbf6d5c8a957d46b1b1453c4489d758ea
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-28T22:08:10+01:00

Commit Message:
TWINE: comment

Changed paths:
    engines/twine/holomap.h


diff --git a/engines/twine/holomap.h b/engines/twine/holomap.h
index 0e7cbde270..067da99ad2 100644
--- a/engines/twine/holomap.h
+++ b/engines/twine/holomap.h
@@ -45,6 +45,7 @@ private:
 	bool isTriangleVisible(const Vertex *vertices) const;
 
 	struct Location {
+		// angles
 		uint16 x = 0;
 		uint16 y = 0;
 		uint16 z = 0;


Commit: d7043700c073d5d0ae23a29f0847b5e2c52b6948
    https://github.com/scummvm/scummvm/commit/d7043700c073d5d0ae23a29f0847b5e2c52b6948
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-28T22:11:03+01:00

Commit Message:
TWINE: fixed position of drawSelectableCharacter

Changed paths:
    engines/twine/menu/menuoptions.cpp


diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp
index 58d87b7a4a..7a4d2be8a8 100644
--- a/engines/twine/menu/menuoptions.cpp
+++ b/engines/twine/menu/menuoptions.cpp
@@ -126,7 +126,7 @@ void MenuOptions::showEndSequence() {
 
 void MenuOptions::drawSelectableCharacter(int32 x, int32 y, Common::Rect &dirtyRect) {
 	const int32 borderTop = 200;
-	const int32 borderLeft = _engine->width() / 2 - 270;
+	const int32 borderLeft = _engine->width() / 2 - 295;
 	const int32 halfButtonHeight = 25;
 	const int32 halfButtonWidth = 20;
 	const int32 buttonDistanceX = halfButtonWidth * 2 + 5;


Commit: db604307f778fbef9257e024fb4f9e94b76d334e
    https://github.com/scummvm/scummvm/commit/db604307f778fbef9257e024fb4f9e94b76d334e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-28T22:11:03+01:00

Commit Message:
TWINE: reduced visibility

Changed paths:
    engines/twine/renderer/screens.h


diff --git a/engines/twine/renderer/screens.h b/engines/twine/renderer/screens.h
index fbfffb0b73..01d38e912e 100644
--- a/engines/twine/renderer/screens.h
+++ b/engines/twine/renderer/screens.h
@@ -35,6 +35,16 @@ class Screens {
 private:
 	TwinEEngine *_engine;
 
+	/**
+	 * Adjust palette intensity
+	 * @param r red component of color
+	 * @param g green component of color
+	 * @param b blue component of color
+	 * @param palette palette to adjust
+	 * @param intensity intensity value to adjust
+	 */
+	void adjustPalette(uint8 r, uint8 g, uint8 b, const uint32 *palette, int32 intensity);
+
 public:
 	Screens(TwinEEngine *engine) : _engine(engine) {}
 
@@ -114,16 +124,6 @@ public:
 	 */
 	int32 crossDot(int32 modifier, int32 color, int32 param, int32 intensity);
 
-	/**
-	 * Adjust palette intensity
-	 * @param r red component of color
-	 * @param g green component of color
-	 * @param b blue component of color
-	 * @param palette palette to adjust
-	 * @param intensity intensity value to adjust
-	 */
-	void adjustPalette(uint8 r, uint8 g, uint8 b, const uint32 *palette, int32 intensity);
-
 	/**
 	 * Adjust between two palettes
 	 * @param pal1 palette from adjust


Commit: 0c21e1fac2ee8dd869d2b24a6fccfcc558b2e265
    https://github.com/scummvm/scummvm/commit/0c21e1fac2ee8dd869d2b24a6fccfcc558b2e265
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-28T22:11:03+01:00

Commit Message:
TWINE: fixed logic in renderLocations according to disassembly

Changed paths:
    engines/twine/holomap.cpp


diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index dd18a21392..0c03794048 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -480,11 +480,11 @@ void Holomap::renderLocations(int xRot, int yRot, int zRot, bool lower) {
 			int32 zpos1_copy2 = _engine->_renderer->destPos.z;
 			_engine->_renderer->getBaseRotationPosition(xpos2, ypos2, zpos2);
 			if (lower) {
-				if (zpos1_copy2 <= _engine->_renderer->destPos.z) {
+				if (zpos1_copy2 > _engine->_renderer->destPos.z) {
 					continue;
 				}
 			} else {
-				if (_engine->_renderer->destPos.z <= zpos1_copy2) {
+				if (_engine->_renderer->destPos.z > zpos1_copy2) {
 					continue;
 				}
 			}