From cbf72fe9922e221ab441f7579c229382af72ab27 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 21 Sep 2014 08:32:39 +0200
Subject: [PATCH] - fixed: Since the serializing code cannot distinguish
 between user variables of the same name coming from different actors in an
 inheritance chain, this kind of name duplication must be prohibited.

---
 src/thingdef/thingdef_parse.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/thingdef/thingdef_parse.cpp b/src/thingdef/thingdef_parse.cpp
index 498003b4ee..88e6084b64 100644
--- a/src/thingdef/thingdef_parse.cpp
+++ b/src/thingdef/thingdef_parse.cpp
@@ -374,6 +374,8 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClass *cls)
 		FScriptPosition::ErrorCounter++;
 	}
 
+
+
 	FName symname = sc.String;
 	if (sc.CheckToken('['))
 	{
@@ -391,6 +393,15 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClass *cls)
 	}
 	sc.MustGetToken(';');
 
+	// We must ensure that we do not define duplicates, even when they come from a parent table.
+	if (symt->FindSymbol(symname, true) != NULL)
+	{
+		sc.ScriptMessage ("'%s' is already defined in '%s' or one of its ancestors.",
+			symname.GetChars(), cls ? cls->TypeName.GetChars() : "Global");
+		FScriptPosition::ErrorCounter++;
+		return;
+	}
+
 	PSymbolVariable *sym = new PSymbolVariable(symname);
 	sym->offset = cls->Extend(sizeof(int) * (valuetype.Type == VAL_Array ? valuetype.size : 1));
 	sym->ValueType = valuetype;