zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The default GetPixelDoubling function in DFrameBuffer returned 1 instead of 0. 

- copied a NULL pointer check for screen from GZDoom.


SVN r2776 (trunk)
This commit is contained in:
Christoph Oelckers 2010-09-14 20:53:12 +00:00
parent ecb34b8302
commit 5fcac9b5f1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/v_video.h
View File

@ -412,7 +412,7 @@ public:
virtual void WipeEndScreen();
virtual bool WipeDo(int ticks);
virtual void WipeCleanup();
virtual int GetPixelDoubling() const { return 1; }
virtual int GetPixelDoubling() const { return 0; }
uint32 GetLastFPS() const { return LastCount; }

8
src/win32/i_input.cpp
View File

@ -320,8 +320,12 @@ bool GUIWndProcHook(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESU
{
ev.subtype = EV_GUI_MouseMove;
}
ev.data1 = LOWORD(lParam) >> screen->GetPixelDoubling();
ev.data2 = HIWORD(lParam) >> screen->GetPixelDoubling();
{
int shift = screen? screen->GetPixelDoubling() : 0;
ev.data1 = LOWORD(lParam) >> shift;
ev.data2 = HIWORD(lParam) >> shift;
}
if (wParam & MK_SHIFT) ev.data3 |= GKM_SHIFT;
if (wParam & MK_CONTROL) ev.data3 |= GKM_CTRL;