[Scummvm-git-logs] scummvm master -> 02a9b16e0f18d55aadb12a12fcf56a384b6172f7

neuromancer noreply at scummvm.org
Mon Nov 14 15:01:20 UTC 2022


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:
02a9b16e0f FREESCAPE: added missing object to drill in driller


Commit: 02a9b16e0f18d55aadb12a12fcf56a384b6172f7
    https://github.com/scummvm/scummvm/commit/02a9b16e0f18d55aadb12a12fcf56a384b6172f7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-14T16:02:01+01:00

Commit Message:
FREESCAPE: added missing object to drill in driller

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 91e0366c7c6..93b727e534a 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -678,6 +678,21 @@ void DrillerEngine::addDrill(const Math::Vector3d position) {
 	obj = (GeometricObject *)_areaMap[255]->objectWithID(id);
 	assert(obj);
 	obj = (GeometricObject *)obj->duplicate();
+	origin.setValue(0, origin.x() + obj->getSize().x());
+	origin.setValue(1, origin.y() + heightLastObject);
+	origin.setValue(2, origin.z() + obj->getSize().z());
+	obj->setOrigin(origin);
+	assert(obj);
+	obj->makeVisible();
+	_currentArea->addObject(obj);
+
+	heightLastObject = obj->getSize().y();
+
+	id = 251;
+	debugC(1, kFreescapeDebugParser, "Adding object %d to room structure", id);
+	obj = (GeometricObject *)_areaMap[255]->objectWithID(id);
+	assert(obj);
+	obj = (GeometricObject *)obj->duplicate();
 	origin.setValue(1, origin.y() + heightLastObject);
 	obj->setOrigin(origin);
 	assert(obj);
@@ -686,7 +701,7 @@ void DrillerEngine::addDrill(const Math::Vector3d position) {
 }
 
 void DrillerEngine::removeDrill(Area *area) {
-	for (int16 id = 252; id < 256; id++) {
+	for (int16 id = 251; id < 256; id++) {
 		area->removeObject(id);
 	}
 }




More information about the Scummvm-git-logs mailing list