[Scummvm-cvs-logs] CVS: scummvm/queen display.h,1.24,1.25 display.cpp,1.31,1.32 cutaway.cpp,1.78,1.79

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv1583

Modified Files:
	display.h display.cpp cutaway.cpp 
Log Message:
remaining stuff for Azura/Floda

Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- display.h	1 Dec 2003 20:48:40 -0000	1.24
+++ display.h	3 Dec 2003 14:09:37 -0000	1.25
@@ -80,6 +80,8 @@
 	void palCustomColors(uint16 roomNum);
 	void palCustomScroll(uint16 roomNum);
 	void palCustomFlash();
+	void palCustomLightsOff(uint16 roomNum);
+	void palCustomLightsOn(uint16 roomNum);
 	void palSetAllDirty() { _pal.dirtyMin = 0; _pal.dirtyMax = 255; }
 
 	void screenMode(int comPanel, bool inCutaway);

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- display.cpp	1 Dec 2003 20:48:40 -0000	1.31
+++ display.cpp	3 Dec 2003 14:09:37 -0000	1.32
@@ -291,7 +291,7 @@
 	int n = end - start + 1;
 	if (!(roomNum < 90 || (roomNum > 94 && roomNum < 114))) {
 		memset(_pal.screen + start * 3, 0, n * 3);
-		palSet(_pal.screen, start, end);
+		palSet(_pal.screen, start, end, true);
 	}
 	else {
 		uint8 tempPal[256 * 3];
@@ -614,6 +614,34 @@
 	palSet(tempPal, 0, 255, true);
 	// restore original palette
 	palSet(_pal.screen, 0, 255, true);
+}
+
+
+void Display::palCustomLightsOff(uint16 roomNum) {
+
+	int end = 223;
+	int start = (roomNum == ROOM_FLODA_FRONTDESK) ? 32 : 16;
+	int n = end - start + 1;
+
+	memset(_pal.screen + start * 3, 0, n * 3);
+	palSet(_pal.screen, start, end, true);
+
+	_pal.scrollable = false;
+}
+
+
+void Display::palCustomLightsOn(uint16 roomNum) {
+
+	int end = 223;
+	int start = (roomNum == ROOM_FLODA_FRONTDESK) ? 32 : 0;
+	int n = end - start + 1;
+
+	memcpy(_pal.screen + start * 3, _pal.room + start * 3, n * 3);
+	palSet(_pal.screen, start, end, true);
+	
+	_pal.dirtyMin = 0;
+	_pal.dirtyMax = 223;
+	_pal.scrollable = true;
 }
 
 

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- cutaway.cpp	3 Dec 2003 13:00:55 -0000	1.78
+++ cutaway.cpp	3 Dec 2003 14:09:37 -0000	1.79
@@ -404,6 +404,26 @@
 			_graphics->cameraBob(0);
 			break;
 
+
+		case 19:
+			_logic->gameState(VAR_AZURA_IN_LOVE, 1);
+			break;
+
+
+		case 21:
+			_logic->display()->palCustomLightsOff(_logic->currentRoom());
+			break;
+
+		case 22:
+			_logic->display()->palCustomLightsOn(_logic->currentRoom());
+			break;
+
+        // manequin area on
+        case 23:
+			_logic->area(ROOM_FLODA_FRONTDESK, 7)->mapNeighbours = ABS(_logic->area(ROOM_FLODA_FRONTDESK, 7)->mapNeighbours);
+			break;
+
+
 		// c75b.cut - Lightning hits plane
 		case 28:
 			{