From e47dab84f3f6606d6d6e95774b16d7d4e8d7daa6 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 25 Apr 2014 09:56:15 -0700
Subject: Cmake generated projects for IDEs include headers in project files.

---
 src/Generating/CMakeLists.txt         | 1 +
 src/Generating/Prefabs/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/Generating')

diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index 1147744c0..3dacb5066 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 file(GLOB SOURCE
     "*.cpp"
+    "*.h"
 )
 
 add_library(Generating ${SOURCE})
diff --git a/src/Generating/Prefabs/CMakeLists.txt b/src/Generating/Prefabs/CMakeLists.txt
index 1e60447e7..a1f09112d 100644
--- a/src/Generating/Prefabs/CMakeLists.txt
+++ b/src/Generating/Prefabs/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../../")
 
 file(GLOB SOURCE
     "*.cpp"
+    "*.h"
 )
 
 add_library(Generating_Prefabs ${SOURCE})
-- 
cgit v1.2.3


From 25d933883a24c97b67f90ae6839ce3d6b8d630d5 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sun, 27 Apr 2014 13:07:21 -0700
Subject: Removed unneeded assert Fixed CID 43610

---
 src/Generating/Prefab.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Generating')

diff --git a/src/Generating/Prefab.cpp b/src/Generating/Prefab.cpp
index c0c9e8a13..44d5097de 100644
--- a/src/Generating/Prefab.cpp
+++ b/src/Generating/Prefab.cpp
@@ -283,7 +283,7 @@ void cPrefab::ParseCharMap(CharMap & a_CharMapOut, const char * a_CharMapDef)
 		if ((NumElements >= 3) && !CharDef[2].empty())
 		{
 			BlockMeta = (NIBBLETYPE)atoi(CharDef[2].c_str());
-			ASSERT((BlockMeta >= 0) && (BlockMeta <= 15));
+			ASSERT((BlockMeta <= 15));
 		}
 		a_CharMapOut[Src].m_BlockMeta = BlockMeta;
 	}  // for itr - Lines[]
-- 
cgit v1.2.3