mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-08 21:41:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2131 from Capostrophic/begin

Browse source 
Allow stray special characters before Begin statement (bug #4803)
This commit is contained in:
Bret Curtis 2019-01-16 11:54:53 +01:00 committed by GitHub
commit ed5df29b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -19,6 +19,7 @@
Bug #4775: Slowfall effect resets player jumping flag Bug #4775: Slowfall effect resets player jumping flag
Bug #4778: Interiors of Illusion puzzle in Sotha Sil Expanded mod is broken Bug #4778: Interiors of Illusion puzzle in Sotha Sil Expanded mod is broken
Bug #4800: Standing collisions are not updated immediately when an object is teleported without a cell change Bug #4800: Standing collisions are not updated immediately when an object is teleported without a cell change
Bug #4803: Stray special characters before begin statement 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

10
components/compiler/fileparser.cpp
View file

@ -94,14 +94,16 @@ namespace Compiler
bool FileParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) bool FileParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
{ {
if (code==Scanner::S_newline) // Ignore any junk special characters
if (mState == BeginState)
{ {
if (mState==BeginState) if (code != Scanner::S_newline)
{ reportWarning ("Ignoring stray special character before begin statement", loc);
// ignore empty lines
return true; return true;
} }
if (code==Scanner::S_newline)
{
if (mState==BeginCompleteState) if (mState==BeginCompleteState)
{ {
// parse the script body // parse the script body