[Scummvm-cvs-logs] CVS: residual engine.cpp,1.34,1.35

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Apr 20 11:55:06 CEST 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29005

Modified Files:
	engine.cpp 
Log Message:
moved 2d stuff as first before 3d

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- engine.cpp	20 Apr 2004 17:57:46 -0000	1.34
+++ engine.cpp	20 Apr 2004 18:54:04 -0000	1.35
@@ -136,8 +136,12 @@
 			if (currScene_ != NULL) {
 				currScene_->drawBitmaps(ObjectState::OBJSTATE_UNDERLAY);
 				currScene_->drawBitmaps(ObjectState::OBJSTATE_STATE);
+				currScene_->drawBitmaps(ObjectState::OBJSTATE_OVERLAY);
 			}
 
+			if (SHOWFPS_GLOBAL)
+				g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));
+
 			g_driver->set3DMode();
 
 			if (currScene_ != NULL)
@@ -156,10 +160,6 @@
 				(*i)->draw();
 			}
 
-			if (SHOWFPS_GLOBAL)
-				g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));
-
-			currScene_->drawBitmaps(ObjectState::OBJSTATE_OVERLAY);
 		}
 
 		g_driver->flipBuffer();





More information about the Scummvm-git-logs mailing list