[Scummvm-cvs-logs] CVS: scummvm/scumm bomp.cpp,2.2,2.3 bundle.h,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv9144

Modified Files:
	bomp.cpp bundle.h 
Log Message:
make some stuff private

Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- bomp.cpp	30 May 2003 19:09:41 -0000	2.2
+++ bomp.cpp	31 May 2003 00:02:59 -0000	2.3
@@ -144,7 +144,7 @@
 		byte tmp = *line_buffer++;
 		if (tmp != transparency) {
 			if (tmp == 13) {
-				tmp = shadowPalette[*(dst)];
+				tmp = shadowPalette[*dst];
 			}
 			*dst = tmp;
 		}

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- bundle.h	28 May 2003 02:08:31 -0000	1.17
+++ bundle.h	31 May 2003 00:02:59 -0000	1.18
@@ -54,23 +54,27 @@
 	File _voiceFile;
 	File _musicFile;
 
+
+	void initializeImcTables();
+
 	int32 compDecode(byte *src, byte *dst);
 	int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size);
 
+	int32 decompressVoiceSampleByIndex(int32 index, byte **comp_final);
+	int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final);
+	int32 getNumberOfMusicSamplesByIndex(int32 index);
+
 public:
 	Bundle();
 	~Bundle();
 
-	void initializeImcTables();
 	bool openVoiceFile(const char *filename, const char *directory);
 	bool openMusicFile(const char *filename, const char *directory);
 	void closeVoiceFile();
 	void closeMusicFile();
+
 	int32 decompressVoiceSampleByName(const char *name, byte **comp_final);
-	int32 decompressVoiceSampleByIndex(int32 index, byte **comp_final);
 	int32 decompressMusicSampleByName(const char *name, int32 number, byte *comp_final);
-	int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final);
-	int32 getNumberOfMusicSamplesByIndex(int32 index);
 	int32 getNumberOfMusicSamplesByName(const char *name);
 };