OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2016-09-24 09:37:18 +02:00
commit 5ef46d1730
208 changed files with 21902 additions and 6688 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/v_font.cpp
View file

@ -90,7 +90,6 @@ The FON2 header is followed by variable length data:
#include "cmdlib.h"
#include "sc_man.h"
#include "hu_stuff.h"
#include "farchive.h"
#include "textures/textures.h"
#include "r_data/r_translate.h"
#include "colormatcher.h"
@ -340,33 +339,6 @@ FFont *V_GetFont(const char *name)
}
return font;
}
//==========================================================================
//
// SerializeFFontPtr
//
//==========================================================================
FArchive &SerializeFFontPtr (FArchive &arc, FFont* &font)
{
if (arc.IsStoring ())
{
arc << font->Name;
}
else
{
char *name = NULL;
arc << name;
font = V_GetFont(name);
if (font == NULL)
{
Printf ("Could not load font %s\n", name);
font = SmallFont;
}
delete[] name;
}
return arc;
}
//==========================================================================
//