Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused argument of entityclass::getcompanion()

Browse Source 
The argument provided to entityclass::getcompanion() does absolutely
nothing. Remove it, and update all callers.
This commit is contained in:
Misa
2020-04-01 15:32:21 -07:00
committed by Ethan Lee
parent d910800423
commit 7abf40881a
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop_version/src/Game.cpp
View File

@@ -1534,7 +1534,7 @@ void Game::updatestate()
companion = 6;
i = obj.getcompanion(6);
i = obj.getcompanion();
obj.entities[i].tile = 0;
obj.entities[i].state = 1;
@@ -1560,7 +1560,7 @@ void Game::updatestate()
state++;
music.playef(2, 10);
graphics.textboxactive();
i = obj.getcompanion(6);
i = obj.getcompanion();
obj.entities[i].tile = 54;
obj.entities[i].state = 0;
}
@@ -1575,7 +1575,7 @@ void Game::updatestate()
case 110:
{
i = obj.getcompanion(6);
i = obj.getcompanion();
obj.entities[i].tile = 0;
obj.entities[i].state = 1;
graphics.createtextbox("Follow me!", 185, 154, 164, 164, 255);
@@ -1650,7 +1650,7 @@ void Game::updatestate()
break;
case 122:
companion = 7;
i = obj.getcompanion(7);
i = obj.getcompanion();
obj.entities[i].tile = 6;
obj.entities[i].state = 1;
@@ -1667,7 +1667,7 @@ void Game::updatestate()
state++;
music.playef(2, 10);
graphics.textboxactive();
i = obj.getcompanion(7); //obj.entities[i].tile = 66; obj.entities[i].state = 0;
i = obj.getcompanion(); //obj.entities[i].tile = 66; obj.entities[i].state = 0;
break;
case 126:
graphics.createtextbox("I can help with that!", 125, 152-40, 164, 164, 255);
@@ -1688,7 +1688,7 @@ void Game::updatestate()
state++;
music.playef(14, 10);
graphics.textboxactive();
i = obj.getcompanion(7);
i = obj.getcompanion();
obj.entities[i].tile = 6;
obj.entities[i].state = 1;
break;
@@ -2317,7 +2317,7 @@ void Game::updatestate()
obj.entities[i].colour = 0;
obj.entities[i].invis = true;
i = obj.getcompanion(companion);
i = obj.getcompanion();
if(i>-1)
{
obj.entities[i].active = false;