Merge branch 'master' of https://github.com/rheit/zdoom

src/actor.h

@@ -804,6 +804,12 @@ public:
 		return bloodcls;
 	}
 
+	double Distance2DSquared(AActor *other, bool absolute = false)
+	{
+		DVector2 otherpos = absolute ? other->Pos() : other->PosRelative(this);
+		return (Pos().XY() - otherpos).LengthSquared();
+	}
+
 	double Distance2D(AActor *other, bool absolute = false)
 	{
 		DVector2 otherpos = absolute ? other->Pos() : other->PosRelative(this);

src/g_shared/a_artifacts.cpp

@@ -1629,7 +1629,7 @@ void APowerDamage::ModifyDamage(int damage, FName damageType, int &newdamage, bo
 		DmgFactors *df = GetClass()->DamageFactors;
 		if (df != NULL && df->CountUsed() != 0)
 		{
-			newdam = MIN(1, df->Apply(damageType, damage));// don't allow zero damage as result of an underflow
+			newdam = MAX(1, df->Apply(damageType, damage));// don't allow zero damage as result of an underflow
 		}
 		else
 		{

src/info.h

@@ -53,6 +53,7 @@ struct Baggage;
 class FScanner;
 struct FActorInfo;
 class FArchive;
+class FIntCVar;
 
 // Sprites that are fixed in position because they can have special meanings.
 enum
@@ -259,6 +260,7 @@ public:
 
 	DDropItem *DropItems;
 	FString SourceLumpName;
+	FIntCVar *distancecheck;
 
 	// Old Decorate compatibility stuff
 	bool DontHurtShooter;

src/p_acs.cpp

@@ -8900,10 +8900,11 @@ scriptwait:
 			break;
 
 		case PCD_ENDTRANSLATION:
-			// This might be useful for hardware rendering, but
+			if (translation != NULL)
-			// for software it is superfluous.
+			{
-			translation->UpdateNative();
+				translation->UpdateNative();
-			translation = NULL;
+				translation = NULL;
+			}
 			break;
 
 		case PCD_SIN:

src/r_things.cpp

@@ -1246,9 +1246,20 @@ void R_AddSprites (sector_t *sec, int lightlevel, int fakeside)
 	// Handle all things in sector.
 	for (thing = sec->thinglist; thing; thing = thing->snext)
 	{
+		FIntCVar *cvar = thing->GetClass()->distancecheck;
+		if (cvar != NULL && *cvar >= 0)
+		{
+			double dist = thing->Distance2DSquared(camera);
+			double check = (double)**cvar;
+			if (dist >= check * check)
+			{
+				continue;
+			}
+		}
+
 		// find fake level
-		for(int i = 0; i < (int)frontsector->e->XFloor.ffloors.Size(); i++) {
+		for(auto rover : frontsector->e->XFloor.ffloors) 
-			rover = frontsector->e->XFloor.ffloors[i];
+		{
 			if(!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) continue;
 			if(!(rover->flags & FF_SOLID) || rover->alpha != 255) continue;
 			if(!fakefloor)

src/thingdef/thingdef_properties.cpp

@@ -1523,6 +1523,28 @@ DEFINE_PROPERTY(riplevelmax, I, Actor)
 	defaults->RipLevelMax = id;
 }
 
+//==========================================================================
+//
+//==========================================================================
+DEFINE_PROPERTY(distancecheck, S, Actor)
+{
+	PROP_STRING_PARM(cvar, 0);
+	FBaseCVar *scratch;
+	FBaseCVar *cv = FindCVar(cvar, &scratch);
+	if (cv == NULL)
+	{
+		I_Error("CVar %s not defined", cvar);
+	}
+	else if (cv->GetRealType() == CVAR_Int)
+	{
+		static_cast<PClassActor*>(info)->distancecheck = static_cast<FIntCVar *>(cv);
+	}
+	else
+	{
+		I_Error("CVar %s must of type Int", cvar);
+	}
+}
+
 //==========================================================================
 //
 // Special inventory properties