From 079544c0b11c55cabcc279c211b2a714119965d6 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 2 Apr 2020 13:42:50 -0700 Subject: [PATCH] Fix mixed indentation in Entity.cpp and Entity.h That guy who indents with 2-wide tabs to match 4-wide spaces strikes again... --- desktop_version/src/Entity.cpp | 164 ++++++++++++++++----------------- desktop_version/src/Entity.h | 8 +- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 546385ca..1a3627db 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -1916,7 +1916,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo if (customplatformtile > 0){ entities[k].tile = customplatformtile; }else if (platformtile > 0) { - entities[k].tile = platformtile; + entities[k].tile = platformtile; }else{ //appearance again depends on location if (gridmatch(p1, p2, p3, p4, 100, 70, 320, 160)) entities[k].tile = 616; @@ -1932,10 +1932,10 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo entities[k].w = 32; entities[k].h = 8; - if (int(vx) <= 1) vertplatforms = true; - if (int(vx) >= 2 && int(vx) <= 5) horplatforms = true; - if (int(vx) == 14 || int(vx) == 15) horplatforms = true; //special case for last part of Space Station - if (int(vx) >= 6 && int(vx) <= 7) vertplatforms = true; + if (int(vx) <= 1) vertplatforms = true; + if (int(vx) >= 2 && int(vx) <= 5) horplatforms = true; + if (int(vx) == 14 || int(vx) == 15) horplatforms = true; //special case for last part of Space Station + if (int(vx) >= 6 && int(vx) <= 7) vertplatforms = true; if (int(vx) >= 10 && int(vx) <= 11) { @@ -4793,65 +4793,65 @@ bool entityclass::entityvlinecollide( int t, int l ) } bool entityclass::entitywarphlinecollide(int t, int l) { - //Returns true is entity t collided with the horizontal line l. - if(entities[t].xp + entities[t].cx+entities[t].w>=entities[l].xp){ - if(entities[t].xp + entities[t].cx<=entities[l].xp+entities[l].w){ - linetemp = 0; - if (entities[l].yp < 120) { - //Top line - if (entities[t].vy < 0) { - if (entities[t].yp < entities[l].yp + 10) linetemp++; - if (entities[t].yp + entities[t].h < entities[l].yp + 10) linetemp++; - if (entities[t].oldyp < entities[l].yp + 10) linetemp++; - if (entities[t].oldyp + entities[t].h < entities[l].yp + 10) linetemp++; - } + //Returns true is entity t collided with the horizontal line l. + if(entities[t].xp + entities[t].cx+entities[t].w>=entities[l].xp){ + if(entities[t].xp + entities[t].cx<=entities[l].xp+entities[l].w){ + linetemp = 0; + if (entities[l].yp < 120) { + //Top line + if (entities[t].vy < 0) { + if (entities[t].yp < entities[l].yp + 10) linetemp++; + if (entities[t].yp + entities[t].h < entities[l].yp + 10) linetemp++; + if (entities[t].oldyp < entities[l].yp + 10) linetemp++; + if (entities[t].oldyp + entities[t].h < entities[l].yp + 10) linetemp++; + } - if (linetemp > 0) return true; - return false; - }else { - //Bottom line - if (entities[t].vy > 0) { - if (entities[t].yp > entities[l].yp - 10) linetemp++; - if (entities[t].yp + entities[t].h > entities[l].yp - 10) linetemp++; - if (entities[t].oldyp > entities[l].yp - 10) linetemp++; - if (entities[t].oldyp + entities[t].h > entities[l].yp - 10) linetemp++; - } + if (linetemp > 0) return true; + return false; + }else { + //Bottom line + if (entities[t].vy > 0) { + if (entities[t].yp > entities[l].yp - 10) linetemp++; + if (entities[t].yp + entities[t].h > entities[l].yp - 10) linetemp++; + if (entities[t].oldyp > entities[l].yp - 10) linetemp++; + if (entities[t].oldyp + entities[t].h > entities[l].yp - 10) linetemp++; + } - if (linetemp > 0) return true; - return false; - } - } - } - return false; + if (linetemp > 0) return true; + return false; + } + } + } + return false; } bool entityclass::entitywarpvlinecollide(int t, int l) { - //Returns true is entity t collided with the vertical warp line l. - if(entities[t].yp + entities[t].cy+entities[t].h>=entities[l].yp){ - if (entities[t].yp + entities[t].cy <= entities[l].yp + entities[l].h) { - linetemp = 0; - if (entities[l].xp < 160) { - //Left hand line - if (entities[t].xp + entities[t].cx + 1 < entities[l].xp + 10) linetemp++; - if (entities[t].xp + entities[t].cx+1 + entities[t].w < entities[l].xp + 10) linetemp++; - if (entities[t].oldxp + entities[t].cx + 1 < entities[l].xp + 10) linetemp++; - if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w < entities[l].xp + 10) linetemp++; + //Returns true is entity t collided with the vertical warp line l. + if(entities[t].yp + entities[t].cy+entities[t].h>=entities[l].yp){ + if (entities[t].yp + entities[t].cy <= entities[l].yp + entities[l].h) { + linetemp = 0; + if (entities[l].xp < 160) { + //Left hand line + if (entities[t].xp + entities[t].cx + 1 < entities[l].xp + 10) linetemp++; + if (entities[t].xp + entities[t].cx+1 + entities[t].w < entities[l].xp + 10) linetemp++; + if (entities[t].oldxp + entities[t].cx + 1 < entities[l].xp + 10) linetemp++; + if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w < entities[l].xp + 10) linetemp++; - if (linetemp > 0) return true; - return false; - }else { - //Right hand line - if (entities[t].xp + entities[t].cx + 1 > entities[l].xp - 10) linetemp++; - if (entities[t].xp + entities[t].cx+1 + entities[t].w > entities[l].xp - 10) linetemp++; - if (entities[t].oldxp + entities[t].cx + 1 > entities[l].xp - 10) linetemp++; - if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w > entities[l].xp - 10) linetemp++; + if (linetemp > 0) return true; + return false; + }else { + //Right hand line + if (entities[t].xp + entities[t].cx + 1 > entities[l].xp - 10) linetemp++; + if (entities[t].xp + entities[t].cx+1 + entities[t].w > entities[l].xp - 10) linetemp++; + if (entities[t].oldxp + entities[t].cx + 1 > entities[l].xp - 10) linetemp++; + if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w > entities[l].xp - 10) linetemp++; - if (linetemp > 0) return true; - return false; - } - } - } - return false; + if (linetemp > 0) return true; + return false; + } + } + } + return false; } float entityclass::entitycollideplatformroof( int t ) @@ -5193,31 +5193,31 @@ void entityclass::hormovingplatformfix( int t ) } void entityclass::customwarplinecheck(int i) { - //Turns on obj.customwarpmodevon and obj.customwarpmodehon if player collides - //with warp lines + //Turns on obj.customwarpmodevon and obj.customwarpmodehon if player collides + //with warp lines - if (entities[i].active) { - //We test entity to entity - for (int j = 0; j < nentity; j++) { - if (entities[j].active && i != j) {//Active - if (entities[i].rule == 0 && entities[j].rule == 5) { //Player vs vertical line! - if (entities[j].type == 51 || entities[j].type == 52) { - if (entitywarpvlinecollide(i, j)) { - customwarpmodevon = true; - } - } - } + if (entities[i].active) { + //We test entity to entity + for (int j = 0; j < nentity; j++) { + if (entities[j].active && i != j) {//Active + if (entities[i].rule == 0 && entities[j].rule == 5) { //Player vs vertical line! + if (entities[j].type == 51 || entities[j].type == 52) { + if (entitywarpvlinecollide(i, j)) { + customwarpmodevon = true; + } + } + } - if (entities[i].rule == 0 && entities[j].rule == 7){ //Player vs horizontal WARP line - if (entities[j].type == 53 || entities[j].type == 54) { - if (entitywarphlinecollide(i, j)) { - customwarpmodehon = true; - } - } - } - } - } - } + if (entities[i].rule == 0 && entities[j].rule == 7){ //Player vs horizontal WARP line + if (entities[j].type == 53 || entities[j].type == 54) { + if (entitywarphlinecollide(i, j)) { + customwarpmodehon = true; + } + } + } + } + } + } } void entityclass::entitycollisioncheck() @@ -5338,7 +5338,7 @@ void entityclass::entitycollisioncheck() } } } - /* + /* if (entities[i].rule == 0 && entities[j].rule == 7) //Player vs horizontal WARP line { if(game.deathseq==-1) @@ -5353,7 +5353,7 @@ void entityclass::entitycollisioncheck() } } } - */ + */ if (game.supercrewmate) { //some extra collisions diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index 6ff558c7..2b3f6b2b 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -146,10 +146,10 @@ public: bool entityvlinecollide(int t, int l); - bool entitywarphlinecollide(int t, int l); - bool entitywarpvlinecollide(int t, int l); + bool entitywarphlinecollide(int t, int l); + bool entitywarpvlinecollide(int t, int l); - void customwarplinecheck(int i); + void customwarplinecheck(int i); float entitycollideplatformroof(int t); @@ -161,7 +161,7 @@ public: bool testwallsx(int t, int tx, int ty); - bool testwallsy(int t, float tx, float ty); + bool testwallsy(int t, float tx, float ty); void fixfriction(int t, float xfix, float xrate, float yrate);