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

Allow auto end if all players finished with AI in network race

Browse Source
This commit is contained in:
Benau 2019-10-09 14:36:49 +08:00
parent a26f67bf16
commit 2a40606be7
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modes/linear_world.cpp
View File

@ -32,10 +32,12 @@
#include "guiengine/modaldialog.hpp" #include "guiengine/modaldialog.hpp"
#include "physics/physics.hpp" #include "physics/physics.hpp"
#include "network/network_config.hpp" #include "network/network_config.hpp"
#include "network/network_player_profile.hpp"
#include "network/network_string.hpp" #include "network/network_string.hpp"
#include "network/protocols/game_events_protocol.hpp" #include "network/protocols/game_events_protocol.hpp"
#include "network/server_config.hpp" #include "network/server_config.hpp"
#include "network/stk_host.hpp" #include "network/stk_host.hpp"
#include "network/stk_peer.hpp"
#include "race/history.hpp" #include "race/history.hpp"
#include "states_screens/race_gui_base.hpp" #include "states_screens/race_gui_base.hpp"
#include "tracks/check_manager.hpp" #include "tracks/check_manager.hpp"
@ -170,6 +172,28 @@ void LinearWorld::reset(bool restart)
*/ */
void LinearWorld::update(int ticks) void LinearWorld::update(int ticks)
{ {
if (NetworkConfig::get()->isServer() && getPhase() == RACE_PHASE)
{
bool all_players_finished = true;
bool has_ai = false;
for (unsigned i = 0; i < race_manager->getNumPlayers(); i++)
{
auto npp =
race_manager->getKartInfo(i).getNetworkPlayerProfile().lock();
if (!npp)
continue;
if (npp)
{
auto peer = npp->getPeer();
if (peer && peer->getUserVersion() == "AI")
has_ai = true;
else if (!getKart(i)->hasFinishedRace())
all_players_finished = false;
}
}
if (all_players_finished && has_ai)
m_finish_timeout = -1.0f;
}
if (getPhase() == RACE_PHASE && if (getPhase() == RACE_PHASE &&
m_finish_timeout != std::numeric_limits<float>::max()) m_finish_timeout != std::numeric_limits<float>::max())
{ {