[Scummvm-cvs-logs] SF.net SVN: scummvm: [29981] scummvm/trunk/engines/cine/cine.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Mon Dec 24 20:13:32 CET 2007
Revision: 29981
http://scummvm.svn.sourceforge.net/scummvm/?rev=29981&view=rev
Author: sev
Date: 2007-12-24 11:13:32 -0800 (Mon, 24 Dec 2007)
Log Message:
-----------
Fix regressions (crashes) introduced in commit 29860
Modified Paths:
--------------
scummvm/trunk/engines/cine/cine.cpp
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2007-12-24 18:32:18 UTC (rev 29980)
+++ scummvm/trunk/engines/cine/cine.cpp 2007-12-24 19:13:32 UTC (rev 29981)
@@ -97,7 +97,6 @@
}
int CineEngine::go() {
- gfxInit();
CursorMan.showMouse(true);
mainLoop(1);
gfxDestroy();
@@ -110,6 +109,7 @@
setupOpcodes();
initLanguage(g_cine->getLanguage());
+ gfxInit();
textDataPtr = (byte *)malloc(8000);
@@ -128,11 +128,11 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list