[Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.22,1.23 gfx.cpp,1.96,1.97 gfx.h,1.9,1.10 gui.cpp,1.49,1.50

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv17192

Modified Files:
	akos.cpp gfx.cpp gfx.h gui.cpp 
Log Message:
Fixed the gost animation background reset. Made a little tweak to draw the gui in vertical rooms (not 100% working)

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- akos.cpp	4 Jun 2002 23:33:49 -0000	1.22
+++ akos.cpp	27 Jun 2002 14:10:56 -0000	1.23
@@ -928,8 +928,10 @@
 	if(left > max_width)
 		left -= left - max_width;
 
+	// Yazoo: this is not correct, but fix a lots of bugs for the momment
+	
 	draw_top = 0;
-	draw_bottom = 200;
+	draw_bottom = vs->height;
 
 	_vm->updateDirtyRect(0, left, right+1, top, bottom+1, 1 << dirty_id);
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- gfx.cpp	4 Jun 2002 23:32:51 -0000	1.96
+++ gfx.cpp	27 Jun 2002 14:10:56 -0000	1.97
@@ -231,7 +231,7 @@
 		scrollY = 0;
 
 	ptr = vs->screenPtr + (t * 40 + x) * 8 + _readOffs + scrollY * 320;
-		_vm->_system->copy_rect(ptr, 320, x * 8, vs->topline + t , w, height);
+	_vm->_system->copy_rect(ptr, 320, x * 8, vs->topline + t , w, height);
 }
 
 void blit(byte *dst, byte *src, int w, int h)

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gfx.h	1 May 2002 00:13:03 -0000	1.9
+++ gfx.h	27 Jun 2002 14:10:56 -0000	1.10
@@ -53,8 +53,8 @@
 	byte alloctwobuffers;
 	byte scrollable;
 	uint16 xstart;
-	byte tdirty[40];
-	byte bdirty[40];
+	uint16 tdirty[40];
+	uint16 bdirty[40];
 	byte *screenPtr;
 	byte *backBuf;
 };

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gui.cpp	14 May 2002 23:50:09 -0000	1.49
+++ gui.cpp	27 Jun 2002 14:10:56 -0000	1.50
@@ -522,7 +522,7 @@
 		return NULL;
 
 	return _vs->screenPtr + x + (y - _vs->topline) * 320 +
-		_s->_screenStartStrip * 8;
+		_s->_screenStartStrip * 8 + (_s->camera._cur.y - 100)*320;
 }
 
 void Gui::lineto(int x, int y)