From ee1964dde53b0951d78c950451c6bb4fedb17cc6 Mon Sep 17 00:00:00 2001
From: rude <none@none>
Date: Sun, 11 Oct 2009 17:16:00 +0200
Subject: [PATCH] Fixed "kp"-prefix on some keyboard constants.

---
 platform/msvc2008/common/common.vcproj |  8 --------
 platform/msvc2008/sound/sound.vcproj   |  2 +-
 src/modules/event/Event.cpp            | 18 +++++++++---------
 src/modules/keyboard/Keyboard.cpp      | 18 +++++++++---------
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/platform/msvc2008/common/common.vcproj b/platform/msvc2008/common/common.vcproj
index ad2161819..4ac5108a2 100644
--- a/platform/msvc2008/common/common.vcproj
+++ b/platform/msvc2008/common/common.vcproj
@@ -310,14 +310,6 @@
 			RelativePath="..\..\..\src\common\runtime.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\..\src\common\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\..\src\common\string.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\..\src\common\StringMap.h"
 			>
diff --git a/platform/msvc2008/sound/sound.vcproj b/platform/msvc2008/sound/sound.vcproj
index a0cee06ae..1367e7883 100644
--- a/platform/msvc2008/sound/sound.vcproj
+++ b/platform/msvc2008/sound/sound.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static_d.lib libFLAC++_static_d.lib"
+				AdditionalDependencies="libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static.lib libFLAC++_static.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
diff --git a/src/modules/event/Event.cpp b/src/modules/event/Event.cpp
index f809bf06a..ee1884c2b 100644
--- a/src/modules/event/Event.cpp
+++ b/src/modules/event/Event.cpp
@@ -177,15 +177,15 @@ namespace event
 		{"kpenter", love::keyboard::Keyboard::KEY_KP_ENTER},
 		{"kp=", love::keyboard::Keyboard::KEY_KP_EQUALS},
 
-		{"kpup", love::keyboard::Keyboard::KEY_UP},
-		{"kpdown", love::keyboard::Keyboard::KEY_DOWN},
-		{"kpright", love::keyboard::Keyboard::KEY_RIGHT},
-		{"kpleft", love::keyboard::Keyboard::KEY_LEFT},
-		{"kpinsert", love::keyboard::Keyboard::KEY_INSERT},
-		{"kphome", love::keyboard::Keyboard::KEY_HOME},
-		{"kpend", love::keyboard::Keyboard::KEY_END},
-		{"kppageup", love::keyboard::Keyboard::KEY_PAGEUP},
-		{"kppagedown", love::keyboard::Keyboard::KEY_PAGEDOWN},
+		{"up", love::keyboard::Keyboard::KEY_UP},
+		{"down", love::keyboard::Keyboard::KEY_DOWN},
+		{"right", love::keyboard::Keyboard::KEY_RIGHT},
+		{"left", love::keyboard::Keyboard::KEY_LEFT},
+		{"insert", love::keyboard::Keyboard::KEY_INSERT},
+		{"home", love::keyboard::Keyboard::KEY_HOME},
+		{"end", love::keyboard::Keyboard::KEY_END},
+		{"pageup", love::keyboard::Keyboard::KEY_PAGEUP},
+		{"pagedown", love::keyboard::Keyboard::KEY_PAGEDOWN},
 
 		{"f1", love::keyboard::Keyboard::KEY_F1},
 		{"f2", love::keyboard::Keyboard::KEY_F2},
diff --git a/src/modules/keyboard/Keyboard.cpp b/src/modules/keyboard/Keyboard.cpp
index 42e5afed0..ea1c082ab 100644
--- a/src/modules/keyboard/Keyboard.cpp
+++ b/src/modules/keyboard/Keyboard.cpp
@@ -128,15 +128,15 @@ namespace keyboard
 		{"kpenter", Keyboard::KEY_KP_ENTER},
 		{"kp=", Keyboard::KEY_KP_EQUALS},
 
-		{"kpup", Keyboard::KEY_UP},
-		{"kpdown", Keyboard::KEY_DOWN},
-		{"kpright", Keyboard::KEY_RIGHT},
-		{"kpleft", Keyboard::KEY_LEFT},
-		{"kpinsert", Keyboard::KEY_INSERT},
-		{"kphome", Keyboard::KEY_HOME},
-		{"kpend", Keyboard::KEY_END},
-		{"kppageup", Keyboard::KEY_PAGEUP},
-		{"kppagedown", Keyboard::KEY_PAGEDOWN},
+		{"up", Keyboard::KEY_UP},
+		{"down", Keyboard::KEY_DOWN},
+		{"right", Keyboard::KEY_RIGHT},
+		{"left", Keyboard::KEY_LEFT},
+		{"insert", Keyboard::KEY_INSERT},
+		{"home", Keyboard::KEY_HOME},
+		{"end", Keyboard::KEY_END},
+		{"pageup", Keyboard::KEY_PAGEUP},
+		{"pagedown", Keyboard::KEY_PAGEDOWN},
 
 		{"f1", Keyboard::KEY_F1},
 		{"f2", Keyboard::KEY_F2},