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

[sev-]

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:
a5f5775a08 QDENGINE: swap() -> SWAP()


Commit: a5f5775a08910040b64ab5ed3255d4764e717400
    https://github.com/scummvm/scummvm/commit/a5f5775a08910040b64ab5ed3255d4764e717400
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-18T16:45:15+02:00

Commit Message:
QDENGINE: swap() -> SWAP()

Changed paths:
    engines/qdengine/minigames/adv/ObjectContainer.cpp
    engines/qdengine/minigames/adv/m_swap.cpp
    engines/qdengine/minigames/adv/m_triangles.cpp


diff --git a/engines/qdengine/minigames/adv/ObjectContainer.cpp b/engines/qdengine/minigames/adv/ObjectContainer.cpp
index af3bbc8e268..0fda76c9260 100644
--- a/engines/qdengine/minigames/adv/ObjectContainer.cpp
+++ b/engines/qdengine/minigames/adv/ObjectContainer.cpp
@@ -105,7 +105,7 @@ void ObjectContainer::releaseObject(QDObject& obj) {
 
 		runtime->hide(obj);
 		if (_current > 0)
-			swap(*it, _objects[--_current]);
+			SWAP(*it, _objects[--_current]);
 		obj = 0;
 	}
 }
diff --git a/engines/qdengine/minigames/adv/m_swap.cpp b/engines/qdengine/minigames/adv/m_swap.cpp
index 8f8ec3e0090..a316e41bfaf 100644
--- a/engines/qdengine/minigames/adv/m_swap.cpp
+++ b/engines/qdengine/minigames/adv/m_swap.cpp
@@ -248,7 +248,7 @@ void Swap::swap(int item1, int item2, bool silent) {
 		}
 	}
 
-	::swap(nodes_[item1], nodes_[item2]);
+	SWAP(nodes_[item1], nodes_[item2]);
 	put(item1, !silent);
 	put(item2, !silent);
 
diff --git a/engines/qdengine/minigames/adv/m_triangles.cpp b/engines/qdengine/minigames/adv/m_triangles.cpp
index ce509b1a86a..9b8d165cb8a 100644
--- a/engines/qdengine/minigames/adv/m_triangles.cpp
+++ b/engines/qdengine/minigames/adv/m_triangles.cpp
@@ -253,7 +253,7 @@ void MinigameTriangle::beginSwapNodes(int pos1, int pos2) {
 	xassert(compatible(pos1, pos2));
 
 	if (pos1 > pos2)
-		swap(pos1, pos2);
+		SWAP(pos1, pos2);
 
 	animationState_ = FIRST_PHASE;
 	animationTimer_ = animationTime_;
@@ -376,7 +376,7 @@ bool MinigameTriangle::animate(float dt) {
 		updateNode(node1, animatedNodes_[1], destination(animatedNodes_[0], animatedNodes_[1]));
 		updateNode(node2, animatedNodes_[0], destination(animatedNodes_[1], animatedNodes_[0]));
 
-		swap(node1, node2);
+		SWAP(node1, node2);
 
 		animationTimer_ = animationTime_;
 		animationState_ = FIRD_PHASE;
@@ -423,7 +423,7 @@ void MinigameTriangle::swapNodes(int pos1, int pos2, bool silentQuick) {
 		releaseNodeBack(node1);
 		releaseNodeBack(node2);
 
-		swap(node1, node2);
+		SWAP(node1, node2);
 
 		updateNode(node1, pos1, 0, true);
 		updateNode(node2, pos2, 0, true);
@@ -560,7 +560,7 @@ int MinigameTriangle::orientation(int num) const {
 
 bool MinigameTriangle::compatible(int num1, int num2) const {
 	if (num1 > num2)
-		swap(num1, num2);
+		SWAP(num1, num2);
 
 	if (num1 < 0)
 		return false;