(svn r5863) Release 0.4.8

A ship in a depot must be stopped before allowed to be cloned (copied ship.h from trunk).

Makefile

@@ -256,7 +256,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"
 
-REV := 0.4.8-$(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)
+REV := 0.4.8
 
 # MorphOS needs builddate
 BUILDDATE=`date +%d.%m.%y`

changelog.txt

@@ -1,3 +1,7 @@
+0.4.8 (2006-08-12)
+------------------------------------------------------------------------
+- Fix: A ship in a depot must be stopped before it can be cloned.
+- Fix: After changing directory in 'Play Scenario', the default scenarios didn't show up in 'New Game'
 0.4.8-RC2 (2006-07-31)
 ------------------------------------------------------------------------
 - Feature: Add Italian town names as we have an official Italian translation

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd July 31, 2006
+.Dd August 12, 2006
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd

known-bugs.txt

@@ -33,7 +33,6 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 
 -1459262	Towns building too many roads way too long now
 -1458995	Another bug with smooth_economy
--1458894	Crashed suddenly from scenario editor
 -1436419	Vehicles profits gone negative.......bug
 -1434000	Error in Transfer-Function
 -1427531	Newspapers problem

network.c

@@ -15,7 +15,7 @@
 	extern const char _openttd_revision[];
 #elif defined(WITH_REV_HACK)
 	#define WITH_REV
-	const char _openttd_revision[] = WITH_REV_HACK;
+	const char _openttd_revision[] = "0.4.8";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif

openttd.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gr /Zp4 /MT /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
+# ADD CPP /nologo /Gr /Zp4 /MT /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WITH_REV_HACK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
 # SUBTRACT CPP /WX /Ot
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_REV_HACK" /YX"stdafx.h" /FD /GZ /c
 # SUBTRACT CPP /WX /Fr
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"

openttd.vcproj

@@ -28,7 +28,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
 				RuntimeLibrary="0"
@@ -100,7 +100,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"

os/win32/installer/install.nsi

@@ -2,7 +2,7 @@
 !define APPNAME "OpenTTD"
 !define APPNAMEANDVERSION "OpenTTD 0.4.8.0"
 !define APPVERSION "0.4.8.0"
-!define INSTALLERVERSION 21 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 22 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"

os2.c

@@ -210,9 +210,10 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
 	int sort_start;
 	char filename[MAX_PATH];
 
-	if (_fios_scn_path == NULL) {
-		_fios_scn_path = malloc(MAX_PATH);
-		strcpy(_fios_scn_path, _path.scenario_dir);
+	/* Copy the default path on first run or on 'New Game' */
+	if (mode == SLD_NEW_GAME || _fios_scn_path == NULL) {
+		if (_fios_scn_path == NULL) _fios_scn_path = malloc(MAX_PATH);
+		ttd_strlcpy(_fios_scn_path, _path.scenario_dir, MAX_PATH);
 	}
 
 	_fios_path = _fios_scn_path;

readme.txt

@@ -1,5 +1,5 @@
 OpenTTD README
-Last updated:    2006-07-31
+Last updated:    2006-08-12
 Release version: 0.4.8
 ------------------------------------------------------------------------
 

ship.h

@@ -0,0 +1,15 @@
+/* $Id$ */
+
+#include "vehicle.h"
+
+
+static inline bool IsShipInDepot(const Vehicle* v)
+{
+	assert(v->type == VEH_Ship);
+	return v->u.ship.state == 0x80;
+}
+
+static inline bool IsShipInDepotStopped(const Vehicle* v)
+{
+	return IsShipInDepot(v) && v->vehstatus & VS_STOPPED;
+}

ship_gui.c

@@ -4,6 +4,7 @@
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
+#include "ship.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "map.h"
@@ -569,7 +570,7 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) {
 			Vehicle *v;
 			uint32 h;
 			v = GetVehicle(w->window_number);
-			h = IsTileDepotType(v->tile, TRANSPORT_WATER) && v->vehstatus & VS_HIDDEN ? (1<< 7) : (1 << 11);
+			h = IsShipInDepotStopped(v) ? (1<< 7) : (1 << 11);
 			if (h != w->hidden_state) {
 				w->hidden_state = h;
 				SetWindowDirty(w);

unix.c

@@ -208,9 +208,10 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
 	int sort_start;
 	char filename[MAX_PATH];
 
-	if (_fios_scn_path == NULL) {
-		_fios_scn_path = malloc(MAX_PATH);
-		strcpy(_fios_scn_path, _path.scenario_dir);
+	/* Copy the default path on first run or on 'New Game' */
+	if (mode == SLD_NEW_GAME || _fios_scn_path == NULL) {
+		if (_fios_scn_path == NULL) _fios_scn_path = malloc(MAX_PATH);
+		ttd_strlcpy(_fios_scn_path, _path.scenario_dir, MAX_PATH);
 	}
 
 	_fios_path = _fios_scn_path;

vehicle.c

@@ -2012,7 +2012,7 @@ uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y)
 
 UnitID GetFreeUnitNumber(byte type)
 {
-	UnitID unit, max;
+	UnitID unit, max = 0;
 	const Vehicle *u;
 	static bool *cache = NULL;
 	static UnitID gmax = 0;

win32.c

@@ -22,10 +22,6 @@
 
 static bool _has_console;
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-	#define __TIMESTAMP__   __DATE__ __TIME__
-#endif
-
 #if defined(__MINGW32__)
 	#include <stdint.h>
 #endif
@@ -445,10 +441,10 @@ static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep)
 	{
 		SYSTEMTIME time;
 		GetLocalTime(&time);
-		output += sprintf(output,
+		output += snprintf(output, 8192,
 			"*** OpenTTD Crash Report ***\r\n"
 			"Date: %d-%.2d-%.2d %.2d:%.2d:%.2d\r\n"
-			"Build: %s built on " __TIMESTAMP__ "\r\n",
+			"Build: %s built on " __DATE__ " " __TIME__ "\r\n",
 			time.wYear,
 			time.wMonth,
 			time.wDay,
@@ -779,9 +775,10 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
 	HANDLE h;
 	int sort_start;
 
-	if (_fios_scn_path == NULL) {
-		_fios_scn_path = malloc(MAX_PATH);
-		strcpy(_fios_scn_path, _path.scenario_dir);
+	/* Copy the default path on first run or on 'New Game' */
+	if (mode == SLD_NEW_GAME || _fios_scn_path == NULL) {
+		if (_fios_scn_path == NULL) _fios_scn_path = malloc(MAX_PATH);
+		ttd_strlcpy(_fios_scn_path, _path.scenario_dir, MAX_PATH);
 	}
 
 	_fios_path = _fios_scn_path;