Skip to content

Commit e64a409

Browse files
committed
Release: Version bumps for v0.2
1 parent 9c8693f commit e64a409

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Base set:
88
Settings NewGRF:
99
* Parameter control of grass (terrain tile), foundation and tree style per climate. Almost fully mix-and-match.
1010

11+
Backend:
12+
* Multithreading for much faster 32bpp to 8bpp sprite conversion.
13+
1114
## v0.1
1215
Base set:
1316
* First OpenGFX-independent baseset.

baseset/baseset_generate_obg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def pad(string, length, character=" ", pad_left=True):
5252
pad_length = 12
5353
obg.write(pad("name", pad_length, pad_left=False) + "= OpenGFX2 " + namesuffix + "\n")
5454
obg.write(pad("shortname", pad_length, pad_left=False) + "=" + namelookup[typeshort] + "\n")
55-
obg.write(pad("version", pad_length, pad_left=False) + "= 0" + "\n")
55+
obg.write(pad("version", pad_length, pad_left=False) + "= 0.2" + "\n")
5656
obg.write(pad("palette", pad_length, pad_left=False) + "= DOS" + "\n")
5757
obg.write(pad("blitter", pad_length, pad_left=False) + "= "+str(blitter)+"bpp" + "\n")
5858
obg.write(pad("description", pad_length, pad_left=False) + "= OpenGFX2 "+description+" base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2." + "\n")
@@ -71,4 +71,4 @@ def pad(string, length, character=" ", pad_left=True):
7171
obg.write(pad(file["name"] + ".grf", 26, pad_left=False) + "= " + md5)
7272
obg.write("\n")
7373
obg.write("[origin]" + "\n")
74-
obg.write("default = Development version, blame Zephyris.")
74+
obg.write("default = From the in-game content download system (BaNaNaS) or https://github.com/zephyris/opengfx2/")

baseset/lang/english.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ STR_GRF_NAME :OpenGFX2Base
55
STR_GRF_DESCRIPTION :{ORANGE}OpenGFX2 Base Graphics Set{BLACK}{}By Zephyris, standing on the shoulders of the OpenGFX team{}{BLACK}License: {SILVER}GPL v2+{}{BLACK}Website: {SILVER}https://github.com/zephyris/OpenGFX2
66
STR_GRF_URL :https://github.com/zephyris/opengfx2
77

8+
STR_WARN_SETTINGSGRF_VERSIONMISMATCH :OpenGFX2 Settings newGRF version does not match this version of the OpenGFX baseset. You may see unusual results!
9+
810
STR_PARAM_CURSOR_NAME :Mouse cursor
911
STR_PARAM_CURSOR_DESC :Style and colour of the mouse cursor/pointer.
1012
STR_PARAM_CURSOR_VALUE_DEFAULT :Classic-style, yellow (Default)

baseset/nml/extra/extra-header.pnml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ if (ttd_platform != PLATFORM_OPENTTD) {
255255
}
256256

257257
if (grf_future_status("OGZ\1")==1) {
258+
// Check version, and warn if it's not the expected version to match this version of the base set
259+
if (param["OGZ\1", 254]!=2) {
260+
error(WARNING, string(STR_WARN_SETTINGSGRF_VERSIONMISMATCH));
261+
}
262+
258263
// Load parameters from settings grf, if will be loaded
259264
param_cursors = param["OGZ\1", 1];
260265
param_gridlines = param["OGZ\1", 2];

newgrf/nml/settings/settings-header.pnml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ grf {
33
name: string(STR_GRF_NAME);
44
desc: string(STR_GRF_DESCRIPTION);
55
url: string(STR_GRF_URL);
6-
version: 1;
6+
version: 2;
77
min_compatible_version: version_openttd(1, 3, 0);
88
param 1 {
99
param_cursors_ {

0 commit comments

Comments
 (0)