Removes unused collor array support, disable bullet in sys/sys.h

1 files changed, 25 insertions, 24 deletions

diff --git a/src/model/map.cc b/src/model/map.cc
index 1d1983c..c2b184f 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -434,13 +434,10 @@ void Map::make_brushface(Plane *face)
 	if (vl.size() > 2) {
 	
 		Material *material = Material::find(face->texture());
-		math::Color color(1.0, 0.0f, 1.0f);
-		if (material) {
-			color.assign(material->color());
-		} else {
+		if (!material) {
 			material = new Material(face->texture());
 			Material::add(material);
-			material->set_color(color);
+			material->set_color(math::Color(1.0, 0.0f, 1.0f));
 			material->set_flags(Material::Bright);
 
 			// don't show material warnings on a dedicated server
@@ -470,8 +467,12 @@ void Map::make_brushface(Plane *face)
 					class_minbbox[i] = (*(*it))[i];
 			}
 		}
-/*		Quads are disable to use model data for bullet physics
-	
+
+
+#ifndef HAVE_BULLET	
+
+		// Quads are disable to use model data for bullet physics 
+
 		// split polygon into quads
 		while (vl.size() > 3) {
 			std::vector<Vector3f *>::iterator v0 = vl.begin();
@@ -485,13 +486,13 @@ void Map::make_brushface(Plane *face)
 			Vector3f n(face->normal()*-1);
 			n.normalize();
 			
-			primitives->add_quad(*(*vn2), *(*vn1), *(*vn), *(*v0), n, color, face->detail());
+			primitives->add_quad(*(*vn2), *(*vn1), *(*vn), *(*v0), n, face->detail());
 			delete(*vn);
 			delete(*vn1);
 			vl.pop_back();
 			vl.pop_back();
 		}
-*/
+#endif
 		// split polygon into triangles
 		while (vl.size() > 2) {
 			std::vector<Vector3f *>::iterator v0 = vl.begin();
@@ -502,7 +503,7 @@ void Map::make_brushface(Plane *face)
 			Vector3f n(face->normal()*-1);
 			n.normalize();
 			
-			primitives->add_triangle(*(*vn1), *(*vn), *(*v0), n, color, face->detail());
+			primitives->add_triangle(*(*vn1), *(*vn), *(*v0), n, face->detail());
 			delete(*vn);
 			vl.pop_back();
 		}
@@ -677,9 +678,9 @@ void Map::load_fragmentgroup(Model *model, const FragmentGroup::Type class_type)
 				Triangle  *triangle = (*tris_it);
 				if (!triangle->detail()) {
 					size_t count = 0;
-					count += fragment->add_vertex(triangle->v0()-map_center, triangle->normal(), triangle->color(), false);
-					count += fragment->add_vertex(triangle->v1()-map_center, triangle->normal(), triangle->color(), false);
-					count += fragment->add_vertex(triangle->v2()-map_center, triangle->normal(), triangle->color(), false);
+					count += fragment->add_vertex(triangle->v0()-map_center, triangle->normal(), false);
+					count += fragment->add_vertex(triangle->v1()-map_center, triangle->normal(), false);
+					count += fragment->add_vertex(triangle->v2()-map_center, triangle->normal(), false);
 					if (count == 3)
 						model->model_tris_count++;
 				}
@@ -690,9 +691,9 @@ void Map::load_fragmentgroup(Model *model, const FragmentGroup::Type class_type)
 				Triangle  *triangle = (*tris_it);
 				if (triangle->detail()) {
 					size_t count = 0;
-					count += fragment->add_vertex(triangle->v0()-map_center, triangle->normal(), triangle->color(), true);
-					count += fragment->add_vertex(triangle->v1()-map_center, triangle->normal(), triangle->color(), true);
-					count += fragment->add_vertex(triangle->v2()-map_center, triangle->normal(), triangle->color(), true);
+					count += fragment->add_vertex(triangle->v0()-map_center, triangle->normal(), true);
+					count += fragment->add_vertex(triangle->v1()-map_center, triangle->normal(), true);
+					count += fragment->add_vertex(triangle->v2()-map_center, triangle->normal(), true);
 					if (count == 3) {
 						model->model_tris_count++;
 						model->model_tris_detail_count++;
@@ -713,10 +714,10 @@ void Map::load_fragmentgroup(Model *model, const FragmentGroup::Type class_type)
 				Quad *quad = (*quad_it);
 				if (!quad->detail()) {
 					size_t count = 0;
-					count += fragment->add_vertex(quad->v0()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v1()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v2()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v3()-map_center, quad->normal(), quad->color(), false);
+					count += fragment->add_vertex(quad->v0()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v1()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v2()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v3()-map_center, quad->normal(), false);
 					if (count == 4)
 						model->model_quad_count++;
 				}
@@ -727,10 +728,10 @@ void Map::load_fragmentgroup(Model *model, const FragmentGroup::Type class_type)
 				Quad *quad = (*quad_it);
 				if (quad->detail()) {
 					size_t count = 0;
-					count += fragment->add_vertex(quad->v0()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v1()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v2()-map_center, quad->normal(), quad->color(), false);
-					count += fragment->add_vertex(quad->v3()-map_center, quad->normal(), quad->color(), false);
+					count += fragment->add_vertex(quad->v0()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v1()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v2()-map_center, quad->normal(), false);
+					count += fragment->add_vertex(quad->v3()-map_center, quad->normal(), false);
 					if (count == 4) {
 						model->model_quad_count++;
 						model->model_quad_detail_count++;