mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Remove two '//Active' comments

Browse source 
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.
This commit is contained in:
Misa 2020-04-03 14:50:08 -07:00 committed by Ethan Lee
parent 2f3eeccdf0
commit 1b78db9079
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Entity.cpp
View file

@ -4556,7 +4556,7 @@ void entityclass::customwarplinecheck(int i) {
//We test entity to entity //We test entity to entity
for (int j = 0; j < (int) entities.size(); j++) { 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! if (entities[i].rule == 0 && entities[j].rule == 5 //Player vs vertical line!
&& (entities[j].type == 51 || entities[j].type == 52) && (entities[j].type == 51 || entities[j].type == 52)
&& entitywarpvlinecollide(i, j)) { && entitywarpvlinecollide(i, j)) {
@ -4579,7 +4579,7 @@ void entityclass::entitycollisioncheck()
//We test entity to entity //We test entity to entity
for (size_t j = 0; j < entities.size(); j++) 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) if (entities[i].rule == 0 && entities[j].rule == 1 && entities[j].harmful)
{ {