[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.21,1.22 graphics.h,1.19,1.20

[David Eriksson]

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

Modified Files:
	graphics.cpp graphics.h 
Log Message:
Make frames array available.


Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- graphics.cpp	16 Oct 2003 13:54:48 -0000	1.21
+++ graphics.cpp	16 Oct 2003 16:55:13 -0000	1.22
@@ -81,6 +81,10 @@
 void Graphics::bankUnpack(uint32 srcframe, uint32 dstframe, uint32 bankslot) {
 	
 	uint8 *p = _banks[bankslot].data + _banks[bankslot].indexes[srcframe];
+
+	if (!_banks[bankslot].data)
+		error("Graphics::bankUnpack(%i, %i, %i) called but _banks[bankslot].data is NULL!", 
+				srcframe, dstframe, bankslot);
 		
 	BobFrame *pbf = &_frames[dstframe];
 	delete[] pbf->data;
@@ -656,13 +660,13 @@
 }
 
 
-void Graphics::journalBobSetup(uint32 bobnum, uint16 x, uint16 y, uint16 frame) {
-
+void Graphics::journalBobSetup(uint32 bobnum, uint16 x, uint16 y, uint16 frameNum) 
+{
 	BobSlot *pbs = &_bobs[bobnum];
 	pbs->active = true;
 	pbs->x = x;
 	pbs->y = y;
-	pbs->frameNum = FRAMES_JOURNAL + frame;
+	pbs->frameNum = FRAMES_JOURNAL + frameNum;
 	pbs->box.y2 = GAME_SCREEN_HEIGHT - 1;
 }
 

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- graphics.h	16 Oct 2003 13:54:48 -0000	1.19
+++ graphics.h	16 Oct 2003 16:55:13 -0000	1.20
@@ -144,6 +144,7 @@
 
 	void frameErase(uint32 fslot);
 	void frameEraseAll(bool joe); // freeframes, freeallframes
+	BobFrame *frame(int index) { return _frames + index; }
 
 	void loadBackdrop(const char *name, uint16 room);
 	void loadPanel();