[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.8,1.9 scummvm.cpp,1.7,1.8 string.cpp,1.2,1.3 sys.cpp,1.3,1.4

[Max Horn]

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

Modified Files:
	scumm.h scummvm.cpp string.cpp sys.cpp 
Log Message:
fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scumm.h	29 Aug 2002 23:45:15 -0000	1.8
+++ scumm.h	31 Aug 2002 13:29:09 -0000	1.9
@@ -208,7 +208,7 @@
 	byte *_charPtr;
 	int _width, _height;
 	int _offsX, _offsY;
-	byte _bitMask, _revBitMask;
+	byte _bitMask;
 	int _bottom;
 	int _virtScreenHeight;
 
@@ -368,7 +368,7 @@
 
 	/* Init functions, etc */
 	byte _fastMode;
-	char *getGameName();
+	const char *getGameName();
 
 	/* video buffer */
 	byte *_videoBuffer;
@@ -835,8 +835,9 @@
 	void unkScreenEffect3();
 	void unkScreenEffect4();
 	void unkScreenEffect5(int a);
-	void transitionEffect(int a);		// former unkScreenEffect7
-	void dissolveEffect(int width, int height);	// former unkScreenEffect5(0) and unkScreenEffect6
+	void transitionEffect(int a);
+	void dissolveEffect(int width, int height);
+	void scrollEffect(int dir);
 
 	void decompressBomp(byte *dst, byte *src, int w, int h);
 	uint _shakeFrame;
@@ -1397,20 +1398,8 @@
 	Scumm_v7(GameDetector *detector, OSystem *syst) : Scumm(detector, syst) {}
 };
 
-extern uint16 _debugLevel;
-
+// This is a constant lookup table of reverse bit masks
 extern const byte revBitMask[8];
-//void blitToScreen(Scumm *s, byte *src, int x, int y, int w, int h);
-
-#if defined(__GNUC__)
-void CDECL error(const char *s, ...) NORETURN;
-#else
-void CDECL NORETURN error(const char *s, ...);
-#endif
-
-void CDECL warning(const char *s, ...);
-void CDECL debug(int level, const char *s, ...);
-void checkHeap();
 
 /* Direction conversion functions (between old dir and new dir format) */
 int newDirToOldDir(int dir);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scummvm.cpp	29 Aug 2002 23:45:15 -0000	1.7
+++ scummvm.cpp	31 Aug 2002 13:29:09 -0000	1.8
@@ -100,7 +100,7 @@
 	_gui->init(this);
 	
 	_newgui = new NewGui(this);
-	_bundle = new Bundle(this);
+	_bundle = new Bundle();
 	_timer = new Timer(this);
 	_sound = new Sound(this);
 
@@ -1464,7 +1464,7 @@
 	_maxHeapThreshold = 450000;
 	_minHeapThreshold = 400000;
 
-	/* Create a primary virtual screen */
+	// Create a primary virtual screen
 	_videoBuffer = (byte *)calloc(328*200, 1);
 
 	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
@@ -1514,8 +1514,6 @@
 	_sound->setupSound();
 
 	runScript(1, 0, 0, &_bootParam);
-
-//  _scummTimer = 0;
 }
 
 void Scumm::go() {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- string.cpp	29 Aug 2002 23:45:15 -0000	1.2
+++ string.cpp	31 Aug 2002 13:29:09 -0000	1.3
@@ -951,8 +951,6 @@
 	_mask_ptr = _vm->getResourceAddress(rtBuffer, 9)
 		+ _drawTop * 40 + _left / 8 + _vm->_screenStartStrip;
 
-	_revBitMask = revBitMask[_left & 7];
-
 	_virtScreenHeight = vs->height;
 	_charPtr += 4;
 
@@ -992,7 +990,7 @@
 	y = 0;
 
 	for (y = 0; y < _height && y + _drawTop < _virtScreenHeight;) {
-		maskmask = _revBitMask;
+		maskmask = revBitMask[_left & 7];
 		maskpos = 0;
 
 		for (x = 0; x < _width; x++) {

Index: sys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sys.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sys.cpp	31 Aug 2002 07:43:34 -0000	1.3
+++ sys.cpp	31 Aug 2002 13:29:09 -0000	1.4
@@ -167,12 +167,6 @@
 	return true;
 }
 
-
-#ifdef NEED_STRDUP
-char *strdup(const char *s);
-#endif /* NEED_STRDUP */
-
-
 void *operator new(size_t size) {
 	return calloc(size, 1);
 }