[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.1,1.2 graphics.h,1.1,1.2 resource.h,1.3,1.4

[Joost Peters]

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

Modified Files:
	graphics.cpp graphics.h resource.h 
Log Message:
consistency (must've overlooked these)

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- graphics.cpp	29 Sep 2003 22:27:07 -0000	1.1
+++ graphics.cpp	29 Sep 2003 23:03:54 -0000	1.2
@@ -58,9 +58,9 @@
 
 void QueenGraphics::bankUnpack(uint32 srcframe, uint32 dstframe, uint32 bankslot) {
 	
-	uint8* p = _banks[bankslot].data + _banks[bankslot].indexes[srcframe];
+	uint8 *p = _banks[bankslot].data + _banks[bankslot].indexes[srcframe];
 		
-	ObjectFrame* pof = &_frames[dstframe];
+	ObjectFrame *pof = &_frames[dstframe];
 	delete[] pof->data;
 
 	pof->width    = READ_LE_UINT16(p + 0);
@@ -68,13 +68,12 @@
 	pof->xhotspot = READ_LE_UINT16(p + 4);
 	pof->yhotspot = READ_LE_UINT16(p + 6);
 	
-	uint size = pof->width * pof->height;
+	uint32 size = pof->width * pof->height;
 	pof->data = new uint8[ size ];
 	memcpy(pof->data, p, size);
 	
 	debug(5, "Unpacked frame %d from bank slot %d to frame slot %d", srcframe, bankslot, dstframe);
 }
-
 
 void QueenGraphics::bankOverpack(uint32 srcframe, uint32 dstframe, uint32 bankslot) {
 	

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- graphics.h	29 Sep 2003 22:27:08 -0000	1.1
+++ graphics.h	29 Sep 2003 23:03:54 -0000	1.2
@@ -30,7 +30,6 @@
 #define MAX_BANKS_NUMBER    18
 
 
-
 struct ObjectFrame {
   uint16 width, height;
   uint16 xhotspot, yhotspot;
@@ -44,8 +43,8 @@
 	QueenGraphics(QueenResource *resource);
 
 	void bankLoad(const char *bankname, uint32 bankslot);
-	void bankUnpack(uint srcframe, uint dstframe, uint32 bankslot);
-	void bankOverpack(uint srcframe, uint dstframe, uint32 bankslot);
+	void bankUnpack(uint32 srcframe, uint32 dstframe, uint32 bankslot);
+	void bankOverpack(uint32 srcframe, uint32 dstframe, uint32 bankslot);
 	void bankErase(uint32 bankslot);
 	
 private:
@@ -62,5 +61,5 @@
 	
 };
 
-
 #endif
+

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource.h	29 Sep 2003 22:27:08 -0000	1.3
+++ resource.h	29 Sep 2003 23:03:54 -0000	1.4
@@ -45,7 +45,7 @@
 public:
 	QueenResource(char *datafilePath);
 	~QueenResource(void);
-	uint8 *loadFile(const char *filename, uint32 skipbytes = 0);
+	uint8 *loadFile(const char *filename, uint32 skipBytes = 0);
 	bool exists(const char *filename);
 
 protected: