1 files changed, 52 insertions, 50 deletions

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 067b9eb6e9..b953f2f5b0 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -117,56 +117,56 @@ void CGEEngine::setup() {
 	_volume[0] = 0;
 	_volume[1] = 0;
 
-	_savTab[0].Ptr = &_now;
-	_savTab[0].Len = sizeof(_now);
-	_savTab[0].Flg = 1;
-	_savTab[1].Ptr = &_oldLev;
-	_savTab[1].Len = sizeof(_oldLev);
-	_savTab[1].Flg = 1;
-	_savTab[2].Ptr = &_demoText;
-	_savTab[2].Len = sizeof(_demoText);
-	_savTab[2].Flg = 1;
-	_savTab[3].Ptr = &_game;
-	_savTab[3].Len = sizeof(_game);
-	_savTab[3].Flg = 1;
-	_savTab[4].Ptr = &_game;
-	_savTab[4].Len = sizeof(_game);
-	_savTab[4].Flg = 1;
-	_savTab[5].Ptr = &_game;
-	_savTab[5].Len = sizeof(_game);
-	_savTab[5].Flg = 1;
-	_savTab[6].Ptr = &_game;
-	_savTab[6].Len = sizeof(_game);
-	_savTab[6].Flg = 1;
-	_savTab[7].Ptr = &_game;
-	_savTab[7].Len = sizeof(_game);
-	_savTab[7].Flg = 1;
-	_savTab[8].Ptr = &_vga->_mono;
-	_savTab[8].Len = sizeof(_vga->_mono);
-	_savTab[8].Flg = 0;
-	_savTab[9].Ptr = &_music;
-	_savTab[9].Len = sizeof(_music);
-	_savTab[9].Flg = 1;
-	_savTab[10].Ptr = _volume;
-	_savTab[10].Len = sizeof(_volume);
-	_savTab[10].Flg = 1;
-	_savTab[11].Ptr = _flag;
-	_savTab[11].Len = sizeof(_flag);
-	_savTab[11].Flg = 1;
-	_savTab[12].Ptr = _heroXY;
-//	_savTab[12].Len = sizeof(_heroXY); FIXME: illegal sizeof
-	_savTab[12].Len = 0;
-	_savTab[12].Flg = 1;
-	_savTab[13].Ptr = _barriers;
-//	_savTab[13].Len = sizeof(_barriers); FIXME: illegal sizeof
-	_savTab[13].Len = 0;
-	_savTab[13].Flg = 1;
-	_savTab[14].Ptr = _pocref;
-	_savTab[14].Len = sizeof(_pocref);
-	_savTab[14].Flg = 1;
-	_savTab[15].Ptr = NULL;
-	_savTab[15].Len = 0;
-	_savTab[15].Flg = 0;
+	_savTab[0]._ptr = &_now;
+	_savTab[0]._len = sizeof(_now);
+	_savTab[0]._flag = true;
+	_savTab[1]._ptr = &_oldLev;
+	_savTab[1]._len = sizeof(_oldLev);
+	_savTab[1]._flag = true;
+	_savTab[2]._ptr = &_demoText;
+	_savTab[2]._len = sizeof(_demoText);
+	_savTab[2]._flag = true;
+	_savTab[3]._ptr = &_game;
+	_savTab[3]._len = sizeof(_game);
+	_savTab[3]._flag = true;
+	_savTab[4]._ptr = &_game;
+	_savTab[4]._len = sizeof(_game);
+	_savTab[4]._flag = true;
+	_savTab[5]._ptr = &_game;
+	_savTab[5]._len = sizeof(_game);
+	_savTab[5]._flag = true;
+	_savTab[6]._ptr = &_game;
+	_savTab[6]._len = sizeof(_game);
+	_savTab[6]._flag = true;
+	_savTab[7]._ptr = &_game;
+	_savTab[7]._len = sizeof(_game);
+	_savTab[7]._flag = true;
+	_savTab[8]._ptr = &_vga->_mono;
+	_savTab[8]._len = sizeof(_vga->_mono);
+	_savTab[8]._flag = false;
+	_savTab[9]._ptr = &_music;
+	_savTab[9]._len = sizeof(_music);
+	_savTab[9]._flag = true;
+	_savTab[10]._ptr = _volume;
+	_savTab[10]._len = sizeof(_volume);
+	_savTab[10]._flag = true;
+	_savTab[11]._ptr = _flag;
+	_savTab[11]._len = sizeof(_flag);
+	_savTab[11]._flag = true;
+	_savTab[12]._ptr = _heroXY;
+//	_savTab[12]._len = sizeof(_heroXY); FIXME: illegal sizeof
+	_savTab[12]._len = 0;
+	_savTab[12]._flag = true;
+	_savTab[13]._ptr = _barriers;
+//	_savTab[13]._len = sizeof(_barriers); FIXME: illegal sizeof
+	_savTab[13]._len = 0;
+	_savTab[13]._flag = true;
+	_savTab[14]._ptr = _pocref;
+	_savTab[14]._len = sizeof(_pocref);
+	_savTab[14]._flag = true;
+	_savTab[15]._ptr = NULL;
+	_savTab[15]._len = 0;
+	_savTab[15]._flag = false;
 
 	if (_isDemo) {
 		_maxCaveArr[0] = CAVE_MAX;
@@ -187,6 +187,8 @@ void CGEEngine::setup() {
 	_now      =  1;
 	_lev      = -1;
 
+	for (int i = 0; i < 4; i++)
+		_flag[i] = false;
 
 }