diff options
author | Paweł Kołodziejski | 2002-08-25 18:40:23 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2002-08-25 18:40:23 +0000 |
commit | 73b031515eadf2865871f3a8a09df9627f7c113e (patch) | |
tree | 4621a4faee1cf7a01efc5ca2748995409c231644 /scumm/scumm.h | |
parent | b169ef13e38bf3bb69e6725f6988011aa9eb258c (diff) | |
download | scummvm-rg350-73b031515eadf2865871f3a8a09df9627f7c113e.tar.gz scummvm-rg350-73b031515eadf2865871f3a8a09df9627f7c113e.tar.bz2 scummvm-rg350-73b031515eadf2865871f3a8a09df9627f7c113e.zip |
applied patch #599909
svn-id: r4855
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 8147020f33..613cde7945 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -55,8 +55,8 @@ enum { NUM_SCRIPT_SLOT = 40, NUM_LOCALSCRIPT = 60, NUM_SHADOW_PALETTE = 8, - MAX_ACTORS = 30, - KEY_SET_OPTIONS = 3456 // WinCE + MAX_ACTORS = 30, + KEY_SET_OPTIONS = 3456 // WinCE }; enum { @@ -292,9 +292,9 @@ enum GameFeatures { GF_DEFAULT = GF_USE_KEY, GF_SMALL_HEADER = 32, - GF_EXTERNAL_CHARSET = GF_SMALL_HEADER, - GF_SMALL_NAMES = 64, - GF_OLD_BUNDLE = 128, + GF_EXTERNAL_CHARSET = GF_SMALL_HEADER, + GF_SMALL_NAMES = 64, + GF_OLD_BUNDLE = 128, GF_16COLOR = 256, GF_OLD256 = 512, GF_AUDIOTRACKS = 1024, @@ -833,8 +833,8 @@ public: void unkScreenEffect3(); void unkScreenEffect4(); void unkScreenEffect5(int a); - void unkScreenEffect6(); void transitionEffect(int a); // former unkScreenEffect7 + void dissolveEffect(int width, int height); // former unkScreenEffect5(0) and unkScreenEffect6 void decompressBomp(byte *dst, byte *src, int w, int h); uint _shakeFrame; |