[Scummvm-cvs-logs] scummvm master -> 31514f8164c525f3ecaa8962e440e20e985d2f33

sev- sev at scummvm.org
Mon May 2 17:51:10 CEST 2016


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

Summary:
375cac6d79 MADE: Init class variables
35476908f0 TOLTECS: Initialize class variables
ca6a414ad0 MADS: Fix class initialization
8a6e5336a6 MORTEVIELLE: Fix warning
31514f8164 CGE2: More portable way of getting max long value


Commit: 375cac6d79a50a68b7513ba77e216eea1363ad01
    https://github.com/scummvm/scummvm/commit/375cac6d79a50a68b7513ba77e216eea1363ad01
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T17:27:49+02:00

Commit Message:
MADE: Init class variables

Changed paths:
    engines/made/made.cpp



diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index f153929..a29aa25 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -58,11 +58,24 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 
 	const GameSettings *g;
 
+	_eventNum = 0;
+	_eventMouseX = _eventMouseY = 0;
+	_eventKey = 0;
+	_autoStopSound = false;
+	_soundEnergyIndex = 0;
+	_soundEnergyArray = 0;
+	_musicBeatStart = 0;
+	_cdTimeStart = 0;
+
+	_gameId = -1;
+
 	const char *gameid = ConfMan.get("gameid").c_str();
 	for (g = madeSettings; g->gameid; ++g)
 		if (!scumm_stricmp(g->gameid, gameid))
 			_gameId = g->id;
 
+	assert(_gameId != -1);
+
 	_rnd = new Common::RandomSource("made");
 
 	_console = new MadeConsole(this);
@@ -85,6 +98,8 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 
 	_music = nullptr;
 
+	_soundRate = 0;
+
 	// Set default sound frequency
 	switch (getGameID()) {
 	case GID_RODNEY:


Commit: 35476908f0abfa1dada13a8e654b7d4544427d80
    https://github.com/scummvm/scummvm/commit/35476908f0abfa1dada13a8e654b7d4544427d80
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T17:32:43+02:00

Commit Message:
TOLTECS: Initialize class variables

Changed paths:
    engines/toltecs/movie.cpp
    engines/toltecs/resource.cpp
    engines/toltecs/sprite.cpp



diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index b64903e..b26408f 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -45,7 +45,7 @@ enum ChunkTypes {
 	kChunkStopSubtitles = 8
 };
 
-MoviePlayer::MoviePlayer(ToltecsEngine *vm) : _vm(vm), _isPlaying(false), _lastPrefetchOfs(0), _framesPerSoundChunk(0), _endPos(0) {
+MoviePlayer::MoviePlayer(ToltecsEngine *vm) : _vm(vm), _isPlaying(false), _lastPrefetchOfs(0), _framesPerSoundChunk(0), _endPos(0), _audioStream(0) {
 }
 
 MoviePlayer::~MoviePlayer() {
diff --git a/engines/toltecs/resource.cpp b/engines/toltecs/resource.cpp
index 468ae02..6dbb9c2 100644
--- a/engines/toltecs/resource.cpp
+++ b/engines/toltecs/resource.cpp
@@ -31,6 +31,7 @@ namespace Toltecs {
 /* ArchiveReader */
 
 ArchiveReader::ArchiveReader() {
+	_offsets = 0;
 }
 
 ArchiveReader::~ArchiveReader() {
diff --git a/engines/toltecs/sprite.cpp b/engines/toltecs/sprite.cpp
index f29f64d..be4be5d 100644
--- a/engines/toltecs/sprite.cpp
+++ b/engines/toltecs/sprite.cpp
@@ -84,6 +84,7 @@ public:
 		_yerror = _sprite->yerror;
 		_origHeight = _sprite->origHeight;
 		_scalerStatus = 0;
+		_xerror = 0;
 	}
 	SpriteReaderStatus readPacket(PixelPacket &packet) {
 		SpriteReaderStatus status = kSrsPixelsLeft;
@@ -135,6 +136,8 @@ public:
 		_yerror = _sprite->yerror;
 		_origHeight = _sprite->origHeight;
 		_scalerStatus = 0;
+		_sourcep = 0;
+		_xerror = 0;
 	}
 	SpriteReaderStatus readPacket(PixelPacket &packet) {
 		SpriteReaderStatus status;


Commit: ca6a414ad02344cba779b705bddd618ce9dea498
    https://github.com/scummvm/scummvm/commit/ca6a414ad02344cba779b705bddd618ce9dea498
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T17:39:20+02:00

Commit Message:
MADS: Fix class initialization

Changed paths:
    engines/mads/mads.cpp



diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 29bcd10..5776d81 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -58,6 +58,7 @@ MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
 	_resources = nullptr;
 	_sound = nullptr;
 	_audio = nullptr;
+	_screen = nullptr;
 }
 
 MADSEngine::~MADSEngine() {


Commit: 8a6e5336a684a99efcb872e4ed92104d856f6e62
    https://github.com/scummvm/scummvm/commit/8a6e5336a684a99efcb872e4ed92104d856f6e62
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T17:39:30+02:00

Commit Message:
MORTEVIELLE: Fix warning

Changed paths:
    engines/mortevielle/mortevielle.cpp



diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 90d366e..81b2edb 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -145,6 +145,7 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const MortevielleGameDescr
 	_endGame = false;
 	_loseGame = false;
 	_txxFileFl = false;
+	_is = 0;
 }
 
 MortevielleEngine::~MortevielleEngine() {


Commit: 31514f8164c525f3ecaa8962e440e20e985d2f33
    https://github.com/scummvm/scummvm/commit/31514f8164c525f3ecaa8962e440e20e985d2f33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T17:50:15+02:00

Commit Message:
CGE2: More portable way of getting max long value

Changed paths:
    engines/cge2/vga13h.cpp



diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 54f5c00..8b0d8b6 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -952,8 +952,9 @@ uint8 Vga::closest(Dac *pal, const uint8 colR, const uint8 colG, const uint8 col
 }
 
 uint8 Vga::closest(Dac *pal, Dac x) {
-	int exp = (sizeof(long) * 8 - 1);
-	long D = (1 << exp) - 1; // Maximum value of long.
+	long D = 0;
+	D = ~D;
+	D = (unsigned long)D >> 1; // Maximum value of long.
 	long R = x._r;
 	long G = x._g;
 	long B = x._b;






More information about the Scummvm-git-logs mailing list