Archlinux-Jerry/pkgbuilds
1
0
Fork 0
mirror of https://github.com/archlinux-jerry/pkgbuilds synced 2024-11-22 14:00:40 +08:00
Code Issues Releases Wiki Activity

update: openttd to 1.10.3

Browse source
This commit is contained in:
Archlinux-Jerry Build Bot 2020-08-15 00:43:29 +08:00 committed by Jerry
parent 18b45f1c7f
commit 8f8249fab5
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openttd/0001-change-network-server.patch
View file

@ -1,4 +1,4 @@
From f1ecd7bbb1e92c22d463ac9521a258f2454bc9e3 Mon Sep 17 00:00:00 2001 From 441bc1d6f41caccd1c5735b119b99f394f5f8847 Mon Sep 17 00:00:00 2001
From: Jerry <isjerryxiao@outlook.com> From: Jerry <isjerryxiao@outlook.com>
Date: Sun, 26 Apr 2020 20:40:46 +0800 Date: Sun, 26 Apr 2020 20:40:46 +0800
Subject: [PATCH] change network server Subject: [PATCH] change network server
@ -35,10 +35,10 @@ index cec611004..d2758ecd0 100644
CommandCost CheckOwnership(Owner owner, TileIndex tile = 0); CommandCost CheckOwnership(Owner owner, TileIndex tile = 0);
CommandCost CheckTileOwnership(TileIndex tile); CommandCost CheckTileOwnership(TileIndex tile);
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp 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 --- a/src/network/network_server.cpp
+++ b/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 pass[NETWORK_PASSWORD_LENGTH];
char command[NETWORK_RCONCOMMAND_LENGTH]; char command[NETWORK_RCONCOMMAND_LENGTH];
@ -61,9 +61,9 @@ index 36a15d3ae..578246a41 100644
+ SubtractMoneyFromAnyCompany(company, CommandCost(EXPENSES_OTHER, -money)); + SubtractMoneyFromAnyCompany(company, CommandCost(EXPENSES_OTHER, -money));
+ DEBUG(net, 0, "[rcon] gm $%lld from client-id %d company %hd, total $%lld", + DEBUG(net, 0, "[rcon] gm $%lld from client-id %d company %hd, total $%lld",
+ money, this->client_id, cid, (int64)(Company::GetIfValid(cid)->money)); + 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()) { + 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), + seprintf(_buf, lastof(_buf),
+ "client id=%d (%s, %s) added $%lld to company %hd, please reconnect", + "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); DEBUG(net, 0, "[rcon] wrong password from client-id %d", this->client_id);
return NETWORK_RECV_STATUS_OKAY; return NETWORK_RECV_STATUS_OKAY;
-- --
2.27.0 2.28.0

6
openttd/PKGBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
pkgname=openttd pkgname=openttd
pkgver=1.10.2 pkgver=1.10.3
pkgrel=1 pkgrel=1
pkgdesc='An engine for running Transport Tycoon Deluxe.' pkgdesc='An engine for running Transport Tycoon Deluxe.'
arch=('x86_64') arch=('x86_64')
@ -12,8 +12,8 @@ optdepends=('openttd-opengfx: free graphics'
'openttd-opensfx: free soundset') 'openttd-opensfx: free soundset')
source=("https://proxy.binaries.openttd.org/openttd-releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz" source=("https://proxy.binaries.openttd.org/openttd-releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz"
"0001-change-network-server.patch") "0001-change-network-server.patch")
sha256sums=('939c55d259fb13cb47dfb3244e8f7b9e2f723883ebb2119410d8a282724eb6f5' sha512sums=('d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4'
'2efcbd86d30f1a4d431734798c3525911733cc42be89f6c1180ff68acfe56e0c') '86e8eb8cf85996171f0516d2052e745ec13081cc96e8786832868c0e5190e8f08f569892ebd0076259bd6717d77236bb45f21097234cc3723153816db9b3197d')
prepare() { prepare() {
cd ${pkgname}-${pkgver} cd ${pkgname}-${pkgver}