[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.125,2.126 gfx.cpp,2.393,2.394 input.cpp,2.13,2.14 palette.cpp,2.23,2.24 scumm.cpp,1.343,1.344 vars.cpp,1.115,1.116

Eugene Sandulenko sev at users.sourceforge.net
Wed Mar 2 13:49:13 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv877/scumm

Modified Files:
	charset.cpp gfx.cpp input.cpp palette.cpp scumm.cpp vars.cpp 
Log Message:
Distinguish between green and amber hercules. Now specify it via hercGreen
and hercAmber. Updated documentation accordingly.


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.125
retrieving revision 2.126
diff -u -d -r2.125 -r2.126
--- charset.cpp	20 Feb 2005 00:17:21 -0000	2.125
+++ charset.cpp	2 Mar 2005 21:46:45 -0000	2.126
@@ -1263,7 +1263,7 @@
 		_color = CGAtextColorMap[_color & 0x0f];
 	}
 
-	if (_vm->_renderMode == Common::kRenderHerc) {
+	if (_vm->_renderMode == Common::kRenderHercA || _vm->_renderMode == Common::kRenderHercG) {
 		static byte HercTextColorMap[16] = {0, 15,  2, 15, 15,  5, 15,  15, 
 										   8, 15, 15, 15, 15, 15, 15, 15};
 		_color = HercTextColorMap[_color & 0x0f];

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.393
retrieving revision 2.394
diff -u -d -r2.393 -r2.394
--- gfx.cpp	1 Mar 2005 07:45:36 -0000	2.393
+++ gfx.cpp	2 Mar 2005 21:46:45 -0000	2.394
@@ -232,7 +232,7 @@
 	memset(_compositeBuf, CHARSET_MASK_TRANSPARENCY, size);
 	memset(_textSurface.pixels, CHARSET_MASK_TRANSPARENCY, size);
 
-	if (_vm->_renderMode == Common::kRenderHerc) {
+	if (_vm->_renderMode == Common::kRenderHercA || _vm->_renderMode == Common::kRenderHercG) {
 		_herculesBuf = (byte *)malloc(Common::kHercW * Common::kHercH);
 		memset(_herculesBuf, CHARSET_MASK_TRANSPARENCY, Common::kHercW * Common::kHercH);
 	}
@@ -519,7 +519,7 @@
 	if (_vm->_renderMode == Common::kRenderCGA)
 		ditherCGA(_compositeBuf + x + y * _vm->_screenWidth, _vm->_screenWidth, x, y, width, height);
 
-	if (_vm->_renderMode == Common::kRenderHerc) {
+	if (_vm->_renderMode == Common::kRenderHercA || _vm->_renderMode == Common::kRenderHercG) {
 		ditherHerc(_compositeBuf + x + y * _vm->_screenWidth, _herculesBuf, _vm->_screenWidth, &x, &y, &width, &height);
 		// center image on the screen
 		_vm->_system->copyRectToScreen(_herculesBuf + x + y * Common::kHercW, 

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- input.cpp	20 Feb 2005 00:17:22 -0000	2.13
+++ input.cpp	2 Mar 2005 21:46:50 -0000	2.14
@@ -131,7 +131,7 @@
 			_mouse.x = event.mouse.x;
 			_mouse.y = event.mouse.y;
 
-			if (_renderMode == Common::kRenderHerc) {
+			if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 				_mouse.x -= (Common::kHercW - _screenWidth * 2) / 2;
 				_mouse.x /= 2;
 				_mouse.y = _mouse.y * 4 / 7;

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- palette.cpp	20 Feb 2005 00:17:22 -0000	2.23
+++ palette.cpp	2 Mar 2005 21:46:50 -0000	2.24
@@ -50,7 +50,11 @@
 
 void ScummEngine::setupHercPalette() {
 	setPalColor( 0,   0,   0,   0);
-	setPalColor( 1, 0xAE, 0x69, 0x38);
+
+	if (_renderMode == Common::kRenderHercA)
+		setPalColor( 1, 0xAE, 0x69, 0x38);
+	else
+		setPalColor( 1, 0x00, 0xFF, 0x00);
 
 	// Setup cursor palette
 	setPalColor( 7, 170, 170, 170);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- scumm.cpp	2 Mar 2005 21:39:16 -0000	1.343
+++ scumm.cpp	2 Mar 2005 21:46:50 -0000	1.344
@@ -1022,7 +1022,8 @@
 		_renderMode = Common::kRenderDefault;
 
 	switch (_renderMode) {
-	case Common::kRenderHerc:
+	case Common::kRenderHercA:
+	case Common::kRenderHercG:
 		if (_version > 2 && _gameId != GID_MONKEY_EGA)
 			_renderMode = Common::kRenderDefault;
 		break;
@@ -1058,7 +1059,7 @@
 	} else if (_features & GF_NES) {
 		_screenWidth = 256;
 		_screenHeight = 240;
-	} else if (_renderMode == Common::kRenderHerc) {
+	} else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 		_features |= GF_DEFAULT_TO_1X_SCALER;
 		_screenWidth = 320;
 		_screenHeight = 200;
@@ -1152,7 +1153,7 @@
 	// Initialize backend
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
-		if (_renderMode == Common::kRenderHerc) {
+		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 			_system->initSize(Common::kHercW, Common::kHercH);
 			_features |= GF_DEFAULT_TO_1X_SCALER;
 			_system->setGraphicsMode("1x");
@@ -1317,7 +1318,7 @@
 			_shadowPalette[i] = i;
 		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
 			setupAmigaPalette();
-		else if (_renderMode == Common::kRenderHerc)
+		else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG)
 			setupHercPalette();
 		else if (_renderMode == Common::kRenderCGA)
 			setupCGAPalette();

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- vars.cpp	28 Feb 2005 13:23:10 -0000	1.115
+++ vars.cpp	2 Mar 2005 21:46:51 -0000	1.116
@@ -560,7 +560,7 @@
 			VAR(VAR_VIDEOMODE) = 82;
 		else if (_renderMode == Common::kRenderCGA)
 			VAR(VAR_VIDEOMODE) = 4;
-		else if (_renderMode == Common::kRenderHerc)
+		else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG)
 			VAR(VAR_VIDEOMODE) = 30;
 		else if (_renderMode == Common::kRenderEGA)
 			VAR(VAR_VIDEOMODE) = 13;





More information about the Scummvm-git-logs mailing list