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

src/c_cmds.cpp

@@ -923,10 +923,21 @@ static bool IsActorACountItem(AActor *mo)
 	return mo->IsKindOf(RUNTIME_CLASS(AInventory)) && mo->flags&MF_SPECIAL && mo->flags&MF_COUNTITEM;
 }
 
-static void PrintFilteredActorList(const ActorTypeChecker IsActorType, const char *FilterName)
+// [SP] for all actors
+static bool IsActor(AActor *mo)
+{
+	if (mo->IsKindOf(RUNTIME_CLASS(AInventory)))
+		return static_cast<AInventory *>(mo)->Owner == NULL; // [SP] Exclude inventory-owned items
+	else
+		return true;
+}
+
+// [SP] modified - now allows showing count only, new arg must be passed. Also now still counts regardless, if lists are printed.
+static void PrintFilteredActorList(const ActorTypeChecker IsActorType, const char *FilterName, bool countOnly)
 {
 	AActor *mo;
 	const PClass *FilterClass = NULL;
+	int counter = 0;
 
 	if (FilterName != NULL)
 	{
@@ -943,10 +954,32 @@ static void PrintFilteredActorList(const ActorTypeChecker IsActorType, const cha
 	{
 		if ((FilterClass == NULL || mo->IsA(FilterClass)) && IsActorType(mo))
 		{
-			Printf ("%s at (%f,%f,%f)\n",
+			counter++;
-				mo->GetClass()->TypeName.GetChars(), mo->X(), mo->Y(), mo->Z());
+			if (!countOnly)
+				Printf ("%s at (%f,%f,%f)\n",
+					mo->GetClass()->TypeName.GetChars(), mo->X(), mo->Y(), mo->Z());
 		}
 	}
+	Printf("%i match(s) found.\n", counter);
+}
+
+//-----------------------------------------------------------------------------
+//
+//
+//
+//-----------------------------------------------------------------------------
+CCMD(actorlist) // [SP] print all actors (this can get quite big?)
+{
+	if (CheckCheatmode ()) return;
+
+	PrintFilteredActorList(IsActor, argv.argc() > 1 ? argv[1] : NULL, false);
+}
+
+CCMD(actornum) // [SP] count all actors
+{
+	if (CheckCheatmode ()) return;
+
+	PrintFilteredActorList(IsActor, argv.argc() > 1 ? argv[1] : NULL, true);
 }
 
 //-----------------------------------------------------------------------------
@@ -958,7 +991,14 @@ CCMD(monster)
 {
 	if (CheckCheatmode ()) return;
 
-	PrintFilteredActorList(IsActorAMonster, argv.argc() > 1 ? argv[1] : NULL);
+	PrintFilteredActorList(IsActorAMonster, argv.argc() > 1 ? argv[1] : NULL, false);
+}
+
+CCMD(monsternum) // [SP] count monsters
+{
+	if (CheckCheatmode ()) return;
+
+	PrintFilteredActorList(IsActorAMonster, argv.argc() > 1 ? argv[1] : NULL, true);
 }
 
 //-----------------------------------------------------------------------------
@@ -970,7 +1010,14 @@ CCMD(items)
 {
 	if (CheckCheatmode ()) return;
 
-	PrintFilteredActorList(IsActorAnItem, argv.argc() > 1 ? argv[1] : NULL);
+	PrintFilteredActorList(IsActorAnItem, argv.argc() > 1 ? argv[1] : NULL, false);
+}
+
+CCMD(itemsnum) // [SP] # of any items
+{
+	if (CheckCheatmode ()) return;
+
+	PrintFilteredActorList(IsActorAnItem, argv.argc() > 1 ? argv[1] : NULL, true);
 }
 
 //-----------------------------------------------------------------------------
@@ -982,7 +1029,14 @@ CCMD(countitems)
 {
 	if (CheckCheatmode ()) return;
 
-	PrintFilteredActorList(IsActorACountItem, argv.argc() > 1 ? argv[1] : NULL);
+	PrintFilteredActorList(IsActorACountItem, argv.argc() > 1 ? argv[1] : NULL, false);
+}
+
+CCMD(countitemsnum) // [SP] # of counted items
+{
+	if (CheckCheatmode ()) return;
+
+	PrintFilteredActorList(IsActorACountItem, argv.argc() > 1 ? argv[1] : NULL, true);
 }
 
 //-----------------------------------------------------------------------------

src/g_shared/shared_hud.cpp

@@ -1108,7 +1108,7 @@ void DrawHUD()
 		}
 		else 
 		{
-			if (CheckRatio(SCREENWIDTH, SCREENHEIGHT) == 4)
+			if (AspectTallerThanWide(WidescreenRatio))
 			{
 				hudheight = hudwidth * 30 / AspectMultiplier(WidescreenRatio);	// BaseRatioSizes is inverted for this mode
 			}

src/menu/videomenu.cpp

@@ -95,7 +95,7 @@ CUSTOM_CVAR (Int, menu_screenratios, -1, CVAR_ARCHIVE)
 	}
 	else
 	{
-		BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+		BuildModesList (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 	}
 }
 
@@ -139,7 +139,7 @@ public:
 
 	DVideoModeMenu()
 	{
-		SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+		SetModesMenu (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 	}
 
 	bool MenuEvent(int mkey, bool fromcontroller)
@@ -163,13 +163,13 @@ public:
 		{
 			if (!GetSelectedSize (&NewWidth, &NewHeight))
 			{
-				NewWidth = SCREENWIDTH;
+				NewWidth = screen->VideoWidth;
-				NewHeight = SCREENHEIGHT;
+				NewHeight = screen->VideoHeight;
 			}
 			else
 			{
-				OldWidth = SCREENWIDTH;
+				OldWidth = screen->VideoWidth;
-				OldHeight = SCREENHEIGHT;
+				OldHeight = screen->VideoHeight;
 				OldBits = DisplayBits;
 				NewBits = BitTranslate[DummyDepthCvar];
 				setmodeneeded = true;
@@ -297,11 +297,11 @@ void M_RestoreMode ()
 void M_SetDefaultMode ()
 {
 	// Make current resolution the default
-	vid_defwidth = SCREENWIDTH;
+	vid_defwidth = screen->VideoWidth;
-	vid_defheight = SCREENHEIGHT;
+	vid_defheight = screen->VideoHeight;
 	vid_defbits = DisplayBits;
 	testingmode = 0;
-	SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+	SetModesMenu (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 }
 
 
@@ -314,7 +314,7 @@ void M_SetDefaultMode ()
 
 void M_RefreshModesList ()
 {
-	BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+	BuildModesList (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 }
 
 void M_InitVideoModesMenu ()
@@ -385,8 +385,8 @@ void M_SetVideoMode()
 {
 	if (!GetSelectedSize (&NewWidth, &NewHeight))
 	{
-		NewWidth = SCREENWIDTH;
+		NewWidth = screen->VideoWidth;
-		NewHeight = SCREENHEIGHT;
+		NewHeight = screen->VideoHeight;
 	}
 	else
 	{

src/v_video.cpp

@@ -850,6 +850,9 @@ DFrameBuffer::DFrameBuffer (int width, int height)
 {
 	LastMS = LastSec = FrameCount = LastCount = LastTic = 0;
 	Accel2D = false;
+
+	VideoWidth = width;
+	VideoHeight = height;
 }
 
 //==========================================================================
@@ -1352,6 +1355,7 @@ void V_OutputResized (int width, int height)
 	{
 		StatusBar->ScreenSizeChanged();
 	}
+	C_NewModeAdjust();
 }
 
 void V_CalcCleanFacs (int designwidth, int designheight, int realwidth, int realheight, int *cleanx, int *cleany, int *_cx1, int *_cx2)

src/v_video.h

@@ -422,6 +422,10 @@ public:
 	virtual bool Is8BitMode() = 0;
 #endif
 
+	// The original size of the framebuffer as selected in the video menu.
+	int VideoWidth = 0;
+	int VideoHeight = 0;
+
 protected:
 	void DrawRateStuff ();
 	void CopyFromBuff (BYTE *src, int srcPitch, int width, int height, BYTE *dest);

src/zscript/vm.h

@@ -156,6 +156,15 @@ enum
 	ATAG_RNG,				// pointer to FRandom
 };
 
+enum EVMAbortException
+{
+	X_READ_NIL,
+	X_WRITE_NIL,
+	X_TOO_MANY_TRIES,
+	X_ARRAY_OUT_OF_BOUNDS,
+	X_DIVISION_BY_ZERO,
+};
+
 class VMFunction : public DObject
 {
 	DECLARE_ABSTRACT_CLASS(VMFunction, DObject);

src/zscript/vmexec.cpp

@@ -44,7 +44,7 @@
 #define ASSERTKA(x)		assert(sfunc != NULL && (unsigned)(x) < sfunc->NumKonstA)
 #define ASSERTKS(x)		assert(sfunc != NULL && (unsigned)(x) < sfunc->NumKonstS)
 
-#define THROW(x)
+#define THROW(x)		throw(EVMAbortException(x))
 
 #define CMPJMP(test) \
 	if ((test) == (a & CMP_CHECK)) { \
@@ -54,14 +54,6 @@
 		pc += 1; \
 	}
 
-enum
-{
-	X_READ_NIL,
-	X_WRITE_NIL,
-	X_TOO_MANY_TRIES,
-	X_ARRAY_OUT_OF_BOUNDS
-};
-
 #define GETADDR(a,o,x) \
 	if (a == NULL) { THROW(x); } \
 	ptr = (VM_SBYTE *)a + o

src/zscript/vmexec.h

@@ -786,27 +786,51 @@ begin:
 
 	OP(DIV_RR):
 		ASSERTD(a); ASSERTD(B); ASSERTD(C);
+		if (reg.d[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = reg.d[B] / reg.d[C];
 		NEXTOP;
 	OP(DIV_RK):
 		ASSERTD(a); ASSERTD(B); ASSERTKD(C);
+		if (konstd[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = reg.d[B] / konstd[C];
 		NEXTOP;
 	OP(DIV_KR):
 		ASSERTD(a); ASSERTKD(B); ASSERTD(C);
+		if (reg.d[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = konstd[B] / reg.d[C];
 		NEXTOP;
 
 	OP(MOD_RR):
 		ASSERTD(a); ASSERTD(B); ASSERTD(C);
+		if (reg.d[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = reg.d[B] % reg.d[C];
 		NEXTOP;
 	OP(MOD_RK):
 		ASSERTD(a); ASSERTD(B); ASSERTKD(C);
+		if (konstd[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = reg.d[B] % konstd[C];
 		NEXTOP;
 	OP(MOD_KR):
 		ASSERTD(a); ASSERTKD(B); ASSERTD(C);
+		if (reg.d[C] == 0)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.d[a] = konstd[B] % reg.d[C];
 		NEXTOP;
 
@@ -981,14 +1005,26 @@ begin:
 
 	OP(DIVF_RR):
 		ASSERTF(a); ASSERTF(B); ASSERTF(C);
+		if (reg.f[C] == 0.)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.f[a] = reg.f[B] / reg.f[C];
 		NEXTOP;
 	OP(DIVF_RK):
 		ASSERTF(a); ASSERTF(B); ASSERTKF(C);
+		if (konstf[C] == 0.)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.f[a] = reg.f[B] / konstf[C];
 		NEXTOP;
 	OP(DIVF_KR):
 		ASSERTF(a); ASSERTKF(B); ASSERTF(C);
+		if (reg.f[C] == 0.)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.f[a] = konstf[B] / reg.f[C];
 		NEXTOP;
 
@@ -996,6 +1032,10 @@ begin:
 		ASSERTF(a); ASSERTF(B); ASSERTF(C);
 		fb = reg.f[B]; fc = reg.f[C];
 	Do_MODF:
+		if (fc == 0.)
+		{
+			THROW(X_DIVISION_BY_ZERO);
+		}
 		reg.f[a] = luai_nummod(fb, fc);
 		NEXTOP;
 	OP(MODF_RK):

src/zscript/vmframe.cpp

@@ -407,6 +407,44 @@ int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMRetur
 		}
 		throw;
 	}
+	catch (EVMAbortException exception)
+	{
+		if (allocated)
+		{
+			PopFrame();
+		}
+		if (trap != nullptr)
+		{
+			*trap = nullptr;
+		}
+
+		Printf("VM execution aborted: ");
+		switch (exception)
+		{
+		case X_READ_NIL:
+			Printf("tried to read from address zero.");
+			break;
+
+		case X_WRITE_NIL:
+			Printf("tried to write to address zero.");
+			break;
+
+		case X_TOO_MANY_TRIES:
+			Printf("too many try-catch blocks.");
+			break;
+
+		case X_ARRAY_OUT_OF_BOUNDS:
+			Printf("array access out of bounds.");
+			break;
+
+		case X_DIVISION_BY_ZERO:
+			Printf("division by zero.");
+			break;
+		}
+		Printf("\n");
+
+		return -1;
+	}
 	catch (...)
 	{
 		if (allocated)