- moved DObject and core parts of the VM to 'common'.

# Conflicts: # src/common/objects/dobject.h
2020-04-11 19:21:41 +02:00 · 2020-04-11 19:21:41 +02:00 · f8ac9a2662
commit f8ac9a2662
parent 1a0ace4f88
48 changed files with 403 additions and 349 deletions
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@ -54,7 +54,7 @@
 #include "v_video.h"
 #include "i_system.h"
 #include "c_buttons.h"
-#include "scripting/types.h"
+#include "types.h"
 #include "texturemanager.h"

 int DMenu::InMenu;