mirror of https://github.com/OpenTTD/OpenTTD
(svn r18354) [0.7] -Backport from trunk:
- Fix: Endianness issue with saving the zoom level [FS#3333] (r18351) [0.7] -Prepare for 0.7.4release/0.7
parent
a1fb44c417
commit
b6834cf135
|
@ -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)
|
||||
------------------------------------------------------------------------
|
||||
- Change: Prefer extmidi over allegro midi and allegro over null driver [FS#3272] (r17875)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
OpenTTD's known bugs
|
||||
Last updated: 2009-11-15
|
||||
Release version: 0.7.4-RC1
|
||||
Last updated: 2009-12-01
|
||||
Release version: 0.7.4
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
* New upstream release.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
!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 INSTALLERVERSION 69 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
|
||||
!define INSTALLERVERSION 70 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
|
||||
!include ${VERSION_INCLUDE}
|
||||
|
||||
!define APPURLLINK "http://www.openttd.org"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
OpenTTD README
|
||||
Last updated: 2009-11-15
|
||||
Release version: 0.7.4-RC1
|
||||
Last updated: 2009-12-01
|
||||
Release version: 0.7.4
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ extern TileIndex _cur_tileloop_tile;
|
|||
/* Keep track of current game position */
|
||||
int _saved_scrollpos_x;
|
||||
int _saved_scrollpos_y;
|
||||
ZoomLevelByte _saved_scrollpos_zoom;
|
||||
|
||||
void SaveViewportBeforeSaveGame()
|
||||
{
|
||||
|
@ -45,7 +46,7 @@ void ResetViewportAfterLoadGame()
|
|||
w->viewport->dest_scrollpos_y = _saved_scrollpos_y;
|
||||
|
||||
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_height = ScaleByZoom(vp->height, vp->zoom);
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@ void CopyTempEngineData();
|
|||
|
||||
extern int32 _saved_scrollpos_x;
|
||||
extern int32 _saved_scrollpos_y;
|
||||
extern ZoomLevelByte _saved_scrollpos_zoom;
|
||||
|
||||
extern SavegameType _savegame_type;
|
||||
extern uint32 _ttdp_version;
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
|
||||
PlaceProc *_place_proc;
|
||||
Point _tile_fract_coords;
|
||||
ZoomLevel _saved_scrollpos_zoom;
|
||||
|
||||
struct StringSpriteToDraw {
|
||||
StringID string;
|
||||
|
|
|
@ -7,8 +7,6 @@
|
|||
|
||||
#include "zoom_type.h"
|
||||
|
||||
extern ZoomLevel _saved_scrollpos_zoom;
|
||||
|
||||
/**
|
||||
* Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
|
||||
* When shifting right, value is rounded up
|
||||
|
|
|
@ -37,4 +37,6 @@ enum ZoomLevel {
|
|||
};
|
||||
DECLARE_POSTFIX_INCREMENT(ZoomLevel)
|
||||
|
||||
typedef SimpleTinyEnumT<ZoomLevel, byte> ZoomLevelByte;
|
||||
|
||||
#endif /* ZOOM_TYPE_H */
|
||||
|
|
Loading…
Reference in New Issue