OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/r_things.cpp
#	src/v_draw.cpp
This commit is contained in:
Rachael Alexanderson 2017-02-05 00:08:01 -05:00
commit 59f32d497d
45 changed files with 703 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/v_font.cpp
View file

@ -525,6 +525,13 @@ FFont *FFont::FindFont (const char *name)
return font;
}
DEFINE_ACTION_FUNCTION(FFont, FindFont)
{
PARAM_PROLOGUE;
PARAM_STRING(name);
ACTION_RETURN_POINTER(FFont::FindFont(name));
}
//==========================================================================
//
// RecordTextureColors