[Scummvm-git-logs] scummvm master -> 95b2e7285ddc18a9b208b1a0537e77d531be9e2e

[neuromancer]

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

Summary:
3b66be4c38 FREESCAPE: correctly use distance returned from sweepAABB function in shootRay
95b2e7285d FREESCAPE: missing palette en dark cga


Commit: 3b66be4c3804762fd7b69ea35ce8973aab840e78
    https://github.com/scummvm/scummvm/commit/3b66be4c3804762fd7b69ea35ce8973aab840e78
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-23T22:16:15+01:00

Commit Message:
FREESCAPE: correctly use distance returned from sweepAABB function in shootRay

Changed paths:
    engines/freescape/area.cpp


diff --git a/engines/freescape/area.cpp b/engines/freescape/area.cpp
index abcb8b25d5c..332da51721b 100644
--- a/engines/freescape/area.cpp
+++ b/engines/freescape/area.cpp
@@ -249,7 +249,7 @@ void Area::drawGroup(Freescape::Renderer *gfx, Group* group, bool runAnimation)
 }
 
 Object *Area::shootRay(const Math::Ray &ray) {
-	float distance = 16.0 * 8192.0; // TODO: check if this is max distance
+	float distance = 1.0;
 	float size = 16.0 * 8192.0; // TODO: check if this is the max size
 	Math::AABB boundingBox(ray.getOrigin(), ray.getOrigin());
 	Object *collided = nullptr;
@@ -258,7 +258,10 @@ Object *Area::shootRay(const Math::Ray &ray) {
 			GeometricObject *gobj = (GeometricObject *)obj;
 			Math::Vector3d collidedNormal;
 			float collidedDistance = sweepAABB(boundingBox, gobj->_boundingBox, 8192 * ray.getDirection(), collidedNormal);
-			debug("shot obj id: %d with distance %f", obj->getObjectID(), collidedDistance);
+			debugC(1, kFreescapeDebugMove, "shot obj id: %d with distance %f", obj->getObjectID(), collidedDistance);
+			if (collidedDistance >= 1.0)
+				continue;
+
 			if (collidedDistance < distance || (collidedDistance == distance && gobj->getSize().length() < size)) {
 				collided = obj;
 				size = gobj->getSize().length();


Commit: 95b2e7285ddc18a9b208b1a0537e77d531be9e2e
    https://github.com/scummvm/scummvm/commit/95b2e7285ddc18a9b208b1a0537e77d531be9e2e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-23T22:16:15+01:00

Commit Message:
FREESCAPE: missing palette en dark cga

Changed paths:
    engines/freescape/games/dark/dos.cpp


diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index 517b9d79112..b1bc926eba1 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -67,6 +67,7 @@ static const CGAPaletteEntry rawCGAPaletteByArea[] {
 	{21, (byte *)kDarkCGAPaletteRedGreen},
 	{22, (byte *)kDarkCGAPalettePinkBlue},
 	{23, (byte *)kDarkCGAPaletteRedGreen},
+	{24, (byte *)kDarkCGAPalettePinkBlue},
 	{25, (byte *)kDarkCGAPalettePinkBlue},
 	{27, (byte *)kDarkCGAPaletteRedGreen},
 	{28, (byte *)kDarkCGAPalettePinkBlue},