Merge branch 'master' into texture_rework

This commit is contained in:
Christoph Oelckers 2020-04-29 08:04:15 +02:00
commit 9be63a5093
14 changed files with 217 additions and 33 deletions

View file

@ -3006,7 +3006,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_AltHUD, GetLatency, Net_GetLatency)
//
//==========================================================================
DEFINE_ACTION_FUNCTION(_Wads, GetNumEntries)
DEFINE_ACTION_FUNCTION(_Wads, GetNumLumps)
{
PARAM_PROLOGUE;
ACTION_RETURN_INT(fileSystem.GetNumEntries());