zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 15:32:54 +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:
Rachael Alexanderson 2016-11-19 12:46:01 -05:00
commit fc011e42dd
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_mobj.cpp
View file

@ -3373,11 +3373,14 @@ void AActor::Tick ()
} }
} }
UnlinkFromWorld (); if (!Vel.isZero() || !(flags & MF_NOBLOCKMAP))
{
UnlinkFromWorld();
flags |= MF_NOBLOCKMAP; flags |= MF_NOBLOCKMAP;
SetXYZ(Vec3Offset(Vel)); SetXYZ(Vec3Offset(Vel));
CheckPortalTransition(false); CheckPortalTransition(false);
LinkToWorld (); LinkToWorld();
}
} }
else else
{ {

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

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

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

@ -1018,7 +1018,7 @@ IOKitJoystickManager::~IOKitJoystickManager()
if (0 != notification) if (0 != notification)
{ {
IOObjectRelease(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; case 12: name = "macOS Sierra"; break;
} }
char release[16] = {}; char release[16] = "unknown";
size_t size = sizeof release - 1; size_t size = sizeof release - 1;
sysctlbyname("kern.osversion", release, &size, nullptr, 0); sysctlbyname("kern.osversion", release, &size, nullptr, 0);

2
src/resourcefiles/file_zip.cpp
View file

@ -577,7 +577,7 @@ bool WriteZip(const char *filename, TArray<FString> &filenames, TArray<FCompress
dirend.DiskNumber = 0; dirend.DiskNumber = 0;
dirend.FirstDisk = 0; dirend.FirstDisk = 0;
dirend.NumEntriesOnAllDisks = dirend.NumEntries = LittleShort(filenames.Size()); dirend.NumEntriesOnAllDisks = dirend.NumEntries = LittleShort(filenames.Size());
dirend.DirectoryOffset = dirofs; dirend.DirectoryOffset = LittleLong(dirofs);
dirend.DirectorySize = LittleLong(ftell(f) - dirofs); dirend.DirectorySize = LittleLong(ftell(f) - dirofs);
dirend.ZipCommentLength = 0; dirend.ZipCommentLength = 0;
if (fwrite(&dirend, sizeof(dirend), 1, f) != 1) if (fwrite(&dirend, sizeof(dirend), 1, f) != 1)