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

src/c_cvars.cpp

@@ -1538,6 +1538,13 @@ FBaseCVar *FindCVar (const char *var_name, FBaseCVar **prev)
 }
 
 DEFINE_ACTION_FUNCTION(_CVar, FindCVar)
+{
+	PARAM_PROLOGUE;
+	PARAM_NAME(name);
+	ACTION_RETURN_POINTER(FindCVar(name, nullptr));
+}
+
+DEFINE_ACTION_FUNCTION(_CVar, GetCVar)
 {
 	PARAM_PROLOGUE;
 	PARAM_NAME(name);

src/p_usdf.cpp

@@ -72,8 +72,13 @@ class USDFParser : public UDMFParserBase
 			}
 			type = cls;
 		}
-		if (type && type->IsDescendantOf(RUNTIME_CLASS(AInventory))) return type;
+		return type;
-		return nullptr;
+	}
+
+	PClassActor *CheckInventoryActorType(const char *key)
+	{
+		PClassActor* const type = CheckActorType(key);
+		return nullptr != type && type->IsDescendantOf(RUNTIME_CLASS(AInventory)) ? type : nullptr;
 	}
 
 	//===========================================================================
@@ -94,7 +99,7 @@ class USDFParser : public UDMFParserBase
 			switch(key)
 			{
 			case NAME_Item:
-				check.Item = CheckActorType(key);
+				check.Item = CheckInventoryActorType(key);
 				break;
 
 			case NAME_Amount:
@@ -273,7 +278,7 @@ class USDFParser : public UDMFParserBase
 			switch(key)
 			{
 			case NAME_Item:
-				check.Item = CheckActorType(key);
+				check.Item = CheckInventoryActorType(key);
 				break;
 
 			case NAME_Count:

src/polyrenderer/drawers/screen_triangle.cpp

@@ -1019,6 +1019,6 @@ void(*ScreenTriangle::RectDrawers32[])(const void *, int, int, int, const RectDr
 	&RectScreenDrawer32<TriScreenDrawerModes::ShadedBlend, TriScreenDrawerModes::FuzzSampler>::Execute             // Fuzz
 };
 
-int ScreenTriangle::FuzzStart = 0;
-
 #endif
+
+int ScreenTriangle::FuzzStart = 0;

src/textures/textures.h

@@ -30,7 +30,6 @@ class FBitmap;
 struct FRemapTable;
 struct FCopyInfo;
 class FScanner;
-class PClassInventory;
 
 // Texture IDs
 class FTextureManager;

wadsrc/static/zscript/base.txt

@@ -286,7 +286,8 @@ struct CVar native
 		CVAR_Color,
 	};
 
-	native static CVar FindCVar(Name name, PlayerInfo player = null);
+	native static CVar FindCVar(Name name);
+	native static CVar GetCVar(Name name, PlayerInfo player = null);
 	native int GetInt();
 	native double GetFloat();
 	native String GetString();