[Scummvm-cvs-logs] scummvm master -> 8484b4b148731b77b9378606987fc9e92d9eb553

[sev-]

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:
18b7c5fd9c PARALLACTION: Pass big value by reference rather than copying. CID 1003923
8484b4b148 PARALLACTION: Make sure overridden methods are not used. Fixes compiler warning


Commit: 18b7c5fd9c56ba5000dce3d898b334d76e72b482
    https://github.com/scummvm/scummvm/commit/18b7c5fd9c56ba5000dce3d898b334d76e72b482
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-03T02:20:39-08:00

Commit Message:
PARALLACTION: Pass big value by reference rather than copying. CID 1003923

Changed paths:
    engines/parallaction/graphics.cpp
    engines/parallaction/graphics.h



diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 3f36d56..dca1870 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -218,7 +218,7 @@ void Palette::rotate(uint first, uint last, bool forward) {
 
 
 
-void Gfx::setPalette(Palette pal) {
+void Gfx::setPalette(Palette &pal) {
 	byte sysPal[256*3];
 
 	uint n = pal.fillRGB(sysPal);
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 55c1c0c..550f9d1 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -465,7 +465,7 @@ public:
 	void invertBackground(const Common::Rect& r);
 
 	// palette
-	void setPalette(Palette palette);
+	void setPalette(Palette &palette);
 	void setBlackPalette();
 	void animatePalette();
 


Commit: 8484b4b148731b77b9378606987fc9e92d9eb553
    https://github.com/scummvm/scummvm/commit/8484b4b148731b77b9378606987fc9e92d9eb553
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-03T02:20:40-08:00

Commit Message:
PARALLACTION: Make sure overridden methods are not used. Fixes compiler warning

Changed paths:
    engines/parallaction/sound_br.cpp
    engines/parallaction/sound_ns.cpp



diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 4a643aa..ea769de 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -207,6 +207,7 @@ public:
 
 	void play(Common::SeekableReadStream *stream);
 	virtual void pause(bool p);
+	virtual void pause() { assert(0); } // overridden
 	virtual void setVolume(int volume);
 	virtual void onTimer();
 
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index 0ee3d73..ed3031e 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -43,6 +43,7 @@ public:
 
 	void play(Common::SeekableReadStream *stream);
 	void pause(bool p);
+	virtual void pause() { assert(0); } // overridden
 	virtual void onTimer();
 
 private: