diff options
| author | Chris Apers | 2004-01-18 16:02:10 +0000 |
|---|---|---|
| committer | Chris Apers | 2004-01-18 16:02:10 +0000 |
| commit | 130abce642cf7e76e1f5a657b3e4bd1f886a194a (patch) | |
| tree | e7d806f4eda25d8ad6c61d39c9c2a93d6fcb439f /scumm | |
| parent | 78d1aa42f6d8d87290a6b4c66164f6b11b144c4c (diff) | |
| download | scummvm-rg350-130abce642cf7e76e1f5a657b3e4bd1f886a194a.tar.gz scummvm-rg350-130abce642cf7e76e1f5a657b3e4bd1f886a194a.tar.bz2 scummvm-rg350-130abce642cf7e76e1f5a657b3e4bd1f886a194a.zip | |
Fixed PalmOS stuffs
svn-id: r12485
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse.h | 6 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_tables.cpp | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index a29b56a19b..7939e2c77a 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -197,9 +197,9 @@ struct imuseFtSeqTable { #ifdef __PALM_OS__ extern const imuseRoomMap *_digStateMusicMap; extern const imuseDigTable *_digStateMusicTable; -extern const imuseDigTable *_comiStateMusicTable; +extern const imuseDigTable *_digSeqMusicTable; +extern const imuseComiTable *_comiStateMusicTable; extern const imuseComiTable *_comiSeqMusicTable; -extern const imuseComiTable *_digSeqMusicTable; extern const imuseFtStateTable *_ftStateMusicTable; extern const imuseFtSeqTable *_ftSeqMusicTable; extern const imuseFtNames *_ftSeqNames; @@ -216,4 +216,4 @@ extern const imuseFtNames _ftSeqNames[]; } // End of namespace Scumm -#endif +#endif
\ No newline at end of file diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp index d89cfd2c06..53bd400c2b 100644 --- a/scumm/imuse_digi/dimuse_tables.cpp +++ b/scumm/imuse_digi/dimuse_tables.cpp @@ -856,23 +856,25 @@ const imuseFtSeqTable _ftSeqMusicTable[] = { #include "scumm_globals.h" _GINIT(DimuseTables) -_GSETPTR(Scumm::_digStateMusicMap, GBVARS_DIGSTATEMUSICMAP_INDEX, Scumm::imuse_music_map , GBVARS_SCUMM) -_GSETPTR(Scumm::_digStateMusicTable, GBVARS_DIGSTATEMUSICTABLE_INDEX, Scumm::imuse_music_table , GBVARS_SCUMM) -_GSETPTR(Scumm::_comiStateMusicTable, GBVARS_COMISTATEMUSICTABLE_INDEX, Scumm::imuse_music_table , GBVARS_SCUMM) -_GSETPTR(Scumm::_comiSeqMusicTable, GBVARS_COMISEQMUSICTABLE_INDEX, Scumm::imuse_music_table , GBVARS_SCUMM) -_GSETPTR(Scumm::_digSeqMusicTable, GBVARS_DIGSEQMUSICTABLE_INDEX, Scumm::imuse_music_table , GBVARS_SCUMM) -_GSETPTR(Scumm::_ftStateMusicTable, GBVARS_FTSTATEMUSICTABLE_INDEX, Scumm::imuse_ft_music_table , GBVARS_SCUMM) -_GSETPTR(Scumm::_ftSeqMusicTable, GBVARS_FTSEQMUSICTABLE_INDEX, Scumm::imuse_ft_music_table , GBVARS_SCUMM) +_GSETPTR(Scumm::_digStateMusicMap, GBVARS_DIGSTATEMUSICMAP_INDEX, Scumm::imuseRoomMap , GBVARS_SCUMM) +_GSETPTR(Scumm::_digStateMusicTable, GBVARS_DIGSTATEMUSICTABLE_INDEX, Scumm::imuseDigTable , GBVARS_SCUMM) +_GSETPTR(Scumm::_digSeqMusicTable, GBVARS_DIGSEQMUSICTABLE_INDEX, Scumm::imuseDigTable , GBVARS_SCUMM) +_GSETPTR(Scumm::_comiStateMusicTable, GBVARS_COMISTATEMUSICTABLE_INDEX, Scumm::imuseComiTable , GBVARS_SCUMM) +_GSETPTR(Scumm::_comiSeqMusicTable, GBVARS_COMISEQMUSICTABLE_INDEX, Scumm::imuseComiTable , GBVARS_SCUMM) +_GSETPTR(Scumm::_ftStateMusicTable, GBVARS_FTSTATEMUSICTABLE_INDEX, Scumm::imuseFtStateTable, GBVARS_SCUMM) +_GSETPTR(Scumm::_ftSeqMusicTable, GBVARS_FTSEQMUSICTABLE_INDEX, Scumm::imuseFtSeqTable , GBVARS_SCUMM) +_GSETPTR(Scumm::_ftSeqNames, GBVARS_FTSEQNAMES_INDEX, Scumm::imuseFtNames , GBVARS_SCUMM) _GEND _GRELEASE(DimuseTables) _GRELEASEPTR(GBVARS_DIGSTATEMUSICMAP_INDEX , GBVARS_SCUMM) _GRELEASEPTR(GBVARS_DIGSTATEMUSICTABLE_INDEX , GBVARS_SCUMM) +_GRELEASEPTR(GBVARS_DIGSEQMUSICTABLE_INDEX , GBVARS_SCUMM) _GRELEASEPTR(GBVARS_COMISTATEMUSICTABLE_INDEX , GBVARS_SCUMM) _GRELEASEPTR(GBVARS_COMISEQMUSICTABLE_INDEX , GBVARS_SCUMM) -_GRELEASEPTR(GBVARS_DIGSEQMUSICTABLE_INDEX , GBVARS_SCUMM) _GRELEASEPTR(GBVARS_FTSTATEMUSICTABLE_INDEX , GBVARS_SCUMM) _GRELEASEPTR(GBVARS_FTSEQMUSICTABLE_INDEX , GBVARS_SCUMM) +_GRELEASEPTR(GBVARS_FTSEQNAMES_INDEX , GBVARS_SCUMM) _GEND -#endif +#endif
\ No newline at end of file |