Subversion Repositories eduke32

Rev

Rev 4977 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4977 Rev 4987
Line 94... Line 94...
94
    { CON_ACTIVATE, 20130522 },
94
    { CON_ACTIVATE, 20130522 },
95
    { CON_SCREENTEXT, 20130529 },
95
    { CON_SCREENTEXT, 20130529 },
96
    { CON_DYNAMICSOUNDREMAP, 20130530 },
96
    { CON_DYNAMICSOUNDREMAP, 20130530 },
97
    { CON_SCREENSOUND, 20130628 },
97
    { CON_SCREENSOUND, 20130628 },
98
    { CON_SETMUSICPOSITION, 20150115 },
98
    { CON_SETMUSICPOSITION, 20150115 },
-
 
99
    { CON_CUTSCENE, 20150117 },
-
 
100
    { CON_IFCUTSCENE, 20150117 },
99
};
101
};
100
#endif
102
#endif
101
103
102
char g_szScriptFileName[BMAX_PATH] = "(none)";  // file we're currently compiling
104
char g_szScriptFileName[BMAX_PATH] = "(none)";  // file we're currently compiling
103
105
Line 553... Line 555...
553
    "getmusicposition",         // 373
555
    "getmusicposition",         // 373
554
    "setmusicposition",         // 374
556
    "setmusicposition",         // 374
555
    "undefinevolume",           // 375
557
    "undefinevolume",           // 375
556
    "undefineskill",            // 376
558
    "undefineskill",            // 376
557
    "undefinelevel",            // 377
559
    "undefinelevel",            // 377
-
 
560
    "cutscene",                 // 378
-
 
561
    "ifcutscene",               // 379
558
    "<null>"
562
    "<null>"
559
};
563
};
560
#endif
564
#endif
561
565
562
// KEEPINSYNC with enum GameEvent_t and lunatic/con_lang.lua
566
// KEEPINSYNC with enum GameEvent_t and lunatic/con_lang.lua
Line 659... Line 663...
659
    "EVENT_CHANGEMENU",
663
    "EVENT_CHANGEMENU",
660
    "EVENT_DAMAGEHPLANE",
664
    "EVENT_DAMAGEHPLANE",
661
    "EVENT_ACTIVATECHEAT",
665
    "EVENT_ACTIVATECHEAT",
662
    "EVENT_DISPLAYINACTIVEMENU",
666
    "EVENT_DISPLAYINACTIVEMENU",
663
    "EVENT_DISPLAYINACTIVEMENUREST",
667
    "EVENT_DISPLAYINACTIVEMENUREST",
-
 
668
    "EVENT_CUTSCENE",
664
#ifdef LUNATIC
669
#ifdef LUNATIC
665
    "EVENT_ANIMATEALLSPRITES",
670
    "EVENT_ANIMATEALLSPRITES",
666
#endif
671
#endif
667
};
672
};
668
673
Line 4160... Line 4165...
4160
        case CON_SECTSETINTERPOLATION:
4165
        case CON_SECTSETINTERPOLATION:
4161
        case CON_SECTCLEARINTERPOLATION:
4166
        case CON_SECTCLEARINTERPOLATION:
4162
        case CON_SETACTORANGLE:
4167
        case CON_SETACTORANGLE:
4163
        case CON_SETPLAYERANGLE:
4168
        case CON_SETPLAYERANGLE:
4164
        case CON_SETMUSICPOSITION:
4169
        case CON_SETMUSICPOSITION:
-
 
4170
        case CON_CUTSCENE:
4165
            C_GetNextVar();
4171
            C_GetNextVar();
4166
            continue;
4172
            continue;
4167
4173
4168
        case CON_SQRT:
4174
        case CON_SQRT:
4169
            C_GetNextVar();
4175
            C_GetNextVar();
Line 5122... Line 5128...
5122
        case CON_IFACTION:
5128
        case CON_IFACTION:
5123
        case CON_IFMOVE:
5129
        case CON_IFMOVE:
5124
        case CON_IFP:
5130
        case CON_IFP:
5125
        case CON_IFPINVENTORY:
5131
        case CON_IFPINVENTORY:
5126
        case CON_IFPLAYERSL:
5132
        case CON_IFPLAYERSL:
-
 
5133
        case CON_IFCUTSCENE:
5127
            {
5134
            {
5128
                intptr_t offset;
5135
                intptr_t offset;
5129
                intptr_t lastScriptPtr = (g_scriptPtr-&script[0]-1);
5136
                intptr_t lastScriptPtr = (g_scriptPtr-&script[0]-1);
5130
5137
5131
                g_ifElseAborted = 0;
5138
                g_ifElseAborted = 0;
5132
5139
5133
                switch (tw)
5140
                switch (tw)
5134
                {
5141
                {
-
 
5142
                case CON_IFCUTSCENE:
-
 
5143
                    C_GetNextVar();
-
 
5144
                    break;
5135
                case CON_IFAI:
5145
                case CON_IFAI:
5136
                    C_GetNextValue(LABEL_AI);
5146
                    C_GetNextValue(LABEL_AI);
5137
                    break;
5147
                    break;
5138
                case CON_IFACTION:
5148
                case CON_IFACTION:
5139
                    C_GetNextValue(LABEL_ACTION);
5149
                    C_GetNextValue(LABEL_ACTION);