Update to 1.10.2
This commit is contained in:
Pavel Stupnikov
55
.gitignore
vendored
Normal file
55
.gitignore
vendored
Normal file
@@ -0,0 +1,55 @@
|
||||
bin/*
|
||||
!bin/ai
|
||||
bin/ai/*
|
||||
!bin/ai/compat*.nut
|
||||
!bin/ai/regression
|
||||
!bin/data
|
||||
bin/baseset/*
|
||||
!bin/baseset/openttd.grf
|
||||
!bin/baseset/opntitle.dat
|
||||
!bin/baseset/orig_extra.grf
|
||||
!bin/baseset/orig_*.obg
|
||||
!bin/baseset/orig_*.obs
|
||||
!bin/baseset/no_sound.obs
|
||||
!bin/baseset/no_music.obm
|
||||
!bin/baseset/orig_*.obm
|
||||
!bin/game
|
||||
bin/game/*
|
||||
!bin/game/compat*.nut
|
||||
!bin/scripts
|
||||
bin/scripts/*
|
||||
!bin/scripts/*.example
|
||||
!bin/scripts/readme.txt
|
||||
|
||||
*.aps
|
||||
bundle/*
|
||||
bundles/*
|
||||
docs/aidocs/*
|
||||
docs/gamedocs/*
|
||||
docs/source/*
|
||||
.kdev4
|
||||
.kdev4/*
|
||||
*.kdev4
|
||||
media/openttd.desktop
|
||||
media/openttd.desktop.install
|
||||
objs/*
|
||||
projects/.vs
|
||||
projects/Debug
|
||||
projects/Release
|
||||
projects/*.ncb
|
||||
projects/*.suo
|
||||
projects/*.sdf
|
||||
projects/*.opensdf
|
||||
projects/*.vcproj.*.user
|
||||
projects/*.vcxproj.user
|
||||
projects/*.VC.db
|
||||
projects/*.VC.opendb
|
||||
src/rev.cpp
|
||||
src/os/windows/ottdres.rc
|
||||
|
||||
/Makefile*
|
||||
!/Makefile.msvc
|
||||
/config.*
|
||||
!/config.lib
|
||||
!*.in
|
||||
*.tmp
|
||||
4
Doxyfile
4
Doxyfile
@@ -7,8 +7,8 @@
|
||||
# Project related configuration options
|
||||
#---------------------------------------------------------------------------
|
||||
DOXYFILE_ENCODING = UTF-8
|
||||
PROJECT_NAME = OpenTTD
|
||||
PROJECT_NUMBER =
|
||||
PROJECT_NAME = "OpenTTD Source"
|
||||
PROJECT_NUMBER = $(VERSION)
|
||||
PROJECT_BRIEF =
|
||||
PROJECT_LOGO =
|
||||
OUTPUT_DIRECTORY = docs/source/
|
||||
|
||||
22
Makefile
22
Makefile
@@ -1,6 +1,4 @@
|
||||
# Auto-generated file from 'Makefile.in' -- DO NOT EDIT
|
||||
# $Id$
|
||||
|
||||
# This file is part of OpenTTD.
|
||||
# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
@@ -17,12 +15,12 @@ include Makefile.am
|
||||
|
||||
CONFIG_CACHE_PWD = config.cache.pwd
|
||||
CONFIG_CACHE_SOURCE_LIST = config.cache.source.list
|
||||
BIN_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/bin
|
||||
BIN_DIR = /home/pavels/Projects/cmbase/bin
|
||||
ICON_THEME_DIR = /usr/local/share/icons/hicolor
|
||||
MAN_DIR = /usr/local/share/man/man6
|
||||
MENU_DIR = /usr/local/share/applications
|
||||
SRC_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/src
|
||||
ROOT_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1
|
||||
SRC_DIR = /home/pavels/Projects/cmbase/src
|
||||
ROOT_DIR = /home/pavels/Projects/cmbase
|
||||
BUNDLE_DIR = "$(ROOT_DIR)/bundle"
|
||||
BUNDLES_DIR = "$(ROOT_DIR)/bundles"
|
||||
INSTALL_DIR = /
|
||||
@@ -33,10 +31,10 @@ INSTALL_ICON_DIR = "$(INSTALL_DIR)/"/usr/local/share/pixmaps
|
||||
INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
|
||||
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"/usr/local/share/games/openttd
|
||||
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"/usr/local/share/doc/openttd
|
||||
SOURCE_LIST = /home/pavels/Downloads/openttd-1.10.0-beta1/source.list
|
||||
CONFIGURE_FILES = /home/pavels/Downloads/openttd-1.10.0-beta1/configure /home/pavels/Downloads/openttd-1.10.0-beta1/config.lib /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.in /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.grf.in /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.lang.in /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.src.in /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.bundle.in /home/pavels/Downloads/openttd-1.10.0-beta1/Makefile.setting.in
|
||||
SOURCE_LIST = /home/pavels/Projects/cmbase/source.list
|
||||
CONFIGURE_FILES = /home/pavels/Projects/cmbase/configure /home/pavels/Projects/cmbase/config.lib /home/pavels/Projects/cmbase/Makefile.in /home/pavels/Projects/cmbase/Makefile.grf.in /home/pavels/Projects/cmbase/Makefile.lang.in /home/pavels/Projects/cmbase/Makefile.src.in /home/pavels/Projects/cmbase/Makefile.bundle.in /home/pavels/Projects/cmbase/Makefile.setting.in
|
||||
BINARY_NAME = openttd
|
||||
STRIP =
|
||||
STRIP = strip -s
|
||||
TTD = openttd
|
||||
TTDS = $(SRC_DIRS:%=%/$(TTD))
|
||||
OS = UNIX
|
||||
@@ -161,16 +159,16 @@ depend:
|
||||
done
|
||||
|
||||
run: all
|
||||
$(Q)cd /home/pavels/Downloads/openttd-1.10.0-beta1/bin && ./openttd $(OPENTTD_ARGS)
|
||||
$(Q)cd /home/pavels/Projects/cmbase/bin && ./openttd $(OPENTTD_ARGS)
|
||||
|
||||
run-gdb: all
|
||||
$(Q)cd /home/pavels/Downloads/openttd-1.10.0-beta1/bin && gdb --ex run --args ./openttd $(OPENTTD_ARGS)
|
||||
$(Q)cd /home/pavels/Projects/cmbase/bin && gdb --ex run --args ./openttd $(OPENTTD_ARGS)
|
||||
|
||||
run-prof: all
|
||||
$(Q)cd /home/pavels/Downloads/openttd-1.10.0-beta1/bin && ./openttd $(OPENTTD_ARGS) && gprof openttd | less
|
||||
$(Q)cd /home/pavels/Projects/cmbase/bin && ./openttd $(OPENTTD_ARGS) && gprof openttd | less
|
||||
|
||||
regression: all
|
||||
$(Q)cd /home/pavels/Downloads/openttd-1.10.0-beta1/bin && sh ai/regression/run.sh
|
||||
$(Q)cd /home/pavels/Projects/cmbase/bin && sh ai/regression/run.sh
|
||||
test: regression
|
||||
|
||||
%.o:
|
||||
|
||||
12
Makefile.am
12
Makefile.am
@@ -1,8 +1,8 @@
|
||||
# Auto-generated file -- DO NOT EDIT
|
||||
|
||||
DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/lang
|
||||
LANG_DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/lang
|
||||
DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/setting
|
||||
DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/extra_grf
|
||||
DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/release
|
||||
SRC_DIRS += /home/pavels/Downloads/openttd-1.10.0-beta1/objs/release
|
||||
DIRS += /home/pavels/Projects/cmbase/objs/lang
|
||||
LANG_DIRS += /home/pavels/Projects/cmbase/objs/lang
|
||||
DIRS += /home/pavels/Projects/cmbase/objs/setting
|
||||
DIRS += /home/pavels/Projects/cmbase/objs/extra_grf
|
||||
DIRS += /home/pavels/Projects/cmbase/objs/release
|
||||
SRC_DIRS += /home/pavels/Projects/cmbase/objs/release
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# $Id$
|
||||
|
||||
# This file is part of OpenTTD.
|
||||
# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
@@ -91,6 +91,7 @@ ISODATE := $(shell echo "$(VERSIONS)" | cut -f 2 -d' ')
|
||||
GITHASH := $(shell echo "$(VERSIONS)" | cut -f 4 -d' ')
|
||||
ISTAG := $(shell echo "$(VERSIONS)" | cut -f 5 -d' ')
|
||||
ISSTABLETAG := $(shell echo "$(VERSIONS)" | cut -f 6 -d' ')
|
||||
YEAR := $(shell echo "$(VERSIONS)" | cut -f 7 -d' ')
|
||||
|
||||
# Make sure we have something in VERSION and ISODATE
|
||||
ifeq ($(VERSION),)
|
||||
@@ -272,10 +273,10 @@ endif
|
||||
# Revision files
|
||||
|
||||
$(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
|
||||
$(Q)cat $(SRC_DIR)/rev.cpp.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g" > $(SRC_DIR)/rev.cpp
|
||||
$(Q)cat $(SRC_DIR)/rev.cpp.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g;s@!!YEAR!!@$(YEAR)@g" > $(SRC_DIR)/rev.cpp
|
||||
|
||||
$(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
|
||||
$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g" > $(SRC_DIR)/os/windows/ottdres.rc
|
||||
$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g;s@!!YEAR!!@$(YEAR)@g" > $(SRC_DIR)/os/windows/ottdres.rc
|
||||
|
||||
FORCE:
|
||||
|
||||
|
||||
@@ -39,8 +39,6 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
commit-checker:
|
||||
Tag: 'commit-checker'
|
||||
linux-amd64-clang-3.9:
|
||||
Tag: 'linux-amd64-clang-3.9'
|
||||
linux-amd64-gcc-6:
|
||||
@@ -60,7 +58,7 @@ jobs:
|
||||
- job: macos
|
||||
displayName: 'MacOS'
|
||||
pool:
|
||||
vmImage: 'macOS-10.13'
|
||||
vmImage: 'macOS-10.14'
|
||||
|
||||
variables:
|
||||
MACOSX_DEPLOYMENT_TARGET: 10.9
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
tag=$(git describe --tags 2>/dev/null)
|
||||
tag=$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@')
|
||||
|
||||
# If we are a tag, show the part of the changelog till (but excluding) the last stable
|
||||
if [ -n "$tag" ]; then
|
||||
@@ -12,5 +12,5 @@ fi
|
||||
|
||||
# In all other cases, show the git log of the last 7 days
|
||||
revdate=$(git log -1 --pretty=format:"%ci")
|
||||
last_week=$(date -u -d "$revdate -7days" +"%Y-%m-%d %H:%M")
|
||||
last_week=$(date -d "$revdate -7days" +"%Y-%m-%d %H:%M")
|
||||
git log --after="${last_week}" --pretty=fuller
|
||||
|
||||
@@ -65,6 +65,7 @@ output_files() {
|
||||
if [ ! -e ${FOLDER}/${filename}.md5sum ] || [ ! -e ${FOLDER}/${filename}.sha1sum ] || [ ! -e ${FOLDER}/${filename}.sha256sum ]; then
|
||||
echo "ERROR: missing checksum file for ${filename}" 1>&2
|
||||
error="y"
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ steps:
|
||||
- bash: |
|
||||
set -ex
|
||||
cd bin/baseset
|
||||
curl -L https://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip > opengfx-0.5.2-all.zip
|
||||
unzip opengfx-0.5.2-all.zip
|
||||
rm -f opengfx-0.5.2-all.zip
|
||||
curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip > opengfx-all.zip
|
||||
unzip opengfx-all.zip
|
||||
rm -f opengfx-all.zip
|
||||
displayName: 'Install OpenGFX'
|
||||
|
||||
@@ -119,6 +119,8 @@ jobs:
|
||||
Tag: 'linux-ubuntu-bionic-i386-gcc'
|
||||
linux-ubuntu-bionic-amd64-gcc:
|
||||
Tag: 'linux-ubuntu-bionic-amd64-gcc'
|
||||
linux-ubuntu-focal-amd64-gcc:
|
||||
Tag: 'linux-ubuntu-focal-amd64-gcc'
|
||||
linux-debian-stretch-i386-gcc:
|
||||
Tag: 'linux-debian-stretch-i386-gcc'
|
||||
linux-debian-stretch-amd64-gcc:
|
||||
@@ -141,7 +143,7 @@ jobs:
|
||||
- job: macos
|
||||
displayName: 'MacOS'
|
||||
pool:
|
||||
vmImage: 'macOS-10.13'
|
||||
vmImage: 'macOS-10.14'
|
||||
dependsOn: source
|
||||
|
||||
variables:
|
||||
|
||||
@@ -1690,6 +1690,9 @@ function Regression::Vehicle()
|
||||
print(" BuildVehicle(): " + AIVehicle.BuildVehicle(10008, 9));
|
||||
print(" BuildVehicle(): " + AIVehicle.BuildVehicle(10008, 27));
|
||||
print(" BuildVehicle(): " + AIVehicle.BuildVehicle(10008, 27));
|
||||
print(" IsValidVehicle(17): " + AIVehicle.IsValidVehicle(17));
|
||||
print(" IsValidVehicle(18): " + AIVehicle.IsValidVehicle(18));
|
||||
print(" IsValidVehicle(19): " + AIVehicle.IsValidVehicle(19)); // 19 is immediately joined to 18
|
||||
print(" MoveWagonChain(): " + AIVehicle.MoveWagonChain(18, 0, 17, 0));
|
||||
print(" GetNumWagons(): " + AIVehicle.GetNumWagons(17));
|
||||
print(" GetLength(): " + AIVehicle.GetLength(17));
|
||||
|
||||
@@ -9115,6 +9115,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
BuildVehicle(): 17
|
||||
BuildVehicle(): 18
|
||||
BuildVehicle(): 19
|
||||
IsValidVehicle(17): true
|
||||
IsValidVehicle(18): true
|
||||
IsValidVehicle(19): false
|
||||
MoveWagonChain(): true
|
||||
GetNumWagons(): 3
|
||||
GetLength(): 24
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents more or less nothingness
|
||||
;
|
||||
[metadata]
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents more or less nothingness
|
||||
;
|
||||
[metadata]
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original graphics as on the non-German Transport
|
||||
; Tycoon Deluxe DOS CD.
|
||||
;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original music as on the Transport
|
||||
; Tycoon Deluxe for DOS CD.
|
||||
;
|
||||
@@ -8,6 +6,7 @@ name = original_dos
|
||||
shortname = TTDD
|
||||
version = 1
|
||||
description = Original Transport Tycoon Deluxe DOS edition music.
|
||||
description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS-uitgawe musiek.
|
||||
description.be_BY = Набор музычнага афармленьня з гульні Transport Tycoon Deluxe для DOS.
|
||||
description.ca_ES = Música original del Transport Tycoon Deluxe pel DOS.
|
||||
description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro DOS).
|
||||
@@ -22,6 +21,7 @@ description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni muusika.
|
||||
description.fi_FI = Alkuperäinen Transport Tycoon Deluxen DOS-version musiikki.
|
||||
description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version DOS).
|
||||
description.gd_GB = Ceòl aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
|
||||
description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para DOS.
|
||||
description.he_IL = מנגינות Transport Tycoon Deluxe המקורי בגרסת DOS.
|
||||
description.hr_HR = Originalna glazba za Transport Tycoon Deluxe DOS izdanje.
|
||||
description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának zenéje.
|
||||
@@ -35,7 +35,7 @@ description.nb_NO = Original Transport Tycoon Deluxe DOS edition music.
|
||||
description.nl_NL = Originele muziek van Transport Tycoon Deluxe voor DOS.
|
||||
description.pl_PL = Oryginalna edycja utworów muzycznych dla Transport Tycoon Deluxe DOS.
|
||||
description.pt_BR = Música Original do Transport Tycoon Deluxe DOS.
|
||||
description.pt_PT = Música original da edição DOS do Transport Tycoon Deluxe.
|
||||
description.pt_PT = Música original da edição DOS de Transport Tycoon Deluxe.
|
||||
description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru DOS.
|
||||
description.ru_RU = Набор музыкального оформления из игры Transport Tycoon Deluxe для DOS.
|
||||
description.sl_SI = Originalna glasba Transport Tycoon Deluxe DOS različice
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original sounds as on the Transport
|
||||
; Tycoon Deluxe DOS CD.
|
||||
;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original graphics as on the German Transport
|
||||
; Tycoon Deluxe DOS CD. It contains one broken sprite.
|
||||
;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original music as on the Transport
|
||||
; Tycoon (with World Editor) for DOS CD.
|
||||
;
|
||||
@@ -8,6 +6,7 @@ name = original_tto
|
||||
shortname = TTOD
|
||||
version = 1
|
||||
description = Original Transport Tycoon (Original/World Editor) DOS edition music.
|
||||
description.af_ZA = Oorspronklike Transport Tycoon (Original/World Editor) musiek van die DOS-uitgawe.
|
||||
description.be_BY = Набор музычнага афармлення з гульні Transport Tycoon (Original/World Editor) для DOS.
|
||||
description.bg_BG = Оригинална Transport Tycoon (Original/World Editor) музика за DOS.
|
||||
description.ca_ES = Música original del Transport Tycoon Deluxe (original/editor d'escenaris) pel DOS.
|
||||
@@ -22,6 +21,7 @@ description.es_MX = Música original de Transport Tycoon versión World Editor p
|
||||
description.fi_FI = Alkuperäinen Transport Tycoonin (alkuperäinen / World Editor) DOS-version musiikki.
|
||||
description.fr_FR = Musiques originales de Transport Tycoon (version Originale/World Editor).
|
||||
description.gd_GB = Ceòl aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe (Original/World Editor).
|
||||
description.gl_ES = Temazos orixinais da edición DOS de Transport Tycoon.
|
||||
description.he_IL = מנגינות Transport Tycoon Deluxe (Original/World Editor) המקורי בגרסת DOS.
|
||||
description.hr_HR = Originalna glazba za Transport Tycoon (original/editor svijeta) DOS izdanje.
|
||||
description.hu_HU = Az eredeti Transport Tycoon (az első változat és a World Editor) DOS verziójának zenéje.
|
||||
@@ -34,7 +34,7 @@ description.nb_NO = Original Transport Tycoon (Original/World Editor) DOS editio
|
||||
description.nl_NL = Originele muziek van Transport Tycoon (Original/World Editor) voor DOS.
|
||||
description.pl_PL = Oryginalna edycja utworów muzycznych dla Transport Tycoon DOS.
|
||||
description.pt_BR = Música Original do Transport Tycoon DOS
|
||||
description.pt_PT = Música original da edição DOS do Transport Tycoon (Original/Editor de Mundo)
|
||||
description.pt_PT = Música original da edição DOS de Transport Tycoon (Original/Editor de Mundo)
|
||||
description.ru_RU = Набор музыкального оформления из игры Transport Tycoon Deluxe для DOS.
|
||||
description.sr_RS = Originalna muzika TTD (Original / World Editor) DOS izdanja.
|
||||
description.sv_SE = Originalmusiken från DOS-utgåvan av Transport Tycoon (Original/World Editor).
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original graphics as on the Transport
|
||||
; Tycoon Deluxe for Windows CD.
|
||||
;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original music as on the Transport
|
||||
; Tycoon Deluxe for Windows CD.
|
||||
;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
; $Id$
|
||||
;
|
||||
; This represents the original sounds as on the Transport
|
||||
; Tycoon Deluxe for Windows CD.
|
||||
;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
bin/openttd
BIN
bin/openttd
Binary file not shown.
@@ -1,3 +1,102 @@
|
||||
1.10.2 (2020-06-01)
|
||||
------------------------------------------------------------------------
|
||||
Add: Ubuntu 20.04 packages (#8127)
|
||||
Fix: [OSX] Possible crash on failure to set colourspace (#8181)
|
||||
Fix #8166: Prevent crash from a NewGRF with an invalid RoadType (#8180)
|
||||
Fix #8024: Make Online Content GUI more responsive while loading (#8179)
|
||||
Fix #7970: Disable event loop when generating crash dump (#8176)
|
||||
Fix: [Build] Compatibility with modern Visual Studio (#8170)
|
||||
Fix: Trees would disappear completely after a few years if tree spread was disabled (#8160)
|
||||
Fix #8155: Roadtype speed limit in scenario editor toolbar dropdown was doubled (#8156)
|
||||
Fix: Desync after house replacement (#8151)
|
||||
Fix #8137: New clients can't join (desync) after funding an industry (#8140)
|
||||
Fix #8132: Corrupted savegame with station with multiple owners caused a crash (#8134, #8142)
|
||||
Fix: Stop gamelog when recovering from a savegame load error (#8133)
|
||||
Fix: Exceptionally unlikely issue when reading MIDI files (#8125)
|
||||
Fix #8119: Docking areas were not properly updated when clearing, causing desyncs (#8124, #8130)
|
||||
Fix #8117: Memory leak for incoming admin port packets (#8122)
|
||||
Fix: Non-roadbridges potentially had roadtype information set (#8111)
|
||||
Fix #8108: Possible crash on loading TTD savegames with phantom oil rigs (#8109, #8110)
|
||||
Fix #8093: Build & refit test run changed game state and could cause desyncs (#8103)
|
||||
Fix: [Script] AreWaterTilesConnected did not handle aqueducts properly (#8074)
|
||||
|
||||
|
||||
1.10.1 (2020-04-13)
|
||||
------------------------------------------------------------------------
|
||||
Fix #8081: Crash when placing a ship depot next to a dock (#8082)
|
||||
Fix: [GS] A Goal's QuestionID was getting truncated (#8072)
|
||||
Fix #8064: Refit capacity could be displayed incorrectly in extreme edgecases (#8065)
|
||||
Fix #8060: Restore admin network API compatibility (#8061)
|
||||
Fix #8055: Crash when roadtype availability changes with the road construction toolbar open (#8058)
|
||||
|
||||
|
||||
1.10.0 (2020-04-01)
|
||||
------------------------------------------------------------------------
|
||||
Change: Open company window when clicking on a company goal (#8033)
|
||||
Change: [SDL2] Support pasting from clipboard on Linux (#8004)
|
||||
Fix: [Script] Random deviation upper bound range should be inclusive (#8052)
|
||||
Fix #8043: Incorrect handling of global road/tram hotkeys caused a crash (#8044)
|
||||
Fix #8039: [Script] SetOrderFlags and GetOrderDestination didn't work for oil rigs (#8040)
|
||||
Fix: [Script] CanBuildConnectedRoadPartsHere neighbours tiles were incorrect if you started a new game with a different world size (#8036)
|
||||
Fix: Ignore clicks on non-applicable global goals (#8035)
|
||||
Fix #7613: Limit News Window to 1024 messages to keep it usable and avoid overflowing scrollbars (#8026)
|
||||
Fix #7644: [OSX] Hopefully improve performance by manually set colorspace to sRGB (#8023)
|
||||
Fix #8020: Add missing docking tiles around industry neutral stations (#8021)
|
||||
Fix: GUI tramway icon only contained a single set of tram tracks (#8015)
|
||||
Fix: Station with multiple docks had the wrong tile area (#8014)
|
||||
Fix #8011: Crash when loading TTD scenario containing a dock (#8012)
|
||||
Fix #7998: Crash when scripts tried to access companies with invalid IDs (#8010)
|
||||
Fix: Crash when attempting to draw a string containing nonprintable characters (#8005)
|
||||
Fix #6399: Directory ~/.local/share not created if it didn't already exist (#8003)
|
||||
Fix #7958: Custom catenary missing on road bridges (#7991)
|
||||
Fix #7944: Demolishing locks built on rivers didn't always restore the river (#7946)
|
||||
|
||||
|
||||
1.10.0-RC1 (2020-02-09)
|
||||
------------------------------------------------------------------------
|
||||
Feature: Allow server to supply a reason to kicked/banned clients (#7859)
|
||||
Feature: [NewGRF] Station variable 6A, querying GRFID of nearby station tiles (#7956)
|
||||
Feature: Improved logic of sharing industry production between 3 or more stations (#7922)
|
||||
Feature: Highlight the item under mouse cursor in file browser (#7900)
|
||||
Feature: [GS] Methods to change town rating of companies (#7898)
|
||||
Feature: [NewGRF] Callback profiling command (#7868)
|
||||
Feature: Add a setting to show the name of the NewGRF of a vehicle in the build window (#7852)
|
||||
Feature: Ability to filter industry directory window by cargo (#7843)
|
||||
Feature: Minimap screenshot type (#7817)
|
||||
Feature: [GS] Methods to control engine availability of a specific company (#7791)
|
||||
Feature: Configurable game ending year (#7747)
|
||||
Feature: Separate window for taking screenshots (#7550)
|
||||
Change: Move autorenew setting to basic category (#7984)
|
||||
Change: Improved algorithm for transfer feeder payments (#7935)
|
||||
Change: Show volume sliders with wedges instead of boxy slider (#7902)
|
||||
Change: Auto-restart loads the original resources (e.g. save or scenario) again (#7688)
|
||||
Change: Improve readability of integer lists saved to config files (#7396)
|
||||
Fix #7976: Crash when attempting to kick the host via rcon (#7985)
|
||||
Fix #7592: Road vehicles no longer balanced between multiple road stop stations (#7979)
|
||||
Fix: Station rating effects affecting too large area (#7977)
|
||||
Fix #7974: Crash when Ctrl+click to show a collapsed vehicle group (#7975)
|
||||
Fix #7969: Crash when executing a recursive console alias (#7973)
|
||||
Fix #6566: Very long loading of the maximum "zoom out" level at high resolutions (#7968)
|
||||
Fix #7952: Crash when switching input languages (#7953)
|
||||
Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver (#7934)
|
||||
Fix #7925: Corrupt savegames could lead to corruption of the titlegame (#7932)
|
||||
Fix: [Fluidsynth] Music notes from previous song were not properly reset (#7930)
|
||||
Fix: Invalid string usage within music window (#7928)
|
||||
Fix: Non-deterministic name sorting in industry directory window (#7915)
|
||||
Fix #7899: Various issues with town list window sorting (#7906, #7916)
|
||||
Fix #7587: Fix possible crashes when loading old save games with invalid waypoint positions (#7894)
|
||||
Fix: Avoid a crash by properly resetting timetable duration when loading old savegames (#7894)
|
||||
Fix: Possible crash when post road-works cleanup removes all road pieces (#7903)
|
||||
Fix #7891: Fix crash when loading save from 1.7.2 (#7892)
|
||||
Fix #7887: Missing sound effects for some main toolbar buttons (#7888)
|
||||
Fix #6667: Avoid confusion by also recalculating bridge costs for 'spectated' AI companies (#7884)
|
||||
Fix: Allow old NewGRF industries to hide in/out cargo slots (#7882)
|
||||
Fix: [Windows] Fix bootstrap GUI with Uniscribe but no Freetype (#7878)
|
||||
Fix: Missing keycodes for hotkeys.cfg (#7850)
|
||||
Fix #7625: Ensure road infrastructure cost is correctly updated when upgrading your own roads (#7628)
|
||||
Fix #7088: Avoid crash by closing AI/GS textfile windows when changing their in-game slot (#7094)
|
||||
|
||||
|
||||
1.10.0-beta2 (2019-12-25)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: [Script] More error mappings (#7857)
|
||||
|
||||
@@ -1 +1 @@
|
||||
./configure --ignore-extra-parameters --build="" --host="" --cc-build="gcc" --cc-host="gcc" --cxx-build="g++" --cxx-host="g++" --windres="" --strip="" --lipo="" --awk="awk" --pkg-config="pkg-config" --os="UNIX" --cpu-type="64" --config-log="config.log" --prefix-dir="/usr/local" --binary-dir="games" --data-dir="share/games/openttd" --doc-dir="share/doc/openttd" --icon-dir="share/pixmaps" --icon-theme-dir="share/icons/hicolor" --man-dir="share/man/man6" --menu-dir="share/applications" --personal-dir=".openttd" --shared-dir="" --install-dir="/" --menu-group="Game;" --menu-name="OpenTTD" --binary-name="openttd" --enable-debug="0" --enable-desync-debug="0" --enable-profiling="0" --enable-lto="0" --enable-dedicated="0" --enable-static="0" --enable-translator="0" --enable-unicode="0" --enable-console="1" --enable-assert="1" --enable-strip="0" --enable-universal="0" --enable-osx-g5="0" --enable-cocoa-quartz="1" --enable-cocoa-quickdraw="1" --with-osx-sysroot="0" --with-application-bundle="0" --with-allegro="1" --with-sdl="1" --with-cocoa="0" --with-zlib="1" --with-lzma="1" --with-lzo2="1" --with-xdg-basedir="1" --with-png="1" --enable-builtin-depend="1" --with-makedepend="0" --with-direct-music="0" --with-xaudio2="0" --with-sort="1" --with-iconv="0" --with-midi="" --with-midi-arg="" --with-fluidsynth="0" --with-freetype="1" --with-fontconfig="1" --with-icu-layout="1" --with-icu-sort="1" --static-icu="0" --with-uniscribe="0" --with-threads="1" --with-distcc="0" --with-ccache="0" --with-grfcodec="1" --with-nforenum="1" --with-sse="1" --CC="" --CXX="" --CFLAGS="" --CXXFLAGS="" --LDFLAGS="" --CFLAGS-BUILD="" --CXXFLAGS-BUILD="" --LDFLAGS-BUILD="" --PKG-CONFIG-PATH="" --PKG-CONFIG-LIBDIR=""
|
||||
./configure --ignore-extra-parameters --build="" --host="" --cc-build="gcc" --cc-host="gcc" --cxx-build="g++" --cxx-host="g++" --windres="" --strip="strip" --lipo="" --awk="awk" --pkg-config="pkg-config" --os="UNIX" --cpu-type="64" --config-log="config.log" --prefix-dir="/usr/local" --binary-dir="games" --data-dir="share/games/openttd" --doc-dir="share/doc/openttd" --icon-dir="share/pixmaps" --icon-theme-dir="share/icons/hicolor" --man-dir="share/man/man6" --menu-dir="share/applications" --personal-dir=".openttd" --shared-dir="" --install-dir="/" --menu-group="Game;" --menu-name="OpenTTD" --binary-name="openttd" --enable-debug="0" --enable-desync-debug="0" --enable-profiling="0" --enable-lto="0" --enable-dedicated="0" --enable-static="0" --enable-translator="0" --enable-unicode="0" --enable-console="1" --enable-assert="0" --enable-strip="1" --enable-universal="0" --enable-osx-g5="0" --enable-cocoa-quartz="1" --enable-cocoa-quickdraw="1" --with-osx-sysroot="0" --with-application-bundle="0" --with-allegro="1" --with-sdl="1" --with-cocoa="0" --with-zlib="1" --with-lzma="1" --with-lzo2="1" --with-xdg-basedir="1" --with-png="1" --enable-builtin-depend="1" --with-makedepend="0" --with-direct-music="0" --with-xaudio2="0" --with-sort="1" --with-iconv="0" --with-midi="" --with-midi-arg="" --with-fluidsynth="0" --with-freetype="1" --with-fontconfig="1" --with-icu-layout="1" --with-icu-sort="1" --static-icu="0" --with-uniscribe="0" --with-threads="1" --with-distcc="0" --with-ccache="0" --with-grfcodec="1" --with-nforenum="1" --with-sse="1" --CC="" --CXX="" --CFLAGS="" --CXXFLAGS="" --LDFLAGS="" --CFLAGS-BUILD="" --CXXFLAGS-BUILD="" --LDFLAGS-BUILD="" --PKG-CONFIG-PATH="" --PKG-CONFIG-LIBDIR=""
|
||||
|
||||
@@ -1 +1 @@
|
||||
/home/pavels/Downloads/openttd-1.10.0-beta1
|
||||
/home/pavels/Projects/cmbase
|
||||
|
||||
@@ -70,6 +70,7 @@ rail.cpp
|
||||
rev.cpp
|
||||
road.cpp
|
||||
roadstop.cpp
|
||||
screenshot_gui.cpp
|
||||
screenshot.cpp
|
||||
settings.cpp
|
||||
signal.cpp
|
||||
@@ -269,6 +270,7 @@ newgrf_house.h
|
||||
newgrf_industries.h
|
||||
newgrf_industrytiles.h
|
||||
newgrf_object.h
|
||||
newgrf_profiling.h
|
||||
newgrf_properties.h
|
||||
newgrf_railtype.h
|
||||
newgrf_roadtype.h
|
||||
@@ -312,6 +314,7 @@ roadstop_base.h
|
||||
roadveh.h
|
||||
safeguards.h
|
||||
screenshot.h
|
||||
screenshot_gui.h
|
||||
sound/sdl_s.h
|
||||
video/sdl_v.h
|
||||
video/sdl2_v.h
|
||||
@@ -555,6 +558,7 @@ widgets/order_widget.h
|
||||
widgets/osk_widget.h
|
||||
widgets/rail_widget.h
|
||||
widgets/road_widget.h
|
||||
widgets/screenshot_widget.h
|
||||
widgets/settings_widget.h
|
||||
widgets/sign_widget.h
|
||||
widgets/smallmap_widget.h
|
||||
@@ -983,6 +987,7 @@ newgrf_house.cpp
|
||||
newgrf_industries.cpp
|
||||
newgrf_industrytiles.cpp
|
||||
newgrf_object.cpp
|
||||
newgrf_profiling.cpp
|
||||
newgrf_railtype.cpp
|
||||
newgrf_roadtype.cpp
|
||||
newgrf_sound.cpp
|
||||
|
||||
18
config.lib
18
config.lib
@@ -54,8 +54,8 @@ set_default() {
|
||||
enable_translator="0"
|
||||
enable_unicode="1"
|
||||
enable_console="1";
|
||||
enable_assert="1"
|
||||
enable_strip="0"
|
||||
enable_assert="0"
|
||||
enable_strip="1"
|
||||
enable_universal="0"
|
||||
enable_osx_g5="0"
|
||||
enable_cocoa_quartz="1"
|
||||
@@ -2405,16 +2405,17 @@ detect_sdl() {
|
||||
log 1 "checking SDL... disabled"
|
||||
|
||||
sdl_config=""
|
||||
sdl2_config=""
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then
|
||||
if [ "$with_sdl" != "1" ] && [ "$with_cocoa" = "2" ]; then
|
||||
log 1 "configure: error: it is impossible to compile both SDL and COCOA"
|
||||
log 1 "configure: error: please deselect one of them and try again"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then
|
||||
if [ "$with_sdl" != "1" ] && [ "$enable_dedicated" != "0" ]; then
|
||||
log 1 "configure: error: it is impossible to compile a dedicated with SDL"
|
||||
log 1 "configure: error: please deselect one of them and try again"
|
||||
exit 1
|
||||
@@ -2424,6 +2425,7 @@ detect_sdl() {
|
||||
log 1 "checking SDL... dedicated server, skipping"
|
||||
|
||||
sdl_config=""
|
||||
sdl2_config=""
|
||||
return 0
|
||||
fi
|
||||
|
||||
@@ -2443,11 +2445,17 @@ detect_sdl() {
|
||||
|
||||
if [ $with_sdl = "sdl1" ]; then
|
||||
detect_pkg_config "2" "sdl" "sdl_config" "1.2"
|
||||
elif [ $with_sdl = "sdl2" ] || [ -x `which sdl2-config` ]; then
|
||||
elif [ $with_sdl = "sdl2" ]; then
|
||||
detect_pkg_config "2" "sdl2" "sdl2_config" "2.0"
|
||||
else
|
||||
sdl2_config=""
|
||||
if [ -x "`which sdl2-config`" ]; then
|
||||
detect_pkg_config "$with_sdl" "sdl2" "sdl2_config" "2.0"
|
||||
fi
|
||||
if [ -z "$sdl2_config" ]; then
|
||||
detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
detect_osx_sdk() {
|
||||
|
||||
48
config.log
48
config.log
@@ -30,7 +30,15 @@ executing g++ -dumpmachine
|
||||
returned x86_64-linux-gnu
|
||||
exit code 0
|
||||
checking host c++... g++
|
||||
checking strip... disabled
|
||||
checking host strip... CC/CXX not set (skipping)
|
||||
executing strip -V
|
||||
returned GNU strip (GNU Binutils for Ubuntu) 2.30
|
||||
Copyright (C) 2018 Free Software Foundation, Inc.
|
||||
This program is free software; you may redistribute it under the terms of
|
||||
the GNU General Public License version 3 or (at your option) any later version.
|
||||
This program has absolutely no warranty.
|
||||
exit code 0
|
||||
checking host strip... strip
|
||||
checking builtin depend... yes
|
||||
checking makedepend... disabled
|
||||
executing g++ tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1
|
||||
@@ -49,12 +57,12 @@ using link time optimization... no
|
||||
checking OSX sysroot... not OSX, skipping
|
||||
detecting allegro
|
||||
executing pkg-config allegro --modversion
|
||||
returned
|
||||
exit code 1
|
||||
checking allegro... not found
|
||||
returned 4.4.2
|
||||
exit code 0
|
||||
checking allegro... found
|
||||
detecting sdl2
|
||||
executing pkg-config sdl2 --modversion
|
||||
returned 2.0.9
|
||||
returned 2.0.8
|
||||
exit code 0
|
||||
checking sdl2... found
|
||||
checking COCOA... not OSX, skipping
|
||||
@@ -63,7 +71,7 @@ checking dedicated... not selected
|
||||
checking console application... not Windows, skipping
|
||||
checking squirrel... found
|
||||
checking translator... no
|
||||
checking assert... enabled
|
||||
checking assert... disabled
|
||||
detecting zlib
|
||||
executing pkg-config zlib --modversion
|
||||
returned 1.2.11
|
||||
@@ -71,7 +79,7 @@ executing pkg-config zlib --modversion
|
||||
checking zlib... found
|
||||
detecting liblzma
|
||||
executing pkg-config liblzma --modversion
|
||||
returned 5.2.4
|
||||
returned 5.2.2
|
||||
exit code 0
|
||||
checking liblzma... found
|
||||
detecting lzo2
|
||||
@@ -85,27 +93,27 @@ executing pkg-config libxdg-basedir --modversion
|
||||
checking libxdg-basedir... not found
|
||||
detecting libpng
|
||||
executing pkg-config libpng --modversion
|
||||
returned 1.6.36
|
||||
returned 1.6.34
|
||||
exit code 0
|
||||
checking libpng... found
|
||||
detecting freetype2
|
||||
executing pkg-config freetype2 --modversion
|
||||
returned 22.1.16
|
||||
returned 21.0.15
|
||||
exit code 0
|
||||
checking freetype2... found
|
||||
detecting fontconfig
|
||||
executing pkg-config fontconfig --modversion
|
||||
returned 2.13.1
|
||||
returned 2.12.6
|
||||
exit code 0
|
||||
checking fontconfig... found
|
||||
detecting icu-lx
|
||||
executing pkg-config icu-lx --modversion
|
||||
returned
|
||||
exit code 1
|
||||
checking icu-lx... not found
|
||||
returned 60.2
|
||||
exit code 0
|
||||
checking icu-lx... found
|
||||
detecting icu-i18n
|
||||
executing pkg-config icu-i18n --modversion
|
||||
returned 63.1
|
||||
returned 60.2
|
||||
exit code 0
|
||||
checking icu-i18n... found
|
||||
detecting fluidsynth
|
||||
@@ -121,7 +129,7 @@ running echo <array> | sort
|
||||
result was valid
|
||||
checking sort... sort
|
||||
suppress language errors... no
|
||||
checking stripping... skipped
|
||||
checking stripping... strip -s
|
||||
checking distcc... no (only used when forced)
|
||||
checking ccache... no (only used when forced)
|
||||
executing grfcodec -v
|
||||
@@ -133,7 +141,7 @@ executing nforenum -v
|
||||
exit code 0
|
||||
checking nforenum... not found
|
||||
checking OSX application bundle... not OSX, skipping
|
||||
checking revision... source tarball
|
||||
checking revision... git detection
|
||||
checking iconv... not OSX, skipping
|
||||
personal home directory... .openttd
|
||||
shared data directory... none
|
||||
@@ -143,14 +151,14 @@ manual page directory... share/man/man6
|
||||
menu item directory... share/applications
|
||||
Running configure with following options:
|
||||
|
||||
./configure --ignore-extra-parameters --build="" --host="" --cc-build="gcc" --cc-host="gcc" --cxx-build="g++" --cxx-host="g++" --windres="" --strip="" --lipo="" --awk="awk" --pkg-config="pkg-config" --os="UNIX" --cpu-type="64" --config-log="config.log" --prefix-dir="/usr/local" --binary-dir="games" --data-dir="share/games/openttd" --doc-dir="share/doc/openttd" --icon-dir="share/pixmaps" --icon-theme-dir="share/icons/hicolor" --man-dir="share/man/man6" --menu-dir="share/applications" --personal-dir=".openttd" --shared-dir="" --install-dir="/" --menu-group="Game;" --menu-name="OpenTTD" --binary-name="openttd" --enable-debug="0" --enable-desync-debug="0" --enable-profiling="0" --enable-lto="0" --enable-dedicated="0" --enable-static="0" --enable-translator="0" --enable-unicode="0" --enable-console="1" --enable-assert="1" --enable-strip="0" --enable-universal="0" --enable-osx-g5="0" --enable-cocoa-quartz="1" --enable-cocoa-quickdraw="1" --with-osx-sysroot="0" --with-application-bundle="0" --with-allegro="1" --with-sdl="1" --with-cocoa="0" --with-zlib="1" --with-lzma="1" --with-lzo2="1" --with-xdg-basedir="1" --with-png="1" --enable-builtin-depend="1" --with-makedepend="0" --with-direct-music="0" --with-xaudio2="0" --with-sort="1" --with-iconv="0" --with-midi="" --with-midi-arg="" --with-fluidsynth="0" --with-freetype="1" --with-fontconfig="1" --with-icu-layout="1" --with-icu-sort="1" --static-icu="0" --with-uniscribe="0" --with-threads="1" --with-distcc="0" --with-ccache="0" --with-grfcodec="1" --with-nforenum="1" --with-sse="1" --CC="" --CXX="" --CFLAGS="" --CXXFLAGS="" --LDFLAGS="" --CFLAGS-BUILD="" --CXXFLAGS-BUILD="" --LDFLAGS-BUILD="" --PKG-CONFIG-PATH="" --PKG-CONFIG-LIBDIR=""
|
||||
./configure --ignore-extra-parameters --build="" --host="" --cc-build="gcc" --cc-host="gcc" --cxx-build="g++" --cxx-host="g++" --windres="" --strip="strip" --lipo="" --awk="awk" --pkg-config="pkg-config" --os="UNIX" --cpu-type="64" --config-log="config.log" --prefix-dir="/usr/local" --binary-dir="games" --data-dir="share/games/openttd" --doc-dir="share/doc/openttd" --icon-dir="share/pixmaps" --icon-theme-dir="share/icons/hicolor" --man-dir="share/man/man6" --menu-dir="share/applications" --personal-dir=".openttd" --shared-dir="" --install-dir="/" --menu-group="Game;" --menu-name="OpenTTD" --binary-name="openttd" --enable-debug="0" --enable-desync-debug="0" --enable-profiling="0" --enable-lto="0" --enable-dedicated="0" --enable-static="0" --enable-translator="0" --enable-unicode="0" --enable-console="1" --enable-assert="0" --enable-strip="1" --enable-universal="0" --enable-osx-g5="0" --enable-cocoa-quartz="1" --enable-cocoa-quickdraw="1" --with-osx-sysroot="0" --with-application-bundle="0" --with-allegro="1" --with-sdl="1" --with-cocoa="0" --with-zlib="1" --with-lzma="1" --with-lzo2="1" --with-xdg-basedir="1" --with-png="1" --enable-builtin-depend="1" --with-makedepend="0" --with-direct-music="0" --with-xaudio2="0" --with-sort="1" --with-iconv="0" --with-midi="" --with-midi-arg="" --with-fluidsynth="0" --with-freetype="1" --with-fontconfig="1" --with-icu-layout="1" --with-icu-sort="1" --static-icu="0" --with-uniscribe="0" --with-threads="1" --with-distcc="0" --with-ccache="0" --with-grfcodec="1" --with-nforenum="1" --with-sse="1" --CC="" --CXX="" --CFLAGS="" --CXXFLAGS="" --LDFLAGS="" --CFLAGS-BUILD="" --CXXFLAGS-BUILD="" --LDFLAGS-BUILD="" --PKG-CONFIG-PATH="" --PKG-CONFIG-LIBDIR=""
|
||||
|
||||
using CFLAGS_BUILD... -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -O1
|
||||
using CFLAGS_BUILD... -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -O1 -DNDEBUG
|
||||
using CXXFLAGS_BUILD... -flifetime-dse=1 -std=c++11
|
||||
using LDFLAGS_BUILD... -rdynamic
|
||||
using CFLAGS... -O2 -fomit-frame-pointer -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -DWITH_SSE -DWITH_SDL2 -D_REENTRANT -I/usr/include/SDL2 -DWITH_ZLIB -DWITH_LIBLZMA -DWITH_LZO -D_SQ64 -I/home/pavels/Downloads/openttd-1.10.0-beta1/src/3rdparty/squirrel/include -DWITH_PNG -I/usr/include/libpng16 -DWITH_FONTCONFIG -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_FREETYPE -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_ICU_I18N -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\".openttd\" -DGLOBAL_DATA_DIR=\"/usr/local/share/games/openttd\"
|
||||
using CFLAGS... -O2 -fomit-frame-pointer -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -DWITH_SSE -DWITH_ALLEGRO -DWITH_SDL2 -D_REENTRANT -I/usr/include/SDL2 -DWITH_ZLIB -DWITH_LIBLZMA -DWITH_LZO -D_SQ64 -I/home/pavels/Projects/cmbase/src/3rdparty/squirrel/include -DWITH_PNG -I/usr/include/libpng16 -DWITH_FONTCONFIG -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_FREETYPE -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_ICU_LX -I/usr/include/icu-le-hb -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -DWITH_ICU_I18N -DNDEBUG -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\".openttd\" -DGLOBAL_DATA_DIR=\"/usr/local/share/games/openttd\"
|
||||
using CXXFLAGS... -flifetime-dse=1 -std=c++11
|
||||
using LDFLAGS... -lpthread -lc -lSDL2 -lz -llzma -llzo2 -lpng16 -lz -lfontconfig -lfreetype -lfreetype -licui18n -licuuc -licudata -rdynamic
|
||||
using LDFLAGS... -lpthread -lc -lalleg -lSDL2 -lz -llzma -llzo2 -lpng16 -lz -lfontconfig -lfreetype -lfreetype -liculx -licu-le-hb -licuuc -licudata -licui18n -licuuc -licudata -rdynamic
|
||||
Generating Makefile...
|
||||
Generating menu item...
|
||||
Generating lang/Makefile...
|
||||
|
||||
@@ -99,3 +99,43 @@ The following is an explanation of the different statistics:
|
||||
If the frame rate window is shaded, the title bar will instead show just the
|
||||
current simulation rate and the game speed factor.
|
||||
|
||||
## 3.0) NewGRF callback profiling
|
||||
|
||||
NewGRF developers can profile callback chains via the `newgrf_profile`
|
||||
console command. The command controls a profiling mode where every sprite
|
||||
request is measured and logged, and written to a CSV file in the end.
|
||||
|
||||
The NewGRF developer tools need to be enabled for the command to function.
|
||||
|
||||
View the syntax for the command in-game with the console command
|
||||
`help newgrf_profile`.
|
||||
|
||||
Profiling only works during game or in the editor, it's not possible to
|
||||
profile across the main menu, world generation, or loading savegames.
|
||||
|
||||
The CSV files contain one line per sprite request during the profiling.
|
||||
They can get very large, especially on large games with many objects from
|
||||
the GRF. Start profiling short periods such as 3 or 7 days, and watch the
|
||||
file sizes.
|
||||
|
||||
The produced CSV file contains the following fields:
|
||||
|
||||
- *Tick* - Game tick counter, this may wrap to zero during recording.
|
||||
Mainly useful to distinguish events from separate ticks.
|
||||
- *Sprite* - Index of the root Action 2 sprite in the GRF file. This is
|
||||
the sprite group being resolved.
|
||||
- *Feature* - NewGRF feature number the sprite group is being resolved for.
|
||||
This will be 0xFF for AI purchase selection and ambient sound callbacks.
|
||||
- *Item* - The id of the item within the GRF. For cargotypes, railtypes,
|
||||
roadtypes, and tramtypes, this is the integer representation of the label.
|
||||
- *CallbackID* - The type of callback being resolved. ID 0 is regular graphics
|
||||
lookup. See the `newgrf_callbacks.h` file in the OpenTTD source code for the
|
||||
full list of callback IDs.
|
||||
- *Microseconds* - Total time spent to resolve the Action 2, in microseconds.
|
||||
- *Depth* - Number of recursive Action 2 lookups were made during resolution.
|
||||
Value zero means the sprite group resolved directly.
|
||||
- *Result* - Result of the callback resolution. For lookups that result in
|
||||
a sprite, this is the index of the base action 2 in the GRF file. For
|
||||
callbacks that give a numeric result, this is the callback result value.
|
||||
For lookups that result in an industry production or tilelayout, this
|
||||
is the sprite index of the action 2 defining the production/tilelayout.
|
||||
|
||||
@@ -67,6 +67,7 @@ if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
|
||||
HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
|
||||
SHORTHASH=`echo ${HASH} | cut -c1-10`
|
||||
ISODATE=`LC_ALL=C git show -s --pretty='format:%ci' HEAD | "$AWK" '{ gsub("-", "", $1); print $1 }'`
|
||||
YEAR=`echo ${ISODATE} | cut -c1-4`
|
||||
BRANCH="`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@'`"
|
||||
TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`"
|
||||
|
||||
@@ -103,10 +104,11 @@ else
|
||||
SHORTHASH=""
|
||||
BRANCH=""
|
||||
ISODATE=""
|
||||
YEAR=""
|
||||
TAG=""
|
||||
VERSION=""
|
||||
ISTAG="0"
|
||||
ISSTABLETAG="0"
|
||||
fi
|
||||
|
||||
echo "$VERSION $ISODATE $MODIFIED $HASH $ISTAG $ISSTABLETAG"
|
||||
echo "$VERSION $ISODATE $MODIFIED $HASH $ISTAG $ISSTABLETAG $YEAR"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
OpenTTD's known bugs
|
||||
Last updated: 2019-12-25
|
||||
Release version: 1.10.0-beta2
|
||||
Last updated: 2020-06-01
|
||||
Release version: 1.10.2
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -63,10 +63,14 @@ Sub Lookup(ini_key, str_id, outfile)
|
||||
For Each file In folder.Files
|
||||
If UCase(FSO.GetExtensionName(file.Name)) = "TXT" Then
|
||||
Dim f
|
||||
Set f = FSO.OpenTextFile(file.Path)
|
||||
Set f = CreateObject("ADODB.Stream")
|
||||
f.Charset = "utf-8"
|
||||
f.LineSeparator = 10 ' Assume lines end with \n even for \r\n files
|
||||
f.Open
|
||||
f.LoadFromFile(file.Path)
|
||||
|
||||
Do Until f.atEndOfStream
|
||||
line = f.ReadLine()
|
||||
Do Until f.EOS
|
||||
line = Replace(f.ReadText(-2), Chr(13), "") ' Read a line and remove any \r
|
||||
|
||||
If InStr(1, line, "##isocode ") = 1 Then
|
||||
p = Split(line)
|
||||
@@ -80,8 +84,9 @@ Sub Lookup(ini_key, str_id, outfile)
|
||||
End If
|
||||
i = i + 1
|
||||
End If
|
||||
|
||||
Loop
|
||||
|
||||
f.Close
|
||||
End If
|
||||
Next
|
||||
|
||||
@@ -89,7 +94,7 @@ Sub Lookup(ini_key, str_id, outfile)
|
||||
ISort output
|
||||
|
||||
For Each line In output
|
||||
outfile.Write line & vbCrLf
|
||||
outfile.WriteText line, 1
|
||||
Next
|
||||
|
||||
End Sub
|
||||
@@ -100,7 +105,9 @@ Dim infile
|
||||
Set infile = FSO.OpenTextFile(inputfile)
|
||||
|
||||
Dim outfile
|
||||
Set outfile = FSO.CreateTextFile(outputfile, True)
|
||||
Set outfile = CreateObject("ADODB.Stream")
|
||||
outfile.Charset = "utf-8"
|
||||
outfile.Open
|
||||
|
||||
Do Until infile.atEndOfStream
|
||||
|
||||
@@ -109,15 +116,30 @@ Do Until infile.atEndOfStream
|
||||
If InStr(1, line, "ORIG_EXTRA.GRF ") = 1 Then
|
||||
p = Split(line, "=")
|
||||
If Trim(p(1)) = "" Then
|
||||
outfile.Write("ORIG_EXTRA.GRF = " & GetExtraGrfHash() & vbCrLf)
|
||||
outfile.WriteText "ORIG_EXTRA.GRF = " & GetExtraGrfHash(), 1
|
||||
Else
|
||||
outfile.Write(line & vbCrLf)
|
||||
outfile.WriteText line, 1
|
||||
End If
|
||||
ElseIf InStr(1, line, "!! ") = 1 Then
|
||||
p = Split(line)
|
||||
Lookup p(1), p(2), outfile
|
||||
Else
|
||||
outfile.Write(line & vbCrLf)
|
||||
outfile.WriteText line, 1
|
||||
End If
|
||||
|
||||
Loop
|
||||
|
||||
' UTF-8 Text ADO Stream includes BOM, so we need to remove it
|
||||
Dim outfile_noBOM
|
||||
Set outfile_noBOM = CreateObject("ADODB.Stream")
|
||||
outfile_noBOM.Type = 1
|
||||
outfile_noBOM.Open
|
||||
|
||||
' Copy Text stream to Binary stream, skiping the BOM
|
||||
outfile.Position = 3
|
||||
outfile.CopyTo outfile_noBOM
|
||||
outfile.Close
|
||||
|
||||
' Write the Binary stream
|
||||
outfile_noBOM.SaveToFile outputfile, 2
|
||||
outfile_noBOM.Close
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1017 B After Width: | Height: | Size: 2.2 KiB |
@@ -1,4 +1,3 @@
|
||||
# $Id$
|
||||
# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
# Auto-generated file from 'Makefile.grf.in' -- DO NOT EDIT
|
||||
# $Id$
|
||||
|
||||
# This file is part of OpenTTD.
|
||||
# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
@@ -16,12 +14,12 @@
|
||||
#
|
||||
|
||||
|
||||
ROOT_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1
|
||||
ROOT_DIR = /home/pavels/Projects/cmbase
|
||||
GRF_DIR = $(ROOT_DIR)/media/extra_grf
|
||||
BASESET_DIR = $(ROOT_DIR)/media/baseset
|
||||
LANG_DIR = $(ROOT_DIR)/src/lang
|
||||
BIN_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/bin/baseset
|
||||
OBJS_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/objs/extra_grf
|
||||
BIN_DIR = /home/pavels/Projects/cmbase/bin/baseset
|
||||
OBJS_DIR = /home/pavels/Projects/cmbase/objs/extra_grf
|
||||
OS = UNIX
|
||||
STAGE = [BASESET]
|
||||
|
||||
|
||||
210656
objs/extra_grf/langfiles.tmp
210656
objs/extra_grf/langfiles.tmp
File diff suppressed because it is too large
Load Diff
@@ -1,25 +1,23 @@
|
||||
# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT
|
||||
# $Id$
|
||||
|
||||
# This file is part of OpenTTD.
|
||||
# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
STRGEN = strgen
|
||||
SRC_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/src
|
||||
LANG_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/src/lang
|
||||
BIN_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/bin
|
||||
SRC_DIR = /home/pavels/Projects/cmbase/src
|
||||
LANG_DIR = /home/pavels/Projects/cmbase/src/lang
|
||||
BIN_DIR = /home/pavels/Projects/cmbase/bin
|
||||
LANGS_SRC = $(shell ls $(LANG_DIR)/*.txt)
|
||||
LANGS = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
|
||||
CXX_BUILD = g++
|
||||
CFLAGS_BUILD = -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -O1
|
||||
CFLAGS_BUILD = -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -Wno-free-nonheap-object -rdynamic -DUNIX -D_FORTIFY_SOURCE=2 -O1 -DNDEBUG
|
||||
CXXFLAGS_BUILD= -flifetime-dse=1 -std=c++11
|
||||
LDFLAGS_BUILD = -rdynamic
|
||||
STRGEN_FLAGS =
|
||||
STAGE = [LANG]
|
||||
LANG_SUPPRESS =
|
||||
LANG_OBJS_DIR = /home/pavels/Downloads/openttd-1.10.0-beta1/objs/lang
|
||||
LANG_OBJS_DIR = /home/pavels/Projects/cmbase/objs/lang
|
||||
|
||||
ifeq ($(LANG_SUPPRESS), yes)
|
||||
LANG_ERRORS = >/dev/null 2>&1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user