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

Removed the love.joystickball event callback function

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-12 06:30:00 -03:00
parent 4b92c4bf4b
commit 66b9b46846
3 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/event/sdl/Event.cpp
+1 -12
View File
@@ -89,7 +89,7 @@ Message *Event::convert(SDL_Event &e)
love::keyboard::Keyboard::Key key; love::keyboard::Keyboard::Key key;
love::mouse::Mouse::Button button; love::mouse::Mouse::Button button;
love::joystick::Joystick::Hat hat; love::joystick::Joystick::Hat hat;
Variant *arg1, *arg2, *arg3, *arg4; Variant *arg1, *arg2, *arg3;
const char *txt; const char *txt;
switch (e.type) switch (e.type)
{ {
@@ -153,17 +153,6 @@ Message *Event::convert(SDL_Event &e)
arg3->release(); arg3->release();
} }
break; break;
case SDL_JOYBALLMOTION:
arg1 = new Variant((double)(e.jball.which+1));
arg2 = new Variant((double)(e.jball.ball+1));
arg3 = new Variant((double)e.jball.xrel);
arg4 = new Variant((double)e.jball.yrel);
msg = new Message("joystickball", arg1, arg2, arg3, arg4);
arg1->release();
arg2->release();
arg3->release();
arg4->release();
break;
case SDL_JOYHATMOTION: case SDL_JOYHATMOTION:
if (hats.find(e.jhat.value, hat) && love::joystick::Joystick::getConstant(hat, txt)) if (hats.find(e.jhat.value, hat) && love::joystick::Joystick::getConstant(hat, txt))
{ {
src/scripts/boot.lua
-3
View File
@@ -176,9 +176,6 @@ function love.createhandlers()
joystickaxis = function (j,a,v) joystickaxis = function (j,a,v)
if love.joystickaxis then return love.joystickaxis(j,a,v) end if love.joystickaxis then return love.joystickaxis(j,a,v) end
end, end,
joystickball = function (j,b,dx,dy)
if love.joystickball then return love.joystickball(j,b,dx,dy) end
end,
joystickhat = function(j,h,v) joystickhat = function(j,h,v)
if love.joystickhat then return love.joystickhat(j,h,v) end if love.joystickhat then return love.joystickhat(j,h,v) end
end, end,
src/scripts/boot.lua.h
-8
View File
@@ -308,14 +308,6 @@ const unsigned char boot_lua[] =
0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x28,
0x6a, 0x2c, 0x61, 0x2c, 0x76, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x6a, 0x2c, 0x61, 0x2c, 0x76, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x20, 0x3d, 0x20, 0x66,
0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x62, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79,
0x29, 0x0a,
0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63,
0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x28,
0x6a, 0x2c, 0x62, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75,
0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x0a, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x0a,
0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63,