Subversion Repositories eduke32

Rev

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

Rev 4968 Rev 4978
Line 1673... Line 1673...
1673
    }
1673
    }
1674
1674
1675
    return MAXLEVELS * MAXVOLUMES;
1675
    return MAXLEVELS * MAXVOLUMES;
1676
}
1676
}
1677
1677
1678
void G_FadeLoad(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t ticwait)
1678
static void G_FadeLoad(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t ticwait, int32_t tc)
1679
{
1679
{
1680
    int32_t m = (step < 0) ? -1 : 1;
1680
    int32_t m = (step < 0) ? -1 : 1;
1681
1681
1682
    int32_t nexttic = totalclock;
1682
    int32_t nexttic = totalclock;
1683
1683
Line 1693... Line 1693...
1693
            return;
1693
            return;
1694
        }
1694
        }
1695
1695
1696
        G_FadePalette(r,g,b,start|128);
1696
        G_FadePalette(r,g,b,start|128);
1697
        flushperms();
1697
        flushperms();
1698
        G_DoLoadScreen(" ", -1);
1698
        G_DoLoadScreen(" ", tc);
1699
    }
1699
    }
1700
}
1700
}
1701
1701
1702
static int32_t G_TryMapHack(const char *mhkfile)
1702
static int32_t G_TryMapHack(const char *mhkfile)
1703
{
1703
{
Line 1905... Line 1905...
1905
    G_AlignWarpElevators();
1905
    G_AlignWarpElevators();
1906
    resetpspritevars(g);
1906
    resetpspritevars(g);
1907
1907
1908
    ud.playerbest = CONFIG_GetMapBestTime(MapInfo[mii].filename);
1908
    ud.playerbest = CONFIG_GetMapBestTime(MapInfo[mii].filename);
1909
1909
1910
    G_FadeLoad(0,0,0, 63,0, -7, 4);
1910
    G_FadeLoad(0,0,0, 63,0, -7, 4, -1);
1911
    G_CacheMapData();
1911
    G_CacheMapData();
1912
    G_FadeLoad(0,0,0, 0,63, 7, 4);
1912
    G_FadeLoad(0,0,0, 0,63, 7, 4, -2);
1913
1913
1914
    if (ud.recstat != 2)
1914
    if (ud.recstat != 2)
1915
    {
1915
    {
1916
        g_musicIndex = mii;
1916
        g_musicIndex = mii;
1917
        if (MapInfo[g_musicIndex].musicfn != NULL)
1917
        if (MapInfo[g_musicIndex].musicfn != NULL)