aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2003-12-17 17:12:09 +0000
committerMax Horn2003-12-17 17:12:09 +0000
commit3364949c82cec9330d95d6e5399ed46f370681e8 (patch)
treebdd5e7faf34fb20bdd4a3ed974295a5947394f7c /scumm/scumm.h
parent3661c7f06cb4ba4af8b9dc5f44267a48ddb0ad83 (diff)
downloadscummvm-rg350-3364949c82cec9330d95d6e5399ed46f370681e8.tar.gz
scummvm-rg350-3364949c82cec9330d95d6e5399ed46f370681e8.tar.bz2
scummvm-rg350-3364949c82cec9330d95d6e5399ed46f370681e8.zip
Patch #861716: palManipulateInit for V6 games (I modified the patch a bit)
svn-id: r11718
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 7677019072..ca6f3f8ae8 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -827,7 +827,7 @@ protected:
void clampCameraPos(Common::Point *pt);
void actorFollowCamera(int act);
- const byte *getPalettePtr();
+ const byte *getPalettePtr(int palindex);
void setupAmigaPalette();
void setupEGAPalette();
void setupV1ManiacPalette();
@@ -842,7 +842,7 @@ protected:
void copyPalColor(int dst, int src);
void cyclePalette();
void stopCycle(int i);
- void palManipulateInit(int start, int end, int string_id, int time);
+ virtual void palManipulateInit(int resID, int start, int end, int time);
void palManipulate();
public:
int remapPaletteColor(int r, int g, int b, uint threshold); // Used by Actor::remapActorPalette