MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diasurgical/devilution

Browse source
This commit is contained in:
Anders Jenbo 2019-11-01 00:06:53 +01:00
commit 215ff59e65
16 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/scrollrt.cpp
View file

@ -1142,8 +1142,8 @@ void scrollrt_draw_game_screen(BOOL draw_cursor)
{
int hgt;
if (drawpanflag == 255) {
drawpanflag = 0;
if (force_redraw == 255) {
force_redraw = 0;
hgt = SCREEN_HEIGHT;
} else {
hgt = 0;
@ -1176,7 +1176,7 @@ void DrawAndBlit()
return;
}
if (SCREEN_WIDTH > PANEL_WIDTH || SCREEN_HEIGHT > VIEWPORT_HEIGHT + PANEL_HEIGHT || drawpanflag == 255) {
if (SCREEN_WIDTH > PANEL_WIDTH || SCREEN_HEIGHT > VIEWPORT_HEIGHT + PANEL_HEIGHT || force_redraw == 255) {
drawhpflag = TRUE;
drawmanaflag = TRUE;
drawbtnflag = TRUE;
@ -1190,7 +1190,7 @@ void DrawAndBlit()
hgt = VIEWPORT_HEIGHT;
}
drawpanflag = 0;
force_redraw = 0;
lock_buf(0);
DrawView(ViewX, ViewY);