Skip to content

Commit acb2dec

Browse files
committed
Merge branch 'release/1.4.1'
2 parents 15e0f64 + 78d174c commit acb2dec

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ScreenManager.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
--===============================================================================--
2222

2323
local ScreenManager = {
24-
_VERSION = '1.3.1',
24+
_VERSION = '1.4.1',
2525
_DESCRIPTION = 'Screen/State Management for the LÖVE framework',
2626
_URL = 'https://github.com/rm-code/screenmanager/',
2727
};
@@ -69,9 +69,9 @@ end
6969
--
7070
-- @param nscreen
7171
--
72-
function ScreenManager.switch(screen)
72+
function ScreenManager.switch(screen, ...)
7373
clear();
74-
ScreenManager.push(screen);
74+
ScreenManager.push(screen, ...);
7575
end
7676

7777
---
@@ -81,7 +81,7 @@ end
8181
--
8282
-- @param screen - The name of the screen to push on the stack.
8383
--
84-
function ScreenManager.push(screen)
84+
function ScreenManager.push(screen, ...)
8585
-- Deactivate the previous screen if there is one.
8686
if ScreenManager.peek() then
8787
ScreenManager.peek():setActive(false);
@@ -100,7 +100,7 @@ function ScreenManager.push(screen)
100100
end
101101

102102
-- Create the new screen and initialise it.
103-
stack[#stack]:init();
103+
stack[#stack]:init(...);
104104
end
105105

106106
---

0 commit comments

Comments
 (0)