From 226ca449396a6b93ffdd431779e3b00a176587ef Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 26 Oct 2008 10:31:19 +0000
Subject: [PATCH] - Fixed: A_Jump didn't properly determine a state's owner
 anymore when called   from weapons.

SVN r1277 (trunk)
---
 docs/rh-log.txt                      | 4 ++++
 src/thingdef/thingdef_expression.cpp | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 8e40c6f3d1..e2a2143929 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+October 26, 2008  (Changes by Graf Zahl)
+- Fixed: A_Jump didn't properly determine a state's owner anymore when called
+  from weapons.
+
 October 25, 2008  (Changes by Graf Zahl)
 - Added NULL checks to all places where class names are passed as DECORATE
   parameters.
diff --git a/src/thingdef/thingdef_expression.cpp b/src/thingdef/thingdef_expression.cpp
index e917f013af..44e10cba94 100644
--- a/src/thingdef/thingdef_expression.cpp
+++ b/src/thingdef/thingdef_expression.cpp
@@ -2599,7 +2599,7 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
 	CHECKRESOLVED();
 	if (names[0] == NAME_None)
 	{
-		scope = NULL;
+		scope = ctx.cls;
 	}
 	else if (names[0] == NAME_Super)
 	{
@@ -2643,6 +2643,7 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
 	}
 	names.Delete(0);
 	names.ShrinkToFit();
+	ValueType = VAL_State;
 	return this;
 }