zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-04-22 08:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
alexey.lysiuk 2016-01-24 17:01:58 +02:00
commit b48c043dc9
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/actorptrselect.cpp
View file

@ -32,6 +32,8 @@
AActor *COPY_AAPTR(AActor *origin, int selector)
{
if (selector == AAPTR_DEFAULT) return origin;
if (origin)
{
if (origin->player)

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

@ -157,8 +157,9 @@ private:
IOHIDElementCookie cookie;
int32_t value;
DigitalButton(const IOHIDElementCookie cookie)
explicit DigitalButton(const IOHIDElementCookie cookie)
: cookie(cookie)
, value(0)
{ }
};

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -4060,7 +4060,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetAngle)
ACTION_PARAM_INT(ptr, 2);
AActor *ref = COPY_AAPTR(self, ptr);
if (ref != NULL)
if (ref == NULL)
{
ACTION_SET_RESULT(false);
return;