akkartik/wardley.love - Change YWGCJJHTPSXLQJMN2UQPOEPTY4B5F5GCJWRHUWYHL62TKO3UMSHQC

resolve conflicts

Created by akkartik on September 4, 2023

YWGCJJHTPSXLQJMN2UQPOEPTY4B5F5GCJWRHUWYHL62TKO3UMSHQC

Dependencies

In channels

main

Change contents

Insertion in app.lua at line 2 [4.2]
[2.30]
[2.30]
```
local Keys_down = {}
```

Insertion in app.lua at line 9 [4.2]

[5.34]

--   * recover from errors (by sending them to the driver and waiting for a command)

Replacement in app.lua at line 20 [4.2]

B:BD[6.137] → [6.137:175]

      love.handlers[name] = App[name]

[6.137]

[6.175]

      -- love.keyboard.isDown doesn't work on Android, so emulate it using
      -- keypressed and keyreleased events
      if name == 'keypressed' then
        love.handlers[name] = function(key, scancode, isrepeat)
                                Keys_down[key] = true
                                return App.keypressed(key, scancode, isrepeat)
                              end
      elseif name == 'keyreleased' then
        love.handlers[name] = function(key, scancode)
                                Keys_down[key] = nil
                                return App.keyreleased(key, scancode)
                              end
      else
        love.handlers[name] = App[name]
      end

Replacement in app.lua at line 66 [4.2]

B:BD[6.950] → [6.950:994]

  -- dispatch some methods to real hardware

[6.950]

[6.994]

  -- other methods dispatch to real hardware

Replacement in app.lua at line 99 [4.2]
∅:D[2.864] → [7.18:56]
B:BD[6.1641] → [7.18:56]
```
  App.key_down = love.keyboard.isDown
```
[2.864]
[6.1684]
```
  App.key_down = function(key) return Keys_down[key] end
```

Deletion in app.lua at line 489 [4.2]

B:BD[8.597] → [3.0:22]

BD:BD[8.597] → [3.0:22]

B:BD[9.7787] → [3.23:719]

BD:BD[9.7787] → [3.23:719]

B:BD[10.983] → [3.720:777]

BD:BD[10.983] → [3.720:777]


local Keys_down = {}
      -- love.keyboard.isDown doesn't work on Android, so emulate it using
      -- keypressed and keyreleased events
      if name == 'keypressed' then
        love.handlers[name] = function(key, scancode, isrepeat)
                                Keys_down[key] = true
                                return App.keypressed(key, scancode, isrepeat)
                              end
      elseif name == 'keyreleased' then
        love.handlers[name] = function(key, scancode)
                                Keys_down[key] = nil
                                return App.keyreleased(key, scancode)
                              end
      else
        love.handlers[name] = App[name]
      end
  App.key_down = function(key) return Keys_down[key] end