commit 6a2d4763a9080cf88ca9f0b588b8187963eeacf5
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Dec 10 23:20:29 2010 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Fri Dec 10 23:20:29 2010 +0000

    Fix crash introduced by merge.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 2213
---
 src/i_video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i_video.c b/src/i_video.c
index aa9640bf..99972e9a 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -928,9 +928,9 @@ static boolean BlitArea(int x1, int y1, int x2, int y2)
     {
         I_InitScale(I_VideoBuffer,
                     (byte *) screenbuffer->pixels
-                                + (y_offset * screen->pitch)
+                                + (y_offset * screenbuffer->pitch)
                                 + x_offset,
-                    screen->pitch);
+                    screenbuffer->pitch);
         result = screen_mode->DrawScreen(x1, y1, x2, y2);
       	SDL_UnlockSurface(screenbuffer);
     }