diff --git a/src/common/Data.h b/src/common/Data.h index e19bd37cc..4d9f1fff3 100644 --- a/src/common/Data.h +++ b/src/common/Data.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/EnumMap.h b/src/common/EnumMap.h index 4281a868c..c86f9fe33 100644 --- a/src/common/EnumMap.h +++ b/src/common/EnumMap.h @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/common/Exception.cpp b/src/common/Exception.cpp index fa9d9b416..6ef8b2819 100644 --- a/src/common/Exception.cpp +++ b/src/common/Exception.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Exception.h b/src/common/Exception.h index ed974a5a6..15a233f7e 100644 --- a/src/common/Exception.h +++ b/src/common/Exception.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Matrix.cpp b/src/common/Matrix.cpp index d9e15294d..e4980ba38 100644 --- a/src/common/Matrix.cpp +++ b/src/common/Matrix.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Matrix.h b/src/common/Matrix.h index 6d57a9e63..db8390ff3 100644 --- a/src/common/Matrix.h +++ b/src/common/Matrix.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,15 +16,15 @@ * 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 diff --git a/src/common/MemoryData.cpp b/src/common/MemoryData.cpp index 788c929e3..3ec1172bb 100644 --- a/src/common/MemoryData.cpp +++ b/src/common/MemoryData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/MemoryData.h b/src/common/MemoryData.h index 0ca8d5f64..8b7895fbe 100644 --- a/src/common/MemoryData.h +++ b/src/common/MemoryData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Module.h b/src/common/Module.h index 29ab1e75a..4dee090a5 100644 --- a/src/common/Module.h +++ b/src/common/Module.h @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/common/Object.cpp b/src/common/Object.cpp index 7976d57fa..8c145347a 100644 --- a/src/common/Object.cpp +++ b/src/common/Object.cpp @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/common/Object.h b/src/common/Object.h index 1eb5e3192..c1ff45fa3 100644 --- a/src/common/Object.h +++ b/src/common/Object.h @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/common/Reference.cpp b/src/common/Reference.cpp index 9f1cbd9a6..7dbcef95a 100644 --- a/src/common/Reference.cpp +++ b/src/common/Reference.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Reference.h b/src/common/Reference.h index 062585d7f..132e48aa3 100644 --- a/src/common/Reference.h +++ b/src/common/Reference.h @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/common/StringMap.h b/src/common/StringMap.h index d83f7f6be..ff3f9e8a0 100644 --- a/src/common/StringMap.h +++ b/src/common/StringMap.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/Vector.cpp b/src/common/Vector.cpp index 2bfe3969d..c2bce3558 100644 --- a/src/common/Vector.cpp +++ b/src/common/Vector.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,7 +16,7 @@ * 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" diff --git a/src/common/Vector.h b/src/common/Vector.h index 980967810..6638e5d3a 100644 --- a/src/common/Vector.h +++ b/src/common/Vector.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,18 +16,18 @@ * 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 - -// LOVE -#include "Matrix.h" - -namespace love +#include + +// LOVE +#include "Matrix.h" + +namespace love { /** * 2D Vector class. diff --git a/src/common/b64.cpp b/src/common/b64.cpp index 8b7fe58f3..bf1dba11b 100644 --- a/src/common/b64.cpp +++ b/src/common/b64.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -24,11 +24,11 @@ namespace love { 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) @@ -38,39 +38,39 @@ namespace love 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; } diff --git a/src/common/b64.h b/src/common/b64.h index 36bfc6af2..7ccd8c049 100644 --- a/src/common/b64.h +++ b/src/common/b64.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/config.h b/src/common/config.h index 635a4ee41..510ee012c 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/math.h b/src/common/math.h index 45ededfa2..4115f44d7 100644 --- a/src/common/math.h +++ b/src/common/math.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,9 +16,9 @@ * 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 @@ -58,11 +58,11 @@ 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 diff --git a/src/common/runtime.cpp b/src/common/runtime.cpp index 67563faf0..67614966a 100644 --- a/src/common/runtime.cpp +++ b/src/common/runtime.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/runtime.h b/src/common/runtime.h index 9c07d1086..4c973031c 100644 --- a/src/common/runtime.h +++ b/src/common/runtime.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/types.h b/src/common/types.h index 08ea9b7c7..7009baa14 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp index dd7512bc9..df702fa2c 100644 --- a/src/common/utf8.cpp +++ b/src/common/utf8.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/utf8.h b/src/common/utf8.h index d70e52873..2ec5c9df4 100644 --- a/src/common/utf8.h +++ b/src/common/utf8.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/version.h b/src/common/version.h index e1a76f9b0..ad3f42f0e 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/wrap_Data.cpp b/src/common/wrap_Data.cpp index 21d90c7f7..dc8da7e1f 100644 --- a/src/common/wrap_Data.cpp +++ b/src/common/wrap_Data.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/common/wrap_Data.h b/src/common/wrap_Data.h index 72f3ce6e4..6d1360c45 100644 --- a/src/common/wrap_Data.h +++ b/src/common/wrap_Data.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/libraries/luasocket/luasocket.cpp b/src/libraries/luasocket/luasocket.cpp index 5996a00c5..8c5fc23e7 100644 --- a/src/libraries/luasocket/luasocket.cpp +++ b/src/libraries/luasocket/luasocket.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/libraries/luasocket/luasocket.h b/src/libraries/luasocket/luasocket.h index 8c6af95a8..493851ace 100644 --- a/src/libraries/luasocket/luasocket.h +++ b/src/libraries/luasocket/luasocket.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,7 +16,7 @@ * 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 diff --git a/src/love.cpp b/src/love.cpp index f1222bc6d..1b0618faf 100644 --- a/src/love.cpp +++ b/src/love.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h index 4fc31f8ab..b784c6c18 100644 --- a/src/modules/audio/Audio.h +++ b/src/modules/audio/Audio.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/Source.cpp b/src/modules/audio/Source.cpp index b635cf525..363e4b998 100644 --- a/src/modules/audio/Source.cpp +++ b/src/modules/audio/Source.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,40 +16,40 @@ * 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::Entry Source::typeEntries[] = { {"static", Source::TYPE_STATIC}, {"stream", Source::TYPE_STREAM}, }; - StringMap Source::types(Source::typeEntries, sizeof(Source::typeEntries)); - -} // audio -} // love + StringMap Source::types(Source::typeEntries, sizeof(Source::typeEntries)); + +} // audio +} // love diff --git a/src/modules/audio/Source.h b/src/modules/audio/Source.h index 4bcfa67d4..9d022337e 100644 --- a/src/modules/audio/Source.h +++ b/src/modules/audio/Source.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,8 +16,8 @@ * 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 diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp index d33608f42..6e4805846 100644 --- a/src/modules/audio/null/Audio.cpp +++ b/src/modules/audio/null/Audio.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h index 676240a1b..663d9029e 100644 --- a/src/modules/audio/null/Audio.h +++ b/src/modules/audio/null/Audio.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/null/Source.cpp b/src/modules/audio/null/Source.cpp index 2a0f26cad..c38281d84 100644 --- a/src/modules/audio/null/Source.cpp +++ b/src/modules/audio/null/Source.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/null/Source.h b/src/modules/audio/null/Source.h index 5c64ff5f4..a1be54a7e 100644 --- a/src/modules/audio/null/Source.h +++ b/src/modules/audio/null/Source.h @@ -1,5 +1,5 @@ /** -* 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 @@ -16,8 +16,8 @@ * 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 @@ -62,7 +62,7 @@ namespace null 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; diff --git a/src/modules/audio/openal/Audio.cpp b/src/modules/audio/openal/Audio.cpp index 3fa411812..ab29346b8 100644 --- a/src/modules/audio/openal/Audio.cpp +++ b/src/modules/audio/openal/Audio.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index 3ba7ed6c3..0a71e20a9 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/openal/Pool.cpp b/src/modules/audio/openal/Pool.cpp index 7ac0a2723..74a6f3fe4 100644 --- a/src/modules/audio/openal/Pool.cpp +++ b/src/modules/audio/openal/Pool.cpp @@ -1,32 +1,32 @@ -/** -* 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) diff --git a/src/modules/audio/openal/Pool.h b/src/modules/audio/openal/Pool.h index 7f55bc698..f83b5002d 100644 --- a/src/modules/audio/openal/Pool.h +++ b/src/modules/audio/openal/Pool.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/openal/Source.cpp b/src/modules/audio/openal/Source.cpp index 931519fed..9392fbaac 100644 --- a/src/modules/audio/openal/Source.cpp +++ b/src/modules/audio/openal/Source.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h index 1698b4ebc..ba7c14d41 100644 --- a/src/modules/audio/openal/Source.h +++ b/src/modules/audio/openal/Source.h @@ -1,5 +1,5 @@ /** -* 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 @@ -70,27 +70,27 @@ namespace openal 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; diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp index 34d58750d..02a687bd8 100644 --- a/src/modules/audio/wrap_Audio.cpp +++ b/src/modules/audio/wrap_Audio.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/wrap_Audio.h b/src/modules/audio/wrap_Audio.h index 90908e3ce..e6d0a2518 100644 --- a/src/modules/audio/wrap_Audio.h +++ b/src/modules/audio/wrap_Audio.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/wrap_Source.cpp b/src/modules/audio/wrap_Source.cpp index 7ed1208c6..bc55ad7ed 100644 --- a/src/modules/audio/wrap_Source.cpp +++ b/src/modules/audio/wrap_Source.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/audio/wrap_Source.h b/src/modules/audio/wrap_Source.h index 5a35363c9..8167e4850 100644 --- a/src/modules/audio/wrap_Source.h +++ b/src/modules/audio/wrap_Source.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/event/Event.cpp b/src/modules/event/Event.cpp index 127b49b71..51cbc08f6 100644 --- a/src/modules/event/Event.cpp +++ b/src/modules/event/Event.cpp @@ -1,21 +1,21 @@ -/** -* 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" diff --git a/src/modules/event/Event.h b/src/modules/event/Event.h index 26e855102..eec9f6337 100644 --- a/src/modules/event/Event.h +++ b/src/modules/event/Event.h @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp index 99046d489..a288ca166 100644 --- a/src/modules/event/sdl/Event.cpp +++ b/src/modules/event/sdl/Event.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/event/sdl/Event.h b/src/modules/event/sdl/Event.h index 32e51a993..1502bc57e 100644 --- a/src/modules/event/sdl/Event.h +++ b/src/modules/event/sdl/Event.h @@ -1,21 +1,21 @@ -/** -* 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 @@ -26,7 +26,7 @@ #include #include -// SDL +// SDL #include namespace love @@ -64,15 +64,15 @@ namespace sdl * 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: diff --git a/src/modules/event/sdl/wrap_Event.cpp b/src/modules/event/sdl/wrap_Event.cpp index c154ed23f..77b4e6fe5 100644 --- a/src/modules/event/sdl/wrap_Event.cpp +++ b/src/modules/event/sdl/wrap_Event.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/event/sdl/wrap_Event.h b/src/modules/event/sdl/wrap_Event.h index 612910880..107a0ace9 100644 --- a/src/modules/event/sdl/wrap_Event.h +++ b/src/modules/event/sdl/wrap_Event.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/File.cpp b/src/modules/filesystem/File.cpp index e12dbeba4..63825145d 100644 --- a/src/modules/filesystem/File.cpp +++ b/src/modules/filesystem/File.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -26,27 +26,27 @@ namespace filesystem { 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::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::Entry File::modeEntries[] = + { + {"c", File::CLOSED}, {"r", File::READ}, {"w", File::WRITE}, - {"a", File::APPEND}, - }; - - StringMap File::modes(File::modeEntries, sizeof(File::modeEntries)); + {"a", File::APPEND}, + }; + + StringMap File::modes(File::modeEntries, sizeof(File::modeEntries)); } // filesystem } // love diff --git a/src/modules/filesystem/File.h b/src/modules/filesystem/File.h index 0ebf93c38..c0a136082 100644 --- a/src/modules/filesystem/File.h +++ b/src/modules/filesystem/File.h @@ -1,5 +1,5 @@ /** -* 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 @@ -160,12 +160,12 @@ namespace filesystem **/ 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::Entry modeEntries[]; + static bool getConstant(const char * in, Mode & out); + static bool getConstant(Mode in, const char *& out); + + private: + + static StringMap::Entry modeEntries[]; static StringMap modes; }; // File diff --git a/src/modules/filesystem/FileData.cpp b/src/modules/filesystem/FileData.cpp index 8420b356c..cee6dfb39 100644 --- a/src/modules/filesystem/FileData.cpp +++ b/src/modules/filesystem/FileData.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -59,22 +59,22 @@ namespace filesystem 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::Entry FileData::decoderEntries[] = - { - {"file", FileData::FILE}, - {"base64", FileData::BASE64}, - }; - + bool FileData::getConstant(Decoder in, const char *& out) + { + return decoders.find(in, out); + } + + StringMap::Entry FileData::decoderEntries[] = + { + {"file", FileData::FILE}, + {"base64", FileData::BASE64}, + }; + StringMap FileData::decoders(FileData::decoderEntries, sizeof(FileData::decoderEntries)); } // filesystem diff --git a/src/modules/filesystem/FileData.h b/src/modules/filesystem/FileData.h index 8fffbdcbb..42100761e 100644 --- a/src/modules/filesystem/FileData.h +++ b/src/modules/filesystem/FileData.h @@ -1,5 +1,5 @@ /** -* 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 @@ -66,12 +66,12 @@ namespace filesystem 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::Entry decoderEntries[]; + static StringMap::Entry decoderEntries[]; static StringMap decoders; }; // FileData diff --git a/src/modules/filesystem/physfs/File.cpp b/src/modules/filesystem/physfs/File.cpp index b436bc193..fecd585f1 100644 --- a/src/modules/filesystem/physfs/File.cpp +++ b/src/modules/filesystem/physfs/File.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/File.h b/src/modules/filesystem/physfs/File.h index d87ed7481..6cb7e5509 100644 --- a/src/modules/filesystem/physfs/File.h +++ b/src/modules/filesystem/physfs/File.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/Filesystem.cpp b/src/modules/filesystem/physfs/Filesystem.cpp index 919e200d4..b7fa2aecb 100644 --- a/src/modules/filesystem/physfs/Filesystem.cpp +++ b/src/modules/filesystem/physfs/Filesystem.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/Filesystem.h b/src/modules/filesystem/physfs/Filesystem.h index 94e5bf32f..36383c59f 100644 --- a/src/modules/filesystem/physfs/Filesystem.h +++ b/src/modules/filesystem/physfs/Filesystem.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_File.cpp b/src/modules/filesystem/physfs/wrap_File.cpp index 12c3e2bc2..f8649b31a 100644 --- a/src/modules/filesystem/physfs/wrap_File.cpp +++ b/src/modules/filesystem/physfs/wrap_File.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_File.h b/src/modules/filesystem/physfs/wrap_File.h index 7e43bfd56..c012ac343 100644 --- a/src/modules/filesystem/physfs/wrap_File.h +++ b/src/modules/filesystem/physfs/wrap_File.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_FileData.cpp b/src/modules/filesystem/physfs/wrap_FileData.cpp index de441f34d..d985b2848 100644 --- a/src/modules/filesystem/physfs/wrap_FileData.cpp +++ b/src/modules/filesystem/physfs/wrap_FileData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_FileData.h b/src/modules/filesystem/physfs/wrap_FileData.h index 5f0a31f77..9f1cf410b 100644 --- a/src/modules/filesystem/physfs/wrap_FileData.h +++ b/src/modules/filesystem/physfs/wrap_FileData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_Filesystem.cpp b/src/modules/filesystem/physfs/wrap_Filesystem.cpp index fe6ef0d6b..3cfad6eb0 100644 --- a/src/modules/filesystem/physfs/wrap_Filesystem.cpp +++ b/src/modules/filesystem/physfs/wrap_Filesystem.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/filesystem/physfs/wrap_Filesystem.h b/src/modules/filesystem/physfs/wrap_Filesystem.h index f11b5c48e..30d3e9b99 100644 --- a/src/modules/filesystem/physfs/wrap_Filesystem.h +++ b/src/modules/filesystem/physfs/wrap_Filesystem.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/Font.h b/src/modules/font/Font.h index 63905101d..788796ec9 100644 --- a/src/modules/font/Font.h +++ b/src/modules/font/Font.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/FontData.cpp b/src/modules/font/FontData.cpp index fb5dd4ba3..726d6c18b 100644 --- a/src/modules/font/FontData.cpp +++ b/src/modules/font/FontData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/FontData.h b/src/modules/font/FontData.h index 23d238dbd..18be20a90 100644 --- a/src/modules/font/FontData.h +++ b/src/modules/font/FontData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/GlyphData.cpp b/src/modules/font/GlyphData.cpp index 9ac202a8c..1f9f16944 100644 --- a/src/modules/font/GlyphData.cpp +++ b/src/modules/font/GlyphData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/GlyphData.h b/src/modules/font/GlyphData.h index c7a59e7ba..440e00fb4 100644 --- a/src/modules/font/GlyphData.h +++ b/src/modules/font/GlyphData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/ImageRasterizer.cpp b/src/modules/font/ImageRasterizer.cpp index 674bf8273..94cca67b6 100644 --- a/src/modules/font/ImageRasterizer.cpp +++ b/src/modules/font/ImageRasterizer.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/ImageRasterizer.h b/src/modules/font/ImageRasterizer.h index 6639f9422..caf714388 100644 --- a/src/modules/font/ImageRasterizer.h +++ b/src/modules/font/ImageRasterizer.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/Rasterizer.cpp b/src/modules/font/Rasterizer.cpp index 90bb39ce2..818c086bb 100644 --- a/src/modules/font/Rasterizer.cpp +++ b/src/modules/font/Rasterizer.cpp @@ -1,21 +1,21 @@ -/** -* 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 diff --git a/src/modules/font/Rasterizer.h b/src/modules/font/Rasterizer.h index aced727ce..7f91d4675 100644 --- a/src/modules/font/Rasterizer.h +++ b/src/modules/font/Rasterizer.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/Font.cpp b/src/modules/font/freetype/Font.cpp index 26ee0fc12..ac87570f9 100644 --- a/src/modules/font/freetype/Font.cpp +++ b/src/modules/font/freetype/Font.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/Font.h b/src/modules/font/freetype/Font.h index 6472837d1..a98778f23 100644 --- a/src/modules/font/freetype/Font.h +++ b/src/modules/font/freetype/Font.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/TrueTypeRasterizer.cpp b/src/modules/font/freetype/TrueTypeRasterizer.cpp index 7d071cfdd..cf0cc0dd5 100644 --- a/src/modules/font/freetype/TrueTypeRasterizer.cpp +++ b/src/modules/font/freetype/TrueTypeRasterizer.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/TrueTypeRasterizer.h b/src/modules/font/freetype/TrueTypeRasterizer.h index 4c8492338..6fc13db0b 100644 --- a/src/modules/font/freetype/TrueTypeRasterizer.h +++ b/src/modules/font/freetype/TrueTypeRasterizer.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/wrap_Font.cpp b/src/modules/font/freetype/wrap_Font.cpp index 03f6b9e31..207c49092 100644 --- a/src/modules/font/freetype/wrap_Font.cpp +++ b/src/modules/font/freetype/wrap_Font.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/freetype/wrap_Font.h b/src/modules/font/freetype/wrap_Font.h index d776f2159..5a7ca90c9 100644 --- a/src/modules/font/freetype/wrap_Font.h +++ b/src/modules/font/freetype/wrap_Font.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_FontData.cpp b/src/modules/font/wrap_FontData.cpp index 75ba11eb1..2d4da4fc9 100644 --- a/src/modules/font/wrap_FontData.cpp +++ b/src/modules/font/wrap_FontData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_FontData.h b/src/modules/font/wrap_FontData.h index a66ea7e49..7e5ef649d 100644 --- a/src/modules/font/wrap_FontData.h +++ b/src/modules/font/wrap_FontData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_GlyphData.cpp b/src/modules/font/wrap_GlyphData.cpp index 73c9aa462..9d4474ffe 100644 --- a/src/modules/font/wrap_GlyphData.cpp +++ b/src/modules/font/wrap_GlyphData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_GlyphData.h b/src/modules/font/wrap_GlyphData.h index c9a888d4d..2663fef28 100644 --- a/src/modules/font/wrap_GlyphData.h +++ b/src/modules/font/wrap_GlyphData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_Rasterizer.cpp b/src/modules/font/wrap_Rasterizer.cpp index 6441916ad..afa374126 100644 --- a/src/modules/font/wrap_Rasterizer.cpp +++ b/src/modules/font/wrap_Rasterizer.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/font/wrap_Rasterizer.h b/src/modules/font/wrap_Rasterizer.h index 0a7934283..dfbd62450 100644 --- a/src/modules/font/wrap_Rasterizer.h +++ b/src/modules/font/wrap_Rasterizer.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/Drawable.cpp b/src/modules/graphics/Drawable.cpp index e01cbe899..661fd3024 100644 --- a/src/modules/graphics/Drawable.cpp +++ b/src/modules/graphics/Drawable.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,18 +16,18 @@ * 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 "Drawable.h" - -namespace love -{ -namespace graphics -{ - - Drawable::~Drawable() - { - } - -} // graphics -} // love +**/ + +#include "Drawable.h" + +namespace love +{ +namespace graphics +{ + + Drawable::~Drawable() + { + } + +} // graphics +} // love diff --git a/src/modules/graphics/Drawable.h b/src/modules/graphics/Drawable.h index fa949e744..6814cf471 100644 --- a/src/modules/graphics/Drawable.h +++ b/src/modules/graphics/Drawable.h @@ -1,21 +1,21 @@ -/** -* 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_GRAPHICS_DRAWABLE_H diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 1e4f4baba..9d6b22e38 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index 5a31c2824..24923bd44 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -1,21 +1,21 @@ -/** -* 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_GRAPHICS_GRAPHICS_H diff --git a/src/modules/graphics/Image.cpp b/src/modules/graphics/Image.cpp index c2fc3a460..6304108ed 100644 --- a/src/modules/graphics/Image.cpp +++ b/src/modules/graphics/Image.cpp @@ -1,5 +1,5 @@ /** - * 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 diff --git a/src/modules/graphics/Image.h b/src/modules/graphics/Image.h index 79a2ce94a..9106239ea 100644 --- a/src/modules/graphics/Image.h +++ b/src/modules/graphics/Image.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/Volatile.cpp b/src/modules/graphics/Volatile.cpp index 65a14dc2d..adc180810 100644 --- a/src/modules/graphics/Volatile.cpp +++ b/src/modules/graphics/Volatile.cpp @@ -1,21 +1,21 @@ -/** -* 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 "Volatile.h" diff --git a/src/modules/graphics/Volatile.h b/src/modules/graphics/Volatile.h index 542d085b7..24bec82a5 100644 --- a/src/modules/graphics/Volatile.h +++ b/src/modules/graphics/Volatile.h @@ -1,21 +1,21 @@ -/** -* 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_GRAPHICS_VOLATILE_H diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index 175a362cc..4d1fa06ef 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Font.h b/src/modules/graphics/opengl/Font.h index 84bd9a7d9..1cdbe9160 100644 --- a/src/modules/graphics/opengl/Font.h +++ b/src/modules/graphics/opengl/Font.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Glyph.cpp b/src/modules/graphics/opengl/Glyph.cpp index 27f51f5d6..4304040ce 100644 --- a/src/modules/graphics/opengl/Glyph.cpp +++ b/src/modules/graphics/opengl/Glyph.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Glyph.h b/src/modules/graphics/opengl/Glyph.h index 331a46167..1ffbe279c 100644 --- a/src/modules/graphics/opengl/Glyph.h +++ b/src/modules/graphics/opengl/Glyph.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index f0808d3c3..bda90bd52 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index eb3c58fe8..e0cec246b 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Image.cpp b/src/modules/graphics/opengl/Image.cpp index a45b5fd5c..84620fdf9 100644 --- a/src/modules/graphics/opengl/Image.cpp +++ b/src/modules/graphics/opengl/Image.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Image.h b/src/modules/graphics/opengl/Image.h index 9d5482e62..3a2456efa 100644 --- a/src/modules/graphics/opengl/Image.h +++ b/src/modules/graphics/opengl/Image.h @@ -1,21 +1,21 @@ -/** -* 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_GRAPHICS_OPENGL_IMAGE_H diff --git a/src/modules/graphics/opengl/ParticleSystem.cpp b/src/modules/graphics/opengl/ParticleSystem.cpp index a037c5266..d1f3d2589 100644 --- a/src/modules/graphics/opengl/ParticleSystem.cpp +++ b/src/modules/graphics/opengl/ParticleSystem.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/ParticleSystem.h b/src/modules/graphics/opengl/ParticleSystem.h index a75ff0994..3370f47ec 100644 --- a/src/modules/graphics/opengl/ParticleSystem.h +++ b/src/modules/graphics/opengl/ParticleSystem.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/Quad.cpp b/src/modules/graphics/opengl/Quad.cpp index df6134b17..d8efc470d 100644 --- a/src/modules/graphics/opengl/Quad.cpp +++ b/src/modules/graphics/opengl/Quad.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,17 +16,17 @@ * 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 "Quad.h" #include // STD -#include // For memcpy - -namespace love -{ -namespace graphics +#include // For memcpy + +namespace love +{ +namespace graphics { namespace opengl { @@ -93,13 +93,13 @@ namespace opengl vertices[2].s = temp[3].s; vertices[2].t = temp[3].t; vertices[3].s = temp[2].s; vertices[3].t = temp[2].t; } - } - - const vertex * Quad::getVertices() const - { - return vertices; - } - -} // opengl -} // graphics -} // love + } + + const vertex * Quad::getVertices() const + { + return vertices; + } + +} // opengl +} // graphics +} // love diff --git a/src/modules/graphics/opengl/Quad.h b/src/modules/graphics/opengl/Quad.h index c93e02bba..9da9fe6f6 100644 --- a/src/modules/graphics/opengl/Quad.h +++ b/src/modules/graphics/opengl/Quad.h @@ -1,21 +1,21 @@ -/** -* 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_GRAPHICS_OPENGL_QUAD_H diff --git a/src/modules/graphics/opengl/SpriteBatch.cpp b/src/modules/graphics/opengl/SpriteBatch.cpp index 8a15c01a4..e0b51b367 100644 --- a/src/modules/graphics/opengl/SpriteBatch.cpp +++ b/src/modules/graphics/opengl/SpriteBatch.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h index 6a92fb410..e375b912c 100644 --- a/src/modules/graphics/opengl/SpriteBatch.h +++ b/src/modules/graphics/opengl/SpriteBatch.h @@ -1,5 +1,5 @@ /** -* 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 @@ -32,8 +32,8 @@ #include #include -// OpenGL -#include "GLee.h" +// OpenGL +#include "GLee.h" #include namespace love @@ -66,8 +66,8 @@ namespace opengl // Index buffer. GLushort * indices; - // The uage hint for the vertex buffer. - int usage; + // The uage hint for the vertex buffer. + int usage; int gl_usage; // If the buffer is locked, this pointer is nonzero. @@ -86,7 +86,7 @@ namespace opengl virtual ~SpriteBatch(); // Implements Volatile. - bool loadVolatile(); + bool loadVolatile(); void unloadVolatile(); void add(float x, float y, float a, float sx, float sy, float ox, float oy); diff --git a/src/modules/graphics/opengl/wrap_Font.cpp b/src/modules/graphics/opengl/wrap_Font.cpp index 56d92c465..9d391b0bf 100644 --- a/src/modules/graphics/opengl/wrap_Font.cpp +++ b/src/modules/graphics/opengl/wrap_Font.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Font.h b/src/modules/graphics/opengl/wrap_Font.h index 2672940f1..260687c4d 100644 --- a/src/modules/graphics/opengl/wrap_Font.h +++ b/src/modules/graphics/opengl/wrap_Font.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Glyph.cpp b/src/modules/graphics/opengl/wrap_Glyph.cpp index 0e13fa30a..fd448f67a 100644 --- a/src/modules/graphics/opengl/wrap_Glyph.cpp +++ b/src/modules/graphics/opengl/wrap_Glyph.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Glyph.h b/src/modules/graphics/opengl/wrap_Glyph.h index a83e9f096..3ae352f9d 100644 --- a/src/modules/graphics/opengl/wrap_Glyph.h +++ b/src/modules/graphics/opengl/wrap_Glyph.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 674182d27..617e1509f 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Graphics.h b/src/modules/graphics/opengl/wrap_Graphics.h index d29d49b8b..0c5fb1163 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.h +++ b/src/modules/graphics/opengl/wrap_Graphics.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Image.cpp b/src/modules/graphics/opengl/wrap_Image.cpp index a584fdc98..bc855fc32 100644 --- a/src/modules/graphics/opengl/wrap_Image.cpp +++ b/src/modules/graphics/opengl/wrap_Image.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Image.h b/src/modules/graphics/opengl/wrap_Image.h index 91a3fe258..60bb20683 100644 --- a/src/modules/graphics/opengl/wrap_Image.h +++ b/src/modules/graphics/opengl/wrap_Image.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp index 9cc708f16..2aeaf9cf8 100644 --- a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp +++ b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_ParticleSystem.h b/src/modules/graphics/opengl/wrap_ParticleSystem.h index 63d6315a7..6679191e0 100644 --- a/src/modules/graphics/opengl/wrap_ParticleSystem.h +++ b/src/modules/graphics/opengl/wrap_ParticleSystem.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Quad.cpp b/src/modules/graphics/opengl/wrap_Quad.cpp index 949ee1c0c..8d4075165 100644 --- a/src/modules/graphics/opengl/wrap_Quad.cpp +++ b/src/modules/graphics/opengl/wrap_Quad.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_Quad.h b/src/modules/graphics/opengl/wrap_Quad.h index 77d3e81fb..05039cc70 100644 --- a/src/modules/graphics/opengl/wrap_Quad.h +++ b/src/modules/graphics/opengl/wrap_Quad.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp index 6cf83d91c..b6611f366 100644 --- a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp +++ b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/graphics/opengl/wrap_SpriteBatch.h b/src/modules/graphics/opengl/wrap_SpriteBatch.h index 42a1761f7..b85b65899 100644 --- a/src/modules/graphics/opengl/wrap_SpriteBatch.h +++ b/src/modules/graphics/opengl/wrap_SpriteBatch.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/EncodedImageData.cpp b/src/modules/image/EncodedImageData.cpp index aed41a692..8fece743c 100644 --- a/src/modules/image/EncodedImageData.cpp +++ b/src/modules/image/EncodedImageData.cpp @@ -1,5 +1,5 @@ /** - * 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 diff --git a/src/modules/image/EncodedImageData.h b/src/modules/image/EncodedImageData.h index cfb5a6d47..787e78317 100644 --- a/src/modules/image/EncodedImageData.h +++ b/src/modules/image/EncodedImageData.h @@ -1,5 +1,5 @@ /** - * 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 diff --git a/src/modules/image/Image.h b/src/modules/image/Image.h index 57bf94335..995823d0d 100644 --- a/src/modules/image/Image.h +++ b/src/modules/image/Image.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/ImageData.cpp b/src/modules/image/ImageData.cpp index 4e2e2f681..6f6328fde 100644 --- a/src/modules/image/ImageData.cpp +++ b/src/modules/image/ImageData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/ImageData.h b/src/modules/image/ImageData.h index 5cc5385d0..2957e0a65 100644 --- a/src/modules/image/ImageData.h +++ b/src/modules/image/ImageData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/devil/Image.cpp b/src/modules/image/devil/Image.cpp index a5d586d13..fe48cc7f4 100644 --- a/src/modules/image/devil/Image.cpp +++ b/src/modules/image/devil/Image.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/devil/Image.h b/src/modules/image/devil/Image.h index f0ba43009..ecda48952 100644 --- a/src/modules/image/devil/Image.h +++ b/src/modules/image/devil/Image.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/devil/ImageData.cpp b/src/modules/image/devil/ImageData.cpp index d583d4280..21a7c103d 100644 --- a/src/modules/image/devil/ImageData.cpp +++ b/src/modules/image/devil/ImageData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/devil/ImageData.h b/src/modules/image/devil/ImageData.h index b7ad72cf7..e0713b9b8 100644 --- a/src/modules/image/devil/ImageData.h +++ b/src/modules/image/devil/ImageData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_EncodedImageData.cpp b/src/modules/image/wrap_EncodedImageData.cpp index fd3b34c33..4ed6bd494 100644 --- a/src/modules/image/wrap_EncodedImageData.cpp +++ b/src/modules/image/wrap_EncodedImageData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_EncodedImageData.h b/src/modules/image/wrap_EncodedImageData.h index 4f7b1944f..d5ea639a2 100644 --- a/src/modules/image/wrap_EncodedImageData.h +++ b/src/modules/image/wrap_EncodedImageData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_Image.cpp b/src/modules/image/wrap_Image.cpp index 492122a0d..a63eebbbe 100644 --- a/src/modules/image/wrap_Image.cpp +++ b/src/modules/image/wrap_Image.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_Image.h b/src/modules/image/wrap_Image.h index 72f66df9b..562fb8cee 100644 --- a/src/modules/image/wrap_Image.h +++ b/src/modules/image/wrap_Image.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_ImageData.cpp b/src/modules/image/wrap_ImageData.cpp index 98555d46c..27d83969c 100644 --- a/src/modules/image/wrap_ImageData.cpp +++ b/src/modules/image/wrap_ImageData.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/image/wrap_ImageData.h b/src/modules/image/wrap_ImageData.h index 81ae3687b..65909eee4 100644 --- a/src/modules/image/wrap_ImageData.h +++ b/src/modules/image/wrap_ImageData.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/joystick/Joystick.cpp b/src/modules/joystick/Joystick.cpp index 14627d52c..656272755 100644 --- a/src/modules/joystick/Joystick.cpp +++ b/src/modules/joystick/Joystick.cpp @@ -1,21 +1,21 @@ -/** -* 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 "Joystick.h" diff --git a/src/modules/joystick/Joystick.h b/src/modules/joystick/Joystick.h index 8625a8c99..0d264e919 100644 --- a/src/modules/joystick/Joystick.h +++ b/src/modules/joystick/Joystick.h @@ -1,21 +1,21 @@ -/** -* 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_JOYSTICK_JOYSTICK_H diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp index baf3b5913..7983bb1d7 100644 --- a/src/modules/joystick/sdl/Joystick.cpp +++ b/src/modules/joystick/sdl/Joystick.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,26 +16,26 @@ * 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 "Joystick.h" - +**/ + +#include "Joystick.h" + // STD -#include - -namespace love -{ -namespace joystick -{ -namespace sdl -{ - Joystick::Joystick() - : joysticks(0) - { +#include + +namespace love +{ +namespace joystick +{ +namespace sdl +{ + Joystick::Joystick() + : joysticks(0) + { // Init the SDL joystick system. if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) - throw Exception(SDL_GetError()); - + throw Exception(SDL_GetError()); + // Start joystick event watching. SDL_JoystickEventState(SDL_ENABLE); @@ -44,11 +44,11 @@ namespace sdl this->joysticks = (SDL_Joystick **)calloc(numjoysticks, sizeof(SDL_Joystick*)); for(int i = 0;iopen(i); - } - - Joystick::~Joystick() - { + this->open(i); + } + + Joystick::~Joystick() + { // Closes any open joysticks. for(int i = 0; i != getNumJoysticks(); i++) { @@ -58,14 +58,14 @@ namespace sdl free(joysticks); - SDL_QuitSubSystem(SDL_INIT_JOYSTICK); - } - - const char * Joystick::getName() const - { - return "love.joystick.sdl"; - } - + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); + } + + const char * Joystick::getName() const + { + return "love.joystick.sdl"; + } + bool Joystick::checkIndex(int index) { if(index < getNumJoysticks()) @@ -227,10 +227,10 @@ namespace sdl SDL_JoystickClose(joysticks[index]); joysticks[index] = 0; } - } - - EnumMap::Entry Joystick::hatEntries[] = - { + } + + EnumMap::Entry Joystick::hatEntries[] = + { {Joystick::HAT_CENTERED, SDL_HAT_CENTERED}, {Joystick::HAT_UP, SDL_HAT_UP}, {Joystick::HAT_RIGHT, SDL_HAT_RIGHT}, @@ -239,11 +239,11 @@ namespace sdl {Joystick::HAT_RIGHTUP, SDL_HAT_RIGHTUP}, {Joystick::HAT_RIGHTDOWN, SDL_HAT_RIGHTDOWN}, {Joystick::HAT_LEFTUP, SDL_HAT_LEFTUP}, - {Joystick::HAT_LEFTDOWN, SDL_HAT_LEFTDOWN}, - }; - - EnumMap Joystick::hats(Joystick::hatEntries, sizeof(Joystick::hatEntries)); - -} // sdl -} // joystick -} // love + {Joystick::HAT_LEFTDOWN, SDL_HAT_LEFTDOWN}, + }; + + EnumMap Joystick::hats(Joystick::hatEntries, sizeof(Joystick::hatEntries)); + +} // sdl +} // joystick +} // love diff --git a/src/modules/joystick/sdl/Joystick.h b/src/modules/joystick/sdl/Joystick.h index 54ec200af..6788ebb4d 100644 --- a/src/modules/joystick/sdl/Joystick.h +++ b/src/modules/joystick/sdl/Joystick.h @@ -1,21 +1,21 @@ -/** -* 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_JOYSTICK_SDL_JOYSTICK_H @@ -25,7 +25,7 @@ #include #include -// SDL +// SDL #include namespace love @@ -45,22 +45,22 @@ namespace sdl // Implements Module. const char * getName() const; - bool checkIndex(int index); - int getNumJoysticks(); - const char * getName(int index); - bool open(int index); - bool isOpen(int index); - bool verifyJoystick(int index); - int getNumAxes(int index); - int getNumBalls(int index); - int getNumButtons(int index); - int getNumHats(int index); - float clampval(float x); - float getAxis(int index, int axis); - int getAxes(lua_State * L); - int getBall(lua_State * L); - bool isDown(int index, int button); - Hat getHat(int index, int hat); + bool checkIndex(int index); + int getNumJoysticks(); + const char * getName(int index); + bool open(int index); + bool isOpen(int index); + bool verifyJoystick(int index); + int getNumAxes(int index); + int getNumBalls(int index); + int getNumButtons(int index); + int getNumHats(int index); + float clampval(float x); + float getAxis(int index, int axis); + int getAxes(lua_State * L); + int getBall(lua_State * L); + bool isDown(int index, int button); + Hat getHat(int index, int hat); void close(int index); private: diff --git a/src/modules/joystick/sdl/wrap_Joystick.cpp b/src/modules/joystick/sdl/wrap_Joystick.cpp index f22f49735..6d82b8a1a 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.cpp +++ b/src/modules/joystick/sdl/wrap_Joystick.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -168,13 +168,13 @@ namespace sdl instance->retain(); - WrappedModule w; - w.module = instance; - w.name = "joystick"; - w.flags = MODULE_T; - w.functions = functions; - w.types = 0; - + WrappedModule w; + w.module = instance; + w.name = "joystick"; + w.flags = MODULE_T; + w.functions = functions; + w.types = 0; + return luax_register_module(L, w); } diff --git a/src/modules/joystick/sdl/wrap_Joystick.h b/src/modules/joystick/sdl/wrap_Joystick.h index 24e8d1e6a..2c6002f49 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.h +++ b/src/modules/joystick/sdl/wrap_Joystick.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/keyboard/Keyboard.cpp b/src/modules/keyboard/Keyboard.cpp index 98079fbc1..db16cb501 100644 --- a/src/modules/keyboard/Keyboard.cpp +++ b/src/modules/keyboard/Keyboard.cpp @@ -1,21 +1,21 @@ -/** -* 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 "Keyboard.h" diff --git a/src/modules/keyboard/Keyboard.h b/src/modules/keyboard/Keyboard.h index aec915c10..a5b016280 100644 --- a/src/modules/keyboard/Keyboard.h +++ b/src/modules/keyboard/Keyboard.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/keyboard/sdl/Keyboard.cpp b/src/modules/keyboard/sdl/Keyboard.cpp index 649a4075f..1b7aae8d3 100644 --- a/src/modules/keyboard/sdl/Keyboard.cpp +++ b/src/modules/keyboard/sdl/Keyboard.cpp @@ -1,21 +1,21 @@ -/** -* 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 "Keyboard.h" @@ -31,17 +31,17 @@ namespace sdl return "love.keyboard.sdl"; } - bool Keyboard::isDown(Key key) const - { - SDLKey k; - - if(keys.find(key, k)) - { - Uint8 * keystate = SDL_GetKeyState(0); - return keystate[(unsigned)k] == 1; - } - - return false; + bool Keyboard::isDown(Key key) const + { + SDLKey k; + + if(keys.find(key, k)) + { + Uint8 * keystate = SDL_GetKeyState(0); + return keystate[(unsigned)k] == 1; + } + + return false; } void Keyboard::setKeyRepeat(int delay, int interval) const diff --git a/src/modules/keyboard/sdl/Keyboard.h b/src/modules/keyboard/sdl/Keyboard.h index 5db7bd391..af807942b 100644 --- a/src/modules/keyboard/sdl/Keyboard.h +++ b/src/modules/keyboard/sdl/Keyboard.h @@ -1,5 +1,5 @@ /** -* 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 @@ -25,7 +25,7 @@ #include #include -// SDL +// SDL #include namespace love diff --git a/src/modules/keyboard/sdl/wrap_Keyboard.cpp b/src/modules/keyboard/sdl/wrap_Keyboard.cpp index ef04f96e2..6987f6d81 100644 --- a/src/modules/keyboard/sdl/wrap_Keyboard.cpp +++ b/src/modules/keyboard/sdl/wrap_Keyboard.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -88,13 +88,13 @@ namespace sdl else instance->retain(); - WrappedModule w; - w.module = instance; - w.name = "keyboard"; - w.flags = MODULE_T; - w.functions = functions; - w.types = 0; - + WrappedModule w; + w.module = instance; + w.name = "keyboard"; + w.flags = MODULE_T; + w.functions = functions; + w.types = 0; + return luax_register_module(L, w); } diff --git a/src/modules/keyboard/sdl/wrap_Keyboard.h b/src/modules/keyboard/sdl/wrap_Keyboard.h index 6f612cb04..798850e5f 100644 --- a/src/modules/keyboard/sdl/wrap_Keyboard.h +++ b/src/modules/keyboard/sdl/wrap_Keyboard.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/mouse/Mouse.cpp b/src/modules/mouse/Mouse.cpp index 1c3e12c0d..9b2a79ef8 100644 --- a/src/modules/mouse/Mouse.cpp +++ b/src/modules/mouse/Mouse.cpp @@ -1,21 +1,21 @@ -/** -* 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 "Mouse.h" diff --git a/src/modules/mouse/Mouse.h b/src/modules/mouse/Mouse.h index 5fc6f8cf5..b8d6a05d3 100644 --- a/src/modules/mouse/Mouse.h +++ b/src/modules/mouse/Mouse.h @@ -1,21 +1,21 @@ -/** -* 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_MOUSE_MOUSE_H diff --git a/src/modules/mouse/sdl/Mouse.cpp b/src/modules/mouse/sdl/Mouse.cpp index ce520991b..5a2248e33 100644 --- a/src/modules/mouse/sdl/Mouse.cpp +++ b/src/modules/mouse/sdl/Mouse.cpp @@ -1,26 +1,26 @@ -/** -* 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 "Mouse.h" -// SDL +// SDL #include namespace love @@ -36,15 +36,15 @@ namespace sdl int Mouse::getX() const { - int x; - SDL_GetMouseState(&x, 0); + int x; + SDL_GetMouseState(&x, 0); return x; } int Mouse::getY() const { - int y; - SDL_GetMouseState(0, &y); + int y; + SDL_GetMouseState(0, &y); return y; } @@ -83,9 +83,9 @@ namespace sdl SDL_WM_GrabInput(grab ? SDL_GRAB_ON : SDL_GRAB_OFF); } - bool Mouse::isGrabbed() const - { - return (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON ? true : false); + bool Mouse::isGrabbed() const + { + return (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON ? true : false); } EnumMap::Entry Mouse::buttonEntries[] = diff --git a/src/modules/mouse/sdl/Mouse.h b/src/modules/mouse/sdl/Mouse.h index 9f9063ab8..dd1e7ed28 100644 --- a/src/modules/mouse/sdl/Mouse.h +++ b/src/modules/mouse/sdl/Mouse.h @@ -1,21 +1,21 @@ -/** -* 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_MOUSE_SDL_MOUSE_H diff --git a/src/modules/mouse/sdl/wrap_Mouse.cpp b/src/modules/mouse/sdl/wrap_Mouse.cpp index 152d0eab7..f5baef0f9 100644 --- a/src/modules/mouse/sdl/wrap_Mouse.cpp +++ b/src/modules/mouse/sdl/wrap_Mouse.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -25,7 +25,7 @@ namespace love namespace mouse { namespace sdl -{ +{ static Mouse * instance = 0; int w_getX(lua_State * L) @@ -125,13 +125,13 @@ namespace sdl else instance->retain(); - WrappedModule w; - w.module = instance; - w.name = "mouse"; - w.flags = MODULE_T; - w.functions = functions; - w.types = 0; - + WrappedModule w; + w.module = instance; + w.name = "mouse"; + w.flags = MODULE_T; + w.functions = functions; + w.types = 0; + return luax_register_module(L, w); } diff --git a/src/modules/mouse/sdl/wrap_Mouse.h b/src/modules/mouse/sdl/wrap_Mouse.h index e3b956ae1..6c3b9cdc7 100644 --- a/src/modules/mouse/sdl/wrap_Mouse.h +++ b/src/modules/mouse/sdl/wrap_Mouse.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/Joint.cpp b/src/modules/physics/Joint.cpp index 776a33d0c..99b90041c 100644 --- a/src/modules/physics/Joint.cpp +++ b/src/modules/physics/Joint.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/Joint.h b/src/modules/physics/Joint.h index 78b4f3d20..f5e49aa4a 100644 --- a/src/modules/physics/Joint.h +++ b/src/modules/physics/Joint.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/Shape.cpp b/src/modules/physics/Shape.cpp index 009415860..cf367e86e 100644 --- a/src/modules/physics/Shape.cpp +++ b/src/modules/physics/Shape.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -40,7 +40,7 @@ namespace physics StringMap::Entry Shape::typeEntries[] = { - {"circle", Shape::SHAPE_CIRCLE}, + {"circle", Shape::SHAPE_CIRCLE}, {"polygon", Shape::SHAPE_POLYGON}, }; diff --git a/src/modules/physics/Shape.h b/src/modules/physics/Shape.h index 6d78c4660..84fed6776 100644 --- a/src/modules/physics/Shape.h +++ b/src/modules/physics/Shape.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Body.cpp b/src/modules/physics/box2d/Body.cpp index 44f4f000c..5487414c8 100644 --- a/src/modules/physics/box2d/Body.cpp +++ b/src/modules/physics/box2d/Body.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Body.h b/src/modules/physics/box2d/Body.h index 179cdf973..9444a39d5 100644 --- a/src/modules/physics/box2d/Body.h +++ b/src/modules/physics/box2d/Body.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/CircleShape.cpp b/src/modules/physics/box2d/CircleShape.cpp index 612a2e73d..ab1242dd3 100644 --- a/src/modules/physics/box2d/CircleShape.cpp +++ b/src/modules/physics/box2d/CircleShape.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/CircleShape.h b/src/modules/physics/box2d/CircleShape.h index c7479bb24..7b00e5db8 100644 --- a/src/modules/physics/box2d/CircleShape.h +++ b/src/modules/physics/box2d/CircleShape.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Contact.cpp b/src/modules/physics/box2d/Contact.cpp index f2913389f..8495920be 100644 --- a/src/modules/physics/box2d/Contact.cpp +++ b/src/modules/physics/box2d/Contact.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Contact.h b/src/modules/physics/box2d/Contact.h index 98d3e830d..7f1972850 100644 --- a/src/modules/physics/box2d/Contact.h +++ b/src/modules/physics/box2d/Contact.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/DistanceJoint.cpp b/src/modules/physics/box2d/DistanceJoint.cpp index 33a7f4b9b..e7bcf6db2 100644 --- a/src/modules/physics/box2d/DistanceJoint.cpp +++ b/src/modules/physics/box2d/DistanceJoint.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/DistanceJoint.h b/src/modules/physics/box2d/DistanceJoint.h index c6871ac17..2363f1643 100644 --- a/src/modules/physics/box2d/DistanceJoint.h +++ b/src/modules/physics/box2d/DistanceJoint.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/GearJoint.cpp b/src/modules/physics/box2d/GearJoint.cpp index efe3febf6..6366869e5 100644 --- a/src/modules/physics/box2d/GearJoint.cpp +++ b/src/modules/physics/box2d/GearJoint.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/GearJoint.h b/src/modules/physics/box2d/GearJoint.h index ed487d9b6..3be2be3af 100644 --- a/src/modules/physics/box2d/GearJoint.h +++ b/src/modules/physics/box2d/GearJoint.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Joint.cpp b/src/modules/physics/box2d/Joint.cpp index ce355de9c..ca15c0cb2 100644 --- a/src/modules/physics/box2d/Joint.cpp +++ b/src/modules/physics/box2d/Joint.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Joint.h b/src/modules/physics/box2d/Joint.h index cfb898c46..b1396e3f5 100644 --- a/src/modules/physics/box2d/Joint.h +++ b/src/modules/physics/box2d/Joint.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/MouseJoint.cpp b/src/modules/physics/box2d/MouseJoint.cpp index 96b8f9798..caaf7d0af 100644 --- a/src/modules/physics/box2d/MouseJoint.cpp +++ b/src/modules/physics/box2d/MouseJoint.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/MouseJoint.h b/src/modules/physics/box2d/MouseJoint.h index 95053daf2..083b23b91 100644 --- a/src/modules/physics/box2d/MouseJoint.h +++ b/src/modules/physics/box2d/MouseJoint.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/physics/box2d/Physics.cpp b/src/modules/physics/box2d/Physics.cpp index 16a2893bb..92f6b1de1 100644 --- a/src/modules/physics/box2d/Physics.cpp +++ b/src/modules/physics/box2d/Physics.cpp @@ -1,5 +1,5 @@ /** -* 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 @@ -16,27 +16,27 @@ * 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 "Physics.h" - -// Convex Hull Scan -#include "graham/GrahamScanConvexHull.h" - -// LOVE -#include -#include "wrap_Body.h" - -namespace love -{ -namespace physics -{ -namespace box2d -{ - - const char * Physics::getName() const - { - return "love.physics.box2d"; +**/ + +#include "Physics.h" + +// Convex Hull Scan +#include "graham/GrahamScanConvexHull.h" + +// LOVE +#include +#include "wrap_Body.h" + +namespace love +{ +namespace physics +{ +namespace box2d +{ + + const char * Physics::getName() const + { + return "love.physics.box2d"; } World * Physics::newWorld(float lx, float ly, float ux, float uy, float gx, float gy, bool sleep, int meter) @@ -112,7 +112,7 @@ namespace box2d def.restitution = 0.1f; def.density = 1.0f; - std::vector points(def.vertexCount); + std::vector points(def.vertexCount); std::vector convex_hull; for(int i = 0;i // LOVE @@ -41,24 +41,24 @@ namespace sdl { private: - // Timing vars for benchmarking. - Uint32 time_init; - - // Frame delta vars. - Uint32 currTime; - Uint32 prevTime; - Uint32 prevFpsUpdate; - - // Updated with a certain frequency. - float fps; - - // The frequency by which to update the FPS. - float fpsUpdateFrequency; - - // Frames since last FPS update. - int frames; - - // The current timestep. + // Timing vars for benchmarking. + Uint32 time_init; + + // Frame delta vars. + Uint32 currTime; + Uint32 prevTime; + Uint32 prevFpsUpdate; + + // Updated with a certain frequency. + float fps; + + // The frequency by which to update the FPS. + float fpsUpdateFrequency; + + // Frames since last FPS update. + int frames; + + // The current timestep. float dt; public: diff --git a/src/modules/timer/sdl/wrap_Timer.cpp b/src/modules/timer/sdl/wrap_Timer.cpp index 54170cc5c..af945fbab 100644 --- a/src/modules/timer/sdl/wrap_Timer.cpp +++ b/src/modules/timer/sdl/wrap_Timer.cpp @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/modules/timer/sdl/wrap_Timer.h b/src/modules/timer/sdl/wrap_Timer.h index 2b968059f..4863bd269 100644 --- a/src/modules/timer/sdl/wrap_Timer.h +++ b/src/modules/timer/sdl/wrap_Timer.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/scripts/audio.lua b/src/scripts/audio.lua index 54ce83870..bd2f8f21d 100644 --- a/src/scripts/audio.lua +++ b/src/scripts/audio.lua @@ -1,5 +1,5 @@ --[[ -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 diff --git a/src/scripts/audio.lua.h b/src/scripts/audio.lua.h index f7b1cf593..1ad950c56 100644 --- a/src/scripts/audio.lua.h +++ b/src/scripts/audio.lua.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 757413271..2dc541ba7 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -1,5 +1,5 @@ --[[ -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 diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 4e3ca88f3..1d1759f54 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1,5 +1,5 @@ /** -* 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 diff --git a/src/scripts/graphics.lua b/src/scripts/graphics.lua index acfa2d50b..7048623a3 100644 --- a/src/scripts/graphics.lua +++ b/src/scripts/graphics.lua @@ -1,5 +1,5 @@ --[[ -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 diff --git a/src/scripts/graphics.lua.h b/src/scripts/graphics.lua.h index efc5f7049..9148a568d 100644 --- a/src/scripts/graphics.lua.h +++ b/src/scripts/graphics.lua.h @@ -1,5 +1,5 @@ /** -* 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