disconnects are handled properly; auto-latency for clients

Author: p4user_0

game/src/tank/Level.cpp

@@ -240,6 +240,7 @@ Level::Level()
   , _pause(0)
   , _time(0)
   , _timeBuffer(0)
+  , _dropedFrames(0)
   , _limitHit(false)
   , _frozen(false)
   , _safeMode(true)
@@ -344,6 +345,8 @@ void Level::Clear()
 
 	_cmdQueue.c.clear();
 	_ctrlQueue.c.clear();
+	_dropedFrames = 0;
+	_lag.clear();
 }
 
 void Level::HitLimit()
@@ -1083,11 +1086,18 @@ void Level::OnNewData(const DataBlock &db)
 	_cmdQueue.push(db);
 }
 
-ControlPacket Level::GetControlPacket()
+ControlPacket Level::GetControlPacket(GC_Object *player)
 {
 	_ASSERT(!_ctrlQueue.empty());
 	ControlPacket cp = _ctrlQueue.front();
 	_ctrlQueue.pop();
+
+	ASSERT_TYPE(player, GC_Player);
+	if( MISC_YOUARETHELAST & cp.wControlState )
+	{
+		_lag = static_cast<GC_Player*>(player)->GetNick();
+	}
+
 	return cp;
 }
 
@@ -1130,6 +1140,7 @@ void Level::TimeStep(float dt)
 				DataBlock::type_type type = db.type();
 				switch( type )
 				{
+					case DBTYPE_ERRORMSG:
 					case DBTYPE_TEXTMESSAGE:
 						static_cast<UI::Desktop*>(g_gui->GetDesktop())->GetMsgArea()->puts((const char*) db.Data());
 						break;
@@ -1175,7 +1186,8 @@ void Level::TimeStep(float dt)
 
 			if( _ctrlQueue.empty() )
 			{
-				_timeBuffer = 0;
+				_timeBuffer -= fixed_dt;
+				_dropedFrames += 1;
 				break; // íåò êàäðà. ïðîïóñêàåì
 			}
 
@@ -1204,8 +1216,9 @@ void Level::TimeStep(float dt)
 			#endif
 
 
-			_time       += fixed_dt;
-			_timeBuffer -= fixed_dt;
+			_time         += fixed_dt;
+			_timeBuffer   -= fixed_dt;
+			_dropedFrames = __max(0, _dropedFrames - fixed_dt); // it's allowed one dropped frame per second
 
 			if( !_frozen )
 			{

game/src/tank/Level.h

@@ -224,11 +224,13 @@ class Level : public RefCounted
 	int _pause;
 	float _time;
 	float _timeBuffer;
+	float _dropedFrames;
+	string_t _lag;
 	std::queue<DataBlock> _cmdQueue;
 	void OnNewData(const DataBlock &db);
 
 	std::queue<ControlPacket> _ctrlQueue;
-	ControlPacket GetControlPacket();
+	ControlPacket GetControlPacket(GC_Object *player);
 
 
 	Field _field;

game/src/tank/config/Config.h

@@ -30,7 +30,8 @@ CONFIG_BEGIN(ConfCache) //  var_name  def_value
 	CONFIG_VAR_STR(    sv_name,   "ZOD server" )
 	CONFIG_VAR_INT(    sv_port,           1945 )
 	CONFIG_VAR_FLOAT(  sv_fps,              30 )
-	CONFIG_VAR_FLOAT(  sv_latency,           4 )
+	CONFIG_VAR_FLOAT(  sv_latency,           1 )
+	CONFIG_VAR_BOOL(   sv_autoLatency,    true )
 	CONFIG_VAR_FLOAT(  sv_speed,           100 ) // percent
 	CONFIG_VAR_FLOAT(  sv_timelimit,         7 ) // minutes
 	CONFIG_VAR_INT(    sv_fraglimit,        21 )
@@ -43,6 +44,7 @@ CONFIG_BEGIN(ConfCache) //  var_name  def_value
 	CONFIG_VAR_INT(    cl_fraglimit,        21 )
 	CONFIG_VAR_BOOL(   cl_nightmode,     false )
 	CONFIG_VAR_STR(    cl_server,  "localhost" )
+	CONFIG_VAR_FLOAT(  cl_latency,           4 )
 	CONFIG_VAR_TABLE(  cl_playerinfo )
 
 	// sound

game/src/tank/gc/Player.cpp

@@ -49,19 +49,21 @@ GC_Player::GC_Player()
 	SetEvents(GC_FLAG_OBJECT_EVENTS_TS_FIXED);
 
 
+
 	// select nick from the random_names table
 	lua_getglobal(g_env.L, "random_name");     // push function
 	lua_call(g_env.L, 0, 1);                   // call it
 	SetNick(lua_tostring(g_env.L, -1));        // get value
 	lua_pop(g_env.L, 1);                       // pop result
 
+	// !! avoid using net_rand in constructor since it may cause sync error
 
-	// select random class
+	// select first available class
 	int count = 0;
 	lua_getglobal(g_env.L, "classes");
 	for( lua_pushnil(g_env.L); lua_next(g_env.L, -2); lua_pop(g_env.L, 1) )
 	{
-		if( 0 == g_level->net_rand() % ++count )
+	//	if( 0 == g_level->net_rand() % ++count )
 		{
 			SetClass(lua_tostring(g_env.L, -2));  // get vehicle class
 		}
@@ -414,12 +416,25 @@ IMPLEMENT_SELF_REGISTRATION(GC_PlayerLocal)
 }
 
 GC_PlayerLocal::GC_PlayerLocal()
+  : _lastLightKeyState(false)
+  , _lights(true)
+  , _aimToMouse(false)
 {
 	new GC_Camera(WrapRawPtr(this));
-	_lastLightKeyState = false;
-	_lights     = true;
-	_aimToMouse = false;
+	SelectFreeProfile();
+}
+
+GC_PlayerLocal::GC_PlayerLocal(FromFile)
+  : GC_Player(FromFile())
+{
+}
+
+GC_PlayerLocal::~GC_PlayerLocal()
+{
+}
 
+void GC_PlayerLocal::SelectFreeProfile()
+{
 	// find first available profile that is not used by another player
 	string_t profile;
 
@@ -448,15 +463,6 @@ GC_PlayerLocal::GC_PlayerLocal()
 	SetProfile(""); // there was no available profile found
 }
 
-GC_PlayerLocal::GC_PlayerLocal(FromFile)
-  : GC_Player(FromFile())
-{
-}
-
-GC_PlayerLocal::~GC_PlayerLocal()
-{
-}
-
 void GC_PlayerLocal::Serialize(SaveFile &f)
 {
 	GC_Player::Serialize(f);
@@ -500,7 +506,7 @@ void GC_PlayerLocal::TimeStepFixed(float dt)
 		if( g_client )
 		{
 			g_client->SendControl(cp);
-			g_level->GetControlPacket();
+			g_level->GetControlPacket(this);
 		}
 	}
 	else
@@ -537,10 +543,29 @@ void GC_PlayerLocal::TimeStepFixed(float dt)
 
 			cp.fromvs(vs);
 			g_client->SendControl(cp);
-			cp = g_level->GetControlPacket();
+			cp = g_level->GetControlPacket(this);
 			cp.tovs(vs);
-
 			GetVehicle()->SetState(vs);
+
+
+			//
+			// auto adjust latency
+			//
+
+			if( !g_server && g_conf->sv_autoLatency->Get() && g_conf->sv_latency->GetInt() < g_conf->sv_fps->GetInt() )
+			{
+				if( (cp.wControlState & MISC_YOUARETHELAST) && g_level->_dropedFrames > g_conf->sv_fps->GetInt() )
+				{
+					g_level->_dropedFrames = 0;
+					g_conf->sv_latency->SetInt(g_conf->sv_latency->GetInt() + 1);
+					TRACE("conf.sv_latency is set to %d\n", g_conf->sv_latency->GetInt());
+
+					if( g_conf->sv_latency->GetInt() >= g_conf->sv_fps->GetInt() )
+					{
+						TRACE("WARNING: latency is too high to play\n", g_conf->sv_latency->GetInt());
+					}
+				}
+			}
 		}
 		else
 		{
@@ -581,6 +606,8 @@ void GC_PlayerLocal::SetProfile(const string_t &name)
 	}
 	else
 	{
+		TRACE("WARNING: profile '%s' not found\n", name);
+
 		_keyForward     = 0;
 		_keyBack        = 0;
 		_keyLeft        = 0;
@@ -595,8 +622,6 @@ void GC_PlayerLocal::SetProfile(const string_t &name)
 		_lights         = true;
 		_aimToMouse     = false;
 		_moveToMouse    = false;
-
-		TRACE("WARNING: profile '%s' not found\n", name);
 	}
 }
 
@@ -790,11 +815,11 @@ void GC_PlayerRemote::TimeStepFixed(float dt)
 	_ASSERT(g_client);
 	if( IsVehicleDead() )
 	{
-		g_level->GetControlPacket();
+		g_level->GetControlPacket(this);
 	}
 	else
 	{
-		ControlPacket cp = g_level->GetControlPacket();
+		ControlPacket cp = g_level->GetControlPacket(this);
 		VehicleState vs;
 		cp.tovs(vs);
 		GetVehicle()->SetState(vs);

game/src/tank/gc/Player.h

@@ -132,7 +132,6 @@ class GC_PlayerLocal : public GC_Player
 
 	void GetControl(VehicleState &vs);
 
-
 protected:
 	class MyPropertySet : public GC_Player::MyPropertySet
 	{
@@ -154,6 +153,9 @@ class GC_PlayerLocal : public GC_Player
 	GC_PlayerLocal(FromFile);
 	virtual ~GC_PlayerLocal();
 
+	void SelectFreeProfile();
+
+
 	virtual DWORD GetNetworkID() const;
 
 	virtual void TimeStepFixed(float dt);

game/src/tank/gc/Weapons.cpp

@@ -1082,6 +1082,8 @@ void GC_Weap_Ram::TimeStepFloat(float dt)
 			}
 		}
 	}
+
+	GC_Weapon::TimeStepFloat(dt);
 }
 
 void GC_Weap_Ram::TimeStepFixed(float dt)

game/src/tank/network/ControlPacket.h

@@ -54,8 +54,11 @@ struct VehicleState
 #define STATE_TOWERCENTER   0x0100
 #define STATE_ENABLELIGHT   0x0200
 
-#define MODE_EXPLICITTOWER  0x4000
-#define MODE_EXPLICITBODY   0x8000
+#define MODE_EXPLICITTOWER  0x1000
+#define MODE_EXPLICITBODY   0x2000
+
+#define MISC_YOUARETHELAST  0x4000
+
 
 #pragma pack(push)
 #pragma pack(2)

game/src/tank/network/Peer.cpp

@@ -15,10 +15,10 @@ Peer::Peer(SOCKET s)
 {
 	_socket = s;
 
-	if( _socket.SetEvents(FD_READ|FD_WRITE|FD_CONNECT) )
+	if( _socket.SetEvents(FD_READ|FD_WRITE|FD_CONNECT|FD_CLOSE) )
 	{
 		TRACE("peer: ERROR - Unable to select event (%u)\n", WSAGetLastError());
-		return; // TODO: report error
+		throw std::runtime_error("peer: Unable to select event");
 	}
 
 	Delegate<void()> d;
@@ -74,7 +74,9 @@ void Peer::Send(const DataBlock &db)
 				if( WSAEWOULDBLOCK != err )
 				{
 					TRACE("peer: network error %u\n", err);
-					// TODO: disconnect peer
+					_ASSERT(eventDisconnect);
+					INVOKE(eventDisconnect) (this, err);
+					return;
 				}
 				_outgoing.insert(_outgoing.end(), db.RawData() + sent, db.RawData() + db.RawSize());
 				break;
@@ -101,6 +103,8 @@ void Peer::OnSocketEvent()
 	if( _socket.EnumNetworkEvents(&ne) )
 	{
 		TRACE("peer: EnumNetworkEvents error 0x%08x\n", WSAGetLastError());
+		_ASSERT(eventDisconnect);
+		INVOKE(eventDisconnect) (this, WSAGetLastError());
 		return;
 	}
 
@@ -110,18 +114,41 @@ void Peer::OnSocketEvent()
 		INVOKE(eventConnect) (ne.iErrorCode[FD_CONNECT_BIT]);
 	}
 
+	if( ne.lNetworkEvents & FD_CLOSE )
+	{
+		_ASSERT(eventDisconnect);
+		INVOKE(eventDisconnect) (this, ne.iErrorCode[FD_CLOSE_BIT]);
+	}
+
 	if( ne.lNetworkEvents & FD_READ )
 	{
 		if( ne.iErrorCode[FD_READ_BIT] )
 		{
 			TRACE("peer: read error 0x%08x\n", ne.iErrorCode[FD_READ_BIT]);
+			_ASSERT(eventDisconnect);
+			INVOKE(eventDisconnect) (this, ne.iErrorCode[FD_READ_BIT]);
 			return;
 		}
 
 		char buf[1024];
 		int result = recv(_socket, buf, sizeof(buf), 0);
 
-		if( result > 0 )
+		if( result < 0 )
+		{
+			TRACE("peer: unexpected error 0x%08x\n", WSAGetLastError());
+			_ASSERT(eventDisconnect);
+			INVOKE(eventDisconnect) (this, WSAGetLastError());
+			return;
+		}
+		else if( 0 == result )
+		{
+			// connection was gracefully closed
+			TRACE("peer: connection closed by remote side\n");
+			_ASSERT(eventDisconnect);
+			INVOKE(eventDisconnect) (this, 0);
+			return;
+		}
+		else
 		{
 			DataBlock db;
 			if( _incoming.empty() )
@@ -158,6 +185,8 @@ void Peer::OnSocketEvent()
 		if( ne.iErrorCode[FD_WRITE_BIT] )
 		{
 			TRACE("peer: write error 0x%08x\n", ne.iErrorCode[FD_WRITE_BIT]);
+			_ASSERT(eventDisconnect);
+			INVOKE(eventDisconnect) (this, ne.iErrorCode[FD_WRITE_BIT]);
 			return;
 		}
 
@@ -178,7 +207,9 @@ void Peer::OnSocketEvent()
 				if( WSAEWOULDBLOCK != err )
 				{
 					TRACE("peer: network error %u\n", err);
-					// TODO: disconnect peer
+					_ASSERT(eventDisconnect);
+					INVOKE(eventDisconnect) (this, err);
+					return;
 				}
 				break;
 			}

game/src/tank/network/Peer.h

@@ -24,7 +24,8 @@ class Peer : public RefCounted
 	void Connect(const sockaddr_in *addr);
 	void Send(const DataBlock &db);
 	Delegate<void(Peer *, const DataBlock &)> eventRecv;
-	Delegate<void(int)> eventConnect;
+	Delegate<void(Peer *, int errorCode)> eventDisconnect;
+	Delegate<void(int errorCode)> eventConnect;
 
 private:
 	void OnSocketEvent();