mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-03 01:41:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2189 from Capostrophic/global

Browse source 
Ignore global variable stray explicit reference calls
This commit is contained in:
Bret Curtis 2019-02-26 22:13:20 +01:00 committed by GitHub
commit 96808f3a16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -35,6 +35,7 @@
Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded
Bug #4860: Actors outside of processing range visible for one frame after spawning Bug #4860: Actors outside of processing range visible for one frame after spawning
Bug #4876: AI ratings handling inconsistencies Bug #4876: AI ratings handling inconsistencies
Bug #4888: Global variable stray explicit reference calls break script compilation
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file
Feature #3610: Option to invert X axis Feature #3610: Option to invert X axis

14
components/compiler/exprparser.cpp
View file

@ -277,10 +277,18 @@ namespace Compiler
{ {
if (!mExplicit.empty()) if (!mExplicit.empty())
{ {
if (mMemberOp && handleMemberAccess (name)) if (!mRefOp)
return true; {
if (mMemberOp && handleMemberAccess (name))
return true;
return Parser::parseName (name, loc, scanner); return Parser::parseName (name, loc, scanner);
}
else
{
mExplicit.clear();
getErrorHandler().warning ("Ignoring stray explicit reference", loc);
}
} }
mFirst = false; mFirst = false;

7
components/compiler/lineparser.cpp
View file

@ -506,6 +506,13 @@ namespace Compiler
return true; return true;
} }
if (code==Scanner::S_ref && mState==SetPotentialMemberVarState)
{
getErrorHandler().warning ("Ignoring stray explicit reference", loc);
mState = SetState;
return true;
}
if (code==Scanner::S_ref && mState==PotentialExplicitState) if (code==Scanner::S_ref && mState==PotentialExplicitState)
{ {
mState = ExplicitState; mState = ExplicitState;