CON: Add LOGO_FLAGS bits 4096-32768 to disable E1-E4 bonus scenes, respectively.

Each scene is disabled in its entirety, there's no way to disable only a
particular part. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4109 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/source/game.c

@@ -12150,6 +12150,10 @@ static void G_BonusCutscenes(void)
     if (!(numplayers < 2 && ud.eog && ud.from_bonus == 0))
         return;
 
+    if ((unsigned)ud.volume_number < 4
+            && (G_GetLogoFlags() & (LOGO_NOE1BONUSSCENE << ud.volume_number)))
+        return;
+
     switch (ud.volume_number)
     {
     case 0:

polymer/eduke32/source/game.h

@@ -63,6 +63,8 @@ enum LogoFlags_t {
     LOGO_TENSCREEN         = 0x00000200,
     LOGO_STOPANIMSOUNDS    = 0x00000400,
     LOGO_NOE4CUTSCENE      = 0x00000800,
+    LOGO_NOE1BONUSSCENE    = 0x00001000,  /* don't play E1 bonus scene */
+    /* 0x00002000 -- 0x00008000: don't play E2 -- E4 bonus scenes (respectively) */
 };
 
 typedef enum basepal_ {

polymer/eduke32/source/lunatic/doc/lunatic.txt

@@ -78,13 +78,11 @@ checks for
 `eduke32 -nologo MYTC.CON -mx addition.con test.lua weapons/nuke.lua -v1 -l1`
 ====================
 
-If the environment variable `LUNATIC_TIMING_BASEFN` is defined, EDuke32 will
+If the OS environment variable `LUNATIC_TIMING_BASEFN` is defined, EDuke32 will
 write out arregate timing results for actors and events in a comma-separated
 value format, obtained by suffixing the base name with ```.actors.csv`'' and
 ```.events.csv`''.
 
-// XXX: it's confusing that there are two kinds of 'environment' mentioned here
-
 
 Global Environment
 ------------------

polymer/eduke32/source/lunatic/lunacon.lua

@@ -429,7 +429,7 @@ local function new_initial_gvartab()
     }
 
     -- Reserved bits
-    gamevar.LOGO_FLAGS.rbits = bit.bnot(4095)
+    gamevar.LOGO_FLAGS.rbits = bit.bnot(65535)
 
     for w=0,C.MAX_WEAPONS-1 do
         for i=1,#wmembers do

polymer/eduke32/source/lunatic/test/rotfixed_actor.con

@@ -12,7 +12,7 @@ include GAME.CON
 // NOTE:
 // DEFS.CON 520:6: warning: label "DUKECAR" not redefined with new value 2491 (old: 913)
 
-gamevar LOGO_FLAGS 2303 0  // 255+2048, test "no ep4 cutscene" bit
+gamevar LOGO_FLAGS 6399 0  // 255+2048+4096, test "no E4 intro", "no E1 bonus" bits
 
 useractor  4  58 1 NO NO 0
     // usertype 4 is "rotation-fixed actor"