Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes #62

Merged
merged 4 commits into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 0 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,38 +248,6 @@ OpenGFX is created by the following people (in reverse alphabetical order):
| Ammler | Marcel Gmür |
| 2006TTD | Anthony Lam |

| Language | Name |
| --------------------- | --------------------- |
| Afrikaans | telanus |
| Catalan | juanjo |
| Chinese (simplified) | sui238X, xiangyigao |
| Chinese (traditional) | sui238X, xiangyigao |
| Croatian | Voyager1 |
| Czech | alfergen |
| Dutch | Alberth |
| English (US) | Supercheese |
| Finnish | juzza1, alluke |
| French | arikover |
| German | planetmaker, Czeczki |
| Hungarian | zaza, Czeczki |
| Indonesian | UseYourIllusion |
| Italian | Voyager1 |
| Japanese | HawkEye1015 |
| Korean | Telk |
| Latin | Supercheese |
| Lithuanian | Stabilitronas |
| Luxembourgish | Phreeze |
| Norwegian (bokmal) | Trond, Leifbk |
| Polish | TadeuszD |
| Portuguese | vesgo |
| Russian | George |
| Scottish Gaelic | GunChleoc |
| Serbian | stravagante |
| Slovak | Tenebrae |
| Spanish | SilverSurferZzZ |
| Swedish | Zuu, Pekkape01 |
| Tamil | Aswn |

- The monospaced characters are generated from the font Liberation Mono: https://www.redhat.com/promo/fonts/ created by Pravin Satpute and Caius Chance, released under GPL v2.

Contact: `planetmaker@openttd.org` or on `irc.oftc.net/#openttd`
Expand Down
11 changes: 5 additions & 6 deletions findversion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ ROOT_DIR=`pwd`
# Determine if we are using a modified version
# Assume the dir is not modified
MODIFIED="0"
if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
if [ -f "$ROOT_DIR/.ottdrev" ]; then
# We are an exported source bundle
cat $ROOT_DIR/.ottdrev
exit
elif [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
# We are a git checkout
# Refresh the index to make sure file stat info is in sync, then look for modifications
git update-index --refresh >/dev/null
Expand Down Expand Up @@ -91,11 +95,6 @@ if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
ISTAG="0"
ISSTABLETAG="0"
fi

elif [ -f "$ROOT_DIR/.ottdrev" ]; then
# We are an exported source bundle
cat $ROOT_DIR/.ottdrev
exit
else
# We don't know
MODIFIED="1"
Expand Down
5 changes: 1 addition & 4 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
STR_GENERAL_DESC :OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. [{TITLE}]

STR_GRF_NAME :{TITLE}
STR_GRF_DESCRIPTION :{ORANGE}OpenGFX Base Graphics Set{BLACK}{}Brought to you by the OpenGFX team{}See readme for a list of contributors{}{BLACK}License: {SILVER}GPL v2+{}{BLACK}Website: {SILVER}http://dev.openttdcoop.org/projects/opengfx

STR_OPENTTD_VERSION :1.2.0

STR_GRF_DESCRIPTION :{ORANGE}OpenGFX Base Graphics Set{BLACK}{}Brought to you by the OpenGFX team{}See readme for a list of contributors{}{BLACK}License: {SILVER}GPL v2+{}{BLACK}Website: {SILVER}https://github.com/OpenTTD/OpenGFX
4 changes: 2 additions & 2 deletions sprites/extra/extra-header.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ grf {

if (ttd_platform == PLATFORM_OPENTTD) {
if (openttd_version < version_openttd(1, 2, 0, 23667)) {
error(FATAL, REQUIRES_OPENTTD, string(STR_OPENTTD_VERSION));
error(FATAL, REQUIRES_OPENTTD, "1.2.0");
}
}

if (ttd_platform != PLATFORM_OPENTTD) {
error(FATAL, REQUIRES_OPENTTD, string(STR_OPENTTD_VERSION));
error(FATAL, REQUIRES_OPENTTD, "1.2.0");
}