games/impostor
4
0
Fork 0
Code Pull Requests 1 Actions Packages Activity

[MASTER] 1.0-beta2 #47

Open
mr.zero wants to merge 8 commits from develop into master
pull from: develop
merge into: games:master
Conversation 0 Commits 8 Files Changed 34 +6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 211af18c26 - Show all commits

4
inc/system/system.input.lua
View File

@@ -6,6 +6,7 @@ local INPUT_KEY_RIGHT = 3
local INPUT_KEY_A = 4
local INPUT_KEY_B = 5
local INPUT_KEY_SPACE = 48
local INPUT_KEY_ENTER = 50
local INPUT_KEY_BACKSPACE = 51
--- Checks if Up is pressed.
@@ -26,3 +27,6 @@ function Input.select() return btnp(INPUT_KEY_A) or keyp(INPUT_KEY_SPACE) or Mou
--- Checks if Back is pressed.
--- @within Input
function Input.back() return btnp(INPUT_KEY_B) or keyp(INPUT_KEY_BACKSPACE) end
--- Checks if Enter is pressed.
--- @within Input
function Input.enter() return keyp(INPUT_KEY_ENTER) end

4
inc/window/window.intro.ttg.lua
View File

@@ -27,8 +27,8 @@ function TTGIntroWindow.update()
TTGIntroWindow.glitch_started = true
end
-- Count menu_back presses during the intro
if Input.back() then
-- Count enter presses during the intro
if Input.enter() then
TTGIntroWindow.space_count = TTGIntroWindow.space_count + 1
end