From fd5b5aad653517d51971fade4e52b8d48995aeb2 Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Wed, 21 May 2014 21:14:08 -0300
Subject: [PATCH] Minor code cleanup

---
 src/common/runtime.h                      |  2 +-
 src/modules/audio/Audio.h                 |  2 +-
 src/modules/audio/Source.h                |  4 ++--
 src/modules/graphics/Graphics.h           | 16 ++++++++--------
 src/modules/graphics/opengl/Font.h        |  2 +-
 src/modules/graphics/opengl/SpriteBatch.h |  2 +-
 src/modules/image/ImageData.h             |  2 +-
 src/scripts/boot.lua                      |  1 -
 src/scripts/boot.lua.h                    |  1 -
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/common/runtime.h b/src/common/runtime.h
index de9c6fbde..dae24f97c 100644
--- a/src/common/runtime.h
+++ b/src/common/runtime.h
@@ -49,7 +49,7 @@ extern void *_gcmutex;
  **/
 enum Registry
 {
-	REGISTRY_GC = 1,
+	REGISTRY_GC,
 	REGISTRY_MODULES,
 	REGISTRY_TYPES
 };
diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h
index 9a8ca863c..7ed9b4362 100644
--- a/src/modules/audio/Audio.h
+++ b/src/modules/audio/Audio.h
@@ -51,7 +51,7 @@ public:
 	 */
 	enum DistanceModel
 	{
-		DISTANCE_NONE = 1,
+		DISTANCE_NONE,
 		DISTANCE_INVERSE,
 		DISTANCE_INVERSE_CLAMPED,
 		DISTANCE_LINEAR,
diff --git a/src/modules/audio/Source.h b/src/modules/audio/Source.h
index 43c5fafca..bf2756b0a 100644
--- a/src/modules/audio/Source.h
+++ b/src/modules/audio/Source.h
@@ -36,14 +36,14 @@ public:
 
 	enum Type
 	{
-		TYPE_STATIC = 1,
+		TYPE_STATIC,
 		TYPE_STREAM,
 		TYPE_MAX_ENUM
 	}; // Type
 
 	enum Unit
 	{
-		UNIT_SECONDS = 1,
+		UNIT_SECONDS,
 		UNIT_SAMPLES,
 		UNIT_MAX_ENUM
 	};
diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h
index 95406e485..00746a8cd 100644
--- a/src/modules/graphics/Graphics.h
+++ b/src/modules/graphics/Graphics.h
@@ -36,14 +36,14 @@ public:
 
 	enum DrawMode
 	{
-		DRAW_LINE = 1,
+		DRAW_LINE,
 		DRAW_FILL,
 		DRAW_MAX_ENUM
 	};
 
 	enum AlignMode
 	{
-		ALIGN_LEFT = 1,
+		ALIGN_LEFT,
 		ALIGN_CENTER,
 		ALIGN_RIGHT,
 		ALIGN_JUSTIFY,
@@ -52,7 +52,7 @@ public:
 
 	enum BlendMode
 	{
-		BLEND_ALPHA = 1,
+		BLEND_ALPHA,
 		BLEND_ADDITIVE,
 		BLEND_SUBTRACTIVE,
 		BLEND_MULTIPLICATIVE,
@@ -64,14 +64,14 @@ public:
 
 	enum LineStyle
 	{
-		LINE_ROUGH = 1,
+		LINE_ROUGH,
 		LINE_SMOOTH,
 		LINE_MAX_ENUM
 	};
 
 	enum LineJoin
 	{
-		LINE_JOIN_NONE = 1,
+		LINE_JOIN_NONE,
 		LINE_JOIN_MITER,
 		LINE_JOIN_BEVEL,
 		LINE_JOIN_MAX_ENUM
@@ -79,14 +79,14 @@ public:
 
 	enum PointStyle
 	{
-		POINT_ROUGH = 1,
+		POINT_ROUGH,
 		POINT_SMOOTH,
 		POINT_MAX_ENUM
 	};
 
 	enum Support
 	{
-		SUPPORT_CANVAS = 1,
+		SUPPORT_CANVAS,
 		SUPPORT_HDR_CANVAS,
 		SUPPORT_MULTI_CANVAS,
 		SUPPORT_SHADER,
@@ -102,7 +102,7 @@ public:
 
 	enum RendererInfo
 	{
-		RENDERER_INFO_NAME = 1,
+		RENDERER_INFO_NAME,
 		RENDERER_INFO_VERSION,
 		RENDERER_INFO_VENDOR,
 		RENDERER_INFO_DEVICE,
diff --git a/src/modules/graphics/opengl/Font.h b/src/modules/graphics/opengl/Font.h
index fee277452..403b0ef45 100644
--- a/src/modules/graphics/opengl/Font.h
+++ b/src/modules/graphics/opengl/Font.h
@@ -142,7 +142,7 @@ private:
 
 	enum FontType
 	{
-		FONT_TRUETYPE = 1,
+		FONT_TRUETYPE,
 		FONT_IMAGE,
 		FONT_UNKNOWN
 	};
diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h
index 7339c7c77..6f87f8fa5 100644
--- a/src/modules/graphics/opengl/SpriteBatch.h
+++ b/src/modules/graphics/opengl/SpriteBatch.h
@@ -52,7 +52,7 @@ public:
 
 	enum UsageHint
 	{
-		USAGE_DYNAMIC = 1,
+		USAGE_DYNAMIC,
 		USAGE_STATIC,
 		USAGE_STREAM,
 		USAGE_MAX_ENUM
diff --git a/src/modules/image/ImageData.h b/src/modules/image/ImageData.h
index f85494d8b..8a0230c20 100644
--- a/src/modules/image/ImageData.h
+++ b/src/modules/image/ImageData.h
@@ -49,7 +49,7 @@ public:
 
 	enum Format
 	{
-		FORMAT_TGA = 1,
+		FORMAT_TGA,
 		FORMAT_BMP,
 		FORMAT_JPG,
 		FORMAT_PNG,
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index faa95a7eb..39ec3b052 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -235,7 +235,6 @@ local no_game_code = false
 function love.boot()
 
 	-- This is absolutely needed.
-	require("love")
 	require("love.filesystem")
 
 	love.arg.parse_options()
diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h
index 5040735bb..88b46ce85 100644
--- a/src/scripts/boot.lua.h
+++ b/src/scripts/boot.lua.h
@@ -422,7 +422,6 @@ const unsigned char boot_lua[] =
 	0x28, 0x29, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 
 	0x74, 0x65, 0x6c, 0x79, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x65, 0x64, 0x2e, 0x0a,
-	0x09, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x22, 0x6c, 0x6f, 0x76, 0x65, 0x22, 0x29, 0x0a,
 	0x09, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x22, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x66, 0x69, 0x6c, 
 	0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x29, 0x0a,
 	0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6f, 0x70,