diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/touche/touche.h | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/touche/touche.h')
| -rw-r--r-- | engines/touche/touche.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/touche/touche.h b/engines/touche/touche.h index ce4f84b9a8..5aef0ef613 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -114,7 +114,7 @@ struct KeyChar { int16 followingKeyCharPos; uint16 sequenceDataIndex; uint16 sequenceDataOffset; - int16 walkPointsListCount; + int16 walkPointsListIndex; int16 walkPointsList[40]; uint16 scriptDataStartOffset; uint16 scriptDataOffset; @@ -209,7 +209,7 @@ struct InventoryState { struct ProgramPointData { int16 x, y, z; - int16 priority; + int16 order; }; struct ProgramWalkData { @@ -390,7 +390,7 @@ protected: void centerScreenToKeyChar(int keyChar); void waitForKeyCharsSet(); void redrawRoom(); - void fadePalette(int firstColor, int lastColor, int scale, int scaleInc, int fadingStepsCount); + void fadePalette(int firstColor, int colorCount, int scale, int scaleInc, int fadingStepsCount); void fadePaletteFromFlags(); void moveKeyChar(uint8 *dst, int dstPitch, KeyChar *key); void changeKeyCharFrame(KeyChar *key, int keyChar); |