From d55de51b9496a735456305d515193f5e09b40480 Mon Sep 17 00:00:00 2001
From:  <>
Date: Wed, 12 Apr 2017 00:24:54 -0700
Subject: [PATCH] Clean up & headers no longer include libraries.h

---
 ReflexToQ3/includes/brushdef.cpp  |  1 +
 ReflexToQ3/includes/v8mapparser.h | 45 -------------------------------
 ReflexToQ3/includes/worldspawn.h  |  6 ++++-
 3 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 ReflexToQ3/includes/v8mapparser.h

diff --git a/ReflexToQ3/includes/brushdef.cpp b/ReflexToQ3/includes/brushdef.cpp
index 9c49a48..721d003 100644
--- a/ReflexToQ3/includes/brushdef.cpp
+++ b/ReflexToQ3/includes/brushdef.cpp
@@ -1,4 +1,5 @@
 #include "brushdef.hpp"
+#include "libraries.h"
 
 using namespace std;
 // e.g GTK Radiant or older level editors.
diff --git a/ReflexToQ3/includes/v8mapparser.h b/ReflexToQ3/includes/v8mapparser.h
deleted file mode 100644
index e82ecd6..0000000
--- a/ReflexToQ3/includes/v8mapparser.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//	Author:	Michael Cameron
-//	Email:	chronokun@hotmail.com
-//
-
-#pragma once
-
-#ifndef __V8MAPPARSER_H__
-#define __V8MAPPARSER_H__
-
-// Includes
-#include "worldspawn.h"
-#include "libraries.h"
-// enums
-enum EParserState
-{
-	PARSERSTATE_UNKNOWN,    // 0
-	PARSERSTATE_ENTITY,     // 1
-	PARSERSTATE_WORLDSPAWN, // 2
-	PARSERSTATE_BRUSH,      // 3
-	PARSERSTATE_VERTEX,     // 4
-	PARSERSTATE_FACE,       // 5
-    PARSERSTATE_PREFAB      // 6 
-};
-
-class CMapParser
-{
-	// Variables
-public:
-	TWorldSpawn m_WorldSpawn;
-
-	// Functions
-public:
-	const bool LoadMap(const char* _kpcFileName);
-
-protected:
-	EParserState ParsePrefab(const std::string _Line);
-	EParserState ParseEntity(const std::string _Line);
-	EParserState ParseWorldSpawn(const std::string _Line);
-	EParserState ParseBrush(const std::string _Line);
-	EParserState ParseVertex(const std::string _Line);
-	EParserState ParseFace(const std::string _Line);
-};
-
-#endif
\ No newline at end of file
diff --git a/ReflexToQ3/includes/worldspawn.h b/ReflexToQ3/includes/worldspawn.h
index f873f70..2f0ed15 100644
--- a/ReflexToQ3/includes/worldspawn.h
+++ b/ReflexToQ3/includes/worldspawn.h
@@ -5,7 +5,11 @@
 
 #ifndef __WORLDSPAWN_H__
 #define __WORLDSPAWN_H__
-#include "libraries.h"
+
+#include <vector>
+#include <string>
+#include <Eigen/Core>
+
 struct TFace
 {
 	float m_fXOffset;