cpp/openttd-patchpack/source Changeset - r13815:8cc0cdaaf624

Changeset - r13815:8cc0cdaaf624

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 14 years ago 2009-11-30 11:29:52
rubidium@openttd.org

(svn r18351) -Fix [FS#3333]: endianness issue with saving the zoom level

5 files changed with 5 insertions and 4 deletions:

src/saveload/misc_sl.cpp

src/saveload/saveload_internal.h

src/viewport.cpp

src/zoom_func.h

src/zoom_type.h

0 comments (0 inline, 0 general)

src/saveload/misc_sl.cpp

➞

Show inline comments

@@ @@ -29,6 +29,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()
+{
@@ @@ -51,7 +52,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);

src/saveload/saveload_internal.h

➞

Show inline comments

@@ @@ -45,6 +45,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;

src/viewport.cpp

➞

Show inline comments

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

src/zoom_func.h

➞

Show inline comments

@@ @@ -14,8 +14,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

src/zoom_type.h

➞

Show inline comments

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

0 comments (0 inline, 0 general)