Subversion Repositories eduke32

Compare Revisions

This comparison shows the changes necessary to convert path

→ /polymer/ @ 5028

→ /polymer/ @ 5029

↔ Reverse comparison
Compare Path: Rev

With Path: Rev

Ignore whitespace Rev 5028 → Rev 5029

 /polymer/eduke32/source/lunatic/con_lang.lua
 ,7 → 1258,7
 "default" +
 "debug" +
 "debris" +
-"cutscene" +
+--"cutscene" +
 "cstator" +
 "cstat" +
 "count" +

 /polymer/eduke32/source/lunatic/defs.ilua
 ,8 → 547,6
         //
         // Sound variables
         //
-        int32_t FXDevice;
-        int32_t MusicDevice;
         int32_t MasterVolume;
         int32_t FXVolume;
         int32_t MusicVolume;

 /polymer/eduke32/source/lunatic/lunacon.lua
 ,8 → 2951,8
     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)

 /polymer/synthesis.sh
 ,8 → 190,8
     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