Skip to content

Commit 75d5f92

Browse files
coltonoscopycoltonoscopy
authored
Merge pull request games50#1 from games50/malan
minor consistency tweaks
2 parents 81bdba7 + 3777488 commit 75d5f92

File tree

13 files changed

+39
-39
lines changed

13 files changed

+39
-39
lines changed

‎pong-0/main.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ WINDOW_HEIGHT = 720
2929
function love.load()
3030
love.window.setMode(WINDOW_WIDTH, WINDOW_HEIGHT, {
3131
fullscreen = false,
32-
resizable = true,
32+
resizable = false,
3333
vsync = true
3434
})
3535
end
@@ -44,4 +44,4 @@ function love.draw()
4444
WINDOW_HEIGHT / 2 - 6, -- starting Y (halfway down the screen)
4545
WINDOW_WIDTH, -- number of pixels to center within (the entire screen here)
4646
'center') -- alignment mode, can be 'center', 'left', or 'right'
47-
end
47+
end

‎pong-1/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ function love.load()
4545
-- actual window no matter its dimensions; replaces our love.window.setMode call
4646
-- from the last example
4747
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
48-
vsync = true,
4948
fullscreen = false,
50-
resizable = true
49+
resizable = false,
50+
vsync = true
5151
})
5252
end
5353

@@ -77,4 +77,4 @@ function love.draw()
7777

7878
-- end rendering at virtual resolution
7979
push:apply('end')
80-
end
80+
end

‎pong-10/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ function love.load()
7575

7676
-- initialize window with virtual resolution
7777
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
78-
vsync = true,
7978
fullscreen = false,
80-
resizable = true
79+
resizable = false,
80+
vsync = true
8181
})
8282

8383
-- initialize score variables, used for rendering on the screen and keeping
@@ -311,4 +311,4 @@ function displayScore()
311311
VIRTUAL_HEIGHT / 3)
312312
love.graphics.print(tostring(player2Score), VIRTUAL_WIDTH / 2 + 30,
313313
VIRTUAL_HEIGHT / 3)
314-
end
314+
end

‎pong-11/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ function love.load()
8383

8484
-- initialize window with virtual resolution
8585
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
86-
vsync = true,
8786
fullscreen = false,
88-
resizable = true
87+
resizable = false,
88+
vsync = true
8989
})
9090

9191
-- initialize score variables, used for rendering on the screen and keeping
@@ -327,4 +327,4 @@ function displayScore()
327327
VIRTUAL_HEIGHT / 3)
328328
love.graphics.print(tostring(player2Score), VIRTUAL_WIDTH / 2 + 30,
329329
VIRTUAL_HEIGHT / 3)
330-
end
330+
end

‎pong-2/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ function love.load()
4747

4848
-- initialize window with virtual resolution
4949
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
50-
vsync = true,
5150
fullscreen = false,
52-
resizable = false
51+
resizable = false,
52+
vsync = true
5353
})
5454
end
5555

@@ -96,4 +96,4 @@ function love.draw()
9696

9797
-- end rendering at virtual resolution
9898
push:apply('end')
99-
end
99+
end

‎pong-3/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ function love.load()
5353

5454
-- initialize window with virtual resolution
5555
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
56-
vsync = true,
5756
fullscreen = false,
58-
resizable = true
57+
resizable = false,
58+
vsync = true
5959
})
6060

6161
-- initialize score variables, used for rendering on the screen and keeping
@@ -139,4 +139,4 @@ function love.draw()
139139

140140
-- end rendering at virtual resolution
141141
push:apply('end')
142-
end
142+
end

‎pong-4/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ function love.load()
5454

5555
-- initialize window with virtual resolution
5656
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
57-
vsync = true,
5857
fullscreen = false,
59-
resizable = true
58+
resizable = false,
59+
vsync = true
6060
})
6161

6262
-- paddle positions on the Y axis (they can only move up or down)
@@ -175,4 +175,4 @@ function love.draw()
175175

176176
-- end rendering at virtual resolution
177177
push:apply('end')
178-
end
178+
end

‎pong-5/main.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ function love.load()
6464
-- more "retro-looking" font object we can use for any text
6565
smallFont = love.graphics.newFont('font.ttf', 8)
6666

67-
-- set LÖVE2D's active font to the smallFont obect
67+
-- set LÖVE2D's active font to the smallFont object
6868
love.graphics.setFont(smallFont)
6969

7070
-- initialize window with virtual resolution
7171
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
72-
vsync = true,
7372
fullscreen = false,
74-
resizable = true
73+
resizable = true,
74+
vsync = true
7575
})
7676

7777
-- initialize our player paddles; make them global so that they can be
@@ -174,4 +174,4 @@ function love.draw()
174174

175175
-- end rendering at virtual resolution
176176
push:apply('end')
177-
end
177+
end

‎pong-6/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ function love.load()
7878

7979
-- initialize window with virtual resolution
8080
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
81-
vsync = true,
8281
fullscreen = false,
83-
resizable = true
82+
resizable = false,
83+
vsync = true
8484
})
8585

8686
-- initialize score variables, used for rendering on the screen and keeping
@@ -209,4 +209,4 @@ function displayFPS()
209209
love.graphics.setFont(smallFont)
210210
love.graphics.setColor(0, 255, 0, 255)
211211
love.graphics.print('FPS: ' .. tostring(love.timer.getFPS()), 10, 10)
212-
end
212+
end

‎pong-7/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ function love.load()
7878

7979
-- initialize window with virtual resolution
8080
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
81-
vsync = true,
8281
fullscreen = false,
83-
resizable = true
82+
resizable = false,
83+
vsync = true
8484
})
8585

8686
-- initialize score variables, used for rendering on the screen and keeping
@@ -248,4 +248,4 @@ function displayFPS()
248248
love.graphics.setFont(smallFont)
249249
love.graphics.setColor(0, 255, 0, 255)
250250
love.graphics.print('FPS: ' .. tostring(love.timer.getFPS()), 10, 10)
251-
end
251+
end

‎pong-8/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ function love.load()
7878

7979
-- initialize window with virtual resolution
8080
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
81-
vsync = true,
8281
fullscreen = false,
83-
resizable = true
82+
resizable = false,
83+
vsync = true
8484
})
8585

8686
-- initialize score variables, used for rendering on the screen and keeping
@@ -258,4 +258,4 @@ function displayFPS()
258258
love.graphics.setFont(smallFont)
259259
love.graphics.setColor(0, 255, 0, 255)
260260
love.graphics.print('FPS: ' .. tostring(love.timer.getFPS()), 10, 10)
261-
end
261+
end

‎pong-9/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ function love.load()
7878

7979
-- initialize window with virtual resolution
8080
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
81-
vsync = true,
8281
fullscreen = false,
83-
resizable = true
82+
resizable = false,
83+
vsync = true
8484
})
8585

8686
-- initialize score variables, used for rendering on the screen and keeping
@@ -275,4 +275,4 @@ function displayScore()
275275
VIRTUAL_HEIGHT / 3)
276276
love.graphics.print(tostring(player2Score), VIRTUAL_WIDTH / 2 + 30,
277277
VIRTUAL_HEIGHT / 3)
278-
end
278+
end

‎pong-final/main.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ function love.load()
8383
-- initialize our virtual resolution, which will be rendered within our
8484
-- actual window no matter its dimensions
8585
push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
86-
vsync = true,
8786
fullscreen = false,
88-
resizable = true
87+
resizable = false,
88+
vsync = true
8989
})
9090

9191
-- initialize our player paddles; make them global so that they can be
@@ -361,4 +361,4 @@ function displayFPS()
361361
love.graphics.setFont(smallFont)
362362
love.graphics.setColor(0, 255, 0, 255)
363363
love.graphics.print('FPS: ' .. tostring(love.timer.getFPS()), 10, 10)
364-
end
364+
end

0 commit comments

Comments
 (0)