Merge branch 'master' into ExtraMercs

2026-08-12 14:10:23 +02:00 · 2023-07-26 13:17:49 +03:00
parent 5c13170424 0decb14856
commit 03482ffc3d
754 changed files with 9435 additions and 74371 deletions
@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Laptop All.h"
-#else
 	#include "laptop.h"
 	#include "BobbyRGuns.h"
 	#include "BobbyR.h"
@@ -23,7 +20,6 @@
 	// HEADROCK HAM 4
 	#include "input.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
-#endif


 #define		BOBBYR_DEFAULT_MENU_COLOR					255