- Fixed: A_Jump didn't properly determine a state's owner anymore when called

from weapons.


SVN r1277 (trunk)
This commit is contained in:
Christoph Oelckers 2008-10-26 10:31:19 +00:00
parent d753d41752
commit 226ca44939
2 changed files with 6 additions and 1 deletions

View File

@ -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) October 25, 2008 (Changes by Graf Zahl)
- Added NULL checks to all places where class names are passed as DECORATE - Added NULL checks to all places where class names are passed as DECORATE
parameters. parameters.

View File

@ -2599,7 +2599,7 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
CHECKRESOLVED(); CHECKRESOLVED();
if (names[0] == NAME_None) if (names[0] == NAME_None)
{ {
scope = NULL; scope = ctx.cls;
} }
else if (names[0] == NAME_Super) else if (names[0] == NAME_Super)
{ {
@ -2643,6 +2643,7 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
} }
names.Delete(0); names.Delete(0);
names.ShrinkToFit(); names.ShrinkToFit();
ValueType = VAL_State;
return this; return this;
} }