diff options
| author | Kamil Zbróg | 2013-11-04 11:40:22 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-04 11:40:22 +0000 |
| commit | 85694ec1f5793eb4025f4153ef4bf71d3769d699 (patch) | |
| tree | c93fab58eb2f52eca244895a9867d28134dbd7f5 /engines/parallaction/graphics.cpp | |
| parent | 026390145b0e947be7cccf3d9ba329eb2270a2ed (diff) | |
| parent | 9dc35033f523c9c694f24e15ed45ba6194786a25 (diff) | |
| download | scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.tar.gz scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.tar.bz2 scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.zip | |
Merge remote-tracking branch 'own/prince' into prince-malik
Conflicts:
engines/prince/debugger.cpp
engines/prince/debugger.h
engines/prince/detection.cpp
engines/prince/font.cpp
engines/prince/graphics.cpp
engines/prince/prince.cpp
engines/prince/prince.h
engines/prince/script.cpp
engines/prince/script.h
Diffstat (limited to 'engines/parallaction/graphics.cpp')
| -rw-r--r-- | engines/parallaction/graphics.cpp | 2 |
1 files changed, 1 insertions, 1 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); |