Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

1 files changed, 3 insertions, 1 deletions

diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 6855fd41b9..337e73dad0 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -964,9 +964,10 @@ Scene810::Scene810(): SceneExt() {
 }
 
 void Scene810::synchronize(Serializer &s) {
+	int dummy = 0;
 	SceneExt::synchronize(s);
 	s.syncAsSint16LE(_fieldA70);
-	s.syncAsSint16LE(_fieldA72);
+	s.syncAsSint16LE(dummy);
 	s.syncAsSint16LE(_fieldA74);
 }
 
@@ -2220,6 +2221,7 @@ Scene840::Scene840(): PalettedScene() {
 	_field1AC2 = 0;
 	_field1AC4 = 0;
 	_field1AC6 = (BF_GLOBALS._dayNumber > 3) ? 1 : 0;
+	_field1ABA = 0;
 }
 
 void Scene840::synchronize(Serializer &s) {