- moved the VM types into their own file and only include it where really needed.

src/menu/joystickmenu.cpp

@@ -50,6 +50,7 @@
 #include "d_gui.h"
 #include "i_music.h"
 #include "m_joy.h"
+#include "vm.h"
 
 static TArray<IJoystickConfig *> Joysticks;
 

src/menu/loadsavemenu.cpp

@@ -48,6 +48,7 @@
 #include "d_gui.h"
 #include "serializer.h"
 #include "resourcefiles/resourcefile.h"
+#include "vm.h"
 
 // Save name length limit for old binary formats.
 #define OLDSAVESTRINGSIZE		24

src/menu/menu.cpp

@@ -55,7 +55,7 @@
 #include "r_utility.h"
 #include "menu/menu.h"
 #include "textures/textures.h"
-#include "virtual.h"
+#include "vm.h"
 #include "events.h"
 
 //
@@ -182,7 +182,7 @@ bool DMenu::CallResponder(event_t *ev)
 			VMValue params[] = { (DObject*)this, &e };
 			int retval;
 			VMReturn ret(&retval);
-			GlobalVMStack.Call(func, params, 2, &ret, 1, nullptr);
+			VMCall(func, params, 2, &ret, 1);
 			return !!retval;
 		}
 	}
@@ -194,7 +194,7 @@ bool DMenu::CallResponder(event_t *ev)
 			VMValue params[] = { (DObject*)this, &e };
 			int retval;
 			VMReturn ret(&retval);
-			GlobalVMStack.Call(func, params, 2, &ret, 1, nullptr);
+			VMCall(func, params, 2, &ret, 1);
 			return !!retval;
 		}
 	}
@@ -214,7 +214,7 @@ bool DMenu::CallMenuEvent(int mkey, bool fromcontroller)
 		VMValue params[] = { (DObject*)this, mkey, fromcontroller };
 		int retval;
 		VMReturn ret(&retval);
-		GlobalVMStack.Call(func, params, 3, &ret, 1, nullptr);
+		VMCall(func, params, 3, &ret, 1);
 		return !!retval;
 	}
 	else return false;
@@ -246,7 +246,7 @@ void DMenu::Close ()
 		IFVIRTUALPTR(CurrentMenu, DMenu, OnReturn)
 		{
 			VMValue params[] = { CurrentMenu };
-			GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr);
+			VMCall(func, params, 1, nullptr, 0);
 		}
 
 	}
@@ -274,7 +274,7 @@ void DMenu::CallTicker()
 	IFVIRTUAL(DMenu, Ticker)
 	{
 		VMValue params[] = { (DObject*)this };
-		GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr);
+		VMCall(func, params, 1, nullptr, 0);
 	}
 }
 
@@ -284,7 +284,7 @@ void DMenu::CallDrawer()
 	IFVIRTUAL(DMenu, Drawer)
 	{
 		VMValue params[] = { (DObject*)this };
-		GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr);
+		VMCall(func, params, 1, nullptr, 0);
 		screen->ClearClipRect();	// make sure the scripts don't leave a valid clipping rect behind.
 	}
 }
@@ -296,7 +296,7 @@ bool DMenu::TranslateKeyboardEvents()
 		VMValue params[] = { (DObject*)this };
 		int retval;
 		VMReturn ret(&retval);
-		GlobalVMStack.Call(func, params, countof(params), &ret, 1, nullptr);
+		VMCall(func, params, countof(params), &ret, 1);
 		return !!retval;
 	}
 	return true;
@@ -472,7 +472,7 @@ void M_SetMenu(FName menu, int param)
 				IFVIRTUALPTRNAME(newmenu, "ListMenu", Init)
 				{
 					VMValue params[3] = { newmenu, CurrentMenu, ld };
-					GlobalVMStack.Call(func, params, 3, nullptr, 0);
+					VMCall(func, params, 3, nullptr, 0);
 				}
 				M_ActivateMenu(newmenu);
 			}
@@ -488,7 +488,7 @@ void M_SetMenu(FName menu, int param)
 			IFVIRTUALPTRNAME(newmenu, "OptionMenu", Init)
 			{
 				VMValue params[3] = { newmenu, CurrentMenu, ld };
-				GlobalVMStack.Call(func, params, 3, nullptr, 0);
+				VMCall(func, params, 3, nullptr, 0);
 			}
 			M_ActivateMenu(newmenu);
 		}
@@ -506,7 +506,7 @@ void M_SetMenu(FName menu, int param)
 				IFVIRTUALPTRNAME(newmenu, "GenericMenu", Init)
 				{
 					VMValue params[3] = { newmenu, CurrentMenu };
-					GlobalVMStack.Call(func, params, 2, nullptr, 0);
+					VMCall(func, params, 2, nullptr, 0);
 				}
 				M_ActivateMenu(newmenu);
 				return;
@@ -1058,7 +1058,7 @@ CCMD(undocolorpic)
 		IFVIRTUALPTR(CurrentMenu, DMenu, ResetColor)
 		{
 			VMValue params[] = { (DObject*)CurrentMenu };
-			GlobalVMStack.Call(func, params, countof(params), nullptr, 0, nullptr);
+			VMCall(func, params, countof(params), nullptr, 0);
 		}
 	}
 }
@@ -1128,7 +1128,7 @@ DMenuItemBase * CreateOptionMenuItemStaticText(const char *name, bool v)
 	FString namestr = name;
 	VMValue params[] = { p, &namestr, v };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("Init", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1139,7 +1139,7 @@ DMenuItemBase * CreateOptionMenuItemJoyConfigMenu(const char *label, IJoystickCo
 	FString namestr = label;
 	VMValue params[] = { p, &namestr, joy };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("Init", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1150,7 +1150,7 @@ DMenuItemBase * CreateOptionMenuItemSubmenu(const char *label, FName cmd, int ce
 	FString namestr = label;
 	VMValue params[] = { p, &namestr, cmd.GetIndex(), center };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("Init", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1161,7 +1161,7 @@ DMenuItemBase * CreateOptionMenuItemControl(const char *label, FName cmd, FKeyBi
 	FString namestr = label;
 	VMValue params[] = { p, &namestr, cmd.GetIndex(), bindings };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("Init", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1172,7 +1172,7 @@ DMenuItemBase * CreateListMenuItemPatch(double x, double y, int height, int hotk
 	FString keystr = FString(char(hotkey));
 	VMValue params[] = { p, x, y, height, tex.GetIndex(), &keystr, command.GetIndex(), param };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("InitDirect", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1184,7 +1184,7 @@ DMenuItemBase * CreateListMenuItemText(double x, double y, int height, int hotke
 	FString textstr = text;
 	VMValue params[] = { p, x, y, height, &keystr, &textstr, font, int(color1.d), int(color2.d), command.GetIndex(), param };
 	auto f = dyn_cast<PFunction>(c->FindSymbol("InitDirect", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenuItemBase*)p;
 }
 
@@ -1195,7 +1195,7 @@ bool DMenuItemBase::Activate()
 		VMValue params[] = { (DObject*)this };
 		int retval;
 		VMReturn ret(&retval);
-		GlobalVMStack.Call(func, params, countof(params), &ret, 1, nullptr);
+		VMCall(func, params, countof(params), &ret, 1);
 		return !!retval;
 	}
 	return false;
@@ -1209,7 +1209,7 @@ bool DMenuItemBase::SetString(int i, const char *s)
 		VMValue params[] = { (DObject*)this, i, &namestr };
 		int retval;
 		VMReturn ret(&retval);
-		GlobalVMStack.Call(func, params, countof(params), &ret, 1, nullptr);
+		VMCall(func, params, countof(params), &ret, 1);
 		return !!retval;
 	}
 	return false;
@@ -1223,7 +1223,7 @@ bool DMenuItemBase::GetString(int i, char *s, int len)
 		int retval;
 		FString retstr;
 		VMReturn ret[2]; ret[0].IntAt(&retval); ret[1].StringAt(&retstr);
-		GlobalVMStack.Call(func, params, countof(params), ret, 2, nullptr);
+		VMCall(func, params, countof(params), ret, 2);
 		strncpy(s, retstr, len);
 		return !!retval;
 	}
@@ -1238,7 +1238,7 @@ bool DMenuItemBase::SetValue(int i, int value)
 		VMValue params[] = { (DObject*)this, i, value };
 		int retval;
 		VMReturn ret(&retval);
-		GlobalVMStack.Call(func, params, countof(params), &ret, 1, nullptr);
+		VMCall(func, params, countof(params), &ret, 1);
 		return !!retval;
 	}
 	return false;
@@ -1251,7 +1251,7 @@ bool DMenuItemBase::GetValue(int i, int *pvalue)
 		VMValue params[] = { (DObject*)this, i };
 		int retval[2];
 		VMReturn ret[2]; ret[0].IntAt(&retval[0]); ret[1].IntAt(&retval[1]);
-		GlobalVMStack.Call(func, params, countof(params), ret, 2, nullptr);
+		VMCall(func, params, countof(params), ret, 2);
 		*pvalue = retval[1];
 		return !!retval[0];
 	}

src/menu/menudef.cpp

@@ -51,6 +51,8 @@
 #include "gi.h"
 #include "i_sound.h"
 #include "cmdlib.h"
+#include "vm.h"
+#include "types.h"
 
 
 
@@ -480,7 +482,7 @@ static void ParseListMenuBody(FScanner &sc, DListMenuDescriptor *desc)
 					}
 					DMenuItemBase *item = (DMenuItemBase*)cls->CreateNew();
 					params[0] = item;
-					GlobalVMStack.Call(func->Variants[0].Implementation, &params[0], params.Size(), nullptr, 0);
+					VMCall(func->Variants[0].Implementation, &params[0], params.Size(), nullptr, 0);
 					desc->mItems.Push((DMenuItemBase*)item);
 
 					if (cls->IsDescendantOf("ListMenuItemSelectable"))
@@ -837,7 +839,7 @@ static void ParseOptionMenuBody(FScanner &sc, DOptionMenuDescriptor *desc)
 
 					DMenuItemBase *item = (DMenuItemBase*)cls->CreateNew();
 					params[0] = item;
-					GlobalVMStack.Call(func->Variants[0].Implementation, &params[0], params.Size(), nullptr, 0);
+					VMCall(func->Variants[0].Implementation, &params[0], params.Size(), nullptr, 0);
 					desc->mItems.Push((DMenuItemBase*)item);
 
 					success = true;

src/menu/messagebox.cpp

@@ -45,6 +45,7 @@
 #include "st_start.h"
 #include "c_dispatch.h"
 #include "g_game.h"
+#include "vm.h"
 
 EXTERN_CVAR (Bool, saveloadconfirmation) // [mxd]
 
@@ -71,7 +72,7 @@ DMenu *CreateMessageBoxMenu(DMenu *parent, const char *message, int messagemode,
 	VMValue params[] = { p, parent, &namestr, messagemode, playsound, action.GetIndex(), reinterpret_cast<void*>(handler) };
 
 	auto f = dyn_cast<PFunction>(c->FindSymbol("Init", false));
-	GlobalVMStack.Call(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
+	VMCall(f->Variants[0].Implementation, params, countof(params), nullptr, 0);
 	return (DMenu*)p;
 }
 

src/menu/playermenu.cpp

@@ -47,6 +47,7 @@
 #include "r_state.h"
 #include "r_data/r_translate.h"
 #include "v_text.h"
+#include "vm.h"
 
 EXTERN_CVAR(Int, team)
 EXTERN_CVAR(Float, autoaim)

src/menu/videomenu.cpp

@@ -53,6 +53,7 @@
 #include "m_joy.h"
 #include "sbar.h"
 #include "hardware.h"
+#include "vm.h"
 
 /*=======================================
  *