[Scummvm-git-logs] scummvm master -> 3af604a62e8869b575ae5716e51497c19abca5c9

sev- noreply at scummvm.org
Sat Sep 21 21:22:21 UTC 2024


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:
3af604a62e QDENGINE: Got rid of the last global object


Commit: 3af604a62e8869b575ae5716e51497c19abca5c9
    https://github.com/scummvm/scummvm/commit/3af604a62e8869b575ae5716e51497c19abca5c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-21T23:22:00+02:00

Commit Message:
QDENGINE: Got rid of the last global object

Changed paths:
    engines/qdengine/qdcore/qd_game_object_state.cpp
    engines/qdengine/qdcore/qd_game_object_state.h


diff --git a/engines/qdengine/qdcore/qd_game_object_state.cpp b/engines/qdengine/qdcore/qd_game_object_state.cpp
index 9eb84e61aa6..1363aad4167 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_state.cpp
@@ -37,8 +37,6 @@
 
 namespace QDEngine {
 
-qdScreenTransform qdScreenTransform::ID;
-
 bool qdScreenTransform::operator == (const qdScreenTransform &trans) const {
 	return fabs(_angle - trans._angle) < FLT_EPS &&
 	       fabs(_scale.x - trans._scale.x) < FLT_EPS && fabs(_scale.y - trans._scale.y) < FLT_EPS;
diff --git a/engines/qdengine/qdcore/qd_game_object_state.h b/engines/qdengine/qdcore/qd_game_object_state.h
index b244a8b1806..333ffc7df0a 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.h
+++ b/engines/qdengine/qdcore/qd_game_object_state.h
@@ -47,7 +47,7 @@ public:
 		return !(*this == trans);
 	}
 	bool operator()() const {
-		return *this != ID;
+		return _angle != 0.f || _scale.x != 1.f || _scale.y != 1.f;
 	}
 
 	qdScreenTransform operator *(float value) const {
@@ -80,9 +80,6 @@ public:
 		return fabs(_scale.x - 1.f) > FLT_EPS || fabs(_scale.y - 1.f) > FLT_EPS;
 	}
 
-	/// единичная трансформация
-	static qdScreenTransform ID;
-
 private:
 
 	float _angle;




More information about the Scummvm-git-logs mailing list