X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=palette.c;h=3e1bd563c4b0666e9cbf9f34ed77f9a6dc8a6969;hb=435b52972823fa8e8ceb9b67797ca3f886f6208a;hp=fc642acb32636ab7fe63893123c13b54d51c5329;hpb=a7d4c723ad7172b540df8c261a24d01e13166c96;p=xonotic%2Fdarkplaces.git

diff --git a/palette.c b/palette.c
index fc642acb..3e1bd563 100644
--- a/palette.c
+++ b/palette.c
@@ -46,7 +46,7 @@ void Palette_Setup8to24(void)
 	palette_complete[255] = 0; // completely transparent black
 
 	// FIXME: fullbright_start should be read from colormap.lmp
-	colormap = FS_LoadFile("gfx/colormap.lmp", true);
+	colormap = FS_LoadFile("gfx/colormap.lmp", tempmempool, true);
 	if (colormap && fs_filesize >= 16385)
 		fullbright_start = 256 - colormap[16384];
 	else
@@ -181,7 +181,7 @@ void Palette_Init(void)
 	float gamma, scale, base;
 	qbyte *pal;
 	qbyte temp[256];
-	pal = (qbyte *)FS_LoadFile ("gfx/palette.lmp", false);
+	pal = (qbyte *)FS_LoadFile ("gfx/palette.lmp", tempmempool, false);
 	if (pal && fs_filesize >= 768)
 	{
 		memcpy(host_basepal, pal, 765);
@@ -189,7 +189,7 @@ void Palette_Init(void)
 	}
 	else
 	{
-		Con_DPrintf("Couldn't load gfx/palette.lmp, falling back on internal palette\n");
+		Con_DPrint("Couldn't load gfx/palette.lmp, falling back on internal palette\n");
 		memcpy(host_basepal, host_quakepal, 765);
 	}
 	host_basepal[765] = host_basepal[766] = host_basepal[767] = 0; // LordHavoc: force the transparent color to black