From dfc100f15e1f6eaee02774436a9374a810bbbd32 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Tue, 13 Sep 2016 22:54:02 -0600 Subject: [PATCH 1/2] Fix issue with kick message not being received --- src/network/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index ecb2f086dc..51e59503a1 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -589,7 +589,6 @@ void Network::KickPlayer(int playerId) format_string(str_disconnect_msg, STR_MULTIPLAYER_KICKED_REASON, NULL); Server_Send_SETDISCONNECTMSG(*(*it), str_disconnect_msg); (*it)->Socket->Disconnect(); - (*it)->SendQueuedPackets(); break; } } @@ -1044,6 +1043,7 @@ void Network::Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, const *packet << (uint32)NETWORK_COMMAND_SETDISCONNECTMSG; packet->WriteString(msg); connection.QueuePacket(std::move(packet)); + connection.SendQueuedPackets(); } void Network::Server_Send_GAMEINFO(NetworkConnection& connection) From 318adc3fa83d98945297521589d4d32bdc41bc2a Mon Sep 17 00:00:00 2001 From: zsilencer Date: Wed, 14 Sep 2016 15:47:23 -0600 Subject: [PATCH 2/2] Fix #4434: Crash when sprite limit is reached --- src/world/sprite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/sprite.c b/src/world/sprite.c index 167ad4cf8d..88596a3455 100644 --- a/src/world/sprite.c +++ b/src/world/sprite.c @@ -259,7 +259,7 @@ rct_sprite *create_sprite(uint8 bl) size_t linkedListTypeOffset = SPRITE_LIST_UNKNOWN * 2; if ((bl & 2) != 0) { // 69EC96; - sint16 cx = 0x12C - gSpriteListCount[SPRITE_LIST_MISC]; + uint16 cx = 0x12C - gSpriteListCount[SPRITE_LIST_MISC]; if (cx >= gSpriteListCount[SPRITE_LIST_NULL]) { return NULL; }