diff --git a/changelog.txt b/changelog.txt index 217bd54183..f2ace51345 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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) diff --git a/known-bugs.txt b/known-bugs.txt index b13ada794b..50faa293e2 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -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 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 4f6dc379da..b82642f25c 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (0.7.4) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Tue, 01 Dec 2009 01:23:45 +0100 + openttd (0.7.4~RC1) unstable; urgency=low * New upstream release. diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 9ca28e6388..f9359fe99e 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -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" diff --git a/readme.txt b/readme.txt index f5c6faed19..e6cf885d30 100644 --- a/readme.txt +++ b/readme.txt @@ -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 ------------------------------------------------------------------------ diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 7153a98925..1fc641d381 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -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(_saved_scrollpos_zoom, ZOOM_LVL_MAX); vp->virtual_width = ScaleByZoom(vp->width, vp->zoom); vp->virtual_height = ScaleByZoom(vp->height, vp->zoom); diff --git a/src/saveload/saveload_internal.h b/src/saveload/saveload_internal.h index 19a5b5cbff..89c8f5b598 100644 --- a/src/saveload/saveload_internal.h +++ b/src/saveload/saveload_internal.h @@ -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; diff --git a/src/viewport.cpp b/src/viewport.cpp index 8f79226cb4..c90f31127a 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -45,7 +45,6 @@ PlaceProc *_place_proc; Point _tile_fract_coords; -ZoomLevel _saved_scrollpos_zoom; struct StringSpriteToDraw { StringID string; diff --git a/src/zoom_func.h b/src/zoom_func.h index 1c3c9c9b32..6fbb0bb3d4 100644 --- a/src/zoom_func.h +++ b/src/zoom_func.h @@ -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 diff --git a/src/zoom_type.h b/src/zoom_type.h index af314ad113..9ef8a0fc45 100644 --- a/src/zoom_type.h +++ b/src/zoom_type.h @@ -37,4 +37,6 @@ enum ZoomLevel { }; DECLARE_POSTFIX_INCREMENT(ZoomLevel) +typedef SimpleTinyEnumT ZoomLevelByte; + #endif /* ZOOM_TYPE_H */