[Scummvm-cvs-logs] scummvm master -> 849f383169d57b0dee7b33ab0c2166007b50b8c2
Strangerke
Strangerke at scummvm.org
Tue Jan 27 07:17:57 CET 2015
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
77302c406f ACCESS: Initialize some variables
849f383169 MADE: Initialize some variables, remove a useless variable
Commit: 77302c406f5fa3641ff7dd3454d8b87d43274c86
https://github.com/scummvm/scummvm/commit/77302c406f5fa3641ff7dd3454d8b87d43274c86
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-27T07:04:18+01:00
Commit Message:
ACCESS: Initialize some variables
Changed paths:
engines/access/access.cpp
engines/access/files.cpp
engines/access/files.h
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 7f59ae7..0a4e519 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -94,6 +94,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
_cheatFl = false;
_restartFl = false;
_printEnd = 0;
+ for (int i = 0; i < 100; i++)
+ _objectsTable[i] = nullptr;
+ _clearSummaryFlag = false;
}
AccessEngine::~AccessEngine() {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 42a7914..4d734a6 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -40,6 +40,10 @@ void FileIdent::load(Common::SeekableReadStream &s) {
/*------------------------------------------------------------------------*/
+CellIdent:: CellIdent() {
+ _cell = 0;
+}
+
CellIdent::CellIdent(int cell, int fileNum, int subfile) {
_cell = cell;
_fileNum = fileNum;
diff --git a/engines/access/files.h b/engines/access/files.h
index 8b1aef0..714ea44 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -46,7 +46,7 @@ struct FileIdent {
struct CellIdent : FileIdent {
byte _cell;
- CellIdent() {}
+ CellIdent();
CellIdent(int cell, int fileNum, int subfile);
};
Commit: 849f383169d57b0dee7b33ab0c2166007b50b8c2
https://github.com/scummvm/scummvm/commit/849f383169d57b0dee7b33ab0c2166007b50b8c2
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-27T07:14:55+01:00
Commit Message:
MADE: Initialize some variables, remove a useless variable
Changed paths:
engines/made/script.cpp
engines/made/script.h
engines/made/scriptfuncs.cpp
diff --git a/engines/made/script.cpp b/engines/made/script.cpp
index 20fa026..f9f7acf 100644
--- a/engines/made/script.cpp
+++ b/engines/made/script.cpp
@@ -122,6 +122,11 @@ ScriptInterpreter::ScriptInterpreter(MadeEngine *vm) : _vm(vm) {
_functions = new ScriptFunctions(_vm);
_functions->setupExternalsTable();
+ _localStackPos = 0;
+ _runningScriptObjectIndex = 0;
+ _codeBase = nullptr;
+ _codeIp = nullptr;
+
#undef COMMAND
}
diff --git a/engines/made/script.h b/engines/made/script.h
index bf75bc0..f28425d 100644
--- a/engines/made/script.h
+++ b/engines/made/script.h
@@ -84,7 +84,6 @@ protected:
int16 _localStackPos;
int16 _runningScriptObjectIndex;
byte *_codeBase, *_codeIp;
- bool _terminated;
ScriptFunctions *_functions;
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index efa765c..bcc08e0 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -42,6 +42,8 @@ ScriptFunctions::ScriptFunctions(MadeEngine *vm) : _vm(vm), _soundStarted(false)
_pcSpeaker2 = new Audio::PCSpeaker();
_vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_pcSpeakerHandle1, _pcSpeaker1);
_vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_pcSpeakerHandle2, _pcSpeaker2);
+ _soundResource = nullptr;
+ _musicRes = nullptr;
}
ScriptFunctions::~ScriptFunctions() {
More information about the Scummvm-git-logs
mailing list