diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 89715b70..546385ca 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -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[t].h < entities[l].yp + 10) linetemp++; } - + if (linetemp > 0) return true; return false; }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[t].h > entities[l].yp - 10) linetemp++; } - + if (linetemp > 0) return true; return false; } @@ -4824,7 +4824,7 @@ bool entityclass::entitywarphlinecollide(int t, int l) { } 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){ @@ -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].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 { @@ -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].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; } @@ -5195,21 +5195,21 @@ void entityclass::hormovingplatformfix( int t ) void entityclass::customwarplinecheck(int i) { //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)) { + 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 (entities[j].type == 53 || entities[j].type == 54) { if (entitywarphlinecollide(i, j)) { customwarpmodehon = true; } diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index a5d96f04..6ff558c7 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -145,7 +145,7 @@ public: bool entityhlinecollide(int t, int l); bool entityvlinecollide(int t, int l); - + bool entitywarphlinecollide(int t, int l); bool entitywarpvlinecollide(int t, int l); diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 39fa41b1..d7c4c31f 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -3264,7 +3264,7 @@ void Game::updatestate() NETWORK_unlockAchievement("vvvvvvcomplete50"); } } - + savestats(); if (nodeathmode) @@ -4675,7 +4675,7 @@ void Game::savestats() msg->LinkEndChild( new TiXmlText( tu.String(fullScreenEffect_badSignal).c_str())); dataNode->LinkEndChild( msg ); - + msg = new TiXmlElement( "usingmmmmmm" ); msg->LinkEndChild( new TiXmlText( tu.String(usingmmmmmm).c_str())); dataNode->LinkEndChild( msg ); diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 37a733f4..25c9313c 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -230,7 +230,7 @@ void titleinput() { if (game.currentmenuname == "mainmenu") { - + #if defined(MAKEANDPLAY) if (game.currentmenuoption == 0) { @@ -868,7 +868,7 @@ SDL_assert(0 && "Remove open level dir"); } else if (game.currentmenuname == "options") { - + #if defined(MAKEANDPLAY) if (game.currentmenuoption == 0) { @@ -877,7 +877,7 @@ SDL_assert(0 && "Remove open level dir"); game.createmenu("accessibility"); map.nexttowercolour(); } - + else if (game.currentmenuoption == 1) { //clear data menu @@ -925,7 +925,7 @@ SDL_assert(0 && "Remove open level dir"); map.nexttowercolour(); } } - + #elif !defined(MAKEANDPLAY) if (game.currentmenuoption == 0) { @@ -955,7 +955,7 @@ SDL_assert(0 && "Remove open level dir"); game.createmenu("cleardatamenu"); map.nexttowercolour(); } - + if(music.mmmmmm){ if (game.currentmenuoption == 4) { diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 085a4d8f..d5652ecc 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -1043,13 +1043,13 @@ void gamelogic() //warp lines for collision obj.customwarpmodehon = false; obj.customwarpmodevon = false; - + 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)){ //Player is leaving room obj.customwarplinecheck(i); } - + if(obj.customwarpmodehon){ map.warpy=true; }else{ map.warpy=false; } if(obj.customwarpmodevon){ map.warpx=true; diff --git a/desktop_version/src/titlerender.cpp b/desktop_version/src/titlerender.cpp index c05d4e3d..3780042a 100644 --- a/desktop_version/src/titlerender.cpp +++ b/desktop_version/src/titlerender.cpp @@ -114,7 +114,7 @@ void titlerender() } else if (game.currentmenuname == "options") { - + #if defined(MAKEANDPLAY) if (game.currentmenuoption == 0) { @@ -1122,7 +1122,7 @@ void titlerender() graphics.Print( -1, 125, "Your have unlocked", tr, tg, tb, true); graphics.Print( -1, 135, "the intermission levels.", tr, tg, tb, true); }else if (game.currentmenuname == "playerworlds") - { + { graphics.tempstring = FILESYSTEM_getUserLevelDirectory(); if(graphics.tempstring.length()>80){ graphics.Print( -1, 160, "To install new player levels, copy", tr, tg, tb, true);