summaryrefslogtreecommitdiff
path: root/src/i_video.c
diff options
context:
space:
mode:
authorSimon Howard2010-12-10 23:20:29 +0000
committerSimon Howard2010-12-10 23:20:29 +0000
commit6a2d4763a9080cf88ca9f0b588b8187963eeacf5 (patch)
tree5dd0f5ada22abacac4fca042807a5fa4ddaedc61 /src/i_video.c
parent8dab0a3e635db40359c8ddeb9afaa9eca626ee98 (diff)
downloadchocolate-doom-6a2d4763a9080cf88ca9f0b588b8187963eeacf5.tar.gz
chocolate-doom-6a2d4763a9080cf88ca9f0b588b8187963eeacf5.tar.bz2
chocolate-doom-6a2d4763a9080cf88ca9f0b588b8187963eeacf5.zip
Fix crash introduced by merge.
Subversion-branch: /branches/raven-branch Subversion-revision: 2213
Diffstat (limited to 'src/i_video.c')
-rw-r--r--src/i_video.c4
1 files 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);
}