[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.35,1.36 interface.h,1.14,1.15

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Nov 24 23:19:14 CET 2004


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

Modified Files:
	interface.cpp interface.h 
Log Message:
Temporarily disable the status bar in IHNM. The only place where we drew it
so far, it shouldn't be drawn. Eventually we could probably handle this
with yet another panel mode: no panel at all.


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- interface.cpp	15 Nov 2004 03:03:47 -0000	1.35
+++ interface.cpp	25 Nov 2004 07:18:35 -0000	1.36
@@ -322,7 +322,6 @@
 	int rportrait_x;
 	int rportrait_y;
 
-	Rect rect;
 	Point origin;
 
 	back_buf = _vm->_gfx->getBackBuffer();
@@ -334,13 +333,7 @@
 	// Get game display info
 	GAME_GetDisplayInfo(&g_di);
 
-	// Erase background of status bar
-	rect.left = 0;
-	rect.top = _iDesc.status_y;
-	rect.right = g_di.logical_w;
-	rect.bottom = _iDesc.status_y + _iDesc.status_h;
-
-	drawRect(back_buf, &rect, _iDesc.status_bgcol);
+	drawStatusBar(back_buf);
 
 	// Draw command panel background
 	if (_panelMode == kPanelCommand) {
@@ -430,6 +423,13 @@
 
 	int string_w;
 
+	// Disable this for IHNM for now, since that game uses the full screen
+	// in some cases.
+
+	if (GAME_GetGameType() == GID_IHNM) {
+		return SUCCESS;
+	}
+
 	// Get game display info
 	GAME_GetDisplayInfo(&g_di);
 

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- interface.h	7 Nov 2004 14:15:41 -0000	1.14
+++ interface.h	25 Nov 2004 07:18:35 -0000	1.15
@@ -78,7 +78,7 @@
 #define IHNM_STATUS_H      24
 #define IHNM_STATUS_TEXT_Y 8
 #define IHNM_STATUS_TXTCOL 186
-#define IHNM_STATUS_BGCOL  0
+#define IHNM_STATUS_BGCOL  11
 
 #define IHNM_CMD_TEXT_COL       147
 #define IHNM_CMD_TEXT_SHADOWCOL 15





More information about the Scummvm-git-logs mailing list