zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 21:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-04 11:52:29 +01:00
commit 824801ae6b
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/m_random.h
View file

@ -57,7 +57,9 @@ public:
// Returns a random number in the range [0,mod) // Returns a random number in the range [0,mod)
int operator() (int mod) int operator() (int mod)
{ {
return GenRand32() % mod; return (0 == mod)
? 0
: (GenRand32() % mod);
} }
// Returns rand# - rand# // Returns rand# - rand#

7
src/posix/cocoa/i_video.mm
View file

@ -625,7 +625,7 @@ void CocoaVideo::SetFullscreenMode(const int width, const int height)
[m_window setHidesOnDeactivate:YES]; [m_window setHidesOnDeactivate:YES];
} }
[m_window setFrame:displayRect display:YES]; [m_window setFrame:screenFrame display:YES];
[m_window setFrameOrigin:NSMakePoint(0.0f, 0.0f)]; [m_window setFrameOrigin:NSMakePoint(0.0f, 0.0f)];
} }
@ -1231,10 +1231,7 @@ NSSize I_GetContentViewSize(const NSWindow* const window)
const NSView* const view = [window contentView]; const NSView* const view = [window contentView];
const NSSize frameSize = [view frame].size; const NSSize frameSize = [view frame].size;
// TODO: figure out why [NSView frame] returns different values in "fullscreen" and in window return (vid_hidpi)
// In "fullscreen" the result is multiplied by [NSScreen backingScaleFactor], but not in window
return (vid_hidpi && !fullscreen)
? [view convertSizeToBacking:frameSize] ? [view convertSizeToBacking:frameSize]
: frameSize; : frameSize;
} }