[Scummvm-cvs-logs] SF.net SVN: scummvm: [26495] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Apr 15 15:41:55 CEST 2007
Revision: 26495
http://scummvm.svn.sourceforge.net/scummvm/?rev=26495&view=rev
Author: drmccoy
Date: 2007-04-15 06:41:54 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
MSVC8 apparently complains about uninitialized variables there, fixing (see bug #1700986)
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/util.cpp
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2007-04-15 13:39:08 UTC (rev 26494)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2007-04-15 13:41:54 UTC (rev 26495)
@@ -2227,6 +2227,7 @@
dataVar = _vm->_parse->parseVarIndex();
size = _vm->_parse->parseValExpr();
offset = _vm->_parse->parseValExpr();
+ retSize = 0;
if (_vm->_game->_extHandle >= 0)
_vm->_dataIO->closeData(_vm->_game->_extHandle);
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2007-04-15 13:39:08 UTC (rev 26494)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2007-04-15 13:41:54 UTC (rev 26495)
@@ -1827,6 +1827,7 @@
size = _vm->_parse->parseValExpr();
evalExpr(0);
offset = _vm->_global->_inter_resVal;
+ retSize = 0;
debugC(2, kDebugFileIO, "Read from file \"%s\" (%d, %d bytes at %d)",
_vm->_global->_inter_resStr, dataVar, size, offset);
@@ -2023,6 +2024,7 @@
type = SOUND_SND;
slotIdMask = 0;
+ dataSize = 0;
if (!search) {
slot = _vm->_parse->parseValExpr();
Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp 2007-04-15 13:39:08 UTC (rev 26494)
+++ scummvm/trunk/engines/gob/util.cpp 2007-04-15 13:41:54 UTC (rev 26495)
@@ -82,7 +82,7 @@
void Util::processInput(bool scroll) {
Common::Event event;
Common::EventManager *eventMan = g_system->getEventManager();
- int16 x, y;
+ int16 x = 0, y = 0;
bool hasMove = false;
while (eventMan->pollEvent(event)) {
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