mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-27 23:18:30 +02:00
Code Issues Releases Wiki Activity

Remove trailing whitespace from all files

Browse Source 
Surprisingly, there's not a lot of it. There is, however, a lot of mixed
indentation in this project.
This commit is contained in:
Misa 2020-04-02 12:41:33 -07:00 committed by Ethan Lee
parent 6c6b6c68ff
commit 12d5433efc
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desktop_version/src/Entity.cpp
View File

@ -4805,7 +4805,7 @@ bool entityclass::entitywarphlinecollide(int t, int l) {
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 {
@ -4816,7 +4816,7 @@ bool entityclass::entitywarphlinecollide(int t, int l) {
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;
} }
@ -4824,7 +4824,7 @@ bool entityclass::entitywarphlinecollide(int t, int l) {
} }
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){
@ -4836,7 +4836,7 @@ bool entityclass::entitywarpvlinecollide(int t, int l) {
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 {
@ -4845,7 +4845,7 @@ bool entityclass::entitywarpvlinecollide(int t, int l) {
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;
} }
@ -5195,21 +5195,21 @@ 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;
} }

2
desktop_version/src/Entity.h
View File

@ -145,7 +145,7 @@ public:
bool entityhlinecollide(int t, int l); bool entityhlinecollide(int t, int l);
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);

4
desktop_version/src/Game.cpp
View File

@ -3264,7 +3264,7 @@ void Game::updatestate()
NETWORK_unlockAchievement("vvvvvvcomplete50"); NETWORK_unlockAchievement("vvvvvvcomplete50");
} }
} }
savestats(); savestats();
if (nodeathmode) if (nodeathmode)
@ -4675,7 +4675,7 @@ void Game::savestats()
msg->LinkEndChild( new TiXmlText( tu.String(fullScreenEffect_badSignal).c_str())); msg->LinkEndChild( new TiXmlText( tu.String(fullScreenEffect_badSignal).c_str()));
dataNode->LinkEndChild( msg ); dataNode->LinkEndChild( msg );
msg = new TiXmlElement( "usingmmmmmm" ); msg = new TiXmlElement( "usingmmmmmm" );
msg->LinkEndChild( new TiXmlText( tu.String(usingmmmmmm).c_str())); msg->LinkEndChild( new TiXmlText( tu.String(usingmmmmmm).c_str()));
dataNode->LinkEndChild( msg ); dataNode->LinkEndChild( msg );

10
desktop_version/src/Input.cpp
View File

@ -230,7 +230,7 @@ void titleinput()
{ {
if (game.currentmenuname == "mainmenu") if (game.currentmenuname == "mainmenu")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
@ -868,7 +868,7 @@ SDL_assert(0 && "Remove open level dir");
} }
else if (game.currentmenuname == "options") else if (game.currentmenuname == "options")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
@ -877,7 +877,7 @@ SDL_assert(0 && "Remove open level dir");
game.createmenu("accessibility"); game.createmenu("accessibility");
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == 1) else if (game.currentmenuoption == 1)
{ {
//clear data menu //clear data menu
@ -925,7 +925,7 @@ SDL_assert(0 && "Remove open level dir");
map.nexttowercolour(); map.nexttowercolour();
} }
} }
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
@ -955,7 +955,7 @@ SDL_assert(0 && "Remove open level dir");
game.createmenu("cleardatamenu"); game.createmenu("cleardatamenu");
map.nexttowercolour(); map.nexttowercolour();
} }
if(music.mmmmmm){ if(music.mmmmmm){
if (game.currentmenuoption == 4) if (game.currentmenuoption == 4)
{ {

4
desktop_version/src/Logic.cpp
View File

@ -1043,13 +1043,13 @@ void gamelogic()
//warp lines for collision //warp lines for collision
obj.customwarpmodehon = false; obj.customwarpmodehon = false;
obj.customwarpmodevon = false; obj.customwarpmodevon = false;
int i = obj.getplayer(); int i = obj.getplayer();
if ((game.door_down > -2 && obj.entities[i].yp >= 226-16) || (game.door_up > -2 && obj.entities[i].yp < -2+16) || (game.door_left > -2 && obj.entities[i].xp < -14+16) || (game.door_right > -2 && obj.entities[i].xp >= 308-16)){ if ((game.door_down > -2 && obj.entities[i].yp >= 226-16) || (game.door_up > -2 && obj.entities[i].yp < -2+16) || (game.door_left > -2 && obj.entities[i].xp < -14+16) || (game.door_right > -2 && obj.entities[i].xp >= 308-16)){
//Player is leaving room //Player is leaving room
obj.customwarplinecheck(i); obj.customwarplinecheck(i);
} }
if(obj.customwarpmodehon){ map.warpy=true; if(obj.customwarpmodehon){ map.warpy=true;
}else{ map.warpy=false; } }else{ map.warpy=false; }
if(obj.customwarpmodevon){ map.warpx=true; if(obj.customwarpmodevon){ map.warpx=true;

4
desktop_version/src/titlerender.cpp
View File

@ -114,7 +114,7 @@ void titlerender()
} }
else if (game.currentmenuname == "options") else if (game.currentmenuname == "options")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
@ -1122,7 +1122,7 @@ void titlerender()
graphics.Print( -1, 125, "Your have unlocked", tr, tg, tb, true); graphics.Print( -1, 125, "Your have unlocked", tr, tg, tb, true);
graphics.Print( -1, 135, "the intermission levels.", tr, tg, tb, true); graphics.Print( -1, 135, "the intermission levels.", tr, tg, tb, true);
}else if (game.currentmenuname == "playerworlds") }else if (game.currentmenuname == "playerworlds")
{ {
graphics.tempstring = FILESYSTEM_getUserLevelDirectory(); graphics.tempstring = FILESYSTEM_getUserLevelDirectory();
if(graphics.tempstring.length()>80){ if(graphics.tempstring.length()>80){
graphics.Print( -1, 160, "To install new player levels, copy", tr, tg, tb, true); graphics.Print( -1, 160, "To install new player levels, copy", tr, tg, tb, true);