(svn r26096) -Release: 1.3.3-RC2

changelog.txt

@@ -1,8 +1,3 @@
-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)
 ------------------------------------------------------------------------
 - 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)

known-bugs.txt

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

os/debian/changelog

@@ -1,9 +1,3 @@
-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
 
   * New upstream release 1.3.3-RC2

os/os2/installer/make_installer.cmd

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

os/windows/installer/install.nsi

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

readme.txt

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

src/aircraft_cmd.cpp

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

src/os/windows/ottdres.rc.in

@@ -79,8 +79,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,!!REVISION!!
- PRODUCTVERSION 1,3,0,!!REVISION!!
+ FILEVERSION 1,3,3,!!REVISION!!
+ PRODUCTVERSION 1,3,3,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

src/rev.cpp.in

@@ -70,7 +70,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
  * final release will always have a lower version number than the released
  * version, thus making comparisons on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 3 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 3 << 24 | 3 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**