[Scummvm-cvs-logs] scummvm master -> dc91eafdadd2e8d1c1b0a863b6e77b187c53d358
sev-
sev at scummvm.org
Tue Oct 29 09:01:24 CET 2013
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
36ad6a69ca DRASCULA: More uninit variables. CID 1003403
9d2cc7ce84 TOUCHE: Fix buffer overrun. CID 1003934
ba99c3d3b6 TOUCHE: Initialize class variables. CID 1002423
dc91eafdad DREAMWEB: More unitialized variables. CID 1003402
Commit: 36ad6a69ca29e86ac5bfaebaee90cc61c0a54a67
https://github.com/scummvm/scummvm/commit/36ad6a69ca29e86ac5bfaebaee90cc61c0a54a67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-29T00:42:11-07:00
Commit Message:
DRASCULA: More uninit variables. CID 1003403
Changed paths:
engines/drascula/drascula.cpp
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 9699dda..159ceb9 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -141,6 +141,32 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
drasculaX = 0;
drasculaY = 0;
trackDrascula = 0;
+ _roomNumber = 0;
+ numRoomObjs = 0;
+ takeObject = 0;
+ pickedObject = 0;
+ _subtitlesDisabled = 0;
+ _menuBar = 0;
+ _menuScreen = 0;
+ _hasName = 0;
+ curExcuseLook = 0;
+ curExcuseAction = 0;
+ frame_y = 0;
+ curX = 0;
+ curY = 0;
+ characterMoved = 0;
+ curDirection = 0;
+ trackProtagonist = 0;
+ _characterFrame = 0;
+ hare_se_ve = 0;
+ roomX = 0;
+ roomY = 0;
+ checkFlags = 0;
+ doBreak = 0;
+ stepX = 0;
+ stepY = 0;
+ curHeight = 0;
+ curWidth = 0;
_color = 0;
blinking = 0;
Commit: 9d2cc7ce84107d93d56371e8266cbe2193a7923b
https://github.com/scummvm/scummvm/commit/9d2cc7ce84107d93d56371e8266cbe2193a7923b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-29T00:46:59-07:00
Commit Message:
TOUCHE: Fix buffer overrun. CID 1003934
Changed paths:
engines/touche/touche.h
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 6ac43e7..9cc42b0 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -102,7 +102,7 @@ struct KeyChar {
int16 zPosPrev;
int16 prevWalkDataNum;
uint16 textColor;
- int16 inventoryItems[4];
+ int16 inventoryItems[5];
int16 money;
int16 pointsDataNum;
int16 currentWalkBox;
Commit: ba99c3d3b6979fecd12109b62a62f9eb7e3a9b61
https://github.com/scummvm/scummvm/commit/ba99c3d3b6979fecd12109b62a62f9eb7e3a9b61
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-29T00:53:34-07:00
Commit Message:
TOUCHE: Initialize class variables. CID 1002423
Changed paths:
engines/touche/touche.cpp
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 89cc1ad..6ca17c8 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -110,6 +110,31 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
DebugMan.addDebugChannel(kDebugCharset, "Charset", "Charset debug level");
_console = new ToucheConsole(this);
+
+ _newEpisodeNum = 0;
+ _currentEpisodeNum = 0;
+ _currentAmountOfMoney = 0;
+ _giveItemToKeyCharNum = 0;
+ _giveItemToObjectNum = 0;
+ _giveItemToCounter = 0;
+ _currentRoomNum = 0;
+ _waitingSetKeyCharNum1 = 0;
+ _waitingSetKeyCharNum2 = 0;
+ _waitingSetKeyCharNum3 = 0;
+ _script.opcodeNum = 0;
+ _script.dataOffset = 0;
+ _script.keyCharNum = 0;
+ _script.dataPtr = 0;
+ _script.stackDataPtr = 0;
+ _script.stackDataBasePtr = 0;
+ _script.quitFlag = 0;
+ _opcodesTable = 0;
+
+ for (uint i = 0; i < NUM_SPRITES; i++)
+ memset(&_spritesTable[i], 0, sizeof(SpriteData));
+
+ for (uint i = 0; i < NUM_SEQUENCES; i++)
+ memset(&_sequenceEntryTable[i], 0, sizeof(SequenceEntry));
}
ToucheEngine::~ToucheEngine() {
Commit: dc91eafdadd2e8d1c1b0a863b6e77b187c53d358
https://github.com/scummvm/scummvm/commit/dc91eafdadd2e8d1c1b0a863b6e77b187c53d358
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-29T00:58:36-07:00
Commit Message:
DREAMWEB: More unitialized variables. CID 1003402
Changed paths:
engines/dreamweb/dreamweb.cpp
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 6c6f529..a91e41e 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -232,6 +232,15 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_hasSpeech = 0;
_roomsSample = 0;
_copyProtection = 0;
+
+ for (uint i = 0; i < 128; i++)
+ memset(&_setDat[i], 0, sizeof(SetObject));
+
+ for (uint i = 0; i < 80; i++)
+ memset(&_freeDat[i], 0, sizeof(DynObject));
+
+ for (uint i = 0; i < kNumExObjects; i++)
+ memset(&_exData[i], 0, sizeof(DynObject));
}
DreamWebEngine::~DreamWebEngine() {
More information about the Scummvm-git-logs
mailing list