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

Fix penalty in networking

Browse Source
This commit is contained in:
Benau 2018-07-06 22:24:32 +08:00
parent c437fcc513
commit 1efce9ae29
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/karts/controller/local_player_controller.cpp
View File

@ -39,7 +39,6 @@
#include "modes/world.hpp"
#include "network/network_config.hpp"
#include "network/protocols/game_protocol.hpp"
#include "network/rewind_manager.hpp"
#include "race/history.hpp"
#include "states_screens/race_gui_base.hpp"
#include "tracks/track.hpp"

16
src/karts/controller/player_controller.cpp
View File

@ -30,6 +30,7 @@
#include "karts/rescue_animation.hpp"
#include "modes/world.hpp"
#include "network/game_setup.hpp"
#include "network/rewind_manager.hpp"
#include "network/network_config.hpp"
#include "network/network_player_profile.hpp"
#include "network/protocols/lobby_protocol.hpp"
@ -107,7 +108,12 @@ void PlayerController::resetInputState()
*/
bool PlayerController::action(PlayerAction action, int value, bool dry_run)
{
if (!NetworkConfig::get()->isNetworking() ||
!NetworkConfig::get()->isServer())
{
if (m_penalty_ticks > 0)
return false;
}
/** If dry_run (parameter) is true, this macro tests if this action would
* trigger a state change in the specified variable (without actually
* doing it). If it will trigger a state change, the macro will
@ -171,7 +177,7 @@ bool PlayerController::action(PlayerAction action, int value, bool dry_run)
break;
case PA_ACCEL:
SET_OR_TEST(m_prev_accel, value);
if (value && !(m_penalty_ticks > 0))
if (value)
{
SET_OR_TEST_GETTER(Accel, value/32768.0f);
SET_OR_TEST_GETTER(Brake, false);
@ -351,9 +357,11 @@ void PlayerController::update(int ticks)
return;
} // if isStartPhase
if (m_penalty_ticks>0)
if (!RewindManager::get()->isRewinding() && m_penalty_ticks > 0)
{
m_penalty_ticks-=ticks;
m_penalty_ticks -= ticks;
m_controls->setBrake(false);
m_controls->setAccel(0.0f);
return;
}