[Scummvm-cvs-logs] scummvm master -> e2bc38ea914d171c790c3853a9dcb26911c973c0

bluegr md5 at scummvm.org
Mon Nov 21 22:09:48 CET 2011


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:
7c5f55912c TOLTECS: Add missing namespace comment
41ba66b59c TOLTECS: Cleanup, removed an obsolete TODO
1eeb852902 TOLTECS: Remove empty implementation of syncSoundSettings()
e2bc38ea91 TOLTECS: Change deltaValue to be an int8, as char isn't always signed


Commit: 7c5f55912c233e4049300051faf5aa31b2efbd47
    https://github.com/scummvm/scummvm/commit/7c5f55912c233e4049300051faf5aa31b2efbd47
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-21T12:32:03-08:00

Commit Message:
TOLTECS: Add missing namespace comment

Changed paths:
    engines/toltecs/detection.cpp



diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 8d685f8..e5ef465 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -283,7 +283,7 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in
 	}
 
 	return SaveStateDescriptor();
-}
+}	// End of namespace Toltecs
 
 #if PLUGIN_ENABLED_DYNAMIC(TOLTECS)
 	REGISTER_PLUGIN_DYNAMIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine);


Commit: 41ba66b59cd71eb1feefe45fe214678004d106ad
    https://github.com/scummvm/scummvm/commit/41ba66b59cd71eb1feefe45fe214678004d106ad
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-21T12:46:33-08:00

Commit Message:
TOLTECS: Cleanup, removed an obsolete TODO

Changed paths:
    engines/toltecs/palette.cpp



diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp
index 8857abc..eb17725 100644
--- a/engines/toltecs/palette.cpp
+++ b/engines/toltecs/palette.cpp
@@ -30,11 +30,9 @@
 namespace Toltecs {
 
 Palette::Palette(ToltecsEngine *vm) : _vm(vm) {
-
 	clearFragments();
 	
 	memset(_colorTransTable, 0, sizeof(_colorTransTable));
-	
 }
 
 Palette::~Palette() {
@@ -115,7 +113,6 @@ void Palette::addFragment(uint resIndex, int16 id) {
 	debug(0, "Palette::addFragment() index = %02X; count = %02X", fragment.index, fragment.count);
 
 	_fragmentIndex += count;
-
 }
 
 uint16 Palette::findFragment(int16 id) {
@@ -142,9 +139,6 @@ void Palette::clearFragments() {
 }
 
 void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
-
-	// TODO
-
 	byte r = 0, g = 0, b = 0;
 	
 	mask &= 7;
@@ -152,7 +146,7 @@ void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
 	for (int i = 0; i < 256; i++) {
 
 		if (deltaValue < 0) {
-			// TODO
+			// TODO (probably unused)
 			warning("Palette::buildColorTransTable(%d, %d, %02X) not yet implemented!", limit, deltaValue, mask);
 		} else {
 			r = _mainPalette[i * 3 + 0];
@@ -184,17 +178,13 @@ void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
 		_colorTransTable[i] = bestIndex;
 
 	}
-
 }
 
 void Palette::buildColorTransTable2(byte limit, char deltaValue, byte mask) {
-
 	// TODO
-
 }
 
 void Palette::saveState(Common::WriteStream *out) {
-
 	// Save currently active palette
 	byte palette[768];
 	getFullPalette(palette);
@@ -213,11 +203,9 @@ void Palette::saveState(Common::WriteStream *out) {
 		out->writeByte(fragment.count);
 	}
 	out->writeByte(_fragmentIndex);
-
 }
 
 void Palette::loadState(Common::ReadStream *in) {
-
 	// Save currently active palette
 	byte palette[768];
 	in->read(palette, 768);
@@ -237,7 +225,6 @@ void Palette::loadState(Common::ReadStream *in) {
 		_fragments.push_back(fragment);
 	}
 	_fragmentIndex = in->readByte();
-
 }
 
 


Commit: 1eeb8529023157555f68cae0e3df9772d340d5ab
    https://github.com/scummvm/scummvm/commit/1eeb8529023157555f68cae0e3df9772d340d5ab
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-21T13:04:48-08:00

Commit Message:
TOLTECS: Remove empty implementation of syncSoundSettings()

Changed paths:
    engines/toltecs/toltecs.cpp
    engines/toltecs/toltecs.h



diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index 948c0c5..8a2853e 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -74,16 +74,6 @@ ToltecsEngine::~ToltecsEngine() {
 	delete _rnd;
 }
 
-void ToltecsEngine::syncSoundSettings() {
-	/*
-	_music->setVolume(ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	*/
-}
-
 Common::Error ToltecsEngine::run() {
 	initGraphics(640, 400, true);
 
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index 3d49af6..1334f84 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -93,7 +93,6 @@ public:
 	virtual ~ToltecsEngine();
 
 	virtual bool hasFeature(EngineFeature f) const;
-	virtual void syncSoundSettings();
 
 	Common::RandomSource *_rnd;
 	const ToltecsGameDescription *_gameDescription;


Commit: e2bc38ea914d171c790c3853a9dcb26911c973c0
    https://github.com/scummvm/scummvm/commit/e2bc38ea914d171c790c3853a9dcb26911c973c0
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-21T13:08:10-08:00

Commit Message:
TOLTECS: Change deltaValue to be an int8, as char isn't always signed

Changed paths:
    engines/toltecs/palette.cpp
    engines/toltecs/palette.h



diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp
index eb17725..706218e 100644
--- a/engines/toltecs/palette.cpp
+++ b/engines/toltecs/palette.cpp
@@ -59,7 +59,7 @@ void Palette::getFullPalette(byte *palette) {
 	}
 }
 
-void Palette::setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 count, int16 startIndex) {
+void Palette::setDeltaPalette(byte *palette, byte mask, int8 deltaValue, int16 count, int16 startIndex) {
 	byte colors[768];
 
 	byte *palPtr = palette + startIndex * 3;
@@ -138,7 +138,7 @@ void Palette::clearFragments() {
 	_fragments.clear();
 }
 
-void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
+void Palette::buildColorTransTable(byte limit, int8 deltaValue, byte mask) {
 	byte r = 0, g = 0, b = 0;
 	
 	mask &= 7;
@@ -180,7 +180,7 @@ void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
 	}
 }
 
-void Palette::buildColorTransTable2(byte limit, char deltaValue, byte mask) {
+void Palette::buildColorTransTable2(byte limit, int8 deltaValue, byte mask) {
 	// TODO
 }
 
diff --git a/engines/toltecs/palette.h b/engines/toltecs/palette.h
index 140d59b..7bcf06e 100644
--- a/engines/toltecs/palette.h
+++ b/engines/toltecs/palette.h
@@ -41,7 +41,7 @@ public:
 
 	void setFullPalette(byte *palette);
 	void getFullPalette(byte *palette);
-	void setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 count, int16 startIndex);
+	void setDeltaPalette(byte *palette, byte mask, int8 deltaValue, int16 count, int16 startIndex);
 
 	void loadAddPalette(uint resIndex, byte startIndex);
 	void loadAddPaletteFrom(byte *source, byte startIndex, byte count);
@@ -50,8 +50,8 @@ public:
 	uint16 findFragment(int16 id);
 	void clearFragments();
 
-	void buildColorTransTable(byte limit, char deltaValue, byte mask);
-	void buildColorTransTable2(byte limit, char deltaValue, byte mask);
+	void buildColorTransTable(byte limit, int8 deltaValue, byte mask);
+	void buildColorTransTable2(byte limit, int8 deltaValue, byte mask);
 	byte getColorTransPixel(byte pixel) const { return _colorTransTable[pixel]; }
 
 	byte *getMainPalette() { return _mainPalette; }






More information about the Scummvm-git-logs mailing list