[Scummvm-git-logs] scummvm master -> 984277131e510e554a669e865828efb953c03941

aquadran noreply at scummvm.org
Thu Oct 29 04:05:29 UTC 2026


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

Summary:
984277131e EMI: Allow negative sector sort orders


Commit: 984277131e510e554a669e865828efb953c03941
    https://github.com/scummvm/scummvm/commit/984277131e510e554a669e865828efb953c03941
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-10-29T05:05:23+01:00

Commit Message:
EMI: Allow negative sector sort orders

Sort order below 0 are still valid, use a new flag to indicate if the
sector order is valid instead of checking if the order is negative or
not.

Fixes #11816

Assisted-by: Claude:claude-sonnet-5-5

Changed paths:
    engines/grim/actor.cpp
    engines/grim/actor.h
    engines/grim/emi/emi.cpp
    engines/grim/sector.cpp
    engines/grim/sector.h
    engines/grim/set.cpp
    engines/grim/set.h


diff --git a/engines/grim/actor.cpp b/engines/grim/actor.cpp
index 5797e931027..f179a72b6e3 100644
--- a/engines/grim/actor.cpp
+++ b/engines/grim/actor.cpp
@@ -94,7 +94,7 @@ Actor::Actor() :
 		_puckOrient(false), _talking(false),
 		_inOverworld(false), _drawnToClean(false), _backgroundTalk(false),
 		_sortOrder(0), _useParentSortOrder(false),
-		_sectorSortOrder(-1), _fakeUnbound(false), _lightMode(LightFastDyn),
+		_sectorSortOrder(0), _hasSectorSortOrder(false), _fakeUnbound(false), _lightMode(LightFastDyn),
 		_hasFollowedBoxes(false), _lookAtActor(0) {
 
 	// Some actors don't set walk and turn rates, so we default the
@@ -436,7 +436,8 @@ bool Actor::restoreState(SaveGame *savedState) {
 		_attachedJoint = savedState->readString();
 
 		// will be recalculated in next update()
-		_sectorSortOrder = -1;
+		_sectorSortOrder = 0;
+		_hasSectorSortOrder = false;
 
 		if (savedState->saveMinorVersion() < 24) {
 			// Used to be the wear chore.
@@ -1539,12 +1540,15 @@ void Actor::update(uint frameTime) {
 		if (_followBoxes) {
 			// Check for sort order information in the current sector
 			int oldSortOrder = getEffectiveSortOrder();
-			_sectorSortOrder = set->findSectorSortOrder(_pos, Sector::WalkType);
+			Common::Pair<bool, int> sortInfo = set->findSectorSortOrder(_pos, Sector::WalkType);
+			_hasSectorSortOrder = sortInfo.first;
+			_sectorSortOrder = sortInfo.second;
 
 			if (oldSortOrder != getEffectiveSortOrder())
 				g_emi->invalidateSortOrder();
-		} else if (_sectorSortOrder >= 0) {
-			_sectorSortOrder = -1;
+		} else if (_hasSectorSortOrder) {
+			_hasSectorSortOrder = false;
+			_sectorSortOrder = 0;
 			g_emi->invalidateSortOrder();
 		}
 	}
@@ -2400,7 +2404,7 @@ int Actor::getEffectiveSortOrder() const {
 		Actor *attachedActor = Actor::getPool().getObject(_attachedActor);
 		return attachedActor->getEffectiveSortOrder();
 	}
-	return _sectorSortOrder >= 0 ? _sectorSortOrder : getSortOrder();
+	return _hasSectorSortOrder ? _sectorSortOrder : getSortOrder();
 }
 
 void Actor::activateShadow(bool active, const char *shadowName) {
diff --git a/engines/grim/actor.h b/engines/grim/actor.h
index 7fa30f5ed73..4994b937195 100644
--- a/engines/grim/actor.h
+++ b/engines/grim/actor.h
@@ -719,6 +719,7 @@ private:
 
 	int _sortOrder;
 	int _sectorSortOrder;
+	bool _hasSectorSortOrder { false };
 	bool _useParentSortOrder;
 
 	bool _fakeUnbound;
diff --git a/engines/grim/emi/emi.cpp b/engines/grim/emi/emi.cpp
index 513af1cbc83..1202b9167ec 100644
--- a/engines/grim/emi/emi.cpp
+++ b/engines/grim/emi/emi.cpp
@@ -303,7 +303,9 @@ void EMIEngine::sortLayers() {
 }
 
 bool EMIEngine::compareActor(const Actor *x, const Actor *y) {
-	if (x->getEffectiveSortOrder() == y->getEffectiveSortOrder()) {
+	int xSortOrder = x->getEffectiveSortOrder();
+	int ySortOrder = y->getEffectiveSortOrder();
+	if (xSortOrder == ySortOrder) {
 		Set::Setup *setup = g_grim->getCurrSet()->getCurrSetup();
 		Math::Matrix4 camRot = setup->_rot;
 
@@ -318,7 +320,7 @@ bool EMIEngine::compareActor(const Actor *x, const Actor *y) {
 			return xp.z() > yp.z();
 		}
 	}
-	return x->getEffectiveSortOrder() > y->getEffectiveSortOrder();
+	return xSortOrder > ySortOrder;
 }
 
 void EMIEngine::sortActiveActorsList() {
diff --git a/engines/grim/sector.cpp b/engines/grim/sector.cpp
index 00053759ad8..076c341b965 100644
--- a/engines/grim/sector.cpp
+++ b/engines/grim/sector.cpp
@@ -517,6 +517,14 @@ void Sector::getExitInfo(const Math::Vector3d &s, const Math::Vector3d &dirVec,
 	result->exitPoint = start + (Math::Vector3d::dotProduct(_vertices[i] - start, edgeNormal) / d) * dir;
 }
 
+int Sector::getSortplane(int setup) {
+	// An unkown sortplane is 0
+	if (setup < 0 || setup >= _numSortplanes) {
+		return 0;
+	}
+	return _sortplanes[setup];
+}
+
 Sector &Sector::operator=(const Sector &other) {
 	_numVertices = other._numVertices;
 	_id = other._id;
diff --git a/engines/grim/sector.h b/engines/grim/sector.h
index 8467deece3e..810a1bd7560 100644
--- a/engines/grim/sector.h
+++ b/engines/grim/sector.h
@@ -84,7 +84,7 @@ public:
 	void getExitInfo(const Math::Vector3d &start, const Math::Vector3d &dir, struct ExitInfo *result) const;
 
 	int getNumSortplanes() { return _numSortplanes; }
-	int getSortplane(int setup) { return _sortplanes[setup]; }
+	int getSortplane(int setup);
 	int getNumVertices() { return _numVertices; }
 	Math::Vector3d *getVertices() const { return _vertices; }
 	Math::Vector3d getNormal() const { return _normal; }
diff --git a/engines/grim/set.cpp b/engines/grim/set.cpp
index 0e2240b30bb..f474edb8364 100644
--- a/engines/grim/set.cpp
+++ b/engines/grim/set.cpp
@@ -912,14 +912,15 @@ Sector *Set::findPointSector(const Math::Vector3d &p, Sector::SectorType type) {
 	return nullptr;
 }
 
-int Set::findSectorSortOrder(const Math::Vector3d &p, Sector::SectorType type) {
+Common::Pair<bool, int> Set::findSectorSortOrder(const Math::Vector3d &p, Sector::SectorType type) {
 	int setup = getSetup();
-	int sortOrder = 0;
 	float minDist = 0.01f;
+	int sortOrder = 0;
+	bool found = false;
 
 	for (int i = 0; i < _numSectors; i++) {
 		Sector *sector = _sectors[i];
-		if (!sector || (sector->getType() & type) == 0 || !sector->isVisible() || setup >= sector->getNumSortplanes())
+		if (!sector || (sector->getType() & type) == 0 || !sector->isVisible())
 			continue;
 
 		Math::Vector3d closestPt = sector->getClosestPoint(p);
@@ -927,9 +928,10 @@ int Set::findSectorSortOrder(const Math::Vector3d &p, Sector::SectorType type) {
 		if (thisDist < minDist) {
 			minDist = thisDist;
 			sortOrder = sector->getSortplane(setup);
+			found = true;
 		}
 	}
-	return sortOrder;
+	return Common::Pair<bool, int>(found, sortOrder);
 }
 
 void Set::findClosestSector(const Math::Vector3d &p, Sector **sect, Math::Vector3d *closestPoint) {
diff --git a/engines/grim/set.h b/engines/grim/set.h
index 547be6bbfdf..140fb0cfd86 100644
--- a/engines/grim/set.h
+++ b/engines/grim/set.h
@@ -100,7 +100,7 @@ public:
 	Sector *getSectorBySubstring(const Common::String &str, const Math::Vector3d &pos);
 
 	Sector *findPointSector(const Math::Vector3d &p, Sector::SectorType type);
-	int findSectorSortOrder(const Math::Vector3d &p, Sector::SectorType type);
+	Common::Pair<bool, int> findSectorSortOrder(const Math::Vector3d &p, Sector::SectorType type);
 	void findClosestSector(const Math::Vector3d &p, Sector **sect, Math::Vector3d *closestPt);
 	void shrinkBoxes(float radius);
 	void unshrinkBoxes();




More information about the Scummvm-git-logs mailing list