mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 03:05:24 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4435 from zsilencer/bugfixes

Browse Source 
Bugfixes
This commit is contained in:
Ted John
2016-09-14 23:23:10 +01:00
committed by GitHub
parent 931fc59506 318adc3fa8
commit 560af48f85
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network.cpp
View File

@@ -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)

2
src/world/sprite.c
View File

@@ -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;
}