mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
removal of legacy MGL block_drawing variable. Fixed window restore bug that prevented the screen from being updated.
This commit is contained in:
parent
fef9b30bd7
commit
6642686e33
10 changed files with 8 additions and 13 deletions
|
@ -80,8 +80,6 @@ extern struct cvar_s *scr_viewsize;
|
|||
extern int scr_copytop;
|
||||
extern int scr_copyeverything;
|
||||
|
||||
extern qboolean block_drawing;
|
||||
|
||||
extern struct qpic_s *scr_ram;
|
||||
extern struct qpic_s *scr_net;
|
||||
extern struct qpic_s *scr_turtle;
|
||||
|
|
|
@ -62,8 +62,6 @@ extern vrect_t scr_vrect;
|
|||
|
||||
extern qboolean scr_skipupdate;
|
||||
|
||||
extern qboolean block_drawing;
|
||||
|
||||
/* CENTER PRINTING */
|
||||
|
||||
extern char scr_centerstring[1024];
|
||||
|
|
|
@ -194,7 +194,7 @@ SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
|
|||
double time1 = 0, time2;
|
||||
static int begun = 0;
|
||||
|
||||
if (block_drawing)
|
||||
if (scr_skipupdate)
|
||||
return;
|
||||
|
||||
if (begun)
|
||||
|
|
|
@ -120,8 +120,6 @@ vrect_t scr_vrect;
|
|||
|
||||
qboolean scr_skipupdate;
|
||||
|
||||
qboolean block_drawing;
|
||||
|
||||
/* CENTER PRINTING */
|
||||
char scr_centerstring[1024];
|
||||
float scr_centertime_start; // for slow victory printing
|
||||
|
|
|
@ -197,7 +197,7 @@ SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
|
|||
{
|
||||
vrect_t vrect;
|
||||
|
||||
if (scr_skipupdate || block_drawing)
|
||||
if (scr_skipupdate)
|
||||
return;
|
||||
|
||||
r_realtime = realtime;
|
||||
|
|
|
@ -218,7 +218,7 @@ SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
|
|||
{
|
||||
vrect_t vrect;
|
||||
|
||||
if (scr_skipupdate || block_drawing)
|
||||
if (scr_skipupdate)
|
||||
return;
|
||||
|
||||
r_realtime = realtime;
|
||||
|
|
|
@ -46,6 +46,7 @@ static __attribute__ ((unused)) const char rcsid[] =
|
|||
#include "QF/input.h"
|
||||
#include "QF/keys.h"
|
||||
#include "QF/qargs.h"
|
||||
#include "QF/screen.h"
|
||||
#include "QF/sys.h"
|
||||
|
||||
#include "compat.h"
|
||||
|
@ -434,6 +435,7 @@ IN_LL_ProcessEvents (void)
|
|||
HRESULT hr;
|
||||
|
||||
while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
|
||||
scr_skipupdate = 0;
|
||||
if (!GetMessage (&msg, NULL, 0, 0))
|
||||
Sys_Quit ();
|
||||
TranslateMessage (&msg);
|
||||
|
|
|
@ -349,7 +349,7 @@ GL_Init (void)
|
|||
void
|
||||
GL_EndRendering (void)
|
||||
{
|
||||
if (!scr_skipupdate || block_drawing) {
|
||||
if (!scr_skipupdate) {
|
||||
qfglFinish ();
|
||||
SwapBuffers (maindc);
|
||||
}
|
||||
|
|
|
@ -232,8 +232,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
|
|||
} else {
|
||||
// yield the CPU for a little while when paused, minimized, or
|
||||
// not the focus
|
||||
if ((cl.paused && !ActiveApp) || Minimized
|
||||
|| block_drawing) {
|
||||
if ((cl.paused && !ActiveApp) || Minimized) {
|
||||
SleepUntilInput (PAUSE_SLEEP);
|
||||
scr_skipupdate = 1; // no point in bothering to draw
|
||||
} else if (!ActiveApp) {
|
||||
|
|
|
@ -223,7 +223,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
|
|||
// main window message loop
|
||||
while (1) {
|
||||
// yield CPU for a little bit when paused, minimized, or not the focus
|
||||
if ((cl.paused && (!ActiveApp)) || Minimized || block_drawing) {
|
||||
if ((cl.paused && (!ActiveApp)) || Minimized) {
|
||||
SleepUntilInput (PAUSE_SLEEP);
|
||||
scr_skipupdate = 1; // no point in bothering to draw
|
||||
} else if (!ActiveApp) {
|
||||
|
|
Loading…
Reference in a new issue