diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index d2a24c891..6f3fc8580 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -1258,7 +1258,7 @@ lpeg.P(false) + "default" + "debug" + "debris" + -"cutscene" + +--"cutscene" + "cstator" + "cstat" + "count" + diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index ead94f1eb..acc9608b3 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -547,8 +547,6 @@ typedef struct { // // Sound variables // - int32_t FXDevice; - int32_t MusicDevice; int32_t MasterVolume; int32_t FXVolume; int32_t MusicVolume; diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua index f830ea022..571a93d2d 100644 --- a/polymer/eduke32/source/lunatic/lunacon.lua +++ b/polymer/eduke32/source/lunatic/lunacon.lua @@ -2951,8 +2951,8 @@ local Cinner = { starttrackvar = cmd(R) / "_con._starttrack(%1)", - cutscene = cmd(R) - / handle.NYI, +-- cutscene = cmd(R) +-- / handle.NYI, getmusicposition = cmd(W) / "%1=_con._getmusicposition()", setmusicposition = cmd(R) diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh index 1935dd976..f1b7c3eff 100755 --- a/polymer/synthesis.sh +++ b/polymer/synthesis.sh @@ -190,8 +190,8 @@ then if [ -n "$BUILD_LUNATIC" ]; then # clean the tree and build - echo "${make64[@]}" LUNATIC=1 $clean all - "${make64[@]}" LUNATIC=1 $clean all + echo "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all + "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all # make sure all the targets were produced verifytargets