From e13cae69ce33481731b5a884b864427d6083c7e8 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 13 Jul 2013 21:04:43 +0000
Subject: [PATCH] LunaCON: add forgotted "screensound" to keyword list in
 con_lang.lua.

Also, fix 'spriteflags' directive.

git-svn-id: https://svn.eduke32.com/eduke32@3945 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/gamedef.h            | 1 +
 polymer/eduke32/source/lunatic/con_lang.lua | 1 +
 polymer/eduke32/source/lunatic/lunacon.lua  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h
index b09b4a340..4cefd5e06 100644
--- a/polymer/eduke32/source/gamedef.h
+++ b/polymer/eduke32/source/gamedef.h
@@ -948,6 +948,7 @@ enum ScriptKeywords_t
     CON_SCREENSOUND,        // 372
     CON_END
 };
+// KEEPINSYNC with the keyword list in lunatic/con_lang.lua
 #endif
 
 
diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua
index da0972c86..90b920ba5 100644
--- a/polymer/eduke32/source/lunatic/con_lang.lua
+++ b/polymer/eduke32/source/lunatic/con_lang.lua
@@ -945,6 +945,7 @@ lpeg.P(false) +
 "sectclearinterpolation" +
 "scriptsize" +
 "screentext" +
+"screensound" +
 "savenn" +
 "savemapstate" +
 "savegamevar" +
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index fb3e2fc28..12cc71196 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -1124,7 +1124,7 @@ function Cmd.xspriteflags(tilenum, flags)
             ffiC.g_tile[tilenum]._flags = flags
         else
             assert(type(flags)=="string")
-            ffiC.g_tile[tilenum]._flags = bit.bor(ffiC.g_tile[tilenum].flags, ffiC[flags])
+            ffiC.g_tile[tilenum]._flags = bit.bor(ffiC.g_tile[tilenum]._flags, ffiC[flags])
         end
     end
 end