Merge branch 'save_ext' into order_occupancy-sx
This commit is contained in:
Jonathan G Rennison
337
config.lib
337
config.lib
@@ -85,7 +85,8 @@ set_default() {
|
|||||||
with_libtimidity="1"
|
with_libtimidity="1"
|
||||||
with_freetype="1"
|
with_freetype="1"
|
||||||
with_fontconfig="1"
|
with_fontconfig="1"
|
||||||
with_icu="1"
|
with_icu_layout="1"
|
||||||
|
with_icu_sort="1"
|
||||||
static_icu="0"
|
static_icu="0"
|
||||||
with_psp_config="1"
|
with_psp_config="1"
|
||||||
with_threads="1"
|
with_threads="1"
|
||||||
@@ -161,7 +162,8 @@ set_default() {
|
|||||||
with_libtimidity
|
with_libtimidity
|
||||||
with_freetype
|
with_freetype
|
||||||
with_fontconfig
|
with_fontconfig
|
||||||
with_icu
|
with_icu_layout
|
||||||
|
with_icu_sort
|
||||||
static_icu
|
static_icu
|
||||||
with_psp_config
|
with_psp_config
|
||||||
with_threads
|
with_threads
|
||||||
@@ -387,12 +389,18 @@ detect_params() {
|
|||||||
--without-libfontconfig) with_fontconfig="0";;
|
--without-libfontconfig) with_fontconfig="0";;
|
||||||
--with-libfontconfig=*) with_fontconfig="$optarg";;
|
--with-libfontconfig=*) with_fontconfig="$optarg";;
|
||||||
|
|
||||||
--with-icu) with_icu="2";;
|
--with-icu) with_icu_layout="2";with_icu_sort="2";;
|
||||||
--without-icu) with_icu="0";;
|
--without-icu) with_icu_layout="0";with_icu_sort="0";;
|
||||||
--with-icu=*) with_icu="$optarg";;
|
--with-icu=*) with_icu_layout="$optarg";with_icu_sort="$optarg";;
|
||||||
--with-libicu) with_icu="2";;
|
--with-libicu) with_icu_layout="2";with_icu_sort="2";;
|
||||||
--without-libicu) with_icu="0";;
|
--without-libicu) with_icu_layout="0";with_icu_sort="0";;
|
||||||
--with-libicu=*) with_icu="$optarg";;
|
--with-libicu=*) with_icu_layout="$optarg";with_icu_sort="$optarg";;
|
||||||
|
--with-icu-layout) with_icu_layout="2";;
|
||||||
|
--without-icu-layout) with_icu_layout="0";;
|
||||||
|
--with-icu-layout=*) with_icu_layout="$optarg";;
|
||||||
|
--with-icu-sort) with_icu_sort="2";;
|
||||||
|
--without-icu-sort) with_icu_sort="0";;
|
||||||
|
--with-icu-sort=*) with_icu_sort="$optarg";;
|
||||||
--static-icu) static_icu="1";;
|
--static-icu) static_icu="1";;
|
||||||
--static-icu=*) static_icu="$optarg";;
|
--static-icu=*) static_icu="$optarg";;
|
||||||
--static-libicu) static_icu="1";;
|
--static-libicu) static_icu="1";;
|
||||||
@@ -791,7 +799,7 @@ check_params() {
|
|||||||
pre_detect_with_zlib=$with_zlib
|
pre_detect_with_zlib=$with_zlib
|
||||||
detect_zlib
|
detect_zlib
|
||||||
|
|
||||||
if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
|
if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then
|
||||||
log 1 "WARNING: zlib was not detected or disabled"
|
log 1 "WARNING: zlib was not detected or disabled"
|
||||||
log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
|
log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
|
||||||
log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
|
log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
|
||||||
@@ -842,7 +850,8 @@ check_params() {
|
|||||||
detect_png
|
detect_png
|
||||||
detect_freetype
|
detect_freetype
|
||||||
detect_fontconfig
|
detect_fontconfig
|
||||||
detect_icu
|
detect_icu_layout
|
||||||
|
detect_icu_sort
|
||||||
detect_pspconfig
|
detect_pspconfig
|
||||||
detect_libtimidity
|
detect_libtimidity
|
||||||
|
|
||||||
@@ -1657,12 +1666,13 @@ make_cflags_and_ldflags() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$with_zlib" != "0" ]; then
|
if [ "$with_zlib" != "0" ]; then
|
||||||
if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
|
|
||||||
LIBS="$LIBS $zlib"
|
|
||||||
else
|
|
||||||
LIBS="$LIBS -lz"
|
|
||||||
fi
|
|
||||||
CFLAGS="$CFLAGS -DWITH_ZLIB"
|
CFLAGS="$CFLAGS -DWITH_ZLIB"
|
||||||
|
CFLAGS="$CFLAGS `$zlib_config --cflags | tr '\n\r' ' '`"
|
||||||
|
if [ "$enable_static" != "0" ]; then
|
||||||
|
LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' ' '`"
|
||||||
|
else
|
||||||
|
LIBS="$LIBS `$zlib_config --libs | tr '\n\r' ' '`"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$lzma_config" ]; then
|
if [ -n "$lzma_config" ]; then
|
||||||
@@ -1708,13 +1718,7 @@ make_cflags_and_ldflags() {
|
|||||||
CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' ' '`"
|
CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
if [ "$enable_static" != "0" ]; then
|
if [ "$enable_static" != "0" ]; then
|
||||||
if [ "$os" = "OSX" ]; then
|
LIBS="$LIBS `$png_config --libs --static | tr '\n\r' ' '`"
|
||||||
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
|
|
||||||
# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
|
|
||||||
LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng[0-9]*@@`"
|
|
||||||
else
|
|
||||||
LIBS="$LIBS `$png_config --libs --static | tr '\n\r' ' '`"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
LIBS="$LIBS `$png_config --libs | tr '\n\r' ' '`"
|
LIBS="$LIBS `$png_config --libs | tr '\n\r' ' '`"
|
||||||
fi
|
fi
|
||||||
@@ -1725,13 +1729,7 @@ make_cflags_and_ldflags() {
|
|||||||
CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`"
|
CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
if [ "$enable_static" != "0" ]; then
|
if [ "$enable_static" != "0" ]; then
|
||||||
if [ "$os" = "OSX" ]; then
|
LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`"
|
||||||
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
|
|
||||||
# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
|
|
||||||
LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s@-lfontconfig@@`"
|
|
||||||
else
|
|
||||||
LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`"
|
LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`"
|
||||||
fi
|
fi
|
||||||
@@ -1742,26 +1740,31 @@ make_cflags_and_ldflags() {
|
|||||||
CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`"
|
CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
if [ "$enable_static" != "0" ]; then
|
if [ "$enable_static" != "0" ]; then
|
||||||
if [ "$os" = "OSX" ]; then
|
LIBS="$LIBS `$freetype_config --libs --static | tr '\n\r' ' '`"
|
||||||
LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
|
|
||||||
else
|
|
||||||
# Is it possible to do static with freetype, if so: how?
|
|
||||||
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
|
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$icu_config" ]; then
|
if [ -n "$icu_layout_config" ]; then
|
||||||
CFLAGS="$CFLAGS -DWITH_ICU"
|
CFLAGS="$CFLAGS -DWITH_ICU_LAYOUT"
|
||||||
CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' ' '`"
|
CFLAGS="$CFLAGS `$icu_layout_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
# Some icu-configs have the 'feature' of not adding a space where others do add the space
|
|
||||||
if [ "$static_icu" != "0" ]; then
|
if [ "$static_icu" != "0" ]; then
|
||||||
LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' ' ' | sed s/licu/lsicu/g`"
|
LIBS="$LIBS `$icu_layout_config --libs --static | tr '\n\r' ' ' | sed s/-licu/-lsicu/g`"
|
||||||
else
|
else
|
||||||
LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' ' '`"
|
LIBS="$LIBS `$icu_layout_config --libs | tr '\n\r' ' '`"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$icu_sort_config" ]; then
|
||||||
|
CFLAGS="$CFLAGS -DWITH_ICU_SORT"
|
||||||
|
CFLAGS="$CFLAGS `$icu_sort_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
|
if [ "$static_icu" != "0" ]; then
|
||||||
|
LIBS="$LIBS `$icu_sort_config --libs --static | tr '\n\r' ' ' | sed s/-licu/-lsicu/g`"
|
||||||
|
else
|
||||||
|
LIBS="$LIBS `$icu_sort_config --libs | tr '\n\r' ' '`"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1776,13 +1779,15 @@ make_cflags_and_ldflags() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$libtimidity" ]; then
|
if [ -n "$libtimidity_config" ]; then
|
||||||
if [ "$enable_static" != "0" ]; then
|
|
||||||
LIBS="$LIBS $libtimidity"
|
|
||||||
else
|
|
||||||
LIBS="$LIBS -ltimidity"
|
|
||||||
fi
|
|
||||||
CFLAGS="$CFLAGS -DLIBTIMIDITY"
|
CFLAGS="$CFLAGS -DLIBTIMIDITY"
|
||||||
|
CFLAGS="$CFLAGS `$libtimidity_config --cflags | tr '\n\r' ' '`"
|
||||||
|
|
||||||
|
if [ "$enable_static" != "0" ]; then
|
||||||
|
LIBS="$LIBS `$libtimidity_config --libs --static | tr '\n\r' ' '`"
|
||||||
|
else
|
||||||
|
LIBS="$LIBS `$libtimidity_config --libs | tr '\n\r' ' '`"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$with_iconv" != "0" ]; then
|
if [ "$with_iconv" != "0" ]; then
|
||||||
@@ -2370,7 +2375,7 @@ detect_allegro() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# By default on OSX we don't use SDL. The rest is auto-detect
|
# By default on OSX we don't use Allegro. The rest is auto-detect
|
||||||
if [ "$with_allegro" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
|
if [ "$with_allegro" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
|
||||||
log 1 "checking Allegro... OSX, skipping"
|
log 1 "checking Allegro... OSX, skipping"
|
||||||
|
|
||||||
@@ -2378,33 +2383,7 @@ detect_allegro() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$with_allegro" = "1" ] || [ "$with_allegro" = "" ] || [ "$with_allegro" = "2" ]; then
|
detect_pkg_config "$with_allegro" "allegro" "allegro_config" "4.4"
|
||||||
allegro_config="allegro-config"
|
|
||||||
else
|
|
||||||
allegro_config="$with_allegro"
|
|
||||||
fi
|
|
||||||
|
|
||||||
version=`$allegro_config --version 2>/dev/null`
|
|
||||||
ret=$?
|
|
||||||
log 2 "executing $allegro_config --version"
|
|
||||||
log 2 " returned $version"
|
|
||||||
log 2 " exit code $ret"
|
|
||||||
|
|
||||||
if [ -z "$version" ] || [ "$ret" != "0" ]; then
|
|
||||||
log 1 "checking Allegro... not found"
|
|
||||||
|
|
||||||
# It was forced, so it should be found.
|
|
||||||
if [ "$with_allegro" != "1" ]; then
|
|
||||||
log 1 "configure: error: allegro-config couldn't be found"
|
|
||||||
log 1 "configure: error: you supplied '$with_allegro', but it seems invalid"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
allegro_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking Allegro... found"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -2450,33 +2429,7 @@ detect_sdl() {
|
|||||||
sleep 5
|
sleep 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then
|
detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2"
|
||||||
sdl_config="sdl-config"
|
|
||||||
else
|
|
||||||
sdl_config="$with_sdl"
|
|
||||||
fi
|
|
||||||
|
|
||||||
version=`$sdl_config --version 2>/dev/null`
|
|
||||||
ret=$?
|
|
||||||
log 2 "executing $sdl_config --version"
|
|
||||||
log 2 " returned $version"
|
|
||||||
log 2 " exit code $ret"
|
|
||||||
|
|
||||||
if [ -z "$version" ] || [ "$ret" != "0" ]; then
|
|
||||||
log 1 "checking SDL... not found"
|
|
||||||
|
|
||||||
# It was forced, so it should be found.
|
|
||||||
if [ "$with_sdl" != "1" ]; then
|
|
||||||
log 1 "configure: error: sdl-config couldn't be found"
|
|
||||||
log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
sdl_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking SDL... found"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_osx_sdk() {
|
detect_osx_sdk() {
|
||||||
@@ -2729,7 +2682,7 @@ detect_library() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
detect_zlib() {
|
detect_zlib() {
|
||||||
detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
|
detect_pkg_config "$with_zlib" "zlib" "zlib_config" "1.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_lzo2() {
|
detect_lzo2() {
|
||||||
@@ -2737,7 +2690,7 @@ detect_lzo2() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
detect_libtimidity() {
|
detect_libtimidity() {
|
||||||
detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
|
detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_pkg_config() {
|
detect_pkg_config() {
|
||||||
@@ -2745,6 +2698,7 @@ detect_pkg_config() {
|
|||||||
# $2 - package name ('liblzma')
|
# $2 - package name ('liblzma')
|
||||||
# $3 - config name ('lzma_config', sets $lzma_config)
|
# $3 - config name ('lzma_config', sets $lzma_config)
|
||||||
# $4 - minimum module version ('2.3')
|
# $4 - minimum module version ('2.3')
|
||||||
|
# $5 - check for dedicated, 1 is "skif if dedicated"
|
||||||
|
|
||||||
# 0 means no, 1 is auto-detect, 2 is force
|
# 0 means no, 1 is auto-detect, 2 is force
|
||||||
if [ "$1" = "0" ]; then
|
if [ "$1" = "0" ]; then
|
||||||
@@ -2754,6 +2708,13 @@ detect_pkg_config() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$5" = "1" ] && [ "$1" = "1" ] && [ "$enable_dedicated" != "0" ]; then
|
||||||
|
log 1 "checking $2... dedicated server, skipping"
|
||||||
|
|
||||||
|
eval "$3=\"\""
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
log 2 "detecting $2"
|
log 2 "detecting $2"
|
||||||
|
|
||||||
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
|
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
|
||||||
@@ -2801,89 +2762,11 @@ detect_xdg_basedir() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
detect_png() {
|
detect_png() {
|
||||||
# 0 means no, 1 is auto-detect, 2 is force
|
|
||||||
if [ "$with_png" = "0" ]; then
|
|
||||||
log 1 "checking libpng... disabled"
|
|
||||||
|
|
||||||
png_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
|
|
||||||
if [ "$with_png" != "1" ]; then
|
|
||||||
log 1 "checking libpng... no zlib"
|
|
||||||
log 1 "ERROR: libpng was forced, but zlib was not detected / disabled."
|
|
||||||
log 1 "ERROR: libpng depends on zlib."
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking libpng... no zlib, skipping"
|
|
||||||
|
|
||||||
png_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
|
detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_freetype() {
|
detect_freetype() {
|
||||||
# 0 means no, 1 is auto-detect, 2 is force
|
detect_pkg_config "$with_freetype" "freetype2" "freetype_config" "2.2" "1"
|
||||||
if [ "$with_freetype" = "0" ]; then
|
|
||||||
log 1 "checking libfreetype... disabled"
|
|
||||||
|
|
||||||
freetype_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then
|
|
||||||
log 1 "checking libfreetype... dedicated server, skipping"
|
|
||||||
|
|
||||||
freetype_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
|
|
||||||
if [ "$with_freetype" != "1" ]; then
|
|
||||||
log 1 "checking libfreetype... no zlib"
|
|
||||||
log 1 "ERROR: libfreetype was forced, but zlib was not detected / disabled."
|
|
||||||
log 1 "ERROR: libfreetype depends on zlib."
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking libfreetype... no zlib, skipping"
|
|
||||||
|
|
||||||
freetype_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
|
|
||||||
freetype_config="freetype-config"
|
|
||||||
else
|
|
||||||
freetype_config="$with_freetype"
|
|
||||||
fi
|
|
||||||
|
|
||||||
version=`$freetype_config --version 2>/dev/null`
|
|
||||||
ret=$?
|
|
||||||
log 2 "executing freetype_config --version"
|
|
||||||
log 2 " returned $version"
|
|
||||||
log 2 " exit code $ret"
|
|
||||||
|
|
||||||
if [ -z "$version" ] || [ "$ret" != "0" ]; then
|
|
||||||
log 1 "checking libfreetype... not found"
|
|
||||||
|
|
||||||
# It was forced, so it should be found.
|
|
||||||
if [ "$with_freetype" != "1" ]; then
|
|
||||||
log 1 "configure: error: freetype-config couldn't be found"
|
|
||||||
log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
freetype_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking libfreetype... found"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_fontconfig() {
|
detect_fontconfig() {
|
||||||
@@ -2894,19 +2777,6 @@ detect_fontconfig() {
|
|||||||
fontconfig_config=""
|
fontconfig_config=""
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then
|
|
||||||
log 1 "checking libfontconfig... dedicated server, skipping"
|
|
||||||
|
|
||||||
fontconfig_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
if [ "$with_fontconfig" != "2" ] && [ -z "$freetype_config" ]; then
|
|
||||||
log 1 "checking libfontconfig... no freetype, skipping"
|
|
||||||
|
|
||||||
fontconfig_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
|
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
|
||||||
log 1 "checking libfontconfig... WIN32, skipping"
|
log 1 "checking libfontconfig... WIN32, skipping"
|
||||||
fontconfig_config=""
|
fontconfig_config=""
|
||||||
@@ -2919,57 +2789,15 @@ detect_fontconfig() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
|
detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3" "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_icu() {
|
detect_icu_layout() {
|
||||||
# 0 means no, 1 is auto-detect, 2 is force
|
detect_pkg_config "$with_icu_layout" "icu-lx" "icu_layout_config" "4.8" "1"
|
||||||
if [ "$with_icu" = "0" ]; then
|
}
|
||||||
log 1 "checking libicu... disabled"
|
|
||||||
|
|
||||||
icu_config=""
|
detect_icu_sort() {
|
||||||
return 0
|
detect_pkg_config "$with_icu_sort" "icu-i18n" "icu_sort_config" "4.8" "1"
|
||||||
fi
|
|
||||||
if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then
|
|
||||||
log 1 "checking libicu... dedicated server, skipping"
|
|
||||||
|
|
||||||
icu_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
|
|
||||||
icu_config="icu-config"
|
|
||||||
else
|
|
||||||
icu_config="$with_icu"
|
|
||||||
fi
|
|
||||||
|
|
||||||
version=`$icu_config --version 2>/dev/null`
|
|
||||||
ret=$?
|
|
||||||
check_version '3.6' "$version"
|
|
||||||
version_ok=$?
|
|
||||||
log 2 "executing $icu_config --version"
|
|
||||||
log 2 " returned $version"
|
|
||||||
log 2 " exit code $ret"
|
|
||||||
|
|
||||||
if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
|
|
||||||
if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
|
|
||||||
log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
|
|
||||||
else
|
|
||||||
log 1 "checking libicu... not found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# It was forced, so it should be found.
|
|
||||||
if [ "$with_icu" != "1" ]; then
|
|
||||||
log 1 "configure: error: icu-config couldn't be found"
|
|
||||||
log 1 "configure: error: you supplied '$with_icu', but it seems invalid"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
icu_config=""
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
log 1 "checking libicu... found"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_pspconfig() {
|
detect_pspconfig() {
|
||||||
@@ -3684,23 +3512,30 @@ showhelp() {
|
|||||||
echo " --with-midi=midi define which midi-player to use"
|
echo " --with-midi=midi define which midi-player to use"
|
||||||
echo " --with-midi-arg=arg define which args to use for the"
|
echo " --with-midi-arg=arg define which args to use for the"
|
||||||
echo " midi-player"
|
echo " midi-player"
|
||||||
echo " --with-libtimidity enables libtimidity support"
|
echo " --with-libtimidity[=\"pkg-config libtimidity\"]"
|
||||||
echo " --with-allegro[=allegro-config]"
|
echo " enables libtimidity support"
|
||||||
|
echo " --with-allegro[=\"pkg-config allegro\"]"
|
||||||
echo " enables Allegro video driver support"
|
echo " enables Allegro video driver support"
|
||||||
echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
|
echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
|
||||||
echo " --with-sdl[=sdl-config] enables SDL video driver support"
|
echo " --with-sdl[=\"pkg-config sdl\"] enables SDL video driver support"
|
||||||
echo " --with-zlib[=zlib.a] enables zlib support"
|
echo " --with-zlib[=\"pkg-config zlib\"]"
|
||||||
|
echo " enables zlib support"
|
||||||
echo " --with-liblzma[=\"pkg-config liblzma\"]"
|
echo " --with-liblzma[=\"pkg-config liblzma\"]"
|
||||||
echo " enables liblzma support"
|
echo " enables liblzma support"
|
||||||
echo " --with-liblzo2[=liblzo2.a] enables liblzo2 support"
|
echo " --with-liblzo2[=liblzo2.a] enables liblzo2 support"
|
||||||
echo " --with-png[=libpng-config] enables libpng support"
|
echo " --with-png[=\"pkg-config libpng\"]"
|
||||||
echo " --with-freetype[=freetype-config]"
|
echo " enables libpng support"
|
||||||
|
echo " --with-freetype[=\"pkg-config freetype2\"]"
|
||||||
echo " enables libfreetype support"
|
echo " enables libfreetype support"
|
||||||
echo " --with-fontconfig[=\"pkg-config fontconfig\"]"
|
echo " --with-fontconfig[=\"pkg-config fontconfig\"]"
|
||||||
echo " enables fontconfig support"
|
echo " enables fontconfig support"
|
||||||
echo " --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
|
echo " --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
|
||||||
echo " enables XDG base directory support"
|
echo " enables XDG base directory support"
|
||||||
echo " --with-icu[=icu-config] enables icu (used for right-to-left support)"
|
echo " --with-icu enables icu components for layout and sorting"
|
||||||
|
echo " --with-icu-layout[=\"pkg-config icu-lx\"]"
|
||||||
|
echo " enables icu components for layouting (right-to-left support)"
|
||||||
|
echo " --with-icu-sort[=\"pkg-config icu-i18n\"]"
|
||||||
|
echo " enables icu components for locale specific string sorting"
|
||||||
echo " --static-icu try to link statically (libsicu instead of"
|
echo " --static-icu try to link statically (libsicu instead of"
|
||||||
echo " libicu; can fail as the new name is guessed)"
|
echo " libicu; can fail as the new name is guessed)"
|
||||||
echo " --with-iconv[=iconv-path] enables iconv support"
|
echo " --with-iconv[=iconv-path] enables iconv support"
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then
|
|||||||
# No rev? Maybe it is a custom git-svn clone
|
# No rev? Maybe it is a custom git-svn clone
|
||||||
REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"`
|
REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"`
|
||||||
fi
|
fi
|
||||||
TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`"
|
TAG="`git describe --tags 2>/dev/null`"
|
||||||
if [ -n "$TAG" ]; then
|
if [ -n "$TAG" ]; then
|
||||||
BRANCH=""
|
BRANCH=""
|
||||||
REV="$TAG"
|
REV="$TAG"
|
||||||
|
|||||||
@@ -22,6 +22,15 @@ then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# openttd_vs140.sln is for MSVC 2015
|
||||||
|
# openttd_vs140.vcxproj is for MSVC 2015
|
||||||
|
# openttd_vs140.vcxproj.filters is for MSVC 2015
|
||||||
|
# langs_vs140.vcxproj is for MSVC 2015
|
||||||
|
# strgen_vs140.vcxproj is for MSVC 2015
|
||||||
|
# strgen_vs140.vcxproj.filters is for MSVC 2015
|
||||||
|
# generate_vs140.vcxproj is for MSVC 2015
|
||||||
|
# version_vs140.vcxproj is for MSVC 2015
|
||||||
|
|
||||||
# openttd_vs100.sln is for MSVC 2010
|
# openttd_vs100.sln is for MSVC 2010
|
||||||
# openttd_vs100.vcxproj is for MSVC 2010
|
# openttd_vs100.vcxproj is for MSVC 2010
|
||||||
# openttd_vs100.vcxproj.filters is for MSVC 2010
|
# openttd_vs100.vcxproj.filters is for MSVC 2010
|
||||||
@@ -306,11 +315,17 @@ generate "$openttd" "openttd_vs80.vcproj"
|
|||||||
generate "$openttd" "openttd_vs90.vcproj"
|
generate "$openttd" "openttd_vs90.vcproj"
|
||||||
generate "$openttdvcxproj" "openttd_vs100.vcxproj"
|
generate "$openttdvcxproj" "openttd_vs100.vcxproj"
|
||||||
generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters"
|
generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters"
|
||||||
|
generate "$openttdvcxproj" "openttd_vs140.vcxproj"
|
||||||
|
generate "$openttdfiles" "openttd_vs140.vcxproj.filters" "$openttdfilters"
|
||||||
generate "$lang" "langs_vs80.vcproj"
|
generate "$lang" "langs_vs80.vcproj"
|
||||||
generate "$lang" "langs_vs90.vcproj"
|
generate "$lang" "langs_vs90.vcproj"
|
||||||
generate "$langvcxproj" "langs_vs100.vcxproj"
|
generate "$langvcxproj" "langs_vs100.vcxproj"
|
||||||
generate "$langfiles" "langs_vs100.vcxproj.filters"
|
generate "$langfiles" "langs_vs100.vcxproj.filters"
|
||||||
|
generate "$langvcxproj" "langs_vs140.vcxproj"
|
||||||
|
generate "$langfiles" "langs_vs140.vcxproj.filters"
|
||||||
generate "$settings" "settings_vs80.vcproj" "$settingscommand"
|
generate "$settings" "settings_vs80.vcproj" "$settingscommand"
|
||||||
generate "$settings" "settings_vs90.vcproj" "$settingscommand"
|
generate "$settings" "settings_vs90.vcproj" "$settingscommand"
|
||||||
generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand"
|
generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand"
|
||||||
generate "$settingsfiles" "settings_vs100.vcxproj.filters"
|
generate "$settingsfiles" "settings_vs100.vcxproj.filters"
|
||||||
|
generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand"
|
||||||
|
generate "$settingsfiles" "settings_vs140.vcxproj.filters"
|
||||||
|
|||||||
@@ -10,6 +10,15 @@ Option Explicit
|
|||||||
Dim FSO
|
Dim FSO
|
||||||
Set FSO = CreateObject("Scripting.FileSystemObject")
|
Set FSO = CreateObject("Scripting.FileSystemObject")
|
||||||
|
|
||||||
|
' openttd_vs140.sln is for MSVC 2015
|
||||||
|
' openttd_vs140.vcxproj is for MSVC 2015
|
||||||
|
' openttd_vs140.vcxproj.filters is for MSVC 2015
|
||||||
|
' langs_vs140.vcxproj is for MSVC 2015
|
||||||
|
' strgen_vs140.vcxproj is for MSVC 2015
|
||||||
|
' strgen_vs140.vcxproj.filters is for MSVC 2015
|
||||||
|
' generate_vs140.vcxproj is for MSVC 2015
|
||||||
|
' version_vs140.vcxproj is for MSVC 2015
|
||||||
|
|
||||||
' openttd_vs100.sln is for MSVC 2010
|
' openttd_vs100.sln is for MSVC 2010
|
||||||
' openttd_vs100.vcxproj is for MSVC 2010
|
' openttd_vs100.vcxproj is for MSVC 2010
|
||||||
' openttd_vs100.vcxproj.filters is for MSVC 2010
|
' openttd_vs100.vcxproj.filters is for MSVC 2010
|
||||||
@@ -369,6 +378,8 @@ generate openttd, ROOT_DIR & "/projects/openttd_vs80.vcproj", Null
|
|||||||
generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null
|
generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null
|
||||||
generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null
|
generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null
|
||||||
generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters
|
generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters
|
||||||
|
generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs140.vcxproj", Null
|
||||||
|
generate openttdfiles, ROOT_DIR & "/projects/openttd_vs140.vcxproj.filters", openttdfilters
|
||||||
|
|
||||||
Dim lang, langvcxproj, langfiles
|
Dim lang, langvcxproj, langfiles
|
||||||
lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles)
|
lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles)
|
||||||
@@ -376,6 +387,8 @@ generate lang, ROOT_DIR & "/projects/langs_vs80.vcproj", Null
|
|||||||
generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null
|
generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null
|
||||||
generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null
|
generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null
|
||||||
generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null
|
generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null
|
||||||
|
generate langvcxproj, ROOT_DIR & "/projects/langs_vs140.vcxproj", Null
|
||||||
|
generate langfiles, ROOT_DIR & "/projects/langs_vs140.vcxproj.filters", Null
|
||||||
|
|
||||||
Dim settings, settingsvcxproj, settingscommand, settingsfiles
|
Dim settings, settingsvcxproj, settingscommand, settingsfiles
|
||||||
settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles)
|
settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles)
|
||||||
@@ -383,3 +396,5 @@ generate settings, ROOT_DIR & "/projects/settings_vs80.vcproj", settingscommand
|
|||||||
generate settings, ROOT_DIR & "/projects/settings_vs90.vcproj", settingscommand
|
generate settings, ROOT_DIR & "/projects/settings_vs90.vcproj", settingscommand
|
||||||
generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs100.vcxproj", settingscommand
|
generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs100.vcxproj", settingscommand
|
||||||
generate settingsfiles, ROOT_DIR & "/projects/settings_vs100.vcxproj.filters", Null
|
generate settingsfiles, ROOT_DIR & "/projects/settings_vs100.vcxproj.filters", Null
|
||||||
|
generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs140.vcxproj", settingscommand
|
||||||
|
generate settingsfiles, ROOT_DIR & "/projects/settings_vs140.vcxproj.filters", Null
|
||||||
|
|||||||
40
projects/generate_vs140.vcxproj
Normal file
40
projects/generate_vs140.vcxproj
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>generate</ProjectName>
|
||||||
|
<ProjectGuid>{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}</ProjectGuid>
|
||||||
|
<RootNamespace>generate</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Utility</ConfigurationType>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\source.list">
|
||||||
|
<FileType>Document</FileType>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Running %27generate.vbs%27 ...</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)generate.vbs"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
384
projects/langs_vs140.vcxproj
Normal file
384
projects/langs_vs140.vcxproj
Normal file
@@ -0,0 +1,384 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>langs</ProjectName>
|
||||||
|
<ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
|
||||||
|
<RootNamespace>langs</RootNamespace>
|
||||||
|
<Keyword>MakeFileProj</Keyword>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Utility</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Message>Generating strings.h</Message>
|
||||||
|
<Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<Midl>
|
||||||
|
<TypeLibraryName>./langs.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\src\lang\english.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\afrikaans.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating afrikaans language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\afrikaans.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\arabic_egypt.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating arabic_egypt language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\arabic_egypt.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\basque.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating basque language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\basque.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\belarusian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating belarusian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\belarusian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating brazilian_portuguese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\brazilian_portuguese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\bulgarian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating bulgarian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\bulgarian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\catalan.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating catalan language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\catalan.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\croatian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating croatian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\croatian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\czech.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating czech language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\czech.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\danish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating danish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\danish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\dutch.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating dutch language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\dutch.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\english_AU.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_AU language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_AU.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\english_US.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_US language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_US.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\esperanto.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating esperanto language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\esperanto.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\estonian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating estonian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\estonian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\faroese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating faroese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\faroese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\finnish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating finnish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\finnish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\french.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating french language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\french.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\gaelic.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gaelic language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\gaelic.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\galician.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating galician language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\galician.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\german.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating german language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\german.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\greek.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating greek language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\greek.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\hebrew.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hebrew language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hebrew.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\hungarian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hungarian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hungarian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\icelandic.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating icelandic language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\icelandic.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\indonesian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating indonesian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\indonesian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\irish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating irish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\irish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\italian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating italian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\italian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\japanese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating japanese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\japanese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\korean.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating korean language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\korean.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\latin.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latin language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latin.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\latvian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latvian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latvian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\lithuanian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating lithuanian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\lithuanian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\luxembourgish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating luxembourgish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\luxembourgish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\malay.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating malay language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\malay.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_bokmal language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_bokmal.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_nynorsk language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_nynorsk.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\polish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating polish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\polish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\portuguese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating portuguese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\portuguese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\romanian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating romanian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\romanian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\russian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating russian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\russian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\serbian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating serbian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\serbian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\simplified_chinese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating simplified_chinese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\simplified_chinese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\slovak.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovak language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovak.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\slovenian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovenian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\spanish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\swedish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\swedish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\tamil.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tamil language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\tamil.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\thai.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating thai language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\thai.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\traditional_chinese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating traditional_chinese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\traditional_chinese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\turkish.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating turkish language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\turkish.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\ukrainian.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ukrainian language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\ukrainian.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\vietnamese.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating vietnamese language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\vietnamese.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\welsh.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating welsh language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\welsh.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="strgen_vs100.vcxproj">
|
||||||
|
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
173
projects/langs_vs140.vcxproj.filters
Normal file
173
projects/langs_vs140.vcxproj.filters
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Translations">
|
||||||
|
<UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\src\lang\english.txt" />
|
||||||
|
<CustomBuild Include="..\src\lang\afrikaans.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\arabic_egypt.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\basque.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\belarusian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\bulgarian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\catalan.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\croatian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\czech.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\danish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\dutch.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\english_AU.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\english_US.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\esperanto.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\estonian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\faroese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\finnish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\french.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\gaelic.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\galician.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\german.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\greek.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\hebrew.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\hungarian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\icelandic.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\indonesian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\irish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\italian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\japanese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\korean.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\latin.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\latvian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\lithuanian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\luxembourgish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\malay.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\polish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\portuguese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\romanian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\russian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\serbian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\simplified_chinese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\slovak.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\slovenian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\spanish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\swedish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\tamil.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\thai.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\traditional_chinese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\turkish.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\ukrainian.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\vietnamese.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\src\lang\welsh.txt">
|
||||||
|
<Filter>Translations</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
12
projects/langs_vs140.vcxproj.filters.in
Normal file
12
projects/langs_vs140.vcxproj.filters.in
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Translations">
|
||||||
|
<UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\src\lang\english.txt" />
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
61
projects/langs_vs140.vcxproj.in
Normal file
61
projects/langs_vs140.vcxproj.in
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>langs</ProjectName>
|
||||||
|
<ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
|
||||||
|
<RootNamespace>langs</RootNamespace>
|
||||||
|
<Keyword>MakeFileProj</Keyword>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Utility</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Message>Generating strings.h</Message>
|
||||||
|
<Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<Midl>
|
||||||
|
<TypeLibraryName>./langs.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\src\lang\english.txt">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="strgen_vs100.vcxproj">
|
||||||
|
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
94
projects/openttd_vs140.sln
Normal file
94
projects/openttd_vs140.sln
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 14
|
||||||
|
VisualStudioVersion = 14.0.23107.0
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs140.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs140.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs140.vcxproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs140.vcxproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs140.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Win32 = Debug|Win32
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Release|Win32 = Release|Win32
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
|
||||||
|
{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
|
||||||
|
{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
|
||||||
|
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
1313
projects/openttd_vs140.vcxproj
Normal file
1313
projects/openttd_vs140.vcxproj
Normal file
File diff suppressed because it is too large
Load Diff
3056
projects/openttd_vs140.vcxproj.filters
Normal file
3056
projects/openttd_vs140.vcxproj.filters
Normal file
File diff suppressed because it is too large
Load Diff
13
projects/openttd_vs140.vcxproj.filters.in
Normal file
13
projects/openttd_vs140.vcxproj.filters.in
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
!!FILTERS!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\media\openttd.ico" />
|
||||||
|
<None Include="..\readme.txt" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
332
projects/openttd_vs140.vcxproj.in
Normal file
332
projects/openttd_vs140.vcxproj.in
Normal file
@@ -0,0 +1,332 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>openttd</ProjectName>
|
||||||
|
<ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
|
||||||
|
<RootNamespace>openttd</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
|
||||||
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
|
||||||
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
|
||||||
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||||
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||||
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
|
||||||
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin</LocalDebuggerWorkingDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<Midl>
|
||||||
|
<TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<Optimization>Full</Optimization>
|
||||||
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||||
|
<OmitFramePointers>true</OmitFramePointers>
|
||||||
|
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||||
|
<StructMemberAlignment>4Bytes</StructMemberAlignment>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<AssemblerOutput>All</AssemblerOutput>
|
||||||
|
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||||
|
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>false</TreatWarningAsError>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>Default</CompileAs>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
|
||||||
|
</ClCompile>
|
||||||
|
<ResourceCompile>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<Culture>0x0809</Culture>
|
||||||
|
</ResourceCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<StackReserveSize>1048576</StackReserveSize>
|
||||||
|
<StackCommitSize>1048576</StackCommitSize>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||||
|
<DataExecutionPrevention>
|
||||||
|
</DataExecutionPrevention>
|
||||||
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<Midl>
|
||||||
|
<TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||||
|
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>false</TreatWarningAsError>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>Default</CompileAs>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
|
||||||
|
</ClCompile>
|
||||||
|
<ResourceCompile>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<Culture>0x0809</Culture>
|
||||||
|
</ResourceCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<StackReserveSize>1048576</StackReserveSize>
|
||||||
|
<StackCommitSize>1048576</StackCommitSize>
|
||||||
|
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||||
|
<DataExecutionPrevention>
|
||||||
|
</DataExecutionPrevention>
|
||||||
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
|
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Midl>
|
||||||
|
<TargetEnvironment>X64</TargetEnvironment>
|
||||||
|
<TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<Optimization>Full</Optimization>
|
||||||
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||||
|
<OmitFramePointers>true</OmitFramePointers>
|
||||||
|
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||||
|
<StructMemberAlignment>Default</StructMemberAlignment>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<AssemblerOutput>All</AssemblerOutput>
|
||||||
|
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||||
|
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>false</TreatWarningAsError>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>Default</CompileAs>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
|
||||||
|
</ClCompile>
|
||||||
|
<ResourceCompile>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<Culture>0x0809</Culture>
|
||||||
|
</ResourceCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<StackReserveSize>1048576</StackReserveSize>
|
||||||
|
<StackCommitSize>1048576</StackCommitSize>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Midl>
|
||||||
|
<TargetEnvironment>X64</TargetEnvironment>
|
||||||
|
<TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||||
|
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>false</TreatWarningAsError>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<CallingConvention>Cdecl</CallingConvention>
|
||||||
|
<CompileAs>Default</CompileAs>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
|
||||||
|
</ClCompile>
|
||||||
|
<ResourceCompile>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<Culture>0x0809</Culture>
|
||||||
|
</ResourceCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<StackReserveSize>1048576</StackReserveSize>
|
||||||
|
<StackCommitSize>1048576</StackCommitSize>
|
||||||
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
|
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\media\openttd.ico" />
|
||||||
|
<None Include="..\readme.txt" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="langs_vs100.vcxproj">
|
||||||
|
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="strgen_vs100.vcxproj">
|
||||||
|
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="version_vs100.vcxproj">
|
||||||
|
<Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
</Project>
|
||||||
54
projects/settings_vs140.vcxproj
Normal file
54
projects/settings_vs140.vcxproj
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>settings</ProjectName>
|
||||||
|
<ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
|
||||||
|
<RootNamespace>settings</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Makefile</ConfigurationType>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros">
|
||||||
|
<SettingsCommandLine>
|
||||||
|
..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
|
||||||
|
</SettingsCommandLine>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
|
||||||
|
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
|
||||||
|
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
|
||||||
|
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
|
||||||
|
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\company_settings.ini" />
|
||||||
|
<None Include="..\src\table\currency_settings.ini" />
|
||||||
|
<None Include="..\src\table\gameopt_settings.ini" />
|
||||||
|
<None Include="..\src\table\misc_settings.ini" />
|
||||||
|
<None Include="..\src\table\settings.ini" />
|
||||||
|
<None Include="..\src\table\win32_settings.ini" />
|
||||||
|
<None Include="..\src\table\window_settings.ini" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\settings.h.postamble" />
|
||||||
|
<None Include="..\src\table\settings.h.preamble" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
35
projects/settings_vs140.vcxproj.filters
Normal file
35
projects/settings_vs140.vcxproj.filters
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="INI">
|
||||||
|
<UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\company_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\currency_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\gameopt_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\misc_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\win32_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\src\table\window_settings.ini">
|
||||||
|
<Filter>INI</Filter>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\settings.h.postamble" />
|
||||||
|
<None Include="..\src\table\settings.h.preamble" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
15
projects/settings_vs140.vcxproj.filters.in
Normal file
15
projects/settings_vs140.vcxproj.filters.in
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="INI">
|
||||||
|
<UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\settings.h.postamble" />
|
||||||
|
<None Include="..\src\table\settings.h.preamble" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
48
projects/settings_vs140.vcxproj.in
Normal file
48
projects/settings_vs140.vcxproj.in
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>settings</ProjectName>
|
||||||
|
<ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
|
||||||
|
<RootNamespace>settings</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Makefile</ConfigurationType>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros">
|
||||||
|
<SettingsCommandLine>
|
||||||
|
!!FILTERS!!
|
||||||
|
</SettingsCommandLine>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
|
||||||
|
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
|
||||||
|
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
|
||||||
|
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
|
||||||
|
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
!!FILES!!
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\table\settings.h.postamble" />
|
||||||
|
<None Include="..\src\table\settings.h.preamble" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
83
projects/settingsgen_vs140.vcxproj
Normal file
83
projects/settingsgen_vs140.vcxproj
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>settingsgen</ProjectName>
|
||||||
|
<ProjectGuid>{E9548DE9-F089-49B7-93A6-30BE2CC311C7}</ProjectGuid>
|
||||||
|
<RootNamespace>settings</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">settings_gen</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>
|
||||||
|
</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<CustomBuildStep>
|
||||||
|
<Inputs>%(Inputs)</Inputs>
|
||||||
|
</CustomBuildStep>
|
||||||
|
<ClCompile>
|
||||||
|
<Optimization>MinSpace</Optimization>
|
||||||
|
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||||
|
<PreprocessorDefinitions>SETTINGSGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<AssemblerOutput>All</AssemblerOutput>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<OutputFile>$(OutDir)settings_gen.exe</OutputFile>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||||
|
<DataExecutionPrevention>
|
||||||
|
</DataExecutionPrevention>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>
|
||||||
|
</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\src\core\alloc_func.cpp" />
|
||||||
|
<ClCompile Include="..\src\misc\getoptdata.cpp" />
|
||||||
|
<ClCompile Include="..\src\ini_load.cpp" />
|
||||||
|
<ClCompile Include="..\src\settingsgen\settingsgen.cpp" />
|
||||||
|
<ClCompile Include="..\src\string.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\src\misc\getoptdata.h" />
|
||||||
|
<ClInclude Include="..\src\ini_type.h" />
|
||||||
|
<ClInclude Include="..\src\core\smallvec_type.hpp" />
|
||||||
|
<ClInclude Include="..\src\string_func.h" />
|
||||||
|
<ClInclude Include="..\src\strings_type.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
32
projects/settingsgen_vs140.vcxproj.filters
Normal file
32
projects/settingsgen_vs140.vcxproj.filters
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{a4678737-b3b3-4be5-9db1-fa6ccd164c59}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\src\core\alloc_func.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\misc\getoptdata.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\ini_load.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\settingsgen\settingsgen.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\string.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\src\misc\getoptdata.h" />
|
||||||
|
<ClInclude Include="..\src\ini_type.h" />
|
||||||
|
<ClInclude Include="..\src\core\smallvec_type.hpp" />
|
||||||
|
<ClInclude Include="..\src\string_func.h" />
|
||||||
|
<ClInclude Include="..\src\strings_type.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
95
projects/strgen_vs140.vcxproj
Normal file
95
projects/strgen_vs140.vcxproj
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>strgen</ProjectName>
|
||||||
|
<ProjectGuid>{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}</ProjectGuid>
|
||||||
|
<RootNamespace>strgen</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
|
||||||
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<Midl>
|
||||||
|
<TypeLibraryName>.\Debug/strgen.tlb</TypeLibraryName>
|
||||||
|
<HeaderFileName>
|
||||||
|
</HeaderFileName>
|
||||||
|
</Midl>
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<Optimization>MinSpace</Optimization>
|
||||||
|
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||||
|
<PreprocessorDefinitions>STRGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<AssemblerOutput>All</AssemblerOutput>
|
||||||
|
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||||
|
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
</ClCompile>
|
||||||
|
<ResourceCompile>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<Culture>0x041d</Culture>
|
||||||
|
</ResourceCompile>
|
||||||
|
<Link>
|
||||||
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<ProgramDatabaseFile>$(IntDir)strgen.pdb</ProgramDatabaseFile>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||||
|
<DataExecutionPrevention>
|
||||||
|
</DataExecutionPrevention>
|
||||||
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
|
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\src\core\alloc_func.cpp" />
|
||||||
|
<ClCompile Include="..\src\strgen\strgen_base.cpp" />
|
||||||
|
<ClCompile Include="..\src\strgen\strgen.cpp" />
|
||||||
|
<ClCompile Include="..\src\string.cpp" />
|
||||||
|
<ClCompile Include="..\src\misc\getoptdata.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\src\core\alloc_func.hpp" />
|
||||||
|
<ClInclude Include="..\src\table\control_codes.h" />
|
||||||
|
<ClInclude Include="..\src\debug.h" />
|
||||||
|
<ClInclude Include="..\src\core\endian_func.hpp" />
|
||||||
|
<ClInclude Include="..\src\stdafx.h" />
|
||||||
|
<ClInclude Include="..\src\string_func.h" />
|
||||||
|
<ClInclude Include="..\src\misc\getoptdata.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
35
projects/strgen_vs140.vcxproj.filters
Normal file
35
projects/strgen_vs140.vcxproj.filters
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{5894294c-d4dc-41f0-be31-e56cff4e0405}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\src\core\alloc_func.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\strgen\strgen_base.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\strgen\strgen.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\string.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\misc\getoptdata.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\src\core\alloc_func.hpp" />
|
||||||
|
<ClInclude Include="..\src\table\control_codes.h" />
|
||||||
|
<ClInclude Include="..\src\debug.h" />
|
||||||
|
<ClInclude Include="..\src\core\endian_func.hpp" />
|
||||||
|
<ClInclude Include="..\src\stdafx.h" />
|
||||||
|
<ClInclude Include="..\src\string_func.h" />
|
||||||
|
<ClInclude Include="..\src\misc\getoptdata.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
42
projects/version_vs140.vcxproj
Normal file
42
projects/version_vs140.vcxproj
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>version</ProjectName>
|
||||||
|
<ProjectGuid>{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}</ProjectGuid>
|
||||||
|
<RootNamespace>version</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Makefile</ConfigurationType>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</IntDir>
|
||||||
|
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeBuildCommandLine>
|
||||||
|
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeReBuildCommandLine>
|
||||||
|
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\rev.cpp</NMakeOutput>
|
||||||
|
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\src\rev.cpp</NMakeCleanCommandLine>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\src\os\windows\ottdres.rc.in" />
|
||||||
|
<None Include="..\src\rev.cpp.in" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
@@ -45,7 +45,7 @@ struct CompanyInfrastructure {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef Pool<Company, CompanyByte, 1, MAX_COMPANIES> CompanyPool;
|
typedef Pool<Company, CompanyID, 1, MAX_COMPANIES> CompanyPool;
|
||||||
extern CompanyPool _company_pool;
|
extern CompanyPool _company_pool;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ DEFINE_POOL_METHOD(inline void *)::AllocateItem(size_t size, size_t index)
|
|||||||
item = (Titem *)MallocT<byte>(size);
|
item = (Titem *)MallocT<byte>(size);
|
||||||
}
|
}
|
||||||
this->data[index] = item;
|
this->data[index] = item;
|
||||||
item->index = (uint)index;
|
item->index = (Tindex)(uint)index;
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,9 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
|
|||||||
# include <ft2build.h>
|
# include <ft2build.h>
|
||||||
# include FT_FREETYPE_H
|
# include FT_FREETYPE_H
|
||||||
#endif /* WITH_FREETYPE */
|
#endif /* WITH_FREETYPE */
|
||||||
#ifdef WITH_ICU
|
#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
|
||||||
# include <unicode/uversion.h>
|
# include <unicode/uversion.h>
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
|
||||||
#ifdef WITH_LZMA
|
#ifdef WITH_LZMA
|
||||||
# include <lzma.h>
|
# include <lzma.h>
|
||||||
#endif
|
#endif
|
||||||
@@ -241,14 +241,19 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
|
|||||||
buffer += seprintf(buffer, last, " FreeType: %d.%d.%d\n", major, minor, patch);
|
buffer += seprintf(buffer, last, " FreeType: %d.%d.%d\n", major, minor, patch);
|
||||||
#endif /* WITH_FREETYPE */
|
#endif /* WITH_FREETYPE */
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
|
||||||
/* 4 times 0-255, separated by dots (.) and a trailing '\0' */
|
/* 4 times 0-255, separated by dots (.) and a trailing '\0' */
|
||||||
char buf[4 * 3 + 3 + 1];
|
char buf[4 * 3 + 3 + 1];
|
||||||
UVersionInfo ver;
|
UVersionInfo ver;
|
||||||
u_getVersion(ver);
|
u_getVersion(ver);
|
||||||
u_versionToString(ver, buf);
|
u_versionToString(ver, buf);
|
||||||
buffer += seprintf(buffer, last, " ICU: %s\n", buf);
|
#ifdef WITH_ICU_SORT
|
||||||
#endif /* WITH_ICU */
|
buffer += seprintf(buffer, last, " ICU i18n: %s\n", buf);
|
||||||
|
#endif
|
||||||
|
#ifdef WITH_ICU_LAYOUT
|
||||||
|
buffer += seprintf(buffer, last, " ICU lx: %s\n", buf);
|
||||||
|
#endif
|
||||||
|
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
|
||||||
|
|
||||||
#ifdef WITH_LZMA
|
#ifdef WITH_LZMA
|
||||||
buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string());
|
buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string());
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ static inline void GfxDoDrawLine(void *video, int x, int y, int x2, int y2, int
|
|||||||
int grade_x = x2 - x;
|
int grade_x = x2 - x;
|
||||||
|
|
||||||
/* Clipping rectangle. Slightly extended so we can ignore the width of the line. */
|
/* Clipping rectangle. Slightly extended so we can ignore the width of the line. */
|
||||||
uint extra = CeilDiv(3 * width, 4); // not less then "width * sqrt(2) / 2"
|
int extra = (int)CeilDiv(3 * width, 4); // not less then "width * sqrt(2) / 2"
|
||||||
Rect clip = { -extra, -extra, screen_width - 1 + extra, screen_height - 1 + extra };
|
Rect clip = { -extra, -extra, screen_width - 1 + extra, screen_height - 1 + extra };
|
||||||
|
|
||||||
/* prevent integer overflows. */
|
/* prevent integer overflows. */
|
||||||
@@ -586,7 +586,7 @@ int GetStringLineCount(StringID str, int maxw)
|
|||||||
*/
|
*/
|
||||||
Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestion)
|
Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestion)
|
||||||
{
|
{
|
||||||
Dimension box = {suggestion.width, GetStringHeight(str, suggestion.width)};
|
Dimension box = {suggestion.width, (uint)GetStringHeight(str, suggestion.width)};
|
||||||
return box;
|
return box;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -598,7 +598,7 @@ Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestio
|
|||||||
*/
|
*/
|
||||||
Dimension GetStringMultiLineBoundingBox(const char *str, const Dimension &suggestion)
|
Dimension GetStringMultiLineBoundingBox(const char *str, const Dimension &suggestion)
|
||||||
{
|
{
|
||||||
Dimension box = {suggestion.width, GetStringHeight(str, suggestion.width)};
|
Dimension box = {suggestion.width, (uint)GetStringHeight(str, suggestion.width)};
|
||||||
return box;
|
return box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
#include "table/control_codes.h"
|
#include "table/control_codes.h"
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_LAYOUT
|
||||||
#include <unicode/ustring.h>
|
#include <unicode/ustring.h>
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_LAYOUT */
|
||||||
|
|
||||||
#include "safeguards.h"
|
#include "safeguards.h"
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ Font::Font(FontSize size, TextColour colour) :
|
|||||||
assert(size < FS_END);
|
assert(size < FS_END);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_LAYOUT
|
||||||
/* Implementation details of LEFontInstance */
|
/* Implementation details of LEFontInstance */
|
||||||
|
|
||||||
le_int32 Font::getUnitsPerEM() const
|
le_int32 Font::getUnitsPerEM() const
|
||||||
@@ -213,7 +213,7 @@ static ParagraphLayouter *GetParagraphLayout(UChar *buff, UChar *buff_end, FontM
|
|||||||
return new ICUParagraphLayout(p);
|
return new ICUParagraphLayout(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_LAYOUT */
|
||||||
|
|
||||||
/*** Paragraph layout ***/
|
/*** Paragraph layout ***/
|
||||||
/**
|
/**
|
||||||
@@ -654,7 +654,7 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
|
|||||||
line.layout->Reflow();
|
line.layout->Reflow();
|
||||||
} else {
|
} else {
|
||||||
/* Line is new, layout it */
|
/* Line is new, layout it */
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_LAYOUT
|
||||||
FontState old_state = state;
|
FontState old_state = state;
|
||||||
const char *old_str = str;
|
const char *old_str = str;
|
||||||
|
|
||||||
|
|||||||
@@ -19,12 +19,12 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_LAYOUT
|
||||||
#include "layout/ParagraphLayout.h"
|
#include "layout/ParagraphLayout.h"
|
||||||
#define ICU_FONTINSTANCE : public LEFontInstance
|
#define ICU_FONTINSTANCE : public LEFontInstance
|
||||||
#else /* WITH_ICU */
|
#else /* WITH_ICU_LAYOUT */
|
||||||
#define ICU_FONTINSTANCE
|
#define ICU_FONTINSTANCE
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_LAYOUT */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Text drawing parameters, which can change while drawing a line, but are kept between multiple parts
|
* Text drawing parameters, which can change while drawing a line, but are kept between multiple parts
|
||||||
@@ -75,7 +75,7 @@ public:
|
|||||||
|
|
||||||
Font(FontSize size, TextColour colour);
|
Font(FontSize size, TextColour colour);
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_LAYOUT
|
||||||
/* Implementation details of LEFontInstance */
|
/* Implementation details of LEFontInstance */
|
||||||
|
|
||||||
le_int32 getUnitsPerEM() const;
|
le_int32 getUnitsPerEM() const;
|
||||||
@@ -91,7 +91,7 @@ public:
|
|||||||
LEGlyphID mapCharToGlyph(LEUnicode32 ch) const;
|
LEGlyphID mapCharToGlyph(LEUnicode32 ch) const;
|
||||||
void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const;
|
void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const;
|
||||||
le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const;
|
le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const;
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_LAYOUT */
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Mapping from index to font. */
|
/** Mapping from index to font. */
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "fileio_func.h"
|
#include "fileio_func.h"
|
||||||
|
|
||||||
#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500)
|
#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500)
|
||||||
# define WITH_FDATASYNC
|
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -80,7 +79,7 @@ bool IniFile::SaveToDisk(const char *filename)
|
|||||||
* APIs to do so. We only need to flush the data as the metadata itself
|
* APIs to do so. We only need to flush the data as the metadata itself
|
||||||
* (modification date etc.) is not important to us; only the real data is.
|
* (modification date etc.) is not important to us; only the real data is.
|
||||||
*/
|
*/
|
||||||
#ifdef WITH_FDATASYNC
|
#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
|
||||||
int ret = fdatasync(fileno(f));
|
int ret = fdatasync(fileno(f));
|
||||||
fclose(f);
|
fclose(f);
|
||||||
if (ret != 0) return false;
|
if (ret != 0) return false;
|
||||||
|
|||||||
@@ -1181,64 +1181,64 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :Model d'acceler
|
|||||||
STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_HELPTEXT :Seleccioneu el model físic per l'acceleració de trens. El model «original» penalitza les pujades per igual a tots els vehicles. El model «realista» penalitza les pujades i les corbes en funció de diverses propietats del tren, com ara la longitud i la força de tracció
|
STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_HELPTEXT :Seleccioneu el model físic per l'acceleració de trens. El model «original» penalitza les pujades per igual a tots els vehicles. El model «realista» penalitza les pujades i les corbes en funció de diverses propietats del tren, com ara la longitud i la força de tracció
|
||||||
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :Model d'acceleració per als vehicles: {STRING}
|
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :Model d'acceleració per als vehicles: {STRING}
|
||||||
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_HELPTEXT :Seleccioneu el model físic per l'acceleració d'automòbils. El model «original» penalitza les pujades per igual a tots els vehicles. El model «realista» penalitza els pendents en funció de les diferents propietats de la màquina, com per exemple l'esforç de tracció.
|
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_HELPTEXT :Seleccioneu el model físic per l'acceleració d'automòbils. El model «original» penalitza les pujades per igual a tots els vehicles. El model «realista» penalitza els pendents en funció de les diferents propietats de la màquina, com per exemple l'esforç de tracció.
|
||||||
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :Pendent d'inclinació per als trens: {STRING}
|
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :Pendent de les costes per als trens: {STRING}
|
||||||
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS_HELPTEXT :La inclinació d'una cel·la en pendent per a un tren. Els valors més alts fan que sigui més difícil escalar un turó
|
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS_HELPTEXT :El pendent de les caselles amb costes per als trens. Els valors alts fan que sigui més difícil pujar els turons.
|
||||||
STR_CONFIG_SETTING_PERCENTAGE :{COMMA}%
|
STR_CONFIG_SETTING_PERCENTAGE :{COMMA}%
|
||||||
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :Pendent d'inclinació per als automòbils: {STRING}
|
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :Pendent de les costes per als vehicles de carretera: {STRING}
|
||||||
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT :La inclinació d'una cel·la amb pendent per a automòbils. Els valors més alts fan que sigui més difícil escalar un turó
|
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT :El pendent de les caselles amb costes per a vehicles de carretera. Els valors alts fan que sigui més difícil pujar els turons.
|
||||||
STR_CONFIG_SETTING_FORBID_90_DEG :Prohibeix fer girs de 90 graus als trens i vaixells: {STRING}
|
STR_CONFIG_SETTING_FORBID_90_DEG :Prohibeix fer girs de 90 graus als trens i vaixells: {STRING}
|
||||||
STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT :Els girs de 90 graus succeeixen quan una via horitzontal està seguida d'una vertical a la cel·la annexa, provocant que el tren giri 90 graus quan travessi la vora de la cel·la en lloc dels 45 graus usuals en les altres combinacions. Això també s'aplica al radi de gir dels vaixells
|
STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT :Els girs de 90 graus succeeixen quan hi ha una via horitzontal seguida d'una de vertical a la cel·la annexa, provocant que el tren giri 90 graus quan travessi la vora de la cel·la en lloc dels 45 graus usuals en les altres combinacions. Això també s'aplica al gir dels vaixells.
|
||||||
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :Permet ajuntar estacions no annexes: {STRING}
|
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :Permet ajuntar estacions no annexes: {STRING}
|
||||||
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT :Permetre afegir parts a una estació sense contacte directe amb les parts existents. Fa falta Ctrl + Clic, mentre és col·loquen les peces noves
|
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT :Aquesta opció permet afegir parts noves a una estació existent sense estar les parts noves en contacte directe amb les existents. Cal clicar Ctrl+Clic mentre es col·loquen les parts noves.
|
||||||
STR_CONFIG_SETTING_INFLATION :Inflació: {STRING}
|
STR_CONFIG_SETTING_INFLATION :Inflació: {STRING}
|
||||||
STR_CONFIG_SETTING_INFLATION_HELPTEXT :Habilita la inflació a l'economia, on l'augment dels costos són una mica més ràpids que els dels pagaments
|
STR_CONFIG_SETTING_INFLATION_HELPTEXT :Habilita la inflació a l'economia, on l'augment dels costos són una mica més ràpids que els dels pagaments.
|
||||||
STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH :Màxima longitud dels ponts: {STRING}
|
STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH :Longitud màxima dels ponts: {STRING}
|
||||||
STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT :Longitud màxima per a la construcció de ponts
|
STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT :Longitud màxima per a la construcció de ponts
|
||||||
STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT :Alçada màxima dels ponts: {STRING}
|
STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT :Alçada màxima dels ponts: {STRING}
|
||||||
STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT :Alçada màxima de construcció dels ponts
|
STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT :Alçada màxima de construcció dels ponts
|
||||||
STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :Màxima longitud dels túnels: {STRING}
|
STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :Màxima longitud dels túnels: {STRING}
|
||||||
STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT :Longitud màxima per a la construcció de túnels
|
STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT :Longitud màxima per a la construcció de túnels
|
||||||
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :Mètode de construcció de la indústria primària manual: {STRING}
|
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :Fundació de noves indústries primàries: {STRING}
|
||||||
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Mètode de finançament d'indústria primària. 'cap' significa que no serà possible fundar-ne cap, 'prospecció' significa que serà possible fundar-ne, però la construcció succeirà en un lloc aleatori del mapa i també podria passar que fracassi, 'com les altre indústries' significa que les indústries de matèries primeres poden ser construides a qualsevol lloc per les companyies igual que les indústries manufactureres
|
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Mètode de fundació de noves indústries primàries. «Fundació desactivada» significa que no serà possible fundar-ne cap, «Amb prospeccions» significa que serà possible fundar-ne, però la construcció succeirà en un lloc aleatori del mapa i podria fracassar. «Com les altres indústries» significa que les indústries de matèries primeres poden ser construïdes en qualsevol lloc per les companyies igual que les indústries manufactureres.
|
||||||
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Cap
|
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Fundació desactivada
|
||||||
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Com les altres indústries
|
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Com les altres indústries
|
||||||
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Prospeccionant
|
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Amb prospeccions
|
||||||
STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Àrea plana al voltant de les indústries: {STRING}
|
STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Àrea anivellada al voltant de les indústries: {STRING}
|
||||||
STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT :Quantitat d'espai pla al voltant d'una indústira. Això assegura que quedarà espai buit al voltant de la indústria per a construir vies, etc.
|
STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT :Quantitat d'espai pla al voltant d'una indústria. Això assegura que quedarà espai buit al voltant de la indústria per construir vies o altres infraestructures.
|
||||||
STR_CONFIG_SETTING_MULTIPINDTOWN :Permet vàries indústries similars a cada població: {STRING}
|
STR_CONFIG_SETTING_MULTIPINDTOWN :Permet vàries indústries similars a cada població: {STRING}
|
||||||
STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT :Normalment, una població no vol més d'un tipus d'indústria de cada tipus. Amb aquest paràmetre es permetrà diverses indústries del mateix tipus a la mateixa població
|
STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT :Normalment, una població no vol tenir més d'una indústria de cada tipus. Amb aquest paràmetre es permet la construcció de diverses indústries del mateix tipus a la mateixa població.
|
||||||
STR_CONFIG_SETTING_SIGNALSIDE :Mostra els senyals: {STRING}
|
STR_CONFIG_SETTING_SIGNALSIDE :Mostra els senyals: {STRING}
|
||||||
STR_CONFIG_SETTING_SIGNALSIDE_HELPTEXT :Selecciona a quin costat de la via s'han de posar els senyals
|
STR_CONFIG_SETTING_SIGNALSIDE_HELPTEXT :Seleccioneu a quin costat de la via s'han de posar els senyals
|
||||||
STR_CONFIG_SETTING_SIGNALSIDE_LEFT :A l'esquerra
|
STR_CONFIG_SETTING_SIGNALSIDE_LEFT :A l'esquerra
|
||||||
STR_CONFIG_SETTING_SIGNALSIDE_DRIVING_SIDE :Al costat de conducció
|
STR_CONFIG_SETTING_SIGNALSIDE_DRIVING_SIDE :Al costat de conducció
|
||||||
STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :A la dreta
|
STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :A la dreta
|
||||||
STR_CONFIG_SETTING_SHOWFINANCES :Mostra la finestra de balanç al finalitzar cada any: {STRING}
|
STR_CONFIG_SETTING_SHOWFINANCES :Mostra la finestra de balanç al finalitzar cada any: {STRING}
|
||||||
STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT :Si està activat, la finestra de finances apareix al final de cada any per permetre una inspecció fàcil de l'estat financer de la companyia
|
STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT :Si el paràmetre està activat, la finestra de finances apareix al final de cada any per permetre una inspecció fàcil de l'estat financer de la companyia.
|
||||||
STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :Les noves ordres predeterminades són 'sense parada': {STRING}
|
STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :«Sense parada» per defecte a les noves ordres : {STRING}
|
||||||
STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normalment, un vehicle pararà a cada estació que passi. Activant aquest paràmetre no pararà a cap estació fins arribar a la seu destí. Nota, aquest paràmetre només defineix el valor predeterminat per les noves ordres. De totes maneres les ordres individuals poden establir explícitament qualsevol dels comportaments
|
STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normalment, un vehicle para a cada estació per la que passa. Activant aquest paràmetre, no pararà a cap estació fins arribar al seu destí. Nota: aquest paràmetre només defineix el valor predeterminat per a les noves ordres. Un cop creada una ordre, aquesta es pot establir manualment al comportament desitjat.
|
||||||
STR_CONFIG_SETTING_STOP_LOCATION :Noves ordres del tren: parar per defecte {STRING} de la plataforma
|
STR_CONFIG_SETTING_STOP_LOCATION :Noves ordres de trens: parar per defecte {STRING} de la plataforma
|
||||||
STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Situa en quin lloc de la plataforma el tren pararà per defecte. 'Extrem més proper' significa a prop del punt d'entrada, 'al mig' significa al mig de la plataforma, i 'extrem més llunyà' significa lluny del punt d'entrada. Nota, aquest paràmetre només defineix el valor predeterminat per les noves ordres. De totes maneres les ordres individuals poden establir explícitament qualsevol dels comportaments
|
STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Estableix en quin lloc de la plataforma els trens pararan per defecte. «Extrem més proper» significa a prop del punt d'entrada, «Al mig» significa al mig de la plataforma, i «Extrem més llunyà» significa lluny del punt d'entrada. Nota: aquest paràmetre només defineix el valor predeterminat per les noves ordres. Un cop creada una ordre, es pot modificar el comportament de forma manual.
|
||||||
STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END :a l'extrem més proper
|
STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END :A l'extrem més proper
|
||||||
STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE :a la meitat
|
STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE :Al mig
|
||||||
STR_CONFIG_SETTING_STOP_LOCATION_FAR_END :a l'extrem més llunyà
|
STR_CONFIG_SETTING_STOP_LOCATION_FAR_END :A l'extrem més llunyà
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL :Finestra d'avís quan el ratolí és al marc del programa: {STRING}
|
STR_CONFIG_SETTING_AUTOSCROLL :Desplaça la finestra quan el ratolí sigui prop de la vora: {STRING}
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT :Quan està activat, les vistes començaran a desplaçar-se quan el ratolí sigui a prop la vora de la finestra
|
STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT :Quan està activat, l'àrea de visualització començarà a desplaçar-se quan el ratolí sigui prop de la vora de la finestra.
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL_DISABLED :Desactivat
|
STR_CONFIG_SETTING_AUTOSCROLL_DISABLED :Desactivat
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT_FULLSCREEN :Vista principal, només pantalla completa
|
STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT_FULLSCREEN :Vista principal (només pantalla completa)
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT :Vista principal
|
STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT :Vista principal
|
||||||
STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT :Cada vista
|
STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT :Qualsevol vista
|
||||||
STR_CONFIG_SETTING_BRIBE :Permet subornar a les autoritats locals: {STRING}
|
STR_CONFIG_SETTING_BRIBE :Permet subornar les autoritats locals: {STRING}
|
||||||
STR_CONFIG_SETTING_BRIBE_HELPTEXT :Permet a les companyies intentar subornar a l'autoritat local. Si el suborn és detectat per un inspector, la companyia no podrà actuar a la població durant sis mesos
|
STR_CONFIG_SETTING_BRIBE_HELPTEXT :Permet a les companyies intentar subornar l'autoritat local. Si el suborn és detectat per un inspector, la companyia no podrà actuar a la població durant sis mesos.
|
||||||
STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :Permet comprar els drets del transport en exclusiva: {STRING}
|
STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :Permet comprar els drets del transport en exclusiva: {STRING}
|
||||||
STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT :Si una companyia compra els drets de transport en exclusiva en una població, les estacions dels oponents (passatgers i càrrega) no rebran cap càrrega durant tot l'any
|
STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT :Si una companyia compra els drets de transport en exclusiva d'una població, les estacions dels oponents (passatgers i càrrega) no rebran cap càrrega durant un any sencer.
|
||||||
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Permet finançar edificis: {STRING}
|
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Permet finançar edificis: {STRING}
|
||||||
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Permet a les companyies donar diners a les poblacions per a finançar nous edificis
|
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Permet a les companyies donar diners a les poblacions per finançar nous edificis
|
||||||
STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Permet finançar la reconstrucció dels carrers locals: {STRING}
|
STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Permet finançar la reconstrucció dels carrers locals: {STRING}
|
||||||
STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Permet a les companyies donar diners a les poblacions per a la reconstrucció de carrers i sabotejar-hi la circulació de vehicles
|
STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Permet a les companyies donar diners a les poblacions per la reconstrucció de carrers i sabotejar la circulació de vehicles.
|
||||||
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Permet enviar diners a altres companyies: {STRING}
|
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Permet enviar diners a altres companyies: {STRING}
|
||||||
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT :Permet transferir diners entre companyies en el mode multijugador
|
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT :Permet transferir diners entre companyies en el mode multijugador
|
||||||
STR_CONFIG_SETTING_FREIGHT_TRAINS :Multiplicador de pes per contenidor per simular trens pesats: {STRING}
|
STR_CONFIG_SETTING_FREIGHT_TRAINS :Multiplicador de pes per simular trens pesats: {STRING}
|
||||||
STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT :Estableix l'impacte de transportar contenidors en trens. Un valor més alt fa que transportar contenidors sigui més exigent amb els trens, especialment als turons
|
STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT :Estableix l'impacte de transportar contenidors en trens. Els valors alts fan que transportar contenidors sigui més exigent amb els trens, especialment als turons.
|
||||||
STR_CONFIG_SETTING_PLANE_SPEED :Factor de velocitat dels avions: {STRING}
|
STR_CONFIG_SETTING_PLANE_SPEED :Factor de velocitat dels avions: {STRING}
|
||||||
STR_CONFIG_SETTING_PLANE_SPEED_HELPTEXT :Estableix la velocitat relativa dels avions en comparació amb els altres tipus de vehicles, per reduir la quantitat de guanys de transport dels avions
|
STR_CONFIG_SETTING_PLANE_SPEED_HELPTEXT :Estableix la velocitat relativa dels avions en comparació amb els altres tipus de vehicles, per reduir la quantitat de guanys de transport dels avions
|
||||||
STR_CONFIG_SETTING_PLANE_SPEED_VALUE :1 / {COMMA}
|
STR_CONFIG_SETTING_PLANE_SPEED_VALUE :1 / {COMMA}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ STR_CARGO_PLURAL_NOTHING :
|
|||||||
STR_CARGO_PLURAL_PASSENGERS :Passagiers
|
STR_CARGO_PLURAL_PASSENGERS :Passagiers
|
||||||
STR_CARGO_PLURAL_COAL :Kolen
|
STR_CARGO_PLURAL_COAL :Kolen
|
||||||
STR_CARGO_PLURAL_MAIL :Post
|
STR_CARGO_PLURAL_MAIL :Post
|
||||||
STR_CARGO_PLURAL_OIL :Olie
|
STR_CARGO_PLURAL_OIL :Aardolie
|
||||||
STR_CARGO_PLURAL_LIVESTOCK :Vee
|
STR_CARGO_PLURAL_LIVESTOCK :Vee
|
||||||
STR_CARGO_PLURAL_GOODS :Goederen
|
STR_CARGO_PLURAL_GOODS :Goederen
|
||||||
STR_CARGO_PLURAL_GRAIN :Graan
|
STR_CARGO_PLURAL_GRAIN :Graan
|
||||||
@@ -64,7 +64,7 @@ STR_CARGO_SINGULAR_NOTHING :
|
|||||||
STR_CARGO_SINGULAR_PASSENGER :Passagier
|
STR_CARGO_SINGULAR_PASSENGER :Passagier
|
||||||
STR_CARGO_SINGULAR_COAL :Kolen
|
STR_CARGO_SINGULAR_COAL :Kolen
|
||||||
STR_CARGO_SINGULAR_MAIL :Post
|
STR_CARGO_SINGULAR_MAIL :Post
|
||||||
STR_CARGO_SINGULAR_OIL :Olie
|
STR_CARGO_SINGULAR_OIL :Aardolie
|
||||||
STR_CARGO_SINGULAR_LIVESTOCK :Vee
|
STR_CARGO_SINGULAR_LIVESTOCK :Vee
|
||||||
STR_CARGO_SINGULAR_GOODS :Goederen
|
STR_CARGO_SINGULAR_GOODS :Goederen
|
||||||
STR_CARGO_SINGULAR_GRAIN :Graan
|
STR_CARGO_SINGULAR_GRAIN :Graan
|
||||||
@@ -98,7 +98,7 @@ STR_QUANTITY_NOTHING :
|
|||||||
STR_QUANTITY_PASSENGERS :{COMMA}{NBSP}passagier{P "" s}
|
STR_QUANTITY_PASSENGERS :{COMMA}{NBSP}passagier{P "" s}
|
||||||
STR_QUANTITY_COAL :{WEIGHT_LONG} kolen
|
STR_QUANTITY_COAL :{WEIGHT_LONG} kolen
|
||||||
STR_QUANTITY_MAIL :{COMMA}{NBSP}zak{P "" ken} post
|
STR_QUANTITY_MAIL :{COMMA}{NBSP}zak{P "" ken} post
|
||||||
STR_QUANTITY_OIL :{VOLUME_LONG} olie
|
STR_QUANTITY_OIL :{VOLUME_LONG} Vaten Olie
|
||||||
STR_QUANTITY_LIVESTOCK :{COMMA}{NBSP}stuk{P "" s} vee
|
STR_QUANTITY_LIVESTOCK :{COMMA}{NBSP}stuk{P "" s} vee
|
||||||
STR_QUANTITY_GOODS :{COMMA}{NBSP}krat{P "" ten} goederen
|
STR_QUANTITY_GOODS :{COMMA}{NBSP}krat{P "" ten} goederen
|
||||||
STR_QUANTITY_GRAIN :{WEIGHT_LONG} graan
|
STR_QUANTITY_GRAIN :{WEIGHT_LONG} graan
|
||||||
@@ -168,7 +168,7 @@ STR_ABBREV_ALL :{TINY_FONT}ALLE
|
|||||||
STR_PASSENGERS :{COMMA}{NBSP}passagier{P "" s}
|
STR_PASSENGERS :{COMMA}{NBSP}passagier{P "" s}
|
||||||
STR_BAGS :{COMMA}{NBSP}zak{P "" ken}
|
STR_BAGS :{COMMA}{NBSP}zak{P "" ken}
|
||||||
STR_TONS :{COMMA}{NBSP}ton
|
STR_TONS :{COMMA}{NBSP}ton
|
||||||
STR_LITERS :{COMMA}{NBSP}liter
|
STR_LITERS :{COMMA}{NBSP}liter{P "" s}
|
||||||
STR_ITEMS :{COMMA}{NBSP}stuk{P "" s}
|
STR_ITEMS :{COMMA}{NBSP}stuk{P "" s}
|
||||||
STR_CRATES :{COMMA}{NBSP}krat{P "" ten}
|
STR_CRATES :{COMMA}{NBSP}krat{P "" ten}
|
||||||
|
|
||||||
@@ -3185,7 +3185,7 @@ STR_FINANCES_YEAR :{WHITE}{NUM}
|
|||||||
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Bouwkosten
|
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Bouwkosten
|
||||||
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nieuwe voertuigen
|
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nieuwe voertuigen
|
||||||
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Treinonderhoudskosten
|
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Treinonderhoudskosten
|
||||||
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Wegvoertuigbrandstofkosten
|
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Wegvoertuigonderhoudskosten
|
||||||
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Vliegtuigonderhoudskosten
|
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Vliegtuigonderhoudskosten
|
||||||
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Schiponderhoudskosten
|
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Schiponderhoudskosten
|
||||||
STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Eigendomsonderhoud
|
STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Eigendomsonderhoud
|
||||||
@@ -3268,7 +3268,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY :{WHITE}Tramrail
|
|||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT :{GOLD}Water tegels:
|
STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT :{GOLD}Water tegels:
|
||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS :{WHITE}Kanalen
|
STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS :{WHITE}Kanalen
|
||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT :{GOLD}Stations:
|
STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT :{GOLD}Stations:
|
||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Station tegels
|
STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stationtegels
|
||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Vliegvelden
|
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Vliegvelden
|
||||||
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENCY_LONG}/jr
|
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENCY_LONG}/jr
|
||||||
|
|
||||||
@@ -3350,7 +3350,7 @@ STR_GROUP_DEFAULT_SHIPS :Niet gegroepeer
|
|||||||
STR_GROUP_DEFAULT_AIRCRAFTS :Niet gegroepeerde vliegtuigen
|
STR_GROUP_DEFAULT_AIRCRAFTS :Niet gegroepeerde vliegtuigen
|
||||||
|
|
||||||
STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Groepen - Klik op een groep voor een lijst van alle voertuigen in deze groep. Klik en sleep om hiërarchie te beheren
|
STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Groepen - Klik op een groep voor een lijst van alle voertuigen in deze groep. Klik en sleep om hiërarchie te beheren
|
||||||
STR_GROUP_CREATE_TOOLTIP :{BLACK}Klik om een groep te maken
|
STR_GROUP_CREATE_TOOLTIP :{BLACK}Klik om een groep te creëren
|
||||||
STR_GROUP_DELETE_TOOLTIP :{BLACK}Verwijder de geselecteerde groep
|
STR_GROUP_DELETE_TOOLTIP :{BLACK}Verwijder de geselecteerde groep
|
||||||
STR_GROUP_RENAME_TOOLTIP :{BLACK}Hernoem de geselecteerde groep
|
STR_GROUP_RENAME_TOOLTIP :{BLACK}Hernoem de geselecteerde groep
|
||||||
STR_GROUP_REPLACE_PROTECTION_TOOLTIP :{BLACK}Klik om deze groep te beschermen tegen globaal automatisch vervangen
|
STR_GROUP_REPLACE_PROTECTION_TOOLTIP :{BLACK}Klik om deze groep te beschermen tegen globaal automatisch vervangen
|
||||||
@@ -4357,7 +4357,7 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Kan dit
|
|||||||
STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... het is al van jou!
|
STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... het is al van jou!
|
||||||
|
|
||||||
# Group related errors
|
# Group related errors
|
||||||
STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Kan groep niet maken...
|
STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Kan groep niet creëren...
|
||||||
STR_ERROR_GROUP_CAN_T_DELETE :{WHITE}Kan deze groep niet verwijderen...
|
STR_ERROR_GROUP_CAN_T_DELETE :{WHITE}Kan deze groep niet verwijderen...
|
||||||
STR_ERROR_GROUP_CAN_T_RENAME :{WHITE}Kan deze groep niet hernoemen...
|
STR_ERROR_GROUP_CAN_T_RENAME :{WHITE}Kan deze groep niet hernoemen...
|
||||||
STR_ERROR_GROUP_CAN_T_SET_PARENT :{WHITE}Kan huidige groep niet instellen...
|
STR_ERROR_GROUP_CAN_T_SET_PARENT :{WHITE}Kan huidige groep niet instellen...
|
||||||
|
|||||||
@@ -1901,8 +1901,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t
|
|||||||
|
|
||||||
# Network server list
|
# Network server list
|
||||||
STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer
|
STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer
|
||||||
STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertized
|
STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised
|
||||||
STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertized (internet) and a not advertized (Local Area Network, LAN) game
|
STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
|
||||||
STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No
|
STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No
|
||||||
STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes
|
STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes
|
||||||
STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name:
|
STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name:
|
||||||
|
|||||||
@@ -2988,7 +2988,7 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX :{BLACK}지난
|
|||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH :{BLACK}도시가 성장하기 위해 필요한 화물:
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH :{BLACK}도시가 성장하기 위해 필요한 화물:
|
||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL :{ORANGE}{STRING}{RED}{G 0 "이" "가"} 필요함
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL :{ORANGE}{STRING}{RED}{G 0 "이" "가"} 필요함
|
||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :겨울에는 {ORANGE}{STRING}{BLACK}{G 0 "이" "가"} 필요함
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :겨울에는 {ORANGE}{STRING}{BLACK}{G 0 "이" "가"} 필요함
|
||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL :{ORANGE}{STRING}{GREEN} 수송됨
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL :{ORANGE}{STRING}{GREEN}{G 0 "이" "가"} 수송됨
|
||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED :{ORANGE}{1:CARGO_LONG} ＼ {0:CARGO_TINY}{RED} (더 필요함)
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED :{ORANGE}{1:CARGO_LONG} ＼ {0:CARGO_TINY}{RED} (더 필요함)
|
||||||
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED :{ORANGE}{1:CARGO_LONG} ＼ {0:CARGO_TINY}{GREEN} (수송됨)
|
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED :{ORANGE}{1:CARGO_LONG} ＼ {0:CARGO_TINY}{GREEN} (수송됨)
|
||||||
STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}도시가 {ORANGE}{COMMA}{BLACK}일마다 성장합니다.
|
STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}도시가 {ORANGE}{COMMA}{BLACK}일마다 성장합니다.
|
||||||
|
|||||||
@@ -1258,7 +1258,7 @@ STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT :By ynskeakeljen
|
|||||||
STR_CONFIG_SETTING_WARN_LOST_VEHICLE :Warskôgje as in fiertúch it paad bjuster is: {STRING}
|
STR_CONFIG_SETTING_WARN_LOST_VEHICLE :Warskôgje as in fiertúch it paad bjuster is: {STRING}
|
||||||
STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT :Lit berjochten sjen at in fiertúch gjin paad nei syn bestimming fine kin
|
STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT :Lit berjochten sjen at in fiertúch gjin paad nei syn bestimming fine kin
|
||||||
STR_CONFIG_SETTING_ORDER_REVIEW :Hâld fiertúchoarders yn de gaten: {STRING}
|
STR_CONFIG_SETTING_ORDER_REVIEW :Hâld fiertúchoarders yn de gaten: {STRING}
|
||||||
STR_CONFIG_SETTING_ORDER_REVIEW_HELPTEXT :By ynkeakeljen wurde de oarder fan de fiertugen sa no en dan kontrolearre en wurde flater dy't dêrby nei boppe komme melden
|
STR_CONFIG_SETTING_ORDER_REVIEW_HELPTEXT :By ynskeakeljen wurde de oarder fan de fiertugen sa no en dan kontrolearre en wurde flater dy't dêrby nei boppe komme melden
|
||||||
STR_CONFIG_SETTING_ORDER_REVIEW_OFF :Nee
|
STR_CONFIG_SETTING_ORDER_REVIEW_OFF :Nee
|
||||||
STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :Ja, mar slút stilsteande fiertugen út
|
STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :Ja, mar slút stilsteande fiertugen út
|
||||||
STR_CONFIG_SETTING_ORDER_REVIEW_ON :Fan alle fiertugen
|
STR_CONFIG_SETTING_ORDER_REVIEW_ON :Fan alle fiertugen
|
||||||
@@ -1303,7 +1303,9 @@ STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Rûch
|
|||||||
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Tige rûch
|
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Tige rûch
|
||||||
STR_CONFIG_SETTING_VARIETY :Fariaasjedistribusje: {STRING}
|
STR_CONFIG_SETTING_VARIETY :Fariaasjedistribusje: {STRING}
|
||||||
STR_CONFIG_SETTING_RIVER_AMOUNT :Tal rivieren: {STRING}
|
STR_CONFIG_SETTING_RIVER_AMOUNT :Tal rivieren: {STRING}
|
||||||
|
STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT :Kieze hoefolle rivieren generearje moatte wurde
|
||||||
STR_CONFIG_SETTING_TREE_PLACER :Algoritme foar pleatsing beamen: {STRING}
|
STR_CONFIG_SETTING_TREE_PLACER :Algoritme foar pleatsing beamen: {STRING}
|
||||||
|
STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT :Kies de spreding fan beammen op 'e kaart: 'Orizjineel' plantet beammen ferspreid oer de kaart, 'Ferbettere' plantet beammen yn kloften
|
||||||
STR_CONFIG_SETTING_TREE_PLACER_NONE :Gjin
|
STR_CONFIG_SETTING_TREE_PLACER_NONE :Gjin
|
||||||
STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :Orizjineel
|
STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :Orizjineel
|
||||||
STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :Ferbettere
|
STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :Ferbettere
|
||||||
@@ -1328,7 +1330,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Grien
|
|||||||
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Donker grien
|
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Donker grien
|
||||||
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fiolet
|
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fiolet
|
||||||
STR_CONFIG_SETTING_REVERSE_SCROLLING :Draai scrollrjochtig om: {STRING}
|
STR_CONFIG_SETTING_REVERSE_SCROLLING :Draai scrollrjochtig om: {STRING}
|
||||||
STR_CONFIG_SETTING_REVERSE_SCROLLING_HELPTEXT :By útskeakjen beweecht de mûs de kamera. By ynskeakeljen beweecht de mûs de kaart
|
STR_CONFIG_SETTING_REVERSE_SCROLLING_HELPTEXT :By útskeakeljen beweecht de mûs de kamera. By ynskeakeljen beweecht de mûs de kaart
|
||||||
STR_CONFIG_SETTING_SMOOTH_SCROLLING :Loaitsfinster floeiend scrolle : {STRING}
|
STR_CONFIG_SETTING_SMOOTH_SCROLLING :Loaitsfinster floeiend scrolle : {STRING}
|
||||||
STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Bepaalt hoe it haadfinster scrollt. By ynskeakeljen sil dit floeiend wêze. By útskeakeljen ljept it byld direktst nei de selektearre lokaasje
|
STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Bepaalt hoe it haadfinster scrollt. By ynskeakeljen sil dit floeiend wêze. By útskeakeljen ljept it byld direktst nei de selektearre lokaasje
|
||||||
STR_CONFIG_SETTING_MEASURE_TOOLTIP :Under it gebrûk fan de ferskate bou-arken diminsjes sjen litte: {STRING}
|
STR_CONFIG_SETTING_MEASURE_TOOLTIP :Under it gebrûk fan de ferskate bou-arken diminsjes sjen litte: {STRING}
|
||||||
@@ -1446,6 +1448,7 @@ STR_CONFIG_SETTING_AI_PROFILE_MEDIUM :Middel
|
|||||||
STR_CONFIG_SETTING_AI_PROFILE_HARD :Dreech
|
STR_CONFIG_SETTING_AI_PROFILE_HARD :Dreech
|
||||||
|
|
||||||
STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :Stea AIs ta yn multiplayer: {STRING}
|
STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :Stea AIs ta yn multiplayer: {STRING}
|
||||||
|
STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT :Kompjûterspilers tastean mei te spylje yn multyspyler spullen
|
||||||
|
|
||||||
STR_CONFIG_SETTING_SERVINT_ISPERCENT :reperaasje skemas binne yn procenten: {STRING}
|
STR_CONFIG_SETTING_SERVINT_ISPERCENT :reperaasje skemas binne yn procenten: {STRING}
|
||||||
STR_CONFIG_SETTING_SERVINT_TRAINS :Standert reparaasjeskema foar treinen: {STRING}
|
STR_CONFIG_SETTING_SERVINT_TRAINS :Standert reparaasjeskema foar treinen: {STRING}
|
||||||
@@ -3293,12 +3296,23 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Net losse en w
|
|||||||
STR_ORDER_NO_UNLOAD_NO_LOAD :(net lade of losse)
|
STR_ORDER_NO_UNLOAD_NO_LOAD :(net lade of losse)
|
||||||
|
|
||||||
STR_ORDER_AUTO_REFIT :(Ombouwe nei {STRING})
|
STR_ORDER_AUTO_REFIT :(Ombouwe nei {STRING})
|
||||||
|
STR_ORDER_NO_UNLOAD_REFIT :(Net losse en fracht meinimme mei ombou nei {STRING})
|
||||||
|
STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT :(Net losse en folslein lade mei ombou nei {STRING})
|
||||||
|
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT :(Net losse en ien fracht folslein lade mei ombou nei {STRING})
|
||||||
|
|
||||||
STR_ORDER_AUTO_REFIT_ANY :beskikbere fracht
|
STR_ORDER_AUTO_REFIT_ANY :beskikbere fracht
|
||||||
|
|
||||||
|
STR_ORDER_STOP_LOCATION_NEAR_END :[begjin]
|
||||||
|
STR_ORDER_STOP_LOCATION_MIDDLE :[midden]
|
||||||
|
STR_ORDER_STOP_LOCATION_FAR_END :[ein]
|
||||||
|
|
||||||
|
STR_ORDER_OUT_OF_RANGE :{RED} (Folgjende bestimming is bûten berik)
|
||||||
|
|
||||||
|
STR_ORDER_CONDITIONAL_UNCONDITIONAL :Ljep nei opdracht {COMMA}
|
||||||
|
STR_ORDER_CONDITIONAL_NUM :Ljep nei opdracht {COMMA} at {STRING} {STRING} {COMMA}
|
||||||
|
STR_ORDER_CONDITIONAL_TRUE_FALSE :Ljep nei opdracht {COMMA} at {STRING} {STRING}
|
||||||
|
|
||||||
|
STR_INVALID_ORDER :{RED} (Unjildige opdracht)
|
||||||
|
|
||||||
# Time table window
|
# Time table window
|
||||||
STR_TIMETABLE_ORDER_VIEW :{BLACK}Opdrachten
|
STR_TIMETABLE_ORDER_VIEW :{BLACK}Opdrachten
|
||||||
@@ -3314,6 +3328,7 @@ STR_TIMETABLE_DAYS :{COMMA}{NBSP}{P
|
|||||||
STR_TIMETABLE_TICKS :{COMMA}{NBSP}tik{P "" ken}
|
STR_TIMETABLE_TICKS :{COMMA}{NBSP}tik{P "" ken}
|
||||||
|
|
||||||
|
|
||||||
|
STR_TIMETABLE_STATUS_ON_TIME :{BLACK}Dit fiertûg is op tiid
|
||||||
|
|
||||||
|
|
||||||
STR_TIMETABLE_CHANGE_TIME :{BLACK}Tiid Feroarje
|
STR_TIMETABLE_CHANGE_TIME :{BLACK}Tiid Feroarje
|
||||||
@@ -3326,6 +3341,7 @@ STR_TIMETABLE_CHANGE_SPEED_TOOLTIP :{BLACK}Feroarje
|
|||||||
STR_TIMETABLE_CLEAR_SPEED :{BLACK}Helje maksimum snelheid fuort
|
STR_TIMETABLE_CLEAR_SPEED :{BLACK}Helje maksimum snelheid fuort
|
||||||
STR_TIMETABLE_CLEAR_SPEED_TOOLTIP :{BLACK}Helje de maksimum reissnelheid fuort fan de opljochte oarder
|
STR_TIMETABLE_CLEAR_SPEED_TOOLTIP :{BLACK}Helje de maksimum reissnelheid fuort fan de opljochte oarder
|
||||||
|
|
||||||
|
STR_TIMETABLE_RESET_LATENESS :{BLACK}Fertragingsteller weromsette
|
||||||
|
|
||||||
|
|
||||||
STR_TIMETABLE_EXPECTED :{BLACK}Ferwachte
|
STR_TIMETABLE_EXPECTED :{BLACK}Ferwachte
|
||||||
@@ -3373,7 +3389,9 @@ STR_AI_CONFIG_CHANGE_GAMESCRIPT :Spulskript
|
|||||||
STR_AI_LIST_CAPTION :{WHITE}Beskikber {STRING}
|
STR_AI_LIST_CAPTION :{WHITE}Beskikber {STRING}
|
||||||
STR_AI_LIST_CAPTION_AI :AIs
|
STR_AI_LIST_CAPTION_AI :AIs
|
||||||
STR_AI_LIST_CAPTION_GAMESCRIPT :Spulskripten
|
STR_AI_LIST_CAPTION_GAMESCRIPT :Spulskripten
|
||||||
|
STR_AI_LIST_TOOLTIP :{BLACK}Klik om in skript te selektearje
|
||||||
|
|
||||||
|
STR_AI_LIST_AUTHOR :{LTBLUE}Makker: {ORANGE}{STRING}
|
||||||
STR_AI_LIST_VERSION :{LTBLUE}Ferzje: {ORANGE}{NUM}
|
STR_AI_LIST_VERSION :{LTBLUE}Ferzje: {ORANGE}{NUM}
|
||||||
STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING}
|
STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING}
|
||||||
|
|
||||||
@@ -3420,6 +3438,8 @@ STR_ERROR_GAME_SAVE_FAILED :{WHITE}Opslaan
|
|||||||
STR_ERROR_UNABLE_TO_DELETE_FILE :{WHITE}Kin bestân net fuortsmite
|
STR_ERROR_UNABLE_TO_DELETE_FILE :{WHITE}Kin bestân net fuortsmite
|
||||||
STR_ERROR_GAME_LOAD_FAILED :{WHITE}Laden Mislearre{}{STRING}
|
STR_ERROR_GAME_LOAD_FAILED :{WHITE}Laden Mislearre{}{STRING}
|
||||||
STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Interne flater: {STRING}
|
STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Interne flater: {STRING}
|
||||||
|
STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Koe bestân net lêze
|
||||||
|
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Koe net nei bestân skriuwe
|
||||||
STR_GAME_SAVELOAD_NOT_AVAILABLE :<net beskikber>
|
STR_GAME_SAVELOAD_NOT_AVAILABLE :<net beskikber>
|
||||||
|
|
||||||
# Map generation messages
|
# Map generation messages
|
||||||
@@ -3462,13 +3482,16 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}Net tast
|
|||||||
# Local authority errors
|
# Local authority errors
|
||||||
STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} gemiente stiet dit net ta
|
STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} gemiente stiet dit net ta
|
||||||
STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}{TOWN} gemeente lit it net ta dat der noch in fleanfjild bout wurd yn dizze stêd
|
STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}{TOWN} gemeente lit it net ta dat der noch in fleanfjild bout wurd yn dizze stêd
|
||||||
|
STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE :{WHITE}{TOWN} gemeente lit it net ta dat der in fleanfjild bout wurd fanwegen lûdoerlêst
|
||||||
|
|
||||||
# Levelling errors
|
# Levelling errors
|
||||||
STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Kin it lân hjir net ferheegje...
|
STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Kin it lân hjir net ferheegje...
|
||||||
STR_ERROR_CAN_T_LOWER_LAND_HERE :{WHITE}Kin it lân hjir net ferleegje...
|
STR_ERROR_CAN_T_LOWER_LAND_HERE :{WHITE}Kin it lân hjir net ferleegje...
|
||||||
|
STR_ERROR_CAN_T_LEVEL_LAND_HERE :{WHITE}Kin it lân hjir net egalisearje...
|
||||||
STR_ERROR_EXCAVATION_WOULD_DAMAGE :{WHITE}Utgrave soe tunnel beskeadigje
|
STR_ERROR_EXCAVATION_WOULD_DAMAGE :{WHITE}Utgrave soe tunnel beskeadigje
|
||||||
STR_ERROR_ALREADY_AT_SEA_LEVEL :{WHITE}Lân is al op seenivo
|
STR_ERROR_ALREADY_AT_SEA_LEVEL :{WHITE}Lân is al op seenivo
|
||||||
STR_ERROR_TOO_HIGH :{WHITE}Te heech
|
STR_ERROR_TOO_HIGH :{WHITE}Te heech
|
||||||
|
STR_ERROR_ALREADY_LEVELLED :{WHITE}... is al plat
|
||||||
|
|
||||||
# Company related errors
|
# Company related errors
|
||||||
STR_ERROR_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Kin bedriuwsnamme net feroarje...
|
STR_ERROR_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Kin bedriuwsnamme net feroarje...
|
||||||
@@ -3479,10 +3502,12 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY :{WHITE}Kin net
|
|||||||
STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... gjin liening werom te betelje
|
STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... gjin liening werom te betelje
|
||||||
STR_ERROR_CURRENCY_REQUIRED :{WHITE}...{CURRENCY_LONG} nedich
|
STR_ERROR_CURRENCY_REQUIRED :{WHITE}...{CURRENCY_LONG} nedich
|
||||||
STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Kin liening net werombetelje...
|
STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Kin liening net werombetelje...
|
||||||
|
STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Kin gjin jild dat fan de bank lient is weijaan...
|
||||||
STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Kin bedriuw net keapje...
|
STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Kin bedriuw net keapje...
|
||||||
STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Kin gjin haadkantoar boue
|
STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Kin gjin haadkantoar boue
|
||||||
STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kin net 25% oandielen fan dit bedriuw keapje...
|
STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kin net 25% oandielen fan dit bedriuw keapje...
|
||||||
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Kin net 25% oandielen fan dit bedriuw ferkeapje...
|
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Kin net 25% oandielen fan dit bedriuw ferkeapje...
|
||||||
|
STR_ERROR_PROTECTED :{WHITE}Dit bedriuw is noch net âld genoch om oandielen te ferhannelje...
|
||||||
|
|
||||||
# Town related errors
|
# Town related errors
|
||||||
STR_ERROR_CAN_T_GENERATE_TOWN :{WHITE}Kin gjin stêd bouwe
|
STR_ERROR_CAN_T_GENERATE_TOWN :{WHITE}Kin gjin stêd bouwe
|
||||||
@@ -3493,10 +3518,13 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB :{WHITE}... te t
|
|||||||
STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... te ticht by in oare stêd
|
STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... te ticht by in oare stêd
|
||||||
STR_ERROR_TOO_MANY_TOWNS :{WHITE}... te folle stêden
|
STR_ERROR_TOO_MANY_TOWNS :{WHITE}... te folle stêden
|
||||||
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... der is gjin romte mear op'e kaart
|
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... der is gjin romte mear op'e kaart
|
||||||
|
STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Wurk oan de dyk dwaande
|
||||||
|
STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}Kin dizze stêd net fuorthelje...{}In stasjon of depôt ferwiist nei dizze stêd of in tegel dy't eigendom van dizze stêd is kin net fuorthelje wurde
|
||||||
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... Gjin geskikt plak fûn foar in stânbield in dizze stêd
|
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... Gjin geskikt plak fûn foar in stânbield in dizze stêd
|
||||||
|
|
||||||
# Industry related errors
|
# Industry related errors
|
||||||
STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... te folle yndustryen
|
STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... te folle yndustryen
|
||||||
|
STR_ERROR_CAN_T_GENERATE_INDUSTRIES :{WHITE}Kin gjin yndustryen generearje...
|
||||||
STR_ERROR_CAN_T_BUILD_HERE :{WHITE}Kin hjir gjin {STRING} boue...
|
STR_ERROR_CAN_T_BUILD_HERE :{WHITE}Kin hjir gjin {STRING} boue...
|
||||||
STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Kin dit type yndustry hjir net boue...
|
STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Kin dit type yndustry hjir net boue...
|
||||||
STR_ERROR_INDUSTRY_TOO_CLOSE :{WHITE}... te ticht by in oare yndustry
|
STR_ERROR_INDUSTRY_TOO_CLOSE :{WHITE}... te ticht by in oare yndustry
|
||||||
@@ -3506,12 +3534,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200 :{WHITE}... kin
|
|||||||
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... kin allinnich yn in reinwâld bout wurde
|
STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... kin allinnich yn in reinwâld bout wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... kin allinnich yn in woastine bout wurde
|
STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... kin allinnich yn in woastine bout wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... kin allinnich yn in stêd bout wurde (ferfangt besteande hûzen)
|
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... kin allinnich yn in stêd bout wurde (ferfangt besteande hûzen)
|
||||||
|
STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER :{WHITE}... kin allinich by it sintrum van in stêd bout wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS :{WHITE}... kin allinnich yn lege plakken bout wurde
|
STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS :{WHITE}... kin allinnich yn lege plakken bout wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... kin allinich pleatse wurde by de rân fan'e kaart
|
STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... kin allinich pleatse wurde by de rân fan'e kaart
|
||||||
STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... bosk kin allinich boppe snieline boud wurde
|
STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... bosk kin allinich boppe snieline boud wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... kin allinich boppe snieline boud wurde
|
STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... kin allinich boppe snieline boud wurde
|
||||||
STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... kin allinich ûnder snieline boud wurde
|
STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... kin allinich ûnder snieline boud wurde
|
||||||
|
|
||||||
|
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}Der wie gjin gaadlike plak foar '{STRING}' industryen
|
||||||
|
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Feroarje de mapynstellings om in bettere kaart te krijen
|
||||||
|
|
||||||
# Station construction related errors
|
# Station construction related errors
|
||||||
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Kin hjir gjin treinstasjon boue...
|
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Kin hjir gjin treinstasjon boue...
|
||||||
@@ -3525,14 +3556,20 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Kin hjir
|
|||||||
STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Ferbynt mear dan ien stasjon
|
STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Ferbynt mear dan ien stasjon
|
||||||
STR_ERROR_STATION_TOO_SPREAD_OUT :{WHITE}... stasjon is te grut
|
STR_ERROR_STATION_TOO_SPREAD_OUT :{WHITE}... stasjon is te grut
|
||||||
STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}Te folle stasjons
|
STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}Te folle stasjons
|
||||||
|
STR_ERROR_TOO_MANY_STATION_SPECS :{WHITE}Te folle stasjonsdielen
|
||||||
STR_ERROR_TOO_MANY_BUS_STOPS :{WHITE}Te folle bushaltes
|
STR_ERROR_TOO_MANY_BUS_STOPS :{WHITE}Te folle bushaltes
|
||||||
STR_ERROR_TOO_MANY_TRUCK_STOPS :{WHITE}Te folle frachtstasjons
|
STR_ERROR_TOO_MANY_TRUCK_STOPS :{WHITE}Te folle frachtstasjons
|
||||||
STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Te ticht by in oar stasjon
|
STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Te ticht by in oar stasjon
|
||||||
STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK :{WHITE}Te ticht by in oare haven
|
STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK :{WHITE}Te ticht by in oare haven
|
||||||
STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT :{WHITE}Te ticht by in oar fleanfjild
|
STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT :{WHITE}Te ticht by in oar fleanfjild
|
||||||
STR_ERROR_CAN_T_RENAME_STATION :{WHITE}Kin namme fan stasjon net feroarje
|
STR_ERROR_CAN_T_RENAME_STATION :{WHITE}Kin namme fan stasjon net feroarje
|
||||||
|
STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD :{WHITE}... dizze dyk is eigendom fan in stêd
|
||||||
|
STR_ERROR_DRIVE_THROUGH_DIRECTION :{WHITE}... dyk leit in ferkearde rjochting
|
||||||
|
STR_ERROR_DRIVE_THROUGH_CORNER :{WHITE}... trochriidhaltes kinne gjin bochten hawwe
|
||||||
|
STR_ERROR_DRIVE_THROUGH_JUNCTION :{WHITE}... trochriidhaltes kinne gjin krusings hawwe
|
||||||
|
|
||||||
# Station destruction related errors
|
# Station destruction related errors
|
||||||
|
STR_ERROR_CAN_T_REMOVE_PART_OF_STATION :{WHITE}Kin diel fan it stasjon net fourthelje...
|
||||||
STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Treinstasjon moat earst fuorthelle wurde
|
STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Treinstasjon moat earst fuorthelle wurde
|
||||||
STR_ERROR_CAN_T_REMOVE_BUS_STATION :{WHITE}Kin busstasjon net fuorthelje...
|
STR_ERROR_CAN_T_REMOVE_BUS_STATION :{WHITE}Kin busstasjon net fuorthelje...
|
||||||
STR_ERROR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Kin frachtstasjon net fuorthelje...
|
STR_ERROR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Kin frachtstasjon net fuorthelje...
|
||||||
|
|||||||
@@ -13,9 +13,9 @@
|
|||||||
#define LANGUAGE_H
|
#define LANGUAGE_H
|
||||||
|
|
||||||
#include "core/smallvec_type.hpp"
|
#include "core/smallvec_type.hpp"
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
#include <unicode/coll.h>
|
#include <unicode/coll.h>
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
static const uint8 CASE_GENDER_LEN = 16; ///< The (maximum) length of a case/gender string.
|
static const uint8 CASE_GENDER_LEN = 16; ///< The (maximum) length of a case/gender string.
|
||||||
static const uint8 MAX_NUM_GENDERS = 8; ///< Maximum number of supported genders.
|
static const uint8 MAX_NUM_GENDERS = 8; ///< Maximum number of supported genders.
|
||||||
@@ -110,9 +110,9 @@ extern LanguageList _languages;
|
|||||||
/** The currently loaded language. */
|
/** The currently loaded language. */
|
||||||
extern const LanguageMetadata *_current_language;
|
extern const LanguageMetadata *_current_language;
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
extern Collator *_current_collator;
|
extern Collator *_current_collator;
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
bool ReadLanguagePack(const LanguageMetadata *lang);
|
bool ReadLanguagePack(const LanguageMetadata *lang);
|
||||||
const LanguageMetadata *GetLanguage(byte newgrflangid);
|
const LanguageMetadata *GetLanguage(byte newgrflangid);
|
||||||
|
|||||||
@@ -25,7 +25,12 @@ int32 SimpleCountedObject::Release()
|
|||||||
int32 res = --m_ref_cnt;
|
int32 res = --m_ref_cnt;
|
||||||
assert(res >= 0);
|
assert(res >= 0);
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
FinalRelease();
|
try {
|
||||||
|
FinalRelease(); // may throw, for example ScriptTest/ExecMode
|
||||||
|
} catch (...) {
|
||||||
|
delete this;
|
||||||
|
throw;
|
||||||
|
}
|
||||||
delete this;
|
delete this;
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
|
|||||||
@@ -825,7 +825,7 @@ Point QueryString::GetCaretPosition(const Window *w, int wid) const
|
|||||||
int delta = min(0, (right - left) - tb->pixels - 10);
|
int delta = min(0, (right - left) - tb->pixels - 10);
|
||||||
if (tb->caretxoffs + delta < 0) delta = -tb->caretxoffs;
|
if (tb->caretxoffs + delta < 0) delta = -tb->caretxoffs;
|
||||||
|
|
||||||
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, wi->pos_y + WD_FRAMERECT_TOP};
|
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, (int)wi->pos_y + WD_FRAMERECT_TOP};
|
||||||
return pt;
|
return pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "dmusic.h"
|
#include "dmusic.h"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#undef FACILITY_DIRECTMUSIC // Needed for newer Windows SDK version.
|
||||||
#include <dmksctrl.h>
|
#include <dmksctrl.h>
|
||||||
#include <dmusici.h>
|
#include <dmusici.h>
|
||||||
#include <dmusicc.h>
|
#include <dmusicc.h>
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ struct NewGRFParametersWindow : public Window {
|
|||||||
|
|
||||||
case WID_NP_DESCRIPTION:
|
case WID_NP_DESCRIPTION:
|
||||||
/* Minimum size of 4 lines. The 500 is the default size of the window. */
|
/* Minimum size of 4 lines. The 500 is the default size of the window. */
|
||||||
Dimension suggestion = {500 - WD_FRAMERECT_LEFT - WD_FRAMERECT_RIGHT, FONT_HEIGHT_NORMAL * 4 + WD_TEXTPANEL_TOP + WD_TEXTPANEL_BOTTOM};
|
Dimension suggestion = {500 - WD_FRAMERECT_LEFT - WD_FRAMERECT_RIGHT, (uint)FONT_HEIGHT_NORMAL * 4 + WD_TEXTPANEL_TOP + WD_TEXTPANEL_BOTTOM};
|
||||||
for (uint i = 0; i < this->grf_config->param_info.Length(); i++) {
|
for (uint i = 0; i < this->grf_config->param_info.Length(); i++) {
|
||||||
const GRFParameterInfo *par_info = this->grf_config->param_info[i];
|
const GRFParameterInfo *par_info = this->grf_config->param_info[i];
|
||||||
if (par_info == NULL) continue;
|
if (par_info == NULL) continue;
|
||||||
|
|||||||
@@ -322,7 +322,9 @@ static char *PrintModuleInfo(char *output, const char *last, HMODULE mod)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
|
#pragma warning(disable:4091)
|
||||||
#include <dbghelp.h>
|
#include <dbghelp.h>
|
||||||
|
#pragma warning(default:4091)
|
||||||
|
|
||||||
char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) const
|
char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) const
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,13 +14,13 @@
|
|||||||
#include "../../gfx_func.h"
|
#include "../../gfx_func.h"
|
||||||
#include "../../textbuf_gui.h"
|
#include "../../textbuf_gui.h"
|
||||||
#include "../../fileio_func.h"
|
#include "../../fileio_func.h"
|
||||||
#include "../../fios.h"
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <regstr.h>
|
#include <regstr.h>
|
||||||
#include <shlobj.h> /* SHGetFolderPath */
|
#include <shlobj.h> /* SHGetFolderPath */
|
||||||
#include <shellapi.h>
|
#include <shellapi.h>
|
||||||
#include "win32.h"
|
#include "win32.h"
|
||||||
|
#include "../../fios.h"
|
||||||
#include "../../core/alloc_func.hpp"
|
#include "../../core/alloc_func.hpp"
|
||||||
#include "../../openttd.h"
|
#include "../../openttd.h"
|
||||||
#include "../../core/random_func.hpp"
|
#include "../../core/random_func.hpp"
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ static void PlaceRoadStop(TileIndex start_tile, TileIndex end_tile, uint32 p2, u
|
|||||||
p2 |= ddir << 6; // Set the DiagDirecion into p2 bits 6 and 7.
|
p2 |= ddir << 6; // Set the DiagDirecion into p2 bits 6 and 7.
|
||||||
|
|
||||||
TileArea ta(start_tile, end_tile);
|
TileArea ta(start_tile, end_tile);
|
||||||
CommandContainer cmdcont = { ta.tile, ta.w | ta.h << 8, p2, cmd, CcRoadStop, "" };
|
CommandContainer cmdcont = { ta.tile, (uint32)(ta.w | ta.h << 8), p2, cmd, CcRoadStop, "" };
|
||||||
ShowSelectStationIfNeeded(cmdcont, ta);
|
ShowSelectStationIfNeeded(cmdcont, ta);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
#include "../tunnelbridge_map.h"
|
#include "../tunnelbridge_map.h"
|
||||||
#include "../tunnelbridge.h"
|
#include "../tunnelbridge.h"
|
||||||
#include "../station_base.h"
|
#include "../station_base.h"
|
||||||
|
#include "../settings_func.h"
|
||||||
|
|
||||||
#include "saveload.h"
|
#include "saveload.h"
|
||||||
|
|
||||||
@@ -486,6 +487,7 @@ static void Load_PLYR()
|
|||||||
int index;
|
int index;
|
||||||
while ((index = SlIterateArray()) != -1) {
|
while ((index = SlIterateArray()) != -1) {
|
||||||
Company *c = new (index) Company();
|
Company *c = new (index) Company();
|
||||||
|
SetDefaultCompanySettings(c->index);
|
||||||
SaveLoad_PLYR(c);
|
SaveLoad_PLYR(c);
|
||||||
_company_colours[index] = (Colours)c->colour;
|
_company_colours[index] = (Colours)c->colour;
|
||||||
}
|
}
|
||||||
@@ -529,7 +531,25 @@ static void Ptrs_PLYR()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern void LoadSettingsPlyx(bool skip);
|
||||||
|
extern void SaveSettingsPlyx();
|
||||||
|
|
||||||
|
static void Load_PLYX()
|
||||||
|
{
|
||||||
|
LoadSettingsPlyx(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Check_PLYX()
|
||||||
|
{
|
||||||
|
LoadSettingsPlyx(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Save_PLYX()
|
||||||
|
{
|
||||||
|
SaveSettingsPlyx();
|
||||||
|
}
|
||||||
|
|
||||||
extern const ChunkHandler _company_chunk_handlers[] = {
|
extern const ChunkHandler _company_chunk_handlers[] = {
|
||||||
{ 'PLYR', Save_PLYR, Load_PLYR, Ptrs_PLYR, Check_PLYR, CH_ARRAY | CH_LAST},
|
{ 'PLYR', Save_PLYR, Load_PLYR, Ptrs_PLYR, Check_PLYR, CH_ARRAY },
|
||||||
|
{ 'PLYX', Save_PLYX, Load_PLYX, NULL, Check_PLYX, CH_RIFF | CH_LAST},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -165,7 +165,6 @@ static void Save_SLXI()
|
|||||||
SlXvSetCurrentState();
|
SlXvSetCurrentState();
|
||||||
|
|
||||||
static const SaveLoad _xlsi_sub_chunk_desc[] = {
|
static const SaveLoad _xlsi_sub_chunk_desc[] = {
|
||||||
SLE_VAR(SlxiSubChunkInfo, save_version, SLE_UINT16),
|
|
||||||
SLE_STR(SlxiSubChunkInfo, name, SLE_STR, 0),
|
SLE_STR(SlxiSubChunkInfo, name, SLE_STR, 0),
|
||||||
SLE_END()
|
SLE_END()
|
||||||
};
|
};
|
||||||
@@ -179,9 +178,9 @@ static void Save_SLXI()
|
|||||||
chunk_counts.resize(XSLFI_SIZE);
|
chunk_counts.resize(XSLFI_SIZE);
|
||||||
const SlxiSubChunkInfo *info = _sl_xv_sub_chunk_infos;
|
const SlxiSubChunkInfo *info = _sl_xv_sub_chunk_infos;
|
||||||
for (; info->index != XSLFI_NULL; ++info) {
|
for (; info->index != XSLFI_NULL; ++info) {
|
||||||
if (info->save_version > 0) {
|
if (_sl_xv_feature_versions[info->index] > 0) {
|
||||||
item_count++;
|
item_count++;
|
||||||
length += 4;
|
length += 6;
|
||||||
length += SlCalcObjLength(info, _xlsi_sub_chunk_desc);
|
length += SlCalcObjLength(info, _xlsi_sub_chunk_desc);
|
||||||
if (info->save_proc) {
|
if (info->save_proc) {
|
||||||
uint32 extra_data_length = info->save_proc(info, true);
|
uint32 extra_data_length = info->save_proc(info, true);
|
||||||
@@ -209,7 +208,8 @@ static void Save_SLXI()
|
|||||||
// write data
|
// write data
|
||||||
info = _sl_xv_sub_chunk_infos;
|
info = _sl_xv_sub_chunk_infos;
|
||||||
for (; info->index != XSLFI_NULL; ++info) {
|
for (; info->index != XSLFI_NULL; ++info) {
|
||||||
if (info->save_version > 0) {
|
uint16 save_version = _sl_xv_feature_versions[info->index];
|
||||||
|
if (save_version > 0) {
|
||||||
SlxiSubChunkFlags flags = info->flags;
|
SlxiSubChunkFlags flags = info->flags;
|
||||||
assert(!(flags & (XSCF_EXTRA_DATA_PRESENT | XSCF_CHUNK_ID_LIST_PRESENT)));
|
assert(!(flags & (XSCF_EXTRA_DATA_PRESENT | XSCF_CHUNK_ID_LIST_PRESENT)));
|
||||||
uint32 extra_data_length = extra_data_lengths[info->index];
|
uint32 extra_data_length = extra_data_lengths[info->index];
|
||||||
@@ -217,6 +217,7 @@ static void Save_SLXI()
|
|||||||
if (extra_data_length > 0) flags |= XSCF_EXTRA_DATA_PRESENT;
|
if (extra_data_length > 0) flags |= XSCF_EXTRA_DATA_PRESENT;
|
||||||
if (chunk_count > 0) flags |= XSCF_CHUNK_ID_LIST_PRESENT;
|
if (chunk_count > 0) flags |= XSCF_CHUNK_ID_LIST_PRESENT;
|
||||||
SlWriteUint32(flags);
|
SlWriteUint32(flags);
|
||||||
|
SlWriteUint16(save_version);
|
||||||
SlObject(const_cast<SlxiSubChunkInfo *>(info), _xlsi_sub_chunk_desc);
|
SlObject(const_cast<SlxiSubChunkInfo *>(info), _xlsi_sub_chunk_desc);
|
||||||
|
|
||||||
if (extra_data_length > 0) {
|
if (extra_data_length > 0) {
|
||||||
|
|||||||
@@ -888,9 +888,20 @@ void SlSetLength(size_t length)
|
|||||||
case CH_RIFF:
|
case CH_RIFF:
|
||||||
/* Ugly encoding of >16M RIFF chunks
|
/* Ugly encoding of >16M RIFF chunks
|
||||||
* The lower 24 bits are normal
|
* The lower 24 bits are normal
|
||||||
* The uppermost 4 bits are bits 24:27 */
|
* The uppermost 4 bits are bits 24:27
|
||||||
assert(length < (1 << 28));
|
*
|
||||||
|
* If we have more than 28 bits, use an extra uint32 and
|
||||||
|
* signal this using the extended chunk header */
|
||||||
|
assert(length < (1LL << 32));
|
||||||
|
if (length >= (1 << 28)) {
|
||||||
|
/* write out extended chunk header */
|
||||||
|
SlWriteByte(CH_EXT_HDR);
|
||||||
|
SlWriteUint32(static_cast<uint32>(SLCEHF_BIG_RIFF));
|
||||||
|
}
|
||||||
SlWriteUint32((uint32)((length & 0xFFFFFF) | ((length >> 24) << 28)));
|
SlWriteUint32((uint32)((length & 0xFFFFFF) | ((length >> 24) << 28)));
|
||||||
|
if (length >= (1 << 28)) {
|
||||||
|
SlWriteUint32(length >> 28);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case CH_ARRAY:
|
case CH_ARRAY:
|
||||||
assert(_sl.last_array_index <= _sl.array_index);
|
assert(_sl.last_array_index <= _sl.array_index);
|
||||||
@@ -1661,6 +1672,16 @@ void SlAutolength(AutolengthProc *proc, void *arg)
|
|||||||
if (offs != _sl.dumper->GetSize()) SlErrorCorrupt("Invalid chunk size");
|
if (offs != _sl.dumper->GetSize()) SlErrorCorrupt("Invalid chunk size");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Notes on extended chunk header:
|
||||||
|
*
|
||||||
|
* If the chunk type is CH_EXT_HDR (15), then a u32 flags field follows.
|
||||||
|
* This flag field may define additional fields which follow the flags field in future.
|
||||||
|
* The standard chunk header follows, though it my be modified by the flags field.
|
||||||
|
* At present SLCEHF_BIG_RIFF increases the RIFF size limit to a theoretical 60 bits,
|
||||||
|
* by adding a further u32 field for the high bits after the existing RIFF size field.
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load a chunk of data (eg vehicles, stations, etc.)
|
* Load a chunk of data (eg vehicles, stations, etc.)
|
||||||
* @param ch The chunkhandler that will be used for the operation
|
* @param ch The chunkhandler that will be used for the operation
|
||||||
@@ -1674,6 +1695,15 @@ static void SlLoadChunk(const ChunkHandler *ch)
|
|||||||
_sl.block_mode = m;
|
_sl.block_mode = m;
|
||||||
_sl.obj_len = 0;
|
_sl.obj_len = 0;
|
||||||
|
|
||||||
|
SaveLoadChunkExtHeaderFlags ext_flags = static_cast<SaveLoadChunkExtHeaderFlags>(0);
|
||||||
|
if ((m & 0xF) == CH_EXT_HDR) {
|
||||||
|
ext_flags = static_cast<SaveLoadChunkExtHeaderFlags>(SlReadUint32());
|
||||||
|
|
||||||
|
/* read in real header */
|
||||||
|
m = SlReadByte();
|
||||||
|
_sl.block_mode = m;
|
||||||
|
}
|
||||||
|
|
||||||
switch (m) {
|
switch (m) {
|
||||||
case CH_ARRAY:
|
case CH_ARRAY:
|
||||||
_sl.array_index = 0;
|
_sl.array_index = 0;
|
||||||
@@ -1689,6 +1719,10 @@ static void SlLoadChunk(const ChunkHandler *ch)
|
|||||||
/* Read length */
|
/* Read length */
|
||||||
len = (SlReadByte() << 16) | ((m >> 4) << 24);
|
len = (SlReadByte() << 16) | ((m >> 4) << 24);
|
||||||
len += SlReadUint16();
|
len += SlReadUint16();
|
||||||
|
if (ext_flags & SLCEHF_BIG_RIFF) {
|
||||||
|
len |= SlReadUint32() << 28;
|
||||||
|
}
|
||||||
|
|
||||||
_sl.obj_len = len;
|
_sl.obj_len = len;
|
||||||
endoffs = _sl.reader->GetSize() + len;
|
endoffs = _sl.reader->GetSize() + len;
|
||||||
ch->load_proc();
|
ch->load_proc();
|
||||||
@@ -1714,9 +1748,21 @@ static void SlLoadCheckChunk(const ChunkHandler *ch)
|
|||||||
_sl.block_mode = m;
|
_sl.block_mode = m;
|
||||||
_sl.obj_len = 0;
|
_sl.obj_len = 0;
|
||||||
|
|
||||||
|
SaveLoadChunkExtHeaderFlags ext_flags = static_cast<SaveLoadChunkExtHeaderFlags>(0);
|
||||||
|
if ((m & 0xF) == CH_EXT_HDR) {
|
||||||
|
ext_flags = static_cast<SaveLoadChunkExtHeaderFlags>(SlReadUint32());
|
||||||
|
|
||||||
|
/* read in real header */
|
||||||
|
m = SlReadByte();
|
||||||
|
_sl.block_mode = m;
|
||||||
|
}
|
||||||
|
|
||||||
switch (m) {
|
switch (m) {
|
||||||
case CH_ARRAY:
|
case CH_ARRAY:
|
||||||
_sl.array_index = 0;
|
_sl.array_index = 0;
|
||||||
|
if (ext_flags) {
|
||||||
|
SlErrorCorruptFmt("CH_ARRAY does not take chunk header extension flags: 0x%X", ext_flags);
|
||||||
|
}
|
||||||
if (ch && ch->load_check_proc) {
|
if (ch && ch->load_check_proc) {
|
||||||
ch->load_check_proc();
|
ch->load_check_proc();
|
||||||
} else {
|
} else {
|
||||||
@@ -1724,6 +1770,9 @@ static void SlLoadCheckChunk(const ChunkHandler *ch)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CH_SPARSE_ARRAY:
|
case CH_SPARSE_ARRAY:
|
||||||
|
if (ext_flags) {
|
||||||
|
SlErrorCorruptFmt("CH_SPARSE_ARRAY does not take chunk header extension flags: 0x%X", ext_flags);
|
||||||
|
}
|
||||||
if (ch && ch->load_check_proc) {
|
if (ch && ch->load_check_proc) {
|
||||||
ch->load_check_proc();
|
ch->load_check_proc();
|
||||||
} else {
|
} else {
|
||||||
@@ -1732,9 +1781,19 @@ static void SlLoadCheckChunk(const ChunkHandler *ch)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if ((m & 0xF) == CH_RIFF) {
|
if ((m & 0xF) == CH_RIFF) {
|
||||||
|
if (ext_flags != (ext_flags & SLCEHF_BIG_RIFF)) {
|
||||||
|
SlErrorCorruptFmt("Unknown chunk header extension flags for CH_RIFF: 0x%X", ext_flags);
|
||||||
|
}
|
||||||
/* Read length */
|
/* Read length */
|
||||||
len = (SlReadByte() << 16) | ((m >> 4) << 24);
|
len = (SlReadByte() << 16) | ((m >> 4) << 24);
|
||||||
len += SlReadUint16();
|
len += SlReadUint16();
|
||||||
|
if (ext_flags & SLCEHF_BIG_RIFF) {
|
||||||
|
uint64 full_len = len | (static_cast<uint64>(SlReadUint32()) << 28);
|
||||||
|
if (full_len >= (1LL << 32)) {
|
||||||
|
SlErrorCorrupt("Chunk size too large: " OTTD_PRINTFHEX64, full_len);
|
||||||
|
}
|
||||||
|
len = static_cast<size_t>(full_len);
|
||||||
|
}
|
||||||
_sl.obj_len = len;
|
_sl.obj_len = len;
|
||||||
endoffs = _sl.reader->GetSize() + len;
|
endoffs = _sl.reader->GetSize() + len;
|
||||||
if (ch && ch->load_check_proc) {
|
if (ch && ch->load_check_proc) {
|
||||||
|
|||||||
@@ -99,10 +99,17 @@ enum ChunkType {
|
|||||||
CH_ARRAY = 1,
|
CH_ARRAY = 1,
|
||||||
CH_SPARSE_ARRAY = 2,
|
CH_SPARSE_ARRAY = 2,
|
||||||
CH_TYPE_MASK = 3,
|
CH_TYPE_MASK = 3,
|
||||||
|
CH_EXT_HDR = 15, ///< Extended chunk header
|
||||||
CH_LAST = 8, ///< Last chunk in this array.
|
CH_LAST = 8, ///< Last chunk in this array.
|
||||||
CH_AUTO_LENGTH = 16,
|
CH_AUTO_LENGTH = 16,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** Flags for chunk extended headers */
|
||||||
|
enum SaveLoadChunkExtHeaderFlags {
|
||||||
|
SLCEHF_BIG_RIFF = 1 << 0, ///< This block uses a 60-bit RIFF chunk size
|
||||||
|
};
|
||||||
|
DECLARE_ENUM_AS_BIT_SET(SaveLoadChunkExtHeaderFlags)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* VarTypes is the general bitmasked magic type that tells us
|
* VarTypes is the general bitmasked magic type that tells us
|
||||||
* certain characteristics about the variable it refers to. For example
|
* certain characteristics about the variable it refers to. For example
|
||||||
@@ -234,7 +241,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @note In general, it is better to use one of the SLE_* macros below.
|
* @note In general, it is better to use one of the SLE_* macros below.
|
||||||
*/
|
*/
|
||||||
#define SLE_GENERAL_X(cmd, base, variable, type, length, from, to, extver) {false, cmd, type, length, from, to, (void*)cpp_offsetof(base, variable), cpp_sizeof(base, variable), extver}
|
#define SLE_GENERAL_X(cmd, base, variable, type, length, from, to, extver) {false, cmd, type, length, from, to, (void*)cpp_offsetof(base, variable), cpp_sizeof(base, variable), extver}
|
||||||
#define SLE_GENERAL(cmd, base, variable, type, length, from, to) SLE_GENERAL_X(cmd, base, variable, type, length, from, to, {})
|
#define SLE_GENERAL(cmd, base, variable, type, length, from, to) SLE_GENERAL_X(cmd, base, variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a variable in some savegame versions.
|
* Storage of a variable in some savegame versions.
|
||||||
@@ -246,7 +253,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDVAR_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_VAR, base, variable, type, 0, from, to, extver)
|
#define SLE_CONDVAR_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_VAR, base, variable, type, 0, from, to, extver)
|
||||||
#define SLE_CONDVAR(base, variable, type, from, to) SLE_CONDVAR_X(base, variable, type, from, to, {})
|
#define SLE_CONDVAR(base, variable, type, from, to) SLE_CONDVAR_X(base, variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a reference in some savegame versions.
|
* Storage of a reference in some savegame versions.
|
||||||
@@ -258,7 +265,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDREF_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_REF, base, variable, type, 0, from, to, extver)
|
#define SLE_CONDREF_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_REF, base, variable, type, 0, from, to, extver)
|
||||||
#define SLE_CONDREF(base, variable, type, from, to) SLE_CONDREF_X(base, variable, type, from, to, {})
|
#define SLE_CONDREF(base, variable, type, from, to) SLE_CONDREF_X(base, variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of an array in some savegame versions.
|
* Storage of an array in some savegame versions.
|
||||||
@@ -271,7 +278,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDARR_X(base, variable, type, length, from, to, extver) SLE_GENERAL_X(SL_ARR, base, variable, type, length, from, to, extver)
|
#define SLE_CONDARR_X(base, variable, type, length, from, to, extver) SLE_GENERAL_X(SL_ARR, base, variable, type, length, from, to, extver)
|
||||||
#define SLE_CONDARR(base, variable, type, length, from, to) SLE_CONDARR_X(base, variable, type, length, from, to, {})
|
#define SLE_CONDARR(base, variable, type, length, from, to) SLE_CONDARR_X(base, variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a string in some savegame versions.
|
* Storage of a string in some savegame versions.
|
||||||
@@ -284,7 +291,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDSTR_X(base, variable, type, length, from, to, extver) SLE_GENERAL_X(SL_STR, base, variable, type, length, from, to, extver)
|
#define SLE_CONDSTR_X(base, variable, type, length, from, to, extver) SLE_GENERAL_X(SL_STR, base, variable, type, length, from, to, extver)
|
||||||
#define SLE_CONDSTR(base, variable, type, length, from, to) SLE_CONDSTR_X(base, variable, type, length, from, to, {})
|
#define SLE_CONDSTR(base, variable, type, length, from, to) SLE_CONDSTR_X(base, variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a list in some savegame versions.
|
* Storage of a list in some savegame versions.
|
||||||
@@ -296,7 +303,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDLST_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_LST, base, variable, type, 0, from, to, extver)
|
#define SLE_CONDLST_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_LST, base, variable, type, 0, from, to, extver)
|
||||||
#define SLE_CONDLST(base, variable, type, from, to) SLE_CONDLST_X(base, variable, type, from, to, {})
|
#define SLE_CONDLST(base, variable, type, from, to) SLE_CONDLST_X(base, variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a variable in every version of a savegame.
|
* Storage of a variable in every version of a savegame.
|
||||||
@@ -354,16 +361,16 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have empty space
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have empty space
|
||||||
*/
|
*/
|
||||||
#define SLE_CONDNULL_X(length, from, to, extver) SLE_CONDARR_X(NullStruct, null, SLE_FILE_U8 | SLE_VAR_NULL | SLF_NOT_IN_CONFIG, length, from, to, extver)
|
#define SLE_CONDNULL_X(length, from, to, extver) SLE_CONDARR_X(NullStruct, null, SLE_FILE_U8 | SLE_VAR_NULL | SLF_NOT_IN_CONFIG, length, from, to, extver)
|
||||||
#define SLE_CONDNULL(length, from, to) SLE_CONDNULL_X(length, from, to, {})
|
#define SLE_CONDNULL(length, from, to) SLE_CONDNULL_X(length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/** Translate values ingame to different values in the savegame and vv. */
|
/** Translate values ingame to different values in the savegame and vv. */
|
||||||
#define SLE_WRITEBYTE(base, variable, value) SLE_GENERAL(SL_WRITEBYTE, base, variable, 0, 0, value, value)
|
#define SLE_WRITEBYTE(base, variable, value) SLE_GENERAL(SL_WRITEBYTE, base, variable, 0, 0, value, value)
|
||||||
|
|
||||||
#define SLE_VEH_INCLUDE() {false, SL_VEH_INCLUDE, 0, 0, 0, SL_MAX_VERSION, NULL, 0, {}}
|
#define SLE_VEH_INCLUDE() {false, SL_VEH_INCLUDE, 0, 0, 0, SL_MAX_VERSION, NULL, 0, SlXvFeatureTest()}
|
||||||
#define SLE_ST_INCLUDE() {false, SL_ST_INCLUDE, 0, 0, 0, SL_MAX_VERSION, NULL, 0, {}}
|
#define SLE_ST_INCLUDE() {false, SL_ST_INCLUDE, 0, 0, 0, SL_MAX_VERSION, NULL, 0, SlXvFeatureTest()}
|
||||||
|
|
||||||
/** End marker of a struct/class save or load. */
|
/** End marker of a struct/class save or load. */
|
||||||
#define SLE_END() {false, SL_END, 0, 0, 0, 0, NULL, 0, {}}
|
#define SLE_END() {false, SL_END, 0, 0, 0, 0, NULL, 0, SlXvFeatureTest()}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of global simple variables, references (pointers), and arrays.
|
* Storage of global simple variables, references (pointers), and arrays.
|
||||||
@@ -376,7 +383,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @note In general, it is better to use one of the SLEG_* macros below.
|
* @note In general, it is better to use one of the SLEG_* macros below.
|
||||||
*/
|
*/
|
||||||
#define SLEG_GENERAL_X(cmd, variable, type, length, from, to, extver) {true, cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
|
#define SLEG_GENERAL_X(cmd, variable, type, length, from, to, extver) {true, cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
|
||||||
#define SLEG_GENERAL(cmd, variable, type, length, from, to) SLEG_GENERAL_X(cmd, variable, type, length, from, to, {})
|
#define SLEG_GENERAL(cmd, variable, type, length, from, to) SLEG_GENERAL_X(cmd, variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global variable in some savegame versions.
|
* Storage of a global variable in some savegame versions.
|
||||||
@@ -387,7 +394,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDVAR_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_VAR, variable, type, 0, from, to, extver)
|
#define SLEG_CONDVAR_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_VAR, variable, type, 0, from, to, extver)
|
||||||
#define SLEG_CONDVAR(variable, type, from, to) SLEG_CONDVAR_X(variable, type, from, to, {})
|
#define SLEG_CONDVAR(variable, type, from, to) SLEG_CONDVAR_X(variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global reference in some savegame versions.
|
* Storage of a global reference in some savegame versions.
|
||||||
@@ -398,7 +405,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDREF_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_REF, variable, type, 0, from, to, extver)
|
#define SLEG_CONDREF_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_REF, variable, type, 0, from, to, extver)
|
||||||
#define SLEG_CONDREF(variable, type, from, to) SLEG_CONDREF_X(variable, type, from, to, {})
|
#define SLEG_CONDREF(variable, type, from, to) SLEG_CONDREF_X(variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global array in some savegame versions.
|
* Storage of a global array in some savegame versions.
|
||||||
@@ -410,7 +417,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDARR_X(variable, type, length, from, to, extver) SLEG_GENERAL_X(SL_ARR, variable, type, length, from, to, extver)
|
#define SLEG_CONDARR_X(variable, type, length, from, to, extver) SLEG_GENERAL_X(SL_ARR, variable, type, length, from, to, extver)
|
||||||
#define SLEG_CONDARR(variable, type, length, from, to) SLEG_CONDARR_X(variable, type, length, from, to, {})
|
#define SLEG_CONDARR(variable, type, length, from, to) SLEG_CONDARR_X(variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global string in some savegame versions.
|
* Storage of a global string in some savegame versions.
|
||||||
@@ -422,7 +429,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDSTR_X(variable, type, length, from, to, extver) SLEG_GENERAL_X(SL_STR, variable, type, length, from, to, extver)
|
#define SLEG_CONDSTR_X(variable, type, length, from, to, extver) SLEG_GENERAL_X(SL_STR, variable, type, length, from, to, extver)
|
||||||
#define SLEG_CONDSTR(variable, type, length, from, to) SLEG_CONDSTR_X(variable, type, length, from, to, {})
|
#define SLEG_CONDSTR(variable, type, length, from, to) SLEG_CONDSTR_X(variable, type, length, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global list in some savegame versions.
|
* Storage of a global list in some savegame versions.
|
||||||
@@ -433,7 +440,7 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDLST_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_LST, variable, type, 0, from, to, extver)
|
#define SLEG_CONDLST_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_LST, variable, type, 0, from, to, extver)
|
||||||
#define SLEG_CONDLST(variable, type, from, to) SLEG_CONDLST_X(variable, type, from, to, {})
|
#define SLEG_CONDLST(variable, type, from, to) SLEG_CONDLST_X(variable, type, from, to, SlXvFeatureTest())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage of a global variable in every savegame version.
|
* Storage of a global variable in every savegame version.
|
||||||
@@ -477,10 +484,10 @@ typedef SaveLoad SaveLoadGlobVarList;
|
|||||||
* @param to Last savegame version that has the empty space.
|
* @param to Last savegame version that has the empty space.
|
||||||
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have empty space
|
* @param extver SlXvFeatureTest to test (along with from and to) which savegames have empty space
|
||||||
*/
|
*/
|
||||||
#define SLEG_CONDNULL(length, from, to) {true, SL_ARR, SLE_FILE_U8 | SLE_VAR_NULL | SLF_NOT_IN_CONFIG, length, from, to, (void*)NULL, {}}
|
#define SLEG_CONDNULL(length, from, to) {true, SL_ARR, SLE_FILE_U8 | SLE_VAR_NULL | SLF_NOT_IN_CONFIG, length, from, to, (void*)NULL, SlXvFeatureTest()}
|
||||||
|
|
||||||
/** End marker of global variables save or load. */
|
/** End marker of global variables save or load. */
|
||||||
#define SLEG_END() {true, SL_END, 0, 0, 0, 0, NULL, 0, {}}
|
#define SLEG_END() {true, SL_END, 0, 0, 0, 0, NULL, 0, SlXvFeatureTest()}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether the savegame is below \a major.\a minor.
|
* Checks whether the savegame is below \a major.\a minor.
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ ScriptExecMode::ScriptExecMode()
|
|||||||
this->SetDoCommandMode(&ScriptExecMode::ModeProc, this);
|
this->SetDoCommandMode(&ScriptExecMode::ModeProc, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptExecMode::~ScriptExecMode()
|
void ScriptExecMode::FinalRelease()
|
||||||
{
|
{
|
||||||
if (this->GetDoCommandModeInstance() != this) {
|
if (this->GetDoCommandModeInstance() != this) {
|
||||||
/* Ignore this error if the script already died. */
|
/* Ignore this error if the script already died. */
|
||||||
@@ -38,5 +38,9 @@ ScriptExecMode::~ScriptExecMode()
|
|||||||
throw Script_FatalError("ScriptExecMode object was removed while it was not the latest *Mode object created.");
|
throw Script_FatalError("ScriptExecMode object was removed while it was not the latest *Mode object created.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScriptExecMode::~ScriptExecMode()
|
||||||
|
{
|
||||||
this->SetDoCommandMode(this->last_mode, this->last_instance);
|
this->SetDoCommandMode(this->last_mode, this->last_instance);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ public:
|
|||||||
* in when the instance was created.
|
* in when the instance was created.
|
||||||
*/
|
*/
|
||||||
~ScriptExecMode();
|
~ScriptExecMode();
|
||||||
|
|
||||||
|
virtual void FinalRelease();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* SCRIPT_EXECMODE_HPP */
|
#endif /* SCRIPT_EXECMODE_HPP */
|
||||||
|
|||||||
@@ -371,8 +371,8 @@ static bool NormaliseTileOffset(int32 *tile)
|
|||||||
if (!::IsValidTile(tile) || !::IsValidTile(start) || !::IsValidTile(end)) return -1;
|
if (!::IsValidTile(tile) || !::IsValidTile(start) || !::IsValidTile(end)) return -1;
|
||||||
if (::DistanceManhattan(tile, start) != 1 || ::DistanceManhattan(tile, end) != 1) return -1;
|
if (::DistanceManhattan(tile, start) != 1 || ::DistanceManhattan(tile, end) != 1) return -1;
|
||||||
|
|
||||||
/* ROAD_NW ROAD_SW ROAD_SE ROAD_NE */
|
/* ROAD_NW ROAD_SW ROAD_SE ROAD_NE */
|
||||||
static const TileIndex neighbours[] = {::TileDiffXY(0, -1), ::TileDiffXY(1, 0), ::TileDiffXY(0, 1), ::TileDiffXY(-1, 0)};
|
static const TileIndexDiff neighbours[] = {::TileDiffXY(0, -1), ::TileDiffXY(1, 0), ::TileDiffXY(0, 1), ::TileDiffXY(-1, 0)};
|
||||||
Array *existing = (Array*)alloca(sizeof(Array) + lengthof(neighbours) * sizeof(int32));
|
Array *existing = (Array*)alloca(sizeof(Array) + lengthof(neighbours) * sizeof(int32));
|
||||||
existing->size = 0;
|
existing->size = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ ScriptTestMode::ScriptTestMode()
|
|||||||
this->SetDoCommandMode(&ScriptTestMode::ModeProc, this);
|
this->SetDoCommandMode(&ScriptTestMode::ModeProc, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptTestMode::~ScriptTestMode()
|
void ScriptTestMode::FinalRelease()
|
||||||
{
|
{
|
||||||
if (this->GetDoCommandModeInstance() != this) {
|
if (this->GetDoCommandModeInstance() != this) {
|
||||||
/* Ignore this error if the script already died. */
|
/* Ignore this error if the script already died. */
|
||||||
@@ -38,5 +38,9 @@ ScriptTestMode::~ScriptTestMode()
|
|||||||
throw Script_FatalError("Testmode object was removed while it was not the latest *Mode object created.");
|
throw Script_FatalError("Testmode object was removed while it was not the latest *Mode object created.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScriptTestMode::~ScriptTestMode()
|
||||||
|
{
|
||||||
this->SetDoCommandMode(this->last_mode, this->last_instance);
|
this->SetDoCommandMode(this->last_mode, this->last_instance);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ public:
|
|||||||
* in when the instance was created.
|
* in when the instance was created.
|
||||||
*/
|
*/
|
||||||
~ScriptTestMode();
|
~ScriptTestMode();
|
||||||
|
|
||||||
|
virtual void FinalRelease();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* SCRIPT_TESTMODE_HPP */
|
#endif /* SCRIPT_TESTMODE_HPP */
|
||||||
|
|||||||
298
src/settings.cpp
298
src/settings.cpp
@@ -2235,10 +2235,10 @@ static void SaveSettings(const SettingDesc *sd, void *object)
|
|||||||
*
|
*
|
||||||
* The PATX chunk contents has the following format:
|
* The PATX chunk contents has the following format:
|
||||||
*
|
*
|
||||||
* uint32 chunk flags
|
* uint32 chunk flags (unused)
|
||||||
* uint32 number of settings
|
* uint32 number of settings
|
||||||
* For each of N settings:
|
* For each of N settings:
|
||||||
* uint32 setting flags
|
* uint32 setting flags (unused)
|
||||||
* SLE_STR setting name
|
* SLE_STR setting name
|
||||||
* uint32 length of setting field
|
* uint32 length of setting field
|
||||||
* N bytes setting field
|
* N bytes setting field
|
||||||
@@ -2247,6 +2247,18 @@ static void SaveSettings(const SettingDesc *sd, void *object)
|
|||||||
/** Sorted list of PATX settings, generated by MakeSettingsPatxList */
|
/** Sorted list of PATX settings, generated by MakeSettingsPatxList */
|
||||||
static std::vector<const SettingDesc *> _sorted_patx_settings;
|
static std::vector<const SettingDesc *> _sorted_patx_settings;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal structure used in LoadSettingsPatx()
|
||||||
|
* placed outside for legacy compiler compatibility
|
||||||
|
* this makes me miss lambdas :/
|
||||||
|
*/
|
||||||
|
struct StringSorter {
|
||||||
|
bool operator()(const SettingDesc *a, const SettingDesc *b)
|
||||||
|
{
|
||||||
|
return strcmp(a->patx_name, b->patx_name) < 0;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prepare a sorted list of settings to be potentially be loaded out of the PATX chunk
|
* Prepare a sorted list of settings to be potentially be loaded out of the PATX chunk
|
||||||
* This is to enable efficient lookup of settings by name
|
* This is to enable efficient lookup of settings by name
|
||||||
@@ -2257,6 +2269,7 @@ static void MakeSettingsPatxList(const SettingDesc *sd)
|
|||||||
static const SettingDesc *previous = NULL;
|
static const SettingDesc *previous = NULL;
|
||||||
|
|
||||||
if (sd == previous) return;
|
if (sd == previous) return;
|
||||||
|
previous = sd;
|
||||||
|
|
||||||
_sorted_patx_settings.clear();
|
_sorted_patx_settings.clear();
|
||||||
for (const SettingDesc *desc = sd; desc->save.cmd != SL_END; desc++) {
|
for (const SettingDesc *desc = sd; desc->save.cmd != SL_END; desc++) {
|
||||||
@@ -2264,16 +2277,60 @@ static void MakeSettingsPatxList(const SettingDesc *sd)
|
|||||||
_sorted_patx_settings.push_back(desc);
|
_sorted_patx_settings.push_back(desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
// this makes me miss lambdas :/
|
|
||||||
struct StringSorter {
|
|
||||||
bool operator()(const SettingDesc *a, const SettingDesc *b)
|
|
||||||
{
|
|
||||||
return strcmp(a->patx_name, b->patx_name) < 0;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
std::sort(_sorted_patx_settings.begin(), _sorted_patx_settings.end(), StringSorter());
|
std::sort(_sorted_patx_settings.begin(), _sorted_patx_settings.end(), StringSorter());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal structure used in LoadSettingsPatx()
|
||||||
|
* placed outside for legacy compiler compatibility
|
||||||
|
* this is effectively a reference capture lambda
|
||||||
|
*/
|
||||||
|
struct StringSearcher {
|
||||||
|
bool &m_exact_match;
|
||||||
|
|
||||||
|
StringSearcher(bool &exact_match)
|
||||||
|
: m_exact_match(exact_match) { }
|
||||||
|
|
||||||
|
bool operator()(const SettingDesc *a, const char *b)
|
||||||
|
{
|
||||||
|
int result = strcmp(a->patx_name, b);
|
||||||
|
if (result == 0) m_exact_match = true;
|
||||||
|
return result < 0;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal structure used in LoadSettingsPatx() and LoadSettingsPlyx()
|
||||||
|
*/
|
||||||
|
struct SettingsExtLoad {
|
||||||
|
uint32 flags;
|
||||||
|
char name[256];
|
||||||
|
uint32 setting_length;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const SaveLoad _settings_ext_load_desc[] = {
|
||||||
|
SLE_VAR(SettingsExtLoad, flags, SLE_UINT32),
|
||||||
|
SLE_STR(SettingsExtLoad, name, SLE_STRB, 256),
|
||||||
|
SLE_VAR(SettingsExtLoad, setting_length, SLE_UINT32),
|
||||||
|
SLE_END()
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal structure used in SaveSettingsPatx() and SaveSettingsPlyx()
|
||||||
|
*/
|
||||||
|
struct SettingsExtSave {
|
||||||
|
uint32 flags;
|
||||||
|
const char *name;
|
||||||
|
uint32 setting_length;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const SaveLoad _settings_ext_save_desc[] = {
|
||||||
|
SLE_VAR(SettingsExtSave, flags, SLE_UINT32),
|
||||||
|
SLE_STR(SettingsExtSave, name, SLE_STR, 0),
|
||||||
|
SLE_VAR(SettingsExtSave, setting_length, SLE_UINT32),
|
||||||
|
SLE_END()
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load handler for settings which go in the PATX chunk
|
* Load handler for settings which go in the PATX chunk
|
||||||
* @param osd SettingDesc struct containing all information
|
* @param osd SettingDesc struct containing all information
|
||||||
@@ -2284,19 +2341,7 @@ static void LoadSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
{
|
{
|
||||||
MakeSettingsPatxList(sd);
|
MakeSettingsPatxList(sd);
|
||||||
|
|
||||||
struct SettingsPatxLoad {
|
SettingsExtLoad current_setting;
|
||||||
uint32 flags;
|
|
||||||
char name[256];
|
|
||||||
uint32 setting_length;
|
|
||||||
};
|
|
||||||
SettingsPatxLoad current_setting;
|
|
||||||
|
|
||||||
static const SaveLoad _settings_patx_desc[] = {
|
|
||||||
SLE_VAR(SettingsPatxLoad, flags, SLE_UINT32),
|
|
||||||
SLE_STR(SettingsPatxLoad, name, SLE_STRB, 256),
|
|
||||||
SLE_VAR(SettingsPatxLoad, setting_length, SLE_UINT32),
|
|
||||||
SLE_END()
|
|
||||||
};
|
|
||||||
|
|
||||||
uint32 flags = SlReadUint32();
|
uint32 flags = SlReadUint32();
|
||||||
// flags are not in use yet, reserve for future expansion
|
// flags are not in use yet, reserve for future expansion
|
||||||
@@ -2304,26 +2349,13 @@ static void LoadSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
|
|
||||||
uint32 settings_count = SlReadUint32();
|
uint32 settings_count = SlReadUint32();
|
||||||
for (uint32 i = 0; i < settings_count; i++) {
|
for (uint32 i = 0; i < settings_count; i++) {
|
||||||
SlObject(¤t_setting, _settings_patx_desc);
|
SlObject(¤t_setting, _settings_ext_load_desc);
|
||||||
|
|
||||||
// flags are not in use yet, reserve for future expansion
|
// flags are not in use yet, reserve for future expansion
|
||||||
if (current_setting.flags != 0) SlErrorCorruptFmt("PATX chunk: unknown setting header flags: 0x%X", current_setting.flags);
|
if (current_setting.flags != 0) SlErrorCorruptFmt("PATX chunk: unknown setting header flags: 0x%X", current_setting.flags);
|
||||||
|
|
||||||
// now try to find corresponding setting, this would be much easier with C++11 support...
|
// now try to find corresponding setting, this would be much easier with C++11 support...
|
||||||
bool exact_match = false;
|
bool exact_match = false;
|
||||||
struct StringSearcher {
|
|
||||||
bool &m_exact_match;
|
|
||||||
|
|
||||||
StringSearcher(bool &exact_match)
|
|
||||||
: m_exact_match(exact_match) { }
|
|
||||||
|
|
||||||
bool operator()(const SettingDesc *a, const char *b)
|
|
||||||
{
|
|
||||||
int result = strcmp(a->patx_name, b);
|
|
||||||
if (result == 0) m_exact_match = true;
|
|
||||||
return result < 0;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
std::vector<const SettingDesc *>::iterator iter = std::lower_bound(_sorted_patx_settings.begin(), _sorted_patx_settings.end(), current_setting.name, StringSearcher(exact_match));
|
std::vector<const SettingDesc *>::iterator iter = std::lower_bound(_sorted_patx_settings.begin(), _sorted_patx_settings.end(), current_setting.name, StringSearcher(exact_match));
|
||||||
|
|
||||||
if (exact_match) {
|
if (exact_match) {
|
||||||
@@ -2344,6 +2376,15 @@ static void LoadSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal structure used in SaveSettingsPatx()
|
||||||
|
* placed outside for legacy compiler compatibility
|
||||||
|
*/
|
||||||
|
struct SettingToAdd {
|
||||||
|
const SettingDesc *setting;
|
||||||
|
uint32 setting_length;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save handler for settings which go in the PATX chunk
|
* Save handler for settings which go in the PATX chunk
|
||||||
* @param sd SettingDesc struct containing all information
|
* @param sd SettingDesc struct containing all information
|
||||||
@@ -2352,24 +2393,8 @@ static void LoadSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
*/
|
*/
|
||||||
static void SaveSettingsPatx(const SettingDesc *sd, void *object)
|
static void SaveSettingsPatx(const SettingDesc *sd, void *object)
|
||||||
{
|
{
|
||||||
struct SettingsPatxSave {
|
SettingsExtSave current_setting;
|
||||||
uint32 flags;
|
|
||||||
const char *name;
|
|
||||||
uint32 setting_length;
|
|
||||||
};
|
|
||||||
SettingsPatxSave current_setting;
|
|
||||||
|
|
||||||
static const SaveLoad _settings_patx_desc[] = {
|
|
||||||
SLE_VAR(SettingsPatxSave, flags, SLE_UINT32),
|
|
||||||
SLE_STR(SettingsPatxSave, name, SLE_STR, 0),
|
|
||||||
SLE_VAR(SettingsPatxSave, setting_length, SLE_UINT32),
|
|
||||||
SLE_END()
|
|
||||||
};
|
|
||||||
|
|
||||||
struct SettingToAdd {
|
|
||||||
const SettingDesc *setting;
|
|
||||||
uint32 setting_length;
|
|
||||||
};
|
|
||||||
std::vector<SettingToAdd> settings_to_add;
|
std::vector<SettingToAdd> settings_to_add;
|
||||||
|
|
||||||
size_t length = 8;
|
size_t length = 8;
|
||||||
@@ -2381,12 +2406,14 @@ static void SaveSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
current_setting.name = desc->patx_name;
|
current_setting.name = desc->patx_name;
|
||||||
|
|
||||||
// add length of setting header
|
// add length of setting header
|
||||||
length += SlCalcObjLength(¤t_setting, _settings_patx_desc);
|
length += SlCalcObjLength(¤t_setting, _settings_ext_save_desc);
|
||||||
|
|
||||||
// add length of actual setting
|
// add length of actual setting
|
||||||
length += setting_length;
|
length += setting_length;
|
||||||
|
|
||||||
settings_to_add.push_back({ desc, setting_length });
|
// duplicate copy made for compiler backwards compatibility
|
||||||
|
SettingToAdd new_setting = { desc, setting_length };
|
||||||
|
settings_to_add.push_back(new_setting);
|
||||||
}
|
}
|
||||||
SlSetLength(length);
|
SlSetLength(length);
|
||||||
|
|
||||||
@@ -2398,12 +2425,171 @@ static void SaveSettingsPatx(const SettingDesc *sd, void *object)
|
|||||||
current_setting.flags = 0;
|
current_setting.flags = 0;
|
||||||
current_setting.name = desc->patx_name;
|
current_setting.name = desc->patx_name;
|
||||||
current_setting.setting_length = settings_to_add[i].setting_length;
|
current_setting.setting_length = settings_to_add[i].setting_length;
|
||||||
SlObject(¤t_setting, _settings_patx_desc);
|
SlObject(¤t_setting, _settings_ext_save_desc);
|
||||||
void *ptr = GetVariableAddress(object, &desc->save);
|
void *ptr = GetVariableAddress(object, &desc->save);
|
||||||
SlObjectMember(ptr, &desc->save);
|
SlObjectMember(ptr, &desc->save);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @file
|
||||||
|
*
|
||||||
|
* The PLYX chunk stores additional company settings in an unordered
|
||||||
|
* format which is tolerant of extra, missing or reordered settings.
|
||||||
|
* The format is similar to the PATX chunk.
|
||||||
|
* Additional settings generally means those that aren't in trunk.
|
||||||
|
*
|
||||||
|
* The PLYX chunk contents has the following format:
|
||||||
|
*
|
||||||
|
* uint32 chunk flags (unused)
|
||||||
|
* uint32 number of companies
|
||||||
|
* For each of N companies:
|
||||||
|
* uint32 company ID
|
||||||
|
* uint32 company flags (unused)
|
||||||
|
* uint32 number of settings
|
||||||
|
* For each of N settings:
|
||||||
|
* uint32 setting flags (unused)
|
||||||
|
* SLE_STR setting name
|
||||||
|
* uint32 length of setting field
|
||||||
|
* N bytes setting field
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load handler for company settings which go in the PLYX chunk
|
||||||
|
* @param check_mode Whether to skip over settings without reading
|
||||||
|
*/
|
||||||
|
void LoadSettingsPlyx(bool skip)
|
||||||
|
{
|
||||||
|
SettingsExtLoad current_setting;
|
||||||
|
|
||||||
|
uint32 chunk_flags = SlReadUint32();
|
||||||
|
// flags are not in use yet, reserve for future expansion
|
||||||
|
if (chunk_flags != 0) SlErrorCorruptFmt("PLYX chunk: unknown chunk header flags: 0x%X", chunk_flags);
|
||||||
|
|
||||||
|
uint32 company_count = SlReadUint32();
|
||||||
|
for (uint32 i = 0; i < company_count; i++) {
|
||||||
|
uint32 company_id = SlReadUint32();
|
||||||
|
if (company_id >= MAX_COMPANIES) SlErrorCorruptFmt("PLYX chunk: invalid company ID: %u", company_id);
|
||||||
|
|
||||||
|
const Company *c = NULL;
|
||||||
|
if (!skip) {
|
||||||
|
c = Company::GetIfValid(company_id);
|
||||||
|
if (c == NULL) SlErrorCorruptFmt("PLYX chunk: non-existant company ID: %u", company_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 company_flags = SlReadUint32();
|
||||||
|
// flags are not in use yet, reserve for future expansion
|
||||||
|
if (company_flags != 0) SlErrorCorruptFmt("PLYX chunk: unknown company flags: 0x%X", company_flags);
|
||||||
|
|
||||||
|
uint32 settings_count = SlReadUint32();
|
||||||
|
for (uint32 j = 0; j < settings_count; j++) {
|
||||||
|
SlObject(¤t_setting, _settings_ext_load_desc);
|
||||||
|
|
||||||
|
// flags are not in use yet, reserve for future expansion
|
||||||
|
if (current_setting.flags != 0) SlErrorCorruptFmt("PLYX chunk: unknown setting header flags: 0x%X", current_setting.flags);
|
||||||
|
|
||||||
|
if (skip) {
|
||||||
|
SlSkipBytes(current_setting.setting_length);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const SettingDesc *setting = NULL;
|
||||||
|
|
||||||
|
// not many company settings, so perform a linear scan
|
||||||
|
for (const SettingDesc *desc = _company_settings; desc->save.cmd != SL_END; desc++) {
|
||||||
|
if (desc->patx_name != NULL && strcmp(desc->patx_name, current_setting.name) == 0) {
|
||||||
|
setting = desc;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (setting != NULL) {
|
||||||
|
// found setting
|
||||||
|
const SaveLoad *sld = &(setting->save);
|
||||||
|
size_t read = SlGetBytesRead();
|
||||||
|
void *ptr = GetVariableAddress(&(c->settings), sld);
|
||||||
|
SlObjectMember(ptr, sld);
|
||||||
|
if (SlGetBytesRead() != read + current_setting.setting_length) {
|
||||||
|
SlErrorCorruptFmt("PLYX chunk: setting read length mismatch for setting: '%s'", current_setting.name);
|
||||||
|
}
|
||||||
|
if (IsNumericType(sld->conv)) Write_ValidateSetting(ptr, setting, ReadValue(ptr, sld->conv));
|
||||||
|
} else {
|
||||||
|
DEBUG(sl, 1, "PLYX chunk: Could not find company setting: '%s', ignoring", current_setting.name);
|
||||||
|
SlSkipBytes(current_setting.setting_length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save handler for settings which go in the PLYX chunk
|
||||||
|
*/
|
||||||
|
void SaveSettingsPlyx()
|
||||||
|
{
|
||||||
|
SettingsExtSave current_setting;
|
||||||
|
|
||||||
|
static const SaveLoad _settings_plyx_desc[] = {
|
||||||
|
SLE_VAR(SettingsExtSave, flags, SLE_UINT32),
|
||||||
|
SLE_STR(SettingsExtSave, name, SLE_STR, 0),
|
||||||
|
SLE_VAR(SettingsExtSave, setting_length, SLE_UINT32),
|
||||||
|
SLE_END()
|
||||||
|
};
|
||||||
|
|
||||||
|
std::vector<uint32> company_setting_counts;
|
||||||
|
|
||||||
|
size_t length = 8;
|
||||||
|
uint32 companies_count = 0;
|
||||||
|
|
||||||
|
Company *c;
|
||||||
|
FOR_ALL_COMPANIES(c) {
|
||||||
|
length += 12;
|
||||||
|
companies_count++;
|
||||||
|
uint32 setting_count = 0;
|
||||||
|
for (const SettingDesc *desc = _company_settings; desc->save.cmd != SL_END; desc++) {
|
||||||
|
if (desc->patx_name == NULL) continue;
|
||||||
|
uint32 setting_length = SlCalcObjMemberLength(&(c->settings), &desc->save);
|
||||||
|
if (!setting_length) continue;
|
||||||
|
|
||||||
|
current_setting.name = desc->patx_name;
|
||||||
|
|
||||||
|
// add length of setting header
|
||||||
|
length += SlCalcObjLength(¤t_setting, _settings_ext_save_desc);
|
||||||
|
|
||||||
|
// add length of actual setting
|
||||||
|
length += setting_length;
|
||||||
|
|
||||||
|
setting_count++;
|
||||||
|
}
|
||||||
|
company_setting_counts.push_back(setting_count);
|
||||||
|
}
|
||||||
|
SlSetLength(length);
|
||||||
|
|
||||||
|
SlWriteUint32(0); // flags
|
||||||
|
SlWriteUint32(companies_count); // companies count
|
||||||
|
|
||||||
|
size_t index = 0;
|
||||||
|
FOR_ALL_COMPANIES(c) {
|
||||||
|
length += 12;
|
||||||
|
companies_count++;
|
||||||
|
SlWriteUint32(c->index); // company ID
|
||||||
|
SlWriteUint32(0); // flags
|
||||||
|
SlWriteUint32(company_setting_counts[index]); // setting count
|
||||||
|
index++;
|
||||||
|
|
||||||
|
for (const SettingDesc *desc = _company_settings; desc->save.cmd != SL_END; desc++) {
|
||||||
|
if (desc->patx_name == NULL) continue;
|
||||||
|
uint32 setting_length = SlCalcObjMemberLength(&(c->settings), &desc->save);
|
||||||
|
if (!setting_length) continue;
|
||||||
|
|
||||||
|
current_setting.flags = 0;
|
||||||
|
current_setting.name = desc->patx_name;
|
||||||
|
current_setting.setting_length = setting_length;
|
||||||
|
SlObject(¤t_setting, _settings_plyx_desc);
|
||||||
|
void *ptr = GetVariableAddress(&(c->settings), &desc->save);
|
||||||
|
SlObjectMember(ptr, &desc->save);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void Load_OPTS()
|
static void Load_OPTS()
|
||||||
{
|
{
|
||||||
/* Copy over default setting since some might not get loaded in
|
/* Copy over default setting since some might not get loaded in
|
||||||
|
|||||||
@@ -1884,13 +1884,13 @@ struct GameSettingsWindow : Window {
|
|||||||
if (this->warn_missing != WHR_NONE) {
|
if (this->warn_missing != WHR_NONE) {
|
||||||
const int left = panel->pos_x;
|
const int left = panel->pos_x;
|
||||||
const int right = left + panel->current_x - 1;
|
const int right = left + panel->current_x - 1;
|
||||||
const int top = panel->pos_y;
|
const int top = panel->pos_y + WD_FRAMETEXT_TOP + (SETTING_HEIGHT - FONT_HEIGHT_NORMAL) * this->warn_lines / 2;
|
||||||
SetDParam(0, _game_settings_restrict_dropdown[this->filter.min_cat]);
|
SetDParam(0, _game_settings_restrict_dropdown[this->filter.min_cat]);
|
||||||
if (this->warn_lines == 1) {
|
if (this->warn_lines == 1) {
|
||||||
/* If the warning fits at one line, center it. */
|
/* If the warning fits at one line, center it. */
|
||||||
DrawString(left + WD_FRAMETEXT_LEFT, right - WD_FRAMETEXT_RIGHT, top + WD_FRAMETEXT_TOP, warn_str, TC_FROMSTRING, SA_HOR_CENTER);
|
DrawString(left + WD_FRAMETEXT_LEFT, right - WD_FRAMETEXT_RIGHT, top, warn_str, TC_FROMSTRING, SA_HOR_CENTER);
|
||||||
} else {
|
} else {
|
||||||
DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top + WD_FRAMERECT_TOP, INT32_MAX, warn_str);
|
DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top, INT32_MAX, warn_str, TC_FROMSTRING, SA_HOR_CENTER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1944,7 +1944,7 @@ struct GameSettingsWindow : Window {
|
|||||||
{
|
{
|
||||||
switch (widget) {
|
switch (widget) {
|
||||||
case WID_GS_OPTIONSPANEL: {
|
case WID_GS_OPTIONSPANEL: {
|
||||||
int top_pos = r.top + SETTINGTREE_TOP_OFFSET + 1 + this->warn_lines * FONT_HEIGHT_NORMAL;
|
int top_pos = r.top + SETTINGTREE_TOP_OFFSET + 1 + this->warn_lines * SETTING_HEIGHT;
|
||||||
uint last_row = this->vscroll->GetPosition() + this->vscroll->GetCapacity() - this->warn_lines;
|
uint last_row = this->vscroll->GetPosition() + this->vscroll->GetCapacity() - this->warn_lines;
|
||||||
int next_row = GetSettingsTree().Draw(settings_ptr, r.left + SETTINGTREE_LEFT_OFFSET, r.right - SETTINGTREE_RIGHT_OFFSET, top_pos,
|
int next_row = GetSettingsTree().Draw(settings_ptr, r.left + SETTINGTREE_LEFT_OFFSET, r.right - SETTINGTREE_RIGHT_OFFSET, top_pos,
|
||||||
this->vscroll->GetPosition(), last_row, this->last_clicked);
|
this->vscroll->GetPosition(), last_row, this->last_clicked);
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ struct SignListWindow : Window, SignList {
|
|||||||
Dimension spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
|
Dimension spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
|
||||||
this->text_offset = WD_FRAMETEXT_LEFT + spr_dim.width + 2; // 2 pixels space between icon and the sign text.
|
this->text_offset = WD_FRAMETEXT_LEFT + spr_dim.width + 2; // 2 pixels space between icon and the sign text.
|
||||||
resize->height = max<uint>(FONT_HEIGHT_NORMAL, spr_dim.height);
|
resize->height = max<uint>(FONT_HEIGHT_NORMAL, spr_dim.height);
|
||||||
Dimension d = {this->text_offset + WD_FRAMETEXT_RIGHT, WD_FRAMERECT_TOP + 5 * resize->height + WD_FRAMERECT_BOTTOM};
|
Dimension d = {(uint)(this->text_offset + WD_FRAMETEXT_RIGHT), WD_FRAMERECT_TOP + 5 * resize->height + WD_FRAMERECT_BOTTOM};
|
||||||
*size = maxdim(*size, d);
|
*size = maxdim(*size, d);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1076,7 +1076,7 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
|
|||||||
_heightmap_schemes[n].height_colours = ReallocT<uint32>(_heightmap_schemes[n].height_colours, heights);
|
_heightmap_schemes[n].height_colours = ReallocT<uint32>(_heightmap_schemes[n].height_colours, heights);
|
||||||
|
|
||||||
for (int z = 0; z < heights; z++) {
|
for (int z = 0; z < heights; z++) {
|
||||||
uint access_index = (_heightmap_schemes[n].colour_count * z) / heights;
|
size_t access_index = (_heightmap_schemes[n].colour_count * z) / heights;
|
||||||
|
|
||||||
/* Choose colour by mapping the range (0..max heightlevel) on the complete colour table. */
|
/* Choose colour by mapping the range (0..max heightlevel) on the complete colour table. */
|
||||||
_heightmap_schemes[n].height_colours[z] = _heightmap_schemes[n].height_colours_base[access_index];
|
_heightmap_schemes[n].height_colours[z] = _heightmap_schemes[n].height_colours_base[access_index];
|
||||||
@@ -1401,7 +1401,7 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
|
|||||||
case WID_SM_ZOOM_IN:
|
case WID_SM_ZOOM_IN:
|
||||||
case WID_SM_ZOOM_OUT: {
|
case WID_SM_ZOOM_OUT: {
|
||||||
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
|
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
|
||||||
Point pt = {wid->current_x / 2, wid->current_y / 2};
|
Point pt = { (int)wid->current_x / 2, (int)wid->current_y / 2};
|
||||||
this->SetZoomLevel((widget == WID_SM_ZOOM_IN) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt);
|
this->SetZoomLevel((widget == WID_SM_ZOOM_IN) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt);
|
||||||
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
|
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ const char *SoundDriver_Win32::Start(const char * const *parm)
|
|||||||
PrepareHeader(&_wave_hdr[1]);
|
PrepareHeader(&_wave_hdr[1]);
|
||||||
|
|
||||||
if (NULL == (_thread = CreateThread(NULL, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread";
|
if (NULL == (_thread = CreateThread(NULL, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread";
|
||||||
} catch (char *error) {
|
} catch (const char *error) {
|
||||||
this->Stop();
|
this->Stop();
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1409,7 +1409,7 @@ struct StationViewWindow : public Window {
|
|||||||
if (!this->IsShaded()) {
|
if (!this->IsShaded()) {
|
||||||
/* Draw 'accepted cargo' or 'cargo ratings'. */
|
/* Draw 'accepted cargo' or 'cargo ratings'. */
|
||||||
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SV_ACCEPT_RATING_LIST);
|
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SV_ACCEPT_RATING_LIST);
|
||||||
const Rect r = {wid->pos_x, wid->pos_y, wid->pos_x + wid->current_x - 1, wid->pos_y + wid->current_y - 1};
|
const Rect r = {(int)wid->pos_x, (int)wid->pos_y, (int)(wid->pos_x + wid->current_x - 1), (int)(wid->pos_y + wid->current_y - 1)};
|
||||||
if (this->GetWidget<NWidgetCore>(WID_SV_ACCEPTS_RATINGS)->widget_data == STR_STATION_VIEW_RATINGS_BUTTON) {
|
if (this->GetWidget<NWidgetCore>(WID_SV_ACCEPTS_RATINGS)->widget_data == STR_STATION_VIEW_RATINGS_BUTTON) {
|
||||||
int lines = this->DrawAcceptedCargo(r);
|
int lines = this->DrawAcceptedCargo(r);
|
||||||
if (lines > this->accepts_lines) { // Resize the widget, and perform re-initialization of the window.
|
if (lines > this->accepts_lines) { // Resize the widget, and perform re-initialization of the window.
|
||||||
@@ -1437,7 +1437,7 @@ struct StationViewWindow : public Window {
|
|||||||
|
|
||||||
/* Draw waiting cargo. */
|
/* Draw waiting cargo. */
|
||||||
NWidgetBase *nwi = this->GetWidget<NWidgetBase>(WID_SV_WAITING);
|
NWidgetBase *nwi = this->GetWidget<NWidgetBase>(WID_SV_WAITING);
|
||||||
Rect waiting_rect = {nwi->pos_x, nwi->pos_y, nwi->pos_x + nwi->current_x - 1, nwi->pos_y + nwi->current_y - 1};
|
Rect waiting_rect = { (int)nwi->pos_x, (int)nwi->pos_y, (int)(nwi->pos_x + nwi->current_x - 1), (int)(nwi->pos_y + nwi->current_y - 1)};
|
||||||
this->DrawEntries(&cargo, waiting_rect, pos, maxrows, 0);
|
this->DrawEntries(&cargo, waiting_rect, pos, maxrows, 0);
|
||||||
scroll_to_row = INT_MAX;
|
scroll_to_row = INT_MAX;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -223,7 +223,9 @@
|
|||||||
|
|
||||||
#include <malloc.h> // alloca()
|
#include <malloc.h> // alloca()
|
||||||
#define NORETURN __declspec(noreturn)
|
#define NORETURN __declspec(noreturn)
|
||||||
#define inline __forceinline
|
#if (_MSC_VER < 1900)
|
||||||
|
#define inline __forceinline
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(WINCE)
|
#if !defined(WINCE)
|
||||||
#define CDECL _cdecl
|
#define CDECL _cdecl
|
||||||
|
|||||||
@@ -378,7 +378,7 @@ static int TranslateArgumentIdx(int arg, int offset = 0);
|
|||||||
static void EmitWordList(Buffer *buffer, const char * const *words, uint nw)
|
static void EmitWordList(Buffer *buffer, const char * const *words, uint nw)
|
||||||
{
|
{
|
||||||
buffer->AppendByte(nw);
|
buffer->AppendByte(nw);
|
||||||
for (uint i = 0; i < nw; i++) buffer->AppendByte((uint)strlen(words[i]) + 1);
|
for (uint i = 0; i < nw; i++) buffer->AppendByte((byte)strlen(words[i]) + 1);
|
||||||
for (uint i = 0; i < nw; i++) {
|
for (uint i = 0; i < nw; i++) {
|
||||||
for (uint j = 0; words[i][j] != '\0'; j++) buffer->AppendByte(words[i][j]);
|
for (uint j = 0; words[i][j] != '\0'; j++) buffer->AppendByte(words[i][j]);
|
||||||
buffer->AppendByte(0);
|
buffer->AppendByte(0);
|
||||||
|
|||||||
@@ -25,12 +25,12 @@
|
|||||||
#include <errno.h> // required by vsnprintf implementation for MSVC
|
#include <errno.h> // required by vsnprintf implementation for MSVC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
/* Required by strnatcmp. */
|
/* Required by strnatcmp. */
|
||||||
#include <unicode/ustring.h>
|
#include <unicode/ustring.h>
|
||||||
#include "language.h"
|
#include "language.h"
|
||||||
#include "gfx_func.h"
|
#include "gfx_func.h"
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
/* The function vsnprintf is used internally to perform the required formatting
|
/* The function vsnprintf is used internally to perform the required formatting
|
||||||
* tasks. As such this one must be allowed, and makes sure it's terminated. */
|
* tasks. As such this one must be allowed, and makes sure it's terminated. */
|
||||||
@@ -355,7 +355,7 @@ bool IsValidChar(WChar key, CharSetFilter afilter)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||||
/**
|
/**
|
||||||
* Almost POSIX compliant implementation of \c vsnprintf for VC compiler.
|
* Almost POSIX compliant implementation of \c vsnprintf for VC compiler.
|
||||||
* The difference is in the value returned on output truncation. This
|
* The difference is in the value returned on output truncation. This
|
||||||
@@ -578,33 +578,20 @@ int strnatcmp(const char *s1, const char *s2, bool ignore_garbage_at_front)
|
|||||||
s1 = SkipGarbage(s1);
|
s1 = SkipGarbage(s1);
|
||||||
s2 = SkipGarbage(s2);
|
s2 = SkipGarbage(s2);
|
||||||
}
|
}
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
if (_current_collator != NULL) {
|
if (_current_collator != NULL) {
|
||||||
UErrorCode status = U_ZERO_ERROR;
|
UErrorCode status = U_ZERO_ERROR;
|
||||||
int result;
|
int result = _current_collator->compareUTF8(s1, s2, status);
|
||||||
|
|
||||||
/* We want to use the new faster method for ICU 4.2 and higher. */
|
|
||||||
#if U_ICU_VERSION_MAJOR_NUM > 4 || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 2)
|
|
||||||
/* The StringPiece parameter gets implicitly constructed from the char *. */
|
|
||||||
result = _current_collator->compareUTF8(s1, s2, status);
|
|
||||||
#else /* The following for 4.0 and lower. */
|
|
||||||
UChar buffer1[DRAW_STRING_BUFFER];
|
|
||||||
u_strFromUTF8Lenient(buffer1, lengthof(buffer1), NULL, s1, -1, &status);
|
|
||||||
UChar buffer2[DRAW_STRING_BUFFER];
|
|
||||||
u_strFromUTF8Lenient(buffer2, lengthof(buffer2), NULL, s2, -1, &status);
|
|
||||||
|
|
||||||
result = _current_collator->compare(buffer1, buffer2, status);
|
|
||||||
#endif /* ICU version check. */
|
|
||||||
if (U_SUCCESS(status)) return result;
|
if (U_SUCCESS(status)) return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
/* Do a normal comparison if ICU is missing or if we cannot create a collator. */
|
/* Do a normal comparison if ICU is missing or if we cannot create a collator. */
|
||||||
return strcasecmp(s1, s2);
|
return strcasecmp(s1, s2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
|
|
||||||
#include <unicode/utext.h>
|
#include <unicode/utext.h>
|
||||||
#include <unicode/brkiter.h>
|
#include <unicode/brkiter.h>
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang
|
|||||||
|
|
||||||
TextDirection _current_text_dir; ///< Text direction of the currently selected language.
|
TextDirection _current_text_dir; ///< Text direction of the currently selected language.
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
Collator *_current_collator = NULL; ///< Collator for the language currently in use.
|
Collator *_current_collator = NULL; ///< Collator for the language currently in use.
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam.
|
static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam.
|
||||||
static WChar _global_string_params_type[20]; ///< Type of parameters stored in #_decode_parameters
|
static WChar _global_string_params_type[20]; ///< Type of parameters stored in #_decode_parameters
|
||||||
@@ -1275,7 +1275,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (c == NULL) break;
|
if (c == NULL) break;
|
||||||
|
|
||||||
if (c->name != NULL) {
|
if (c->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)c->name};
|
int64 args_array[] = {(int64)(size_t)c->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1301,7 +1301,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
case SCC_DEPOT_NAME: { // {DEPOT}
|
case SCC_DEPOT_NAME: { // {DEPOT}
|
||||||
VehicleType vt = (VehicleType)args->GetInt32(SCC_DEPOT_NAME);
|
VehicleType vt = (VehicleType)args->GetInt32(SCC_DEPOT_NAME);
|
||||||
if (vt == VEH_AIRCRAFT) {
|
if (vt == VEH_AIRCRAFT) {
|
||||||
uint64 args_array[] = {args->GetInt32()};
|
uint64 args_array[] = {(uint64)args->GetInt32()};
|
||||||
WChar types_array[] = {SCC_STATION_NAME};
|
WChar types_array[] = {SCC_STATION_NAME};
|
||||||
StringParameters tmp_params(args_array, 1, types_array);
|
StringParameters tmp_params(args_array, 1, types_array);
|
||||||
buff = GetStringWithArgs(buff, STR_FORMAT_DEPOT_NAME_AIRCRAFT, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_FORMAT_DEPOT_NAME_AIRCRAFT, &tmp_params, last);
|
||||||
@@ -1310,7 +1310,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
|
|
||||||
const Depot *d = Depot::Get(args->GetInt32());
|
const Depot *d = Depot::Get(args->GetInt32());
|
||||||
if (d->name != NULL) {
|
if (d->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)d->name};
|
int64 args_array[] = {(int64)(size_t)d->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1326,7 +1326,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (e == NULL) break;
|
if (e == NULL) break;
|
||||||
|
|
||||||
if (e->name != NULL && e->IsEnabled()) {
|
if (e->name != NULL && e->IsEnabled()) {
|
||||||
int64 args_array[] = {(uint64)(size_t)e->name};
|
int64 args_array[] = {(int64)(size_t)e->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1341,7 +1341,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (g == NULL) break;
|
if (g == NULL) break;
|
||||||
|
|
||||||
if (g->name != NULL) {
|
if (g->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)g->name};
|
int64 args_array[] = {(int64)(size_t)g->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1378,7 +1378,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (c == NULL) break;
|
if (c == NULL) break;
|
||||||
|
|
||||||
if (c->president_name != NULL) {
|
if (c->president_name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)c->president_name};
|
int64 args_array[] = {(int64)(size_t)c->president_name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1403,7 +1403,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (st->name != NULL) {
|
if (st->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)st->name};
|
int64 args_array[] = {(int64)(size_t)st->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1432,7 +1432,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (t == NULL) break;
|
if (t == NULL) break;
|
||||||
|
|
||||||
if (t->name != NULL) {
|
if (t->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)t->name};
|
int64 args_array[] = {(int64)(size_t)t->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1446,7 +1446,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (wp == NULL) break;
|
if (wp == NULL) break;
|
||||||
|
|
||||||
if (wp->name != NULL) {
|
if (wp->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)wp->name};
|
int64 args_array[] = {(int64)(size_t)wp->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1464,7 +1464,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (v == NULL) break;
|
if (v == NULL) break;
|
||||||
|
|
||||||
if (v->name != NULL) {
|
if (v->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)v->name};
|
int64 args_array[] = {(int64)(size_t)v->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1490,7 +1490,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||||||
if (si == NULL) break;
|
if (si == NULL) break;
|
||||||
|
|
||||||
if (si->name != NULL) {
|
if (si->name != NULL) {
|
||||||
int64 args_array[] = {(uint64)(size_t)si->name};
|
int64 args_array[] = {(int64)(size_t)si->name};
|
||||||
StringParameters tmp_params(args_array);
|
StringParameters tmp_params(args_array);
|
||||||
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
||||||
} else {
|
} else {
|
||||||
@@ -1790,7 +1790,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
|
|||||||
strecpy(_config_language_file, c_file, lastof(_config_language_file));
|
strecpy(_config_language_file, c_file, lastof(_config_language_file));
|
||||||
SetCurrentGrfLangID(_current_language->newgrflangid);
|
SetCurrentGrfLangID(_current_language->newgrflangid);
|
||||||
|
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU_SORT
|
||||||
/* Delete previous collator. */
|
/* Delete previous collator. */
|
||||||
if (_current_collator != NULL) {
|
if (_current_collator != NULL) {
|
||||||
delete _current_collator;
|
delete _current_collator;
|
||||||
@@ -1807,7 +1807,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
|
|||||||
delete _current_collator;
|
delete _current_collator;
|
||||||
_current_collator = NULL;
|
_current_collator = NULL;
|
||||||
}
|
}
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU_SORT */
|
||||||
|
|
||||||
/* Some lists need to be sorted again after a language change. */
|
/* Some lists need to be sorted again after a language change. */
|
||||||
ReconsiderGameScriptLanguage();
|
ReconsiderGameScriptLanguage();
|
||||||
@@ -2132,7 +2132,7 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
|
|||||||
/* Update the font with cache */
|
/* Update the font with cache */
|
||||||
LoadStringWidthTable(searcher->Monospace());
|
LoadStringWidthTable(searcher->Monospace());
|
||||||
|
|
||||||
#if !defined(WITH_ICU)
|
#if !defined(WITH_ICU_LAYOUT)
|
||||||
/*
|
/*
|
||||||
* For right-to-left languages we need the ICU library. If
|
* For right-to-left languages we need the ICU library. If
|
||||||
* we do not have support for that library we warn the user
|
* we do not have support for that library we warn the user
|
||||||
@@ -2152,5 +2152,5 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
|
|||||||
SetDParamStr(0, err_str);
|
SetDParamStr(0, err_str);
|
||||||
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
|
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* !WITH_ICU_LAYOUT */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ static const SettingDesc _company_settings[] = {
|
|||||||
[post-amble]
|
[post-amble]
|
||||||
};
|
};
|
||||||
[templates]
|
[templates]
|
||||||
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
|
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, $patxname),
|
||||||
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
|
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, $patxname),
|
||||||
SDT_END = SDT_END()
|
SDT_END = SDT_END()
|
||||||
|
|
||||||
[defaults]
|
[defaults]
|
||||||
@@ -34,7 +34,8 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
patxname = NULL
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
#include "../newgrf_engine.h"
|
#include "../newgrf_engine.h"
|
||||||
|
|
||||||
/* Helper for filling property tables */
|
/* Helper for filling property tables */
|
||||||
#define NIP(prop, base, variable, type, name) { name, cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
|
#define NIP(prop, base, variable, type, name) { name, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
|
||||||
#define NIP_END() { NULL, 0, 0, 0, 0 }
|
#define NIP_END() { NULL, 0, 0, 0, 0 }
|
||||||
|
|
||||||
/* Helper for filling callback tables */
|
/* Helper for filling callback tables */
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
patxname = NULL
|
patxname = NULL
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,23 +9,23 @@
|
|||||||
|
|
||||||
/** @file string_colours.h The colour translation of GRF's strings. */
|
/** @file string_colours.h The colour translation of GRF's strings. */
|
||||||
|
|
||||||
/** Colour mapping for the TextColours. */
|
/** Colour mapping for #TextColour. */
|
||||||
static const byte _string_colourmap[17] = {
|
static const byte _string_colourmap[17] = {
|
||||||
150, // TC_BLUE
|
150, // TC_BLUE
|
||||||
12, // TC_SILVER
|
12, // TC_SILVER
|
||||||
189, // TC_GOLD
|
189, // TC_GOLD
|
||||||
184, // TC_RED
|
184, // TC_RED
|
||||||
174, // TC_PURPLE
|
174, // TC_PURPLE
|
||||||
30, // TC_LIGHT_BROWN
|
30, // TC_LIGHT_BROWN
|
||||||
195, // TC_ORANGE
|
195, // TC_ORANGE
|
||||||
209, // TC_GREEN
|
209, // TC_GREEN
|
||||||
68, // TC_YELLOW
|
68, // TC_YELLOW
|
||||||
95, // TC_DARK_GREEN
|
95, // TC_DARK_GREEN
|
||||||
79, // TC_CREAM
|
79, // TC_CREAM
|
||||||
116, // TC_BROWN
|
116, // TC_BROWN
|
||||||
15, // TC_WHITE
|
15, // TC_WHITE
|
||||||
152, // TC_LIGHT_BLUE
|
152, // TC_LIGHT_BLUE
|
||||||
6, // TC_GREY
|
6, // TC_GREY
|
||||||
133, // TC_DARK_BLUE
|
133, // TC_DARK_BLUE
|
||||||
1, // TC_BLACK
|
1, // TC_BLACK
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ load = NULL
|
|||||||
from = 0
|
from = 0
|
||||||
to = SL_MAX_VERSION
|
to = SL_MAX_VERSION
|
||||||
cat = SC_ADVANCED
|
cat = SC_ADVANCED
|
||||||
extver = {}
|
extver = SlXvFeatureTest()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -403,7 +403,7 @@ CommandCost CmdTerraformLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c != NULL) c->terraform_limit -= ts.tile_to_new_height.size() << 16;
|
if (c != NULL) c->terraform_limit -= (uint32)ts.tile_to_new_height.size() << 16;
|
||||||
}
|
}
|
||||||
return total_cost;
|
return total_cost;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ static void Gunzip(byte **bufp, size_t *sizep)
|
|||||||
|
|
||||||
memset(&z, 0, sizeof(z));
|
memset(&z, 0, sizeof(z));
|
||||||
z.next_in = *bufp;
|
z.next_in = *bufp;
|
||||||
z.avail_in = *sizep;
|
z.avail_in = (uInt)*sizep;
|
||||||
|
|
||||||
/* window size = 15, add 32 to enable gzip or zlib header processing */
|
/* window size = 15, add 32 to enable gzip or zlib header processing */
|
||||||
res = inflateInit2(&z, 15 + 32);
|
res = inflateInit2(&z, 15 + 32);
|
||||||
|
|||||||
@@ -1545,7 +1545,7 @@ void NWidgetMatrix::SetupSmallestSize(Window *w, bool init_array)
|
|||||||
SB(nw->index, 16, 16, 0);
|
SB(nw->index, 16, 16, 0);
|
||||||
this->head->SetupSmallestSize(w, init_array);
|
this->head->SetupSmallestSize(w, init_array);
|
||||||
|
|
||||||
Dimension padding = {this->pip_pre + this->pip_post, this->pip_pre + this->pip_post};
|
Dimension padding = { (uint)this->pip_pre + this->pip_post, (uint)this->pip_pre + this->pip_post};
|
||||||
Dimension size = {this->head->smallest_x + padding.width, this->head->smallest_y + padding.height};
|
Dimension size = {this->head->smallest_x + padding.width, this->head->smallest_y + padding.height};
|
||||||
Dimension fill = {0, 0};
|
Dimension fill = {0, 0};
|
||||||
Dimension resize = {this->pip_inter + this->head->smallest_x, this->pip_inter + this->head->smallest_y};
|
Dimension resize = {this->pip_inter + this->head->smallest_x, this->pip_inter + this->head->smallest_y};
|
||||||
|
|||||||
@@ -380,8 +380,8 @@ void ShowDropDownListAt(Window *w, const DropDownList *list, int selected, int b
|
|||||||
|
|
||||||
if (auto_width) width = max(width, max_item_width);
|
if (auto_width) width = max(width, max_item_width);
|
||||||
|
|
||||||
Point dw_pos = { w->left + (_current_text_dir == TD_RTL ? wi_rect.right + 1 - width : wi_rect.left), top};
|
Point dw_pos = { w->left + (_current_text_dir == TD_RTL ? wi_rect.right + 1 - (int)width : wi_rect.left), top};
|
||||||
Dimension dw_size = {width, height};
|
Dimension dw_size = {width, (uint)height};
|
||||||
new DropdownWindow(w, list, selected, button, instant_close, dw_pos, dw_size, wi_colour, scroll);
|
new DropdownWindow(w, list, selected, button, instant_close, dw_pos, dw_size, wi_colour, scroll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user