From cb4c334c162601fa2e2675e293e2e4c7a6ae57e4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 20 Sep 2008 19:46:11 +0000
Subject: Add I_VideoBuffer variable for pointer to screen buffer used by
 i_video.c code. Make V_CopyRect always blit to the screen.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1245
---
 src/doom/d_main.c   | 1 +
 src/doom/st_lib.c   | 6 +++---
 src/doom/st_stuff.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/doom')

diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index ef5c4317..6aaa5d9c 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -416,6 +416,7 @@ void D_DoomLoop (void)
     I_SetGrabMouseCallback(D_GrabMouseCallback);
     I_SetWindowTitle(gamedescription);
 
+    V_RestoreBuffer();
     R_ExecuteSetViewSize();
 
     D_StartGameLoop();
diff --git a/src/doom/st_lib.c b/src/doom/st_lib.c
index 11299a91..5c9a9d0c 100644
--- a/src/doom/st_lib.c
+++ b/src/doom/st_lib.c
@@ -123,7 +123,7 @@ STlib_drawNum
     if (n->y - ST_Y < 0)
 	I_Error("drawNum: n->y - ST_Y < 0");
 
-    V_CopyRect(x, n->y - ST_Y, BG, w*numdigits, h, x, n->y, FG);
+    V_CopyRect(x, n->y - ST_Y, screens[BG], w*numdigits, h, x, n->y);
 
     // if non-number, do not draw it
     if (num == 1994)
@@ -233,7 +233,7 @@ STlib_updateMultIcon
 	    if (y - ST_Y < 0)
 		I_Error("updateMultIcon: y - ST_Y < 0");
 
-	    V_CopyRect(x, y-ST_Y, BG, w, h, x, y, FG);
+	    V_CopyRect(x, y-ST_Y, screens[BG], w, h, x, y);
 	}
 	V_DrawPatch(mi->x, mi->y, FG, mi->p[*mi->inum]);
 	mi->oldinum = *mi->inum;
@@ -285,7 +285,7 @@ STlib_updateBinIcon
 	if (*bi->val)
 	    V_DrawPatch(bi->x, bi->y, FG, bi->p);
 	else
-	    V_CopyRect(x, y-ST_Y, BG, w, h, x, y, FG);
+	    V_CopyRect(x, y-ST_Y, screens[BG], w, h, x, y);
 
 	bi->oldval = *bi->val;
     }
diff --git a/src/doom/st_stuff.c b/src/doom/st_stuff.c
index 22d98685..21e7e206 100644
--- a/src/doom/st_stuff.c
+++ b/src/doom/st_stuff.c
@@ -438,7 +438,7 @@ void ST_refreshBackground(void)
 	if (netgame)
 	    V_DrawPatch(ST_FX, 0, BG, faceback);
 
-	V_CopyRect(ST_X, 0, BG, ST_WIDTH, ST_HEIGHT, ST_X, ST_Y, FG);
+	V_CopyRect(ST_X, 0, screens[BG], ST_WIDTH, ST_HEIGHT, ST_X, ST_Y);
     }
 
 }
-- 
cgit v1.2.3