Skip to content

Commit 419e5ee

Browse files
committed
Remove semi-colons
The root of all evil.
1 parent 773af26 commit 419e5ee

File tree

3 files changed

+128
-128
lines changed

3 files changed

+128
-128
lines changed

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,49 @@ This is a simple example of how the ScreenManager should be used (note: You will
1717
```lua
1818
-- main.lua
1919

20-
local ScreenManager = require('lib.ScreenManager');
20+
local ScreenManager = require('lib.ScreenManager')
2121

2222
function love.load()
2323
local screens = {
24-
main = require('src.screens.MainScreen');
25-
};
24+
main = require('src.screens.MainScreen')
25+
}
2626

27-
ScreenManager.init(screens, 'main');
27+
ScreenManager.init(screens, 'main')
2828
end
2929

3030
function love.draw()
31-
ScreenManager.draw();
31+
ScreenManager.draw()
3232
end
3333

3434
function love.update(dt)
35-
ScreenManager.update(dt);
35+
ScreenManager.update(dt)
3636
end
3737
```
3838
Note how MainScreen inherits from Screen.lua. This isn't mandatory, but recommended since Screen.lua already has templates for most of the callback functions.
3939

4040
```lua
4141
-- MainScreen.lua
4242

43-
local Screen = require('lib.Screen');
43+
local Screen = require('lib.Screen')
4444

45-
local MainScreen = {};
45+
local MainScreen = {}
4646

4747
function MainScreen.new()
48-
local self = Screen.new();
48+
local self = Screen.new()
4949

50-
local x, y, w, h = 20, 20, 40, 20;
50+
local x, y, w, h = 20, 20, 40, 20
5151

5252
function self:draw()
53-
love.graphics.rectangle('fill', x, y, w, h);
53+
love.graphics.rectangle('fill', x, y, w, h)
5454
end
5555

5656
function self:update(dt)
57-
w = w + 2;
58-
h = h + 1;
57+
w = w + 2
58+
h = h + 1
5959
end
6060

61-
return self;
61+
return self
6262
end
6363

64-
return MainScreen;
64+
return MainScreen
6565
```

Screen.lua

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-- --
2121
--===============================================================================--
2222

23-
local Screen = {};
23+
local Screen = {}
2424

2525
-- ------------------------------------------------
2626
-- Private Functions
@@ -30,76 +30,76 @@ local Screen = {};
3030
-- Function stub.
3131
--
3232
local function null()
33-
return;
33+
return
3434
end
3535

3636
-- ------------------------------------------------
3737
-- Module
3838
-- ------------------------------------------------
3939

4040
function Screen.new()
41-
local self = {};
41+
local self = {}
4242

43-
local active = true;
43+
local active = true
4444

4545
-- ------------------------------------------------
4646
-- Public Methods
4747
-- ------------------------------------------------
4848

4949
function self:isActive()
50-
return active;
50+
return active
5151
end
5252

5353
function self:setActive( nactiv )
54-
active = nactiv;
54+
active = nactiv
5555
end
5656

5757
-- ------------------------------------------------
5858
-- Callback-stubs
5959
-- ------------------------------------------------
6060

61-
self.init = null;
62-
self.close = null;
61+
self.init = null
62+
self.close = null
6363
self.directorydropped = null
64-
self.draw = null;
65-
self.filedropped = null;
66-
self.focus = null;
67-
self.keypressed = null;
68-
self.keyreleased = null;
69-
self.lowmemory = null;
70-
self.mousefocus = null;
71-
self.mousemoved = null;
72-
self.mousepressed = null;
73-
self.mousereleased = null;
74-
self.quit = null;
75-
self.resize = null;
76-
self.textedited = null;
77-
self.textinput = null;
78-
self.threaderror = null;
79-
self.touchmoved = null;
80-
self.touchpressed = null;
81-
self.touchreleased = null;
82-
self.update = null;
83-
self.visible = null;
84-
self.wheelmoved = null;
85-
self.gamepadaxis = null;
86-
self.gamepadpressed = null;
87-
self.gamepadreleased = null;
88-
self.joystickadded = null;
89-
self.joystickaxis = null;
90-
self.joystickhat = null;
91-
self.joystickpressed = null;
92-
self.joystickreleased = null;
93-
self.joystickremoved = null;
64+
self.draw = null
65+
self.filedropped = null
66+
self.focus = null
67+
self.keypressed = null
68+
self.keyreleased = null
69+
self.lowmemory = null
70+
self.mousefocus = null
71+
self.mousemoved = null
72+
self.mousepressed = null
73+
self.mousereleased = null
74+
self.quit = null
75+
self.resize = null
76+
self.textedited = null
77+
self.textinput = null
78+
self.threaderror = null
79+
self.touchmoved = null
80+
self.touchpressed = null
81+
self.touchreleased = null
82+
self.update = null
83+
self.visible = null
84+
self.wheelmoved = null
85+
self.gamepadaxis = null
86+
self.gamepadpressed = null
87+
self.gamepadreleased = null
88+
self.joystickadded = null
89+
self.joystickaxis = null
90+
self.joystickhat = null
91+
self.joystickpressed = null
92+
self.joystickreleased = null
93+
self.joystickremoved = null
9494

95-
return self;
95+
return self
9696
end
9797

9898
-- ------------------------------------------------
9999
-- Return Module
100100
-- ------------------------------------------------
101101

102-
return Screen;
102+
return Screen
103103

104104
--==================================================================================================
105105
-- Created 02.06.14 - 20:25 =

0 commit comments

Comments
 (0)