removing a mistake that was making karts not do item checks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
@@ -57,6 +57,8 @@
|
||||
#include "karts/max_speed.hpp"
|
||||
#include "karts/skidding.hpp"
|
||||
#include "modes/linear_world.hpp"
|
||||
#include "network/network_world.hpp"
|
||||
#include "network/network_manager.hpp"
|
||||
#include "physics/btKart.hpp"
|
||||
#include "physics/btKartRaycast.hpp"
|
||||
#include "physics/btUprightConstraint.hpp"
|
||||
@@ -1152,7 +1154,8 @@ void Kart::update(float dt)
|
||||
} // if there is material
|
||||
|
||||
// Check if any item was hit.
|
||||
if (!m_controller->isNetworkController()) // no need in network
|
||||
// check it if we're not in a network world, or if we're on the server (when network mode is on)
|
||||
if (!NetworkWorld::getInstance()->isRunning() || NetworkManager::getInstance()->isServer())
|
||||
ItemManager::get()->checkItemHit(this);
|
||||
|
||||
static video::SColor pink(255, 255, 133, 253);
|
||||
|
||||
@@ -27,7 +27,7 @@ void NetworkWorld::update(float dt)
|
||||
ProtocolManager::getInstance()->getProtocol(PROTOCOL_SYNCHRONIZATION));
|
||||
if (protocol) // if this protocol exists, that's that we play online
|
||||
{
|
||||
Log::debug("NetworkWorld", "Coutdown value is %f", protocol->getCountdown());
|
||||
Log::info("NetworkWorld", "Coutdown value is %f", protocol->getCountdown());
|
||||
if (protocol->getCountdown() > 0.0)
|
||||
{
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user