Optimize block sent: Fix rendering issue

master
Lars Hofhansl 2016-11-30 21:42:22 -08:00 committed by paramat
parent e2cbfa82e8
commit 8a7dc838a8
3 changed files with 4 additions and 4 deletions

View File

@ -951,7 +951,7 @@ void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *
[12+12] s32 pitch*100 [12+12] s32 pitch*100
[12+12+4] s32 yaw*100 [12+12+4] s32 yaw*100
[12+12+4+4] u32 keyPressed [12+12+4+4] u32 keyPressed
[12+12+4+4+1] u8 fov*80 [12+12+4+4+4] u8 fov*80
[12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE [12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
*/ */
*pkt << position << speed << pitch << yaw << keyPressed; *pkt << position << speed << pitch << yaw << keyPressed;
@ -1338,7 +1338,7 @@ void Client::sendPlayerPos()
assert(myplayer->peer_id == our_peer_id); assert(myplayer->peer_id == our_peer_id);
NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4); NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4 + 1 + 1);
writePlayerPos(myplayer, &map, &pkt); writePlayerPos(myplayer, &map, &pkt);

View File

@ -357,7 +357,7 @@ queue_full_break:
} else if(nearest_emergefull_d != -1){ } else if(nearest_emergefull_d != -1){
new_nearest_unsent_d = nearest_emergefull_d; new_nearest_unsent_d = nearest_emergefull_d;
} else { } else {
if(d > g_settings->getS16("max_block_send_distance")){ if(d > full_d_max){
new_nearest_unsent_d = 0; new_nearest_unsent_d = 0;
m_nothing_to_send_pause_timer = 2.0; m_nothing_to_send_pause_timer = 2.0;
} else { } else {

View File

@ -794,7 +794,7 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
u32 keyPressed = 0; u32 keyPressed = 0;
// default behavior (in case an old client doesn't send these) // default behavior (in case an old client doesn't send these)
f32 fov = (72.0*M_PI/180) * 4./3.; f32 fov = 0;
u8 wanted_range = 0; u8 wanted_range = 0;
if (pkt->getRemainingBytes() >= 4) if (pkt->getRemainingBytes() >= 4)