aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2007-12-24 19:13:32 +0000
committerEugene Sandulenko2007-12-24 19:13:32 +0000
commitfd22ebb2692d97a0b9fbf673fbf9a46fe175080e (patch)
treedddce19e8aa86074d64cf83e787a625fb31e7dc8
parent22dca84d30fdbb6b9c2bcd8accdbb6595f89e12d (diff)
downloadscummvm-rg350-fd22ebb2692d97a0b9fbf673fbf9a46fe175080e.tar.gz
scummvm-rg350-fd22ebb2692d97a0b9fbf673fbf9a46fe175080e.tar.bz2
scummvm-rg350-fd22ebb2692d97a0b9fbf673fbf9a46fe175080e.zip
Fix regressions (crashes) introduced in commit 29860
svn-id: r29981
-rw-r--r--engines/cine/cine.cpp12
1 files changed, 6 insertions, 6 deletions
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;