Subversion Repositories eduke32

Rev

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

Rev 5029 Rev 5031
Line 1370... Line 1370...
1370
        warnprintf("'spriteflags' after %s %d", loc[4], tilenum)
1370
        warnprintf("'spriteflags' after %s %d", loc[4], tilenum)
1371
        contprintf(false, "at %s %d:%d", loc[1], loc[2], loc[3])
1371
        contprintf(false, "at %s %d:%d", loc[1], loc[2], loc[3])
1372
    end
1372
    end
1373
1373
1374
    -- Mark the last 'spriteflags' or 'sprite*' directive for the given actor.
1374
    -- Mark the last 'spriteflags' or 'sprite*' directive for the given actor.
1375
    g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw))
1375
    g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw), pos)
1376
1376
1377
    if (ffi and ok) then
1377
    if (ffi and ok) then
1378
        local tile = ffiC.g_tile[tilenum]
1378
        local tile = ffiC.g_tile[tilenum]
1379
        tile._flags = bit.bor(override and 0 or tile._flags, flags)
1379
        tile._flags = bit.bor(override and 0 or tile._flags, flags)
1380
    end
1380
    end
Line 2949... Line 2949...
2949
    starttrack = cmd(D)
2949
    starttrack = cmd(D)
2950
        / "_con._starttrack(%1)",
2950
        / "_con._starttrack(%1)",
2951
    starttrackvar = cmd(R)
2951
    starttrackvar = cmd(R)
2952
        / "_con._starttrack(%1)",
2952
        / "_con._starttrack(%1)",
2953
2953
2954
--    cutscene = cmd(R)
2954
    startcutscene = cmd(R)
2955
--        / handle.NYI,
2955
        / handle.NYI,
2956
    getmusicposition = cmd(W)
2956
    getmusicposition = cmd(W)
2957
        / "%1=_con._getmusicposition()",
2957
        / "%1=_con._getmusicposition()",
2958
    setmusicposition = cmd(R)
2958
    setmusicposition = cmd(R)
2959
        / "_con._setmusicposition(%1)",
2959
        / "_con._setmusicposition(%1)",
2960
2960
Line 3890... Line 3890...
3890
                    gvs[#gvs+1] = gv
3890
                    gvs[#gvs+1] = gv
3891
                end
3891
                end
3892
            end
3892
            end
3893
        end
3893
        end
3894
3894
3895
        local function compare_gv(gva, gvb)
3895
        function compare_gv(gva, gvb)
3896
            if (gva.loc[1] ~= gvb.loc[1]) then
3896
            if (gva.loc[1] ~= gvb.loc[1]) then
3897
                return gva.loc[1] < gvb.loc[1]
3897
                return gva.loc[1] < gvb.loc[1]
3898
            end
3898
            end
3899
            return (gva.loc[2] < gvb.loc[2])
3899
            return (gva.loc[2] < gvb.loc[2])
3900
        end
3900
        end