[Scummvm-cvs-logs] CVS: scummvm/queen defs.h,1.3,1.4 logic.h,1.21,1.22 logic.cpp,1.31,1.32

[Gregory Montoir]

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

Modified Files:
	defs.h logic.h logic.cpp 
Log Message:
minor initialise() tweaks, added panel zones

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defs.h	9 Oct 2003 13:14:15 -0000	1.3
+++ defs.h	12 Oct 2003 17:38:01 -0000	1.4
@@ -72,6 +72,24 @@
 };
 
 
+enum {
+	PANEL_AREA_OPEN     = 1,
+	PANEL_AREA_CLOSE    = 2,
+	PANEL_AREA_MOVE     = 3,
+	PANEL_AREA_GIVE     = 4,
+	PANEL_AREA_LOOKAT   = 5,
+	PANEL_AREA_PICKUP   = 6,
+	PANEL_AREA_TALKTO   = 7,
+	PANEL_AREA_USE      = 8,
+	PANEL_AREA_INV_UP   = 9,
+	PANEL_AREA_INV_DOWN = 10,
+	PANEL_AREA_INV_1    = 11,
+	PANEL_AREA_INV_2    = 12,
+	PANEL_AREA_INV_3    = 13,
+	PANEL_AREA_INV_4    = 14
+};
+
+
 } // End of namespace Queen
 
 #endif

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- logic.h	12 Oct 2003 16:37:56 -0000	1.21
+++ logic.h	12 Oct 2003 17:38:01 -0000	1.22
@@ -103,6 +103,7 @@
 	uint16 zoneInArea(uint16 screen, uint16 x, uint16 y);
 	void zoneClearAll(uint16 screen);
 	void zoneSetup();
+	void zoneSetupPanel();
 
 	void roomErase();
 	void roomSetupFurniture(); // SETUP_FURNITURE()

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- logic.cpp	12 Oct 2003 16:37:56 -0000	1.31
+++ logic.cpp	12 Oct 2003 17:38:01 -0000	1.32
@@ -218,6 +218,10 @@
 	//Command List Data
 
 
+	_graphics->panelLoad();
+	_graphics->bobSetupControl();
+	_walk->joeSetup();
+
 	memset(_zones, 0, sizeof(_zones));
 	_oldRoom = 0;
 	_entryObj = 0;
@@ -602,6 +606,28 @@
 }
 
 
+void Logic::zoneSetupPanel() {
+
+	int i;
+
+	// verbs 
+	for (i = 0; i <= 7; ++i) {
+		int x = i * 20;
+		zoneSet(ZONE_PANEL, i + 1, x, 10, x + 19, 49);
+	}
+
+	// inventory scrolls
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_UP,   160, 10, 179, 29);
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_DOWN, 160, 30, 179, 49);
+
+	// inventory items
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_1, 180, 10, 213, 49);
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_2, 214, 10, 249, 49);
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_3, 250, 10, 284, 49);
+	zoneSet(ZONE_PANEL, PANEL_AREA_INV_4, 285, 10, 320, 49);
+}
+
+
 void Logic::roomErase() {
 
 	_graphics->frameEraseAll(false);
@@ -770,7 +796,7 @@
 		}
 		else if(obj > 0 && obj < 5000) {
 			// FIXME: need GRAPHIC_ANIM stuff
-			warning("Logic::roomSetupObjects() - Object number %d no handled", obj);
+			warning("Logic::roomSetupObjects() - Object number %d not handled", obj);
 		}
 
 	}
@@ -789,7 +815,7 @@
 //			else {
 //				curImage = personAllocate(noun, curImage);
 //			}
-			warning("Logic::roomSetupObjects() - Person object number %d no handled", noun);
+			warning("Logic::roomSetupObjects() - Person object number %d not handled", noun);
 		}
 	}