From 2e675a40c03e09c866fe974d9572c83a2d04698f Mon Sep 17 00:00:00 2001
From: Bill Meltsner <bill@meltsner.com>
Date: Sun, 8 May 2011 18:41:42 -0400
Subject: [PATCH] do a bit of type cleanup

---
 src/common/runtime.cpp | 3 +--
 src/common/types.h     | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/common/runtime.cpp b/src/common/runtime.cpp
index d0cfe6401..95e9df64d 100644
--- a/src/common/runtime.cpp
+++ b/src/common/runtime.cpp
@@ -381,11 +381,10 @@ namespace love
 		{"Drawable", GRAPHICS_DRAWABLE_ID},
 		{"Image", GRAPHICS_IMAGE_ID},
 		{"Quad", GRAPHICS_QUAD_ID},
-		{"Glyph", GRAPHICS_GLYPH_ID},
 		{"Font", GRAPHICS_FONT_ID},
 		{"ParticleSystem", GRAPHICS_PARTICLE_SYSTEM_ID},
 		{"SpriteBatch", GRAPHICS_SPRITE_BATCH_ID},
-		{"VertexBuffer", GRAPHICS_VERTEX_BUFFER_ID},
+		{"Framebuffer", GRAPHICS_FRAMEBUFFER_ID},
 
 		// Image
 		{"ImageData", IMAGE_IMAGE_DATA_ID},
diff --git a/src/common/types.h b/src/common/types.h
index 7009baa14..bbe0650d5 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -39,7 +39,6 @@ namespace love
 		FILESYSTEM_FILE_DATA_ID,
 
 		// Font
-		FONT_FONT_DATA_ID,
 		FONT_GLYPH_DATA_ID,
 		FONT_RASTERIZER_ID,
 
@@ -47,11 +46,9 @@ namespace love
 		GRAPHICS_DRAWABLE_ID,
 		GRAPHICS_IMAGE_ID,
 		GRAPHICS_QUAD_ID,
-		GRAPHICS_GLYPH_ID,
 		GRAPHICS_FONT_ID,
 		GRAPHICS_PARTICLE_SYSTEM_ID,
 		GRAPHICS_SPRITE_BATCH_ID,
-		GRAPHICS_VERTEX_BUFFER_ID,
 		GRAPHICS_FRAMEBUFFER_ID,
 
 		// Image
@@ -104,7 +101,6 @@ namespace love
 	const bits FILESYSTEM_FILE_T = (bits(1) << FILESYSTEM_FILE_ID) | OBJECT_T;
 	const bits FILESYSTEM_FILE_DATA_T = (bits(1) << FILESYSTEM_FILE_DATA_ID) | DATA_T;
 
-	const bits FONT_FONT_DATA_T = (bits(1) << FONT_FONT_DATA_ID) | DATA_T;
 	const bits FONT_GLYPH_DATA_T = (bits(1) << FONT_GLYPH_DATA_ID) | DATA_T;
 	const bits FONT_RASTERIZER_T = (bits(1) << FONT_RASTERIZER_ID) | OBJECT_T;
 
@@ -112,11 +108,9 @@ namespace love
 	const bits GRAPHICS_DRAWABLE_T = (bits(1) << GRAPHICS_DRAWABLE_ID) | OBJECT_T;
 	const bits GRAPHICS_IMAGE_T = (bits(1) << GRAPHICS_IMAGE_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_QUAD_T = (bits(1) << GRAPHICS_QUAD_ID) | OBJECT_T;
-	const bits GRAPHICS_GLYPH_T = (bits(1) << GRAPHICS_GLYPH_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_FONT_T = (bits(1) << GRAPHICS_FONT_ID) | OBJECT_T;
 	const bits GRAPHICS_PARTICLE_SYSTEM_T = (bits(1) << GRAPHICS_PARTICLE_SYSTEM_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_SPRITE_BATCH_T = (bits(1) << GRAPHICS_SPRITE_BATCH_ID) | GRAPHICS_DRAWABLE_T;
-	const bits GRAPHICS_VERTEX_BUFFER_T = (bits(1) << GRAPHICS_VERTEX_BUFFER_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_FRAMEBUFFER_T = (bits(1) << GRAPHICS_FRAMEBUFFER_ID) | GRAPHICS_DRAWABLE_T;
 
 	// Image.