LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code style fixes

Browse Source
This commit is contained in:
Alex Szpakowski
2013-10-20 04:02:09 -03:00
parent 5542ab7f4e
commit 3e9fcacf07
4 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/luasocket/luasocket.cpp
+65 -64
View File
@@ -39,82 +39,83 @@ namespace love
{ {
namespace luasocket namespace luasocket
{ {
int __open(lua_State * L)
{
// Preload code from LuaSocket. int __open(lua_State * L)
PRELOAD("socket.core", luaopen_socket_core); {
PRELOAD("mime.core", luaopen_mime_core);
PRELOAD("socket", __open_luasocket_socket); // Preload code from LuaSocket.
PRELOAD("socket.ftp", __open_luasocket_ftp) PRELOAD("socket.core", luaopen_socket_core);
PRELOAD("socket.http", __open_luasocket_http); PRELOAD("mime.core", luaopen_mime_core);
PRELOAD("ltn12", __open_luasocket_ltn12);
PRELOAD("mime", __open_luasocket_mime)
PRELOAD("socket.smtp", __open_luasocket_smtp);
PRELOAD("socket.tp", __open_luasocket_tp)
PRELOAD("socket.url", __open_luasocket_url)
// No need to register garbage collector function. PRELOAD("socket", __open_luasocket_socket);
PRELOAD("socket.ftp", __open_luasocket_ftp)
PRELOAD("socket.http", __open_luasocket_http);
PRELOAD("ltn12", __open_luasocket_ltn12);
PRELOAD("mime", __open_luasocket_mime)
PRELOAD("socket.smtp", __open_luasocket_smtp);
PRELOAD("socket.tp", __open_luasocket_tp)
PRELOAD("socket.url", __open_luasocket_url)
return 0; // No need to register garbage collector function.
}
int __open_luasocket_socket(lua_State * L) return 0;
{ }
#include "libluasocket/socket.lua.h"
lua_getglobal(L, "socket");
return 1;
}
int __open_luasocket_ftp(lua_State * L) int __open_luasocket_socket(lua_State * L)
{ {
#include "libluasocket/ftp.lua.h" #include "libluasocket/socket.lua.h"
lua_getglobal(L, "socket.ftp"); lua_getglobal(L, "socket");
return 1; return 1;
} }
int __open_luasocket_http(lua_State * L) int __open_luasocket_ftp(lua_State * L)
{ {
#include "libluasocket/http.lua.h" #include "libluasocket/ftp.lua.h"
lua_getglobal(L, "socket.http"); lua_getglobal(L, "socket.ftp");
return 1; return 1;
} }
int __open_luasocket_ltn12(lua_State * L) int __open_luasocket_http(lua_State * L)
{ {
#include "libluasocket/ltn12.lua.h" #include "libluasocket/http.lua.h"
lua_getglobal(L, "ltn12"); lua_getglobal(L, "socket.http");
return 1; return 1;
} }
int __open_luasocket_mime(lua_State * L) int __open_luasocket_ltn12(lua_State * L)
{ {
#include "libluasocket/mime.lua.h" #include "libluasocket/ltn12.lua.h"
lua_getglobal(L, "mime"); lua_getglobal(L, "ltn12");
return 1; return 1;
} }
int __open_luasocket_smtp(lua_State * L) int __open_luasocket_mime(lua_State * L)
{ {
#include "libluasocket/smtp.lua.h" #include "libluasocket/mime.lua.h"
lua_getglobal(L, "socket.smtp"); lua_getglobal(L, "mime");
return 1; return 1;
} }
int __open_luasocket_tp(lua_State * L) int __open_luasocket_smtp(lua_State * L)
{ {
#include "libluasocket/tp.lua.h" #include "libluasocket/smtp.lua.h"
lua_getglobal(L, "socket.tp"); lua_getglobal(L, "socket.smtp");
return 1; return 1;
} }
int __open_luasocket_url(lua_State * L) int __open_luasocket_tp(lua_State * L)
{ {
#include "libluasocket/url.lua.h" #include "libluasocket/tp.lua.h"
lua_getglobal(L, "socket.url"); lua_getglobal(L, "socket.tp");
return 1; return 1;
} }
int __open_luasocket_url(lua_State * L)
{
#include "libluasocket/url.lua.h"
lua_getglobal(L, "socket.url");
return 1;
}
} // luasocket } // luasocket
} // love } // love
src/libraries/luasocket/luasocket.h
+13 -12
View File
@@ -28,19 +28,20 @@ namespace love
{ {
namespace luasocket namespace luasocket
{ {
int __open(lua_State * L);
// Loaders for all lua files. We want to be able int __open(lua_State * L);
// to load these dynamically. (Identical in the LuaSocket
// documentation. These functions wrap the parsing of code, etc). // Loaders for all lua files. We want to be able
int __open_luasocket_socket(lua_State * L); // to load these dynamically. (Identical in the LuaSocket
int __open_luasocket_ftp(lua_State * L); // documentation. These functions wrap the parsing of code, etc).
int __open_luasocket_http(lua_State * L); int __open_luasocket_socket(lua_State * L);
int __open_luasocket_ltn12(lua_State * L); int __open_luasocket_ftp(lua_State * L);
int __open_luasocket_mime(lua_State * L); int __open_luasocket_http(lua_State * L);
int __open_luasocket_smtp(lua_State * L); int __open_luasocket_ltn12(lua_State * L);
int __open_luasocket_tp(lua_State * L); int __open_luasocket_mime(lua_State * L);
int __open_luasocket_url(lua_State * L); int __open_luasocket_smtp(lua_State * L);
int __open_luasocket_tp(lua_State * L);
int __open_luasocket_url(lua_State * L);
} // luasocket } // luasocket
} // love } // love
src/modules/audio/null/Audio.cpp
+2 -1
View File
@@ -27,7 +27,8 @@ namespace audio
namespace null namespace null
{ {
Audio::Audio() : distanceModel(DISTANCE_NONE) Audio::Audio()
: distanceModel(DISTANCE_NONE)
{ {
} }
src/modules/audio/openal/Audio.cpp
+2 -1
View File
@@ -68,7 +68,8 @@ void Audio::PoolThread::setFinish()
finish = true; finish = true;
} }
Audio::Audio() : distanceModel(DISTANCE_INVERSE_CLAMPED) Audio::Audio()
: distanceModel(DISTANCE_INVERSE_CLAMPED)
{ {
// Passing zero for default device. // Passing zero for default device.
device = alcOpenDevice(0); device = alcOpenDevice(0);