mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix warning

This commit is contained in:
duncanspumpkin 2017-04-15 07:49:35 +01:00 committed by Michał Janiszewski
parent feef3d98da
commit 8adcbd6e35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/actions/SetParkEntranceFeeAction.cpp
View File

@ -81,13 +81,13 @@ extern "C"
{ {
auto gameAction = SetParkEntranceFeeAction(); auto gameAction = SetParkEntranceFeeAction();
gameAction.Fee = (money16)value; gameAction.Fee = (money16)value;
GameActions::Execute(&gameAction, 0, nullptr); GameActions::Execute(&gameAction);
} }
void game_command_set_park_entrance_fee(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) void game_command_set_park_entrance_fee(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp)
{ {
auto gameAction = SetParkEntranceFeeAction(); auto gameAction = SetParkEntranceFeeAction();
gameAction.Fee = (*edi & 0xFFFF); gameAction.Fee = (*edi & 0xFFFF);
GameActions::Execute(&gameAction, 0, nullptr); GameActions::Execute(&gameAction);
} }
} }

4
src/openrct2/network/Network.cpp
View File

@ -2065,7 +2065,7 @@ void Network::Client_Handle_GAME_ACTION(NetworkConnection& connection, NetworkPa
uint8 playerid; uint8 playerid;
packet >> tick >> type >> playerid; packet >> tick >> type >> playerid;
MemoryStream stream; MemoryStream stream;
uint16 size = packet.Size - packet.BytesRead; size_t size = packet.Size - packet.BytesRead;
stream.WriteArray(packet.Read(size), size); stream.WriteArray(packet.Read(size), size);
stream.SetPosition(0); stream.SetPosition(0);
GameCommand gc = GameCommand(tick, type, stream, playerid); GameCommand gc = GameCommand(tick, type, stream, playerid);
@ -2131,7 +2131,7 @@ void Network::Server_Handle_GAME_ACTION(NetworkConnection& connection, NetworkPa
// Run game command, and if it is successful send to clients // Run game command, and if it is successful send to clients
auto ga = GameActions::Create(commandType); auto ga = GameActions::Create(commandType);
MemoryStream stream; MemoryStream stream;
uint16 size = packet.Size - packet.BytesRead; size_t size = packet.Size - packet.BytesRead;
stream.WriteArray(packet.Read(size), size); stream.WriteArray(packet.Read(size), size);
stream.SetPosition(0); stream.SetPosition(0);
uint32 flags = stream.ReadValue<uint32>(); uint32 flags = stream.ReadValue<uint32>();