From 7de8c2b5eb0fc9c62a008f475efa325f67d4cbdb Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 3 Apr 2016 21:35:44 -0500 Subject: [PATCH] Fixed: || should be && --- src/p_acs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 143683602..2668fd4a1 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -4559,7 +4559,7 @@ bool GetVarAddrType(AActor *self, FName varname, int index, void *&addr, PType * addr = baddr; // We don't want Int subclasses like Name or Color to be accessible, // but we do want to support Float subclasses like Fixed. - if (!type->IsA(RUNTIME_CLASS(PInt)) || !type->IsKindOf(RUNTIME_CLASS(PFloat))) + if (!type->IsA(RUNTIME_CLASS(PInt)) && !type->IsKindOf(RUNTIME_CLASS(PFloat))) { // For reading, we also support Name and String types. if (readonly && (type->IsA(RUNTIME_CLASS(PName)) || type->IsA(RUNTIME_CLASS(PString))))