[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.39,2.40 bundle.cpp,1.47,1.48 akos.cpp,1.87,1.88 imuse_digi.cpp,1.51,1.52 gfx.cpp,2.220,2.221 dialogs.cpp,1.75,1.76 charset.cpp,2.66,2.67 costume.cpp,1.116,1.117
Chris Apers
chrilith at users.sourceforge.net
Thu Oct 9 07:18:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28926
Modified Files:
player_v2.cpp bundle.cpp akos.cpp imuse_digi.cpp gfx.cpp
dialogs.cpp charset.cpp costume.cpp
Log Message:
Moved PalmOS initializations out of namespaces.
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.39
retrieving revision 2.40
diff -u -d -r2.39 -r2.40
--- player_v2.cpp 5 Oct 2003 17:32:38 -0000 2.39
+++ player_v2.cpp 9 Oct 2003 14:17:05 -0000 2.40
@@ -986,18 +986,20 @@
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 @@
#endif
-} // End of namespace Scumm
Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- bundle.cpp 3 Oct 2003 18:33:53 -0000 1.47
+++ bundle.cpp 9 Oct 2003 14:17:05 -0000 1.48
@@ -946,11 +946,13 @@
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 @@
#endif
-} // End of namespace Scumm
+
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- akos.cpp 3 Oct 2003 18:33:53 -0000 1.87
+++ akos.cpp 9 Oct 2003 14:17:05 -0000 1.88
@@ -1366,11 +1366,13 @@
}
}
+} // 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 @@
_GEND
#endif
-
-} // End of namespace Scumm
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- imuse_digi.cpp 3 Oct 2003 23:32:34 -0000 1.51
+++ imuse_digi.cpp 9 Oct 2003 14:17:05 -0000 1.52
@@ -1164,18 +1164,19 @@
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 @@
_GEND
#endif
-
-} // End of namespace Scumm
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.220
retrieving revision 2.221
diff -u -d -r2.220 -r2.221
--- gfx.cpp 9 Oct 2003 05:44:46 -0000 2.220
+++ gfx.cpp 9 Oct 2003 14:17:06 -0000 2.221
@@ -3634,12 +3634,13 @@
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 @@
_GEND
#endif
-
-} // End of namespace Scumm
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- dialogs.cpp 8 Oct 2003 21:59:22 -0000 1.75
+++ dialogs.cpp 9 Oct 2003 14:17:06 -0000 1.76
@@ -789,13 +789,15 @@
#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 @@
_GEND
#endif
-
-} // End of namespace Scumm
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -d -r2.66 -r2.67
--- charset.cpp 3 Oct 2003 18:33:53 -0000 2.66
+++ charset.cpp 9 Oct 2003 14:17:06 -0000 2.67
@@ -1303,15 +1303,17 @@
_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 @@
_GEND
#endif
-
-} // End of namespace Scumm
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- costume.cpp 3 Oct 2003 18:33:53 -0000 1.116
+++ costume.cpp 9 Oct 2003 14:17:06 -0000 1.117
@@ -858,11 +858,13 @@
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 @@
#endif
-} // End of namespace Scumm
More information about the Scummvm-git-logs
mailing list