From fd22ebb2692d97a0b9fbf673fbf9a46fe175080e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 24 Dec 2007 19:13:32 +0000
Subject: Fix regressions (crashes) introduced in commit 29860

svn-id: r29981
---
 engines/cine/cine.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/cine/cine.cpp')

diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index b5b83211c8..4c89bbbe1e 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -97,7 +97,6 @@ int CineEngine::init() {
 }
 
 int CineEngine::go() {
-	gfxInit();
 	CursorMan.showMouse(true);
 	mainLoop(1);
 	gfxDestroy();
@@ -110,6 +109,7 @@ void CineEngine::initialize() {
 	setupOpcodes();
 
 	initLanguage(g_cine->getLanguage());
+	gfxInit();
 
 	textDataPtr = (byte *)malloc(8000);
 
@@ -128,11 +128,11 @@ void CineEngine::initialize() {
 		loadErrmessDat("errmess.dat");
 	}
 
-	memset(objectTable, 0, sizeof(objectTable));
-	memset(globalVars, 0, sizeof(globalVars));
-	memset(scriptTable, 0, sizeof(scriptTable));
-	memset(messageTable, 0, sizeof(scriptTable));
-	memset(relTable, 0, sizeof(scriptTable));
+	memset(objectTable, 0, ARRAYSIZE(objectTable));
+	memset(globalVars, 0, ARRAYSIZE(globalVars));
+	memset(scriptTable, 0, ARRAYSIZE(scriptTable));
+	memset(messageTable, 0, ARRAYSIZE(scriptTable));
+	memset(relTable, 0, ARRAYSIZE(scriptTable));
 
 	for (int i = 0; i < NUM_MAX_ANIMDATA; i++) {
 		animDataTable[i].ptr1 = animDataTable[i].ptr2 = NULL;
-- 
cgit v1.2.3