[Scummvm-cvs-logs] CVS: scummvm newgui.cpp,1.31,1.32 bundle.cpp,1.7,1.8

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7492

Modified Files:
	newgui.cpp bundle.cpp 
Log Message:
fixed some endian issues in the new SMUSH decoder; cleanup

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/newgui.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- newgui.cpp	14 Aug 2002 20:43:55 -0000	1.31
+++ newgui.cpp	25 Aug 2002 10:50:14 -0000	1.32
@@ -36,8 +36,6 @@
  * - ...
  */
 
-#define ABS(x)	((x) < 0 ? -(x) : (x))
-
 NewGui::NewGui(Scumm *s) : _s(s), _use_alpha_blending(false),
 	_need_redraw(false),_prepare_for_gui(true),
 	_pauseDialog(0), _saveLoadDialog(0), _aboutDialog(0), _optionsDialog(0),

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bundle.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bundle.cpp	14 Aug 2002 09:52:43 -0000	1.7
+++ bundle.cpp	25 Aug 2002 10:50:14 -0000	1.8
@@ -50,7 +50,7 @@
 
 	_voiceFile = fopen(filename, "rb");
 	if (_voiceFile == NULL) {
-		printf("Bundle: Can't open voice bundle file: %s\n", filename);
+		warning("Bundle: Can't open voice bundle file: %s", filename);
 		return false;
 	}
 
@@ -93,7 +93,7 @@
 
 	_musicFile = fopen(filename, "rb");
 	if (_musicFile == NULL) {
-		printf("Bundle: Can't open music bundle file: %s\n", filename);
+		warning("Bundle: Can't open music bundle file: %s", filename);
 		return false;
 	}
 
@@ -132,7 +132,7 @@
 	byte *comp_input, *comp_output;
 
 	if (_voiceFile == NULL) {
-		printf("Bundle: voice file is not open !\n");
+		warning("Bundle: voice file is not open!");
 		return 0;
 	}
 
@@ -182,7 +182,7 @@
 	byte *comp_input;
 
 	if (_musicFile == NULL) {
-		printf("Bundle: music file is not open !\n");
+		warning("Bundle: music file is not open!");
 		return 0;
 	}
 
@@ -228,7 +228,7 @@
 	int32 final_size = 0, i;
 
 	if (_voiceFile == NULL) {
-		printf("Bundle: voice file is not open !\n");
+		warning("Bundle: voice file is not open!");
 		return 0;
 	}
 
@@ -246,7 +246,7 @@
 	int32 final_size = 0, i;
 
 	if (_voiceFile == NULL) {
-		printf("Bundle: voice file is not open !\n");
+		warning("Bundle: voice file is not open!");
 		return 0;
 	}
 
@@ -262,7 +262,7 @@
 int32 Bundle::getNumberOfMusicSamplesByIndex(int32 index)
 {
 	if (_musicFile == NULL) {
-		printf("Bundle: music file is not open !\n");
+		warning("Bundle: music file is not open!");
 		return 0;
 	}
 
@@ -276,7 +276,7 @@
 	int32 number = 0, i;
 
 	if (_musicFile == NULL) {
-		printf("Bundle: music file is not open !\n");
+		warning("Bundle: music file is not open!");
 		return 0;
 	}
 
@@ -651,7 +651,7 @@
 		break;
 
 	default:
-		printf("Bundle: Unknown codec %d!\n", (int)codec);
+		warning("Bundle: Unknown codec %d!", (int)codec);
 		output_size = 0;
 		break;
 	}