From 62d4bbbe65f706fd0dd034db133783de3e6d20a3 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 21 Apr 2020 10:07:24 +0300 Subject: [PATCH] - restored Wads.GetNumLumps() scripted function https://forum.zdoom.org/viewtopic.php?t=68300 --- src/scripting/vmthunks.cpp | 2 +- wadsrc/static/zscript/base.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp index 02394188f2..a55abc5e66 100644 --- a/src/scripting/vmthunks.cpp +++ b/src/scripting/vmthunks.cpp @@ -3005,7 +3005,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()); diff --git a/wadsrc/static/zscript/base.zs b/wadsrc/static/zscript/base.zs index 976d1b63d5..a1800f9fda 100644 --- a/wadsrc/static/zscript/base.zs +++ b/wadsrc/static/zscript/base.zs @@ -879,7 +879,7 @@ struct Wads native static int FindLump(string name, int startlump = 0, FindLumpNamespace ns = GlobalNamespace); native static string ReadLump(int lump); - native static int GetNumEntries(); + native static int GetNumLumps(); native static string GetLumpName(int lump); native static string GetLumpFullName(int lump); native static int GetLumpNamespace(int lump);