diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/akos.cpp | 6 | ||||
| -rw-r--r-- | scumm/bundle.cpp | 6 | ||||
| -rw-r--r-- | scumm/charset.cpp | 14 | ||||
| -rw-r--r-- | scumm/costume.cpp | 5 | ||||
| -rw-r--r-- | scumm/dialogs.cpp | 10 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 5 | ||||
| -rw-r--r-- | scumm/imuse_digi.cpp | 17 | ||||
| -rw-r--r-- | scumm/player_v2.cpp | 19 | ||||
| -rw-r--r-- | scumm/smush/codec47.cpp | 6 |
9 files changed, 46 insertions, 42 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 1747c3c25f..f4459f5def 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -1366,11 +1366,13 @@ void ScummEngine::akos_queCommand(byte cmd, Actor *a, int param_1, int param_2) } } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Akos) -_GSETPTR(defaultScaleTable, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::defaultScaleTable, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM) _GEND _GRELEASE(Akos) @@ -1378,5 +1380,3 @@ _GRELEASEPTR(GBVARS_DEFAULTSCALETABLE_INDEX, GBVARS_SCUMM) _GEND #endif - -} // End of namespace Scumm diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp index 4e720d6d7e..c9176a1f4f 100644 --- a/scumm/bundle.cpp +++ b/scumm/bundle.cpp @@ -946,11 +946,13 @@ int32 Bundle::decompressCodec(int32 codec, byte *comp_input, byte *comp_output, return output_size; } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Bundle) -_GSETPTR(imcTable, GBVARS_IMCTABLE_INDEX, int16, GBVARS_SCUMM) +_GSETPTR(Scumm::imcTable, GBVARS_IMCTABLE_INDEX, int16, GBVARS_SCUMM) _GEND _GRELEASE(Bundle) @@ -959,4 +961,4 @@ _GEND #endif -} // End of namespace Scumm + diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 8dcc9598b5..0cf0ad8f27 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -1303,15 +1303,17 @@ void CharsetRendererNut::printChar(int chr) { _str.bottom = shadow_bottom; } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Charset) -_GSETPTR(germanCharsetDataV2, GBVARS_GERMANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) -_GSETPTR(frenchCharsetDataV2, GBVARS_FRENCHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) -_GSETPTR(englishCharsetDataV2, GBVARS_ENGLISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) -_GSETPTR(italianCharsetDataV2, GBVARS_ITALIANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) -_GSETPTR(spanishCharsetDataV2, GBVARS_SPANISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::germanCharsetDataV2, GBVARS_GERMANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::frenchCharsetDataV2, GBVARS_FRENCHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::englishCharsetDataV2, GBVARS_ENGLISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::italianCharsetDataV2, GBVARS_ITALIANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::spanishCharsetDataV2, GBVARS_SPANISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM) _GEND _GRELEASE(Charset) @@ -1323,5 +1325,3 @@ _GRELEASEPTR(GBVARS_SPANISHCHARSETDATAV2_INDEX, GBVARS_SCUMM) _GEND #endif - -} // End of namespace Scumm diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 2723177ce1..3f6f718656 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -858,11 +858,13 @@ bool ScummEngine::isCostumeInUse(int cost) const { return false; } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Costume) -_GSETPTR(cost_scaleTable, GBVARS_COSTSCALETABLE_INDEX, byte, GBVARS_SCUMM) +_GSETPTR(Scumm::cost_scaleTable, GBVARS_COSTSCALETABLE_INDEX, byte, GBVARS_SCUMM) _GEND _GRELEASE(Costume) @@ -871,4 +873,3 @@ _GEND #endif -} // End of namespace Scumm diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index 94e59cdd08..d528fa30d5 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -789,13 +789,15 @@ void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { #endif +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Dialogs) -_GSETPTR(string_map_table_v7, GBVARS_STRINGMAPTABLEV7_INDEX, ResString, GBVARS_SCUMM) -_GSETPTR(string_map_table_v6, GBVARS_STRINGMAPTABLEV6_INDEX, ResString, GBVARS_SCUMM) -_GSETPTR(string_map_table_v5, GBVARS_STRINGMAPTABLEV5_INDEX, ResString, GBVARS_SCUMM) +_GSETPTR(Scumm::string_map_table_v7, GBVARS_STRINGMAPTABLEV7_INDEX, Scumm::ResString, GBVARS_SCUMM) +_GSETPTR(Scumm::string_map_table_v6, GBVARS_STRINGMAPTABLEV6_INDEX, Scumm::ResString, GBVARS_SCUMM) +_GSETPTR(Scumm::string_map_table_v5, GBVARS_STRINGMAPTABLEV5_INDEX, Scumm::ResString, GBVARS_SCUMM) _GEND _GRELEASE(Dialogs) @@ -805,5 +807,3 @@ _GRELEASEPTR(GBVARS_STRINGMAPTABLEV5_INDEX, GBVARS_SCUMM) _GEND #endif - -} // End of namespace Scumm diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index dd9605f5b5..18213eadf6 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -3634,12 +3634,13 @@ void ScummEngine::makeCursorColorTransparent(int a) { updateCursor(); } +} // End of namespace Scumm #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Gfx) -_GSETPTR(transitionEffects, GBVARS_TRANSITIONEFFECTS_INDEX, TransitionEffect, GBVARS_SCUMM) +_GSETPTR(Scumm::transitionEffects, GBVARS_TRANSITIONEFFECTS_INDEX, Scumm::TransitionEffect, GBVARS_SCUMM) _GEND _GRELEASE(Gfx) @@ -3647,5 +3648,3 @@ _GRELEASEPTR(GBVARS_TRANSITIONEFFECTS_INDEX, GBVARS_SCUMM) _GEND #endif - -} // End of namespace Scumm diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index c5cc8059b3..faa8b9e425 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -1164,18 +1164,19 @@ int IMuseDigital::getSoundStatus(int sound) const { return 0; } +} // End of namespace Scumm #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(IMuseDigital) -_GSETPTR(_digStateMusicMap, GBVARS_DIGSTATEMUSICMAP_INDEX, imuse_music_map , GBVARS_SCUMM) -_GSETPTR(_digStateMusicTable, GBVARS_DIGSTATEMUSICTABLE_INDEX, imuse_music_table , GBVARS_SCUMM) -_GSETPTR(_comiStateMusicTable, GBVARS_COMISTATEMUSICTABLE_INDEX, imuse_music_table , GBVARS_SCUMM) -_GSETPTR(_comiSeqMusicTable, GBVARS_COMISEQMUSICTABLE_INDEX, imuse_music_table , GBVARS_SCUMM) -_GSETPTR(_digSeqMusicTable, GBVARS_DIGSEQMUSICTABLE_INDEX, imuse_music_table , GBVARS_SCUMM) -_GSETPTR(_ftStateMusicTable, GBVARS_FTSTATEMUSICTABLE_INDEX, imuse_ft_music_table, GBVARS_SCUMM) -_GSETPTR(_ftSeqMusicTable, GBVARS_FTSEQMUSICTABLE_INDEX, imuse_ft_music_table, GBVARS_SCUMM) +_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) _GEND _GRELEASE(IMuseDigital) @@ -1189,5 +1190,3 @@ _GRELEASEPTR(GBVARS_FTSEQMUSICTABLE_INDEX , GBVARS_SCUMM) _GEND #endif - -} // End of namespace Scumm diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp index 8a853922ea..2e42a3d7f7 100644 --- a/scumm/player_v2.cpp +++ b/scumm/player_v2.cpp @@ -986,18 +986,20 @@ void Player_V2::generatePCjrSamples(int16 *data, uint len) { lowPassFilter(data, len); } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(PlayerV2) -_GSETPTR(note_lengths, GBVARS_NOTELENGTHS_INDEX, uint8, GBVARS_SCUMM) -_GSETPTR(hull_offsets, GBVARS_HULLOFFSETS_INDEX, uint16, GBVARS_SCUMM) -_GSETPTR(hulls, GBVARS_HULLS_INDEX, int16, GBVARS_SCUMM) -_GSETPTR(freqmod_lengths, GBVARS_FREQMODLENGTHS_INDEX, uint16, GBVARS_SCUMM) -_GSETPTR(freqmod_offsets, GBVARS_FREQMODOFFSETS_INDEX, uint16, GBVARS_SCUMM) -_GSETPTR(freqmod_table, GBVARS_FREQMODTABLE_INDEX, int8, GBVARS_SCUMM) -_GSETPTR(spk_freq_table, GBVARS_SPKFREQTABLE_INDEX, uint16, GBVARS_SCUMM) -_GSETPTR(pcjr_freq_table, GBVARS_PCJRFREQTABLE_INDEX, uint16, GBVARS_SCUMM) +_GSETPTR(Scumm::note_lengths, GBVARS_NOTELENGTHS_INDEX, uint8, GBVARS_SCUMM) +_GSETPTR(Scumm::hull_offsets, GBVARS_HULLOFFSETS_INDEX, uint16, GBVARS_SCUMM) +_GSETPTR(Scumm::hulls, GBVARS_HULLS_INDEX, int16, GBVARS_SCUMM) +_GSETPTR(Scumm::freqmod_lengths, GBVARS_FREQMODLENGTHS_INDEX, uint16, GBVARS_SCUMM) +_GSETPTR(Scumm::freqmod_offsets, GBVARS_FREQMODOFFSETS_INDEX, uint16, GBVARS_SCUMM) +_GSETPTR(Scumm::freqmod_table, GBVARS_FREQMODTABLE_INDEX, int8, GBVARS_SCUMM) +_GSETPTR(Scumm::spk_freq_table, GBVARS_SPKFREQTABLE_INDEX, uint16, GBVARS_SCUMM) +_GSETPTR(Scumm::pcjr_freq_table, GBVARS_PCJRFREQTABLE_INDEX, uint16, GBVARS_SCUMM) _GEND _GRELEASE(PlayerV2) @@ -1013,4 +1015,3 @@ _GEND #endif -} // End of namespace Scumm diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp index 5cc6d7e709..e331f95f92 100644 --- a/scumm/smush/codec47.cpp +++ b/scumm/smush/codec47.cpp @@ -617,11 +617,13 @@ bool Codec47Decoder::decode(byte *dst, const byte *src) { return true; } +} // End of namespace Scumm + #ifdef __PALM_OS__ #include "scumm_globals.h" _GINIT(Codec47) -_GSETPTR(codec47_table, GBVARS_CODEC47TABLE_INDEX, int8, GBVARS_SCUMM) +_GSETPTR(Scumm::codec47_table, GBVARS_CODEC47TABLE_INDEX, int8, GBVARS_SCUMM) _GEND _GRELEASE(Codec47) @@ -630,4 +632,4 @@ _GEND #endif -} // End of namespace Scumm + |