From 1b78db9079c7538d9838c57c7483619443fef4d8 Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 3 Apr 2020 14:50:08 -0700 Subject: [PATCH] Remove two '//Active' comments I guess these were here earlier when there were 'active' conditionals, but then I removed those, so now they look weird next to the 'i != j' conditionals, so I'm removing them. --- desktop_version/src/Entity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 9ed0d7d2..45d65df2 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -4556,7 +4556,7 @@ void entityclass::customwarplinecheck(int i) { //We test entity to entity for (int j = 0; j < (int) entities.size(); j++) { - if (i != j) {//Active + if (i != j) { if (entities[i].rule == 0 && entities[j].rule == 5 //Player vs vertical line! && (entities[j].type == 51 || entities[j].type == 52) && entitywarpvlinecollide(i, j)) { @@ -4579,7 +4579,7 @@ void entityclass::entitycollisioncheck() //We test entity to entity for (size_t j = 0; j < entities.size(); j++) { - if (i!=j) //Active + if (i!=j) { if (entities[i].rule == 0 && entities[j].rule == 1 && entities[j].harmful) {