OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-24 09:58:29 +01:00
commit aa4b3bb230
22 changed files with 82 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/posix/cocoa/i_input.mm
View file

@ -526,7 +526,7 @@ void ProcessMouseMoveInGame(NSEvent* theEvent)
lastX = x;
lastY = y;
if (0 != event.x | 0 != event.y)
if (0 != event.x || 0 != event.y)
{
event.type = EV_Mouse;

2
src/posix/cocoa/i_joystick.cpp
View file

@ -1018,7 +1018,7 @@ IOKitJoystickManager::~IOKitJoystickManager()
if (0 != notification)
{
IOObjectRelease(notification);
notification = NULL;
notification = 0;
}
}
}

2
src/posix/cocoa/i_main.mm
View file

@ -156,7 +156,7 @@ static void I_DetectOS()
case 12: name = "macOS Sierra"; break;
}
char release[16] = {};
char release[16] = "unknown";
size_t size = sizeof release - 1;
sysctlbyname("kern.osversion", release, &size, nullptr, 0);

2
src/posix/cocoa/i_timer.cpp
View file

@ -37,8 +37,6 @@
#include <pthread.h>
#include <libkern/OSAtomic.h>
#include "basictypes.h"
#include "basicinlines.h"
#include "doomdef.h"
#include "i_system.h"
#include "templates.h"

3
src/posix/sdl/i_timer.cpp
View file

@ -7,8 +7,7 @@
#include <SDL.h>
#include "basictypes.h"
#include "basicinlines.h"
#include "m_fixed.h"
#include "hardware.h"
#include "i_system.h"
#include "templates.h"