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

(svn r18354) [0.7] -Backport from trunk: 

- Fix: Endianness issue with saving the zoom level [FS#3333] (r18351)
[0.7] -Prepare for 0.7.4
release/0.7
rubidium 2009-11-30 23:59:42 +00:00
parent a1fb44c417
commit b6834cf135
10 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.txt
View File

@ -1,3 +1,9 @@
0.7.4 (2009-12-01)
------------------------------------------------------------------------
- Fix: Endianness issue with saving the zoom level [FS#3333] (r18351)
- Fix: [NewGRF] When starting a new game the values of action D variable 13 were incorrect [FS#3324] (r18207)
0.7.4-RC1 (2009-11-15) 0.7.4-RC1 (2009-11-15)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Change: Prefer extmidi over allegro midi and allegro over null driver [FS#3272] (r17875) - Change: Prefer extmidi over allegro midi and allegro over null driver [FS#3272] (r17875)

4
known-bugs.txt
View File

@ -1,6 +1,6 @@
OpenTTD's known bugs OpenTTD's known bugs
Last updated: 2009-11-15 Last updated: 2009-12-01
Release version: 0.7.4-RC1 Release version: 0.7.4
------------------------------------------------------------------------ ------------------------------------------------------------------------

6
os/debian/changelog
View File

@ -1,3 +1,9 @@
openttd (0.7.4) unstable; urgency=low
* New upstream release.
-- Matthijs Kooijman <matthijs@stdin.nl> Tue, 01 Dec 2009 01:23:45 +0100
openttd (0.7.4~RC1) unstable; urgency=low openttd (0.7.4~RC1) unstable; urgency=low
* New upstream release. * New upstream release.

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

@ -1,7 +1,7 @@
!define APPNAME "OpenTTD" ; Define application name !define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "0.7.4-RC1" ; Define application version !define APPVERSION "0.7.4" ; Define application version
!define APPVERSIONINTERNAL "0.7.4.0" ; Define application version in X.X.X.X !define APPVERSIONINTERNAL "0.7.4.0" ; Define application version in X.X.X.X
!define INSTALLERVERSION 69 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! !define INSTALLERVERSION 70 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
!include ${VERSION_INCLUDE} !include ${VERSION_INCLUDE}
!define APPURLLINK "http://www.openttd.org" !define APPURLLINK "http://www.openttd.org"

4
readme.txt
View File

@ -1,6 +1,6 @@
OpenTTD README OpenTTD README
Last updated: 2009-11-15 Last updated: 2009-12-01
Release version: 0.7.4-RC1 Release version: 0.7.4
------------------------------------------------------------------------ ------------------------------------------------------------------------

3
src/saveload/misc_sl.cpp
View File

@ -23,6 +23,7 @@ extern TileIndex _cur_tileloop_tile;
/* Keep track of current game position */ /* Keep track of current game position */
int _saved_scrollpos_x; int _saved_scrollpos_x;
int _saved_scrollpos_y; int _saved_scrollpos_y;
ZoomLevelByte _saved_scrollpos_zoom;
void SaveViewportBeforeSaveGame() void SaveViewportBeforeSaveGame()
{ {
@ -45,7 +46,7 @@ void ResetViewportAfterLoadGame()
w->viewport->dest_scrollpos_y = _saved_scrollpos_y; w->viewport->dest_scrollpos_y = _saved_scrollpos_y;
ViewPort *vp = w->viewport; ViewPort *vp = w->viewport;
vp->zoom = min(_saved_scrollpos_zoom, ZOOM_LVL_MAX); vp->zoom = min<ZoomLevel>(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
vp->virtual_width = ScaleByZoom(vp->width, vp->zoom); vp->virtual_width = ScaleByZoom(vp->width, vp->zoom);
vp->virtual_height = ScaleByZoom(vp->height, vp->zoom); vp->virtual_height = ScaleByZoom(vp->height, vp->zoom);

1
src/saveload/saveload_internal.h
View File

@ -36,6 +36,7 @@ void CopyTempEngineData();
extern int32 _saved_scrollpos_x; extern int32 _saved_scrollpos_x;
extern int32 _saved_scrollpos_y; extern int32 _saved_scrollpos_y;
extern ZoomLevelByte _saved_scrollpos_zoom;
extern SavegameType _savegame_type; extern SavegameType _savegame_type;
extern uint32 _ttdp_version; extern uint32 _ttdp_version;

1
src/viewport.cpp
View File

@ -45,7 +45,6 @@
PlaceProc *_place_proc; PlaceProc *_place_proc;
Point _tile_fract_coords; Point _tile_fract_coords;
ZoomLevel _saved_scrollpos_zoom;
struct StringSpriteToDraw { struct StringSpriteToDraw {
StringID string; StringID string;

2
src/zoom_func.h
View File

@ -7,8 +7,6 @@
#include "zoom_type.h" #include "zoom_type.h"
extern ZoomLevel _saved_scrollpos_zoom;
/** /**
* Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL) * Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
* When shifting right, value is rounded up * When shifting right, value is rounded up

2
src/zoom_type.h
View File

@ -37,4 +37,6 @@ enum ZoomLevel {
}; };
DECLARE_POSTFIX_INCREMENT(ZoomLevel) DECLARE_POSTFIX_INCREMENT(ZoomLevel)
typedef SimpleTinyEnumT<ZoomLevel, byte> ZoomLevelByte;
#endif /* ZOOM_TYPE_H */ #endif /* ZOOM_TYPE_H */