From 8f8249fab53f6e8177b2f0f466b63c5e3eab7b75 Mon Sep 17 00:00:00 2001 From: Archlinux-Jerry Build Bot Date: Sat, 15 Aug 2020 00:43:29 +0800 Subject: [PATCH] update: openttd to 1.10.3 --- openttd/0001-change-network-server.patch | 12 ++++++------ openttd/PKGBUILD | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openttd/0001-change-network-server.patch b/openttd/0001-change-network-server.patch index dd8eace..2deea6d 100644 --- a/openttd/0001-change-network-server.patch +++ b/openttd/0001-change-network-server.patch @@ -1,4 +1,4 @@ -From f1ecd7bbb1e92c22d463ac9521a258f2454bc9e3 Mon Sep 17 00:00:00 2001 +From 441bc1d6f41caccd1c5735b119b99f394f5f8847 Mon Sep 17 00:00:00 2001 From: Jerry Date: Sun, 26 Apr 2020 20:40:46 +0800 Subject: [PATCH] change network server @@ -35,10 +35,10 @@ index cec611004..d2758ecd0 100644 CommandCost CheckOwnership(Owner owner, TileIndex tile = 0); CommandCost CheckTileOwnership(TileIndex tile); diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp -index 36a15d3ae..578246a41 100644 +index c82c51cfd..24df26d7e 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp -@@ -1437,11 +1437,47 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_RCON(Packet *p) +@@ -1447,11 +1447,47 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_RCON(Packet *p) char pass[NETWORK_PASSWORD_LENGTH]; char command[NETWORK_RCONCOMMAND_LENGTH]; @@ -61,9 +61,9 @@ index 36a15d3ae..578246a41 100644 + SubtractMoneyFromAnyCompany(company, CommandCost(EXPENSES_OTHER, -money)); + DEBUG(net, 0, "[rcon] gm $%lld from client-id %d company %hd, total $%lld", + money, this->client_id, cid, (int64)(Company::GetIfValid(cid)->money)); -+ const char * ipaddr = "0.0.0.0:0"; ++ char ipaddr[50] = "0.0.0.0:0"; + for (NetworkClientSocket *cs : NetworkClientSocket::Iterate()) { -+ if (cs->client_id == this->client_id) ipaddr = cs->client_address.GetAddressAsString(false); ++ if (cs->client_id == this->client_id) cs->client_address.GetAddressAsString(ipaddr, lastof(ipaddr), false); + } + seprintf(_buf, lastof(_buf), + "client id=%d (%s, %s) added $%lld to company %hd, please reconnect", @@ -89,5 +89,5 @@ index 36a15d3ae..578246a41 100644 DEBUG(net, 0, "[rcon] wrong password from client-id %d", this->client_id); return NETWORK_RECV_STATUS_OKAY; -- -2.27.0 +2.28.0 diff --git a/openttd/PKGBUILD b/openttd/PKGBUILD index 81be91c..662e3dd 100644 --- a/openttd/PKGBUILD +++ b/openttd/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('x86_64') @@ -12,8 +12,8 @@ optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("https://proxy.binaries.openttd.org/openttd-releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz" "0001-change-network-server.patch") -sha256sums=('939c55d259fb13cb47dfb3244e8f7b9e2f723883ebb2119410d8a282724eb6f5' - '2efcbd86d30f1a4d431734798c3525911733cc42be89f6c1180ff68acfe56e0c') +sha512sums=('d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4' + '86e8eb8cf85996171f0516d2052e745ec13081cc96e8786832868c0e5190e8f08f569892ebd0076259bd6717d77236bb45f21097234cc3723153816db9b3197d') prepare() { cd ${pkgname}-${pkgver}