[Scummvm-cvs-logs] scummvm master -> 38d02d1687bb72270c317ef50e38b11f2cb5aeaf

sev- sev at scummvm.org
Sat Nov 9 12:24:00 CET 2013 

This automated email contains information about 15 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6491ad1cf9 TOUCHE: Initialize more variables. CID 1002423
fe67837077 DRASCULA: More variables initialized. CID 1003403
986369bcb5 DREAMWEB: Initialize struct contents. CID 1003402
c8bf090327 PARALLACTION: Initialize class. CID 1002701
8c21b5cdd4 PARALLACTION: Initialize class. CID 1002702
c7331eea02 PARALLACTION: Initialize class. CID 1002703
918ae371a0 PARALLACTION: Initialize class. CID 1002705
d74585b344 PARALLACTION: Initialize class. CID 1002706
c9ae0a46dd PARALLACTION: Initialize class variables. CID 1002707
9cf199cb42 PARALLACTION: Initialize class variables. CID 1002708
4decd8c808 PARALLACTION: Initialize class variable. CID 1002715
bcd65f854f PARALLACTION: Initialize class. CID 1002721
234f3f3150 PARALLACTION: Initialize class variable. CID 1002724
ee9b4c979a PARALLACTION: Initialize variable. CID 1002725
38d02d1687 PARALLACTION: Initialize class. CID 1002753


Commit: 6491ad1cf93a3fe75a759536c68ac590e56e00a3
    https://github.com/scummvm/scummvm/commit/6491ad1cf93a3fe75a759536c68ac590e56e00a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T02:49:48-08:00

Commit Message:
TOUCHE: Initialize more variables. CID 1002423

Changed paths:
    engines/touche/touche.cpp



diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 6ca17c8..b3e3ca5 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -135,6 +135,38 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
 
 	for (uint i = 0; i < NUM_SEQUENCES; i++)
 		memset(&_sequenceEntryTable[i], 0, sizeof(SequenceEntry));
+
+	_talkListEnd = 0;
+	_talkListCurrent = 0;
+	_talkTextRectDefined = 0;
+	_talkTextDisplayed = 0;
+	_talkTextInitialized = 0;
+	_skipTalkText = 0;
+	_talkTextSpeed = 0;
+	_keyCharTalkCounter = 0;
+	_talkTableLastTalkingKeyChar = 0;
+	_talkTableLastOtherKeyChar = 0;
+	_talkTableLastStringNum = 0;
+
+	for (uint i = 0; i < NUM_TALK_ENTRIES; i++)
+		memset(&_talkTable[i], 0, sizeof(TalkEntry));
+
+	_conversationChoicesUpdated = 0;
+	_conversationReplyNum = 0;
+	_conversationEnded = 0;
+	_conversationNum = 0;
+	_scrollConversationChoiceOffset = 0;
+	_currentConversation = 0;
+	_disableConversationScript = 0;
+	_conversationAreaCleared = 0;
+
+	for (uint i = 0; i < NUM_CONVERSATION_CHOICES; i++)
+		memset(&_conversationChoicesTable[i], 0, sizeof(ConversationChoice));
+
+	for (uint i = 0; i < NUM_KEYCHARS; i++)
+		_sortedKeyCharsTable[i] = 0;
+
+	_currentKeyCharNum = 0;
 }
 
 ToucheEngine::~ToucheEngine() {


Commit: fe678370770d3aeadbd8250e97d497898a8e8857
    https://github.com/scummvm/scummvm/commit/fe678370770d3aeadbd8250e97d497898a8e8857
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T02:51:39-08:00

Commit Message:
DRASCULA: More variables initialized. CID 1003403

Changed paths:
    engines/drascula/drascula.cpp



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 159ceb9..163f007 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -176,6 +176,20 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	_rightMouseButton = 0;
 	*textName = 0;
 
+	crosshairCursor = 0;
+	mouseCursor = 0;
+	bgSurface = 0;
+	backSurface = 0;
+	cursorSurface = 0;
+	drawSurface3 = 0;
+	drawSurface2 = 0;
+	tableSurface = 0;
+	extraSurface = 0;
+	screenSurface = 0;
+	frontSurface = 0;
+	previousMusic = 0;
+	roomMusic = 0;
+
 	_rnd = new Common::RandomSource("drascula");
 
 	_console = 0;


Commit: 986369bcb558790af8ebe4708117c45d23bd7dca
    https://github.com/scummvm/scummvm/commit/986369bcb558790af8ebe4708117c45d23bd7dca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T02:59:38-08:00

Commit Message:
DREAMWEB: Initialize struct contents. CID 1003402

Changed paths:
    engines/dreamweb/dreamweb.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index a91e41e..7323dfc 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -241,6 +241,33 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 
 	for (uint i = 0; i < kNumExObjects; i++)
 		memset(&_exData[i], 0, sizeof(DynObject));
+
+	memset(&_vars, 0, sizeof(GameVars));
+
+	for (uint i = 0; i < 96; i++)
+		memset(&_backdropFlags[i], 0, sizeof(BackdropMapFlag));
+
+	for (uint i = 0; i < kNumReelRoutines+1; i++)
+		memset(&_reelRoutines[i], 0, sizeof(ReelRoutine));
+
+	_personData = 0;
+
+	for (uint i = 0; i < 16; i++)
+		memset(&_openInvList[i], 0, sizeof(ObjectRef));
+
+	for (uint i = 0; i < 30; i++)
+		memset(&_ryanInvList[i], 0, sizeof(ObjectRef));
+
+	for (uint i = 0; i < 11*10; i++)
+		memset(&_mapFlags[i], 0, sizeof(MapFlag));
+
+	for (uint i = 0; i < kNumChanges; i++)
+		memset(&_listOfChanges[i], 0, sizeof(Change));
+
+	_currentCharset = 0;
+
+	for (uint i = 0; i < 36; i++)
+		memset(&_pathData[i], 0, sizeof(RoomPaths));
 }
 
 DreamWebEngine::~DreamWebEngine() {


Commit: c8bf0903271424d3c41842667e241297e23ea318
    https://github.com/scummvm/scummvm/commit/c8bf0903271424d3c41842667e241297e23ea318
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:04:08-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002701

Changed paths:
    engines/parallaction/parser.h



diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 3e2604e..560e57a 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -207,6 +207,11 @@ protected:
 public:
 	LocationParser_ns(Parallaction_ns *vm) : _vm(vm), _commandsNames(0), _locationStmt(0),
 		_locationZoneStmt(0), _locationAnimStmt(0) {
+		_script = 0;
+		_parser = 0;
+		_zoneTypeNames = 0;
+		_zoneFlagNames = 0;
+		_zoneProg = 0;
 	}
 
 	virtual void init();


Commit: 8c21b5cdd4a2c20e5bc18c026cdb8eaba0d166e5
    https://github.com/scummvm/scummvm/commit/8c21b5cdd4a2c20e5bc18c026cdb8eaba0d166e5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:05:42-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002702

Changed paths:
    engines/parallaction/parser.h



diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 560e57a..a97cb3d 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -304,7 +304,7 @@ protected:
 
 public:
 	LocationParser_br(Parallaction_br *vm) : LocationParser_ns((Parallaction_ns*)vm), _vm(vm),
-		_audioCommandsNames(0) {
+		_audioCommandsNames(0), _out(0) {
 	}
 
 	virtual void init();


Commit: c7331eea02c1aee47240847bb59cd1397d843ae6
    https://github.com/scummvm/scummvm/commit/c7331eea02c1aee47240847bb59cd1397d843ae6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:06:55-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002703

Changed paths:
    engines/parallaction/parser.h



diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index a97cb3d..e55df68 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -368,7 +368,7 @@ protected:
 	}
 
 public:
-	ProgramParser_ns(Parallaction_ns *vm) : _vm(vm), _parser(0), _instructionNames(0) {
+	ProgramParser_ns(Parallaction_ns *vm) : _vm(vm), _parser(0), _instructionNames(0), _script(0), _currentInstruction(0) {
 	}
 
 	virtual void init();


Commit: 918ae371a0dd5c09c5e64f31c8663b0caf8f699b
    https://github.com/scummvm/scummvm/commit/918ae371a0dd5c09c5e64f31c8663b0caf8f699b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:09:30-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002705

Changed paths:
    engines/parallaction/parallaction_ns.cpp



diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 49b63dc..91e8c78 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -145,6 +145,18 @@ void LocationName::bind(const char *s) {
 
 Parallaction_ns::Parallaction_ns(OSystem* syst, const PARALLACTIONGameDescription *gameDesc) : Parallaction(syst, gameDesc),
 	_locationParser(0), _programParser(0), _walker(0) {
+	_soundManI = 0;
+	_score = 0;
+	_inTestResult = 0;
+	_callables = 0;
+	num_foglie = 0;
+	_sarcophagusDeltaX = 0;
+	_movingSarcophagus = 0;
+	_freeSarcophagusSlotX = 0;
+	_intro = 0;
+
+	_testResultLabels[0] = 0;
+	_testResultLabels[1] = 0;
 }
 
 Common::Error Parallaction_ns::init() {


Commit: d74585b344e88962d722ada471ae51532d800749
    https://github.com/scummvm/scummvm/commit/d74585b344e88962d722ada471ae51532d800749
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:12:06-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002706

Changed paths:
    engines/parallaction/parallaction_br.cpp



diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index f9df9d8..586e4bb 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -45,6 +45,18 @@ const char *Parallaction_br::_partNames[] = {
 
 Parallaction_br::Parallaction_br(OSystem* syst, const PARALLACTIONGameDescription *gameDesc) : Parallaction(syst, gameDesc),
 	_locationParser(0), _programParser(0), _soundManI(0) {
+	_audioCommandsNamesRes = 0;
+	_part = 0;
+	_nextPart = 0;
+	_subtitleY = 0;
+	_subtitle[0] = 0;
+	_subtitle[1] = 0;
+	_charInventories[0] = 0;
+	_charInventories[1] = 0;
+	_charInventories[2] = 0;
+	_countersNames = 0;
+	_callables = 0;
+	_walker = 0;
 }
 
 Common::Error Parallaction_br::init() {


Commit: c9ae0a46dda76355c53ec0ec30647789ece2e727
    https://github.com/scummvm/scummvm/commit/c9ae0a46dda76355c53ec0ec30647789ece2e727
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:13:56-08:00

Commit Message:
PARALLACTION: Initialize class variables. CID 1002707

Changed paths:
    engines/parallaction/parallaction.cpp



diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index f868abf..5826e96 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -882,6 +882,9 @@ void CharacterName::dummify() {
 
 CharacterName::CharacterName() {
 	dummify();
+
+	_suffix = 0;
+	_prefix = 0;
 }
 
 CharacterName::CharacterName(const char *name) {


Commit: 9cf199cb42e4d0e723b098225487fcb83c8b11eb
    https://github.com/scummvm/scummvm/commit/9cf199cb42e4d0e723b098225487fcb83c8b11eb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:15:47-08:00

Commit Message:
PARALLACTION: Initialize class variables. CID 1002708

Changed paths:
    engines/parallaction/parallaction.cpp



diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 5826e96..e7be1eb 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -59,6 +59,33 @@ Parallaction::Parallaction(OSystem *syst, const PARALLACTIONGameDescription *gam
 	DebugMan.addDebugChannel(kDebugAudio, "audio", "Audio debug level");
 	DebugMan.addDebugChannel(kDebugMenu, "menu", "Menu debug level");
 	DebugMan.addDebugChannel(kDebugInventory, "inventory", "Inventory debug level");
+
+	_screenHeight = 0;
+	_screenSize = 0;
+	_gameType = 0;
+	_gfx = 0;
+	_disk = 0;
+	_input = 0;
+	_debugger = 0;
+	_saveLoad = 0;
+	_menuHelper = 0;
+	_soundMan = 0;
+	_labelFont = 0;
+	_menuFont = 0;
+	_introFont = 0;
+	_dialogueFont = 0;
+	_globalFlagsNames = 0;
+	_objectsNames = 0;
+	_objects = 0;
+	_callableNames = 0;
+	_localFlagNames = 0;
+	_cmdExec = 0;
+	_programExec = 0;
+	_balloonMan = 0;
+	_inventoryRenderer = 0;
+	_inventory = 0;
+	_currentLocationIndex = 0;
+	_numLocations = 0;
 }
 
 Parallaction::~Parallaction() {


Commit: 4decd8c8083a6ff85c092d336d70b61bf8ec30bf
    https://github.com/scummvm/scummvm/commit/4decd8c8083a6ff85c092d336d70b61bf8ec30bf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:17:30-08:00

Commit Message:
PARALLACTION: Initialize class variable. CID 1002715

Changed paths:
    engines/parallaction/gui_ns.cpp



diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp
index 082c37f..ea3c394 100644
--- a/engines/parallaction/gui_ns.cpp
+++ b/engines/parallaction/gui_ns.cpp
@@ -117,6 +117,7 @@ public:
 		_allowChoice = false;
 		_nextState = "selectgame";
 		_label = 0;
+		_blocks = 0;
 
 		_dosLanguageSelectBlocks[0] = Common::Rect(  80, 110, 128, 180 );	// Italian
 		_dosLanguageSelectBlocks[1] = Common::Rect( 129,  85, 177, 155 );	// French


Commit: bcd65f854f98405c16f9749e1b2c23419772a237
    https://github.com/scummvm/scummvm/commit/bcd65f854f98405c16f9749e1b2c23419772a237
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:18:54-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002721

Changed paths:
    engines/parallaction/gui_br.cpp



diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index ddbc31d..2ec5ba6 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -196,6 +196,11 @@ class MainMenuInputState_BR : public MenuInputState {
 public:
 	MainMenuInputState_BR(Parallaction_br *vm, MenuInputHelper *helper) : MenuInputState("mainmenu", helper), _vm(vm)  {
 	    memset(_lines, 0, sizeof(_lines));
+
+		_menuStrings = 0;
+		_options = 0;
+		_availItems = 0;
+		_selection = 0;
 	}
 
 	~MainMenuInputState_BR() {


Commit: 234f3f315053005961a91018f8b8bcf6ebb1865f
    https://github.com/scummvm/scummvm/commit/234f3f315053005961a91018f8b8bcf6ebb1865f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:20:13-08:00

Commit Message:
PARALLACTION: Initialize class variable. CID 1002724

Changed paths:
    engines/parallaction/gui.h



diff --git a/engines/parallaction/gui.h b/engines/parallaction/gui.h
index a6eed24..9f2e964 100644
--- a/engines/parallaction/gui.h
+++ b/engines/parallaction/gui.h
@@ -43,7 +43,7 @@ class MenuInputHelper {
 	MenuInputState *_newState;
 
 public:
-	MenuInputHelper() : _state(0) {
+	MenuInputHelper() : _state(0), _newState(0) {
 	}
 
 	~MenuInputHelper();


Commit: ee9b4c979a3c06776f6f1b9996ce9406e1f67044
    https://github.com/scummvm/scummvm/commit/ee9b4c979a3c06776f6f1b9996ce9406e1f67044
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:21:25-08:00

Commit Message:
PARALLACTION: Initialize variable. CID 1002725

Changed paths:
    engines/parallaction/graphics.h



diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 550f9d1..401e753 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -138,7 +138,7 @@ public:
 	}
 
 	Cnv(uint16 numFrames, uint16 width, uint16 height, byte* data, bool freeData = false)
-		: _count(numFrames), _width(width), _height(height), _data(data), _freeData(freeData) {
+		: _count(numFrames), _width(width), _height(height), _data(data), _freeData(freeData), field_8(0) {
 
 	}
 


Commit: 38d02d1687bb72270c317ef50e38b11f2cb5aeaf
    https://github.com/scummvm/scummvm/commit/38d02d1687bb72270c317ef50e38b11f2cb5aeaf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-09T03:22:57-08:00

Commit Message:
PARALLACTION: Initialize class. CID 1002753

Changed paths:
    engines/parallaction/font.cpp



diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index 03b1ced..627c6eb 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -518,6 +518,9 @@ AmigaFont::AmigaFont(Common::SeekableReadStream &stream) {
 	_charSpace = 0;
 	_charKern = 0;
 
+	_cp = 0;
+	_pitch = 0;
+
 	if (_font->_charSpace != 0)
 		_charSpace = (uint16 *)(_data + FROM_BE_32(_font->_charSpace));
 	if (_font->_charKern != 0)

More information about the Scummvm-git-logs mailing list