collision code cleanups (model->brush.TraceBox is now used for everything except...

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index b08118b8afa2f4fdbe3da97f8b5ec0d0f13fc13d..f76ec54010850a87e4147e8166521eabe80bc682 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -35,8 +35,8 @@ void Palette_Setup8to24(void)
        palette_complete[255] = 0; // completely transparent black
 
        // FIXME: fullbright_start should be read from colormap.lmp
-       colormap = COM_LoadFile("gfx/colormap.lmp", true);
-       if (colormap && com_filesize >= 16385)
+       colormap = FS_LoadFile("gfx/colormap.lmp", true);
+       if (colormap && fs_filesize >= 16385)
                fullbright_start = 256 - colormap[16384];
        else
                fullbright_start = 256;
@@ -110,7 +110,6 @@ void Palette_Setup8to24(void)
        palette_font[255] = 0;
 }
 
-
 void BuildGammaTable8(float prescale, float gamma, float scale, float base, qbyte *out)
 {
        int i, adjusted;
@@ -171,7 +170,7 @@ void Palette_Init(void)
        float gamma, scale, base;
        qbyte *pal;
        qbyte temp[256];
-       pal = (qbyte *)COM_LoadFile ("gfx/palette.lmp", false);
+       pal = (qbyte *)FS_LoadFile ("gfx/palette.lmp", false);
        if (!pal)
                Sys_Error ("Couldn't load gfx/palette.lmp");
        memcpy(host_basepal, pal, 765);