ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip eliminated karts when switching camera target in spectating mode

Browse Source
This commit is contained in:
Alayan 2019-01-04 19:19:26 +01:00
parent f4a932271f
commit 4d6be5934e
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/input/input_manager.cpp
View File

@ -816,16 +816,33 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
int current_idx = 0;
if (cam->getKart())
current_idx = cam->getKart()->getWorldKartId();
bool up = false;
if (action == PA_STEER_LEFT && value == 0)
current_idx = ++current_idx % World::getWorld()->getNumKarts();
up = false;
else if (action == PA_STEER_RIGHT && value == 0)
up = true;
else
return;
for (int i=0;i<World::getWorld()->getNumKarts();i++)
{
if (current_idx == 0)
current_idx = up ? current_idx+1 : current_idx-1;
// Handle looping
if (current_idx == -1)
current_idx = World::getWorld()->getNumKarts() - 1;
else
current_idx = --current_idx;
else if (current_idx == World::getWorld()->getNumKarts())
current_idx = 0;
if (!World::getWorld()->getKart(current_idx)->isEliminated())
{
cam->setKart(World::getWorld()->getKart(current_idx));
break;
}
// This can happen if there is only one active kart
if (current_idx == cam->getKart()->getWorldKartId())
break;
}
cam->setKart(World::getWorld()->getKart(current_idx));
return;
}
}