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

Fix mixed indentation in Entity.cpp and Entity.h

Browse source 
That guy who indents with 2-wide tabs to match 4-wide spaces strikes
again...
This commit is contained in:
Misa 2020-04-02 13:42:50 -07:00 committed by Ethan Lee
parent 7c511b1550
commit 079544c0b1
2 changed files with 86 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
desktop_version/src/Entity.cpp
View file

@ -1916,7 +1916,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
if (customplatformtile > 0){ if (customplatformtile > 0){
entities[k].tile = customplatformtile; entities[k].tile = customplatformtile;
}else if (platformtile > 0) { }else if (platformtile > 0) {
entities[k].tile = platformtile; entities[k].tile = platformtile;
}else{ }else{
//appearance again depends on location //appearance again depends on location
if (gridmatch(p1, p2, p3, p4, 100, 70, 320, 160)) entities[k].tile = 616; 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].w = 32;
entities[k].h = 8; entities[k].h = 8;
if (int(vx) <= 1) vertplatforms = true; if (int(vx) <= 1) vertplatforms = true;
if (int(vx) >= 2 && int(vx) <= 5) horplatforms = 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) == 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) >= 6 && int(vx) <= 7) vertplatforms = true;
if (int(vx) >= 10 && int(vx) <= 11) 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) { bool entityclass::entitywarphlinecollide(int t, int l) {
//Returns true is entity t collided with the horizontal line 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[t].w>=entities[l].xp){
if(entities[t].xp + entities[t].cx<=entities[l].xp+entities[l].w){ if(entities[t].xp + entities[t].cx<=entities[l].xp+entities[l].w){
linetemp = 0; linetemp = 0;
if (entities[l].yp < 120) { if (entities[l].yp < 120) {
//Top line //Top line
if (entities[t].vy < 0) { if (entities[t].vy < 0) {
if (entities[t].yp < entities[l].yp + 10) linetemp++; if (entities[t].yp < entities[l].yp + 10) linetemp++;
if (entities[t].yp + entities[t].h < 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[l].yp + 10) linetemp++;
if (entities[t].oldyp + entities[t].h < entities[l].yp + 10) linetemp++; if (entities[t].oldyp + entities[t].h < entities[l].yp + 10) linetemp++;
} }
if (linetemp > 0) return true; if (linetemp > 0) return true;
return false; return false;
}else { }else {
//Bottom line //Bottom line
if (entities[t].vy > 0) { if (entities[t].vy > 0) {
if (entities[t].yp > entities[l].yp - 10) linetemp++; if (entities[t].yp > entities[l].yp - 10) linetemp++;
if (entities[t].yp + entities[t].h > 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[l].yp - 10) linetemp++;
if (entities[t].oldyp + entities[t].h > entities[l].yp - 10) linetemp++; if (entities[t].oldyp + entities[t].h > entities[l].yp - 10) linetemp++;
} }
if (linetemp > 0) return true; if (linetemp > 0) return true;
return false; return false;
} }
} }
} }
return false; return false;
} }
bool entityclass::entitywarpvlinecollide(int t, int l) { bool entityclass::entitywarpvlinecollide(int t, int l) {
//Returns true is entity t collided with the vertical warp line 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[t].h>=entities[l].yp){
if (entities[t].yp + entities[t].cy <= entities[l].yp + entities[l].h) { if (entities[t].yp + entities[t].cy <= entities[l].yp + entities[l].h) {
linetemp = 0; linetemp = 0;
if (entities[l].xp < 160) { if (entities[l].xp < 160) {
//Left hand line //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[l].xp + 10) linetemp++;
if (entities[t].xp + entities[t].cx+1 + entities[t].w < 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[l].xp + 10) linetemp++;
if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w < 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; if (linetemp > 0) return true;
return false; return false;
}else { }else {
//Right hand line //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[l].xp - 10) linetemp++;
if (entities[t].xp + entities[t].cx+1 + entities[t].w > 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[l].xp - 10) linetemp++;
if (entities[t].oldxp + entities[t].cx + 1 + entities[t].w > 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; if (linetemp > 0) return true;
return false; return false;
} }
} }
} }
return false; return false;
} }
float entityclass::entitycollideplatformroof( int t ) float entityclass::entitycollideplatformroof( int t )
@ -5193,31 +5193,31 @@ void entityclass::hormovingplatformfix( int t )
} }
void entityclass::customwarplinecheck(int i) { void entityclass::customwarplinecheck(int i) {
//Turns on obj.customwarpmodevon and obj.customwarpmodehon if player collides //Turns on obj.customwarpmodevon and obj.customwarpmodehon if player collides
//with warp lines //with warp lines
if (entities[i].active) { if (entities[i].active) {
//We test entity to entity //We test entity to entity
for (int j = 0; j < nentity; j++) { for (int j = 0; j < nentity; j++) {
if (entities[j].active && i != j) {//Active if (entities[j].active && i != j) {//Active
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!
if (entities[j].type == 51 || entities[j].type == 52) { if (entities[j].type == 51 || entities[j].type == 52) {
if (entitywarpvlinecollide(i, j)) { if (entitywarpvlinecollide(i, j)) {
customwarpmodevon = true; customwarpmodevon = true;
} }
} }
} }
if (entities[i].rule == 0 && entities[j].rule == 7){ //Player vs horizontal WARP line if (entities[i].rule == 0 && entities[j].rule == 7){ //Player vs horizontal WARP line
if (entities[j].type == 53 || entities[j].type == 54) { if (entities[j].type == 53 || entities[j].type == 54) {
if (entitywarphlinecollide(i, j)) { if (entitywarphlinecollide(i, j)) {
customwarpmodehon = true; customwarpmodehon = true;
} }
} }
} }
} }
} }
} }
} }
void entityclass::entitycollisioncheck() 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 (entities[i].rule == 0 && entities[j].rule == 7) //Player vs horizontal WARP line
{ {
if(game.deathseq==-1) if(game.deathseq==-1)
@ -5353,7 +5353,7 @@ void entityclass::entitycollisioncheck()
} }
} }
} }
*/ */
if (game.supercrewmate) if (game.supercrewmate)
{ {
//some extra collisions //some extra collisions

8
desktop_version/src/Entity.h
View file

@ -146,10 +146,10 @@ public:
bool entityvlinecollide(int t, int l); bool entityvlinecollide(int t, int l);
bool entitywarphlinecollide(int t, int l); bool entitywarphlinecollide(int t, int l);
bool entitywarpvlinecollide(int t, int l); bool entitywarpvlinecollide(int t, int l);
void customwarplinecheck(int i); void customwarplinecheck(int i);
float entitycollideplatformroof(int t); float entitycollideplatformroof(int t);
@ -161,7 +161,7 @@ public:
bool testwallsx(int t, int tx, int ty); 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); void fixfriction(int t, float xfix, float xrate, float yrate);