mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26135) [1.3] -Update documentation 

[1.3] -Backport from trunk:
- Fix: Aircraft crashing near the map's border due to a lack of airports could trigger a crash [FS#5820] (r26134)
release/1.3
rubidium 2013-11-29 12:10:22 +00:00
parent 184a94510b
commit 2e4ae0588a
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog.txt
View File

@ -1,3 +1,8 @@
1.3.3 (2013-11-29)
------------------------------------------------------------------------
- Fix: Aircraft crashing near the map's border due to a lack of airports could trigger a crash [CVE-2013-6411] [FS#5820] (r26134)
1.3.3-RC2 (2013-11-24) 1.3.3-RC2 (2013-11-24)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Fix: [Script] Prevent scripts from crashing OpenTTD when they send text with command codes to user editable texts such as sign and station names [FS#5818] (r26093, r26092) - Fix: [Script] Prevent scripts from crashing OpenTTD when they send text with command codes to user editable texts such as sign and station names [FS#5818] (r26093, r26092)

4
known-bugs.txt
View File

@ -1,6 +1,6 @@
OpenTTD's known bugs OpenTTD's known bugs
Last updated: 2013-11-24 Last updated: 2013-11-29
Release version: 1.3.3-RC2 Release version: 1.3.3
------------------------------------------------------------------------ ------------------------------------------------------------------------

6
os/debian/changelog
View File

@ -1,3 +1,9 @@
openttd (1.3.3-0) unstable; urgency=low
* New upstream release 1.3.3
-- OpenTTD <info@openttd.org> Fri, 29 Nov 2013 19:00:00 +0100
openttd (1.3.3~RC2-0) unstable; urgency=low openttd (1.3.3~RC2-0) unstable; urgency=low
* New upstream release 1.3.3-RC2 * New upstream release 1.3.3-RC2

2
os/os2/installer/make_installer.cmd
View File

@ -1,6 +1,6 @@
@echo off @echo off
set OPENTTD_VERSION=1.3.3-RC2 set OPENTTD_VERSION=1.3.3
set OPENSFX_VERSION=0.8.0 set OPENSFX_VERSION=0.8.0
set NOSOUND_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0
set OPENGFX_VERSION=1.2.0 set OPENGFX_VERSION=1.2.0

4
os/windows/installer/install.nsi
View File

@ -2,8 +2,8 @@
!define APPV_MAJOR 1 !define APPV_MAJOR 1
!define APPV_MINOR 3 !define APPV_MINOR 3
!define APPV_MAINT 3 !define APPV_MAINT 3
!define APPV_BUILD 1 !define APPV_BUILD 2
!define APPV_EXTRA "-RC2" !define APPV_EXTRA ""
!define APPNAME "OpenTTD" ; Define application name !define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version

4
readme.txt
View File

@ -1,5 +1,5 @@
Last updated: 2013-11-24 Last updated: 2013-11-29
Release version: 1.3.3-RC2 Release version: 1.3.3
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
src/aircraft_cmd.cpp
View File

@ -1021,7 +1021,7 @@ static bool HandleCrashedAircraft(Aircraft *v)
/* make aircraft crash down to the ground */ /* make aircraft crash down to the ground */
if (v->crashed_counter < 500 && st == NULL && ((v->crashed_counter % 3) == 0) ) { if (v->crashed_counter < 500 && st == NULL && ((v->crashed_counter % 3) == 0) ) {
int z = GetSlopePixelZ(v->x_pos, v->y_pos); int z = GetSlopePixelZ(Clamp(v->x_pos, 0, MapMaxX() * TILE_SIZE), Clamp(v->y_pos, 0, MapMaxY() * TILE_SIZE));
v->z_pos -= 1; v->z_pos -= 1;
if (v->z_pos == z) { if (v->z_pos == z) {
v->crashed_counter = 500; v->crashed_counter = 500;