From 6af5c1fa2b8f2d696742e44382f1a259f280cec0 Mon Sep 17 00:00:00 2001
From: ZZYZX <zzyzx@virtual>
Date: Sat, 4 Mar 2017 21:36:27 +0200
Subject: [PATCH] Produce a warning if clearscope is used on non-inner structs.
 Also now checking for outer class presence correctly.

---
 src/scripting/zscript/zcc_compile.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp
index 14eceb0cb..8a73f891d 100644
--- a/src/scripting/zscript/zcc_compile.cpp
+++ b/src/scripting/zscript/zcc_compile.cpp
@@ -501,7 +501,8 @@ void ZCCCompiler::CreateStructTypes()
 			Error(s->strct, "Struct %s has incompatible flags", s->NodeName().GetChars());
 		}
 
-		if (outer) s->Type()->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(s->Type()->ObjectFlags, FScopeBarrier::SideFromObjectFlags(outer->ObjectFlags));
+		if (outer != OutNamespace) s->Type()->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(s->Type()->ObjectFlags, FScopeBarrier::SideFromObjectFlags(outer->ObjectFlags));
+		else if (s->strct->Flags & ZCC_ClearScope) Warn(s->strct, "Useless 'ClearScope' on struct %s not inside a class", s->NodeName().GetChars());
 		if (s->strct->Flags & ZCC_UIFlag)
 			s->Type()->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(s->Type()->ObjectFlags, FScopeBarrier::Side_UI);
 		if (s->strct->Flags & ZCC_Play)