Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +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

16
desktop_version/src/Logic.cpp
View File

@@ -1361,7 +1361,7 @@ void gamelogic()
{
case 6:
obj.createentity(obj.entities[i].xp, 121.0f, 15.0f,1); //Y=121, the floor in that particular place!
j = obj.getcompanion(6);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
break;
@@ -1376,7 +1376,7 @@ void gamelogic()
{
obj.createentity(obj.entities[i].xp, 86.0f, 16.0f, 1); //Y=86, the ROOF in that particular place!
}
j = obj.getcompanion(7);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
@@ -1387,14 +1387,14 @@ void gamelogic()
if (game.roomx == 102)
{
obj.createentity(310, 177, 17, 1);
j = obj.getcompanion(8);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
else
{
obj.createentity(obj.entities[i].xp, 177.0f, 17.0f, 1);
j = obj.getcompanion(8);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
@@ -1411,7 +1411,7 @@ void gamelogic()
{
obj.createentity(obj.entities[i].xp, 185.0f, 18.0f, 15, 0, 1);
}
j = obj.getcompanion(9);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
@@ -1423,7 +1423,7 @@ void gamelogic()
if (obj.flags[59] == 0)
{
obj.createentity(225.0f, 169.0f, 18, graphics.crewcolour(game.lastsaved), 0, 10);
j = obj.getcompanion(10);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
@@ -1433,7 +1433,7 @@ void gamelogic()
if (obj.flags[59] == 1)
{
obj.createentity(160.0f, 177.0f, 18, graphics.crewcolour(game.lastsaved), 0, 18, 1);
j = obj.getcompanion(10);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}
@@ -1441,7 +1441,7 @@ void gamelogic()
{
obj.flags[59] = 1;
obj.createentity(obj.entities[i].xp, -20.0f, 18.0f, graphics.crewcolour(game.lastsaved), 0, 10, 0);
j = obj.getcompanion(10);
j = obj.getcompanion();
obj.entities[j].vx = obj.entities[i].vx;
obj.entities[j].dir = obj.entities[i].dir;
}