diff options
| author | Kamil Zbróg | 2013-11-04 11:31:09 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-04 11:31:09 +0000 |
| commit | 9dc35033f523c9c694f24e15ed45ba6194786a25 (patch) | |
| tree | 7b5f28a46601e4a980f147a8af686270d4b3cf1b /engines/parallaction | |
| parent | c56c85265f0ae4df7cf11dd3e2170f5c6c6f6edb (diff) | |
| parent | eea62d4b6d28dbb8fd91fa0889ce1b7fd177458f (diff) | |
| download | scummvm-rg350-9dc35033f523c9c694f24e15ed45ba6194786a25.tar.gz scummvm-rg350-9dc35033f523c9c694f24e15ed45ba6194786a25.tar.bz2 scummvm-rg350-9dc35033f523c9c694f24e15ed45ba6194786a25.zip | |
Merge remote-tracking branch 'origin/master' into prince
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/graphics.h | 2 | ||||
| -rw-r--r-- | engines/parallaction/sound_br.cpp | 1 | ||||
| -rw-r--r-- | engines/parallaction/sound_ns.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 3f36d56420..dca1870cb7 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 55c1c0c04e..550f9d1dd9 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(); diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index 4a643aaf1d..ea769de9e8 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 0ee3d73556..ed3031e94e 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: |