Commits

Bart van Strien committed 4aaec7a Merge

Merge 'default' into 'minor'

Comments (0)

Files changed (267)

extra/nsis/love.nsi

-!include "MUI.nsh" # Modern look, plxz
+!include "MUI2.nsh" # Modern look, plxz
 
 Name "LOVE"
-OutFile "love-0.5-0.exe"
-Icon "love.ico" # this doesn't seem to work
+
+OutFile ${LOVEEXE}
 
 InstallDir $PROGRAMFILES\LOVE
 InstallDirRegKey HKCU "Software\LOVE" ""
 
 # Graphics
+!define MUI_ICON "love\extra\nsis\love.ico"
+!define MUI_UNICON "love\extra\nsis\love.ico"
 !define MUI_ABORTWARNING
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "top.bmp" # optional
-!define MUI_WELCOMEFINISHPAGE_BITMAP "left.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "left.bmp"
+!define MUI_HEADERIMAGE_BITMAP "love\extra\nsis\top.bmp" # optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "love\extra\nsis\left.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "love\extra\nsis\left.bmp"
+
+!define MUI_WELCOMEPAGE_TITLE "LÖVE Setup"
+!define MUI_WELCOMEPAGE_TEXT "This will install LÖVE, the unquestionably awesome Lua game framework."
 
 # Pages
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\..\license.txt"
+!insertmacro MUI_PAGE_LICENSE "love\license.txt"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
 	SectionIn RO
 	SetOutPath $INSTDIR
-
-	# Program
-	File ..\..\platform\msvc\Release\love.exe
-	
-	# Modules
-	#File ..\..\platform\msvc\Release\love_chipmunk.dll
-	#File ..\..\platform\msvc\Release\love_opengl.dll
-	#File ..\..\platform\msvc\Release\love_physfs.dll
-	#File ..\..\platform\msvc\Release\love_sdlkeyboard.dll
-	#File ..\..\platform\msvc\Release\love_sdlmixer.dll
-	#File ..\..\platform\msvc\Release\love_sdlmouse.dll
-	#File ..\..\platform\msvc\Release\love_sdltimer.dll
-	#File ..\..\platform\msvc\Release\love_system.dll
-	
-	# DLLs
-	File ..\..\platform\msvc\DevIL.dll
-	File ..\..\platform\msvc\ILU.dll
-	File ..\..\platform\msvc\SDL.dll
-	File ..\..\platform\msvc\SDL_mixer.dll
-	File ..\..\platform\msvc\Microsoft.VC80.CRT.manifest
-	File ..\..\platform\msvc\msvcp80.dll
-	File ..\..\platform\msvc\msvcr80.dll
-	
-	# Delete old DLLS (from 0.2.1 - 0.3.1)
-	Delete $INSTDIR\love_chipmunk.dll
-	Delete $INSTDIR\love_opengl.dll
-	Delete $INSTDIR\love_physfs.dll
-	Delete $INSTDIR\love_sdlkeyboard.dll
-	Delete $INSTDIR\love_sdlmixer.dll
-	Delete $INSTDIR\love_sdlmouse.dll
-	Delete $INSTDIR\love_sdltimer.dll
-	Delete $INSTDIR\love_system.dll
-	Delete $INSTDIR\freetype6.dll
-	Delete $INSTDIR\ILUT.dll
-	Delete $INSTDIR\libogg-0.dll
-	Delete $INSTDIR\libvorbis-0.dll
-	Delete $INSTDIR\libvorbisfile-3.dll
-	Delete $INSTDIR\lua5.1.dll
-	Delete $INSTDIR\physfs.dll
-	Delete $INSTDIR\smpeg.dll
-	Delete $INSTDIR\zlib1.dll
-	
-	# Delete old demos.
-	Delete $INSTDIR\demos\kkav.love
-	Delete $INSTDIR\demos\passingclouds.love
-	Delete $INSTDIR\demos\sinescroller.love
-	Delete $INSTDIR\demos\no.love
-	Delete $INSTDIR\demos\particles.love
-
-	# Icons
-	File love.ico
-	File game.ico
-	# Text
-	File ..\..\changes.txt
-	File ..\..\license.txt
-	File ..\..\readme.txt
+	File "love\platform\msvc2010\Release\love.exe"
+	File "love\platform\msvc2010\DevIL.dll"
+	File "love\platform\msvc2010\SDL.dll"
+	File "love\platform\msvc2010\OpenAL32.dll"
+	File "love\extra\nsis\love.ico"
+	File "love\extra\nsis\game.ico"
 
 	# Uninstaller
 	WriteUninstaller $INSTDIR\Uninstall.exe
 
-	# Start Menu
-	# Remove old menu items (from 0.2.0)
-	Delete "$SMPROGRAMS\LOVE\Demos\Animation Demo.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Chinchilla.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Color Blend Demo.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Hello LOVE.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Mouse and Image Basics.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Movement.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Passing Clouds.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Sound.lnk"
-	Delete "$SMPROGRAMS\LOVE\Demos\Text Demo.lnk"
-	RMDir "$SMPROGRAMS\LOVE\Demos"
-	Delete "$SMPROGRAMS\LOVE\LOVE.lnk"
-	Delete "$SMPROGRAMS\LOVE\Uninstall.lnk"
-	Delete "$SMPROGRAMS\LOVE\Documentation.url"
 	# Add new start menu items
 	CreateDirectory "$SMPROGRAMS\LOVE"
 	CreateShortCut "$SMPROGRAMS\LOVE\LOVE.lnk" "$INSTDIR\love.exe"
 	CreateShortCut "$SMPROGRAMS\LOVE\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-	WriteINIStr "$SMPROGRAMS\LOVE\Documentation.url" "InternetShortcut" "URL" "http://love.sourceforge.net/docs/"
+	WriteINIStr "$SMPROGRAMS\LOVE\Documentation.url" "InternetShortcut" "URL" "http://love2d.org/wiki/"
 
 	# Desktop
 	CreateShortCut "$DESKTOP\LOVE.lnk" "$INSTDIR\love.exe" ""
 
 SectionEnd
 
-# Demos
-Section "Demos" Demos
-
-	SetOutPath $INSTDIR\demos
-
-	# Files
-	File ..\..\demos\lovalanche.love
-	File ..\..\demos\no.love
-	File ..\..\demos\particles.love
-
-	# Start menu
-	CreateShortCut "$SMPROGRAMS\LOVE\Demos.lnk" "$INSTDIR\demos"
-
-SectionEnd
-
 # Descriptions
 LangString DESC_MainProg ${LANG_ENGLISH} "Main program."
-LangString DESC_Demos ${LANG_ENGLISH} "A series of demos to show what LOVE can do."
 
 # Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${MainProg} $(DESC_MainProg)
-	!insertmacro MUI_DESCRIPTION_TEXT ${Demos} $(DESC_Demos)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 # Uninstall
 Section "Uninstall"
-
-	# Delete Demos
-	Delete $INSTDIR\demos\lovalanche.love
-	Delete $INSTDIR\demos\no.love
-	Delete $INSTDIR\demos\particles.love
-
-	RMDir $INSTDIR\demos
-	# Program
-	Delete $INSTDIR\love.exe
-	# Modules
-	# Delete $INSTDIR\love_chipmunk.dll
-	# Delete $INSTDIR\love_opengl.dll
-	# Delete $INSTDIR\love_physfs.dll
-	# Delete $INSTDIR\love_sdlkeyboard.dll
-	# Delete $INSTDIR\love_sdlmixer.dll
-	# Delete $INSTDIR\love_sdlmouse.dll
-	# Delete $INSTDIR\love_sdltimer.dll
-	# Delete $INSTDIR\love_system.dll
-	# DLLs
-	Delete $INSTDIR\DevIL.dll
-	Delete $INSTDIR\ILU.dll
-	Delete $INSTDIR\SDL.dll
-	Delete $INSTDIR\SDL_mixer.dll
-	Delete $INSTDIR\Microsoft.VC80.CRT.manifest
-	Delete $INSTDIR\msvcp80.dll
-	Delete $INSTDIR\msvcr80.dll
-	# Icons
-	Delete $INSTDIR\love.ico
-	Delete $INSTDIR\game.ico
-	# Text
-	Delete $INSTDIR\changes.txt
-	Delete $INSTDIR\license.txt
-	Delete $INSTDIR\readme.txt
+	Delete $INSTDIR\"DevIL.dll"
+	Delete $INSTDIR\"SDL.dll"
+	Delete $INSTDIR\"love.exe"
+	Delete $INSTDIR\"OpenAL32.dll"
+	Delete $INSTDIR\"game.ico"
+	Delete $INSTDIR\"love.ico"
 	RMDir $INSTDIR
-
+	
 	# Start menu
-	Delete "$SMPROGRAMS\LOVE\Demos.lnk"
 	Delete "$SMPROGRAMS\LOVE\LOVE.lnk"
 	Delete "$SMPROGRAMS\LOVE\Uninstall.lnk"
 	Delete "$SMPROGRAMS\LOVE\Documentation.url"
 	# Refresh shell icons
 	System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v  (0x08000000, 0, 0, 0)'
 
-SectionEnd
+SectionEnd
-Copyright (c) 2006-2010 LOVE Development Team
+Copyright (c) 2006-2011 LOVE Development Team
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

platform/macosx/love.xcodeproj/project.pbxproj

 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
 				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 					../../src/modules,
 				);
 				LIBRARY_SEARCH_PATHS = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PREBINDING = YES;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				DEPLOYMENT_POSTPROCESSING = NO;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_INPUT_FILETYPE = automatic;
 					../../src,
 					../../src/modules,
 				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";

platform/msvc2010/app.rc

+LANGUAGE 7, 3
+1           ICON         "love.ico"

platform/msvc2010/love.ico

Added
New image

platform/msvc2010/love.vcxproj

     <ClInclude Include="..\..\src\modules\timer\sdl\Timer.h" />
     <ClInclude Include="..\..\src\modules\timer\sdl\wrap_Timer.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="app.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="love.ico" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AED6D87B-9F81-49D0-8C6B-1C9F64421ECC}</ProjectGuid>
     <RootNamespace>love</RootNamespace>

platform/msvc2010/love.vcxproj.filters

       <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="app.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="love.ico" />
+  </ItemGroup>
 </Project>

src/common/Data.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/EnumMap.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_ENUM_MAP_H

src/common/Exception.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/Exception.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/Matrix.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 
 	void Matrix::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy)
 	{
-		// TODO: This works fine, but should consider speeding this up a little.
-		setIdentity();
-		translate(x, y);
-		rotate(angle);
-		scale(sx, sy);
-		translate(-ox, -oy);
+		memset(e, 0, sizeof(float)*16); // zero out matrix
+		float c = cos(angle), s = sin(angle);
+		// matrix multiplication carried out on paper:
+		// |1     x| |c -s    | |sx       | |1     -ox|
+		// |  1   y| |s  c    | |   sy    | |  1   -oy|
+		// |    1  | |     1  | |      1  | |    1    |
+		// |      1| |       1| |        1| |       1 |
+		//   move      rotate      scale       origin
+		e[10] = e[15] = 1.0f;
+		e[0] = sx * c;
+		e[1] = sx * s;
+		e[4] = -sy * s;
+		e[5] = sy * c;
+		e[12] = -ox * e[0] - oy * e[4] + x;
+		e[13] = -ox * e[1] - oy * e[5] + y;
 	}
 
 	void Matrix::translate(float x, float y)

src/common/Matrix.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
+**/
+
 #ifndef LOVE_MATRIX_H
-#define LOVE_MATRIX_H
-
-// LOVE
-#include "math.h"
-
-namespace love
+#define LOVE_MATRIX_H
+
+// LOVE
+#include "math.h"
+
+namespace love
 {
 	/**
 	* This class is the basis for all transformations in LOVE. Althought not

src/common/MemoryData.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/MemoryData.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/Module.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_MODULE_H

src/common/Object.cpp

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 // LOVE

src/common/Object.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_OBJECT_H

src/common/Reference.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/Reference.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_REFERENCE_H

src/common/StringMap.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/Vector.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
+**/
 
 #include "Vector.h"
 

src/common/Vector.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
+**/
+
 #ifndef LOVE_VECTOR_H
-#define LOVE_VECTOR_H
-
+#define LOVE_VECTOR_H
+
 // STD
-#include <cmath>
-
-// LOVE
-#include "Matrix.h"
-
-namespace love
+#include <cmath>
+
+// LOVE
+#include "Matrix.h"
+
+namespace love
 {
 	/**
 	* 2D Vector class.

src/common/b64.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 {
 	static const char cd64[]="|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
 
-	void b64_decode_block(char in[4], char out[3])
-	{   
-		out[0] = (char)(in[0] << 2 | in[1] >> 4);
-		out[1] = (char)(in[1] << 4 | in[2] >> 2);
-		out[2] = (char)(((in[2] << 6) & 0xc0) | in[3]);
+	void b64_decode_block(char in[4], char out[3])
+	{   
+		out[0] = (char)(in[0] << 2 | in[1] >> 4);
+		out[1] = (char)(in[1] << 4 | in[2] >> 2);
+		out[2] = (char)(((in[2] << 6) & 0xc0) | in[3]);
 	}
 
 	char * b64_decode(const char * src, int slen, int & size)
 		char * dst = new char[size];
 		char * d = dst;
 
-		char in[4], out[3], v;
-		int i, len, pos = 0;
-
-		while(pos <= slen)
-		{
-			for(len = 0, i = 0; i < 4 && pos <= slen; i++ )
-			{
-				v = 0;
-
-				while(pos <= slen && v == 0 )
-				{
-					v = src[pos++];
-					v = (char)((v < 43 || v > 122) ? 0 : cd64[v - 43]);
-					if(v)
-						v = (char)((v == '$') ? 0 : v - 61);
-				}
-
-				if(pos <= slen)
-				{
-					len++;
-					if(v)
-						in[i] = (char)(v - 1);
-				}
-				else
-					in[i] = 0;
-			}
-
-			if(len) {
-				b64_decode_block(in, out);
-				for(i = 0; i < len - 1; i++)
-					*(d++) = out[i];
-			}
-		}
+		char in[4], out[3], v;
+		int i, len, pos = 0;
+
+		while(pos <= slen)
+		{
+			for(len = 0, i = 0; i < 4 && pos <= slen; i++ )
+			{
+				v = 0;
+
+				while(pos <= slen && v == 0 )
+				{
+					v = src[pos++];
+					v = (char)((v < 43 || v > 122) ? 0 : cd64[v - 43]);
+					if(v)
+						v = (char)((v == '$') ? 0 : v - 61);
+				}
+
+				if(pos <= slen)
+				{
+					len++;
+					if(v)
+						in[i] = (char)(v - 1);
+				}
+				else
+					in[i] = 0;
+			}
+
+			if(len) {
+				b64_decode_block(in, out);
+				for(i = 0; i < len - 1; i++)
+					*(d++) = out[i];
+			}
+		}
 
 		return dst;
 	}
 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/config.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/math.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#ifndef LOVE_MATH_H
+**/
+
+#ifndef LOVE_MATH_H
 #define LOVE_MATH_H
 
 /* Definitions of useful mathematical constants
 namespace love
 {
 
-struct vertex
-{
-	unsigned char r, g, b, a;
-	float x, y;
-	float s, t;
+struct vertex
+{
+	unsigned char r, g, b, a;
+	float x, y;
+	float s, t;
 };
 
 } // love

src/common/runtime.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 
 	bool luax_toboolean(lua_State * L, int idx)
 	{
-		return (lua_toboolean(L, idx) == 1 ? true : false);
+		return (lua_toboolean(L, idx) != 0);
 	}
 
 	void luax_pushboolean(lua_State * L, bool b)

src/common/runtime.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/types.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/utf8.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/utf8.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/version.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/wrap_Data.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/common/wrap_Data.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/libraries/luasocket/luasocket.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/libraries/luasocket/luasocket.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
+**/
 
 #ifndef LOVE_LUASOCKET_LUASOCKET_H
 #define LOVE_LUASOCKET_LUASOCKET_H
 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/Audio.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/Source.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#include "Source.h"
-
-namespace love
-{
-namespace audio
-{
-	Source::Source(Type type)
-		: type(type)
-	{
-	}
-
-	Source::~Source()
-	{
-	}
-
+**/
+
+#include "Source.h"
+
+namespace love
+{
+namespace audio
+{
+	Source::Source(Type type)
+		: type(type)
+	{
+	}
+
+	Source::~Source()
+	{
+	}
+
 	bool Source::getConstant(const char * in, Type & out)
 	{
 		return types.find(in, out);
 	}
 
-	bool Source::getConstant(Type in, const char *& out)
-	{
-		return types.find(in, out);
-	}
-
+	bool Source::getConstant(Type in, const char *& out)
+	{
+		return types.find(in, out);
+	}
+
 	StringMap<Source::Type, Source::TYPE_MAX_ENUM>::Entry Source::typeEntries[] =
 	{
 		{"static", Source::TYPE_STATIC},
 		{"stream", Source::TYPE_STREAM},
 	};
 
-	StringMap<Source::Type, Source::TYPE_MAX_ENUM> Source::types(Source::typeEntries, sizeof(Source::typeEntries));
-
-} // audio
-} // love
+	StringMap<Source::Type, Source::TYPE_MAX_ENUM> Source::types(Source::typeEntries, sizeof(Source::typeEntries));
+
+} // audio
+} // love

src/modules/audio/Source.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
+**/
+
 #ifndef LOVE_AUDIO_SOURCE_H
 #define LOVE_AUDIO_SOURCE_H
 

src/modules/audio/null/Audio.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/null/Audio.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/null/Source.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/null/Source.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 * 2. Altered source versions must be plainly marked as such, and must not be
 *    misrepresented as being the original software.
 * 3. This notice may not be removed or altered from any source distribution.
-**/
-
+**/
+
 #ifndef LOVE_AUDIO_NULL_SOURCE_H
 #define LOVE_AUDIO_NULL_SOURCE_H
 
 		virtual void setVelocity(float * v);
 		virtual void getVelocity(float * v) const;
 		virtual void setDirection(float * v);
-		virtual void getDirection(float * v) const;
+		virtual void getDirection(float * v) const;
 		void setLooping(bool looping);
 		bool isLooping() const;
 		bool isStatic() const;

src/modules/audio/openal/Audio.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/openal/Audio.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/openal/Pool.cpp

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #include "Pool.h"
 
 #include "Source.h"
 
-#define MUTEX_ASSERT(fn, sval) \
-	if(fn != sval) \
-	{ \
+#define MUTEX_ASSERT(fn, sval) \
+	if(fn != sval) \
+	{ \
 		std::cout << "Mutex lock/unlock failure. " << SDL_GetError() << std::endl; \
-		exit(-1); \
+		exit(-1); \
 	} \
 
 #define LOCK(m) MUTEX_ASSERT(SDL_LockMutex(m), 0)

src/modules/audio/openal/Pool.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/openal/Source.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 
 	void Source::stop()
 	{
-		pool->stop(this);
+		if (!isStopped())
+			pool->stop(this);
 	}
 
 	void Source::pause()

src/modules/audio/openal/Source.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 		Source(Pool * pool, love::sound::Decoder * decoder);
 		virtual ~Source();
 
-		virtual love::audio::Source * copy();
-		virtual void play();
-		virtual void stop();
-		virtual void pause();
-		virtual void resume();
-		virtual void rewind();
+		virtual love::audio::Source * copy();
+		virtual void play();
+		virtual void stop();
+		virtual void pause();
+		virtual void resume();
+		virtual void rewind();
 		virtual bool isStopped() const;
-		virtual bool isPaused() const;
-		virtual bool isFinished() const;
-		virtual void update();
-		virtual void setPitch(float pitch);
-		virtual float getPitch() const;
-		virtual void setVolume(float volume);
-		virtual float getVolume() const;
-		virtual void setPosition(float * v);
-		virtual void getPosition(float * v) const;
-		virtual void setVelocity(float * v);
-		virtual void getVelocity(float * v) const;
-		virtual void setDirection(float * v);
+		virtual bool isPaused() const;
+		virtual bool isFinished() const;
+		virtual void update();
+		virtual void setPitch(float pitch);
+		virtual float getPitch() const;
+		virtual void setVolume(float volume);
+		virtual float getVolume() const;
+		virtual void setPosition(float * v);
+		virtual void getPosition(float * v) const;
+		virtual void setVelocity(float * v);
+		virtual void getVelocity(float * v) const;
+		virtual void setDirection(float * v);
 		virtual void getDirection(float * v) const;
-		void setLooping(bool looping);
+		void setLooping(bool looping);
 		bool isLooping() const;
 		bool isStatic() const;
 

src/modules/audio/wrap_Audio.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/wrap_Audio.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/wrap_Source.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/audio/wrap_Source.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/event/Event.cpp

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #include "Event.h"

src/modules/event/Event.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_EVENT_EVENT_H

src/modules/event/sdl/Event.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 		case SDL_ACTIVEEVENT:
 			if (e.active.state & SDL_APPINPUTFOCUS) {
 				m.type = Event::TYPE_FOCUS;
-				m.focus.f = e.active.gain;
+				m.focus.f = (e.active.gain != 0);
 				return true;
 			} else break;
 		case SDL_QUIT:

src/modules/event/sdl/Event.h

-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2011 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 
 #ifndef LOVE_EVENT_SDL_EVENT_H
 #include <common/runtime.h>
 #include <common/EnumMap.h>
 
-// SDL
+// SDL
 #include <SDL.h>
 
 namespace love
 		* the screen and game state only needs updating when the user interacts with
 		* the window.
 		**/
-		bool wait(Message & message);
-
-		/**
-		* Push a message onto the event queue.
-		* 
-		* @param message The message to push onto the queue.
-		* @return True on success, false if the queue was full. 
-		**/
-		bool push(Message & message);
+		bool wait(Message & message);
+
+		/**
+		* Push a message onto the event queue.
+		* 
+		* @param message The message to push onto the queue.
+		* @return True on success, false if the queue was full. 
+		**/
+		bool push(Message & message);
 
 	private:
 

src/modules/event/sdl/wrap_Event.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 *
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 			msg.joystick.button = luaL_checkint(L, 3);
 			return true;
 		case Event::TYPE_FOCUS:
-			msg.focus.f = lua_toboolean(L, 2);
+			msg.focus.f = luax_toboolean(L, 2);
 			return true;
 		case Event::TYPE_QUIT:
 			return true;

src/modules/event/sdl/wrap_Event.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/filesystem/File.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 {
 	File::~File()
 	{
-	}
-
-	bool File::getConstant(const char * in, Mode & out)
-	{
-		return modes.find(in, out);
-	}
-
-	bool File::getConstant(Mode in, const char *& out)
-	{
-		return modes.find(in, out);
-	}
-
-	StringMap<File::Mode, File::MODE_MAX_ENUM>::Entry File::modeEntries[] = 
-	{
-		{"c", File::CLOSED},
+	}
+
+	bool File::getConstant(const char * in, Mode & out)
+	{
+		return modes.find(in, out);
+	}
+
+	bool File::getConstant(Mode in, const char *& out)
+	{
+		return modes.find(in, out);
+	}
+
+	StringMap<File::Mode, File::MODE_MAX_ENUM>::Entry File::modeEntries[] = 
+	{
+		{"c", File::CLOSED},
 		{"r", File::READ},
 		{"w", File::WRITE},
-		{"a", File::APPEND},
-	};
-
-	StringMap<File::Mode, File::MODE_MAX_ENUM> File::modes(File::modeEntries, sizeof(File::modeEntries));
+		{"a", File::APPEND},
+	};
+
+	StringMap<File::Mode, File::MODE_MAX_ENUM> File::modes(File::modeEntries, sizeof(File::modeEntries));
 
 } // filesystem
 } // love

src/modules/filesystem/File.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 		**/
 		virtual std::string getExtension() const = 0;
 
-		static bool getConstant(const char * in, Mode & out);
-		static bool getConstant(Mode in, const char *& out);
-
-	private:
-
-		static StringMap<Mode, MODE_MAX_ENUM>::Entry modeEntries[];
+		static bool getConstant(const char * in, Mode & out);
+		static bool getConstant(Mode in, const char *& out);
+
+	private:
+
+		static StringMap<Mode, MODE_MAX_ENUM>::Entry modeEntries[];
 		static StringMap<Mode, MODE_MAX_ENUM> modes;
 
 	}; // File

src/modules/filesystem/FileData.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 		return extension;
 	}
 
-	bool FileData::getConstant(const char * in, Decoder & out)
-	{
-		return decoders.find(in, out);
-	}
-
-	bool FileData::getConstant(Decoder in, const char *& out)
-	{
-		return decoders.find(in, out);
+	bool FileData::getConstant(const char * in, Decoder & out)
+	{
+		return decoders.find(in, out);
 	}
 
-	StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM>::Entry FileData::decoderEntries[] = 
-	{
-		{"file", FileData::FILE},
-		{"base64", FileData::BASE64},
-	};
-
+	bool FileData::getConstant(Decoder in, const char *& out)
+	{
+		return decoders.find(in, out);
+	}
+
+	StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM>::Entry FileData::decoderEntries[] = 
+	{
+		{"file", FileData::FILE},
+		{"base64", FileData::BASE64},
+	};
+
 	StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM> FileData::decoders(FileData::decoderEntries, sizeof(FileData::decoderEntries));
 
 } // filesystem

src/modules/filesystem/FileData.h

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages
 		const std::string & getFilename() const;
 		const std::string & getExtension() const;
 
-		static bool getConstant(const char * in, Decoder & out);
+		static bool getConstant(const char * in, Decoder & out);
 		static bool getConstant(Decoder in, const char *& out);
 
 	private:
 
-		static StringMap<Decoder, DECODE_MAX_ENUM>::Entry decoderEntries[];
+		static StringMap<Decoder, DECODE_MAX_ENUM>::Entry decoderEntries[];
 		static StringMap<Decoder, DECODE_MAX_ENUM> decoders;
 
 	}; // FileData

src/modules/filesystem/physfs/File.cpp

 /**
-* Copyright (c) 2006-2010 LOVE Development Team
+* Copyright (c) 2006-2011 LOVE Development Team
 * 
 * This software is provided 'as-is', without any express or implied
 * warranty.  In no event will the authors be held liable for any damages

src/modules/filesystem/physfs/File.h

 /**