diff options
| author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-07-16 19:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 19:05:08 +0200 |
| commit | 523d6b2ae834647a00199007c5903bc91872372f (patch) | |
| tree | 6305d5b069cc1078836613076b856ff2e22220c7 /core/templates | |
| parent | 60add98a4cff0d27c6aa2f52042555eccb86ed70 (diff) | |
| parent | 6f3e7f7cb051be498df7b0b4a4959d30fc27dad3 (diff) | |
Merge pull request #47395 from sygi/shape_idx_collision
Add shape_idx to CollisionObject2D mouse_entered signal
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/pair.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/templates/pair.h b/core/templates/pair.h index 31706b6ecb..e30ee8bc56 100644 --- a/core/templates/pair.h +++ b/core/templates/pair.h @@ -62,7 +62,10 @@ bool operator!=(const Pair<F, S> &pair, const Pair<F, S> &other) { template <class F, class S> struct PairSort { bool operator()(const Pair<F, S> &A, const Pair<F, S> &B) const { - return A.first < B.first; + if (A.first != B.first) { + return A.first < B.first; + } + return A.second < B.second; } }; |