summaryrefslogtreecommitdiffstats
path: root/src/core/Collision.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-26 14:27:13 +0200
committeraap <aap@papnet.eu>2019-07-26 14:27:13 +0200
commit9a50a59a3ced80d782ac1b89aed1e5e86a91dd64 (patch)
treed3252eb8d966a82ea1e41853c08642a88b593a3a /src/core/Collision.cpp
parentMerge pull request #165 from Nick007J/master (diff)
downloadre3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.gz
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.bz2
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.lz
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.xz
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.zst
re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.zip
Diffstat (limited to '')
-rw-r--r--src/core/Collision.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 7982e77d..cc360f79 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -2023,11 +2023,11 @@ CColModel::operator=(const CColModel &other)
numVerts = 0;
for(i = 0; i < other.numTriangles; i++){
if(other.triangles[i].a > numVerts)
- other.triangles[i].a = numVerts;
+ numVerts = other.triangles[i].a;
if(other.triangles[i].b > numVerts)
- other.triangles[i].b = numVerts;
+ numVerts = other.triangles[i].b;
if(other.triangles[i].c > numVerts)
- other.triangles[i].c = numVerts;
+ numVerts = other.triangles[i].c;
}
numVerts++;
if(vertices)